diff --git a/.github/workflows/cron-checks.yml b/.github/workflows/cron-checks.yml
index 8e112dec9c0..eb3ac1e9c95 100644
--- a/.github/workflows/cron-checks.yml
+++ b/.github/workflows/cron-checks.yml
@@ -41,6 +41,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - ios: 18.1
+            xcode: 16.1
+            os: macos-15
+            device: "iPhone 16 Pro"
+            setup_runtime: false
           - ios: 17.4
             xcode: 15.4
             os: macos-14
@@ -123,6 +128,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - ios: 18.1
+            xcode: 16.1
+            os: macos-15
+            device: "iPhone 16 Pro"
+            setup_runtime: false
           - ios: 17.4
             xcode: 15.4
             os: macos-14
@@ -138,16 +148,6 @@ jobs:
             os: macos-14
             device: "iPhone 13 Pro"
             setup_runtime: true
-          - ios: 14.5
-            xcode: 14.2
-            os: macos-12
-            device: "iPhone 12 Pro"
-            setup_runtime: true
-          - ios: 13.7
-            xcode: 14.2
-            os: macos-12
-            device: "iPhone 11 Pro"
-            setup_runtime: true
       fail-fast: false
     runs-on: ${{ matrix.os }}
     env:
@@ -189,11 +189,11 @@ jobs:
           fastlane/test_output/logs/*/Diagnostics/**/*.txt
           fastlane/test_output/logs/*/Diagnostics/simctl_diagnostics/DiagnosticReports/*
 
-  build-xcode14:
-    name: Build LLC + UI (Xcode 14)
-    runs-on: macos-12
+  build-old-xcode:
+    name: Build LLC + UI (Xcode 15)
+    runs-on: macos-14
     env:
-      XCODE_VERSION: "14.0.1"
+      XCODE_VERSION: "15.0.1"
     steps:
     - name: Connect Bot
       uses: webfactory/ssh-agent@v0.7.0
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 48bfffd20be..e664c5a7e16 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   release:
     name: Publish new release
-    runs-on: macos-12
+    runs-on: macos-15
     steps:
       - name: Connect Bot
         uses: webfactory/ssh-agent@v0.7.0
diff --git a/.github/workflows/smoke-checks.yml b/.github/workflows/smoke-checks.yml
index 0dc31813bcb..babfcf2cea0 100644
--- a/.github/workflows/smoke-checks.yml
+++ b/.github/workflows/smoke-checks.yml
@@ -19,7 +19,7 @@ concurrency:
 
 env:
   HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI
-  IOS_SIMULATOR_DEVICE: "iPhone 15 Pro (17.4)"
+  IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.1)"
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GITHUB_PR_NUM: ${{ github.event.pull_request.number }}
 
@@ -48,9 +48,9 @@ jobs:
 
   automated-code-review:
     name: Automated Code Review
-    runs-on: macos-12
+    runs-on: macos-14
     env:
-      XCODE_VERSION: "14.0.1"
+      XCODE_VERSION: "15.0.1"
     if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     steps:
       - uses: actions/checkout@v4.1.1
@@ -67,12 +67,12 @@ jobs:
         if: startsWith(github.event.pull_request.head.ref, 'release/')
         run: bundle exec fastlane pod_lint
 
-  build-xcode14:
-    name: Build LLC + UI (Xcode 14)
-    runs-on: macos-12
+  build-old-xcode:
+    name: Build LLC + UI (Xcode 15)
+    runs-on: macos-14
     if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     env:
-      XCODE_VERSION: "14.0.1"
+      XCODE_VERSION: "15.0.1"
     steps:
     - uses: actions/checkout@v4.1.1
     - uses: ./.github/actions/ruby-cache
@@ -87,7 +87,7 @@ jobs:
 
   test-llc-debug:
     name: Test LLC (Debug)
-    runs-on: macos-14
+    runs-on: macos-15
     if: ${{ github.event.inputs.snapshots != 'true' }}
     needs: build-test-app-and-frameworks
     steps:
@@ -136,7 +136,7 @@ jobs:
 
   test-ui-debug:
     name: Test UI (Debug)
-    runs-on: macos-14
+    runs-on: macos-15
     needs: build-test-app-and-frameworks
     if: ${{ github.event_name != 'push' }}
     steps:
@@ -152,7 +152,7 @@ jobs:
         SKIP_BREW_BOOTSTRAP: true
     - name: Run UI Tests (Debug)
       run: bundle exec fastlane test_ui device:"${{ env.IOS_SIMULATOR_DEVICE }}" skip_build:true record:${{ github.event.inputs.snapshots }}
-      timeout-minutes: 60
+      timeout-minutes: 120
       env:
         GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }} # to open a PR
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # to use github cli
@@ -170,7 +170,7 @@ jobs:
 
   allure_testops_launch:
     name: Launch Allure TestOps
-    runs-on: macos-13
+    runs-on: macos-14
     if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     needs: build-test-app-and-frameworks
     outputs:
@@ -189,7 +189,7 @@ jobs:
 
   test-e2e-debug:
     name: Test E2E UI (Debug)
-    runs-on: macos-14
+    runs-on: macos-15
     if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     needs:
       - allure_testops_launch
@@ -216,8 +216,6 @@ jobs:
       run: bundle exec fastlane test_e2e_mock device:"${{ env.IOS_SIMULATOR_DEVICE }}" batch:'${{ matrix.batch }}' test_without_building:true
       timeout-minutes: 100
       env:
-        XCODE_VERSION: "15.0.1" # the most stable pair of Xcode
-        IOS_SIMULATOR_DEVICE: "iPhone 15 Pro (17.0)" # and iOS
         MATRIX_SIZE: ${{ strategy.job-total }}
         STREAM_DEMO_APP_SECRET: ${{ secrets.STREAM_DEMO_APP_SECRET }}
     - name: Allure TestOps Upload
diff --git a/.github/workflows/update-copyright.yml b/.github/workflows/update-copyright.yml
index 1cd27ed3b31..1649699d350 100644
--- a/.github/workflows/update-copyright.yml
+++ b/.github/workflows/update-copyright.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   copyright:
     name: Copyright
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4.1.1
     - uses: ./.github/actions/ruby-cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f3c4e72505..b125dffee3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ _December 03, 2024_
 ### 🐞 Fixed
 - Fix a rare infinite loop triggering a crash when handling database changes [#3508](https://github.com/GetStream/stream-chat-swift/pull/3508)
 - Fix reconnection timeout handler not working in the token provider phase [#3513](https://github.com/GetStream/stream-chat-swift/pull/3513)
+### 🔄 Changed
+- Minor breaking change in the test tools. Some mock classes were made internal and now require a `@testable` annotation [#3509](https://github.com/GetStream/stream-chat-swift/pull/3509)
 
 ## StreamChatUI
 ### 🐞 Fixed
diff --git a/StreamChatUITestsAppUITests/Robots/UserRobot.swift b/StreamChatUITestsAppUITests/Robots/UserRobot.swift
index 4f78ab68c09..c08e7764a29 100644
--- a/StreamChatUITestsAppUITests/Robots/UserRobot.swift
+++ b/StreamChatUITestsAppUITests/Robots/UserRobot.swift
@@ -142,6 +142,9 @@ extension UserRobot {
     func clearComposer() -> Self {
         if !composer.textView.text.isEmpty {
             composer.inputField.tap()
+            if !composer.selectAllButton.waitForExistence(timeout: 1) {
+                composer.inputField.tap()
+            }
             composer.selectAllButton.wait().safeTap()
             composer.inputField.typeText(XCUIKeyboardKey.delete.rawValue)
         }
diff --git a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatChannelController_Mock.swift b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatChannelController_Mock.swift
index 71cbaf74343..85937401b46 100644
--- a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatChannelController_Mock.swift
+++ b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatChannelController_Mock.swift
@@ -5,20 +5,20 @@
 import Foundation
 @testable import StreamChat
 
-public class ChatChannelController_Mock: ChatChannelController {
+class ChatChannelController_Mock: ChatChannelController {
 
     var mockCid: ChannelId?
-    public override var cid: ChannelId? {
+    override var cid: ChannelId? {
         mockCid ?? super.cid
     }
 
     var mockFirstUnreadMessageId: MessageId?
-    public override var firstUnreadMessageId: MessageId? {
+    override var firstUnreadMessageId: MessageId? {
         mockFirstUnreadMessageId ?? super.firstUnreadMessageId
     }
 
     /// Creates a new mock instance of `ChatChannelController`.
-    public static func mock(chatClientConfig: ChatClientConfig? = nil) -> ChatChannelController_Mock {
+    static func mock(chatClientConfig: ChatClientConfig? = nil) -> ChatChannelController_Mock {
         .init(
             channelQuery: .init(cid: try! .init(cid: "mock:channel")),
             channelListQuery: nil,
@@ -35,7 +35,7 @@ public class ChatChannelController_Mock: ChatChannelController {
         )
     }
 
-    public static func mock(
+    static func mock(
         channelQuery: ChannelQuery,
         channelListQuery: ChannelListQuery?,
         client: ChatClient
@@ -47,7 +47,7 @@ public class ChatChannelController_Mock: ChatChannelController {
         )
     }
 
-    public static func mock(client: ChatClient) -> ChatChannelController_Mock {
+    static func mock(client: ChatClient) -> ChatChannelController_Mock {
         .init(
             channelQuery: .init(cid: try! .init(cid: "mock:channel")),
             channelListQuery: nil,
@@ -56,7 +56,7 @@ public class ChatChannelController_Mock: ChatChannelController {
     }
 
     var createNewMessageCallCount = 0
-    public override func createNewMessage(
+    override func createNewMessage(
         messageId: MessageId? = nil,
         text: String, pinning: MessagePinning? = nil,
         isSilent: Bool = false,
@@ -71,61 +71,61 @@ public class ChatChannelController_Mock: ChatChannelController {
         createNewMessageCallCount += 1
     }
 
-    public var hasLoadedAllNextMessages_mock: Bool? = true
-    public override var hasLoadedAllNextMessages: Bool {
+    var hasLoadedAllNextMessages_mock: Bool? = true
+    override var hasLoadedAllNextMessages: Bool {
         hasLoadedAllNextMessages_mock ?? super.hasLoadedAllNextMessages
     }
 
-    public var hasLoadedAllPreviousMessages_mock: Bool? = true
-    public override var hasLoadedAllPreviousMessages: Bool {
+    var hasLoadedAllPreviousMessages_mock: Bool? = true
+    override var hasLoadedAllPreviousMessages: Bool {
         hasLoadedAllPreviousMessages_mock ?? super.hasLoadedAllPreviousMessages
     }
 
-    public var markedAsUnread_mock: Bool? = true
-    public override var isMarkedAsUnread: Bool {
+    var markedAsUnread_mock: Bool? = true
+    override var isMarkedAsUnread: Bool {
         markedAsUnread_mock ?? super.isMarkedAsUnread
     }
 
-    public var channel_mock: ChatChannel?
-    override public var channel: ChatChannel? {
+    var channel_mock: ChatChannel?
+    override var channel: ChatChannel? {
         channel_mock ?? super.channel
     }
 
-    public var channelQuery_mock: ChannelQuery?
-    public override var channelQuery: ChannelQuery {
+    var channelQuery_mock: ChannelQuery?
+    override var channelQuery: ChannelQuery {
         channelQuery_mock ?? super.channelQuery
     }
 
-    public var messages_mock: [ChatMessage]?
-    override public var messages: LazyCachedMapCollection<ChatMessage> {
+    var messages_mock: [ChatMessage]?
+    override var messages: LazyCachedMapCollection<ChatMessage> {
         messages_mock.map { $0.lazyCachedMap { $0 } } ?? super.messages
     }
 
-    public var markReadCallCount = 0
-    public override func markRead(completion: ((Error?) -> Void)?) {
+    var markReadCallCount = 0
+    override func markRead(completion: ((Error?) -> Void)?) {
         markReadCallCount += 1
     }
 
-    public var state_mock: State?
-    override public var state: DataController.State {
+    var state_mock: State?
+    override var state: DataController.State {
         get { state_mock ?? super.state }
         set { super.state = newValue }
     }
 
-    public private(set) var synchronize_completion: ((Error?) -> Void)?
-    override public func synchronize(_ completion: ((Error?) -> Void)? = nil) {
+    private(set) var synchronize_completion: ((Error?) -> Void)?
+    override func synchronize(_ completion: ((Error?) -> Void)? = nil) {
         synchronize_completion = completion
     }
 
-    public var loadFirstPageCallCount = 0
-    public var loadFirstPage_result: Error?
-    public override func loadFirstPage(_ completion: ((Error?) -> Void)? = nil) {
+    var loadFirstPageCallCount = 0
+    var loadFirstPage_result: Error?
+    override func loadFirstPage(_ completion: ((Error?) -> Void)? = nil) {
         loadFirstPageCallCount += 1
         completion?(loadFirstPage_result)
     }
 
-    public var loadPageAroundMessageIdCallCount = 0
-    public override func loadPageAroundMessageId(
+    var loadPageAroundMessageIdCallCount = 0
+    override func loadPageAroundMessageId(
         _ messageId: MessageId,
         limit: Int? = nil,
         completion: ((Error?) -> Void)? = nil
@@ -134,7 +134,7 @@ public class ChatChannelController_Mock: ChatChannelController {
     }
 }
 
-public extension ChatChannelController_Mock {
+extension ChatChannelController_Mock {
     /// Simulates the initial conditions. Setting these values doesn't trigger any observer callback.
     func simulateInitial(channel: ChatChannel, messages: [ChatMessage], state: DataController.State) {
         channel_mock = channel
diff --git a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatChannelListController_Mock.swift b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatChannelListController_Mock.swift
index c2f374a990e..c20c0704a07 100644
--- a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatChannelListController_Mock.swift
+++ b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatChannelListController_Mock.swift
@@ -5,40 +5,40 @@
 import Foundation
 @testable import StreamChat
 
-public class ChatChannelListController_Mock: ChatChannelListController, Spy {
-    public let spyState = SpyState()
-    public var loadNextChannelsIsCalled = false
-    public var loadNextChannelsCallCount = 0
-    public var resetChannelsQueryResult: Result<(synchedAndWatched: [ChatChannel], unwanted: Set<ChannelId>), Error>?
-    public var refreshLoadedChannelsResult: Result<Set<ChannelId>, any Error>?
+class ChatChannelListController_Mock: ChatChannelListController, Spy {
+    let spyState = SpyState()
+    var loadNextChannelsIsCalled = false
+    var loadNextChannelsCallCount = 0
+    var resetChannelsQueryResult: Result<(synchedAndWatched: [ChatChannel], unwanted: Set<ChannelId>), Error>?
+    var refreshLoadedChannelsResult: Result<Set<ChannelId>, any Error>?
 
     /// Creates a new mock instance of `ChatChannelListController`.
-    public static func mock(client: ChatClient? = nil) -> ChatChannelListController_Mock {
+    static func mock(client: ChatClient? = nil) -> ChatChannelListController_Mock {
         .init(query: .init(filter: .equal(.memberCount, to: 0)), client: client ?? .mock())
     }
 
-    public var channels_mock: [ChatChannel]?
-    override public var channels: LazyCachedMapCollection<ChatChannel> {
+    var channels_mock: [ChatChannel]?
+    override var channels: LazyCachedMapCollection<ChatChannel> {
         channels_mock.map { $0.lazyCachedMap { $0 } } ?? super.channels
     }
 
-    public var state_mock: State?
-    override public var state: DataController.State {
+    var state_mock: State?
+    override var state: DataController.State {
         get { state_mock ?? super.state }
         set { super.state = newValue }
     }
 
-    override public func loadNextChannels(limit: Int?, completion: ((Error?) -> Void)?) {
+    override func loadNextChannels(limit: Int?, completion: ((Error?) -> Void)?) {
         loadNextChannelsCallCount += 1
         loadNextChannelsIsCalled = true
     }
 
-    override public func refreshLoadedChannels(completion: @escaping (Result<Set<ChannelId>, any Error>) -> Void) {
+    override func refreshLoadedChannels(completion: @escaping (Result<Set<ChannelId>, any Error>) -> Void) {
         record()
         refreshLoadedChannelsResult.map(completion)
     }
     
-    override public func resetQuery(
+    override func resetQuery(
         watchedAndSynchedChannelIds: Set<ChannelId>,
         synchedChannelIds: Set<ChannelId>,
         completion: @escaping (Result<(synchedAndWatched: [ChatChannel], unwanted: Set<ChannelId>), Error>) -> Void
@@ -48,7 +48,7 @@ public class ChatChannelListController_Mock: ChatChannelListController, Spy {
     }
 }
 
-public extension ChatChannelListController_Mock {
+extension ChatChannelListController_Mock {
     /// Simulates the initial conditions. Setting these values doesn't trigger any observer callback.
     func simulateInitial(channels: [ChatChannel], state: DataController.State) {
         channels_mock = channels
diff --git a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatMessageController_Mock.swift b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatMessageController_Mock.swift
index 3d07927091d..88c27fc7fb4 100644
--- a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatMessageController_Mock.swift
+++ b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatMessageController_Mock.swift
@@ -5,9 +5,9 @@
 import Foundation
 @testable import StreamChat
 
-public class ChatMessageController_Mock: ChatMessageController {
+class ChatMessageController_Mock: ChatMessageController {
     /// Creates a new mock instance of `ChatMessageController`.
-    public static func mock(
+    static func mock(
         currentUserId: UserId = "ID",
         cid: ChannelId? = nil,
         messageId: String = "MockMessage"
@@ -23,24 +23,24 @@ public class ChatMessageController_Mock: ChatMessageController {
         return .init(client: chatClient, cid: channelId!, messageId: messageId, replyPaginationHandler: MessagesPaginationStateHandler_Mock())
     }
 
-    public var message_mock: ChatMessage?
-    override public var message: ChatMessage? {
+    var message_mock: ChatMessage?
+    override var message: ChatMessage? {
         message_mock ?? super.message
     }
 
-    public var replies_mock: [ChatMessage]?
-    override public var replies: LazyCachedMapCollection<ChatMessage> {
+    var replies_mock: [ChatMessage]?
+    override var replies: LazyCachedMapCollection<ChatMessage> {
         replies_mock.map { $0.lazyCachedMap { $0 } } ?? super.replies
     }
 
-    public var state_mock: State?
-    override public var state: DataController.State {
+    var state_mock: State?
+    override var state: DataController.State {
         get { state_mock ?? super.state }
         set { super.state = newValue }
     }
 
-    public var startObserversIfNeeded_mock: (() -> Void)?
-    override public func startObserversIfNeeded() {
+    var startObserversIfNeeded_mock: (() -> Void)?
+    override func startObserversIfNeeded() {
         if let mock = startObserversIfNeeded_mock {
             mock()
             return
@@ -51,7 +51,7 @@ public class ChatMessageController_Mock: ChatMessageController {
 
     var synchronize_callCount = 0
     var synchronize_completion: ((Error?) -> Void)?
-    override public func synchronize(_ completion: ((Error?) -> Void)? = nil) {
+    override func synchronize(_ completion: ((Error?) -> Void)? = nil) {
         synchronize_callCount += 1
         synchronize_completion = completion
     }
@@ -59,7 +59,7 @@ public class ChatMessageController_Mock: ChatMessageController {
 
     var loadPageAroundReplyId_callCount = 0
     var loadPageAroundReplyId_completion: ((Error?) -> Void)?
-    override public func loadPageAroundReplyId(
+    override func loadPageAroundReplyId(
         _ replyId: MessageId,
         limit: Int? = nil,
         completion: ((Error?) -> Void)? = nil
@@ -69,7 +69,7 @@ public class ChatMessageController_Mock: ChatMessageController {
     }
 }
 
-public extension ChatMessageController_Mock {
+extension ChatMessageController_Mock {
     /// Simulates the initial conditions. Setting these values doesn't trigger any observer callback.
     func simulateInitial(message: ChatMessage, replies: [ChatMessage], state: DataController.State) {
         message_mock = message
diff --git a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatMessageSearchController_Mock.swift b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatMessageSearchController_Mock.swift
index 5f66fcfb47d..eb90beec212 100644
--- a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatMessageSearchController_Mock.swift
+++ b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatMessageSearchController_Mock.swift
@@ -5,18 +5,18 @@
 import Foundation
 @testable import StreamChat
 
-public class ChatMessageSearchController_Mock: ChatMessageSearchController {
-    public static func mock(client: ChatClient? = nil) -> ChatMessageSearchController_Mock {
+class ChatMessageSearchController_Mock: ChatMessageSearchController {
+    static func mock(client: ChatClient? = nil) -> ChatMessageSearchController_Mock {
         .init(client: client ?? .mock())
     }
 
-    public var messages_mock: LazyCachedMapCollection<ChatMessage>?
-    override public var messages: LazyCachedMapCollection<ChatMessage> {
+    var messages_mock: LazyCachedMapCollection<ChatMessage>?
+    override var messages: LazyCachedMapCollection<ChatMessage> {
         messages_mock ?? super.messages
     }
 
-    public var state_mock: DataController.State?
-    public override var state: DataController.State {
+    var state_mock: DataController.State?
+    override var state: DataController.State {
         get {
             state_mock ?? super.state
         }
@@ -26,18 +26,18 @@ public class ChatMessageSearchController_Mock: ChatMessageSearchController {
     }
 
     var loadNextMessagesCallCount = 0
-    override public func loadNextMessages(limit: Int = 25, completion: ((Error?) -> Void)? = nil) {
+    override func loadNextMessages(limit: Int = 25, completion: ((Error?) -> Void)? = nil) {
         loadNextMessagesCallCount += 1
         completion?(nil)
     }
 
     var searchCallCount = 0
-    override public func search(query: MessageSearchQuery, completion: ((Error?) -> Void)? = nil) {
+    override func search(query: MessageSearchQuery, completion: ((Error?) -> Void)? = nil) {
         searchCallCount += 1
         completion?(nil)
     }
 
-    public override func search(text: String, completion: ((Error?) -> Void)? = nil) {
+    override func search(text: String, completion: ((Error?) -> Void)? = nil) {
         searchCallCount += 1
     }
 }
diff --git a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatThreadListController_Mock.swift b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatThreadListController_Mock.swift
index 3bd9eb0502f..0ff904f3379 100644
--- a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatThreadListController_Mock.swift
+++ b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatThreadListController_Mock.swift
@@ -5,25 +5,25 @@
 import Foundation
 @testable import StreamChat
 
-public class ChatThreadListController_Mock: ChatThreadListController {
-    public static func mock(query: ThreadListQuery, client: ChatClient? = nil) -> ChatThreadListController_Mock {
+class ChatThreadListController_Mock: ChatThreadListController {
+    static func mock(query: ThreadListQuery, client: ChatClient? = nil) -> ChatThreadListController_Mock {
         .init(query: query, client: client ?? .mock())
     }
 
-    public var threads_mock: [ChatThread]?
-    public override var threads: LazyCachedMapCollection<ChatThread> {
+    var threads_mock: [ChatThread]?
+    override var threads: LazyCachedMapCollection<ChatThread> {
         threads_mock.map { $0.lazyCachedMap { $0 } } ?? super.threads
     }
 
-    public var state_mock: State?
-    override public var state: DataController.State {
+    var state_mock: State?
+    override var state: DataController.State {
         get { state_mock ?? super.state }
         set { super.state = newValue }
     }
 
-    public var synchronize_completion: (((any Error)?) -> Void)?
-    public var synchronize_callCount = 0
-    public override func synchronize(_ completion: (((any Error)?) -> Void)? = nil) {
+    var synchronize_completion: (((any Error)?) -> Void)?
+    var synchronize_callCount = 0
+    override func synchronize(_ completion: (((any Error)?) -> Void)? = nil) {
         synchronize_callCount += 1
         synchronize_completion = completion
     }
diff --git a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatUserSearchController_Mock.swift b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatUserSearchController_Mock.swift
index 004f2dbc50b..dd17b86c96c 100644
--- a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatUserSearchController_Mock.swift
+++ b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/ChatUserSearchController_Mock.swift
@@ -5,25 +5,25 @@
 import Foundation
 @testable import StreamChat
 
-public class ChatUserSearchController_Mock: ChatUserSearchController {
+class ChatUserSearchController_Mock: ChatUserSearchController {
 
     var searchCallCount = 0
 
-    public static func mock(client: ChatClient? = nil) -> ChatUserSearchController_Mock {
+    static func mock(client: ChatClient? = nil) -> ChatUserSearchController_Mock {
         .init(client: client ?? .mock())
     }
 
-    public var users_mock: [ChatUser]?
-    override public var userArray: [ChatUser] {
+    var users_mock: [ChatUser]?
+    override var userArray: [ChatUser] {
         users_mock ?? super.userArray
     }
 
-    override public func search(query: UserListQuery, completion: ((Error?) -> Void)? = nil) {
+    override func search(query: UserListQuery, completion: ((Error?) -> Void)? = nil) {
         searchCallCount += 1
         completion?(nil)
     }
 
-    override public func search(term: String?, completion: ((Error?) -> Void)? = nil) {
+    override func search(term: String?, completion: ((Error?) -> Void)? = nil) {
         searchCallCount += 1
         users_mock = users_mock?.filter { user in
             user.name?.contains(term ?? "") ?? true
diff --git a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/CurrentChatUserController_Mock.swift b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/CurrentChatUserController_Mock.swift
index ece0a7da07e..88563e88f64 100644
--- a/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/CurrentChatUserController_Mock.swift
+++ b/TestTools/StreamChatTestTools/Mocks/StreamChat/Controllers/CurrentChatUserController_Mock.swift
@@ -5,13 +5,13 @@
 import Foundation
 @testable import StreamChat
 
-public class CurrentChatUserController_Mock: CurrentChatUserController {
-    public static func mock(client: ChatClient? = nil) -> CurrentChatUserController_Mock {
+class CurrentChatUserController_Mock: CurrentChatUserController {
+    static func mock(client: ChatClient? = nil) -> CurrentChatUserController_Mock {
         .init(client: client ?? .mock())
     }
 
-    public var currentUser_mock: CurrentChatUser?
-    override public var currentUser: CurrentChatUser? {
+    var currentUser_mock: CurrentChatUser?
+    override var currentUser: CurrentChatUser? {
         currentUser_mock
     }
 }
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_chatChannel_isPopulated.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_chatChannel_isPopulated.default-light.png
index 225be7654df..0078c5b7c47 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_chatChannel_isPopulated.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_chatChannel_isPopulated.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png
index fd468292830..d5fb4623845 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png
index dfc4147fafb..c489c39b967 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png
index 5ec54c1d1fc..161af87cdcc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png
index b4587955eac..f81bb4b243a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_defaultAppearance.default-light.png
index a34e144e4bc..63ca6d4d612 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesVisibilityWhenAlwaysVisible.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesVisibilityWhenAlwaysVisible.default-light.png
index 637a0220eb4..e122c25ac47 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesVisibilityWhenAlwaysVisible.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesVisibilityWhenAlwaysVisible.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesVisibilityWhenOnlyVisibleToYou.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesVisibilityWhenOnlyVisibleToYou.default-light.png
index 61820a32beb..ba8298d37d6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesVisibilityWhenOnlyVisibleToYou.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesVisibilityWhenOnlyVisibleToYou.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesWithAttachmentsAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesWithAttachmentsAppearance.default-light.png
index f6fa977bf1a..d3fabea1214 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesWithAttachmentsAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_deletedMessagesWithAttachmentsAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.default-light.png
index adc27c6fe74..07a5b85dd10 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png
index f7a4d1339eb..0338a46b717 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png
index 4f8faf52083..dc70a02159a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.small-dark.png
index 269bbc44aa2..8bf3c65033b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_emptyAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_headerViewForMessage_whenUnreadSeparatorIsDisabled_whenMessageShouldShowDateSeparator_AndIsMarkedAsUnread.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_headerViewForMessage_whenUnreadSeparatorIsDisabled_whenMessageShouldShowDateSeparator_AndIsMarkedAsUnread.default-light.png
index 1d5513e1561..f258c52a615 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_headerViewForMessage_whenUnreadSeparatorIsDisabled_whenMessageShouldShowDateSeparator_AndIsMarkedAsUnread.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_headerViewForMessage_whenUnreadSeparatorIsDisabled_whenMessageShouldShowDateSeparator_AndIsMarkedAsUnread.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_headerViewForMessage_whenUnreadSeparatorIsEnabled_whenMessageShouldShowDateSeparator_AndIsMarkedAsUnread.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_headerViewForMessage_whenUnreadSeparatorIsEnabled_whenMessageShouldShowDateSeparator_AndIsMarkedAsUnread.default-light.png
index 007f5511171..f223dd5c1f1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_headerViewForMessage_whenUnreadSeparatorIsEnabled_whenMessageShouldShowDateSeparator_AndIsMarkedAsUnread.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_headerViewForMessage_whenUnreadSeparatorIsEnabled_whenMessageShouldShowDateSeparator_AndIsMarkedAsUnread.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.default-light.png
index 3d054c64abb..0dc1165acf5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.extraExtraExtraLarge-light.png
index ec4f40b7557..0599f897293 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.rightToLeftLayout-default.png
index e12057f0f05..32075e8aca7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.small-dark.png
index 9160eff1dd3..fef009119ce 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.default-light.png
index 397e4af8eff..f4989a17131 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.extraExtraExtraLarge-light.png
index 3e0d4ba6e3d..0e78b982a25 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.rightToLeftLayout-default.png
index 8b1ca2a508b..dfe761a9f35 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.small-dark.png
index 0dcf3350923..66485a402f9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_onlyEmojiMessageAppearance_whenQuotingMessage.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_staticDateSeparatorsAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_staticDateSeparatorsAppearance.default-light.png
index acd4afd918e..2115ba93900 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_staticDateSeparatorsAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_staticDateSeparatorsAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageEditedAt_editedMessageIsNotGrouped.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageEditedAt_editedMessageIsNotGrouped.default-light.png
index 139bf75db6a..180d062091a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageEditedAt_editedMessageIsNotGrouped.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageEditedAt_editedMessageIsNotGrouped.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedByEphemeralMessage_messagesAreNotGrouped.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedByEphemeralMessage_messagesAreNotGrouped.default-light.png
index 4db95076e6f..e0149cad573 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedByEphemeralMessage_messagesAreNotGrouped.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedByEphemeralMessage_messagesAreNotGrouped.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedByErrorMessage_messagesAreNotGrouped.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedByErrorMessage_messagesAreNotGrouped.default-light.png
index 2f253f91621..8c5e3ae2a9d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedByErrorMessage_messagesAreNotGrouped.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedByErrorMessage_messagesAreNotGrouped.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedBySystemMessage_messagesAreNotGrouped.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedBySystemMessage_messagesAreNotGrouped.default-light.png
index 4f1b6e57152..51607ddddbe 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedBySystemMessage_messagesAreNotGrouped.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenMessageFromCurrentUserIsFollowedBySystemMessage_messagesAreNotGrouped.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenReactionIsAddedByCurrentUserWithSameType_shouldUpdateReactionColor.default-light-after-current-user-reaction.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenReactionIsAddedByCurrentUserWithSameType_shouldUpdateReactionColor.default-light-after-current-user-reaction.png
index 7ca9c889696..71515c45f98 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenReactionIsAddedByCurrentUserWithSameType_shouldUpdateReactionColor.default-light-after-current-user-reaction.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenReactionIsAddedByCurrentUserWithSameType_shouldUpdateReactionColor.default-light-after-current-user-reaction.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenReactionIsAddedByCurrentUserWithSameType_shouldUpdateReactionColor.default-light-before-current-user-reaction.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenReactionIsAddedByCurrentUserWithSameType_shouldUpdateReactionColor.default-light-before-current-user-reaction.png
index 99e5c3951a5..dee8dc3f053 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenReactionIsAddedByCurrentUserWithSameType_shouldUpdateReactionColor.default-light-before-current-user-reaction.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenReactionIsAddedByCurrentUserWithSameType_shouldUpdateReactionColor.default-light-before-current-user-reaction.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenShouldMessagesStartAtTheTopIsTrue.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenShouldMessagesStartAtTheTopIsTrue.small-dark.png
index 28bfd2a21b9..1678d18bf3d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenShouldMessagesStartAtTheTopIsTrue.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenShouldMessagesStartAtTheTopIsTrue.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessageOutOfScreen_shouldShowJumpToUnreadPill_whenJumpToUnreadIsDisabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessageOutOfScreen_shouldShowJumpToUnreadPill_whenJumpToUnreadIsDisabled.default-light.png
index bb5ca193df4..280d28a39c4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessageOutOfScreen_shouldShowJumpToUnreadPill_whenJumpToUnreadIsDisabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessageOutOfScreen_shouldShowJumpToUnreadPill_whenJumpToUnreadIsDisabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessageOutOfScreen_shouldShowJumpToUnreadPill_whenJumpToUnreadIsEnabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessageOutOfScreen_shouldShowJumpToUnreadPill_whenJumpToUnreadIsEnabled.default-light.png
index bb5ca193df4..280d28a39c4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessageOutOfScreen_shouldShowJumpToUnreadPill_whenJumpToUnreadIsEnabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessageOutOfScreen_shouldShowJumpToUnreadPill_whenJumpToUnreadIsEnabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessage_whenFeatureIsDisabled_shouldShowABannerOnTopOfIt.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessage_whenFeatureIsDisabled_shouldShowABannerOnTopOfIt.default-light.png
index 0ff8d161cfb..6522b249f48 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessage_whenFeatureIsDisabled_shouldShowABannerOnTopOfIt.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessage_whenFeatureIsDisabled_shouldShowABannerOnTopOfIt.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessage_whenFeatureIsEnabled_shouldShowABannerOnTopOfIt.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessage_whenFeatureIsEnabled_shouldShowABannerOnTopOfIt.default-light.png
index 29db80a707e..8dd0afb1aa6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessage_whenFeatureIsEnabled_shouldShowABannerOnTopOfIt.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenThereIsAnUnreadMessage_whenFeatureIsEnabled_shouldShowABannerOnTopOfIt.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromAnotherUserIs1minOrLess_messagesAreGrouped.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromAnotherUserIs1minOrLess_messagesAreGrouped.default-light.png
index f819a7b1d14..130a38f382a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromAnotherUserIs1minOrLess_messagesAreGrouped.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromAnotherUserIs1minOrLess_messagesAreGrouped.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromAnotherUserIsMoreThan1min_messagesAreNotGrouped.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromAnotherUserIsMoreThan1min_messagesAreNotGrouped.default-light.png
index b8fc470eaf2..87e35acaab5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromAnotherUserIsMoreThan1min_messagesAreNotGrouped.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromAnotherUserIsMoreThan1min_messagesAreNotGrouped.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromTheCurrentUserIs1minOrLess_messagesAreGrouped.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromTheCurrentUserIs1minOrLess_messagesAreGrouped.default-light.png
index 756075d3c45..abf0691a782 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromTheCurrentUserIs1minOrLess_messagesAreGrouped.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromTheCurrentUserIs1minOrLess_messagesAreGrouped.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromTheCurrentUserIsMoreThan1min_messagesAreNotGrouped.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromTheCurrentUserIsMoreThan1min_messagesAreNotGrouped.default-light.png
index 484077c17ab..45b55fb6bf2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromTheCurrentUserIsMoreThan1min_messagesAreNotGrouped.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannel/__Snapshots__/ChatChannelVC_Tests/test_whenTimeIntervalBetween2MessagesFromTheCurrentUserIsMoreThan1min_messagesAreNotGrouped.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/ChatMessageSearchVC_Tests.swift b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/ChatMessageSearchVC_Tests.swift
index cf6fc1b9f6b..ebcb4388cf6 100644
--- a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/ChatMessageSearchVC_Tests.swift
+++ b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/ChatMessageSearchVC_Tests.swift
@@ -94,13 +94,13 @@ final class ChatMessageSearchVC_Tests: XCTestCase {
         XCTAssertEqual(vc.hasEmptyResults, false)
     }
 
-    func test_loadSearchResults() {
+    func test_loadSearchResults() throws {
         vc.loadSearchResults(with: "Dummy")
 
         XCTAssertEqual(mockedMessageSearchController.searchCallCount, 1)
     }
 
-    func test_loadMoreSearchResults() {
+    func test_loadMoreSearchResults() throws {
         vc.loadMoreSearchResults()
 
         XCTAssertEqual(mockedMessageSearchController.loadNextMessagesCallCount, 1)
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.default-light.png
index 09febc52d92..773bdb86b31 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index ed4619bcb74..f69b961b24e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index bb01e323e66..1f774bb0b78 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.small-dark.png
index d47c4dfd703..d13bc6dcd70 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.default-light.png
index 0d37cd6f467..8dc9c26401d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png
index c1b839c47bd..dc27df86426 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png
index 7da8f590efe..7ee9e3ed7af 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.small-dark.png
index 0f28b301424..2506bfbbc51 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_emptyAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.default-light.png
index 8f1c0684b9c..be89b54219e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.extraExtraExtraLarge-light.png
index 38fbde6eea5..5054b9441f7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.rightToLeftLayout-default.png
index 21e1d2f23f3..af88f6ccd70 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.small-dark.png
index 5df479f85a2..439722c36d9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatChannelSearchVC_Tests/test_loadingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.default-light.png
index bbad0610386..21d912564d0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index c97c45493da..3df8a084234 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 618bc37a4fa..990cdb1c0d9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.small-dark.png
index 3ed4f8c64aa..2388c6754f6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.default-light.png
index 0d37cd6f467..8dc9c26401d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png
index c1b839c47bd..dc27df86426 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png
index 7da8f590efe..7ee9e3ed7af 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.small-dark.png
index 0f28b301424..2506bfbbc51 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_emptyAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.default-light.png
index 8f1c0684b9c..be89b54219e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.extraExtraExtraLarge-light.png
index 38fbde6eea5..5054b9441f7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.rightToLeftLayout-default.png
index 21e1d2f23f3..af88f6ccd70 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.small-dark.png
index 5df479f85a2..439722c36d9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/Search/__Snapshots__/ChatMessageSearchVC_Tests/test_loadingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index 3ec9ceec9e4..2329f5f3d1f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png
index 3ec9ceec9e4..2329f5f3d1f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png
index 3ec9ceec9e4..2329f5f3d1f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png
index 32b3aa3f5e7..b2e34ce3f59 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index eeff491f2a2..c4cee74c6c3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index eeff491f2a2..c4cee74c6c3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index eeff491f2a2..c4cee74c6c3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index 2fa023b0606..f6a7bace946 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.default-light.png
index 303a2fe6e35..a4617ad0bf9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index 303a2fe6e35..a4617ad0bf9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 303a2fe6e35..a4617ad0bf9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.small-dark.png
index 6073ef9941b..f12c092c426 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListEmptyView_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index d6bb28d094f..c60648954c9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png
index d6bb28d094f..c60648954c9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png
index c7077dc6769..ccb61417954 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png
index d6bb28d094f..c60648954c9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index ece63d5cd36..d4abb2e2530 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index ece63d5cd36..d4abb2e2530 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index 0b8e0dc2d63..56d95ad94f4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index ece63d5cd36..d4abb2e2530 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.default-light.png
index d6bb28d094f..c60648954c9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index d6bb28d094f..c60648954c9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index c7077dc6769..ccb61417954 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.small-dark.png
index d6bb28d094f..c60648954c9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListErrorView_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png
index 02548ec23f6..7609e9f0fa7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.extraExtraExtraLarge-light.png
index 9cd37c03266..c0520cd4cdd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.rightToLeftLayout-default.png
index e84575c09bc..2413ba070a0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.small-dark.png
index 4829b3f76fa..0b0eabcc854 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView+SwiftUI_Tests/test_injectedSwiftUIView.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index dd627da2ac5..404efbb9cd9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png
index c7f2606a18a..fac5855a365 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png
index 4cc7e77d9d3..9ee5b810593 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png
index 92142000719..901086b61c9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index b03d6f7d6c1..7334b5b0662 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index e8436b222a0..851d939873a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index d8eb89e654d..963f2213c9f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index 88801088ceb..13876db7167 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage.default-light.png
index 8cb2ef5d309..08c4fd4091e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenMultipleMembers.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenMultipleMembers.default-light.png
index d75ab0f5bf5..9297a8fd06e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenMultipleMembers.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenMultipleMembers.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenSentByCurrentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenSentByCurrentUser.default-light.png
index 401d324b3b7..206cf373e75 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenSentByCurrentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenSentByCurrentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenTextIsEmpty.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenTextIsEmpty.default-light.png
index ca8944822c4..bf6e0db1ab0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenTextIsEmpty.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_audioPreviewMessage_whenTextIsEmpty.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsDisabled.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsDisabled.default-dark.png
index 024911f53e8..24265c018ee 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsDisabled.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsDisabled.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsDisabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsDisabled.default-light.png
index 6c7079dc4fe..44ba7098bd7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsDisabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsDisabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsEnabled.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsEnabled.default-dark.png
index 024911f53e8..24265c018ee 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsEnabled.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsEnabled.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsEnabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsEnabled.default-light.png
index 6c7079dc4fe..44ba7098bd7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsEnabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_failedPreviewMessageFromCurrentUser_readsEnabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage.default-light.png
index d45136bd933..8e51dfe0f69 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenMultipleMembers.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenMultipleMembers.default-light.png
index e7bf9ac4bb4..ae0aaafee09 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenMultipleMembers.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenMultipleMembers.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenSentByCurrentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenSentByCurrentUser.default-light.png
index c948e035239..8326dd988ae 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenSentByCurrentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenSentByCurrentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenTitleIsNil.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenTitleIsNil.default-light.png
index 59c5132b24c..3be4b09972c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenTitleIsNil.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_filePreviewMessage_whenTitleIsNil.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage.default-light.png
index c7ffdbde2cc..ac80109f07c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage_whenMultipleMembers.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage_whenMultipleMembers.default-light.png
index 32591e937b3..9a9ae937c17 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage_whenMultipleMembers.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage_whenMultipleMembers.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage_whenSentByCurrentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage_whenSentByCurrentUser.default-light.png
index 8eed3a7bbc7..e86c93a9731 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage_whenSentByCurrentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_giphyPreviewMessage_whenSentByCurrentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage.default-light.png
index e63a41c4aba..376f564e6b0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenMultipleMembers.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenMultipleMembers.default-light.png
index 87210194acb..bf490e1924b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenMultipleMembers.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenMultipleMembers.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenSentByCurrentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenSentByCurrentUser.default-light.png
index 6703be76b04..6d45ae267c6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenSentByCurrentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenSentByCurrentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenTextIsEmpty.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenTextIsEmpty.default-light.png
index abc95b167fa..b92f4920e8b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenTextIsEmpty.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_imagePreviewMessage_whenTextIsEmpty.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pendingPreviewMessageFromCurrentUser_readsDisabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pendingPreviewMessageFromCurrentUser_readsDisabled.default-light.png
index 02b34b38c0f..1f8e17c8abc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pendingPreviewMessageFromCurrentUser_readsDisabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pendingPreviewMessageFromCurrentUser_readsDisabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pendingPreviewMessageFromCurrentUser_readsEnabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pendingPreviewMessageFromCurrentUser_readsEnabled.default-light.png
index 02b34b38c0f..1f8e17c8abc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pendingPreviewMessageFromCurrentUser_readsEnabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pendingPreviewMessageFromCurrentUser_readsEnabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsAnotherUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsAnotherUser.default-light.png
index 39aaaa805b7..35048709b1f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsAnotherUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsAnotherUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.default-light.png
index 594e3ba6036..343b7aeb028 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.extraExtraExtraLarge-light.png
index d6afad80502..8b016e39139 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.rightToLeftLayout-default.png
index 12e4f720714..11822177475 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.small-dark.png
index 2f9d2018035..498d7a31355 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenLatestVoterIsCurrentUser.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenPollCreatedByAnotherUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenPollCreatedByAnotherUser.default-light.png
index 57293f0f579..c5feaebb070 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenPollCreatedByAnotherUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenPollCreatedByAnotherUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenPollCreatedByCurrentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenPollCreatedByCurrentUser.default-light.png
index 74ceedceed5..ef22b779aa1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenPollCreatedByCurrentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_pollPreview_whenPollCreatedByCurrentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.default-light.png
index e054bbd7d12..0460b69b2a0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.extraExtraExtraLarge-light.png
index 44330eae18b..6cd0706ff18 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.rightToLeftLayout-default.png
index adcc1cbf9d9..c43f42041d3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.small-dark.png
index 4f845917366..194698aeddd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_previewMessageIsVoiceRecording.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromAnotherUser_readEnabled.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromAnotherUser_readEnabled.default-dark.png
index f7699fd636b..cd15ab20ab8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromAnotherUser_readEnabled.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromAnotherUser_readEnabled.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromAnotherUser_readEnabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromAnotherUser_readEnabled.default-light.png
index a4570077a30..c6b5da996f9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromAnotherUser_readEnabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromAnotherUser_readEnabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsDisabled.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsDisabled.default-dark.png
index a80da8d845c..0dcd67da633 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsDisabled.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsDisabled.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsDisabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsDisabled.default-light.png
index da0512fd10e..33563a89140 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsDisabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsDisabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsEnabled.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsEnabled.default-dark.png
index 2cc55774f28..d4228036d92 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsEnabled.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsEnabled.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsEnabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsEnabled.default-light.png
index de5caf5ffbd..556da1cb6ff 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsEnabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_readPreviewMessageFromCurrentUser_readsEnabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-dark.png
index 14656288c87..cc78739cf93 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-light-without-channel-name.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-light-without-channel-name.png
index 64f34e13d2e..ce1a67bb9e0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-light-without-channel-name.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-light-without-channel-name.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-light.png
index 26ded3d1d4b..4b7c0c017a9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_searchedMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsDisabled.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsDisabled.default-dark.png
index 1f643358185..e414b45f0a1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsDisabled.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsDisabled.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsDisabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsDisabled.default-light.png
index a731da4dc3c..1f4cd789134 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsDisabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsDisabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsEnabled.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsEnabled.default-dark.png
index dad353e23d1..0505671742b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsEnabled.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsEnabled.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsEnabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsEnabled.default-light.png
index 1587ad470a9..6f72b948fd1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsEnabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_sentPreviewMessageFromCurrentUser_readsEnabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_systemPreviewMessage.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_systemPreviewMessage.default-dark.png
index 4f883235dfa..b0f219f17e5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_systemPreviewMessage.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_systemPreviewMessage.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_systemPreviewMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_systemPreviewMessage.default-light.png
index d57a56dedce..fe47660fb8c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_systemPreviewMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_systemPreviewMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage.default-dark.png
index 270139162e0..5cec6bba2df 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage.default-light.png
index bcc6e88847e..9eb427c7c2b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage_whenHasAttachment.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage_whenHasAttachment.default-dark.png
index 8bce3162308..ba9003bff64 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage_whenHasAttachment.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage_whenHasAttachment.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage_whenHasAttachment.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage_whenHasAttachment.default-light.png
index 8614ba90740..5a78f7fc87d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage_whenHasAttachment.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_translatedMessage_whenHasAttachment.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage.default-light.png
index 13177cf2709..a6717eaa164 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenMultipleMembers.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenMultipleMembers.default-light.png
index ecd61c7607f..c9eb5f5d48a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenMultipleMembers.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenMultipleMembers.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenSentByCurrentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenSentByCurrentUser.default-light.png
index 641e5c3eefa..9febe0e9a48 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenSentByCurrentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenSentByCurrentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenTextIsEmpty.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenTextIsEmpty.default-light.png
index eae3f412783..dcaac550b05 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenTextIsEmpty.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_appearance_videoPreviewMessage_whenTextIsEmpty.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.default-light.png
index cfa9a517446..fbbf5a14824 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.extraExtraExtraLarge-light.png
index cfa9a517446..fbbf5a14824 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.rightToLeftLayout-default.png
index 2a58bbf81b6..094477155ee 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.small-dark.png
index fe84fabbf53..75f6c2ac9c9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListItemView_Tests/test_emptyState.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.default-light.png
index dd76ba8ad09..6b9d3627f33 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.extraExtraExtraLarge-light.png
index 47c700eb633..f32f7cbf144 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.rightToLeftLayout-default.png
index 32cc1290eeb..220be467170 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.small-dark.png
index c192563fccf..c6841125e76 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_chatChannelList_isPopulated.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png
index 2071ac068ab..1fb21a4fc8b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png
index 17c442566e2..47b28a52a99 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png
index 1e3c2293ba8..db993455f48 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png
index dc05b7f3e2c..e808e504d12 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingComponents.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingComponents.default-dark.png
index 07a41a8a636..084e0db26d9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingComponents.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingComponents.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingComponents.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingComponents.default-light.png
index 736a969d31e..48f080de124 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingComponents.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingComponents.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png
index 4de59d020b6..416870edcc3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 6b615e414a1..9183bdb0088 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.default-light.png
index 8eb46d1be73..442b1ff53f4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.extraExtraExtraLarge-light.png
index 8eec1c8393f..532133fba9d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.rightToLeftLayout-default.png
index 2dcd58be88c..b8047169ab8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.small-dark.png
index ba0f3a63208..6162bf875e3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_appearance_withSearchBar.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.default-light.png
index 4777727f9f2..73fe7a401be 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index 736f5df60a5..b09a2c858e8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 5313b355bbc..e0017ca01a5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.small-dark.png
index 413d0f6d407..08eeee559c5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.default-light.png
index 7785c8d3a42..95afbba8cc1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png
index 73b16fb4115..a66d4b121f5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png
index 69537bd80fc..5cbabaa348e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.small-dark.png
index f2c13c0fd07..7465f4f2818 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelListVC_Tests/test_emptyAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png
index d397c32587e..d94f814e0da 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.extraExtraExtraLarge-light.png
index f99488b84e7..206e08bdb41 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.rightToLeftLayout-default.png
index 2b2684ac15f..dd7d07119f6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.small-dark.png
index 2ea96102f1a..1d65420a7b3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView+SwiftUI_Tests/test_injectedSwiftUIView.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.default-light.png
index 6b413bb38b4..39812b44795 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light.png
index e301e8c0956..841655fc38e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default.png
index 6b413bb38b4..39812b44795 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.small-dark.png
index 0493be83402..08e20abe0e5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingComponents.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 264f13cdbe7..e46b8361daf 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index 3029f99be76..d48f6db5de4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index 264f13cdbe7..e46b8361daf 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index 31af0ff491c..0cf078176d6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.default-light-2digits.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.default-light-2digits.png
index 53ec98d0a21..5bd86463478 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.default-light-2digits.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.default-light-2digits.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.default-light-3digits.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.default-light-3digits.png
index 4ccb7ad155d..bb14e6f06ad 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.default-light-3digits.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.default-light-3digits.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-2digits.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-2digits.png
index b59fbc6d891..0f8242d9a85 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-2digits.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-2digits.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-3digits.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-3digits.png
index d9384757a11..849a4a069dc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-3digits.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-3digits.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.rightToLeftLayout-default-2digits.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.rightToLeftLayout-default-2digits.png
index 53ec98d0a21..5bd86463478 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.rightToLeftLayout-default-2digits.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.rightToLeftLayout-default-2digits.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.rightToLeftLayout-default-3digits.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.rightToLeftLayout-default-3digits.png
index 4ccb7ad155d..bb14e6f06ad 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.rightToLeftLayout-default-3digits.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.rightToLeftLayout-default-3digits.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.small-dark-2digits.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.small-dark-2digits.png
index 634b724111d..dc2b6c1342a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.small-dark-2digits.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.small-dark-2digits.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.small-dark-3digits.png b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.small-dark-3digits.png
index d58ec6ccbf7..ba460be02c5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.small-dark-3digits.png and b/Tests/StreamChatUITests/SnapshotTests/ChatChannelList/__Snapshots__/ChatChannelUnreadCountView_Tests/test_defaultAppearance.small-dark-3digits.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index 74356841615..8e82e644d1a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index b6c8e7e5310..8fe6397242a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf.default-light.png
index 16a9f87f56c..696b2de0409 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenDownloadedThenShareIcon.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenDownloadedThenShareIcon.default-light.png
index 06cdb11e2f9..6907596a98b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenDownloadedThenShareIcon.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenDownloadedThenShareIcon.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenSizeIsZero.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenSizeIsZero.default-light.png
index 0b3a8877ea2..3daee85e5b6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenSizeIsZero.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenSizeIsZero.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenUploadingStateIsNil.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenUploadingStateIsNil.default-light.png
index 16a9f87f56c..696b2de0409 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenUploadingStateIsNil.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_pdf_whenUploadingStateIsNil.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_whenUnknown.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_whenUnknown.default-light.png
index 7e80c69d010..4e205b4a0c3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_whenUnknown.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatFileAttachmentListView+ItemView_Tests/test_appearance_whenUnknown.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 4ee5082d097..a526cc4611a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_five_attachments.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_five_attachments.default-light.png
index b7a01e5d89a..8c2ff9001a4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_five_attachments.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_five_attachments.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_one_attachment.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_one_attachment.default-light.png
index 450750aee68..98bd06d1b15 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_one_attachment.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_one_attachment.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_two_attachments.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_two_attachments.default-light.png
index a26a13b422c..a1d603ebb76 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_two_attachments.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageFileAttachmentListView_Tests/test_appearance_two_attachments.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index 1a05d86e7a4..1ebf5546e2d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearance_whenMoreThanFourImages.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearance_whenMoreThanFourImages.default-dark.png
index 602ded84969..3e6d936b3f8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearance_whenMoreThanFourImages.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearance_whenMoreThanFourImages.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearance_whenMoreThanFourImages.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearance_whenMoreThanFourImages.default-light.png
index 602ded84969..3e6d936b3f8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearance_whenMoreThanFourImages.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageGalleryView_Tests/test_appearance_whenMoreThanFourImages.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.default-light.png
index 9f1ef0f45df..1291adc135e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.extraExtraExtraLarge-light.png
index c4acd01d130..2c9c7e2d0b1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.rightToLeftLayout-default.png
index 4702230ff17..8f58907d38c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.small-dark.png
index 5b47a6c93b6..02cbd7fae9f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index 9b6ba7990cd..db4e8fe80d6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png
index b080b948309..f439a8fca29 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png
index c01b6ad34a3..8cf157e83f9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png
index c8e34b1521b..a4ccfa11f48 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 6be2e969a17..46b186afe4f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index 89095afc040..d8a518e82b4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index e14141e7099..640fda3b690 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index efc7d3f6b4e..3b82a893f32 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.default-light.png
index e7775557a95..ac8c4f880e2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.extraExtraExtraLarge-light.png
index bd478600960..145c9042189 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.rightToLeftLayout-default.png
index 36482f06545..bacd640efec 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.small-dark.png
index 15ad34ab284..44bb7058e71 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenLongTexts.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.default-light.png
index 4ed6daa35c2..3a68e5d1e8c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.extraExtraExtraLarge-light.png
index bb0a252a984..8faf3a65619 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.rightToLeftLayout-default.png
index 98deed991de..08f3a1ed29e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.small-dark.png
index b7abaedf6b5..067c5ac4f2b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoAuthor.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.default-light.png
index db8e6d79ced..3afe6879671 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.extraExtraExtraLarge-light.png
index 9e56fcd0aa7..ac1750fd567 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.rightToLeftLayout-default.png
index 02da2f255f9..f9e73b58fcb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.small-dark.png
index 4c35a2c3eb6..e2c7e9af903 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoImagePreview.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.default-light.png
index b2ca5cf8a13..373a71d43e7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.extraExtraExtraLarge-light.png
index 9f3bafab7ae..64d8d74bfd3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.rightToLeftLayout-default.png
index 8cfc97151ec..cf6519b06b6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.small-dark.png
index dff178674c6..460a448ce1d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitle.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.default-light.png
index 37d2033bd34..2faacc6beb9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.extraExtraExtraLarge-light.png
index fb886e79191..bcb4556c213 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.rightToLeftLayout-default.png
index 1b717ca5f96..55f48bf931f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.small-dark.png
index a61077a85e0..e48f8fdbc80 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageLinkPreviewView_Tests/test_appearance_whenNoTitleAndText.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index f15e10d2c3e..e0365b8d1b3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index da1f8e3cf26..a8d2414ae1f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index 0e5456ef25f..ae6cbe0369d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index 7c8d7d149c0..01e74cd129d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.default-light.png
index e5fb0b30988..1015188cdc6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.extraExtraExtraLarge-light.png
index 82e425827b7..7b7f3a91a45 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.rightToLeftLayout-default.png
index 138b6e37f58..8ef4790743c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.small-dark.png
index 292f0ad4ffb..f097dfbcd30 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_five_attachments.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.default-light.png
index 070cb172c42..4b601fe4daa 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.extraExtraExtraLarge-light.png
index 69ee358190d..8edca26607f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.rightToLeftLayout-default.png
index 313d1868cea..720a1da82bf 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.small-dark.png
index d4a1a4d22fd..fbc02041997 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_one_attachment.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.default-light.png
index 397b10923a4..0e51f4db588 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.extraExtraExtraLarge-light.png
index ef62ed0bf55..a8c06f2c605 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.rightToLeftLayout-default.png
index 5603f8795b1..7f4ef0d68c4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.small-dark.png
index c92572ce77c..e592f9858cf 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Attachments/__Snapshots__/ChatMessageVoiceRecordingAttachmentListView_Tests/test_appearance_two_attachments.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingAppearance.default-dark.png
index 52569d7045b..978247802b1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index 9637afcdab8..e795db7ca99 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png
index 6cae91a516c..615b3bc33e0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 5c75e9ee9d6..0cc64e75fbb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenContentIsSet.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenContentIsSet.default-dark.png
index d4cb9c1948f..9a5a2cffde8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenContentIsSet.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenContentIsSet.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenContentIsSet.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenContentIsSet.default-light.png
index c88007d1598..24007097b60 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenContentIsSet.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenContentIsSet.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenNoContentSet.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenNoContentSet.default-dark.png
index 52569d7045b..978247802b1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenNoContentSet.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenNoContentSet.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenNoContentSet.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenNoContentSet.default-light.png
index 9637afcdab8..e795db7ca99 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenNoContentSet.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageBubbleView_Tests/test_appearance_whenNoContentSet.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-continuousBubble-quotedMessage-reactions-text-threadInfo-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-continuousBubble-quotedMessage-reactions-text-threadInfo-timestamp.png
index de28dc97b84..48358168e8f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-continuousBubble-quotedMessage-reactions-text-threadInfo-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-continuousBubble-quotedMessage-reactions-text-threadInfo-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-quotedMessage-reactions-text-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-quotedMessage-reactions-text-timestamp.png
index 1cacaf5e955..ea61e232c80 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-quotedMessage-reactions-text-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-quotedMessage-reactions-text-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-quotedMessage-text-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-quotedMessage-text-timestamp.png
index 8faff74ed8f..344c861e089 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-quotedMessage-text-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-quotedMessage-text-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-reactions-text-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-reactions-text-timestamp.png
index 043dca44cb4..bce8014e9c8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-reactions-text-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-reactions-text-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-text-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-text-timestamp.png
index 8aa0741ff46..cd2e0f7a916 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-text-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatar-bubble-text-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-reactions-text-threadInfo.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-reactions-text-threadInfo.png
index 40e4be0eae6..a0af9dfa6de 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-reactions-text-threadInfo.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-reactions-text-threadInfo.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-reactions-text.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-reactions-text.png
index 4a2bdf2297d..6fbc595e9e5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-reactions-text.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-reactions-text.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-text.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-text.png
index e9458f0d732..30adf0c8fb4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-text.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-quotedMessage-text.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-reactions-text.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-reactions-text.png
index 54f56e030d6..8b113509421 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-reactions-text.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-reactions-text.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-text.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-text.png
index 1bd8696a70c..15a6944ea64 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-text.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-avatarSizePadding-bubble-continuousBubble-text.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-errorIndicator-flipped-quotedMessage-reactions-text-threadInfo-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-errorIndicator-flipped-quotedMessage-reactions-text-threadInfo-timestamp.png
index fce628671cb..8c77f3b9acc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-errorIndicator-flipped-quotedMessage-reactions-text-threadInfo-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-errorIndicator-flipped-quotedMessage-reactions-text-threadInfo-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-errorIndicator-flipped-quotedMessage-reactions-text-threadInfo.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-errorIndicator-flipped-quotedMessage-reactions-text-threadInfo.png
index 8d614d52b89..b9e0afb4eec 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-errorIndicator-flipped-quotedMessage-reactions-text-threadInfo.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-errorIndicator-flipped-quotedMessage-reactions-text-threadInfo.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text-threadInfo-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text-threadInfo-timestamp.png
index 8e5cf9a40c0..55499413345 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text-threadInfo-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text-threadInfo-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text-threadInfo.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text-threadInfo.png
index 6386faafb78..c17066e27fd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text-threadInfo.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text-threadInfo.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text.png
index 5c2b214c424..cd5b6de75da 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-reactions-text.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-text.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-text.png
index 03942b34845..654445c432a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-text.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-quotedMessage-text.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-reactions-text.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-reactions-text.png
index 2cd9342ac8c..dccd131e98e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-reactions-text.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-reactions-text.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-text.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-text.png
index 21c5f58631f..3f8667bcb46 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-text.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-continuousBubble-flipped-text.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-quotedMessage-reactions-text-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-quotedMessage-reactions-text-timestamp.png
index 4f67c6192b5..a8ea135fa45 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-quotedMessage-reactions-text-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-quotedMessage-reactions-text-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-quotedMessage-text-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-quotedMessage-text-timestamp.png
index 10165fd3ffe..d7bcaaedf5b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-quotedMessage-text-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-quotedMessage-text-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-reactions-text-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-reactions-text-timestamp.png
index e043da9b960..5071820d24b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-reactions-text-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-reactions-text-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-text-timestamp.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-text-timestamp.png
index ad885c80a5d..551042ef28f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-text-timestamp.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance.default-light-bubble-flipped-text-timestamp.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index ac34a4c5da8..347d0207d9d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index 68414a616df..5f5e456ca39 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index e75fc56e30b..6925157f042 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index e772311beb9..de12ae3788e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.default-light.png
index ac34a4c5da8..347d0207d9d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.extraExtraExtraLarge-light.png
index 68414a616df..5f5e456ca39 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.rightToLeftLayout-default.png
index e75fc56e30b..6925157f042 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.small-dark.png
index e772311beb9..de12ae3788e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceCustomization_usingUIConfig.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.default-light.png
index 7480b3f2d68..c4a08d9e5e6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.extraExtraExtraLarge-light.png
index 4b6817db5df..dfb6a33d1bb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.rightToLeftLayout-default.png
index 7480b3f2d68..c4a08d9e5e6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.small-dark.png
index ca484f7492d..9469e6448fa 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForErrorMessage.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.default-light.png
index 7480b3f2d68..c4a08d9e5e6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.extraExtraExtraLarge-light.png
index 4b6817db5df..dfb6a33d1bb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.rightToLeftLayout-default.png
index 7480b3f2d68..c4a08d9e5e6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.small-dark.png
index ca484f7492d..9469e6448fa 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearanceForSystemMessage.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsPendingSend.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsPendingSend.default-dark.png
index b4f2449a5de..dd99d0e4dd5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsPendingSend.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsPendingSend.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsPendingSend.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsPendingSend.default-light.png
index 0394fc62896..4c5641200f2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsPendingSend.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsPendingSend.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inDirectMesssagesChannel.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inDirectMesssagesChannel.default-dark.png
index 8a3545a3aa9..2926e922628 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inDirectMesssagesChannel.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inDirectMesssagesChannel.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inDirectMesssagesChannel.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inDirectMesssagesChannel.default-light.png
index b3a5e996827..c4b3fc1c3ff 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inDirectMesssagesChannel.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inDirectMesssagesChannel.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inGroupChannel.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inGroupChannel.default-dark.png
index 8cf59c81d15..145284a408a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inGroupChannel.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inGroupChannel.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inGroupChannel.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inGroupChannel.default-light.png
index 96708976753..58504e1d6f3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inGroupChannel.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsRead_inGroupChannel.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsSent.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsSent.default-dark.png
index 7e9ab8fe801..1fbf58a3c6f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsSent.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsSent.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsSent.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsSent.default-light.png
index 2e5f3c278b8..0caf074cb25 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsSent.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageFromTheCurrentUserIsSent.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLink.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLink.default-dark.png
index bad3cbfa31f..9db268473f3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLink.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLink.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLink.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLink.default-light.png
index 4719987f09d..d1faafe4292 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLink.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLink.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkAndMarkdown.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkAndMarkdown.default-light.png
index b5d0e885321..e6c7ea30017 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkAndMarkdown.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkAndMarkdown.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkAndMention.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkAndMention.default-light.png
index 6e10b0e9c9b..7259936c941 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkAndMention.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkAndMention.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutAuthor.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutAuthor.default-dark.png
index 4cfeb6b0208..f365a989f7a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutAuthor.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutAuthor.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutAuthor.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutAuthor.default-light.png
index bc694dad306..3302b0e1023 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutAuthor.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutAuthor.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImage.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImage.default-dark.png
index b29811a6514..95d22234885 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImage.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImage.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImage.default-light.png
index 93a58f0538e..941ae5b3373 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImageAndAuthor.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImageAndAuthor.default-dark.png
index 0674768262d..fd68ecc95b8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImageAndAuthor.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImageAndAuthor.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImageAndAuthor.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImageAndAuthor.default-light.png
index 9023e21c7f2..70d19dd0270 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImageAndAuthor.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasLinkWithoutImageAndAuthor.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenHasAttachment.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenHasAttachment.default-light.png
index b6ebc536cc0..f68a05237ab 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenHasAttachment.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenHasAttachment.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenIsSentByCurrentUser.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenIsSentByCurrentUser.default-dark.png
index b86cb87bc36..ea14e39d09a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenIsSentByCurrentUser.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenIsSentByCurrentUser.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenIsSentByCurrentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenIsSentByCurrentUser.default-light.png
index e4819495d50..575e4d45167 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenIsSentByCurrentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenIsSentByCurrentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotLastInGroup.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotLastInGroup.default-dark.png
index cd3a868546f..217a62fecb2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotLastInGroup.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotLastInGroup.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotLastInGroup.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotLastInGroup.default-light.png
index 1d495e63220..1b7ed3cd8b7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotLastInGroup.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotLastInGroup.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotSentByCurrentUser.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotSentByCurrentUser.default-dark.png
index 63d4c83d24e..6720d823189 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotSentByCurrentUser.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotSentByCurrentUser.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotSentByCurrentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotSentByCurrentUser.default-light.png
index d3fad68325c..feee3e0e059 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotSentByCurrentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageHasTranslation_whenNotSentByCurrentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsBounced.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsBounced.default-light.png
index 36a8015ce2e..c6158802e40 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsBounced.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsBounced.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.default-light.png
index 6f740450649..3189dad38ed 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.extraExtraExtraLarge-light.png
index dca48f0e489..c0d1ecb0485 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.rightToLeftLayout-default.png
index f92113666b0..1ab0122ceed 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.small-dark.png
index 4538b979abc..b1a69cac54e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited_andDeleted_shouldNotShowEditedLabel.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited_andDeleted_shouldNotShowEditedLabel.default-light.png
index 4fb7ca8456d..ce9d60784fb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited_andDeleted_shouldNotShowEditedLabel.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageIsEdited_andDeleted_shouldNotShowEditedLabel.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent.default-dark.png
index 2eee9d3497a..39fcf7d2916 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent.default-light.png
index 0c69be5c042..9e2141e1041 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenDuplicatedMentions.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenDuplicatedMentions.default-dark.png
index a987f540698..4803fdffe7b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenDuplicatedMentions.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenDuplicatedMentions.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenDuplicatedMentions.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenDuplicatedMentions.default-light.png
index 0e1033470ba..8aa81982906 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenDuplicatedMentions.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenDuplicatedMentions.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenNoName.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenNoName.default-dark.png
index 23156069eaf..150c185751f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenNoName.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenNoName.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenNoName.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenNoName.default-light.png
index b911f9fcc07..748cb24bae4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenNoName.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithAMentionedUserIsSent_whenNoName.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownFromTheCurrentUserIsSent.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownFromTheCurrentUserIsSent.default-dark.png
index 9d4f8c29e8e..cf237e03393 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownFromTheCurrentUserIsSent.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownFromTheCurrentUserIsSent.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownFromTheCurrentUserIsSent.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownFromTheCurrentUserIsSent.default-light.png
index 2ffffbdea4d..8fb44a4e5f4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownFromTheCurrentUserIsSent.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownFromTheCurrentUserIsSent.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownItalicStyleFromTheCurrentUserIsSent.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownItalicStyleFromTheCurrentUserIsSent.default-dark.png
index 0de18cbc8e4..ca068ed0120 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownItalicStyleFromTheCurrentUserIsSent.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownItalicStyleFromTheCurrentUserIsSent.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownItalicStyleFromTheCurrentUserIsSent.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownItalicStyleFromTheCurrentUserIsSent.default-light.png
index 0fd410ddb5d..47048407240 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownItalicStyleFromTheCurrentUserIsSent.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownItalicStyleFromTheCurrentUserIsSent.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownOrderedListFromTheCurrentUserIsSent.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownOrderedListFromTheCurrentUserIsSent.default-dark.png
index 6fbb648b60c..aa67f174414 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownOrderedListFromTheCurrentUserIsSent.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownOrderedListFromTheCurrentUserIsSent.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownOrderedListFromTheCurrentUserIsSent.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownOrderedListFromTheCurrentUserIsSent.default-light.png
index 3d6aa2e7415..93820f50a77 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownOrderedListFromTheCurrentUserIsSent.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithMarkdownOrderedListFromTheCurrentUserIsSent.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithoutMarkdownOrderedListFromTheCurrentUserIsSent.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithoutMarkdownOrderedListFromTheCurrentUserIsSent.default-dark.png
index bbc76001ccd..78315ec06ac 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithoutMarkdownOrderedListFromTheCurrentUserIsSent.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithoutMarkdownOrderedListFromTheCurrentUserIsSent.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithoutMarkdownOrderedListFromTheCurrentUserIsSent.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithoutMarkdownOrderedListFromTheCurrentUserIsSent.default-light.png
index ffa7b05c126..061fa57cff5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithoutMarkdownOrderedListFromTheCurrentUserIsSent.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenMessageWithoutMarkdownOrderedListFromTheCurrentUserIsSent.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenQuoteMessageHasTranslation.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenQuoteMessageHasTranslation.default-light.png
index 08498d3db5f..4277806648f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenQuoteMessageHasTranslation.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageContentView_Tests/test_appearance_whenQuoteMessageHasTranslation.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageDeliveryStatusView_Tests/test_appearance_whenMessageIsReadInGroupChannel.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageDeliveryStatusView_Tests/test_appearance_whenMessageIsReadInGroupChannel.default-dark.png
index eb6200024dd..b44678097e1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageDeliveryStatusView_Tests/test_appearance_whenMessageIsReadInGroupChannel.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/ChatMessage/__Snapshots__/ChatMessageDeliveryStatusView_Tests/test_appearance_whenMessageIsReadInGroupChannel.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.default-light.png
index e72d12bdb12..60cb3fa5344 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.extraExtraExtraLarge-light.png
index 5f347560985..dbed00603dd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.rightToLeftLayout-default.png
index 4f7b40e015d..4b0166f4a3b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.small-dark.png
index 2f1e2eed5d7..4b601de09a4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.default-light.png
index 373d1a97915..183fb8c059f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.extraExtraExtraLarge-light.png
index 441f1299a1d..4b1560238db 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.rightToLeftLayout-default.png
index f92a158a74e..a9c6ea6df8a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.small-dark.png
index dd00de8f3f2..9e2ec639837 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAllOptionsListVC_Tests/test_appearance_whenIsClosed.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.default-light.png
index 4fde9462273..a42c9c3de25 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.extraExtraExtraLarge-light.png
index 537403ea17c..8d9487c788e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.rightToLeftLayout-default.png
index 617fc48a137..4679220708e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.small-dark.png
index c3ada25035e..32f8b7626b5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenAnonymous.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenAnonymous.default-light.png
index 6a47b10de71..450be0a0e69 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenAnonymous.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenAnonymous.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenClosed.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenClosed.default-dark.png
index ec15150c34c..6940680efa8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenClosed.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenClosed.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenClosed.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenClosed.default-light.png
index 0e178150fa1..f74f020e28e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenClosed.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenClosed.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenOptionsMoreThanMaxVisibleOptions.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenOptionsMoreThanMaxVisibleOptions.default-light.png
index 319d65327a7..b218b1ae918 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenOptionsMoreThanMaxVisibleOptions.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenOptionsMoreThanMaxVisibleOptions.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenSuggestionsEnabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenSuggestionsEnabled.default-light.png
index 342bdf7d717..139df7888d2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenSuggestionsEnabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_whenSuggestionsEnabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments.default-dark.png
index 7420e4dfd7e..ba8fa6aae52 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments.default-light.png
index 19a4cfde0dd..966160e41fb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments_whenCurrentUserAlreadyComment.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments_whenCurrentUserAlreadyComment.default-light.png
index 62e72519307..32a176ca54e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments_whenCurrentUserAlreadyComment.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withComments_whenCurrentUserAlreadyComment.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withZeroComments.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withZeroComments.default-light.png
index 344da9325c2..a4c390d7bbb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withZeroComments.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollAttachmentView_Tests/test_appearance_withZeroComments.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.default-light.png
index 049d09b5f6f..a4e10b2b543 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.extraExtraExtraLarge-light.png
index 52bc4e8ac6d..03fede50b8e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.rightToLeftLayout-default.png
index 049d09b5f6f..a4e10b2b543 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.small-dark.png
index 09c163947d9..fd41d64812c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.default-light.png
index 2f2fd13016c..ddc72191d05 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.extraExtraExtraLarge-light.png
index 92491d847b7..9815e971122 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.rightToLeftLayout-default.png
index 2f2fd13016c..ddc72191d05 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.small-dark.png
index 22a80d5a920..929839de99f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCommentListVC_Tests/test_appearance_whenAlreadyCommented.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.default-light.png
index a62ee1b77a5..c836cf3fa7c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.extraExtraExtraLarge-light.png
index 7039cc4ef86..8a3893b2a53 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.rightToLeftLayout-default.png
index 41b5c767acd..9e9bf009195 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.small-dark.png
index 21b22151818..f711b7f836f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenCanCreatePoll.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenCanCreatePoll.default-dark.png
index 45ec0c0e24a..75a4633a702 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenCanCreatePoll.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenCanCreatePoll.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenCanCreatePoll.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenCanCreatePoll.default-light.png
index da93d8a41d6..15aa32351f2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenCanCreatePoll.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenCanCreatePoll.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesEnabledByDefault.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesEnabledByDefault.default-dark.png
index 7e4b4dcfccd..be979bf49ba 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesEnabledByDefault.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesEnabledByDefault.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesEnabledByDefault.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesEnabledByDefault.default-light.png
index 950ea21c4e9..8823340ecf9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesEnabledByDefault.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesEnabledByDefault.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesNotSupported.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesNotSupported.default-dark.png
index f6bbab40806..f0782e34fe3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesNotSupported.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesNotSupported.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesNotSupported.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesNotSupported.default-light.png
index 0dba96121cb..284ba8e571c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesNotSupported.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenFeaturesNotSupported.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenMaxVotesOnlyDisabled.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenMaxVotesOnlyDisabled.default-dark.png
index 2920fba6c4f..a61efc1a155 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenMaxVotesOnlyDisabled.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenMaxVotesOnlyDisabled.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenMaxVotesOnlyDisabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenMaxVotesOnlyDisabled.default-light.png
index 8d0c02ea7b6..338d6c3d519 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenMaxVotesOnlyDisabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_whenMaxVotesOnlyDisabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.default-light.png
index 786a164cd57..b92915b4fae 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.extraExtraExtraLarge-light.png
index bef8ebce5de..5bf1a2f7141 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.rightToLeftLayout-default.png
index b0573b30e26..e1996a0dc6e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.small-dark.png
index ed118cc76fc..813249a642e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollCreationVC_Tests/test_appearance_withErrors.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.default-light.png
index 0740749a384..99b0bfe837e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.extraExtraExtraLarge-light.png
index 4ffa4140618..2f91c63d705 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.rightToLeftLayout-default.png
index 0740749a384..99b0bfe837e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.small-dark.png
index 82c87b86908..b4c5bfb0c79 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenAnonymous.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenAnonymous.default-light.png
index e3218163ec4..94a4da7c60d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenAnonymous.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenAnonymous.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenClosed.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenClosed.default-dark.png
index 7dbc2a3e798..1ab9884219e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenClosed.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenClosed.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenClosed.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenClosed.default-light.png
index d422948869e..26ffa75b63e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenClosed.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenClosed.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenVotesMoreThanLimit.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenVotesMoreThanLimit.default-dark.png
index aae77ce7f61..235a62c0dea 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenVotesMoreThanLimit.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenVotesMoreThanLimit.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenVotesMoreThanLimit.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenVotesMoreThanLimit.default-light.png
index d1d1c04758d..655cb4233cc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenVotesMoreThanLimit.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVC_Tests/test_appearance_whenVotesMoreThanLimit.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.default-light.png
index 5e70e6af79e..adf2924d49a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.extraExtraExtraLarge-light.png
index d7420816e06..e1ddaac2150 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.rightToLeftLayout-default.png
index 5e70e6af79e..adf2924d49a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.small-dark.png
index 79db1e95baa..2f80b0900e3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Poll/__Snapshots__/PollResultsVoteListVC_Tests/test_appearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_customAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_customAppearance.default-dark.png
index 7371ee6e336..6dcab3adc27 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_customAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_customAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_customAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_customAppearance.default-light.png
index ce0c481476b..883b4bb1968 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_customAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_customAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.default-light.png
index fb71bf0705e..38da1956c47 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index bdbc33585e0..3b4968c4480 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index fb71bf0705e..38da1956c47 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.small-dark.png
index 7be675e5a22..1ba816e0a64 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance_shouldNotRenderUnavailableReactions.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance_shouldNotRenderUnavailableReactions.default-light.png
index 0978be01674..1a2b9d93d6b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance_shouldNotRenderUnavailableReactions.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance_shouldNotRenderUnavailableReactions.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance_whenOnlyOneReaction_shouldUseSingularLocalization.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance_whenOnlyOneReaction_shouldUseSingularLocalization.default-light.png
index 0978be01674..1a2b9d93d6b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance_whenOnlyOneReaction_shouldUseSingularLocalization.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/Reactions/ChatMessageReactionAuthorsVC/__Snapshots__/ChatMessageReactionAuthorsVC_Tests/test_defaultAppearance_whenOnlyOneReaction_shouldUseSingularLocalization.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_hundredMessages.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_hundredMessages.default-dark.png
index 2467c56daf5..4709d74bef8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_hundredMessages.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_hundredMessages.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_hundredMessages.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_hundredMessages.default-light.png
index 2467c56daf5..4709d74bef8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_hundredMessages.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_hundredMessages.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_zeroMessages.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_zeroMessages.default-dark.png
index f7ef54aff9e..8ded963342a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_zeroMessages.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_zeroMessages.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_zeroMessages.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_zeroMessages.default-light.png
index f7ef54aff9e..8ded963342a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_zeroMessages.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/JumpToUnreadMessagesButton_Tests/test_jumpToUnreadMessages_zeroMessages.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index fabbe1dcd2b..e741aa6adc8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png
index fabbe1dcd2b..e741aa6adc8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png
index 858fabb81e6..9ebe401937f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png
index 56f4e50da3d..0dd14a0cd2c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 7c38e8c8932..cbfbb4bffa8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index 7c38e8c8932..cbfbb4bffa8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index 4d3951cf735..dffcae8568a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index 8f699a1025f..c3c7f489a19 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.default-light.png
index bb86e47532d..a23868bc9b4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index bb86e47532d..a23868bc9b4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 03b54fd8f04..22cf19f41b2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.small-dark.png
index a2c7127ea49..e90617a8588 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatMessageList/__Snapshots__/TypingIndicatorView_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_chatThreadVC_isPopulated.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_chatThreadVC_isPopulated.default-light.png
index 495ede732c4..2f42401fa6c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_chatThreadVC_isPopulated.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_chatThreadVC_isPopulated.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png
index 5b5ba2cbbd4..8bc6afa901b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png
index cdfd2c43c6f..432fd07c7f9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png
index ddd55393cd4..35e5a3b34f3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png
index daea64d04c5..ef9e6ed8e7d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC+SwiftUI_Tests/test_customNavigationViewValues_arePopulated.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_defaultAppearance.default-light.png
index c8020b9eb95..a0e311ba3e8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_emptyAppearance.default-light.png
index 9b80eb38acc..ed83cae5183 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_whenShouldMessagesStartAtTheTopIsTrue.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_whenShouldMessagesStartAtTheTopIsTrue.small-dark.png
index 8e5299ecb05..beb11b3b16b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_whenShouldMessagesStartAtTheTopIsTrue.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_whenShouldMessagesStartAtTheTopIsTrue.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_whenThreadRendersParentMessageEnabledIsFalse.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_whenThreadRendersParentMessageEnabledIsFalse.default-light.png
index 166b474f1f6..f6fbd6bf597 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_whenThreadRendersParentMessageEnabledIsFalse.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThread/__Snapshots__/ChatThreadVC_Tests/test_whenThreadRendersParentMessageEnabledIsFalse.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.default-light.png
index fd57802221a..fbd21ed27b9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index baa571ef5d5..fad16940c62 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 80de845e8b3..f3b7dc3b7a4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.small-dark.png
index bf18e12f2c0..ef1c623c3b3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_whenAttachments.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_whenAttachments.default-light.png
index d71b5c0c43e..08b1d7c2cd6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_whenAttachments.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_whenAttachments.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withLastReplyDeleted.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withLastReplyDeleted.default-light.png
index 72b2bc810a2..1d2a5e0ade3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withLastReplyDeleted.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withLastReplyDeleted.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withParentMessageDeleted.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withParentMessageDeleted.default-light.png
index 7008f11a24c..8cf64d1d65c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withParentMessageDeleted.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withParentMessageDeleted.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withThreadTitle.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withThreadTitle.default-light.png
index ce3be461bd8..d58ccdc3de6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withThreadTitle.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withThreadTitle.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.default-light.png
index b463299c207..b4e82b21af5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.extraExtraExtraLarge-light.png
index 9dd14085252..ca82a55bd06 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.rightToLeftLayout-default.png
index 78011859c60..b82ca1f271a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.small-dark.png
index 3879fb7fc99..89613ac8a76 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_defaultAppearance_withUnreads.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.default-light.png
index b58be9c0a6d..f6eef71a729 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index 57c1526ae3d..2b258eaff52 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 70742298ea5..2221b593886 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.small-dark.png
index e5d214c78ce..84a42647451 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnErrorView_whenThreadsNotEmpty_shouldShowLoadingHeaderBannerView.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnErrorView_whenThreadsNotEmpty_shouldShowLoadingHeaderBannerView.default-dark.png
index 5a11877e422..3831ee49f0f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnErrorView_whenThreadsNotEmpty_shouldShowLoadingHeaderBannerView.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnErrorView_whenThreadsNotEmpty_shouldShowLoadingHeaderBannerView.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnErrorView_whenThreadsNotEmpty_shouldShowLoadingHeaderBannerView.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnErrorView_whenThreadsNotEmpty_shouldShowLoadingHeaderBannerView.default-light.png
index 95bcb937ad1..201c9ca798f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnErrorView_whenThreadsNotEmpty_shouldShowLoadingHeaderBannerView.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnErrorView_whenThreadsNotEmpty_shouldShowLoadingHeaderBannerView.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnHeaderBannerView_shouldShowLoadingHeaderBannerView.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnHeaderBannerView_shouldShowLoadingHeaderBannerView.default-dark.png
index 5a11877e422..3831ee49f0f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnHeaderBannerView_shouldShowLoadingHeaderBannerView.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnHeaderBannerView_shouldShowLoadingHeaderBannerView.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnHeaderBannerView_shouldShowLoadingHeaderBannerView.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnHeaderBannerView_shouldShowLoadingHeaderBannerView.default-light.png
index 95bcb937ad1..201c9ca798f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnHeaderBannerView_shouldShowLoadingHeaderBannerView.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_didTapOnHeaderBannerView_shouldShowLoadingHeaderBannerView.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.default-light.png
index dc3e4f474fa..558d18455ff 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png
index dc3e4f474fa..558d18455ff 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png
index 680d24aef5d..970a6a21b6c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.small-dark.png
index d98e1cc2eed..15f1b697f7a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_emptyAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.default-light.png
index d19673b2562..af06bade80b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.extraExtraExtraLarge-light.png
index d19673b2562..af06bade80b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.rightToLeftLayout-default.png
index e11c39fe186..c85edc06be2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.small-dark.png
index 295f5ac8b93..1fb03eb6713 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_errorAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.default-light.png
index 83659450748..cebf12a7240 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.extraExtraExtraLarge-light.png
index eacd9a3260a..4d6b94bd990 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.rightToLeftLayout-default.png
index 913967199d7..b0b7af96709 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.small-dark.png
index 742e728665a..2c30bb9e832 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/ChatThreadList/__Snapshots__/ChatThreadListVC_Tests/test_newThreadsAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.default-light.png
index 3e847ce13de..c035e8d75df 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.extraExtraExtraLarge-light.png
index c997786a6dc..57a9ddc9dfa 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.rightToLeftLayout-default.png
index 75e4e3e8ede..bf32ccf7415 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.small-dark.png
index f4092317c31..062898bc420 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/AttachmentViews/__Snapshots__/VoiceRecordingAttachmentComposerPreview_Tests/test_appearance_wasConfiguredAsExpected.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.default-light.png
index 5a9f03d72c6..35add946fa5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.extraExtraExtraLarge-light.png
index 06406cab10b..8dfdd529b0d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.rightToLeftLayout-default.png
index 54bcae14cb8..509214a8cee 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.small-dark.png
index f118f878e31..8500e053dff 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasLessItemsThanMaxNumberOfVerticalItems_rendersCorrectly.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.default-light.png
index 39c1dcf0d7c..b2b1f097f33 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.extraExtraExtraLarge-light.png
index 3ca2442118f..8830428059c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.rightToLeftLayout-default.png
index 62c77f06a8c..2c9417c90ee 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.small-dark.png
index cf5dc0d81ab..2e9f7d22f9d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Attachments/__Snapshots__/AttachmentsPreviewVC_Tests/test_appearance_contentHasMoreItemsThanMaxNumberOfVerticalItems_rendersCorrectly.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-dark.png
index a49a3882307..a518b5ff2fd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-light.png
index 5da2a5c722e..2686eba2e7e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png
index da6cb687724..37eed66ac01 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index da6cb687724..37eed66ac01 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithFourMembersInNonDMChannel.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithFourMembersInNonDMChannel.default-dark.png
index 7224e691327..8c7c8d8991c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithFourMembersInNonDMChannel.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithFourMembersInNonDMChannel.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithFourMembersInNonDMChannel.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithFourMembersInNonDMChannel.default-light.png
index 7224e691327..8c7c8d8991c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithFourMembersInNonDMChannel.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithFourMembersInNonDMChannel.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithNoMembersInChannel.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithNoMembersInChannel.default-dark.png
index 262be0b32d2..7b11cef7038 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithNoMembersInChannel.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithNoMembersInChannel.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithNoMembersInChannel.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithNoMembersInChannel.default-light.png
index 262be0b32d2..7b11cef7038 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithNoMembersInChannel.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithNoMembersInChannel.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithSingleMemberInNonDMChannel.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithSingleMemberInNonDMChannel.default-dark.png
index 8ae13f4a499..4caa00afbd1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithSingleMemberInNonDMChannel.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithSingleMemberInNonDMChannel.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithSingleMemberInNonDMChannel.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithSingleMemberInNonDMChannel.default-light.png
index 8ae13f4a499..4caa00afbd1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithSingleMemberInNonDMChannel.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithSingleMemberInNonDMChannel.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithThreeMembersInNonDMChannel.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithThreeMembersInNonDMChannel.default-dark.png
index 2febb10f3a9..8901af46a85 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithThreeMembersInNonDMChannel.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithThreeMembersInNonDMChannel.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithThreeMembersInNonDMChannel.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithThreeMembersInNonDMChannel.default-light.png
index 2febb10f3a9..8901af46a85 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithThreeMembersInNonDMChannel.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithThreeMembersInNonDMChannel.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithTwoMembersInNonDMChannel.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithTwoMembersInNonDMChannel.default-dark.png
index 381fe68d455..c2253ec610c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithTwoMembersInNonDMChannel.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithTwoMembersInNonDMChannel.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithTwoMembersInNonDMChannel.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithTwoMembersInNonDMChannel.default-light.png
index 381fe68d455..c2253ec610c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithTwoMembersInNonDMChannel.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearanceWithTwoMembersInNonDMChannel.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-dark-with-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-dark-with-online-indicator.png
index 02eb67acf4f..a1b74aa99f2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-dark-with-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-dark-with-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-dark.png
index 232eb338353..e194b0c6d4f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-light-with-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-light-with-online-indicator.png
index 02eb67acf4f..a1b74aa99f2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-light-with-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-light-with-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-light.png
index 232eb338353..e194b0c6d4f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel_whenMultipleMembers.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel_whenMultipleMembers.default-dark.png
index 922192f7bd8..63b6b8f1bc5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel_whenMultipleMembers.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel_whenMultipleMembers.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel_whenMultipleMembers.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel_whenMultipleMembers.default-light.png
index 922192f7bd8..63b6b8f1bc5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel_whenMultipleMembers.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_defaultAppearance_withDirectMessageChannel_whenMultipleMembers.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_emptyAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_emptyAppearance.default-dark.png
index 0799d81e8bb..13188051bc2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_emptyAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_emptyAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_emptyAppearance.default-light.png
index 0799d81e8bb..13188051bc2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_wrappedChatChannelAvatarViewInSwiftUI.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_wrappedChatChannelAvatarViewInSwiftUI.default-dark.png
index 97cde017b3a..a0555661832 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_wrappedChatChannelAvatarViewInSwiftUI.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_wrappedChatChannelAvatarViewInSwiftUI.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_wrappedChatChannelAvatarViewInSwiftUI.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_wrappedChatChannelAvatarViewInSwiftUI.default-light.png
index 90d8c00930b..b47aaa2d751 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_wrappedChatChannelAvatarViewInSwiftUI.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatChannelAvatarView_Tests/test_wrappedChatChannelAvatarViewInSwiftUI.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-dark.png
index a49a3882307..a518b5ff2fd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-light.png
index 5da2a5c722e..2686eba2e7e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingAppearanceAndComponents.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png
index da6cb687724..37eed66ac01 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index da6cb687724..37eed66ac01 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearance_whenOnlineIndicatorDisabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearance_whenOnlineIndicatorDisabled.default-light.png
index 232eb338353..e194b0c6d4f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearance_whenOnlineIndicatorDisabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_appearance_whenOnlineIndicatorDisabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-dark-with-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-dark-with-online-indicator.png
index 02eb67acf4f..a1b74aa99f2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-dark-with-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-dark-with-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-dark-without-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-dark-without-online-indicator.png
index 232eb338353..e194b0c6d4f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-dark-without-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-dark-without-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-light-with-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-light-with-online-indicator.png
index 02eb67acf4f..a1b74aa99f2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-light-with-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-light-with-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-light-without-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-light-without-online-indicator.png
index 232eb338353..e194b0c6d4f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-light-without-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_defaultAppearance.default-light-without-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_emptyAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_emptyAppearance.default-dark.png
index e79ab938f41..c72a80a0e71 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_emptyAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_emptyAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_emptyAppearance.default-light.png
index e79ab938f41..c72a80a0e71 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/ChatUserAvatarView_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-dark-empty.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-dark-empty.png
index 6f300b39b18..d2dc9eb3bb9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-dark-empty.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-dark-empty.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-dark.png
index 0b380feab94..af2b472edeb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-light-empty.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-light-empty.png
index 6f300b39b18..d2dc9eb3bb9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-light-empty.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-light-empty.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-light.png
index 0b380feab94..af2b472edeb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_customizationUsingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_defaultAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_defaultAppearance.default-dark.png
index 4018b963cf4..b5694a88e3e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_defaultAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_defaultAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_defaultAppearance.default-light.png
index 5ef82c3c8a7..cf863bd4965 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_emptyAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_emptyAppearance.default-dark.png
index 0905d883617..94ad69df79a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_emptyAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_emptyAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_emptyAppearance.default-light.png
index 0905d883617..94ad69df79a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/AvatarView/__Snapshots__/CurrentChatUserAvatarView_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.default-light.png
index 3a6fb0ec1f8..2ad0cc5e2b8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.extraExtraExtraLarge-light.png
index 5f766267700..b57696b8a58 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.rightToLeftLayout-default.png
index 3a6fb0ec1f8..2ad0cc5e2b8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.small-dark.png
index 97646057f39..0322090eab4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/ChatChannelHeaderView/__Snapshots__/ChatChannelHeaderView_Tests/test_channelNameSet.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.default-light.png
index c64219148b7..a691356f170 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index 54fd4b54590..fae61314618 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 94fbdcaf406..ecef6d31673 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.small-dark.png
index 658160d91e6..5460d7576c3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.default-light.png
index cd27e02aaf4..56c21f452b2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.extraExtraExtraLarge-light.png
index 764ad496991..9861d6c6bc6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.rightToLeftLayout-default.png
index 6084d78c413..0686bc8a8cf 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.small-dark.png
index 251e04e730d..259ac5e2ec7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_defaultAppearance_SwiftUI.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.default-light.png
index b4597af5221..7d3cb34f32b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png
index b4597af5221..7d3cb34f32b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.rightToLeftLayout-default.png
index fec8613ffb1..ca84913ead0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.small-dark.png
index b4597af5221..7d3cb34f32b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/CommandLabelView/__Snapshots__/CommandLabelView_Tests/test_emptyAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-bigger.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-bigger.png
index 87439c69cad..eb214eafdf8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-bigger.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-bigger.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-isHighlighted.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-isHighlighted.png
index 653c7573a4b..5ad606dc776 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-isHighlighted.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-isHighlighted.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light.png
index 98fdcf5f76b..e8e1ea6c766 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-bigger.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-bigger.png
index 87439c69cad..eb214eafdf8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-bigger.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-bigger.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-isHighlighted.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-isHighlighted.png
index 653c7573a4b..5ad606dc776 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-isHighlighted.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-isHighlighted.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light.png
index 98fdcf5f76b..e8e1ea6c766 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-bigger.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-bigger.png
index 87439c69cad..eb214eafdf8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-bigger.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-bigger.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-isHighlighted.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-isHighlighted.png
index 653c7573a4b..5ad606dc776 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-isHighlighted.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-isHighlighted.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default.png
index 98fdcf5f76b..e8e1ea6c766 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-bigger.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-bigger.png
index 87439c69cad..eb214eafdf8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-bigger.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-bigger.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-isHighlighted.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-isHighlighted.png
index 31d2a56938e..66380072364 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-isHighlighted.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-isHighlighted.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark.png
index 98fdcf5f76b..e8e1ea6c766 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/PlayPauseButton/__Snapshots__/PlayPauseButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png
index 00ec0d43141..c8d783a1b86 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView+SwiftUI_Tests/test_injectedSwiftUIView.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_appearanceCustomization_usingComponents.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_appearanceCustomization_usingComponents.default-light.png
index 72b164fa9bb..7de96f573fd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_appearanceCustomization_usingComponents.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_appearanceCustomization_usingComponents.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index ae9d2e527a6..8b7bf6645bc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.default-light.png
index a027108f341..df91954a2f9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index aaedf8c66d1..23e51fdb6b1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 24bee8b7633..53f9d201a12 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.small-dark.png
index d06e80c243a..ae113a79b06 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_emptyAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_emptyAppearance.default-dark.png
index 4f94d41e6e5..90fe15e7358 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_emptyAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_emptyAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_emptyAppearance.default-light.png
index 4a87c708e63..acb0a12aa15 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.default-light.png
index a027108f341..df91954a2f9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.extraExtraExtraLarge-light.png
index aaedf8c66d1..23e51fdb6b1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.rightToLeftLayout-default.png
index 24bee8b7633..53f9d201a12 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.small-dark.png
index d06e80c243a..ae113a79b06 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentLeftAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.default-light.png
index 24bee8b7633..53f9d201a12 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.extraExtraExtraLarge-light.png
index 597d072740d..663a0651696 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.rightToLeftLayout-default.png
index a027108f341..df91954a2f9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.small-dark.png
index 3d232b6689d..c7e2375ef13 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withAvatarAlignmentRightAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.default-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.default-light-emptyText.png
index b7419dea8f1..987dafcbe60 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.default-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.default-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.default-light.png
index 12183aef2b5..66d88bcc805 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png
index d4490439433..7847b9f6341 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.extraExtraExtraLarge-light.png
index b401d6a3583..d154ae2c94d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.rightToLeftLayout-default-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.rightToLeftLayout-default-emptyText.png
index da9608591de..d236ead5517 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.rightToLeftLayout-default-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.rightToLeftLayout-default-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.rightToLeftLayout-default.png
index 1a2c2458577..67cf1d4e93b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.small-dark-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.small-dark-emptyText.png
index 95bd48b7d24..4df1e71be83 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.small-dark-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.small-dark-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.small-dark.png
index 2269a7d3dc1..30b15fd521b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.default-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.default-light-emptyText.png
index 7388e909889..1a41a6c0385 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.default-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.default-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.default-light.png
index c7a3076ff26..4675f8e2dbf 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.extraExtraExtraLarge-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.extraExtraExtraLarge-light-emptyText.png
index c957a4e946b..f3c6b3270e5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.extraExtraExtraLarge-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.extraExtraExtraLarge-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png
index 373ebac2e1a..cd43d8c66b3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.rightToLeftLayout-default-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.rightToLeftLayout-default-emptyText.png
index edbe511957a..9546973846a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.rightToLeftLayout-default-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.rightToLeftLayout-default-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.rightToLeftLayout-default.png
index dc38ea76290..bcb8a628532 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.small-dark-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.small-dark-emptyText.png
index d3f23b75751..eec1470572c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.small-dark-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.small-dark-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.small-dark.png
index 2fdf9b1b9f8..e09f2e252dd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withFileAttachmentAppearance_currentUser.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.default-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.default-light-emptyText.png
index 6f2d0032fe1..d0f10227f29 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.default-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.default-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.default-light.png
index 452af4985a4..2f63426a535 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png
index 9cfa6265287..db7a225bfe3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.extraExtraExtraLarge-light.png
index bbc61d5a66e..bb380c5529b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.rightToLeftLayout-default-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.rightToLeftLayout-default-emptyText.png
index 047b15cc514..d71c6fd0331 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.rightToLeftLayout-default-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.rightToLeftLayout-default-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.rightToLeftLayout-default.png
index 39a6e799895..d2a2b0a0f5a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.small-dark-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.small-dark-emptyText.png
index 2684daa2014..5e12b91fc03 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.small-dark-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.small-dark-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.small-dark.png
index bf9a737802a..b4c4e93431e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withGiphyAttachmentAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.default-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.default-light-emptyText.png
index dfbfc54a074..ec870d593e3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.default-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.default-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.default-light.png
index 452af4985a4..2f63426a535 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png
index ffd107cc9b9..6835b0833bd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.extraExtraExtraLarge-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.extraExtraExtraLarge-light.png
index bbc61d5a66e..bb380c5529b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.rightToLeftLayout-default-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.rightToLeftLayout-default-emptyText.png
index a43414d75ad..c9622bc42f8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.rightToLeftLayout-default-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.rightToLeftLayout-default-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.rightToLeftLayout-default.png
index 39a6e799895..d2a2b0a0f5a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.small-dark-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.small-dark-emptyText.png
index 73c729f69d8..5ab2dede4cc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.small-dark-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.small-dark-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.small-dark.png
index bf9a737802a..b4c4e93431e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.default-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.default-light-emptyText.png
index de6135f324c..ff87786f6d5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.default-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.default-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.default-light.png
index e9250f8ef58..362076fe7da 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.extraExtraExtraLarge-light-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.extraExtraExtraLarge-light-emptyText.png
index f09677c69df..78a8dc8838b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.extraExtraExtraLarge-light-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.extraExtraExtraLarge-light-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png
index 6a19b543bfa..4e9c19c1ff1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.rightToLeftLayout-default-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.rightToLeftLayout-default-emptyText.png
index 1fec2fc0680..f8d960ee58c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.rightToLeftLayout-default-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.rightToLeftLayout-default-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.rightToLeftLayout-default.png
index 809b3b14cf0..3dd843745cc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.small-dark-emptyText.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.small-dark-emptyText.png
index e4bb6e5a0df..d019f86e786 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.small-dark-emptyText.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.small-dark-emptyText.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.small-dark.png
index 1176c883061..2a03bad1943 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withImageAttachmentAppearance_currentUser.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.default-light.png
index fbf0cfe1883..d324512f05a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.extraExtraExtraLarge-light.png
index 57a6236e7a9..d76b36d8cf9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.rightToLeftLayout-default.png
index dc23765a79d..2f51497f963 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.small-dark.png
index a9d13d4187a..5b4eaf809d1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.default-light.png
index 74361383164..5a1e0cd97f0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png
index a82ea491021..fa1e390e317 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.rightToLeftLayout-default.png
index 15264f9c5f4..1606c4fa6b9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.small-dark.png
index 5180a856549..5d3a2060902 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLinkAttachmentAppearance_currentUser.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.default-light.png
index e677d618893..c247ae5f4c7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.extraExtraExtraLarge-light.png
index 134d145a9b5..f37b7b29617 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.rightToLeftLayout-default.png
index 2b753d9fe0d..53ae70c6514 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.small-dark.png
index 83e63099b49..c3f1927086c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withLongTextAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withPoll.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withPoll.default-light.png
index 7ccbc30c50e..44111279948 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withPoll.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withPoll.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withTranslatedText.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withTranslatedText.default-light.png
index 47b2776a83c..688ccc47a9f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withTranslatedText.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withTranslatedText.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withTranslatedText_whenHasAttachments.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withTranslatedText_whenHasAttachments.default-light.png
index 37e80a20b31..33ea1542137 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withTranslatedText_whenHasAttachments.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withTranslatedText_whenHasAttachments.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.default-light.png
index 8abe278f1e5..3dedc0d47b8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.extraExtraExtraLarge-light.png
index ce041dfd18e..8135e33cbee 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.rightToLeftLayout-default.png
index 34a797f2ae6..db52279c377 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.small-dark.png
index b667ea7743c..2c2e0e2d929 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment_whenEmptyText.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment_whenEmptyText.default-light.png
index a4a6b8e7ec9..6deafdb8e9d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment_whenEmptyText.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withUnsupportedAttachment_whenEmptyText.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.default-light.png
index 940e6307adf..3638ed7c94c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.extraExtraExtraLarge-light.png
index 3a8713d2725..eac62d162ae 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.rightToLeftLayout-default.png
index 2f48375f581..705b48e3b51 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.small-dark.png
index 02f92e698f1..d8f0497f882 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_withVoiceRecordingAttachmentAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_wrappedInSwiftUI.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_wrappedInSwiftUI.default-light.png
index 8f991a900bc..2811b1f5e9f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_wrappedInSwiftUI.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/QuotedChatMessageView/__Snapshots__/QuotedChatMessageView_Tests/test_wrappedInSwiftUI.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/SendButton/__Snapshots__/SendButton_Tests/test_appearanceCustomization_usingAppearance.default-dark-new-disabled.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/SendButton/__Snapshots__/SendButton_Tests/test_appearanceCustomization_usingAppearance.default-dark-new-disabled.png
index 3104694703a..e9b9a34ec46 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/SendButton/__Snapshots__/SendButton_Tests/test_appearanceCustomization_usingAppearance.default-dark-new-disabled.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/SendButton/__Snapshots__/SendButton_Tests/test_appearanceCustomization_usingAppearance.default-dark-new-disabled.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/SendButton/__Snapshots__/SendButton_Tests/test_defaultAppearance.default-dark-new-disabled.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/SendButton/__Snapshots__/SendButton_Tests/test_defaultAppearance.default-dark-new-disabled.png
index 4a494933cb6..fc8e34c4a6b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/SendButton/__Snapshots__/SendButton_Tests/test_defaultAppearance.default-dark-new-disabled.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/SendButton/__Snapshots__/SendButton_Tests/test_defaultAppearance.default-dark-new-disabled.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index d0fc62dfd23..3c61b7cc7ac 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 032496cbd4e..cc46e0b6c53 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.default-light.png
index 22930fa03db..fcf97c36db9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index a7b5e561c7b..2f460bef2fd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index e3dc9b19cc7..d12a3f02f11 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.small-dark.png
index 5e5db62accb..ec82bd2919d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatCommandSuggestionView/__Snapshots__/ChatCommandSuggestionView_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light-online-indicator-visible.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light-online-indicator-visible.png
index 66cd9c2b971..86e5c230a95 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light-online-indicator-visible.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light-online-indicator-visible.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light-user-name-not-set.png
index 0607624eee5..c25ba5cebe9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light.png
index f52365a955f..81c3085f45e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light-online-indicator-visible.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light-online-indicator-visible.png
index f6dc6e536e7..04f9fd89ed9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light-online-indicator-visible.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light-online-indicator-visible.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light-user-name-not-set.png
index 82da88c4871..216b72a9394 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light.png
index 5f44e1cb02f..5d6052e350d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default-online-indicator-visible.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default-online-indicator-visible.png
index 87c1aa81eb4..f1828829567 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default-online-indicator-visible.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default-online-indicator-visible.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default-user-name-not-set.png
index 47b718fec3e..ad4371c0dc4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default.png
index 636417dddf5..b86ea05588f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark-online-indicator-visible.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark-online-indicator-visible.png
index 5a4affbe9e2..4f95cf26628 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark-online-indicator-visible.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark-online-indicator-visible.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark-user-name-not-set.png
index a780c265731..89b8145effe 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark.png
index 1d3231134b1..6feaa2870b4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingComponents.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light-user-name-not-set.png
index 75a751d6c43..8025f2d8729 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light-with-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light-with-online-indicator.png
index c23819cf944..4934d9d5f32 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light-with-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light-with-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 92772e381f0..90b199cd8ad 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light-user-name-not-set.png
index 7283a12e359..352555a1dbc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light-with-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light-with-online-indicator.png
index cc4e5944bfa..032c60c43ae 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light-with-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light-with-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index f9d35e2fd2e..79621150447 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default-user-name-not-set.png
index 2ef900ffc60..86b5c5b9ef6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default-with-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default-with-online-indicator.png
index 178562bf675..4ebc7c56d90 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default-with-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default-with-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index 6f06c56a4fa..40b2dc98dea 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark-user-name-not-set.png
index 6f7d2b967d4..14738caa8a9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark-with-online-indicator.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark-with-online-indicator.png
index a15a6a571d5..0cc9b916023 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark-with-online-indicator.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark-with-online-indicator.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index 9b23a786a91..37cf00c632c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light-online-indicator-visible.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light-online-indicator-visible.png
index ab9f381ec8e..63fddf862d9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light-online-indicator-visible.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light-online-indicator-visible.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light-user-name-not-set.png
index bbd380ba91d..ddac8133ac4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light.png
index fbb1411065c..def136b71fc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-online-indicator-visible.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-online-indicator-visible.png
index 1e8774e0e43..415df6eb96f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-online-indicator-visible.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-online-indicator-visible.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-user-name-not-set.png
index 0128fe06510..87f93b41947 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index 4b27346182a..a4a37cf08c6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default-online-indicator-visible.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default-online-indicator-visible.png
index 89b9e3242d5..32df9038642 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default-online-indicator-visible.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default-online-indicator-visible.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default-user-name-not-set.png
index 63de8d6365a..264eeb030f6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 317cf856386..70331a300e9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark-online-indicator-visible.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark-online-indicator-visible.png
index e886bcbf253..9480f674114 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark-online-indicator-visible.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark-online-indicator-visible.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark-user-name-not-set.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark-user-name-not-set.png
index e50460dfc56..c1c51b70f5c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark-user-name-not-set.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark-user-name-not-set.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark.png
index 643843b9e9e..2a7fb2f693b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.default-light.png
index fa4f7ca506e..e00ba5adbae 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png
index fa4f7ca506e..e00ba5adbae 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.rightToLeftLayout-default.png
index 561c41680ed..b8b2149ff00 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.small-dark.png
index d936b0a31f9..fc30de9be6a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_emptyAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_whenUserThatHasNameIsAssignedAfterUserWithoutName_usernameLabelGetsShown.default-light-with-name.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_whenUserThatHasNameIsAssignedAfterUserWithoutName_usernameLabelGetsShown.default-light-with-name.png
index ab9f381ec8e..63fddf862d9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_whenUserThatHasNameIsAssignedAfterUserWithoutName_usernameLabelGetsShown.default-light-with-name.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_whenUserThatHasNameIsAssignedAfterUserWithoutName_usernameLabelGetsShown.default-light-with-name.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_whenUserThatHasNameIsAssignedAfterUserWithoutName_usernameLabelGetsShown.default-light-without-name.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_whenUserThatHasNameIsAssignedAfterUserWithoutName_usernameLabelGetsShown.default-light-without-name.png
index bbd380ba91d..ddac8133ac4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_whenUserThatHasNameIsAssignedAfterUserWithoutName_usernameLabelGetsShown.default-light-without-name.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/ChatMentionSuggestionView/__Snapshots__/ChatMentionSuggestionView_Tests/test_whenUserThatHasNameIsAssignedAfterUserWithoutName_usernameLabelGetsShown.default-light-without-name.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index 2a8cd2842cd..2b6417bfc3c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png
index c3559f451e1..2dff007e924 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png
index 2a8cd2842cd..2b6417bfc3c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png
index f9c399e1f58..7b72bc46893 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index b15203a2583..0d1f1712d07 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index b15203a2583..0d1f1712d07 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index b15203a2583..0d1f1712d07 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index b15203a2583..0d1f1712d07 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.default-light-full.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.default-light-full.png
index 014469293ee..e74a780fefa 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.default-light-full.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.default-light-full.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.default-light-only-subtitle.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.default-light-only-subtitle.png
index 308e5d72520..6976e5e8dd3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.default-light-only-subtitle.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.default-light-only-subtitle.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-full.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-full.png
index c760f478df1..4a4329692b2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-full.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-full.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-only-subtitle.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-only-subtitle.png
index 29fd281ea5f..dec437d9f82 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-only-subtitle.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-only-subtitle.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-only-title.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-only-title.png
index 7faee715968..420263f98cc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-only-title.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.extraExtraExtraLarge-light-only-title.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.rightToLeftLayout-default-full.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.rightToLeftLayout-default-full.png
index 014469293ee..e74a780fefa 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.rightToLeftLayout-default-full.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.rightToLeftLayout-default-full.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.rightToLeftLayout-default-only-subtitle.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.rightToLeftLayout-default-only-subtitle.png
index 308e5d72520..6976e5e8dd3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.rightToLeftLayout-default-only-subtitle.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.rightToLeftLayout-default-only-subtitle.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-full.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-full.png
index f8e30632390..8fbf02c9d5c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-full.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-full.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-only-subtitle.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-only-subtitle.png
index 2e7b49e24c2..a754d957a64 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-only-subtitle.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-only-subtitle.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-only-title.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-only-title.png
index 935ec896657..3b26de4593c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-only-title.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_defaultAppearance.small-dark-only-title.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.default-light.png
index 84eb5247441..5648472afe5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.extraExtraExtraLarge-light.png
index 55596c5debf..294564403ff 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.rightToLeftLayout-default.png
index 84eb5247441..5648472afe5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.small-dark.png
index 51dd59d1370..ee38c177587 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/TitleContainerView/__Snapshots__/TitleContainerView_Tests/test_swiftUIWrapper.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingComponents.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingComponents.default-dark.png
index 5a857f05f78..1e6e54df12b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingComponents.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingComponents.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingComponents.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingComponents.default-light.png
index f6bcc53c72d..b47d4fd29ba 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingComponents.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingComponents.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingSubclassing.default-light.png
index 77fb08de4e8..70a9823d723 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.default-light.png
index 4d0cbda0ea7..b5951098097 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.extraExtraExtraLarge-light.png
index c151e045544..c8d80b04383 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.rightToLeftLayout-default.png
index f95785db2f0..ef10d91ce1b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.small-dark.png
index fde7f52921a..422b20da748 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_emptyAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_emptyAppearance.default-dark.png
index 73edfc1621f..ff18d8ed901 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_emptyAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_emptyAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_emptyAppearance.default-light.png
index 789f087724f..863d6b1d670 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_commands_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingComponents.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingComponents.default-dark.png
index 427a5eff110..0d59e0afc84 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingComponents.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingComponents.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingComponents.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingComponents.default-light.png
index ca52b72473d..8eb2d230ac4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingComponents.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingComponents.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingSubclassing.default-light.png
index 4e460769e89..b6effab7f06 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.default-light.png
index 046619f76ac..a39018251ce 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.extraExtraExtraLarge-light.png
index b8b9bd84fac..f4ffae07e59 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.rightToLeftLayout-default.png
index f92584fcb07..d5c008fd9bc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.small-dark.png
index b67c3313610..87f2d67ec5b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_emptyAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_emptyAppearance.default-dark.png
index f329c6367ad..4abad139028 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_emptyAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_emptyAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_emptyAppearance.default-light.png
index 6f42e193575..203fc0d1bd5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/Suggestions/__Snapshots__/ChatSuggestionsVC_Tests/test_mentions_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-0-0.png
index dc478dc218e..7126d053f29 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-32-0.png
index 6cddfc31dae..1b2a354b265 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-inf.png
index 77e74958855..cffd375cc1f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-equal-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-0-0.png
index cc09daffdd7..e587faad9b2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-32-0.png
index e257a53ab25..8caa7a171d5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-inf.png
index 006c025bfe7..6ff58564036 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisLeading-natural-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-0-0.png
index dc478dc218e..7126d053f29 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-32-0.png
index 6cddfc31dae..1b2a354b265 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-inf.png
index 77e74958855..cffd375cc1f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-equal-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-0-0.png
index cc09daffdd7..e587faad9b2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-32-0.png
index e257a53ab25..8caa7a171d5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-inf.png
index 006c025bfe7..6ff58564036 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-axisTrailing-natural-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-0-0.png
index dc478dc218e..7126d053f29 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-32-0.png
index 6cddfc31dae..1b2a354b265 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-inf.png
index 77e74958855..cffd375cc1f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-equal-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-0-0.png
index cc09daffdd7..e587faad9b2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-32-0.png
index e257a53ab25..8caa7a171d5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-inf.png
index 006c025bfe7..6ff58564036 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-center-natural-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-0-0.png
index dc478dc218e..7126d053f29 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-32-0.png
index 6cddfc31dae..1b2a354b265 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-inf.png
index 77e74958855..cffd375cc1f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-equal-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-0-0.png
index cc09daffdd7..e587faad9b2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-32-0.png
index e257a53ab25..8caa7a171d5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-inf.png
index 006c025bfe7..6ff58564036 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-horizontal-fill-natural-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-0-0.png
index b937eda51cf..fdeeb89c408 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-32-0.png
index d5dd4d73689..43a600328d6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-inf.png
index 65ad33dbf37..453c88f4124 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-equal-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-0-0.png
index b937eda51cf..fdeeb89c408 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-32-0.png
index d5dd4d73689..43a600328d6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-inf.png
index 65ad33dbf37..453c88f4124 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisLeading-natural-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-0-0.png
index 9d3f456c112..05679a1bfcc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-32-0.png
index 32608b4eeea..fcfbcf113ed 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-inf.png
index 07bc11c4f67..28487530588 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-equal-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-0-0.png
index 9d3f456c112..05679a1bfcc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-32-0.png
index 32608b4eeea..fcfbcf113ed 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-inf.png
index 07bc11c4f67..28487530588 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-axisTrailing-natural-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-0-0.png
index aba5fff1853..6150f414fe0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-32-0.png
index 8bd3d443ae4..6bba13f77ac 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-inf.png
index 8d45c0492fd..d915263bf1c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-equal-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-0-0.png
index aba5fff1853..6150f414fe0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-32-0.png
index 8bd3d443ae4..6bba13f77ac 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-inf.png
index 8d45c0492fd..d915263bf1c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-center-natural-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-0-0.png
index a9fa95107cd..aa88a6b647d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-32-0.png
index 1d1b62c180e..b2b3711b237 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-inf.png
index 990f8e45df1..5eaca4496a5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-equal-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-0-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-0-0.png
index a9fa95107cd..aa88a6b647d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-0-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-0-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-32-0.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-32-0.png
index 1d1b62c180e..b2b3711b237 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-32-0.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-32-0.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-inf.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-inf.png
index 990f8e45df1..5eaca4496a5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-inf.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance.default-light-vertical-fill-natural-inf.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance_withOneViewOnly.default-light-horizontal.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance_withOneViewOnly.default-light-horizontal.png
index 9878e98586d..a165336ecbd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance_withOneViewOnly.default-light-horizontal.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance_withOneViewOnly.default-light-horizontal.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance_withOneViewOnly.default-light-vertical.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance_withOneViewOnly.default-light-vertical.png
index 9878e98586d..a165336ecbd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance_withOneViewOnly.default-light-vertical.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/ContainerStackView_Tests/testAppearance_withOneViewOnly.default-light-vertical.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-isHighlighted.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-isHighlighted.png
index 2da03ff9a5d..e3683e3a790 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-isHighlighted.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.default-light-isHighlighted.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.default-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.default-light.png
index 30db6c56222..94fc7011a44 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-isHighlighted.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-isHighlighted.png
index 2da03ff9a5d..e3683e3a790 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-isHighlighted.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light-isHighlighted.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light.png
index 30db6c56222..94fc7011a44 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-isHighlighted.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-isHighlighted.png
index 2da03ff9a5d..e3683e3a790 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-isHighlighted.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default-isHighlighted.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default.png
index 30db6c56222..94fc7011a44 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-isHighlighted.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-isHighlighted.png
index 3d2eaf765f9..462e33fb2b4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-isHighlighted.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark-isHighlighted.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark.png
index 30db6c56222..94fc7011a44 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/CommonViews/__Snapshots__/PillButton_Tests/test_appearance_wasConfiguredCorrectly.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.default-light.png
index 017d8b6ac2e..fff84e1fe7a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.extraExtraExtraLarge-light.png
index 2a854a4d7ff..d476954ea20 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.rightToLeftLayout-default.png
index 49ed591fd0b..12d8e353d97 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.small-dark.png
index 209f186a112..d3e5549fec8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedOneAfterThree.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.default-light.png
index 017d8b6ac2e..fff84e1fe7a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.extraExtraExtraLarge-light.png
index 2a854a4d7ff..d476954ea20 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.rightToLeftLayout-default.png
index 49ed591fd0b..12d8e353d97 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.small-dark.png
index 209f186a112..d3e5549fec8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedSameTime.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.default-light.png
index 017d8b6ac2e..fff84e1fe7a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.extraExtraExtraLarge-light.png
index 2a854a4d7ff..d476954ea20 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.rightToLeftLayout-default.png
index 49ed591fd0b..12d8e353d97 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.small-dark.png
index 209f186a112..d3e5549fec8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedThreeAfterOne.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.default-light.png
index 017d8b6ac2e..fff84e1fe7a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.extraExtraExtraLarge-light.png
index 2a854a4d7ff..d476954ea20 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.rightToLeftLayout-default.png
index 49ed591fd0b..12d8e353d97 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.small-dark.png
index 209f186a112..d3e5549fec8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withFourAttachments_addedTwoAfterTwo.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withLongFileNames.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withLongFileNames.default-light.png
index 7c594624adf..72db63d1388 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withLongFileNames.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withLongFileNames.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.default-light.png
index 1668f3af676..6b6d46d1018 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.extraExtraExtraLarge-light.png
index 39039d82c69..e95504130d3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.rightToLeftLayout-default.png
index 9199429c3b4..97e2134ab50 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.small-dark.png
index 1391396d9e5..baed3026c0f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_attachmentsPreview_withMultipleAttachmentTypes.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.default-light.png
index 327de70649e..8cc09085d7b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.extraExtraExtraLarge-light.png
index 59808eb5718..694be6e3fde 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.rightToLeftLayout-default.png
index 30956d62cb8..f63069b2539 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.small-dark.png
index d121617dc59..ff7acda45e8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_canNotSendMessage.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SkipSlowModeIsOnWithCountdownShown.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SkipSlowModeIsOnWithCountdownShown.default-light.png
index af0fdfead06..edb86aeaf73 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SkipSlowModeIsOnWithCountdownShown.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SkipSlowModeIsOnWithCountdownShown.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.default-light.png
index 1a0df1af66b..93e042c077f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.extraExtraExtraLarge-light.png
index a492ed39a37..10e9b06ab20 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.rightToLeftLayout-default.png
index b725f224851..604b312d6cd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.small-dark.png
index 4b7ddad2ef0..016365a2c68 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_channelWithSlowModeActive_messageIsSent_SlowModeIsOnWithCountdownShown.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.default-light.png
index be6279c9011..3345c1645e2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.extraExtraExtraLarge-light.png
index 9ead743127b..a02c74cf8aa 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.rightToLeftLayout-default.png
index 36d9ff1a07f..2ff4c516a76 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.small-dark.png
index cb9a40355a2..a69d09fab1a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithEmptyArgs_hasSendButtonEnabled.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.default-light.png
index fa68d455389..b3437760dfe 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.extraExtraExtraLarge-light.png
index 1b5c15c65cb..5ecd52ea492 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.rightToLeftLayout-default.png
index b29f5cabaa7..5fcc1b28a84 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.small-dark.png
index 01bcb4dd55c..d86549ec43a 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_commandWithNonEmptyArgs_hasSendButtonDisabled.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_dismissLinkPreview.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_dismissLinkPreview.default-light.png
index 0618c737ce4..28432384291 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_dismissLinkPreview.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_dismissLinkPreview.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_linkPreview_whenComposerLinkPreviewDisabled_thenNoHighlighting.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_linkPreview_whenComposerLinkPreviewDisabled_thenNoHighlighting.default-light.png
index ab6c960726d..2a172545b99 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_linkPreview_whenComposerLinkPreviewDisabled_thenNoHighlighting.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_linkPreview_whenComposerLinkPreviewDisabled_thenNoHighlighting.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_linkPreview_whenComposerLinkPreviewEnabled_thenHighlightsLinks.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_linkPreview_whenComposerLinkPreviewEnabled_thenHighlightsLinks.default-light.png
index 0618c737ce4..28432384291 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_linkPreview_whenComposerLinkPreviewEnabled_thenHighlightsLinks.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_linkPreview_whenComposerLinkPreviewEnabled_thenHighlightsLinks.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.default-light.png
index a003b900f28..a53ba62a829 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.extraExtraExtraLarge-light.png
index fe5fb101c3b..05fd35ea2b8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.rightToLeftLayout-default.png
index 6022283bc82..cc893bbbe25 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.small-dark.png
index 208bf6639a4..19e4b51c6e4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_quotedTranslatedMessage.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showCommandSuggestionsView.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showCommandSuggestionsView.default-light.png
index 4b528333031..ebaae59f142 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showCommandSuggestionsView.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showCommandSuggestionsView.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.default-light.png
index ab7d2053a27..9db6b1686fb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.rightToLeftLayout-default.png
index 2d027f9f82e..95ca856946c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.small-dark.png
index dfe5af0176a..50f1ddfa070 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoDescription.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoDescription.default-light.png
index 33665d626f4..a8e75815da6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoDescription.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoDescription.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoImage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoImage.default-light.png
index 3c8a7b13a3b..b65527c9e9c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoImage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoImage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoMetadata.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoMetadata.default-light.png
index cbfc890b24c..3d16e881095 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoMetadata.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoMetadata.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoTitle.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoTitle.default-light.png
index 7ef456209ea..10cda953ce9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoTitle.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showLinkPreview_whenNoTitle.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showMentionSuggestionsView.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showMentionSuggestionsView.default-light.png
index 1acb67b733b..0d4891f4e10 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showMentionSuggestionsView.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Composer/__Snapshots__/ComposerVC_Tests/test_showMentionSuggestionsView.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 8160c06f889..40cf265b2d4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index 27213120a37..0939397669d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index d7a3d98fea8..04342db3114 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index dcee4190430..d3bd2d0f706 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.default-light.png
index 69e9bdeace9..721e38d4fb8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.extraExtraExtraLarge-light.png
index d3d8b4b7f0a..85ec111ea09 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.rightToLeftLayout-default.png
index 94ce3504cc0..b36692fc842 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.small-dark.png
index 95851a05a09..caf2f044a39 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_appearanceCustomization_usingUIConfig.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.default-light.png
index 8160c06f889..40cf265b2d4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index 27213120a37..0939397669d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index d7a3d98fea8..04342db3114 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.small-dark.png
index 9fafc9b9f61..014dccceeb6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/Gallery/__Snapshots__/GalleryVC_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index 1c19a67c77a..e57df9c2e60 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png
index 1aba5dc60b3..94f3e1db8f4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png
index de40968fe35..e306fd52d7d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.small-dark.png
index 281526e6f40..e4b9c843691 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 1ca67cfe4e3..252dcffa3e9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index acca4ee4a0b..3afa02ba165 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index 53f548a4b80..9964099efc4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index 77e5bc2b77a..3b084be1df8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.default-light.png
index 489b4fc83ee..ec38055c86c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index 77787e667b6..9fd7f3fb1a2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 0034acbf99f..c977a9ae173 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.small-dark.png
index 111491e5a87..a205e7e84c5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.default-light.png
index 962d565ba23..eedcaf166eb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.extraExtraExtraLarge-light.png
index 66e7ea61b1c..3fa3ca5c018 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.rightToLeftLayout-default.png
index d3b456101c8..ce1ef335f70 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.small-dark.png
index fbeba3409bf..859e80271c3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenDestructive.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.default-light.png
index e1768d45f44..f0c81a1ac38 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.extraExtraExtraLarge-light.png
index c3332137d29..189563e0463 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.rightToLeftLayout-default.png
index 0757915cee6..7fb4d04a316 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.small-dark.png
index b1d5f0a6b8d..3dc3d5fb79e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenHighlighted.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.default-light.png
index c438d505ca4..bdab0ccf108 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.extraExtraExtraLarge-light.png
index 0374b88578a..fe3a0845e7e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.rightToLeftLayout-default.png
index ff3618105f1..40d9918a33f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.small-dark.png
index 8c258c70e32..eac3df05373 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimary.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.default-light.png
index 962d565ba23..eedcaf166eb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.extraExtraExtraLarge-light.png
index 66e7ea61b1c..3fa3ca5c018 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.rightToLeftLayout-default.png
index d3b456101c8..ce1ef335f70 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.small-dark.png
index fbeba3409bf..859e80271c3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultAppearance_whenPrimaryAndDestructive.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.default-light.png
index af6dd8c37ab..5deb7363850 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.extraExtraExtraLarge-light.png
index add03b8b85d..d57be07654c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.rightToLeftLayout-default.png
index 544ff06c580..00badfb20c0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.small-dark.png
index d11f1437f04..d43ba0c3ac5 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionControl_Tests/test_defaultMultilineAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index 0e2b770ccfd..7fe6f6155e1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png
index 17f8474820a..71a7d198a5e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png
index 52718b6ad35..c729e77336e 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.small-dark.png
index 34eea392fc7..e69646c15fd 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 2640e79ef56..6b79dfd5aed 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png
index 9c142e61de7..e3480b38fc2 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png
index 794b63ff5fa..0b4e970df48 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png
index c1ba1dcf6f1..43bde1eb035 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_appearanceCustomization_usingSubclassing.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.default-light.png
index ed42a7a9673..3db2206d3f3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png
index 8c915aa5895..04d695aa756 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png
index 7b0dc13edb6..33c988f28b8 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.small-dark.png
index c68c46e1d81..b4c6f9c125b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_defaultAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.default-light.png
index b08f5d430ac..e8a9b676962 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png
index b08f5d430ac..e8a9b676962 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png
index b08f5d430ac..e8a9b676962 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.small-dark.png
index 773de88107b..122911df99c 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_emptyAppearance.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_messageActions_hasCorrectOrdering.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_messageActions_hasCorrectOrdering.default-light.png
index a3f9aeb0577..7130380a065 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_messageActions_hasCorrectOrdering.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessageActionsVC_Tests/test_messageActions_hasCorrectOrdering.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingAppearance.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingAppearance.default-dark.png
index 8d0953404d0..0dbc9142b40 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingAppearance.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingAppearance.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingAppearance.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingAppearance.default-light.png
index 1fc3116f2b3..de2fbc24043 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingAppearance.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingAppearance.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png
index 42c31738f7a..1b358336e13 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingSubclassing.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png
index 8e94a672e2d..b215b6d6000 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_appearanceCustomization_usingSubclassing.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_defaultAppearance_when_largeLongMessage.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_defaultAppearance_when_largeLongMessage.default-dark.png
index a8a512dc576..295ca7acded 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_defaultAppearance_when_largeLongMessage.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_defaultAppearance_when_largeLongMessage.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_defaultAppearance_when_largeLongMessage.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_defaultAppearance_when_largeLongMessage.default-light.png
index c27df16be24..d18d23cc815 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_defaultAppearance_when_largeLongMessage.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_defaultAppearance_when_largeLongMessage.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountEqual4_shouldOnlyHaveSmallerHeight.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountEqual4_shouldOnlyHaveSmallerHeight.default-dark.png
index 44f542f4be2..d58a617c571 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountEqual4_shouldOnlyHaveSmallerHeight.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountEqual4_shouldOnlyHaveSmallerHeight.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountEqual4_shouldOnlyHaveSmallerHeight.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountEqual4_shouldOnlyHaveSmallerHeight.default-light.png
index 90717d573bc..c49aa5de492 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountEqual4_shouldOnlyHaveSmallerHeight.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountEqual4_shouldOnlyHaveSmallerHeight.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountLessThan4_shouldHaveSmallerWidth.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountLessThan4_shouldHaveSmallerWidth.default-dark.png
index 9a0af0372f8..bd01e55298b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountLessThan4_shouldHaveSmallerWidth.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountLessThan4_shouldHaveSmallerWidth.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountLessThan4_shouldHaveSmallerWidth.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountLessThan4_shouldHaveSmallerWidth.default-light.png
index 88949327b51..3e41593c5a9 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountLessThan4_shouldHaveSmallerWidth.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountLessThan4_shouldHaveSmallerWidth.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountMoreThan4_shouldHaveBiggerWidth.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountMoreThan4_shouldHaveBiggerWidth.default-dark.png
index 2ee90fea49b..d7c9af44153 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountMoreThan4_shouldHaveBiggerWidth.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountMoreThan4_shouldHaveBiggerWidth.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountMoreThan4_shouldHaveBiggerWidth.default-light.png b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountMoreThan4_shouldHaveBiggerWidth.default-light.png
index a3ec7c51d15..db9f1878144 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountMoreThan4_shouldHaveBiggerWidth.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/MessageActionsPopup/__Snapshots__/ChatMessagePopupVC_Tests/test_reactions_whenReactionsCountMoreThan4_shouldHaveBiggerWidth.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.default-light.png
index 2f38083b73b..fab17e930f4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.extraExtraExtraLarge-light.png
index 2f38083b73b..fab17e930f4 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.rightToLeftLayout-default.png
index efcc93ce96d..6d1cc85ab12 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.small-dark.png
index 0462c7686c1..a86c2d22db3 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPaused_snapshotsAreAsExpected.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.default-light.png
index d070dbc0d80..7be7fb81c03 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.extraExtraExtraLarge-light.png
index d070dbc0d80..7be7fb81c03 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.rightToLeftLayout-default.png
index 2af1fae70c0..2a79b16b82f 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.small-dark.png
index 3b51c073ff4..6a06f2326cc 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isPlaying_snapshotsAreAsExpected.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.default-light.png
index 2119f16591b..cb679268ac0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.extraExtraExtraLarge-light.png
index 2119f16591b..cb679268ac0 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.rightToLeftLayout-default.png
index 776c154e4bf..80f3772e196 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.small-dark.png
index c8459437aa2..9a8dfe027f6 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LiveRecordingView_Tests/test_appearance_isRecording_snapshotsAreAsExpected.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light-Locked.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light-Locked.png
index dac7b257334..20223867735 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light-Locked.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light-Locked.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png
index 796b5738930..5ba077a9331 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-Locked.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-Locked.png
index dac7b257334..20223867735 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-Locked.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-Locked.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png
index 796b5738930..5ba077a9331 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-Locked.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-Locked.png
index dac7b257334..20223867735 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-Locked.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-Locked.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png
index 796b5738930..5ba077a9331 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-Locked.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-Locked.png
index d1a2e4bd921..5726ea7f923 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-Locked.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-Locked.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png
index 543ae1fe6e5..b110161eafe 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/LockIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light-IncreasedDuration.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light-IncreasedDuration.png
index e98eeb5aaf8..cb308c33453 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light-IncreasedDuration.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light-IncreasedDuration.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png
index 02dcca9e29c..14624cec068 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-IncreasedDuration.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-IncreasedDuration.png
index e98eeb5aaf8..cb308c33453 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-IncreasedDuration.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-IncreasedDuration.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png
index 02dcca9e29c..14624cec068 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-IncreasedDuration.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-IncreasedDuration.png
index cef2ed88c34..1284ee091bb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-IncreasedDuration.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-IncreasedDuration.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png
index a215df1e0e6..79cb9821b74 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-IncreasedDuration.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-IncreasedDuration.png
index e98eeb5aaf8..cb308c33453 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-IncreasedDuration.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-IncreasedDuration.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png
index 02dcca9e29c..14624cec068 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingIndicatorView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png
index d583918f093..cd146849241 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png
index d583918f093..cd146849241 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png
index d583918f093..cd146849241 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png
index e8361469933..ad2b3e7a5fe 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/RecordingTipView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.default-light-AlmostHidden.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.default-light-AlmostHidden.png
index a6013bb7990..12095df804b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.default-light-AlmostHidden.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.default-light-AlmostHidden.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png
index 0bc8504df7f..92e475239ba 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-AlmostHidden.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-AlmostHidden.png
index a6013bb7990..12095df804b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-AlmostHidden.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light-AlmostHidden.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png
index 0bc8504df7f..92e475239ba 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.extraExtraExtraLarge-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-AlmostHidden.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-AlmostHidden.png
index 14e0e72a186..fe98d189652 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-AlmostHidden.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default-AlmostHidden.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png
index 7572951701e..91401f031b7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.rightToLeftLayout-default.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-AlmostHidden.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-AlmostHidden.png
index a6013bb7990..12095df804b 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-AlmostHidden.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.small-dark-AlmostHidden.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png
index 0bc8504df7f..92e475239ba 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/Views/__Snapshots__/SlideToCancelView_Tests/test_appearance_snapshotsAreAsExpected.small-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_idle_viewIsConfiguredAsExpected.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_idle_viewIsConfiguredAsExpected.default-dark.png
index 0d0b19cd4d2..c704436f2a7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_idle_viewIsConfiguredAsExpected.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_idle_viewIsConfiguredAsExpected.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_idle_viewIsConfiguredAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_idle_viewIsConfiguredAsExpected.default-light.png
index 94ab3e1f045..6194ceb63a1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_idle_viewIsConfiguredAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_idle_viewIsConfiguredAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_locked_viewIsConfiguredAsExpected.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_locked_viewIsConfiguredAsExpected.default-dark.png
index 2845f9708c6..d15580f64c7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_locked_viewIsConfiguredAsExpected.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_locked_viewIsConfiguredAsExpected.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_locked_viewIsConfiguredAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_locked_viewIsConfiguredAsExpected.default-light.png
index 03a9e188d66..e180dd1fcbe 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_locked_viewIsConfiguredAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_locked_viewIsConfiguredAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_afterHideViewsDebouncerExecution_viewIsConfiguredAsExpected.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_afterHideViewsDebouncerExecution_viewIsConfiguredAsExpected.default-dark.png
index 0631cf2f9dc..090541fd7eb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_afterHideViewsDebouncerExecution_viewIsConfiguredAsExpected.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_afterHideViewsDebouncerExecution_viewIsConfiguredAsExpected.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_afterHideViewsDebouncerExecution_viewIsConfiguredAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_afterHideViewsDebouncerExecution_viewIsConfiguredAsExpected.default-light.png
index dead716b82b..276733c742d 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_afterHideViewsDebouncerExecution_viewIsConfiguredAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_afterHideViewsDebouncerExecution_viewIsConfiguredAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_viewIsConfiguredAsExpected.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_viewIsConfiguredAsExpected.default-dark.png
index 2845f9708c6..d15580f64c7 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_viewIsConfiguredAsExpected.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_viewIsConfiguredAsExpected.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_viewIsConfiguredAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_viewIsConfiguredAsExpected.default-light.png
index 03a9e188d66..e180dd1fcbe 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_viewIsConfiguredAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_preview_viewIsConfiguredAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_recording_viewIsConfiguredAsExpected.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_recording_viewIsConfiguredAsExpected.default-dark.png
index e0d3d9638d6..dcf50b452bb 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_recording_viewIsConfiguredAsExpected.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_recording_viewIsConfiguredAsExpected.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_recording_viewIsConfiguredAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_recording_viewIsConfiguredAsExpected.default-light.png
index 8d4c712c60e..7b3aa3812f1 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_recording_viewIsConfiguredAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_recording_viewIsConfiguredAsExpected.default-light.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_showingTip_viewIsConfiguredAsExpected.default-dark.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_showingTip_viewIsConfiguredAsExpected.default-dark.png
index cc5ad9014a6..7db9a9f79ca 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_showingTip_viewIsConfiguredAsExpected.default-dark.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_showingTip_viewIsConfiguredAsExpected.default-dark.png differ
diff --git a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_showingTip_viewIsConfiguredAsExpected.default-light.png b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_showingTip_viewIsConfiguredAsExpected.default-light.png
index 65c8576fa42..10fb30afc76 100644
Binary files a/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_showingTip_viewIsConfiguredAsExpected.default-light.png and b/Tests/StreamChatUITests/SnapshotTests/VoiceRecording/__Snapshots__/VoiceRecordingVC_Tests/test_updateContent_showingTip_viewIsConfiguredAsExpected.default-light.png differ
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 872be29ef45..9c3742fc40a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -6,7 +6,7 @@ require 'net/http'
 import 'Sonarfile'
 import 'Allurefile'
 
-xcode_version = ENV['XCODE_VERSION'] || '15.4'
+xcode_version = ENV['XCODE_VERSION'] || '16.1'
 xcode_project = 'StreamChat.xcodeproj'
 sdk_names = ['StreamChat', 'StreamChatUI']
 github_repo = ENV['GITHUB_REPOSITORY'] || 'GetStream/stream-chat-swift'
@@ -108,7 +108,6 @@ lane :publish_release do |options|
   UI.user_error!('Release version cannot be empty') if release_version.to_s.empty?
   ensure_git_branch(branch: 'main')
 
-  xcversion(version: '14.0.1')
   clean_products
   build_xcframeworks
   compress_frameworks