diff --git a/Brand/Database.swift b/Brand/Database.swift
index 3a2f4ed488..81e9028b7f 100644
--- a/Brand/Database.swift
+++ b/Brand/Database.swift
@@ -26,4 +26,4 @@ import Foundation
 // Database Realm
 //
 let databaseName                    = "nextcloud.realm"
-let databaseSchemaVersion: UInt64   = 348
+let databaseSchemaVersion: UInt64   = 354
diff --git a/Brand/NCBrand.swift b/Brand/NCBrand.swift
index 7277e85951..cfeef5ca6d 100755
--- a/Brand/NCBrand.swift
+++ b/Brand/NCBrand.swift
@@ -52,7 +52,7 @@ let userAgent: String = {
     var folderDefaultAutoUpload: String = "Photos"
 
     // Capabilities Group
-    var capabilitiesGroups: String = "group.it.twsweb.Crypto-Cloud"
+    var capabilitiesGroup: String = "group.it.twsweb.Crypto-Cloud"
     var capabilitiesGroupApps: String = "group.com.nextcloud.apps"
 
     // BRAND ONLY
@@ -257,6 +257,7 @@ class NCBrandColor: NSObject {
 
     private func stepCalc(steps: Int, color1: CGColor, color2: CGColor) -> [CGFloat] {
         var step = [CGFloat](repeating: 0, count: 3)
+
         step[0] = (color2.components![0] - color1.components![0]) / CGFloat(steps)
         step[1] = (color2.components![1] - color1.components![1]) / CGFloat(steps)
         step[2] = (color2.components![2] - color1.components![2]) / CGFloat(steps)
@@ -266,8 +267,8 @@ class NCBrandColor: NSObject {
     private func mixPalette(steps: Int, color1: CGColor, color2: CGColor) -> [CGColor] {
         var palette = [color1]
         let step = stepCalc(steps: steps, color1: color1, color2: color2)
-
         let c1Components = color1.components!
+
         for i in 1 ..< steps {
             let r = c1Components[0] + step[0] * CGFloat(i)
             let g = c1Components[1] + step[1] * CGFloat(i)
@@ -292,6 +293,7 @@ class NCBrandColor: NSObject {
         let palette1 = mixPalette(steps: steps, color1: red, color2: yellow)
         let palette2 = mixPalette(steps: steps, color1: yellow, color2: blue)
         let palette3 = mixPalette(steps: steps, color1: blue, color2: red)
+
         return palette1 + palette2 + palette3
     }
 }
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 955d19125d..a19f7cdae1 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,2 +1,2 @@
-binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/MobileVLCKit.json" "3.5.1"
+binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/MobileVLCKit.json" "3.6.0"
 github "marinofaggiana/TOPasscodeViewController" "ed795637acd2b1ef154e011a04ebab4686d0523c"
diff --git a/File Provider Extension/FileProviderData.swift b/File Provider Extension/FileProviderData.swift
index eb03a93c06..bc271a4649 100644
--- a/File Provider Extension/FileProviderData.swift	
+++ b/File Provider Extension/FileProviderData.swift	
@@ -40,36 +40,30 @@ class fileProviderData: NSObject {
     var accountUrlBase = ""
     var homeServerUrl = ""
 
-    // Max item for page
-    let itemForPage = 100
-
-    // Anchor
-    var currentAnchor: UInt64 = 0
-
-    // Rank favorite
     var listFavoriteIdentifierRank: [String: NSNumber] = [:]
 
-    // Item for signalEnumerator
     var fileProviderSignalDeleteContainerItemIdentifier: [NSFileProviderItemIdentifier: NSFileProviderItemIdentifier] = [:]
     var fileProviderSignalUpdateContainerItem: [NSFileProviderItemIdentifier: FileProviderItem] = [:]
     var fileProviderSignalDeleteWorkingSetItemIdentifier: [NSFileProviderItemIdentifier: NSFileProviderItemIdentifier] = [:]
     var fileProviderSignalUpdateWorkingSetItem: [NSFileProviderItemIdentifier: FileProviderItem] = [:]
 
-    // Error
     enum FileProviderError: Error {
         case downloadError
         case uploadError
     }
 
+    enum TypeSignal: String {
+        case delete
+        case update
+        case workingSet
+    }
+
     // MARK: - 
 
     func setupAccount(domain: NSFileProviderDomain?, providerExtension: NSFileProviderExtension) -> tableAccount? {
-
         self.domain = domain
-        if domain != nil {
-            if let fileProviderManager = NSFileProviderManager(for: domain!) {
-                self.fileProviderManager = fileProviderManager
-            }
+        if let domain, let fileProviderManager = NSFileProviderManager(for: domain) {
+            self.fileProviderManager = fileProviderManager
         }
 
         // LOG
@@ -81,9 +75,7 @@ class fileProviderData: NSObject {
 
         // NO DOMAIN -> Set default account
         if domain == nil {
-
             guard let activeAccount = NCManageDatabase.shared.getActiveAccount() else { return nil }
-
             account = activeAccount.account
             user = activeAccount.user
             userId = activeAccount.userId
@@ -91,8 +83,8 @@ class fileProviderData: NSObject {
             homeServerUrl = utilityFileSystem.getHomeServer(urlBase: activeAccount.urlBase, userId: activeAccount.userId)
 
             NCManageDatabase.shared.setCapabilities(account: account)
-
-            NextcloudKit.shared.setup(account: activeAccount.account, user: activeAccount.user, userId: activeAccount.userId, password: NCKeychain().getPassword(account: activeAccount.account), urlBase: activeAccount.urlBase, userAgent: userAgent, nextcloudVersion: NCGlobal.shared.capabilityServerVersionMajor, delegate: NCNetworking.shared)
+            NextcloudKit.shared.setup(account: activeAccount.account, user: activeAccount.user, userId: activeAccount.userId, password: NCKeychain().getPassword(account: activeAccount.account), urlBase: activeAccount.urlBase, userAgent: userAgent, nextcloudVersion: NCGlobal.shared.capabilityServerVersionMajor, groupIdentifier: NCBrandOptions.shared.capabilitiesGroup, delegate: NCNetworking.shared)
+            NCNetworking.shared.delegate = providerExtension as? NCNetworkingDelegate
 
             return tableAccount.init(value: activeAccount)
         }
@@ -106,7 +98,6 @@ class fileProviderData: NSObject {
             guard let host = url.host else { continue }
             let accountDomain = activeAccount.userId + " (" + host + ")"
             if accountDomain == domain!.identifier.rawValue {
-
                 account = activeAccount.account
                 user = activeAccount.user
                 userId = activeAccount.userId
@@ -115,84 +106,38 @@ class fileProviderData: NSObject {
 
                 NCManageDatabase.shared.setCapabilities(account: account)
 
-                NextcloudKit.shared.setup(account: activeAccount.account, user: activeAccount.user, userId: activeAccount.userId, password: NCKeychain().getPassword(account: activeAccount.account), urlBase: activeAccount.urlBase, userAgent: userAgent, nextcloudVersion: NCGlobal.shared.capabilityServerVersionMajor, delegate: NCNetworking.shared)
+                NextcloudKit.shared.setup(account: activeAccount.account, user: activeAccount.user, userId: activeAccount.userId, password: NCKeychain().getPassword(account: activeAccount.account), urlBase: activeAccount.urlBase, userAgent: userAgent, nextcloudVersion: NCGlobal.shared.capabilityServerVersionMajor, groupIdentifier: NCBrandOptions.shared.capabilitiesGroup, delegate: NCNetworking.shared)
+                NCNetworking.shared.delegate = providerExtension as? NCNetworkingDelegate
 
                 return tableAccount.init(value: activeAccount)
             }
         }
-
         return nil
     }
 
     // MARK: -
 
     @discardableResult
-    func signalEnumerator(ocId: String, delete: Bool = false, update: Bool = false) -> FileProviderItem? {
-
-        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else { return nil }
-
-        guard let parentItemIdentifier = fileProviderUtility().getParentItemIdentifier(metadata: metadata) else { return nil }
-
+    func signalEnumerator(ocId: String, type: TypeSignal) -> FileProviderItem? {
+        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId),
+              let parentItemIdentifier = fileProviderUtility().getParentItemIdentifier(metadata: metadata) else { return nil }
         let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier)
 
-        if delete {
+        if type == .delete {
             fileProviderData.shared.fileProviderSignalDeleteContainerItemIdentifier[item.itemIdentifier] = item.itemIdentifier
             fileProviderData.shared.fileProviderSignalDeleteWorkingSetItemIdentifier[item.itemIdentifier] = item.itemIdentifier
         }
-
-        if update {
+        if type == .update {
             fileProviderData.shared.fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item
             fileProviderData.shared.fileProviderSignalUpdateWorkingSetItem[item.itemIdentifier] = item
         }
-
-        if !update && !delete {
+        if type == .workingSet {
             fileProviderData.shared.fileProviderSignalUpdateWorkingSetItem[item.itemIdentifier] = item
         }
-
-        if update || delete {
-            currentAnchor += 1
+        if type == .delete || type == .update {
             fileProviderManager.signalEnumerator(for: parentItemIdentifier) { _ in }
         }
-
         fileProviderManager.signalEnumerator(for: .workingSet) { _ in }
-
         return item
     }
-
-    /*
-     func updateFavoriteForWorkingSet() {
-         
-         var updateWorkingSet = false
-         let oldListFavoriteIdentifierRank = listFavoriteIdentifierRank
-         listFavoriteIdentifierRank = NCManageDatabase.shared.getTableMetadatasDirectoryFavoriteIdentifierRank(account: account)
-         
-         // (ADD)
-         for (identifier, _) in listFavoriteIdentifierRank {
-             
-             guard let metadata = NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "ocId == %@", identifier)) else { continue }
-             guard let parentItemIdentifier = fileProviderUtility.sharedInstance.getParentItemIdentifier(metadata: metadata, homeServerUrl: homeServerUrl) else { continue }
-             let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier)
-                 
-             fileProviderSignalUpdateWorkingSetItem[item.itemIdentifier] = item
-             updateWorkingSet = true
-         }
-         
-         // (REMOVE)
-         for (identifier, _) in oldListFavoriteIdentifierRank {
-             
-             if !listFavoriteIdentifierRank.keys.contains(identifier) {
-                 
-                 guard let metadata = NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "ocId == %@", identifier)) else { continue }
-                 let itemIdentifier = fileProviderUtility.sharedInstance.getItemIdentifier(metadata: metadata)
-                 
-                 fileProviderSignalDeleteWorkingSetItemIdentifier[itemIdentifier] = itemIdentifier
-                 updateWorkingSet = true
-             }
-         }
-         
-         if updateWorkingSet {
-             signalEnumerator(for: [.workingSet])
-         }
-     }
-     */
 }
diff --git a/File Provider Extension/FileProviderDomain.swift b/File Provider Extension/FileProviderDomain.swift
index 4810416ddb..17c03bccb0 100644
--- a/File Provider Extension/FileProviderDomain.swift	
+++ b/File Provider Extension/FileProviderDomain.swift	
@@ -24,11 +24,8 @@
 import UIKit
 
 class FileProviderDomain: NSObject {
-
     func registerDomains() {
-
         NSFileProviderManager.getDomainsWithCompletionHandler { fileProviderDomain, error in
-
             var domains: [String] = []
             let pathRelativeToDocumentStorage = NSFileProviderManager.default.documentStorageURL.absoluteString
             let accounts = NCManageDatabase.shared.getAllAccount()
@@ -50,10 +47,10 @@ class FileProviderDomain: NSObject {
                     }
                 }
                 if !domainFound {
-                    let domainRawValue = NSFileProviderDomain(identifier: NSFileProviderDomainIdentifier(rawValue: domain), displayName: domain, pathRelativeToDocumentStorage: pathRelativeToDocumentStorage)
-                    NSFileProviderManager.remove(domainRawValue, completionHandler: { error in
-                        if error != nil {
-                            print("Error  domain: \(domainRawValue) error: \(String(describing: error))")
+                    let fileProviderDomain = NSFileProviderDomain(identifier: NSFileProviderDomainIdentifier(rawValue: domain), displayName: domain, pathRelativeToDocumentStorage: pathRelativeToDocumentStorage)
+                    NSFileProviderManager.remove(fileProviderDomain, completionHandler: { error in
+                        if let error {
+                            print("Error  domain: \(fileProviderDomain) error: \(String(describing: error))")
                         }
                     })
                 }
@@ -72,19 +69,14 @@ class FileProviderDomain: NSObject {
                     }
                 }
                 if !domainFound {
-                    let domainRawValue = NSFileProviderDomain(identifier: NSFileProviderDomainIdentifier(rawValue: accountDomain), displayName: accountDomain, pathRelativeToDocumentStorage: pathRelativeToDocumentStorage)
-                    NSFileProviderManager.add(domainRawValue, completionHandler: { error in
-                        if error != nil {
-                            print("Error  domain: \(domainRawValue) error: \(String(describing: error))")
+                    let fileProviderDomain = NSFileProviderDomain(identifier: NSFileProviderDomainIdentifier(rawValue: accountDomain), displayName: accountDomain, pathRelativeToDocumentStorage: pathRelativeToDocumentStorage)
+                    NSFileProviderManager.add(fileProviderDomain, completionHandler: { error in
+                        if let error {
+                            print("Error  domain: \(fileProviderDomain) error: \(String(describing: error))")
                         }
                     })
                 }
             }
         }
     }
-
-    func removeAllDomains() {
-
-        NSFileProviderManager.removeAllDomains { _ in }
-    }
 }
diff --git a/File Provider Extension/FileProviderEnumerator.swift b/File Provider Extension/FileProviderEnumerator.swift
index 08179e2aa0..1f2058e681 100644
--- a/File Provider Extension/FileProviderEnumerator.swift	
+++ b/File Provider Extension/FileProviderEnumerator.swift	
@@ -23,87 +23,93 @@
 
 import UIKit
 import FileProvider
+import RealmSwift
 import NextcloudKit
 
 class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
     var enumeratedItemIdentifier: NSFileProviderItemIdentifier
     var serverUrl: String?
-    let fpUtility = fileProviderUtility()
+    let providerUtility = fileProviderUtility()
+    var recordsPerPage: Int = 20
+    var anchor: UInt64 = 0
 
     init(enumeratedItemIdentifier: NSFileProviderItemIdentifier) {
         self.enumeratedItemIdentifier = enumeratedItemIdentifier
-
-        // Select ServerUrl
         if enumeratedItemIdentifier == .rootContainer {
             serverUrl = fileProviderData.shared.homeServerUrl
         } else {
-            let metadata = fpUtility.getTableMetadataFromItemIdentifier(enumeratedItemIdentifier)
-            if metadata != nil {
-                if let directorySource = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata!.account, metadata!.serverUrl)) {
-                    serverUrl = directorySource.serverUrl + "/" + metadata!.fileName
-                }
+            if let metadata = providerUtility.getTableMetadataFromItemIdentifier(enumeratedItemIdentifier),
+               let directorySource = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) {
+                serverUrl = directorySource.serverUrl + "/" + metadata.fileName
+
             }
         }
-
         super.init()
     }
 
-    func invalidate() {
-
-    }
+    func invalidate() { }
 
     func enumerateItems(for observer: NSFileProviderEnumerationObserver, startingAt page: NSFileProviderPage) {
         var items: [NSFileProviderItemProtocol] = []
-
-        /*** WorkingSet ***/
+        /// WorkingSet
         if enumeratedItemIdentifier == .workingSet {
             var itemIdentifierMetadata: [NSFileProviderItemIdentifier: tableMetadata] = [:]
-
-            // ***** Tags *****
+            /// Tags
             let tags = NCManageDatabase.shared.getTags(predicate: NSPredicate(format: "account == %@", fileProviderData.shared.account))
             for tag in tags {
-
                 guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(tag.ocId)  else { continue }
-                fpUtility.createocIdentifierOnFileSystem(metadata: metadata)
-                itemIdentifierMetadata[fpUtility.getItemIdentifier(metadata: metadata)] = metadata
+                itemIdentifierMetadata[providerUtility.getItemIdentifier(metadata: metadata)] = metadata
             }
-
-            // ***** Favorite *****
+            /// Favorite
             fileProviderData.shared.listFavoriteIdentifierRank = NCManageDatabase.shared.getTableMetadatasDirectoryFavoriteIdentifierRank(account: fileProviderData.shared.account)
             for (identifier, _) in fileProviderData.shared.listFavoriteIdentifierRank {
-
                 guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(identifier) else { continue }
-                itemIdentifierMetadata[fpUtility.getItemIdentifier(metadata: metadata)] = metadata
+                itemIdentifierMetadata[providerUtility.getItemIdentifier(metadata: metadata)] = metadata
             }
-
-            // create items
+            /// Create items
             for (_, metadata) in itemIdentifierMetadata {
-                let parentItemIdentifier = fpUtility.getParentItemIdentifier(metadata: metadata)
-                if parentItemIdentifier != nil {
-                    let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier!)
+                if let parentItemIdentifier = providerUtility.getParentItemIdentifier(metadata: metadata) {
+                    let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier)
                     items.append(item)
                 }
             }
-
             observer.didEnumerate(items)
             observer.finishEnumerating(upTo: nil)
-
         } else {
-
-        /*** ServerUrl ***/
-
+            /// ServerUrl
             guard let serverUrl = serverUrl else {
                 observer.finishEnumerating(upTo: nil)
                 return
             }
+            var pageNumber = 1
+            if let stringPage = String(data: page.rawValue, encoding: .utf8),
+               let intPage = Int(stringPage) {
+                pageNumber = intPage
+            }
 
-            if page == NSFileProviderPage.initialPageSortedByDate as NSFileProviderPage || page == NSFileProviderPage.initialPageSortedByName as NSFileProviderPage {
-                self.readFileOrFolder(serverUrl: serverUrl) { metadatas in
-                    self.completeObserver(observer, numPage: 1, metadatas: metadatas)
+            self.fetchItemsForPage(serverUrl: serverUrl, pageNumber: pageNumber) { metadatas in
+                if let metadatas {
+                    for metadata in metadatas {
+                        if metadata.e2eEncrypted || (!metadata.session.isEmpty && metadata.session != NCNetworking.shared.sessionUploadBackgroundExtension) {
+                            continue
+                        }
+                        if let parentItemIdentifier = self.providerUtility.getParentItemIdentifier(metadata: metadata) {
+                            let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier)
+                            items.append(item)
+                        }
+                    }
+                }
+
+                observer.didEnumerate(items)
+
+                if let metadatas,
+                    metadatas.count == self.recordsPerPage {
+                    pageNumber += 1
+                    let providerPage = NSFileProviderPage("\(pageNumber)".data(using: .utf8)!)
+                    observer.finishEnumerating(upTo: providerPage)
+                } else {
+                    observer.finishEnumerating(upTo: nil)
                 }
-            } else {
-                let numPage = Int(String(data: page.rawValue, encoding: .utf8)!)!
-                completeObserver(observer, numPage: numPage, metadatas: nil)
             }
         }
     }
@@ -111,7 +117,6 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
     func enumerateChanges(for observer: NSFileProviderChangeObserver, from anchor: NSFileProviderSyncAnchor) {
         var itemsDelete: [NSFileProviderItemIdentifier] = []
         var itemsUpdate: [FileProviderItem] = []
-
         // Report the deleted items
         //
         if self.enumeratedItemIdentifier == .workingSet {
@@ -125,7 +130,6 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             }
             fileProviderData.shared.fileProviderSignalDeleteContainerItemIdentifier.removeAll()
         }
-
         // Report the updated items
         //
         if self.enumeratedItemIdentifier == .workingSet {
@@ -143,64 +147,36 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
         observer.didDeleteItems(withIdentifiers: itemsDelete)
         observer.didUpdate(itemsUpdate)
 
-        let data = "\(fileProviderData.shared.currentAnchor)".data(using: .utf8)
+        let data = "\(self.anchor)".data(using: .utf8)
         observer.finishEnumeratingChanges(upTo: NSFileProviderSyncAnchor(data!), moreComing: false)
     }
 
     func currentSyncAnchor(completionHandler: @escaping (NSFileProviderSyncAnchor?) -> Void) {
-        let data = "\(fileProviderData.shared.currentAnchor)".data(using: .utf8)
+        let data = "\(self.anchor)".data(using: .utf8)
         completionHandler(NSFileProviderSyncAnchor(data!))
     }
 
-    // --------------------------------------------------------------------------------------------
-    // MARK: - User Function + Network
-    // --------------------------------------------------------------------------------------------
-
-    func completeObserver(_ observer: NSFileProviderEnumerationObserver, numPage: Int, metadatas: [tableMetadata]?) {
-        var numPage = numPage
-        var items: [NSFileProviderItemProtocol] = []
-
-        if metadatas != nil {
-            for metadata in metadatas! {
-                if metadata.e2eEncrypted || (!metadata.session.isEmpty && metadata.session != NCNetworking.shared.sessionUploadBackgroundExtension) { continue }
-                fpUtility.createocIdentifierOnFileSystem(metadata: metadata)
-                let parentItemIdentifier = fpUtility.getParentItemIdentifier(metadata: metadata)
-                if parentItemIdentifier != nil {
-                    let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier!)
-                    items.append(item)
-                }
-            }
-            observer.didEnumerate(items)
-        }
-
-        if items.count == fileProviderData.shared.itemForPage {
-            numPage += 1
-            let providerPage = NSFileProviderPage("\(numPage)".data(using: .utf8)!)
-            observer.finishEnumerating(upTo: providerPage)
-        } else {
-            observer.finishEnumerating(upTo: nil)
-        }
-    }
+    func fetchItemsForPage(serverUrl: String, pageNumber: Int, completionHandler: @escaping (_ metadatas: Results<tableMetadata>?) -> Void) {
+        let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@", fileProviderData.shared.account, serverUrl)
 
-    func readFileOrFolder(serverUrl: String, completionHandler: @escaping (_ metadatas: [tableMetadata]?) -> Void) {
-        NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrl, depth: "1", showHiddenFiles: NCKeychain().showHiddenFiles) { account, files, _, error in
-            if error == .success {
-                DispatchQueue.global().async {
+        if pageNumber == 1 {
+            NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrl, depth: "1", showHiddenFiles: NCKeychain().showHiddenFiles) { _, files, _, error in
+                if error == .success {
                     NCManageDatabase.shared.convertFilesToMetadatas(files, useFirstAsMetadataFolder: true) { metadataFolder, metadatas in
                         /// FOLDER
                         NCManageDatabase.shared.addMetadata(metadataFolder)
                         NCManageDatabase.shared.addDirectory(e2eEncrypted: metadataFolder.e2eEncrypted, favorite: metadataFolder.favorite, ocId: metadataFolder.ocId, fileId: metadataFolder.fileId, etag: metadataFolder.etag, permissions: metadataFolder.permissions, richWorkspace: metadataFolder.richWorkspace, serverUrl: serverUrl, account: metadataFolder.account)
                         /// FILES
-                        let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND status == %d", account, serverUrl, NCGlobal.shared.metadataStatusNormal)
-                        NCManageDatabase.shared.updateMetadatas(metadatas, predicate: predicate)
-                        let metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", fileProviderData.shared.account, serverUrl), sorted: "fileName", ascending: true)
-                        completionHandler(metadatas)
+                        NCManageDatabase.shared.deleteMetadata(predicate: predicate)
+                        NCManageDatabase.shared.addMetadatas(metadatas)
                     }
                 }
-            } else {
-                let metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", fileProviderData.shared.account, serverUrl), sorted: "fileName", ascending: true)
-                completionHandler(metadatas)
+                let resultsMetadata = NCManageDatabase.shared.fetchPagedResults(ofType: tableMetadata.self, primaryKey: "ocId", recordsPerPage: self.recordsPerPage, pageNumber: pageNumber, filter: predicate, sortedByKeyPath: "fileName")
+                completionHandler(resultsMetadata)
             }
+        } else {
+            let resultsMetadata = NCManageDatabase.shared.fetchPagedResults(ofType: tableMetadata.self, primaryKey: "ocId", recordsPerPage: recordsPerPage, pageNumber: pageNumber, filter: predicate, sortedByKeyPath: "fileName")
+            completionHandler(resultsMetadata)
         }
     }
 }
diff --git a/File Provider Extension/FileProviderExtension+Actions.swift b/File Provider Extension/FileProviderExtension+Actions.swift
index d3126e0467..b1e7921454 100644
--- a/File Provider Extension/FileProviderExtension+Actions.swift	
+++ b/File Provider Extension/FileProviderExtension+Actions.swift	
@@ -26,49 +26,33 @@ import FileProvider
 import NextcloudKit
 
 extension FileProviderExtension {
-
     override func createDirectory(withName directoryName: String, inParentItemIdentifier parentItemIdentifier: NSFileProviderItemIdentifier, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) {
-
-        guard let tableDirectory = fpUtility.getTableDirectoryFromParentItemIdentifier(parentItemIdentifier, account: fileProviderData.shared.account, homeServerUrl: fileProviderData.shared.homeServerUrl) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
+        guard let tableDirectory = providerUtility.getTableDirectoryFromParentItemIdentifier(parentItemIdentifier, account: fileProviderData.shared.account, homeServerUrl: fileProviderData.shared.homeServerUrl) else {
+            return completionHandler(nil, NSFileProviderError(.noSuchItem))
         }
-
         let directoryName = utilityFileSystem.createFileName(directoryName, serverUrl: tableDirectory.serverUrl, account: fileProviderData.shared.account)
         let serverUrlFileName = tableDirectory.serverUrl + "/" + directoryName
 
         NextcloudKit.shared.createFolder(serverUrlFileName: serverUrlFileName) { _, ocId, _, error in
-
             if error == .success {
-
                 NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0", showHiddenFiles: NCKeychain().showHiddenFiles) { _, files, _, error in
-
                     if error == .success, let file = files.first {
-
                         let isDirectoryEncrypted = self.utilityFileSystem.isDirectoryE2EE(file: file)
                         let metadata = NCManageDatabase.shared.convertFileToMetadata(file, isDirectoryE2EE: isDirectoryEncrypted)
 
                         NCManageDatabase.shared.addDirectory(e2eEncrypted: false, favorite: false, ocId: ocId!, fileId: metadata.fileId, etag: metadata.etag, permissions: metadata.permissions, serverUrl: serverUrlFileName, account: metadata.account)
                         NCManageDatabase.shared.addMetadata(metadata)
 
-                        guard let metadataInsert = NCManageDatabase.shared.getMetadataFromOcId(ocId!) else {
-                            completionHandler(nil, NSFileProviderError(.noSuchItem))
-                            return
-                        }
-
-                        guard let parentItemIdentifier = self.fpUtility.getParentItemIdentifier(metadata: metadataInsert) else {
-                            completionHandler(nil, NSFileProviderError(.noSuchItem))
-                            return
+                        guard let metadataInsert = NCManageDatabase.shared.getMetadataFromOcId(ocId!),
+                              let parentItemIdentifier = self.providerUtility.getParentItemIdentifier(metadata: metadataInsert) else {
+                            return completionHandler(nil, NSFileProviderError(.noSuchItem))
                         }
-
                         let item = FileProviderItem(metadata: metadataInsert, parentItemIdentifier: parentItemIdentifier)
                         completionHandler(item, nil)
-
                     } else {
                         completionHandler(nil, NSFileProviderError(.serverUnreachable))
                     }
                 }
-
             } else {
                 completionHandler(nil, NSFileProviderError(.serverUnreachable))
             }
@@ -76,12 +60,9 @@ extension FileProviderExtension {
     }
 
     override func deleteItem(withIdentifier itemIdentifier: NSFileProviderItemIdentifier, completionHandler: @escaping (Error?) -> Void) {
-
-        guard let metadata = fpUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
-            completionHandler(NSFileProviderError(.noSuchItem))
-            return
+        guard let metadata = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
+            return completionHandler(NSFileProviderError(.noSuchItem))
         }
-
         let ocId = metadata.ocId
         let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
         let isDirectory = metadata.directory
@@ -89,12 +70,11 @@ extension FileProviderExtension {
         let fileName = metadata.fileName
 
         NextcloudKit.shared.deleteFileOrFolder(serverUrlFileName: serverUrlFileName) { account, error in
-
             if error == .success { // || error == kOCErrorServerPathNotFound {
-
                 let fileNamePath = self.utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue)
+
                 do {
-                    try self.fpUtility.fileManager.removeItem(atPath: fileNamePath)
+                    try self.providerUtility.fileManager.removeItem(atPath: fileNamePath)
                 } catch let error {
                     print("error: \(error)")
                 }
@@ -106,9 +86,7 @@ extension FileProviderExtension {
 
                 NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocId))
                 NCManageDatabase.shared.deleteLocalFile(predicate: NSPredicate(format: "ocId == %@", ocId))
-
                 completionHandler(nil)
-
             } else {
                 completionHandler(NSFileProviderError(.serverUnreachable))
             }
@@ -116,47 +94,34 @@ extension FileProviderExtension {
     }
 
     override func reparentItem(withIdentifier itemIdentifier: NSFileProviderItemIdentifier, toParentItemWithIdentifier parentItemIdentifier: NSFileProviderItemIdentifier, newName: String?, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) {
-
-        guard let itemFrom = try? item(for: itemIdentifier) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
-        }
-
-        guard let metadataFrom = fpUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
+        guard let itemFrom = try? item(for: itemIdentifier),
+              let metadataFrom = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
+            return completionHandler(nil, NSFileProviderError(.noSuchItem))
         }
-
         let ocIdFrom = metadataFrom.ocId
         let serverUrlFrom = metadataFrom.serverUrl
         let fileNameFrom = serverUrlFrom + "/" + itemFrom.filename
-
-        guard let tableDirectoryTo = fpUtility.getTableDirectoryFromParentItemIdentifier(parentItemIdentifier, account: fileProviderData.shared.account, homeServerUrl: fileProviderData.shared.homeServerUrl) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
+        guard let tableDirectoryTo = providerUtility.getTableDirectoryFromParentItemIdentifier(parentItemIdentifier, account: fileProviderData.shared.account, homeServerUrl: fileProviderData.shared.homeServerUrl) else {
+            return completionHandler(nil, NSFileProviderError(.noSuchItem))
         }
         let serverUrlTo = tableDirectoryTo.serverUrl
         let fileNameTo = serverUrlTo + "/" + itemFrom.filename
 
         NextcloudKit.shared.moveFileOrFolder(serverUrlFileNameSource: fileNameFrom, serverUrlFileNameDestination: fileNameTo, overwrite: false) { account, error in
-
             if error == .success {
-
                 if metadataFrom.directory {
                     NCManageDatabase.shared.deleteDirectoryAndSubDirectory(serverUrl: serverUrlFrom, account: account)
                     NCManageDatabase.shared.renameDirectory(ocId: ocIdFrom, serverUrl: serverUrlTo)
                 }
-
                 NCManageDatabase.shared.moveMetadata(ocId: ocIdFrom, serverUrlTo: serverUrlTo)
 
                 guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocIdFrom) else {
-                    completionHandler(nil, NSFileProviderError(.noSuchItem))
-                    return
-                }
+                    return completionHandler(nil, NSFileProviderError(.noSuchItem))
 
+                }
                 let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier)
-                completionHandler(item, nil)
 
+                completionHandler(item, nil)
             } else {
                 completionHandler(nil, NSFileProviderError(.serverUnreachable))
             }
@@ -164,60 +129,38 @@ extension FileProviderExtension {
     }
 
     override func renameItem(withIdentifier itemIdentifier: NSFileProviderItemIdentifier, toName itemName: String, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) {
-
-        guard let metadata = fpUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
+        guard let metadata = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier),
+              let directoryTable = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) else {
+            return completionHandler(nil, NSFileProviderError(.noSuchItem))
         }
-
-        guard let directoryTable = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
-        }
-
         let fileNameFrom = metadata.fileNameView
         let fileNamePathFrom = metadata.serverUrl + "/" + fileNameFrom
         let fileNamePathTo = metadata.serverUrl + "/" + itemName
         let ocId = metadata.ocId
 
         NextcloudKit.shared.moveFileOrFolder(serverUrlFileNameSource: fileNamePathFrom, serverUrlFileNameDestination: fileNamePathTo, overwrite: false) { account, error in
-
             if error == .success {
-
                 // Rename metadata
                 NCManageDatabase.shared.renameMetadata(fileNameTo: itemName, ocId: ocId)
 
                 guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else {
-                    completionHandler(nil, NSFileProviderError(.noSuchItem))
-                    return
+                    return completionHandler(nil, NSFileProviderError(.noSuchItem))
                 }
-
                 if metadata.directory {
-
                     NCManageDatabase.shared.setDirectory(serverUrl: fileNamePathFrom, serverUrlTo: fileNamePathTo, encrypted: directoryTable.e2eEncrypted, account: account)
-
                 } else {
-
-                    let itemIdentifier = self.fpUtility.getItemIdentifier(metadata: metadata)
-
-                    // rename file
-                    _ = self.fpUtility.moveFile(self.utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue, fileNameView: fileNameFrom), toPath: self.utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue, fileNameView: itemName))
-
-                    _ = self.fpUtility.moveFile(self.utilityFileSystem.getDirectoryProviderStoragePreviewOcId(itemIdentifier.rawValue, etag: metadata.etag), toPath: self.utilityFileSystem.getDirectoryProviderStoragePreviewOcId(itemIdentifier.rawValue, etag: metadata.etag))
-
-                    _ = self.fpUtility.moveFile(self.utilityFileSystem.getDirectoryProviderStorageIconOcId(itemIdentifier.rawValue, etag: metadata.etag), toPath: self.utilityFileSystem.getDirectoryProviderStorageIconOcId(itemIdentifier.rawValue, etag: metadata.etag))
-
+                    let itemIdentifier = self.providerUtility.getItemIdentifier(metadata: metadata)
+                    self.providerUtility.moveFile(self.utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue, fileNameView: fileNameFrom), toPath: self.utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue, fileNameView: itemName))
+                    self.providerUtility.moveFile(self.utilityFileSystem.getDirectoryProviderStoragePreviewOcId(itemIdentifier.rawValue, etag: metadata.etag), toPath: self.utilityFileSystem.getDirectoryProviderStoragePreviewOcId(itemIdentifier.rawValue, etag: metadata.etag))
+                    self.providerUtility.moveFile(self.utilityFileSystem.getDirectoryProviderStorageIconOcId(itemIdentifier.rawValue, etag: metadata.etag), toPath: self.utilityFileSystem.getDirectoryProviderStorageIconOcId(itemIdentifier.rawValue, etag: metadata.etag))
                     NCManageDatabase.shared.setLocalFile(ocId: ocId, fileName: itemName)
                 }
 
-                guard let parentItemIdentifier = self.fpUtility.getParentItemIdentifier(metadata: metadata) else {
-                    completionHandler(nil, NSFileProviderError(.noSuchItem))
-                    return
+                guard let parentItemIdentifier = self.providerUtility.getParentItemIdentifier(metadata: metadata) else {
+                    return completionHandler(nil, NSFileProviderError(.noSuchItem))
                 }
-
                 let item = FileProviderItem(metadata: tableMetadata.init(value: metadata), parentItemIdentifier: parentItemIdentifier)
                 completionHandler(item, nil)
-
             } else {
                 completionHandler(nil, NSFileProviderError(.serverUnreachable))
             }
@@ -225,20 +168,16 @@ extension FileProviderExtension {
     }
 
     override func setFavoriteRank(_ favoriteRank: NSNumber?, forItemIdentifier itemIdentifier: NSFileProviderItemIdentifier, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) {
-
-        guard let metadata = fpUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
+        guard let metadata = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
+            return completionHandler(nil, NSFileProviderError(.noSuchItem))
         }
-
         var favorite = false
         let ocId = metadata.ocId
 
         if favoriteRank == nil {
             fileProviderData.shared.listFavoriteIdentifierRank.removeValue(forKey: itemIdentifier.rawValue)
         } else {
-            let rank = fileProviderData.shared.listFavoriteIdentifierRank[itemIdentifier.rawValue]
-            if rank == nil {
+            if fileProviderData.shared.listFavoriteIdentifierRank[itemIdentifier.rawValue] == nil {
                 fileProviderData.shared.listFavoriteIdentifierRank[itemIdentifier.rawValue] = favoriteRank
             }
             favorite = true
@@ -246,35 +185,25 @@ extension FileProviderExtension {
 
         if (favorite == true && metadata.favorite == false) || (favorite == false && metadata.favorite == true) {
             let fileNamePath = utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId)
-
             NextcloudKit.shared.setFavorite(fileName: fileNamePath, favorite: favorite) { _, error in
-
                 if error == .success {
-
-                    guard let metadataTemp = NCManageDatabase.shared.getMetadataFromOcId(ocId) else {
-                        completionHandler(nil, NSFileProviderError(.noSuchItem))
-                        return
+                    guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else {
+                        return completionHandler(nil, NSFileProviderError(.noSuchItem))
                     }
-                    let metadata = tableMetadata.init(value: metadataTemp)
-
                     // Change DB
                     metadata.favorite = favorite
                     NCManageDatabase.shared.addMetadata(metadata)
-
-                    let item = fileProviderData.shared.signalEnumerator(ocId: metadata.ocId)
+                    /// SIGNAL
+                    let item = fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, type: .workingSet)
                     completionHandler(item, nil)
-
                 } else {
-
                     guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else {
-                        completionHandler(nil, NSFileProviderError(.noSuchItem))
-                        return
+                        return completionHandler(nil, NSFileProviderError(.noSuchItem))
                     }
-
                     // Errore, remove from listFavoriteIdentifierRank
                     fileProviderData.shared.listFavoriteIdentifierRank.removeValue(forKey: itemIdentifier.rawValue)
-
-                    let item = fileProviderData.shared.signalEnumerator(ocId: metadata.ocId)
+                    /// SIGNAL
+                    let item = fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, type: .workingSet)
                     completionHandler(item, NSFileProviderError(.serverUnreachable))
                 }
             }
@@ -282,33 +211,23 @@ extension FileProviderExtension {
     }
 
     override func setTagData(_ tagData: Data?, forItemIdentifier itemIdentifier: NSFileProviderItemIdentifier, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) {
-
-        guard let metadataForTag = fpUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
+        guard let metadataForTag = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
+            return completionHandler(nil, NSFileProviderError(.noSuchItem))
         }
         let ocId = metadataForTag.ocId
         let account = metadataForTag.account
 
-        // Add, Remove (nil)
         NCManageDatabase.shared.addTag(ocId, tagIOS: tagData, account: account)
-
-        let item = fileProviderData.shared.signalEnumerator(ocId: ocId)
+        /// SIGNAL WORKINGSET
+        let item = fileProviderData.shared.signalEnumerator(ocId: ocId, type: .workingSet)
         completionHandler(item, nil)
     }
 
     override func setLastUsedDate(_ lastUsedDate: Date?, forItemIdentifier itemIdentifier: NSFileProviderItemIdentifier, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) {
-
-        guard let metadata = fpUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
-        }
-
-        guard let parentItemIdentifier = fpUtility.getParentItemIdentifier(metadata: metadata) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
+        guard let metadata = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier),
+              let parentItemIdentifier = providerUtility.getParentItemIdentifier(metadata: metadata) else {
+            return completionHandler(nil, NSFileProviderError(.noSuchItem))
         }
-
         let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier)
         completionHandler(item, nil)
     }
diff --git a/File Provider Extension/FileProviderExtension+NetworkingDelegate.swift b/File Provider Extension/FileProviderExtension+NetworkingDelegate.swift
new file mode 100644
index 0000000000..5fbf694170
--- /dev/null
+++ b/File Provider Extension/FileProviderExtension+NetworkingDelegate.swift	
@@ -0,0 +1,72 @@
+//
+//  FileProviderExtension+x.swift
+//  File Provider Extension
+//
+//  Created by Marino Faggiana on 11/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+import UniformTypeIdentifiers
+import FileProvider
+import NextcloudKit
+import Alamofire
+
+extension FileProviderExtension: NCNetworkingDelegate {
+    func downloadComplete(fileName: String, serverUrl: String, etag: String?, date: Date?, dateLastModified: Date?, length: Int64, task: URLSessionTask, error: NKError) { }
+    func downloadProgress(_ progress: Float, totalBytes: Int64, totalBytesExpected: Int64, fileName: String, serverUrl: String, session: URLSession, task: URLSessionTask) { }
+    func uploadProgress(_ progress: Float, totalBytes: Int64, totalBytesExpected: Int64, fileName: String, serverUrl: String, session: URLSession, task: URLSessionTask) { }
+
+    func uploadComplete(fileName: String, serverUrl: String, ocId: String?, etag: String?, date: Date?, size: Int64, task: URLSessionTask, error: NKError) {
+        guard let url = task.currentRequest?.url,
+              let metadata = NCManageDatabase.shared.getMetadata(from: url, sessionTaskIdentifier: task.taskIdentifier) else { return }
+        if error == .success, let ocId {
+            /// SIGNAL
+            fileProviderData.shared.signalEnumerator(ocId: metadata.ocIdTemp, type: .delete)
+            metadata.fileName = fileName
+            metadata.serverUrl = serverUrl
+            metadata.uploadDate = (date as? NSDate) ?? NSDate()
+            metadata.etag = etag ?? ""
+            metadata.ocId = ocId
+            metadata.size = size
+            if let fileId = NCUtility().ocIdToFileId(ocId: ocId) {
+                metadata.fileId = fileId
+            }
+            metadata.session = ""
+            metadata.sessionError = ""
+            metadata.status = NCGlobal.shared.metadataStatusNormal
+
+            NCManageDatabase.shared.addMetadata(metadata)
+            NCManageDatabase.shared.addLocalFile(metadata: metadata)
+            /// NEW File
+            if ocId != metadata.ocIdTemp {
+                let atPath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocIdTemp)
+                let toPath = utilityFileSystem.getDirectoryProviderStorageOcId(ocId)
+                utilityFileSystem.copyFile(atPath: atPath, toPath: toPath)
+                NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocIdTemp))
+            }
+            /// SIGNAL
+            fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, type: .update)
+        } else {
+            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocIdTemp))
+            /// SIGNAL
+            fileProviderData.shared.signalEnumerator(ocId: metadata.ocIdTemp, type: .delete)
+        }
+    }
+}
diff --git a/File Provider Extension/FileProviderExtension+Thumbnail.swift b/File Provider Extension/FileProviderExtension+Thumbnail.swift
index a12114b351..17a9d9d055 100644
--- a/File Provider Extension/FileProviderExtension+Thumbnail.swift	
+++ b/File Provider Extension/FileProviderExtension+Thumbnail.swift	
@@ -26,54 +26,34 @@ import FileProvider
 import NextcloudKit
 
 extension FileProviderExtension {
-
     override func fetchThumbnails(for itemIdentifiers: [NSFileProviderItemIdentifier], requestedSize size: CGSize, perThumbnailCompletionHandler: @escaping (NSFileProviderItemIdentifier, Data?, Error?) -> Void, completionHandler: @escaping (Error?) -> Void) -> Progress {
-
         let progress = Progress(totalUnitCount: Int64(itemIdentifiers.count))
         var counterProgress: Int64 = 0
 
         for itemIdentifier in itemIdentifiers {
-
-            guard let metadata = fpUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
+            guard let metadata = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier), metadata.hasPreview else {
                 counterProgress += 1
                 if counterProgress == progress.totalUnitCount { completionHandler(nil) }
                 continue
             }
-
-            if metadata.hasPreview {
-
-                let fileNamePath = utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId)
-                let fileNameIconLocalPath = utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)
-
-                if let urlBase = metadata.urlBase.urlEncoded,
-                   let fileNamePath = fileNamePath.urlEncoded,
-                   let url = URL(string: "\(urlBase)/index.php/core/preview.png?file=\(fileNamePath)&x=\(size.width)&y=\(size.height)&a=1&mode=cover") {
-
-                    NextcloudKit.shared.getPreview(url: url) { _, data, error in
-                        if error == .success && data != nil {
-                            do {
-                                try data!.write(to: URL(fileURLWithPath: fileNameIconLocalPath), options: .atomic)
-                            } catch { }
-                            perThumbnailCompletionHandler(itemIdentifier, data, nil)
-                        } else {
-                            perThumbnailCompletionHandler(itemIdentifier, nil, NSFileProviderError(.serverUnreachable))
-                        }
-                        counterProgress += 1
-                        if counterProgress == progress.totalUnitCount {
-                            completionHandler(nil)
-                        }
-                    }
+            let fileNameIconLocalPath = utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)
+
+            NextcloudKit.shared.downloadPreview(fileId: metadata.fileId, widthPreview: Int(size.width), heightPreview: Int(size.height), etag: metadata.etag) { _ in
+            } completion: { _, data, error in
+                if error == .success, let data {
+                    do {
+                        try data.write(to: URL(fileURLWithPath: fileNameIconLocalPath), options: .atomic)
+                    } catch { }
+                    perThumbnailCompletionHandler(itemIdentifier, data, nil)
+                } else {
+                    perThumbnailCompletionHandler(itemIdentifier, nil, NSFileProviderError(.serverUnreachable))
                 }
-
-            } else {
                 counterProgress += 1
                 if counterProgress == progress.totalUnitCount {
                     completionHandler(nil)
                 }
             }
         }
-
         return progress
     }
-
 }
diff --git a/File Provider Extension/FileProviderExtension.swift b/File Provider Extension/FileProviderExtension.swift
index bd876d60f3..276d010c09 100644
--- a/File Provider Extension/FileProviderExtension.swift	
+++ b/File Provider Extension/FileProviderExtension.swift	
@@ -53,10 +53,7 @@ import Alamofire
    -------------------------------------------------------------------------------------------------------------------------------------------- */
 
 class FileProviderExtension: NSFileProviderExtension {
-
-    var outstandingSessionTasks: [URL: URLSessionTask] = [:]
-    var outstandingOcIdTemp: [String: String] = [:]
-    var fpUtility = fileProviderUtility()
+    let providerUtility = fileProviderUtility()
     let utilityFileSystem = NCUtilityFileSystem()
 
     override init() {
@@ -66,6 +63,8 @@ class FileProviderExtension: NSFileProviderExtension {
         _ = utilityFileSystem.directoryProviderStorage
         // Configure URLSession
         _ = NCNetworking.shared.sessionManagerUploadBackgroundExtension
+        // Domains
+        // FileProviderDomain().registerDomains()
     }
 
     deinit {
@@ -75,7 +74,6 @@ class FileProviderExtension: NSFileProviderExtension {
     // MARK: - Enumeration
 
     override func enumerator(for containerItemIdentifier: NSFileProviderItemIdentifier) throws -> NSFileProviderEnumerator {
-
         var maybeEnumerator: NSFileProviderEnumerator?
 
         if containerItemIdentifier != NSFileProviderItemIdentifier.workingSet {
@@ -114,11 +112,8 @@ class FileProviderExtension: NSFileProviderExtension {
     // MARK: - Item
 
     override func item(for identifier: NSFileProviderItemIdentifier) throws -> NSFileProviderItem {
-
         if identifier == .rootContainer {
-
             let metadata = tableMetadata()
-
             metadata.account = fileProviderData.shared.account
             metadata.directory = true
             metadata.ocId = NSFileProviderItemIdentifier.rootContainer.rawValue
@@ -126,15 +121,10 @@ class FileProviderExtension: NSFileProviderExtension {
             metadata.fileNameView = "root"
             metadata.serverUrl = fileProviderData.shared.homeServerUrl
             metadata.classFile = NKCommon.TypeClassFile.directory.rawValue
-
             return FileProviderItem(metadata: metadata, parentItemIdentifier: NSFileProviderItemIdentifier(NSFileProviderItemIdentifier.rootContainer.rawValue))
-
         } else {
-
-            guard let metadata = fpUtility.getTableMetadataFromItemIdentifier(identifier) else {
-                throw NSFileProviderError(.noSuchItem)
-            }
-            guard let parentItemIdentifier = fpUtility.getParentItemIdentifier(metadata: metadata) else {
+            guard let metadata = providerUtility.getTableMetadataFromItemIdentifier(identifier),
+                  let parentItemIdentifier = providerUtility.getParentItemIdentifier(metadata: metadata) else {
                 throw NSFileProviderError(.noSuchItem)
             }
             let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier)
@@ -143,40 +133,26 @@ class FileProviderExtension: NSFileProviderExtension {
     }
 
     override func urlForItem(withPersistentIdentifier identifier: NSFileProviderItemIdentifier) -> URL? {
-
-        // resolve the given identifier to a file on disk
-        guard let item = try? item(for: identifier) else {
-            return nil
-        }
-
+        guard let item = try? item(for: identifier) else { return nil }
         var url = fileProviderData.shared.fileProviderManager.documentStorageURL.appendingPathComponent(identifier.rawValue, isDirectory: true)
-
         // (fix copy/paste directory -> isDirectory = false)
         url = url.appendingPathComponent(item.filename, isDirectory: false)
-
         return url
     }
 
     override func persistentIdentifierForItem(at url: URL) -> NSFileProviderItemIdentifier? {
-
-        // resolve the given URL to a persistent identifier using a database
         let pathComponents = url.pathComponents
-
         // exploit the fact that the path structure has been defined as
         // <base storage directory>/<item identifier>/<item file name> above
         assert(pathComponents.count > 2)
-
         let itemIdentifier = NSFileProviderItemIdentifier(pathComponents[pathComponents.count - 2])
         return itemIdentifier
     }
 
     override func providePlaceholder(at url: URL, completionHandler: @escaping (Error?) -> Void) {
-
         guard let identifier = persistentIdentifierForItem(at: url) else {
-            completionHandler(NSFileProviderError(.noSuchItem))
-            return
+            return completionHandler(NSFileProviderError(.noSuchItem))
         }
-
         do {
             let fileProviderItem = try item(for: identifier)
             let placeholderURL = NSFileProviderManager.placeholderURL(for: url)
@@ -188,169 +164,127 @@ class FileProviderExtension: NSFileProviderExtension {
     }
 
     override func startProvidingItem(at url: URL, completionHandler: @escaping ((_ error: Error?) -> Void)) {
-
         let pathComponents = url.pathComponents
-        let identifier = NSFileProviderItemIdentifier(pathComponents[pathComponents.count - 2])
-
-        if outstandingSessionTasks[url] != nil {
-            return completionHandler(nil)
-        }
-
-        guard let metadata = fpUtility.getTableMetadataFromItemIdentifier(identifier) else {
-            return completionHandler(NSFileProviderError(.noSuchItem))
-        }
-
-        // Document VIEW ONLY
-        if metadata.isDocumentViewableOnly {
+        let itemIdentifier = NSFileProviderItemIdentifier(pathComponents[pathComponents.count - 2])
+        guard let metadata = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
             return completionHandler(NSFileProviderError(.noSuchItem))
         }
-
-        let tableLocalFile = NCManageDatabase.shared.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
-        if tableLocalFile != nil && utilityFileSystem.fileProviderStorageExists(metadata) && tableLocalFile?.etag == metadata.etag {
+        if metadata.session == NCNetworking.shared.sessionUploadBackgroundExtension {
             return completionHandler(nil)
         }
-
         let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
         let fileNameLocalPath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileName)
-
-        // Update status
-        NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusDownloading)
-        fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, update: true)
+        // Exists ? return
+        if let tableLocalFile = NCManageDatabase.shared.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId)),
+           utilityFileSystem.fileProviderStorageExists(metadata),
+           tableLocalFile.etag == metadata.etag {
+            return completionHandler(nil)
+        } else {
+            NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
+                                                       session: NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload,
+                                                       sessionError: "",
+                                                       selector: "",
+                                                       status: NCGlobal.shared.metadataStatusDownloading)
+        }
+        /// SIGNAL
+        fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, type: .update)
 
         NextcloudKit.shared.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, requestHandler: { _ in
-
         }, taskHandler: { task in
-
-            self.outstandingSessionTasks[url] = task
-            fileProviderData.shared.fileProviderManager.register(task, forItemWithIdentifier: NSFileProviderItemIdentifier(identifier.rawValue)) { _ in }
-
+            NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
+                                                       taskIdentifier: task.taskIdentifier)
+            fileProviderData.shared.fileProviderManager.register(task, forItemWithIdentifier: NSFileProviderItemIdentifier(itemIdentifier.rawValue)) { _ in }
         }, progressHandler: { _ in
-
         }) { _, etag, date, _, _, _, error in
-
-            self.outstandingSessionTasks.removeValue(forKey: url)
-            guard var metadata = self.fpUtility.getTableMetadataFromItemIdentifier(identifier) else {
-                completionHandler(NSFileProviderError(.noSuchItem))
-                return
+            guard let metadata = self.providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
+                return completionHandler(NSFileProviderError(.noSuchItem))
             }
-            metadata = tableMetadata.init(value: metadata)
-
             if error == .success {
-
                 metadata.status = NCGlobal.shared.metadataStatusNormal
-                metadata.date = date ?? NSDate()
+                metadata.date = (date as? NSDate) ?? NSDate()
                 metadata.etag = etag ?? ""
-
                 NCManageDatabase.shared.addLocalFile(metadata: metadata)
                 NCManageDatabase.shared.addMetadata(metadata)
-
                 completionHandler(nil)
-
             } else if error.errorCode == 200 {
-
                 NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusNormal)
-
                 completionHandler(nil)
-
             } else {
-
                 metadata.status = NCGlobal.shared.metadataStatusDownloadError
                 metadata.sessionError = error.errorDescription
                 NCManageDatabase.shared.addMetadata(metadata)
-
                 completionHandler(NSFileProviderError(.noSuchItem))
             }
-
-            fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, update: true)
+            /// SIGNAL
+            fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, type: .update)
         }
     }
 
+    /// Upload the changed file
     override func itemChanged(at url: URL) {
-
         let pathComponents = url.pathComponents
         assert(pathComponents.count > 2)
         let itemIdentifier = NSFileProviderItemIdentifier(pathComponents[pathComponents.count - 2])
         let fileName = pathComponents[pathComponents.count - 1]
-        var ocId = itemIdentifier.rawValue
-
-        // Temp ocId ?
-        if outstandingOcIdTemp[ocId] != nil && outstandingOcIdTemp[ocId] != ocId {
-            ocId = outstandingOcIdTemp[ocId]!
-            let atPath = utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue, fileNameView: fileName)
-            let toPath = utilityFileSystem.getDirectoryProviderStorageOcId(ocId, fileNameView: fileName)
-            utilityFileSystem.copyFile(atPath: atPath, toPath: toPath)
-        }
-        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else { return }
-
+        guard let metadata = NCManageDatabase.shared.getMetadataFromOcIdAndOcIdTemp(itemIdentifier.rawValue) else { return }
         let serverUrlFileName = metadata.serverUrl + "/" + fileName
-        let fileNameLocalPath = url.path
-
+        let fileNameLocalPath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: fileName)
+        utilityFileSystem.copyFile(atPath: url.path, toPath: fileNameLocalPath)
+        NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
+                                                   session: NCNetworking.shared.sessionUploadBackgroundExtension,
+                                                   sessionError: "",
+                                                   selector: "",
+                                                   status: NCGlobal.shared.metadataStatusUploading)
         if let task = NKBackground(nkCommonInstance: NextcloudKit.shared.nkCommonInstance).upload(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, dateCreationFile: nil, dateModificationFile: nil, session: NCNetworking.shared.sessionManagerUploadBackgroundExtension) {
-
+            NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
+                                                       status: NCGlobal.shared.metadataStatusUploading,
+                                                       taskIdentifier: task.taskIdentifier)
             fileProviderData.shared.fileProviderManager.register(task, forItemWithIdentifier: NSFileProviderItemIdentifier(metadata.fileId)) { _ in }
         }
     }
 
     override func stopProvidingItem(at url: URL) {
-
-        let fileHasLocalChanges = false
-
-        if !fileHasLocalChanges {
-            // remove the existing file to free up space
-            do {
-                _ = try fpUtility.fileManager.removeItem(at: url)
-            } catch let error {
-                print("error: \(error)")
+        let pathComponents = url.pathComponents
+        assert(pathComponents.count > 2)
+        let itemIdentifier = NSFileProviderItemIdentifier(pathComponents[pathComponents.count - 2])
+        guard let metadata = NCManageDatabase.shared.getMetadataFromOcIdAndOcIdTemp(itemIdentifier.rawValue) else { return }
+        if metadata.session == NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload {
+            NextcloudKit.shared.sessionManager.session.getTasksWithCompletionHandler { _, _, downloadTasks in
+                downloadTasks.forEach { task in
+                    if metadata.sessionTaskIdentifier == task.taskIdentifier {
+                        task.cancel()
+                    }
+                }
             }
-
-            // write out a placeholder to facilitate future property lookups
-            self.providePlaceholder(at: url, completionHandler: { _ in
-                // handle any error, do any necessary cleanup
-            })
-        }
-
-        // Download task
-        if let downloadTask = outstandingSessionTasks[url] {
-            downloadTask.cancel()
-            outstandingSessionTasks.removeValue(forKey: url)
         }
     }
 
     override func importDocument(at fileURL: URL, toParentItemIdentifier parentItemIdentifier: NSFileProviderItemIdentifier, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) {
-
         DispatchQueue.main.async {
-
             autoreleasepool {
-
+                guard let tableDirectory = self.providerUtility.getTableDirectoryFromParentItemIdentifier(parentItemIdentifier, account: fileProviderData.shared.account, homeServerUrl: fileProviderData.shared.homeServerUrl) else {
+                    return completionHandler(nil, NSFileProviderError(.noSuchItem))
+                }
                 var size = 0 as Int64
                 var error: NSError?
-
-                guard let tableDirectory = self.fpUtility.getTableDirectoryFromParentItemIdentifier(parentItemIdentifier, account: fileProviderData.shared.account, homeServerUrl: fileProviderData.shared.homeServerUrl) else {
-                    completionHandler(nil, NSFileProviderError(.noSuchItem))
-                    return
-                }
-
                 _ = fileURL.startAccessingSecurityScopedResource()
-
                 // typefile directory ? (NOT PERMITTED)
                 do {
-                    let attributes = try self.fpUtility.fileManager.attributesOfItem(atPath: fileURL.path)
+                    let attributes = try self.providerUtility.fileManager.attributesOfItem(atPath: fileURL.path)
                     size = attributes[FileAttributeKey.size] as? Int64 ?? 0
                     let typeFile = attributes[FileAttributeKey.type] as? FileAttributeType
                     if typeFile == FileAttributeType.typeDirectory {
-                        completionHandler(nil, NSFileProviderError(.noSuchItem))
-                        return
+                        return completionHandler(nil, NSFileProviderError(.noSuchItem))
                     }
                 } catch {
-                    completionHandler(nil, NSFileProviderError(.noSuchItem))
-                    return
+                    return completionHandler(nil, NSFileProviderError(.noSuchItem))
                 }
 
                 let fileName = self.utilityFileSystem.createFileName(fileURL.lastPathComponent, serverUrl: tableDirectory.serverUrl, account: fileProviderData.shared.account)
                 let ocIdTemp = NSUUID().uuidString.lowercased()
 
                 NSFileCoordinator().coordinate(readingItemAt: fileURL, options: .withoutChanges, error: &error) { url in
-                    _ = self.fpUtility.copyFile(url.path, toPath: self.utilityFileSystem.getDirectoryProviderStorageOcId(ocIdTemp, fileNameView: fileName))
+                    self.providerUtility.copyFile(url.path, toPath: self.utilityFileSystem.getDirectoryProviderStorageOcId(ocIdTemp, fileNameView: fileName))
                 }
 
                 fileURL.stopAccessingSecurityScopedResource()
@@ -366,71 +300,15 @@ class FileProviderExtension: NSFileProviderExtension {
                 let fileNameLocalPath = self.utilityFileSystem.getDirectoryProviderStorageOcId(ocIdTemp, fileNameView: fileName)
 
                 if let task = NKBackground(nkCommonInstance: NextcloudKit.shared.nkCommonInstance).upload(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, dateCreationFile: nil, dateModificationFile: nil, session: NCNetworking.shared.sessionManagerUploadBackgroundExtension) {
-
-                    self.outstandingSessionTasks[URL(fileURLWithPath: fileNameLocalPath)] = task as URLSessionTask
-
+                    NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
+                                                               status: NCGlobal.shared.metadataStatusUploading,
+                                                               taskIdentifier: task.taskIdentifier)
                     fileProviderData.shared.fileProviderManager.register(task, forItemWithIdentifier: NSFileProviderItemIdentifier(ocIdTemp)) { _ in }
                 }
 
                 let item = FileProviderItem(metadata: tableMetadata.init(value: metadata), parentItemIdentifier: parentItemIdentifier)
-
                 completionHandler(item, nil)
             }
         }
     }
-
-    func uploadComplete(fileName: String, serverUrl: String, ocId: String?, etag: String?, date: NSDate?, size: Int64, fileNameLocalPath: String?, task: URLSessionTask, error: NKError) {
-
-        guard let metadataTemp = NCManageDatabase.shared.getMetadataFromFileNameLocalPath(fileNameLocalPath) else { return }
-        let ocIdTemp = metadataTemp.ocId
-        let metadata = tableMetadata.init(value: metadataTemp)
-
-        let url = URL(fileURLWithPath: utilityFileSystem.getDirectoryProviderStorageOcId(ocIdTemp, fileNameView: fileName))
-        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-            self.outstandingSessionTasks.removeValue(forKey: url)
-        }
-        outstandingOcIdTemp[ocIdTemp] = ocId
-
-        if error == .success {
-
-            // New file
-            if ocId != ocIdTemp {
-                // Signal update
-                fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, delete: true)
-            }
-
-            metadata.fileName = fileName
-            metadata.serverUrl = serverUrl
-            if let etag = etag { metadata.etag = etag }
-            if let ocId = ocId { metadata.ocId = ocId }
-            if let date = date { metadata.date = date }
-            metadata.permissions = "RGDNVW"
-            metadata.session = ""
-            metadata.size = size
-            metadata.status = NCGlobal.shared.metadataStatusNormal
-
-            NCManageDatabase.shared.addMetadata(metadata)
-            NCManageDatabase.shared.addLocalFile(metadata: metadata)
-
-            // New file
-            if let ocId, ocId != ocIdTemp {
-
-                NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocIdTemp))
-
-                // File system
-                let atPath = utilityFileSystem.getDirectoryProviderStorageOcId(ocIdTemp)
-                let toPath = utilityFileSystem.getDirectoryProviderStorageOcId(ocId)
-                utilityFileSystem.copyFile(atPath: atPath, toPath: toPath)
-            }
-
-            fileProviderData.shared.signalEnumerator(ocId: metadata.ocId, update: true)
-
-        } else {
-
-            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocIdTemp))
-
-            fileProviderData.shared.signalEnumerator(ocId: ocIdTemp, delete: true)
-        }
-    }
-
 }
diff --git a/File Provider Extension/FileProviderItem.swift b/File Provider Extension/FileProviderItem.swift
index c9ef7274a3..e5f2ba0cc9 100644
--- a/File Provider Extension/FileProviderItem.swift	
+++ b/File Provider Extension/FileProviderItem.swift	
@@ -24,102 +24,101 @@
 import UIKit
 import FileProvider
 import NextcloudKit
+import UniformTypeIdentifiers
 
 class FileProviderItem: NSObject, NSFileProviderItem {
-
     var metadata: tableMetadata
-    var parentItemIdentifier: NSFileProviderItemIdentifier
-
+    /// Providing Required Properties
     var itemIdentifier: NSFileProviderItemIdentifier {
         return fileProviderUtility().getItemIdentifier(metadata: metadata)
     }
-
     var filename: String {
         return metadata.fileNameView
     }
-
-    var documentSize: NSNumber? {
-        return NSNumber(value: metadata.size)
-    }
-
     var typeIdentifier: String {
         let results = NextcloudKit.shared.nkCommonInstance.getInternalType(fileName: metadata.fileNameView, mimeType: "", directory: metadata.directory)
         return results.typeIdentifier
     }
-
-    var contentModificationDate: Date? {
-        return metadata.date as Date
-    }
-
-    var creationDate: Date? {
-        return metadata.creationDate as Date
-    }
-
-    var lastUsedDate: Date? {
-        return metadata.date as Date
-    }
-
     var capabilities: NSFileProviderItemCapabilities {
-        guard !metadata.directory else {
+        if metadata.directory {
             return [ .allowsAddingSubItems, .allowsContentEnumerating, .allowsReading, .allowsDeleting, .allowsRenaming ]
-        }
-        guard !metadata.lock else {
+        } else if metadata.lock {
             return [ .allowsReading ]
         }
         return [ .allowsWriting, .allowsReading, .allowsDeleting, .allowsRenaming, .allowsReparenting ]
     }
-
+    /// Managing Content
+    var childItemCount: NSNumber? {
+        return metadata.directory ? nil : nil
+    }
+    var documentSize: NSNumber? {
+        return metadata.directory ? nil : NSNumber(value: metadata.size)
+    }
+    /// Specifying Content Location
+    var parentItemIdentifier: NSFileProviderItemIdentifier
     var isTrashed: Bool {
         return false
     }
-
-    var childItemCount: NSNumber? {
+    var symlinkTargetPath: String? {
         return nil
     }
-
+    /// Tracking Usage
+    var contentModificationDate: Date? {
+        return metadata.date as Date
+    }
+    var creationDate: Date? {
+        return metadata.creationDate as Date
+    }
+    var lastUsedDate: Date? {
+        return metadata.date as Date
+    }
+    /// Tracking Versions
     var versionIdentifier: Data? {
         return metadata.etag.data(using: .utf8)
     }
-
-    var tagData: Data? {
-        if let tableTag = NCManageDatabase.shared.getTag(predicate: NSPredicate(format: "ocId == %@", metadata.ocId)) {
-            return tableTag.tagIOS
+    var isMostRecentVersionDownloaded: Bool {
+        if NCManageDatabase.shared.getTableLocalFile(ocId: metadata.ocId) == nil {
+            return false
         } else {
-            return nil
+            return true
         }
     }
-
-    var favoriteRank: NSNumber? {
-        if let rank = fileProviderData.shared.listFavoriteIdentifierRank[metadata.ocId] {
-            return rank
+    /// Monitoring File Transfers
+    var isUploading: Bool {
+        if metadata.status == NCGlobal.shared.metadataStatusWaitUpload || metadata.status == NCGlobal.shared.metadataStatusUploading {
+            return true
         } else {
-            return nil
+            return false
         }
     }
-
-    var isMostRecentVersionDownloaded: Bool {
-        return true
-    }
-
-    var isDownloaded: Bool {
-        if metadata.directory {
+    var isUploaded: Bool {
+        if metadata.status == NCGlobal.shared.metadataStatusWaitUpload || metadata.status == NCGlobal.shared.metadataStatusUploading || metadata.status == NCGlobal.shared.metadataStatusUploadError {
+            return false
+        } else {
             return true
         }
-        if NCUtilityFileSystem().fileProviderStorageExists(metadata) {
+    }
+    var uploadingError: Error? {
+        if metadata.status == NCGlobal.shared.metadataStatusUploadError {
+            return fileProviderData.FileProviderError.uploadError
+        } else {
+            return nil
+        }
+    }
+    var isDownloading: Bool {
+        if metadata.status == NCGlobal.shared.metadataStatusWaitDownload || metadata.status == NCGlobal.shared.metadataStatusDownloading {
             return true
         } else {
             return false
         }
     }
-
-    var isDownloading: Bool {
-        if metadata.status == NCGlobal.shared.metadataStatusDownloading {
+    var isDownloaded: Bool {
+        if NCUtilityFileSystem().fileProviderStorageExists(metadata) {
             return true
         } else {
             return false
         }
     }
-
     var downloadingError: Error? {
         if metadata.status == NCGlobal.shared.metadataStatusDownloadError {
             return fileProviderData.FileProviderError.downloadError
@@ -127,33 +126,25 @@ class FileProviderItem: NSObject, NSFileProviderItem {
             return nil
         }
     }
-
-    var isUploaded: Bool {
-        if NCManageDatabase.shared.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId)) != nil {
-            return true
-        } else {
-            return false
-        }
-    }
-
-    var isUploading: Bool {
-        if metadata.status == NCGlobal.shared.metadataStatusUploading {
-            return true
+    /// Sharing
+    /// Managing Metadata
+    var tagData: Data? {
+        if let tableTag = NCManageDatabase.shared.getTag(predicate: NSPredicate(format: "ocId == %@", metadata.ocId)) {
+            return tableTag.tagIOS
         } else {
-            return false
+            return nil
         }
     }
-
-    var uploadingError: Error? {
-        if metadata.status == NCGlobal.shared.metadataStatusUploadError {
-            return fileProviderData.FileProviderError.uploadError
+    var favoriteRank: NSNumber? {
+        if let rank = fileProviderData.shared.listFavoriteIdentifierRank[metadata.ocId] {
+            return rank
         } else {
             return nil
         }
     }
 
     init(metadata: tableMetadata, parentItemIdentifier: NSFileProviderItemIdentifier) {
-        self.metadata = metadata
+        self.metadata = tableMetadata(value: metadata)
         self.parentItemIdentifier = parentItemIdentifier
     }
 }
diff --git a/File Provider Extension/FileProviderUtility.swift b/File Provider Extension/FileProviderUtility.swift
index baa27d27d0..68c05440bd 100644
--- a/File Provider Extension/FileProviderUtility.swift	
+++ b/File Provider Extension/FileProviderUtility.swift	
@@ -24,40 +24,24 @@
 import UIKit
 
 class fileProviderUtility: NSObject {
-
     let fileManager = FileManager()
     let utilityFileSystem = NCUtilityFileSystem()
 
     func getAccountFromItemIdentifier(_ itemIdentifier: NSFileProviderItemIdentifier) -> String? {
-
         let ocId = itemIdentifier.rawValue
         return NCManageDatabase.shared.getMetadataFromOcId(ocId)?.account
     }
 
     func getTableMetadataFromItemIdentifier(_ itemIdentifier: NSFileProviderItemIdentifier) -> tableMetadata? {
-
         let ocId = itemIdentifier.rawValue
         return NCManageDatabase.shared.getMetadataFromOcId(ocId)
     }
 
     func getItemIdentifier(metadata: tableMetadata) -> NSFileProviderItemIdentifier {
-
         return NSFileProviderItemIdentifier(metadata.ocId)
     }
 
-    func createocIdentifierOnFileSystem(metadata: tableMetadata) {
-
-        let itemIdentifier = getItemIdentifier(metadata: metadata)
-
-        if metadata.directory {
-            _ = utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue)
-        } else {
-            _ = utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue, fileNameView: metadata.fileNameView)
-        }
-    }
-
     func getParentItemIdentifier(metadata: tableMetadata) -> NSFileProviderItemIdentifier? {
-
         let homeServerUrl = utilityFileSystem.getHomeServer(urlBase: metadata.urlBase, userId: metadata.userId)
         if let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) {
             if directory.serverUrl == homeServerUrl {
@@ -70,36 +54,23 @@ class fileProviderUtility: NSObject {
                 }
             }
         }
-
         return nil
     }
 
     func getTableDirectoryFromParentItemIdentifier(_ parentItemIdentifier: NSFileProviderItemIdentifier, account: String, homeServerUrl: String) -> tableDirectory? {
-
         var predicate: NSPredicate
-
         if parentItemIdentifier == .rootContainer {
-
             predicate = NSPredicate(format: "account == %@ AND serverUrl == %@", account, homeServerUrl)
-
         } else {
-
             guard let metadata = getTableMetadataFromItemIdentifier(parentItemIdentifier) else { return nil }
             predicate = NSPredicate(format: "ocId == %@", metadata.ocId)
         }
-
         guard let directory = NCManageDatabase.shared.getTableDirectory(predicate: predicate) else { return nil }
-
         return directory
     }
 
-    // MARK: -
-
-    func copyFile(_ atPath: String, toPath: String) -> Error? {
-
-        var errorResult: Error?
-
-        if !fileManager.fileExists(atPath: atPath) { return NSError(domain: NSCocoaErrorDomain, code: NSFileNoSuchFileError, userInfo: [:]) }
+    func copyFile(_ atPath: String, toPath: String) {
+        if !fileManager.fileExists(atPath: atPath) { return }
 
         do {
             try fileManager.removeItem(atPath: toPath)
@@ -109,18 +80,12 @@ class fileProviderUtility: NSObject {
         do {
             try fileManager.copyItem(atPath: atPath, toPath: toPath)
         } catch let error {
-            errorResult = error
+            print("error: \(error)")
         }
-
-        return errorResult
     }
 
-    func moveFile(_ atPath: String, toPath: String) -> Error? {
-
-        var errorResult: Error?
-
-        if atPath == toPath { return nil }
-        if !fileManager.fileExists(atPath: atPath) { return NSError(domain: NSCocoaErrorDomain, code: NSFileNoSuchFileError, userInfo: [:]) }
+    func moveFile(_ atPath: String, toPath: String) {
+        if !fileManager.fileExists(atPath: atPath) { return }
 
         do {
             try fileManager.removeItem(atPath: toPath)
@@ -130,26 +95,7 @@ class fileProviderUtility: NSObject {
         do {
             try fileManager.moveItem(atPath: atPath, toPath: toPath)
         } catch let error {
-            errorResult = error
-        }
-
-        return errorResult
-    }
-
-    func deleteFile(_ atPath: String) -> Error? {
-
-        var errorResult: Error?
-
-        do {
-            try fileManager.removeItem(atPath: atPath)
-        } catch let error {
-            errorResult = error
+            print("error: \(error)")
         }
-
-        return errorResult
-    }
-
-    func fileExists(atPath: String) -> Bool {
-        return fileManager.fileExists(atPath: atPath)
     }
 }
diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj
index c1d332c641..c563b89e3f 100644
--- a/Nextcloud.xcodeproj/project.pbxproj
+++ b/Nextcloud.xcodeproj/project.pbxproj
@@ -53,9 +53,9 @@
 		AF8ED1FC2757821000B8DBC4 /* NextcloudUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */; };
 		AF93471227E2341B002537EE /* NCShare+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471127E2341B002537EE /* NCShare+Menu.swift */; };
 		AF93471927E2361E002537EE /* NCShareAdvancePermissionFooter.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */; };
-		AF93471A27E2361E002537EE /* NCShareAdvancePermissionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471527E2361E002537EE /* NCShareAdvancePermissionHeader.swift */; };
+		AF93471A27E2361E002537EE /* NCShareHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471527E2361E002537EE /* NCShareHeader.swift */; };
 		AF93471B27E2361E002537EE /* NCShareAdvancePermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */; };
-		AF93471C27E2361E002537EE /* NCShareAdvancePermissionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF93471727E2361E002537EE /* NCShareAdvancePermissionHeader.xib */; };
+		AF93471C27E2361E002537EE /* NCShareHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF93471727E2361E002537EE /* NCShareHeader.xib */; };
 		AF93471D27E2361E002537EE /* NCShareAdvancePermissionFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */; };
 		AF93474C27E34120002537EE /* NCUtility+Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93474B27E34120002537EE /* NCUtility+Image.swift */; };
 		AF93474E27E3F212002537EE /* NCShareNewUserAddComment.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */; };
@@ -113,7 +113,7 @@
 		F359D86B2A7D03420023F405 /* NCUtility+Exif.swift in Sources */ = {isa = PBXBuildFile; fileRef = F359D8662A7D03420023F405 /* NCUtility+Exif.swift */; };
 		F359D86C2A7D03420023F405 /* NCUtility+Exif.swift in Sources */ = {isa = PBXBuildFile; fileRef = F359D8662A7D03420023F405 /* NCUtility+Exif.swift */; };
 		F359D86D2A7D03420023F405 /* NCUtility+Exif.swift in Sources */ = {isa = PBXBuildFile; fileRef = F359D8662A7D03420023F405 /* NCUtility+Exif.swift */; };
-		F36E64F72B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBarDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F36E64F62B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBarDelegate.swift */; };
+		F36E64F72B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = F36E64F62B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBar.swift */; };
 		F36E64FA2B96236C0085ABB5 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E41315294A19B300839300 /* UIView+Extension.swift */; };
 		F36E64FB2B9733F10085ABB5 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E41315294A19B300839300 /* UIView+Extension.swift */; };
 		F36E64FC2B9733F20085ABB5 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E41315294A19B300839300 /* UIView+Extension.swift */; };
@@ -218,12 +218,15 @@
 		F711A4EB2AF9327D00095DD8 /* UIImage+animatedGIF.m in Sources */ = {isa = PBXBuildFile; fileRef = F713FEFF2472764100214AF6 /* UIImage+animatedGIF.m */; };
 		F711A4EF2AF932B900095DD8 /* SVGKitSwift in Frameworks */ = {isa = PBXBuildFile; productRef = F711A4EE2AF932B900095DD8 /* SVGKitSwift */; };
 		F711D63128F44801003F43C8 /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C9739428F17131002C43E2 /* IntentHandler.swift */; };
+		F713FBE52C31645200F10760 /* NCNetworking+AsyncAwait.swift in Sources */ = {isa = PBXBuildFile; fileRef = F713FBE42C31645200F10760 /* NCNetworking+AsyncAwait.swift */; };
+		F713FBE62C31646400F10760 /* NCNetworking+AsyncAwait.swift in Sources */ = {isa = PBXBuildFile; fileRef = F713FBE42C31645200F10760 /* NCNetworking+AsyncAwait.swift */; };
+		F713FBE72C31646500F10760 /* NCNetworking+AsyncAwait.swift in Sources */ = {isa = PBXBuildFile; fileRef = F713FBE42C31645200F10760 /* NCNetworking+AsyncAwait.swift */; };
+		F713FBE82C31646600F10760 /* NCNetworking+AsyncAwait.swift in Sources */ = {isa = PBXBuildFile; fileRef = F713FBE42C31645200F10760 /* NCNetworking+AsyncAwait.swift */; };
 		F713FF002472764100214AF6 /* UIImage+animatedGIF.m in Sources */ = {isa = PBXBuildFile; fileRef = F713FEFF2472764100214AF6 /* UIImage+animatedGIF.m */; };
 		F7145610296433C80038D028 /* NCDocumentCamera.swift in Sources */ = {isa = PBXBuildFile; fileRef = F714560F296433C80038D028 /* NCDocumentCamera.swift */; };
 		F7145A231D12E3B700CAFEEC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7E70DE91A24DE4100E1B66A /* Localizable.strings */; };
 		F714803B262EBE3900693E51 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F714803A262EBE3900693E51 /* MainInterface.storyboard */; };
 		F7148041262EBE4000693E51 /* NCShareExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7148040262EBE4000693E51 /* NCShareExtension.swift */; };
-		F714804F262ED4F900693E51 /* NCGridCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F78ACD4521903D010088454D /* NCGridCell.xib */; };
 		F7148054262ED51000693E51 /* NCListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F78ACD4321903CF20088454D /* NCListCell.xib */; };
 		F714805E262ED52900693E51 /* NCSectionFooter.xib in Resources */ = {isa = PBXBuildFile; fileRef = F78ACD53219047D40088454D /* NCSectionFooter.xib */; };
 		F7160A7D2BE931DE0034DCB3 /* RealmSwift in Frameworks */ = {isa = PBXBuildFile; productRef = F7160A7C2BE931DE0034DCB3 /* RealmSwift */; };
@@ -407,6 +410,7 @@
 		F746EC51273906C40052598D /* NCViewCertificateDetails.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7BC287D26663F6C004D46C5 /* NCViewCertificateDetails.storyboard */; };
 		F746EC52273906C40052598D /* NCViewCertificateDetails.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7BC287D26663F6C004D46C5 /* NCViewCertificateDetails.storyboard */; };
 		F746EC53273906C50052598D /* NCViewCertificateDetails.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7BC287D26663F6C004D46C5 /* NCViewCertificateDetails.storyboard */; };
+		F747EB0D2C4AC1FF00F959A8 /* NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = F747EB0C2C4AC1FF00F959A8 /* NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift */; };
 		F7490E6B29882A92009DCE94 /* NCGlobal.swift in Sources */ = {isa = PBXBuildFile; fileRef = F702F2CE25EE5B5C008F8E80 /* NCGlobal.swift */; };
 		F7490E6C29882AEA009DCE94 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
 		F7490E6E29882B56009DCE94 /* NCBrand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CCD1EAE01BD00921AC9 /* NCBrand.swift */; };
@@ -463,6 +467,8 @@
 		F74DE14425135B6800917068 /* NCTransfers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F74DE14225135B6800917068 /* NCTransfers.storyboard */; };
 		F7501C322212E57500FB1415 /* NCMedia.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7501C302212E57400FB1415 /* NCMedia.storyboard */; };
 		F7501C332212E57500FB1415 /* NCMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7501C312212E57400FB1415 /* NCMedia.swift */; };
+		F751247C2C42919C00E63DB8 /* NCPhotoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F751247A2C42919C00E63DB8 /* NCPhotoCell.swift */; };
+		F751247E2C42919C00E63DB8 /* NCPhotoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F751247B2C42919C00E63DB8 /* NCPhotoCell.xib */; };
 		F75379202AE2AD9400C0250E /* JGProgressHUD in Frameworks */ = {isa = PBXBuildFile; productRef = F753791F2AE2AD9400C0250E /* JGProgressHUD */; };
 		F75379222AE2ADA100C0250E /* JGProgressHUD in Frameworks */ = {isa = PBXBuildFile; productRef = F75379212AE2ADA100C0250E /* JGProgressHUD */; };
 		F753BA93281FD8020015BFB6 /* EasyTipView in Frameworks */ = {isa = PBXBuildFile; productRef = F753BA92281FD8020015BFB6 /* EasyTipView */; };
@@ -515,7 +521,6 @@
 		F765E9CD295C585800A09ED8 /* NCUploadScanDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = F765E9CC295C585800A09ED8 /* NCUploadScanDocument.swift */; };
 		F765F73125237E3F00391DBE /* NCRecent.swift in Sources */ = {isa = PBXBuildFile; fileRef = F765F72F25237E3F00391DBE /* NCRecent.swift */; };
 		F765F73225237E3F00391DBE /* NCRecent.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F765F73025237E3F00391DBE /* NCRecent.storyboard */; };
-		F76673ED22C901F6007ED366 /* FileProviderDomain.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76673EC22C901F5007ED366 /* FileProviderDomain.swift */; };
 		F76673F022C90434007ED366 /* FileProviderUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76673EF22C90433007ED366 /* FileProviderUtility.swift */; };
 		F76687072B7D067400779E3F /* NCAudioRecorderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76687052B7D067400779E3F /* NCAudioRecorderViewController.swift */; };
 		F76687082B7D067400779E3F /* NCAudioRecorderViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F76687062B7D067400779E3F /* NCAudioRecorderViewController.storyboard */; };
@@ -588,9 +593,12 @@
 		F7725A61251F33BB00D125E0 /* NCFiles.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7725A5F251F33BB00D125E0 /* NCFiles.storyboard */; };
 		F77333882927A72100466E35 /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = F77333872927A72100466E35 /* OpenSSL */; };
 		F774264A22EB4D0000B23912 /* NCSearchUserDropDownCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F774264822EB4D0000B23912 /* NCSearchUserDropDownCell.xib */; };
+		F7743A122C33F0A20034F670 /* NCCollectionViewCommon+CollectionViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7743A112C33F0A20034F670 /* NCCollectionViewCommon+CollectionViewDelegate.swift */; };
+		F7743A142C33F13A0034F670 /* NCCollectionViewCommon+CollectionViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7743A132C33F13A0034F670 /* NCCollectionViewCommon+CollectionViewDataSource.swift */; };
 		F77444F522281649000D5EB0 /* NCGridMediaCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F77444F322281649000D5EB0 /* NCGridMediaCell.swift */; };
 		F77444F622281649000D5EB0 /* NCGridMediaCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F77444F422281649000D5EB0 /* NCGridMediaCell.xib */; };
 		F77444F8222816D5000D5EB0 /* NCPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F77444F7222816D5000D5EB0 /* NCPickerViewController.swift */; };
+		F778231E2C42C07C001BB94F /* NCCollectionViewCommon+MediaLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = F778231D2C42C07C001BB94F /* NCCollectionViewCommon+MediaLayout.swift */; };
 		F77A697D250A0FBC00FF1708 /* NCCollectionViewCommon+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F77A697C250A0FBC00FF1708 /* NCCollectionViewCommon+Menu.swift */; };
 		F77B0F631D118A16002130FE /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7E70DE91A24DE4100E1B66A /* Localizable.strings */; };
 		F77B0F7D1D118A16002130FE /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F7F67BB81A24D27800EE80DA /* Images.xcassets */; };
@@ -664,7 +672,7 @@
 		F78ACD4621903D010088454D /* NCGridCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F78ACD4521903D010088454D /* NCGridCell.xib */; };
 		F78ACD4A21903F850088454D /* NCTrashListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78ACD4821903F850088454D /* NCTrashListCell.swift */; };
 		F78ACD4B21903F850088454D /* NCTrashListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F78ACD4921903F850088454D /* NCTrashListCell.xib */; };
-		F78ACD52219046DC0088454D /* NCSectionHeaderMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78ACD51219046DC0088454D /* NCSectionHeaderMenu.swift */; };
+		F78ACD52219046DC0088454D /* NCSectionFirstHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78ACD51219046DC0088454D /* NCSectionFirstHeader.swift */; };
 		F78ACD54219047D40088454D /* NCSectionFooter.xib in Resources */ = {isa = PBXBuildFile; fileRef = F78ACD53219047D40088454D /* NCSectionFooter.xib */; };
 		F78AF1E72BE938C100F3F060 /* MobileVLCKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = F7792DE429EEE02D005930CE /* MobileVLCKit.xcframework */; };
 		F78AF1E82BE938C100F3F060 /* MobileVLCKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F7792DE429EEE02D005930CE /* MobileVLCKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -691,6 +699,12 @@
 		F798F0E225880608000DAFFD /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70CEF5523E9C7E50007035B /* UIColor+Extension.swift */; };
 		F798F0E725880609000DAFFD /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70CEF5523E9C7E50007035B /* UIColor+Extension.swift */; };
 		F798F0EC2588060A000DAFFD /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70CEF5523E9C7E50007035B /* UIColor+Extension.swift */; };
+		F799DF822C4B7DCC003410B5 /* NCSectionFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F799DF812C4B7DCC003410B5 /* NCSectionFooter.swift */; };
+		F799DF832C4B7DCC003410B5 /* NCSectionFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F799DF812C4B7DCC003410B5 /* NCSectionFooter.swift */; };
+		F799DF852C4B7E56003410B5 /* NCSectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = F799DF842C4B7E56003410B5 /* NCSectionHeader.swift */; };
+		F799DF862C4B7E56003410B5 /* NCSectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = F799DF842C4B7E56003410B5 /* NCSectionHeader.swift */; };
+		F799DF882C4B83CC003410B5 /* NCCollectionViewCommon+EasyTipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F799DF872C4B83CC003410B5 /* NCCollectionViewCommon+EasyTipView.swift */; };
+		F799DF8B2C4B84EB003410B5 /* NCCollectionViewCommon+EndToEndInitialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = F799DF8A2C4B84EB003410B5 /* NCCollectionViewCommon+EndToEndInitialize.swift */; };
 		F79A65C32191D90F00FF6DCC /* NCSelect.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F79A65C22191D90F00FF6DCC /* NCSelect.storyboard */; };
 		F79A65C62191D95E00FF6DCC /* NCSelect.swift in Sources */ = {isa = PBXBuildFile; fileRef = F79A65C52191D95E00FF6DCC /* NCSelect.swift */; };
 		F79B646026CA661600838ACA /* UIControl+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F79B645F26CA661600838ACA /* UIControl+Extension.swift */; };
@@ -716,6 +730,7 @@
 		F7A560442AE15D2900BE8FD6 /* Queuer in Frameworks */ = {isa = PBXBuildFile; productRef = F7A560432AE15D2900BE8FD6 /* Queuer */; };
 		F7A560462AE15D3D00BE8FD6 /* Queuer in Frameworks */ = {isa = PBXBuildFile; productRef = F7A560452AE15D3D00BE8FD6 /* Queuer */; };
 		F7A560482AE15D5000BE8FD6 /* Queuer in Frameworks */ = {isa = PBXBuildFile; productRef = F7A560472AE15D5000BE8FD6 /* Queuer */; };
+		F7A5DF052C3FD11800753FC4 /* FileProviderExtension+NetworkingDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A5DF042C3FD11800753FC4 /* FileProviderExtension+NetworkingDelegate.swift */; };
 		F7A60F86292D215000FCE1F2 /* NCShareAccounts.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A60F84292D215000FCE1F2 /* NCShareAccounts.swift */; };
 		F7A60F87292D215000FCE1F2 /* NCShareAccounts.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7A60F85292D215000FCE1F2 /* NCShareAccounts.storyboard */; };
 		F7A76DC8256A71CD00119AB3 /* UIImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B7504A2397D38E004E13EC /* UIImage+Extension.swift */; };
@@ -746,8 +761,8 @@
 		F7AE00FA230E81EB007ACF8A /* NCBrowserWeb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7AE00F9230E81EB007ACF8A /* NCBrowserWeb.storyboard */; };
 		F7AEEAA62C11DBAF00011412 /* NCAccountSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7AEEAA52C11DBAF00011412 /* NCAccountSettingsView.swift */; };
 		F7AEEAA82C11DBFD00011412 /* NCAccountSettingsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7AEEAA72C11DBFD00011412 /* NCAccountSettingsModel.swift */; };
-		F7B398422A6A91D5007538D6 /* NCSectionHeaderMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7B398412A6A91D5007538D6 /* NCSectionHeaderMenu.xib */; };
-		F7B398432A6A91D5007538D6 /* NCSectionHeaderMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7B398412A6A91D5007538D6 /* NCSectionHeaderMenu.xib */; };
+		F7B398422A6A91D5007538D6 /* NCSectionFirstHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7B398412A6A91D5007538D6 /* NCSectionFirstHeader.xib */; };
+		F7B398432A6A91D5007538D6 /* NCSectionFirstHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7B398412A6A91D5007538D6 /* NCSectionFirstHeader.xib */; };
 		F7B6B70427C4E7FA00A7F6EB /* NCScan+CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B6B70327C4E7FA00A7F6EB /* NCScan+CollectionView.swift */; };
 		F7B7504B2397D38F004E13EC /* UIImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B7504A2397D38E004E13EC /* UIImage+Extension.swift */; };
 		F7B769A82B7A0B2000C1AAEB /* NCManageDatabase+Metadata+Session.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B769A72B7A0B2000C1AAEB /* NCManageDatabase+Metadata+Session.swift */; };
@@ -764,6 +779,9 @@
 		F7BB7E4727A18C56009B9F29 /* Parchment in Frameworks */ = {isa = PBXBuildFile; productRef = F7BB7E4627A18C56009B9F29 /* Parchment */; };
 		F7BC287E26663F6C004D46C5 /* NCViewCertificateDetails.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7BC287D26663F6C004D46C5 /* NCViewCertificateDetails.storyboard */; };
 		F7BC288026663F85004D46C5 /* NCViewCertificateDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BC287F26663F85004D46C5 /* NCViewCertificateDetails.swift */; };
+		F7BD0A002C468925003A4A6D /* NCMedia+CollectionViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BD09FF2C468925003A4A6D /* NCMedia+CollectionViewDataSource.swift */; };
+		F7BD0A022C4689A4003A4A6D /* NCMedia+CollectionViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BD0A012C4689A4003A4A6D /* NCMedia+CollectionViewDelegate.swift */; };
+		F7BD0A042C4689E9003A4A6D /* NCMedia+MediaLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BD0A032C4689E9003A4A6D /* NCMedia+MediaLayout.swift */; };
 		F7BD71E62636EAFC00643C34 /* NCNetworkingE2EE.swift in Sources */ = {isa = PBXBuildFile; fileRef = F785EE9C246196DF00B3F945 /* NCNetworkingE2EE.swift */; };
 		F7BF9D822934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BF9D812934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift */; };
 		F7BF9D832934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BF9D812934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift */; };
@@ -771,6 +789,7 @@
 		F7BF9D852934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BF9D812934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift */; };
 		F7BF9D862934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BF9D812934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift */; };
 		F7BF9D872934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7BF9D812934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift */; };
+		F7C1DAEF2C3D1DF4000BDC69 /* FileProviderDomain.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76673EC22C901F5007ED366 /* FileProviderDomain.swift */; };
 		F7C1EEA525053A9C00866ACC /* NCDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C1EEA425053A9C00866ACC /* NCDataSource.swift */; };
 		F7C30DF6291BC0CA0017149B /* NCNetworkingE2EEUpload.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C30DF5291BC0CA0017149B /* NCNetworkingE2EEUpload.swift */; };
 		F7C30DF7291BC0D30017149B /* NCNetworkingE2EEUpload.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C30DF5291BC0CA0017149B /* NCNetworkingE2EEUpload.swift */; };
@@ -798,10 +817,10 @@
 		F7CA212D25F1333300826ABB /* NCAccountRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CA212B25F1333200826ABB /* NCAccountRequest.swift */; };
 		F7CA212E25F1333300826ABB /* NCAccountRequest.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7CA212C25F1333200826ABB /* NCAccountRequest.storyboard */; };
 		F7CB689A2541676B0050EC94 /* NCMore.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7CB68992541676B0050EC94 /* NCMore.storyboard */; };
-		F7CBC1232BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CBC1212BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib */; };
-		F7CBC1242BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CBC1212BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib */; };
-		F7CBC1252BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift */; };
-		F7CBC1262BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift */; };
+		F7CBC1232BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CBC1212BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib */; };
+		F7CBC1242BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CBC1212BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib */; };
+		F7CBC1252BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift */; };
+		F7CBC1262BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CBC1222BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift */; };
 		F7CEE6002BA9A5C9003EFD89 /* NCTrashGridCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7CEE5FE2BA9A5C9003EFD89 /* NCTrashGridCell.xib */; };
 		F7CEE6012BA9A5C9003EFD89 /* NCTrashGridCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CEE5FF2BA9A5C9003EFD89 /* NCTrashGridCell.swift */; };
 		F7D1612023CF19E30039EBBF /* NCViewerRichWorkspace.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7D1611F23CF19E30039EBBF /* NCViewerRichWorkspace.storyboard */; };
@@ -840,8 +859,7 @@
 		F7EDE4D1262D7B8400414FE6 /* NCDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C1EEA425053A9C00866ACC /* NCDataSource.swift */; };
 		F7EDE4D6262D7B9600414FE6 /* NCListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78ACD4121903CE00088454D /* NCListCell.swift */; };
 		F7EDE4DB262D7BA200414FE6 /* NCCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 370D26AE248A3D7A00121797 /* NCCellProtocol.swift */; };
-		F7EDE4E0262D7BAF00414FE6 /* NCGridCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78ACD3F21903CC20088454D /* NCGridCell.swift */; };
-		F7EDE4E5262D7BBE00414FE6 /* NCSectionHeaderMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78ACD51219046DC0088454D /* NCSectionHeaderMenu.swift */; };
+		F7EDE4E5262D7BBE00414FE6 /* NCSectionFirstHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78ACD51219046DC0088454D /* NCSectionFirstHeader.swift */; };
 		F7EDE509262DA9D600414FE6 /* NCSelectCommandViewSelect.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7EDE508262DA9D600414FE6 /* NCSelectCommandViewSelect.xib */; };
 		F7EDE514262DC2CD00414FE6 /* NCSelectCommandViewSelect+CreateFolder.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7EDE513262DC2CD00414FE6 /* NCSelectCommandViewSelect+CreateFolder.xib */; };
 		F7EDE51B262DD0C400414FE6 /* NCSelectCommandViewCopyMove.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7EDE51A262DD0C400414FE6 /* NCSelectCommandViewCopyMove.xib */; };
@@ -1093,9 +1111,9 @@
 		AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NextcloudUnitTests.swift; sourceTree = "<group>"; };
 		AF93471127E2341B002537EE /* NCShare+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCShare+Menu.swift"; sourceTree = "<group>"; };
 		AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareAdvancePermissionFooter.xib; sourceTree = "<group>"; };
-		AF93471527E2361E002537EE /* NCShareAdvancePermissionHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareAdvancePermissionHeader.swift; sourceTree = "<group>"; };
+		AF93471527E2361E002537EE /* NCShareHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareHeader.swift; sourceTree = "<group>"; };
 		AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareAdvancePermission.swift; sourceTree = "<group>"; };
-		AF93471727E2361E002537EE /* NCShareAdvancePermissionHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareAdvancePermissionHeader.xib; sourceTree = "<group>"; };
+		AF93471727E2361E002537EE /* NCShareHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareHeader.xib; sourceTree = "<group>"; };
 		AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareAdvancePermissionFooter.swift; sourceTree = "<group>"; };
 		AF93474B27E34120002537EE /* NCUtility+Image.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCUtility+Image.swift"; sourceTree = "<group>"; };
 		AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareNewUserAddComment.swift; sourceTree = "<group>"; };
@@ -1118,7 +1136,7 @@
 		F343A4B22A1E01FF00DDA874 /* PHAsset+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PHAsset+Extension.swift"; sourceTree = "<group>"; };
 		F343A4BA2A1E734600DDA874 /* Optional+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Optional+Extension.swift"; sourceTree = "<group>"; };
 		F359D8662A7D03420023F405 /* NCUtility+Exif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCUtility+Exif.swift"; sourceTree = "<group>"; };
-		F36E64F62B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBarDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+SelectTabBarDelegate.swift"; sourceTree = "<group>"; };
+		F36E64F62B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+SelectTabBar.swift"; sourceTree = "<group>"; };
 		F37208742BAB4AB0006B5430 /* TestConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestConstants.swift; sourceTree = "<group>"; };
 		F37208772BAB4B5D006B5430 /* BaseXCTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseXCTestCase.swift; sourceTree = "<group>"; };
 		F38F71242B6BBDC300473CDC /* NCCollectionViewCommonSelectTabBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCollectionViewCommonSelectTabBar.swift; sourceTree = "<group>"; };
@@ -1208,6 +1226,7 @@
 		F710D1F42405770F00A6033D /* NCViewerPDF.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCViewerPDF.swift; sourceTree = "<group>"; };
 		F710D2012405826100A6033D /* NCViewer+Menu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NCViewer+Menu.swift"; sourceTree = "<group>"; };
 		F711A4DB2AF92CAD00095DD8 /* NCUtility+Date.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NCUtility+Date.swift"; sourceTree = "<group>"; };
+		F713FBE42C31645200F10760 /* NCNetworking+AsyncAwait.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCNetworking+AsyncAwait.swift"; sourceTree = "<group>"; };
 		F713FEFE2472764000214AF6 /* UIImage+animatedGIF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+animatedGIF.h"; sourceTree = "<group>"; };
 		F713FEFF2472764100214AF6 /* UIImage+animatedGIF.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+animatedGIF.m"; sourceTree = "<group>"; };
 		F714560F296433C80038D028 /* NCDocumentCamera.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCDocumentCamera.swift; sourceTree = "<group>"; };
@@ -1299,6 +1318,7 @@
 		F7421EAE2294044B00C4B7C1 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
 		F745B250222D871800346520 /* QRCodeReader.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QRCodeReader.framework; path = Carthage/Build/iOS/QRCodeReader.framework; sourceTree = "<group>"; };
 		F745B252222D88AE00346520 /* NCLoginQRCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCLoginQRCode.swift; sourceTree = "<group>"; };
+		F747EB0C2C4AC1FF00F959A8 /* NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift"; sourceTree = "<group>"; };
 		F749B649297B0CBB00087535 /* NCManageDatabase+Share.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCManageDatabase+Share.swift"; sourceTree = "<group>"; };
 		F749B650297B0F2400087535 /* NCManageDatabase+Avatar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCManageDatabase+Avatar.swift"; sourceTree = "<group>"; };
 		F74AF3A3247FB6AE00AC767B /* NCUtilityFileSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCUtilityFileSystem.swift; sourceTree = "<group>"; };
@@ -1311,6 +1331,8 @@
 		F74DE14225135B6800917068 /* NCTransfers.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NCTransfers.storyboard; sourceTree = "<group>"; };
 		F7501C302212E57400FB1415 /* NCMedia.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NCMedia.storyboard; sourceTree = "<group>"; };
 		F7501C312212E57400FB1415 /* NCMedia.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCMedia.swift; sourceTree = "<group>"; };
+		F751247A2C42919C00E63DB8 /* NCPhotoCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCPhotoCell.swift; sourceTree = "<group>"; };
+		F751247B2C42919C00E63DB8 /* NCPhotoCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCPhotoCell.xib; sourceTree = "<group>"; };
 		F75153232226920200323DDC /* FastScroll.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FastScroll.framework; path = Carthage/Build/iOS/FastScroll.framework; sourceTree = "<group>"; };
 		F753701822723D620041C76C /* gl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = gl; path = gl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F753701922723E0D0041C76C /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -1420,9 +1442,12 @@
 		F77439541FCD6D6100662C46 /* es-PY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PY"; path = "es-PY.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F774395B1FCD6D8200662C46 /* es-SV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-SV"; path = "es-SV.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439621FCD6D9C00662C46 /* es-UY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-UY"; path = "es-UY.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		F7743A112C33F0A20034F670 /* NCCollectionViewCommon+CollectionViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+CollectionViewDelegate.swift"; sourceTree = "<group>"; };
+		F7743A132C33F13A0034F670 /* NCCollectionViewCommon+CollectionViewDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+CollectionViewDataSource.swift"; sourceTree = "<group>"; };
 		F77444F322281649000D5EB0 /* NCGridMediaCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCGridMediaCell.swift; sourceTree = "<group>"; };
 		F77444F422281649000D5EB0 /* NCGridMediaCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCGridMediaCell.xib; sourceTree = "<group>"; };
 		F77444F7222816D5000D5EB0 /* NCPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCPickerViewController.swift; sourceTree = "<group>"; };
+		F778231D2C42C07C001BB94F /* NCCollectionViewCommon+MediaLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+MediaLayout.swift"; sourceTree = "<group>"; };
 		F7792DE429EEE02D005930CE /* MobileVLCKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MobileVLCKit.xcframework; path = Carthage/Build/MobileVLCKit.xcframework; sourceTree = "<group>"; };
 		F77A697C250A0FBC00FF1708 /* NCCollectionViewCommon+Menu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+Menu.swift"; sourceTree = "<group>"; };
 		F77BB745289984CA0090FC19 /* UIViewController+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; sourceTree = "<group>"; };
@@ -1452,7 +1477,7 @@
 		F78ACD4521903D010088454D /* NCGridCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCGridCell.xib; sourceTree = "<group>"; };
 		F78ACD4821903F850088454D /* NCTrashListCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCTrashListCell.swift; sourceTree = "<group>"; };
 		F78ACD4921903F850088454D /* NCTrashListCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCTrashListCell.xib; sourceTree = "<group>"; };
-		F78ACD51219046DC0088454D /* NCSectionHeaderMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCSectionHeaderMenu.swift; sourceTree = "<group>"; };
+		F78ACD51219046DC0088454D /* NCSectionFirstHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCSectionFirstHeader.swift; sourceTree = "<group>"; };
 		F78ACD53219047D40088454D /* NCSectionFooter.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCSectionFooter.xib; sourceTree = "<group>"; };
 		F78B87E62B62527100C65ADC /* NCMediaDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMediaDataSource.swift; sourceTree = "<group>"; };
 		F78B87E82B62550800C65ADC /* NCMediaDownloadThumbnaill.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMediaDownloadThumbnaill.swift; sourceTree = "<group>"; };
@@ -1471,6 +1496,10 @@
 		F794E13E2BBC0F70003693D7 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		F79918A021997F9000C2E308 /* UICKeyChainStore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UICKeyChainStore.framework; path = Carthage/Build/iOS/UICKeyChainStore.framework; sourceTree = "<group>"; };
 		F79918A72199840500C2E308 /* Sheeeeeeeeet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sheeeeeeeeet.framework; path = Carthage/Build/iOS/Sheeeeeeeeet.framework; sourceTree = "<group>"; };
+		F799DF812C4B7DCC003410B5 /* NCSectionFooter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCSectionFooter.swift; sourceTree = "<group>"; };
+		F799DF842C4B7E56003410B5 /* NCSectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCSectionHeader.swift; sourceTree = "<group>"; };
+		F799DF872C4B83CC003410B5 /* NCCollectionViewCommon+EasyTipView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+EasyTipView.swift"; sourceTree = "<group>"; };
+		F799DF8A2C4B84EB003410B5 /* NCCollectionViewCommon+EndToEndInitialize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+EndToEndInitialize.swift"; sourceTree = "<group>"; };
 		F79A65C22191D90F00FF6DCC /* NCSelect.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCSelect.storyboard; sourceTree = "<group>"; };
 		F79A65C52191D95E00FF6DCC /* NCSelect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCSelect.swift; sourceTree = "<group>"; };
 		F79B645F26CA661600838ACA /* UIControl+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIControl+Extension.swift"; sourceTree = "<group>"; };
@@ -1483,6 +1512,7 @@
 		F7A48414297028FC00BD1B49 /* Nextcloud Hub.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Nextcloud Hub.png"; sourceTree = SOURCE_ROOT; };
 		F7A509242C26BD5D00326106 /* NCCreateDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCreateDocument.swift; sourceTree = "<group>"; };
 		F7A560412AE1593700BE8FD6 /* NCOperationSaveLivePhoto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCOperationSaveLivePhoto.swift; sourceTree = "<group>"; };
+		F7A5DF042C3FD11800753FC4 /* FileProviderExtension+NetworkingDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileProviderExtension+NetworkingDelegate.swift"; sourceTree = "<group>"; };
 		F7A60F84292D215000FCE1F2 /* NCShareAccounts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareAccounts.swift; sourceTree = "<group>"; };
 		F7A60F85292D215000FCE1F2 /* NCShareAccounts.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NCShareAccounts.storyboard; sourceTree = "<group>"; };
 		F7A7FDDB2C2DBD6200E9A93A /* NCDeepLinkHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCDeepLinkHandler.swift; sourceTree = "<group>"; };
@@ -1539,7 +1569,7 @@
 		F7AF7632246BEDFE00B86E3C /* TOPasscodeViewController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TOPasscodeViewController.framework; path = Carthage/Build/iOS/TOPasscodeViewController.framework; sourceTree = "<group>"; };
 		F7B1076C25D3CF2800E72DE2 /* BackgroundTasks.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BackgroundTasks.framework; path = System/Library/Frameworks/BackgroundTasks.framework; sourceTree = SDKROOT; };
 		F7B1A7761EBB3C8000BFB6D1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
-		F7B398412A6A91D5007538D6 /* NCSectionHeaderMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCSectionHeaderMenu.xib; sourceTree = "<group>"; };
+		F7B398412A6A91D5007538D6 /* NCSectionFirstHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCSectionFirstHeader.xib; sourceTree = "<group>"; };
 		F7B6B70327C4E7FA00A7F6EB /* NCScan+CollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCScan+CollectionView.swift"; sourceTree = "<group>"; };
 		F7B7504A2397D38E004E13EC /* UIImage+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+Extension.swift"; sourceTree = "<group>"; };
 		F7B769A72B7A0B2000C1AAEB /* NCManageDatabase+Metadata+Session.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCManageDatabase+Metadata+Session.swift"; sourceTree = "<group>"; };
@@ -1549,6 +1579,9 @@
 		F7BB04851FD58ACB00BBFD2A /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F7BC287D26663F6C004D46C5 /* NCViewCertificateDetails.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCViewCertificateDetails.storyboard; sourceTree = "<group>"; };
 		F7BC287F26663F85004D46C5 /* NCViewCertificateDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewCertificateDetails.swift; sourceTree = "<group>"; };
+		F7BD09FF2C468925003A4A6D /* NCMedia+CollectionViewDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCMedia+CollectionViewDataSource.swift"; sourceTree = "<group>"; };
+		F7BD0A012C4689A4003A4A6D /* NCMedia+CollectionViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCMedia+CollectionViewDelegate.swift"; sourceTree = "<group>"; };
+		F7BD0A032C4689E9003A4A6D /* NCMedia+MediaLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCMedia+MediaLayout.swift"; sourceTree = "<group>"; };
 		F7BE7C25290AC8C9002ABB61 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Intent.strings; sourceTree = "<group>"; };
 		F7BE7C27290ADEFD002ABB61 /* eu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eu; path = eu.lproj/Intent.strings; sourceTree = "<group>"; };
 		F7BE7C29290ADEFD002ABB61 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Intent.strings; sourceTree = "<group>"; };
@@ -1620,8 +1653,8 @@
 		F7CA212B25F1333200826ABB /* NCAccountRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCAccountRequest.swift; sourceTree = "<group>"; };
 		F7CA212C25F1333200826ABB /* NCAccountRequest.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NCAccountRequest.storyboard; sourceTree = "<group>"; };
 		F7CB68992541676B0050EC94 /* NCMore.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCMore.storyboard; sourceTree = "<group>"; };
-		F7CBC1212BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCSectionHeaderEmptyData.xib; sourceTree = "<group>"; };
-		F7CBC1222BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCSectionHeaderEmptyData.swift; sourceTree = "<group>"; };
+		F7CBC1212BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCSectionFirstHeaderEmptyData.xib; sourceTree = "<group>"; };
+		F7CBC1222BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCSectionFirstHeaderEmptyData.swift; sourceTree = "<group>"; };
 		F7CC04E61F5AD50D00378CEF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7CE8AFA1DC1F8D8009CAE48 /* Nextcloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Nextcloud.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F7CE8AFB1DC1F8D8009CAE48 /* Share.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Share.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1899,8 +1932,6 @@
 				AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */,
 				AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */,
 				AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */,
-				AF93471527E2361E002537EE /* NCShareAdvancePermissionHeader.swift */,
-				AF93471727E2361E002537EE /* NCShareAdvancePermissionHeader.xib */,
 				AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */,
 				AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */,
 			);
@@ -2126,6 +2157,8 @@
 				F774264822EB4D0000B23912 /* NCSearchUserDropDownCell.xib */,
 				F769453B22E9CFFF000A798A /* NCShareUserCell.xib */,
 				AF2D7C7D2742559100ADF566 /* NCShareUserCell.swift */,
+				AF93471727E2361E002537EE /* NCShareHeader.xib */,
+				AF93471527E2361E002537EE /* NCShareHeader.swift */,
 			);
 			path = Share;
 			sourceTree = "<group>";
@@ -2199,6 +2232,7 @@
 				F72CD63925C19EBF00F46F9A /* NCAutoUpload.swift */,
 				F77BC3EC293E528A005F2B08 /* NCConfigServer.swift */,
 				F75A9EE523796C6F0044CFCE /* NCNetworking.swift */,
+				F713FBE42C31645200F10760 /* NCNetworking+AsyncAwait.swift */,
 				F7327E1F2B73A42F00A462C7 /* NCNetworking+Download.swift */,
 				F7327E272B73A53400A462C7 /* NCNetworking+Upload.swift */,
 				F7327E2F2B73A86700A462C7 /* NCNetworking+WebDAV.swift */,
@@ -2245,6 +2279,8 @@
 			isa = PBXGroup;
 			children = (
 				370D26AE248A3D7A00121797 /* NCCellProtocol.swift */,
+				F751247A2C42919C00E63DB8 /* NCPhotoCell.swift */,
+				F751247B2C42919C00E63DB8 /* NCPhotoCell.xib */,
 				F78ACD3F21903CC20088454D /* NCGridCell.swift */,
 				F78ACD4521903D010088454D /* NCGridCell.xib */,
 				F78ACD4121903CE00088454D /* NCListCell.swift */,
@@ -2259,8 +2295,14 @@
 				F75FE06B2BB01D0D00A0EFEF /* Cell */,
 				F78ACD50219046AC0088454D /* Section Header Footer */,
 				F70D7C3525FFBF81002B9E34 /* NCCollectionViewCommon.swift */,
+				F799DF8A2C4B84EB003410B5 /* NCCollectionViewCommon+EndToEndInitialize.swift */,
+				F799DF872C4B83CC003410B5 /* NCCollectionViewCommon+EasyTipView.swift */,
+				F747EB0C2C4AC1FF00F959A8 /* NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift */,
+				F7743A132C33F13A0034F670 /* NCCollectionViewCommon+CollectionViewDataSource.swift */,
+				F7743A112C33F0A20034F670 /* NCCollectionViewCommon+CollectionViewDelegate.swift */,
+				F778231D2C42C07C001BB94F /* NCCollectionViewCommon+MediaLayout.swift */,
 				F7D890742BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift */,
-				F36E64F62B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBarDelegate.swift */,
+				F36E64F62B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBar.swift */,
 				F38F71242B6BBDC300473CDC /* NCCollectionViewCommonSelectTabBar.swift */,
 				F7E7AEA42BA32C6500512E52 /* NCCollectionViewDownloadThumbnail.swift */,
 				F7E7AEA62BA32D0000512E52 /* NCCollectionViewUnifiedSearch.swift */,
@@ -2428,6 +2470,7 @@
 				F76673EC22C901F5007ED366 /* FileProviderDomain.swift */,
 				F771E3D620E2392D00AFB62D /* FileProviderEnumerator.swift */,
 				F771E3D220E2392D00AFB62D /* FileProviderExtension.swift */,
+				F7A5DF042C3FD11800753FC4 /* FileProviderExtension+NetworkingDelegate.swift */,
 				F771E3F420E239B400AFB62D /* FileProviderExtension+Actions.swift */,
 				F771E3F520E239B400AFB62D /* FileProviderExtension+Thumbnail.swift */,
 				F771E3D420E2392D00AFB62D /* FileProviderItem.swift */,
@@ -2470,12 +2513,14 @@
 		F78ACD50219046AC0088454D /* Section Header Footer */ = {
 			isa = PBXGroup;
 			children = (
+				F78ACD51219046DC0088454D /* NCSectionFirstHeader.swift */,
+				F7B398412A6A91D5007538D6 /* NCSectionFirstHeader.xib */,
+				F7CBC1222BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift */,
+				F7CBC1212BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib */,
+				F799DF812C4B7DCC003410B5 /* NCSectionFooter.swift */,
 				F78ACD53219047D40088454D /* NCSectionFooter.xib */,
+				F799DF842C4B7E56003410B5 /* NCSectionHeader.swift */,
 				F7FF2CB02842159500EBB7A1 /* NCSectionHeader.xib */,
-				F7CBC1222BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift */,
-				F7CBC1212BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib */,
-				F7B398412A6A91D5007538D6 /* NCSectionHeaderMenu.xib */,
-				F78ACD51219046DC0088454D /* NCSectionHeaderMenu.swift */,
 			);
 			path = "Section Header Footer";
 			sourceTree = "<group>";
@@ -2595,8 +2640,8 @@
 			isa = PBXGroup;
 			children = (
 				F7C9555221F0C4CA0024296E /* NCActivity.storyboard */,
-				AF56C1DB2784856200D8BAE2 /* NCActivityCommentView.xib */,
 				F7C9555421F0C5470024296E /* NCActivity.swift */,
+				AF56C1DB2784856200D8BAE2 /* NCActivityCommentView.xib */,
 				AFA2AC8427849604008E1EA7 /* NCActivityCommentView.swift */,
 				D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */,
 			);
@@ -2826,8 +2871,11 @@
 				F720B5B72507B9A5008C94E5 /* Cell */,
 				F7501C302212E57400FB1415 /* NCMedia.storyboard */,
 				F7501C312212E57400FB1415 /* NCMedia.swift */,
+				F7BD09FF2C468925003A4A6D /* NCMedia+CollectionViewDataSource.swift */,
+				F7BD0A012C4689A4003A4A6D /* NCMedia+CollectionViewDelegate.swift */,
 				F72408322B8A27C900F128E2 /* NCMedia+Command.swift */,
 				F7802B312BD5584F00D74270 /* NCMedia+DragDrop.swift */,
+				F7BD0A032C4689E9003A4A6D /* NCMedia+MediaLayout.swift */,
 				F78B87E62B62527100C65ADC /* NCMediaDataSource.swift */,
 				F78B87E82B62550800C65ADC /* NCMediaDownloadThumbnaill.swift */,
 				F755CB3F2B8CB13C00CE27E9 /* NCMediaLayout.swift */,
@@ -3614,14 +3662,13 @@
 				F7D57C8626317BDA00DE301D /* NCAccountRequest.storyboard in Resources */,
 				F7E4022C2BA85D1D007E5609 /* PrivacyInfo.xcprivacy in Resources */,
 				AF22B209277B4E4C00DAB0CC /* NCCreateFormUploadConflictCell.xib in Resources */,
-				F7CBC1242BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib in Resources */,
-				F7B398432A6A91D5007538D6 /* NCSectionHeaderMenu.xib in Resources */,
+				F7CBC1242BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib in Resources */,
+				F7B398432A6A91D5007538D6 /* NCSectionFirstHeader.xib in Resources */,
 				AF22B207277B4E4C00DAB0CC /* NCCreateFormUploadConflict.storyboard in Resources */,
 				F7145A231D12E3B700CAFEEC /* Localizable.strings in Resources */,
 				F746EC51273906C40052598D /* NCViewCertificateDetails.storyboard in Resources */,
 				F76C26A62850D3A500E42BDF /* Images.xcassets in Resources */,
 				F79EC784263161BA004E59D6 /* NCRenameFile.storyboard in Resources */,
-				F714804F262ED4F900693E51 /* NCGridCell.xib in Resources */,
 				F714805E262ED52900693E51 /* NCSectionFooter.xib in Resources */,
 				F700222D1EC479840080073F /* Custom.xcassets in Resources */,
 			);
@@ -3678,7 +3725,7 @@
 				F7F4F10B27ECDBDB008676F9 /* Inconsolata-Light.ttf in Resources */,
 				F7CEE6002BA9A5C9003EFD89 /* NCTrashGridCell.xib in Resources */,
 				3704EB2A23D5A58400455C5B /* NCMenu.storyboard in Resources */,
-				AF93471C27E2361E002537EE /* NCShareAdvancePermissionHeader.xib in Resources */,
+				AF93471C27E2361E002537EE /* NCShareHeader.xib in Resources */,
 				F76032A0252F0F8E0015A421 /* NCTransferCell.xib in Resources */,
 				F7F4F10527ECDBDB008676F9 /* Inconsolata-SemiBold.ttf in Resources */,
 				F7A48415297028FC00BD1B49 /* Nextcloud Hub.png in Resources */,
@@ -3695,7 +3742,7 @@
 				F78ACD4B21903F850088454D /* NCTrashListCell.xib in Resources */,
 				AF93471927E2361E002537EE /* NCShareAdvancePermissionFooter.xib in Resources */,
 				F7725A61251F33BB00D125E0 /* NCFiles.storyboard in Resources */,
-				F7CBC1232BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.xib in Resources */,
+				F7CBC1232BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib in Resources */,
 				F700510122DF63AC003A3356 /* NCShare.storyboard in Resources */,
 				F787704F22E7019900F287A9 /* NCShareLinkCell.xib in Resources */,
 				F70753F72542A9C000972D44 /* NCViewerMediaPage.storyboard in Resources */,
@@ -3710,6 +3757,7 @@
 				F7C9555321F0C4CA0024296E /* NCActivity.storyboard in Resources */,
 				F7BC287E26663F6C004D46C5 /* NCViewCertificateDetails.storyboard in Resources */,
 				F78ACD54219047D40088454D /* NCSectionFooter.xib in Resources */,
+				F751247E2C42919C00E63DB8 /* NCPhotoCell.xib in Resources */,
 				F704B5E32430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard in Resources */,
 				F7EDE509262DA9D600414FE6 /* NCSelectCommandViewSelect.xib in Resources */,
 				F732D23327CF8AED000B0F1B /* NCPlayerToolBar.xib in Resources */,
@@ -3726,7 +3774,7 @@
 				F73CB3B222E072A000AD728E /* NCShareHeaderView.xib in Resources */,
 				F7AE00FA230E81EB007ACF8A /* NCBrowserWeb.storyboard in Resources */,
 				F7EDE514262DC2CD00414FE6 /* NCSelectCommandViewSelect+CreateFolder.xib in Resources */,
-				F7B398422A6A91D5007538D6 /* NCSectionHeaderMenu.xib in Resources */,
+				F7B398422A6A91D5007538D6 /* NCSectionFirstHeader.xib in Resources */,
 				F7501C322212E57500FB1415 /* NCMedia.storyboard in Resources */,
 				F74DE14425135B6800917068 /* NCTransfers.storyboard in Resources */,
 				F76687082B7D067400779E3F /* NCAudioRecorderViewController.storyboard in Resources */,
@@ -3916,7 +3964,7 @@
 				F7864ACF2A78FE73004870E0 /* NCManageDatabase+LocalFile.swift in Sources */,
 				F71F6D0A2B6A6A5E00F1EB15 /* ThreadSafeArray.swift in Sources */,
 				F7245925289BB59100474787 /* ThreadSafeDictionary.swift in Sources */,
-				F7EDE4E5262D7BBE00414FE6 /* NCSectionHeaderMenu.swift in Sources */,
+				F7EDE4E5262D7BBE00414FE6 /* NCSectionFirstHeader.swift in Sources */,
 				F7BF9D852934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */,
 				F79EC78926316AC4004E59D6 /* NCPopupViewController.swift in Sources */,
 				F7C30DFB291BCF790017149B /* NCNetworkingE2EECreateFolder.swift in Sources */,
@@ -3924,7 +3972,7 @@
 				F7817CFB29801A3500FFBC65 /* Data+Extension.swift in Sources */,
 				F72429362AFE39860040AEF3 /* NCLivePhoto.swift in Sources */,
 				AF4BF61F27562B3F0081CEEF /* NCManageDatabase+Activity.swift in Sources */,
-				F7CBC1262BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift in Sources */,
+				F7CBC1262BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift in Sources */,
 				F7A0D1362591FBC5008F8A13 /* String+Extension.swift in Sources */,
 				F7EDE4D6262D7B9600414FE6 /* NCListCell.swift in Sources */,
 				F7327E372B73AEDE00A462C7 /* NCNetworking+LivePhoto.swift in Sources */,
@@ -3960,7 +4008,9 @@
 				F7BD71E62636EAFC00643C34 /* NCNetworkingE2EE.swift in Sources */,
 				F7F878AF1FB9E3B900599E4F /* NCEndToEndMetadata.swift in Sources */,
 				F7327E3B2B73B8D600A462C7 /* Array+Extension.swift in Sources */,
+				F799DF832C4B7DCC003410B5 /* NCSectionFooter.swift in Sources */,
 				AF22B218277D196700DAB0CC /* NCShareExtension+Files.swift in Sources */,
+				F799DF862C4B7E56003410B5 /* NCSectionHeader.swift in Sources */,
 				F702F2D025EE5B5C008F8E80 /* NCGlobal.swift in Sources */,
 				F343A4BE2A1E734600DDA874 /* Optional+Extension.swift in Sources */,
 				F72437802C10B92400C7C68D /* NCPermissions.swift in Sources */,
@@ -3975,7 +4025,6 @@
 				F7327E232B73A42F00A462C7 /* NCNetworking+Download.swift in Sources */,
 				F749B64D297B0CBB00087535 /* NCManageDatabase+Share.swift in Sources */,
 				F72FD3B8297ED49A00075D28 /* NCManageDatabase+E2EE.swift in Sources */,
-				F7EDE4E0262D7BAF00414FE6 /* NCGridCell.swift in Sources */,
 				F7A76DC8256A71CD00119AB3 /* UIImage+Extension.swift in Sources */,
 				F711A4E52AF9310500095DD8 /* NCUtility+Image.swift in Sources */,
 				F73EF7AA2B0223900087E6E9 /* NCManageDatabase+Comments.swift in Sources */,
@@ -3987,6 +4036,7 @@
 				F7D57C8B26317BDE00DE301D /* NCAccountRequest.swift in Sources */,
 				F7C30DF7291BC0D30017149B /* NCNetworkingE2EEUpload.swift in Sources */,
 				F78A10C229322E8A008499B8 /* NCManageDatabase+Directory.swift in Sources */,
+				F713FBE72C31646500F10760 /* NCNetworking+AsyncAwait.swift in Sources */,
 				F79FFB272A97C24A0055EEA4 /* NCNetworkingE2EEMarkFolder.swift in Sources */,
 				F7D68FCE28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift in Sources */,
 				F73EF7B22B0224350087E6E9 /* NCManageDatabase+DirectEditing.swift in Sources */,
@@ -4025,6 +4075,7 @@
 				F359D8682A7D03420023F405 /* NCUtility+Exif.swift in Sources */,
 				F7346E1628B0EF5C006CE2D2 /* Widget.swift in Sources */,
 				F78302F828B4C3E100B84583 /* NCManageDatabase+Activity.swift in Sources */,
+				F713FBE62C31646400F10760 /* NCNetworking+AsyncAwait.swift in Sources */,
 				F711A4E92AF9327600095DD8 /* UIImage+animatedGIF.m in Sources */,
 				F73EF7D02B0225BA0087E6E9 /* NCManageDatabase+Tag.swift in Sources */,
 				F783030228B4C4B800B84583 /* NCUtility.swift in Sources */,
@@ -4096,6 +4147,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F713FBE82C31646600F10760 /* NCNetworking+AsyncAwait.swift in Sources */,
 				F36E64FC2B9733F20085ABB5 /* UIView+Extension.swift in Sources */,
 				F771E3F720E239B500AFB62D /* FileProviderExtension+Actions.swift in Sources */,
 				F7245926289BB59300474787 /* ThreadSafeDictionary.swift in Sources */,
@@ -4124,6 +4176,7 @@
 				F7327E2C2B73A53400A462C7 /* NCNetworking+Upload.swift in Sources */,
 				F7D68FCF28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift in Sources */,
 				F73EF7CB2B0225610087E6E9 /* NCManageDatabase+PhotoLibrary.swift in Sources */,
+				F7A5DF052C3FD11800753FC4 /* FileProviderExtension+NetworkingDelegate.swift in Sources */,
 				F33EE6F62BF4C9B200CA1A51 /* PKCS12.swift in Sources */,
 				F73EF7C32B02250B0087E6E9 /* NCManageDatabase+GPS.swift in Sources */,
 				F7C9B9212B582F550064EA91 /* NCManageDatabase+SecurityGuard.swift in Sources */,
@@ -4138,6 +4191,7 @@
 				F7E98C1827E0D0FC001F9F19 /* NCManageDatabase+Video.swift in Sources */,
 				F785EEA42461A4A600B3F945 /* NCUtility.swift in Sources */,
 				F79B646226CA661600838ACA /* UIControl+Extension.swift in Sources */,
+				F7C1DAEF2C3D1DF4000BDC69 /* FileProviderDomain.swift in Sources */,
 				F73EF7AB2B0223900087E6E9 /* NCManageDatabase+Comments.swift in Sources */,
 				F7327E392B73B8D400A462C7 /* Array+Extension.swift in Sources */,
 				F78E2D6929AF02DB0024D4F3 /* Database.swift in Sources */,
@@ -4175,6 +4229,7 @@
 				F7E402332BA89551007E5609 /* NCTrash+Networking.swift in Sources */,
 				F7E7AEA72BA32D0000512E52 /* NCCollectionViewUnifiedSearch.swift in Sources */,
 				F73EF7A72B0223900087E6E9 /* NCManageDatabase+Comments.swift in Sources */,
+				F799DF882C4B83CC003410B5 /* NCCollectionViewCommon+EasyTipView.swift in Sources */,
 				F7AE00F8230E81CB007ACF8A /* NCBrowserWeb.swift in Sources */,
 				F702F30825EE5D47008F8E80 /* NCPopupViewController.swift in Sources */,
 				F733598125C1C188002ABA72 /* NCAskAuthorization.swift in Sources */,
@@ -4187,7 +4242,9 @@
 				F790110E21415BF600D7B136 /* NCViewerRichDocument.swift in Sources */,
 				F78ACD4021903CC20088454D /* NCGridCell.swift in Sources */,
 				F7D890752BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift in Sources */,
+				F7BD0A042C4689E9003A4A6D /* NCMedia+MediaLayout.swift in Sources */,
 				F761856B29E98543006EB3B0 /* NCIntroViewController.swift in Sources */,
+				F7743A142C33F13A0034F670 /* NCCollectionViewCommon+CollectionViewDataSource.swift in Sources */,
 				F75B0ABD244C4DBB00E58DCA /* NCActionCenter.swift in Sources */,
 				AF935067276B84E700BD078F /* NCMenu+FloatingPanel.swift in Sources */,
 				F321DA8A2B71205A00DDA0E6 /* NCTrashSelectTabBar.swift in Sources */,
@@ -4197,6 +4254,7 @@
 				F7802B322BD5584F00D74270 /* NCMedia+DragDrop.swift in Sources */,
 				F7EE66AD2A20B226009AE765 /* UILabel+Extension.swift in Sources */,
 				F78ACD4221903CE00088454D /* NCListCell.swift in Sources */,
+				F7BD0A002C468925003A4A6D /* NCMedia+CollectionViewDataSource.swift in Sources */,
 				F76D3CF12428B40E005DFA87 /* NCViewerPDFSearch.swift in Sources */,
 				F7245924289BB50C00474787 /* ThreadSafeDictionary.swift in Sources */,
 				F73F537F1E929C8500F8678D /* NCMore.swift in Sources */,
@@ -4214,11 +4272,13 @@
 				F7B769A82B7A0B2000C1AAEB /* NCManageDatabase+Metadata+Session.swift in Sources */,
 				F79EDAA326B004980007D134 /* NCPlayerToolBar.swift in Sources */,
 				F7B934FE2BDCFE1E002B2FC9 /* NCDragDrop.swift in Sources */,
+				F713FBE52C31645200F10760 /* NCNetworking+AsyncAwait.swift in Sources */,
 				F77444F8222816D5000D5EB0 /* NCPickerViewController.swift in Sources */,
 				F77BB74A2899857B0090FC19 /* UINavigationController+Extension.swift in Sources */,
 				F7327E282B73A53400A462C7 /* NCNetworking+Upload.swift in Sources */,
 				F769454622E9F1B0000A798A /* NCShareCommon.swift in Sources */,
 				F70753F12542A9A200972D44 /* NCViewerMedia.swift in Sources */,
+				F799DF822C4B7DCC003410B5 /* NCSectionFooter.swift in Sources */,
 				F76B649C2ADFFAED00014640 /* NCImageCache.swift in Sources */,
 				F78A18B823CDE2B300F681F3 /* NCViewerRichWorkspace.swift in Sources */,
 				F768822E2C0DD1E7001CF441 /* NCSettingsBundleHelper.swift in Sources */,
@@ -4235,7 +4295,7 @@
 				F75A9EE623796C6F0044CFCE /* NCNetworking.swift in Sources */,
 				F758B460212C56A400515F55 /* NCScan.swift in Sources */,
 				F76882262C0DD1E7001CF441 /* NCSettingsView.swift in Sources */,
-				F78ACD52219046DC0088454D /* NCSectionHeaderMenu.swift in Sources */,
+				F78ACD52219046DC0088454D /* NCSectionFirstHeader.swift in Sources */,
 				F72944F52A8424F800246839 /* NCEndToEndMetadataV1.swift in Sources */,
 				F710D2022405826100A6033D /* NCViewer+Menu.swift in Sources */,
 				F765E9CD295C585800A09ED8 /* NCUploadScanDocument.swift in Sources */,
@@ -4244,7 +4304,9 @@
 				F7BF9D822934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */,
 				AF7E504E27A2D8FF00B5E4AF /* UIBarButton+Extension.swift in Sources */,
 				F7A846DE2BB01ACB0024816F /* NCTrashCellProtocol.swift in Sources */,
+				F799DF852C4B7E56003410B5 /* NCSectionHeader.swift in Sources */,
 				F78A10BF29322E8A008499B8 /* NCManageDatabase+Directory.swift in Sources */,
+				F7743A122C33F0A20034F670 /* NCCollectionViewCommon+CollectionViewDelegate.swift in Sources */,
 				F704B5E92430C0B800632F5F /* NCCreateFormUploadConflictCell.swift in Sources */,
 				F7327E3D2B73B92800A462C7 /* NCNetworking+Synchronization.swift in Sources */,
 				F72D404923D2082500A97FD0 /* NCViewerNextcloudText.swift in Sources */,
@@ -4255,9 +4317,8 @@
 				F76882362C0DD1E7001CF441 /* NCAcknowledgementsView.swift in Sources */,
 				F785EE9D246196DF00B3F945 /* NCNetworkingE2EE.swift in Sources */,
 				F724377B2C10B83E00C7C68D /* NCPermissions.swift in Sources */,
-				F76673ED22C901F6007ED366 /* FileProviderDomain.swift in Sources */,
 				F794E13D2BBBFF2E003693D7 /* NCMainTabBarController.swift in Sources */,
-				F7CBC1252BAC8B0000EC1D55 /* NCSectionHeaderEmptyData.swift in Sources */,
+				F7CBC1252BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift in Sources */,
 				F75C0C4823D1FAE300163CC8 /* NCRichWorkspaceCommon.swift in Sources */,
 				F78ACD4A21903F850088454D /* NCTrashListCell.swift in Sources */,
 				F76882352C0DD1E7001CF441 /* NCWebBrowserView.swift in Sources */,
@@ -4294,9 +4355,10 @@
 				F7E98C1627E0D0FC001F9F19 /* NCManageDatabase+Video.swift in Sources */,
 				F7F4F11227ECDC52008676F9 /* UIFont+Extension.swift in Sources */,
 				F76882222C0DD1E7001CF441 /* NCCapabilitiesView.swift in Sources */,
-				AF93471A27E2361E002537EE /* NCShareAdvancePermissionHeader.swift in Sources */,
+				AF93471A27E2361E002537EE /* NCShareHeader.swift in Sources */,
 				F7F878AE1FB9E3B900599E4F /* NCEndToEndMetadata.swift in Sources */,
 				F7A7FDDD2C2DBD6200E9A93A /* NCDeepLinkHandler.swift in Sources */,
+				F778231E2C42C07C001BB94F /* NCCollectionViewCommon+MediaLayout.swift in Sources */,
 				3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */,
 				F710D1F52405770F00A6033D /* NCViewerPDF.swift in Sources */,
 				F7B6B70427C4E7FA00A7F6EB /* NCScan+CollectionView.swift in Sources */,
@@ -4315,6 +4377,7 @@
 				F7145610296433C80038D028 /* NCDocumentCamera.swift in Sources */,
 				F76882312C0DD1E7001CF441 /* NCFileNameView.swift in Sources */,
 				F7381EE1218218C9000B1560 /* NCOffline.swift in Sources */,
+				F751247C2C42919C00E63DB8 /* NCPhotoCell.swift in Sources */,
 				F7A509252C26BD5D00326106 /* NCCreateDocument.swift in Sources */,
 				F7FA80002C0F4F3B0072FC60 /* NCUploadAssetsModel.swift in Sources */,
 				F719D9E2288D396100762E33 /* NCColorPicker.swift in Sources */,
@@ -4322,6 +4385,7 @@
 				F79B646026CA661600838ACA /* UIControl+Extension.swift in Sources */,
 				F768823E2C0DD305001CF441 /* LazyView.swift in Sources */,
 				F7CA212D25F1333300826ABB /* NCAccountRequest.swift in Sources */,
+				F747EB0D2C4AC1FF00F959A8 /* NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift in Sources */,
 				F765F73125237E3F00391DBE /* NCRecent.swift in Sources */,
 				F76B3CCE1EAE01BD00921AC9 /* NCBrand.swift in Sources */,
 				F7FA7FFC2C0F4EE40072FC60 /* NCViewerQuickLookView.swift in Sources */,
@@ -4338,6 +4402,7 @@
 				F76882302C0DD1E7001CF441 /* NCFileNameModel.swift in Sources */,
 				F72FD3B5297ED49A00075D28 /* NCManageDatabase+E2EE.swift in Sources */,
 				F73EF7CF2B0225BA0087E6E9 /* NCManageDatabase+Tag.swift in Sources */,
+				F7BD0A022C4689A4003A4A6D /* NCMedia+CollectionViewDelegate.swift in Sources */,
 				F3A047982BD2668800658E7B /* NCAssistantCreateNewTask.swift in Sources */,
 				AF93471227E2341B002537EE /* NCShare+Menu.swift in Sources */,
 				F7EFA47825ADBA500083159A /* NCViewerProviderContextMenu.swift in Sources */,
@@ -4351,7 +4416,7 @@
 				F76D364628A4F8BF00214537 /* NCActivityIndicator.swift in Sources */,
 				F3A047992BD2668800658E7B /* NCAssistantTask.swift in Sources */,
 				F76882322C0DD1E7001CF441 /* NCAutoUploadView.swift in Sources */,
-				F36E64F72B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBarDelegate.swift in Sources */,
+				F36E64F72B9245210085ABB5 /* NCCollectionViewCommon+SelectTabBar.swift in Sources */,
 				F79A65C62191D95E00FF6DCC /* NCSelect.swift in Sources */,
 				F75D19E325EFE09000D74598 /* NCTrash+Menu.swift in Sources */,
 				F70CAE3A1F8CF31A008125FD /* NCEndToEndEncryption.m in Sources */,
@@ -4393,6 +4458,7 @@
 				F76882232C0DD1E7001CF441 /* NCCapabilitiesModel.swift in Sources */,
 				F7D68FCC28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift in Sources */,
 				F76882292C0DD1E7001CF441 /* NCManageE2EEModel.swift in Sources */,
+				F799DF8B2C4B84EB003410B5 /* NCCollectionViewCommon+EndToEndInitialize.swift in Sources */,
 				F78E2D6529AF02DB0024D4F3 /* Database.swift in Sources */,
 				F70CEF5623E9C7E50007035B /* UIColor+Extension.swift in Sources */,
 				F76882242C0DD1E7001CF441 /* NCSettingsAdvancedView.swift in Sources */,
@@ -5348,7 +5414,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 11;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -5375,7 +5441,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.2;
+				MARKETING_VERSION = 5.5.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-v";
 				OTHER_LDFLAGS = "";
@@ -5414,7 +5480,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -5438,7 +5504,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.2;
+				MARKETING_VERSION = 5.5.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-v";
 				OTHER_LDFLAGS = "";
@@ -5713,7 +5779,7 @@
 			repositoryURL = "https://github.com/nextcloud/NextcloudKit";
 			requirement = {
 				kind = exactVersion;
-				version = 3.0.2;
+				version = 4.0.3;
 			};
 		};
 		F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {
diff --git a/Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension UI.xcscheme b/Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension UI.xcscheme
new file mode 100644
index 0000000000..c06627e268
--- /dev/null
+++ b/Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension UI.xcscheme	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F70716E22987F81400E72C1D"
+               BuildableName = "File Provider Extension UI.appex"
+               BlueprintName = "File Provider Extension UI"
+               ReferencedContainer = "container:Nextcloud.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F77B0DEB1D118A16002130FE"
+               BuildableName = "Nextcloud.app"
+               BlueprintName = "Nextcloud"
+               ReferencedContainer = "container:Nextcloud.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F77B0DEB1D118A16002130FE"
+            BuildableName = "Nextcloud.app"
+            BlueprintName = "Nextcloud"
+            ReferencedContainer = "container:Nextcloud.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F77B0DEB1D118A16002130FE"
+            BuildableName = "Nextcloud.app"
+            BlueprintName = "Nextcloud"
+            ReferencedContainer = "container:Nextcloud.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Nextcloud.xcodeproj/xcshareddata/xcschemes/WidgetDashboardIntentHandler.xcscheme b/Nextcloud.xcodeproj/xcshareddata/xcschemes/WidgetDashboardIntentHandler.xcscheme
new file mode 100644
index 0000000000..e7fe4caf7c
--- /dev/null
+++ b/Nextcloud.xcodeproj/xcshareddata/xcschemes/WidgetDashboardIntentHandler.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F7C9738F28F17131002C43E2"
+               BuildableName = "WidgetDashboardIntentHandler.appex"
+               BlueprintName = "WidgetDashboardIntentHandler"
+               ReferencedContainer = "container:Nextcloud.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F77B0DEB1D118A16002130FE"
+               BuildableName = "Nextcloud.app"
+               BlueprintName = "Nextcloud"
+               ReferencedContainer = "container:Nextcloud.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F77B0DEB1D118A16002130FE"
+            BuildableName = "Nextcloud.app"
+            BlueprintName = "Nextcloud"
+            ReferencedContainer = "container:Nextcloud.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F77B0DEB1D118A16002130FE"
+            BuildableName = "Nextcloud.app"
+            BlueprintName = "Nextcloud"
+            ReferencedContainer = "container:Nextcloud.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Notification Service Extension/NotificationService.swift b/Notification Service Extension/NotificationService.swift
index 24efbc8e92..b2d6bc1490 100644
--- a/Notification Service Extension/NotificationService.swift	
+++ b/Notification Service Extension/NotificationService.swift	
@@ -46,7 +46,7 @@ class NotificationService: UNNotificationServiceExtension {
                         if var json = try JSONSerialization.jsonObject(with: data) as? [String: AnyObject],
                            let subject = json["subject"] as? String {
                             bestAttemptContent.body = subject
-                            if let pref = UserDefaults(suiteName: NCBrandOptions.shared.capabilitiesGroups) {
+                            if let pref = UserDefaults(suiteName: NCBrandOptions.shared.capabilitiesGroup) {
                                 json["account"] = tableAccount.account as AnyObject
                                 pref.set(json, forKey: "NOTIFICATION_DATA")
                                 pref.synchronize()
diff --git a/Share/NCShareCell.swift b/Share/NCShareCell.swift
index 4b8c5f93f1..5ad6b759a0 100644
--- a/Share/NCShareCell.swift
+++ b/Share/NCShareCell.swift
@@ -50,12 +50,10 @@ class NCShareCell: UITableViewCell {
 
         if let image = UIImage.downsample(imageAt: URL(fileURLWithPath: NSTemporaryDirectory() + fileName), to: CGSize(width: 80, height: 80)) {
             imageCell.image = image
+            imageCell.contentMode = .scaleAspectFill
         } else {
-            if !resultInternalType.iconName.isEmpty {
-                imageCell?.image = UIImage(named: resultInternalType.iconName)
-            } else {
-                imageCell?.image = NCImageCache.images.file
-            }
+            imageCell.image = utility.loadImage(named: resultInternalType.iconName, useTypeIconFile: true)
+            imageCell.contentMode = .scaleAspectFit
         }
 
         fileNameCell?.text = fileName
diff --git a/Share/NCShareExtension+DataSource.swift b/Share/NCShareExtension+DataSource.swift
index 883a8b6e9e..2d10a75bf8 100644
--- a/Share/NCShareExtension+DataSource.swift
+++ b/Share/NCShareExtension+DataSource.swift
@@ -42,7 +42,7 @@ extension NCShareExtension: UICollectionViewDelegate {
 
     func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
         if kind == UICollectionView.elementKindSectionHeader {
-            guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeaderEmptyData", for: indexPath) as? NCSectionHeaderEmptyData else { return NCSectionHeaderEmptyData() }
+            guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFirstHeaderEmptyData", for: indexPath) as? NCSectionFirstHeaderEmptyData else { return NCSectionFirstHeaderEmptyData() }
             if self.dataSourceTask?.state == .running {
                 header.emptyImage.image = utility.loadImage(named: "wifi", colors: [NCBrandColor.shared.brandElement])
                 header.emptyTitle.text = NSLocalizedString("_request_in_progress_", comment: "")
@@ -80,7 +80,6 @@ extension NCShareExtension: UICollectionViewDataSource {
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-
         guard let metadata = dataSource.cellForItemAt(indexPath: indexPath), let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "listCell", for: indexPath) as? NCListCell else {
             return UICollectionViewCell()
         }
@@ -92,7 +91,6 @@ extension NCShareExtension: UICollectionViewDataSource {
         cell.fileUser = metadata.ownerId
         cell.labelTitle.text = metadata.fileNameView
         cell.labelTitle.textColor = NCBrandColor.shared.textColor
-
         cell.imageSelect.image = nil
         cell.imageStatus.image = nil
         cell.imageLocal.image = nil
@@ -101,14 +99,12 @@ extension NCShareExtension: UICollectionViewDataSource {
         cell.imageMore.image = nil
         cell.imageItem.image = nil
         cell.imageItem.backgroundColor = nil
-
         cell.progressView.progress = 0.0
 
         if metadata.directory {
             setupDirectoryCell(cell, indexPath: indexPath, with: metadata)
         }
 
-        // image Favorite
         if metadata.favorite {
             cell.imageFavorite.image = NCImageCache.images.favorite
         }
@@ -117,17 +113,14 @@ extension NCShareExtension: UICollectionViewDataSource {
         cell.backgroundView = nil
         cell.hideButtonMore(true)
         cell.hideButtonShare(true)
-        cell.selectMode(false)
+        cell.selected(false, isEditMode: false)
 
-        // Live Photo
         if metadata.isLivePhoto {
             cell.imageStatus.image = NCImageCache.images.livePhoto
         }
 
-        // Add TAGS
         cell.setTags(tags: Array(metadata.tags))
 
-        // Remove last separator
         cell.separator.isHidden = collectionView.numberOfItems(inSection: indexPath.section) == indexPath.row + 1
 
         return cell
diff --git a/Share/NCShareExtension+Files.swift b/Share/NCShareExtension+Files.swift
index 6b66df2a22..3d8565c827 100644
--- a/Share/NCShareExtension+Files.swift
+++ b/Share/NCShareExtension+Files.swift
@@ -25,39 +25,20 @@ import Foundation
 import UniformTypeIdentifiers
 
 extension NCShareExtension {
-
     @objc func reloadDatasource(withLoadFolder: Bool) {
-
-        var groupByField = "name"
-
         layoutForView = NCManageDatabase.shared.setLayoutForView(account: activeAccount.account, key: keyLayout, serverUrl: serverUrl)
-
-        // set GroupField for Grid
-        if layoutForView?.layout == NCGlobal.shared.layoutGrid {
-            groupByField = "classFile"
-        }
-
         let metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND directory == true", activeAccount.account, serverUrl))
-        self.dataSource = NCDataSource(
-            metadatas: metadatas,
-            account: activeAccount.account,
-            sort: layoutForView?.sort,
-            ascending: layoutForView?.ascending,
-            directoryOnTop: layoutForView?.directoryOnTop,
-            favoriteOnTop: true,
-            groupByField: groupByField)
+        self.dataSource = NCDataSource(metadatas: metadatas, account: activeAccount.account, layoutForView: layoutForView)
 
         if withLoadFolder {
             loadFolder()
         } else {
             self.refreshControl.endRefreshing()
         }
-
         collectionView.reloadData()
     }
 
     @objc func didCreateFolder(_ notification: NSNotification) {
-
         guard let userInfo = notification.userInfo as NSDictionary?,
               let ocId = userInfo["ocId"] as? String,
               let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId)
@@ -69,7 +50,6 @@ extension NCShareExtension {
     }
 
     func loadFolder() {
-
         NCNetworking.shared.readFolder(serverUrl: serverUrl, account: activeAccount.account) { task in
             self.dataSourceTask = task
             self.collectionView.reloadData()
diff --git a/Share/NCShareExtension+NCDelegate.swift b/Share/NCShareExtension+NCDelegate.swift
index 6c4db67854..d13e00f681 100644
--- a/Share/NCShareExtension+NCDelegate.swift
+++ b/Share/NCShareExtension+NCDelegate.swift
@@ -97,7 +97,6 @@ extension NCShareExtension: NCAccountRequestDelegate {
 }
 
 extension NCShareExtension: NCShareCellDelegate, NCRenameFileDelegate, NCListCellDelegate {
-
     func removeFile(named fileName: String) {
         guard let index = self.filesName.firstIndex(of: fileName) else {
             return showAlert(title: "_file_not_found_", description: fileName)
@@ -139,6 +138,15 @@ extension NCShareExtension: NCShareCellDelegate, NCRenameFileDelegate, NCListCel
         filesName[fileIx] = fileNameNew
         tableView.reloadData()
     }
+
+    func tapShareListItem(with objectId: String, indexPath: IndexPath, sender: Any) {
+    }
+
+    func tapMoreListItem(with objectId: String, namedButtonMore: String, image: UIImage?, indexPath: IndexPath, sender: Any) {
+    }
+
+    func longPressListItem(with objectId: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer) {
+    }
 }
 
 extension NCShareExtension: NCCreateFormUploadConflictDelegate {
diff --git a/Share/NCShareExtension.swift b/Share/NCShareExtension.swift
index 4bd442469e..f71371c2c1 100644
--- a/Share/NCShareExtension.swift
+++ b/Share/NCShareExtension.swift
@@ -81,7 +81,7 @@ class NCShareExtension: UIViewController {
 
         self.navigationController?.navigationBar.prefersLargeTitles = false
 
-        collectionView.register(UINib(nibName: "NCSectionHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionHeaderEmptyData")
+        collectionView.register(UINib(nibName: "NCSectionFirstHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionFirstHeaderEmptyData")
         collectionView.register(UINib(nibName: "NCListCell", bundle: nil), forCellWithReuseIdentifier: "listCell")
         collectionView.collectionViewLayout = NCListLayout()
 
@@ -395,7 +395,6 @@ extension NCShareExtension {
 }
 
 extension NCShareExtension: uploadE2EEDelegate {
-
     func start() {
         self.hud.progress = 0
     }
diff --git a/Tests/Common/BaseXCTestCase.swift b/Tests/Common/BaseXCTestCase.swift
index 853bb6ba3d..8d80e6dab3 100644
--- a/Tests/Common/BaseXCTestCase.swift
+++ b/Tests/Common/BaseXCTestCase.swift
@@ -18,7 +18,7 @@ class BaseXCTestCase: XCTestCase {
     func setupAppToken() {
         let expectation = expectation(description: "Should get app token")
 
-        NextcloudKit.shared.getAppPassword(serverUrl: TestConstants.server, username: TestConstants.username, password: TestConstants.password) { token, data, error in
+        NextcloudKit.shared.getAppPassword(url: TestConstants.server, user: TestConstants.username, password: TestConstants.password) { token, _, error in
             XCTAssertEqual(error.errorCode, 0)
             XCTAssertNotNil(token)
 
diff --git a/Tests/NextcloudIntegrationTests/FilesIntegrationTests.swift b/Tests/NextcloudIntegrationTests/FilesIntegrationTests.swift
index cb049761f4..f538479081 100644
--- a/Tests/NextcloudIntegrationTests/FilesIntegrationTests.swift
+++ b/Tests/NextcloudIntegrationTests/FilesIntegrationTests.swift
@@ -37,7 +37,7 @@ final class FilesIntegrationTests: BaseIntegrationXCTestCase {
         let serverUrl = "\(TestConstants.server)/remote.php/dav/files/\(TestConstants.username)"
         let serverUrlFileName = "\(serverUrl)/\(folderName)"
 
-        NextcloudKit.shared.setup(account: TestConstants.account, user: TestConstants.username, userId: TestConstants.username, password: appToken, urlBase: TestConstants.server)
+        NextcloudKit.shared.setup(account: TestConstants.account, user: TestConstants.username, userId: TestConstants.username, password: appToken, urlBase: TestConstants.server, groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
 
         // Test creating folder
         NCNetworking.shared.createFolder(fileName: folderName, serverUrl: serverUrl, account: TestConstants.account, urlBase: TestConstants.server, userId: TestConstants.username, withPush: true, sceneIdentifier: nil) { error in
diff --git a/Widget/Dashboard/DashboardData.swift b/Widget/Dashboard/DashboardData.swift
index 64e7acc115..ef8ebf9a09 100644
--- a/Widget/Dashboard/DashboardData.swift
+++ b/Widget/Dashboard/DashboardData.swift
@@ -21,6 +21,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import UIKit
 import WidgetKit
 import Intents
 import NextcloudKit
@@ -75,7 +76,6 @@ func getDashboardItems(displaySize: CGSize, withButton: Bool) -> Int {
 }
 
 func convertDataToImage(data: Data?, size: CGSize, fileNameToWrite: String?) -> UIImage? {
-
     guard let data = data else { return nil }
     var imageData: UIImage?
 
@@ -97,7 +97,6 @@ func convertDataToImage(data: Data?, size: CGSize, fileNameToWrite: String?) ->
 }
 
 func getDashboardDataEntry(configuration: DashboardIntent?, isPreview: Bool, displaySize: CGSize, completion: @escaping (_ entry: DashboardDataEntry) -> Void) {
-
     let utilityFileSystem = NCUtilityFileSystem()
     let utility = NCUtility()
     let dashboardItems = getDashboardItems(displaySize: displaySize, withButton: false)
@@ -170,7 +169,6 @@ func getDashboardDataEntry(configuration: DashboardIntent?, isPreview: Bool, dis
 
     let options = NKRequestOptions(timeout: 90, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)
     NextcloudKit.shared.getDashboardWidgetsApplication(id, options: options) { _, results, data, error in
-
         Task {
             var datas = [DashboardData]()
             var numberItems = 0
@@ -227,8 +225,9 @@ func getDashboardDataEntry(configuration: DashboardIntent?, isPreview: Bool, dis
                                     if FileManager().fileExists(atPath: fileNamePath), let image = UIImage(contentsOfFile: fileNamePath) {
                                         icon = image
                                     } else {
-                                        let (_, data, _) = await NextcloudKit.shared.getPreview(url: url)
-                                        if let image = convertDataToImage(data: data, size: CGSize(width: 256, height: 256), fileNameToWrite: fileName) {
+                                        let (_, data, error) = await NCNetworking.shared.downloadPreview(url: url)
+                                        if error == .success,
+                                           let image = convertDataToImage(data: data, size: CGSize(width: 256, height: 256), fileNameToWrite: fileName) {
                                             icon = image
                                         }
                                     }
diff --git a/Widget/Dashboard/DashboardWidgetProvider.swift b/Widget/Dashboard/DashboardWidgetProvider.swift
index acfcb13c62..6a2ad42796 100644
--- a/Widget/Dashboard/DashboardWidgetProvider.swift
+++ b/Widget/Dashboard/DashboardWidgetProvider.swift
@@ -21,12 +21,12 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import UIKit
 import WidgetKit
 import Intents
 import SwiftUI
 
 struct DashboardWidgetProvider: IntentTimelineProvider {
-
     typealias Intent = DashboardIntent
     typealias Entry = DashboardDataEntry
 
diff --git a/Widget/Files/FilesData.swift b/Widget/Files/FilesData.swift
index 19180076ff..85fbfa99f4 100644
--- a/Widget/Files/FilesData.swift
+++ b/Widget/Files/FilesData.swift
@@ -21,6 +21,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import UIKit
 import WidgetKit
 import Intents
 import NextcloudKit
@@ -60,7 +61,6 @@ let filesDatasTest: [FilesData] = [
 ]
 
 func getTitleFilesWidget(account: tableAccount?) -> String {
-
     let hour = Calendar.current.component(.hour, from: Date())
     var good = ""
 
@@ -85,7 +85,6 @@ func getFilesItems(displaySize: CGSize) -> Int {
 }
 
 func getFilesDataEntry(configuration: AccountIntent?, isPreview: Bool, displaySize: CGSize, completion: @escaping (_ entry: FilesDataEntry) -> Void) {
-
     let utilityFileSystem = NCUtilityFileSystem()
     let utility = NCUtility()
     let filesItems = getFilesItems(displaySize: displaySize)
@@ -131,6 +130,7 @@ func getFilesDataEntry(configuration: AccountIntent?, isPreview: Bool, displaySi
                 <d:resourcetype/>
                 <d:getcontentlength/>
                 <d:getlastmodified/>
+                <d:getetag/>
                 <id xmlns=\"http://owncloud.org/ns\"/>
                 <fileid xmlns=\"http://owncloud.org/ns\"/>
                 <size xmlns=\"http://owncloud.org/ns\"/>
@@ -163,7 +163,7 @@ func getFilesDataEntry(configuration: AccountIntent?, isPreview: Bool, displaySi
         </d:order>
     </d:orderby>
     <d:limit>
-        <d:nresults>25</d:nresults>
+        <d:nresults>50</d:nresults>
     </d:limit>
     </d:basicsearch>
     </d:searchrequest>
@@ -197,8 +197,8 @@ func getFilesDataEntry(configuration: AccountIntent?, isPreview: Bool, displaySi
             let files = files.sorted(by: { ($0.date as Date) > ($1.date as Date) })
 
             for file in files {
-                var image: UIImage?
                 var useTypeIconFile = false
+                var image: UIImage?
 
                 if file.directory || (!file.livePhotoFile.isEmpty && file.classFile == NKCommon.TypeClassFile.video.rawValue) {
                     continue
@@ -216,17 +216,15 @@ func getFilesDataEntry(configuration: AccountIntent?, isPreview: Bool, displaySi
                 guard let url = URL(string: urlString) else { continue }
 
                 // IMAGE
-                if let result = utility.createFilePreviewImage(ocId: file.ocId, etag: file.etag, fileNameView: file.fileName, classFile: file.classFile, status: 0, createPreviewMedia: false) {
-                    image = result
-                } else if file.hasPreview {
-
-                    let fileNamePreviewLocalPath = utilityFileSystem.getDirectoryProviderStoragePreviewOcId(file.ocId, etag: file.etag)
-                    let fileNameIconLocalPath = utilityFileSystem.getDirectoryProviderStorageIconOcId(file.ocId, etag: file.etag)
+                let fileNamePreviewLocalPath = utilityFileSystem.getDirectoryProviderStoragePreviewOcId(file.ocId, etag: file.etag)
+                let fileNameIconLocalPath = utilityFileSystem.getDirectoryProviderStorageIconOcId(file.ocId, etag: file.etag)
+                if FileManager.default.fileExists(atPath: fileNameIconLocalPath) {
+                    image = UIImage(contentsOfFile: fileNameIconLocalPath)
+                }
+                if image == nil, file.hasPreview {
                     let sizePreview = NCUtility().getSizePreview(width: Int(file.width), height: Int(file.height))
-                    let (_, _, imageIcon, _, _, _) = await NextcloudKit.shared.downloadPreview(fileId: file.fileId, fileNamePreviewLocalPath: fileNamePreviewLocalPath, fileNameIconLocalPath: fileNameIconLocalPath, widthPreview: Int(sizePreview.width), heightPreview: Int(sizePreview.height), sizeIcon: NCGlobal.shared.sizeIcon, options: options)
-                    if let result = imageIcon {
-                         image = result
-                    }
+                    let (_, _, imageIcon, _, _, _) = await NCNetworking.shared.downloadPreview(fileId: file.fileId, fileNamePreviewLocalPath: fileNamePreviewLocalPath, fileNameIconLocalPath: fileNameIconLocalPath, widthPreview: Int(sizePreview.width), heightPreview: Int(sizePreview.height), sizeIcon: NCGlobal.shared.sizeIcon, options: options)
+                    image = imageIcon
                 }
                 if image == nil {
                     image = utility.loadImage(named: file.iconName, useTypeIconFile: true)
@@ -237,7 +235,7 @@ func getFilesDataEntry(configuration: AccountIntent?, isPreview: Bool, displaySi
                 let metadata = NCManageDatabase.shared.convertFileToMetadata(file, isDirectoryE2EE: isDirectoryE2EE)
 
                 // DATA
-                let data = FilesData(id: metadata.ocId, image: image!, title: metadata.fileNameView, subTitle: subTitle, url: url, useTypeIconFile: useTypeIconFile)
+                let data = FilesData(id: metadata.ocId, image: image ?? UIImage(), title: metadata.fileNameView, subTitle: subTitle, url: url, useTypeIconFile: useTypeIconFile)
                 datas.append(data)
                 if datas.count == filesItems { break}
             }
diff --git a/Widget/Files/FilesWidgetProvider.swift b/Widget/Files/FilesWidgetProvider.swift
index da49127f03..9935708d7b 100644
--- a/Widget/Files/FilesWidgetProvider.swift
+++ b/Widget/Files/FilesWidgetProvider.swift
@@ -21,12 +21,12 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import UIKit
 import WidgetKit
 import Intents
 import SwiftUI
 
 struct FilesWidgetProvider: IntentTimelineProvider {
-
     typealias Entry = FilesDataEntry
     typealias Intent = AccountIntent
 
diff --git a/Widget/Lockscreen/LockscreenData.swift b/Widget/Lockscreen/LockscreenData.swift
index fb907eaf91..48a971d645 100644
--- a/Widget/Lockscreen/LockscreenData.swift
+++ b/Widget/Lockscreen/LockscreenData.swift
@@ -21,6 +21,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import UIKit
 import WidgetKit
 import NextcloudKit
 
@@ -36,7 +37,6 @@ struct LockscreenData: TimelineEntry {
 }
 
 func getLockscreenDataEntry(configuration: AccountIntent?, isPreview: Bool, family: WidgetFamily, completion: @escaping (_ entry: LockscreenData) -> Void) {
-
     let utilityFileSystem = NCUtilityFileSystem()
     var account: tableAccount?
     var quotaRelative: Float = 0
diff --git a/Widget/Lockscreen/LockscreenWidgetProvider.swift b/Widget/Lockscreen/LockscreenWidgetProvider.swift
index 6d3ac5b897..92949263fa 100644
--- a/Widget/Lockscreen/LockscreenWidgetProvider.swift
+++ b/Widget/Lockscreen/LockscreenWidgetProvider.swift
@@ -21,12 +21,12 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import UIKit
 import WidgetKit
 import Intents
 import SwiftUI
 
 struct LockscreenWidgetProvider: IntentTimelineProvider {
-
     typealias Entry = LockscreenData
     typealias Intent = AccountIntent
 
diff --git a/Widget/Toolbar/ToolbarData.swift b/Widget/Toolbar/ToolbarData.swift
index 67146ea5d1..7fd87d29f3 100644
--- a/Widget/Toolbar/ToolbarData.swift
+++ b/Widget/Toolbar/ToolbarData.swift
@@ -21,6 +21,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import UIKit
 import WidgetKit
 
 struct ToolbarDataEntry: TimelineEntry {
@@ -33,7 +34,6 @@ struct ToolbarDataEntry: TimelineEntry {
 }
 
 func getToolbarDataEntry(isPreview: Bool, completion: @escaping (_ entry: ToolbarDataEntry) -> Void) {
-
     var userId = ""
     var url = ""
 
diff --git a/Widget/Toolbar/ToolbarWidgetProvider.swift b/Widget/Toolbar/ToolbarWidgetProvider.swift
index 303b73eac7..b1842d81d3 100644
--- a/Widget/Toolbar/ToolbarWidgetProvider.swift
+++ b/Widget/Toolbar/ToolbarWidgetProvider.swift
@@ -21,11 +21,11 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import UIKit
 import WidgetKit
 import SwiftUI
 
 struct ToolbarWidgetProvider: TimelineProvider {
-
     typealias Entry = ToolbarDataEntry
 
     func placeholder(in context: Context) -> Entry {
diff --git a/WidgetDashboardIntentHandler/IntentHandler.swift b/WidgetDashboardIntentHandler/IntentHandler.swift
index 1e1b1430e7..03d8e669a2 100644
--- a/WidgetDashboardIntentHandler/IntentHandler.swift
+++ b/WidgetDashboardIntentHandler/IntentHandler.swift
@@ -28,10 +28,7 @@ class IntentHandler: INExtension, DashboardIntentHandling, AccountIntentHandling
 
     // MARK: - Account
 
-    // Account
-
     func provideAccountsOptionsCollection(for intent: AccountIntent, with completion: @escaping (INObjectCollection<Accounts>?, Error?) -> Void) {
-
         var accounts: [Accounts] = []
         let results = NCManageDatabase.shared.getAllAccount()
 
@@ -52,7 +49,6 @@ class IntentHandler: INExtension, DashboardIntentHandling, AccountIntentHandling
     }
 
     func defaultAccounts(for intent: AccountIntent) -> Accounts? {
-
         if NCManageDatabase.shared.getActiveAccount() == nil {
             return nil
         } else {
@@ -63,9 +59,7 @@ class IntentHandler: INExtension, DashboardIntentHandling, AccountIntentHandling
     // MARK: - Dashboard
 
     // Application
-
     func provideApplicationsOptionsCollection(for intent: DashboardIntent, with completion: @escaping (INObjectCollection<Applications>?, Error?) -> Void) {
-
         var applications: [Applications] = []
         var account: tableAccount?
 
@@ -90,7 +84,6 @@ class IntentHandler: INExtension, DashboardIntentHandling, AccountIntentHandling
     }
 
     func defaultApplications(for intent: DashboardIntent) -> Applications? {
-
         guard let account = NCManageDatabase.shared.getActiveAccount() else {
             return nil
         }
@@ -101,9 +94,7 @@ class IntentHandler: INExtension, DashboardIntentHandling, AccountIntentHandling
     }
 
     // Account
-
     func provideAccountsOptionsCollection(for intent: DashboardIntent, with completion: @escaping (INObjectCollection<Accounts>?, Error?) -> Void) {
-
         var accounts: [Accounts] = []
         let results = NCManageDatabase.shared.getAllAccount()
 
@@ -124,7 +115,6 @@ class IntentHandler: INExtension, DashboardIntentHandling, AccountIntentHandling
     }
 
     func defaultAccounts(for intent: DashboardIntent) -> Accounts? {
-
         if NCManageDatabase.shared.getActiveAccount() == nil {
             return nil
         } else {
diff --git a/iOSClient/Account Settings/NCAccountSettingsModel.swift b/iOSClient/Account Settings/NCAccountSettingsModel.swift
index cae70fd981..08fa601180 100644
--- a/iOSClient/Account Settings/NCAccountSettingsModel.swift	
+++ b/iOSClient/Account Settings/NCAccountSettingsModel.swift	
@@ -131,19 +131,19 @@ class NCAccountSettingsModel: ObservableObject, ViewOnAppearHandling {
     }
 
     /// Function to update the user data
-    func getUserStatus() -> (statusImage: UIImage, statusMessage: String, descriptionMessage: String) {
+    func getUserStatus() -> (statusImage: UIImage?, statusMessage: String, descriptionMessage: String) {
         guard let activeAccount else { return (UIImage(), "", "") }
         if NCGlobal.shared.capabilityUserStatusEnabled,
            let tableAccount = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", activeAccount.account)) {
             return NCUtility().getUserStatus(userIcon: tableAccount.userStatusIcon, userStatus: tableAccount.userStatusStatus, userMessage: tableAccount.userStatusMessage)
         }
-        return (UIImage(), "", "")
+        return (nil, "", "")
     }
 
     /// Function to know the height of "account" data
     func getTableViewHeight() -> CGFloat {
         guard let activeAccount else { return 0 }
-        var height: CGFloat = 190
+        var height: CGFloat = NCGlobal.shared.capabilityUserStatusEnabled ? 190 : 220
         if NCGlobal.shared.capabilityUserStatusEnabled,
            let tableAccount = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", activeAccount.account)) {
             if !tableAccount.email.isEmpty { height += 30 }
@@ -168,20 +168,22 @@ class NCAccountSettingsModel: ObservableObject, ViewOnAppearHandling {
 
     @objc func changeAccount() {
         if let activeAccount {
-            self.appDelegate.changeAccount(activeAccount.account, userProfile: nil)
+            self.appDelegate.changeAccount(activeAccount.account, userProfile: nil) { }
         }
     }
 
     /// Function to delete the current account
     func deleteAccount() {
         if let activeAccount {
-            appDelegate.deleteAccount(activeAccount.account, wipe: false)
+            appDelegate.deleteAccount(activeAccount.account)
             if let account = NCManageDatabase.shared.getAllAccount().first?.account {
-                appDelegate.changeAccount(account, userProfile: nil)
+                appDelegate.changeAccount(account, userProfile: nil) {
+                    onViewAppear()
+                }
             } else {
                 dismissView = true
+                appDelegate.openLogin(selector: NCGlobal.shared.introLogin, openLoginWeb: false)
             }
-            onViewAppear()
         }
     }
 }
diff --git a/iOSClient/Account Settings/NCAccountSettingsView.swift b/iOSClient/Account Settings/NCAccountSettingsView.swift
index d398eea531..c8a9e500c7 100644
--- a/iOSClient/Account Settings/NCAccountSettingsView.swift	
+++ b/iOSClient/Account Settings/NCAccountSettingsView.swift	
@@ -52,16 +52,18 @@ struct NCAccountSettingsView: View {
                                         .resizable()
                                         .scaledToFit()
                                         .frame(width: UIScreen.main.bounds.width, height: 75)
-                                    ZStack {
-                                        Circle()
-                                            .fill(.white)
-                                            .frame(width: 30, height: 30)
-                                        Image(uiImage: status.statusImage)
-                                            .resizable()
-                                            .scaledToFit()
-                                            .frame(width: 30, height: 30)
+                                    if let statusImage = status.statusImage {
+                                        ZStack {
+                                            Circle()
+                                                .fill(.white)
+                                                .frame(width: 30, height: 30)
+                                            Image(uiImage: statusImage)
+                                                .resizable()
+                                                .scaledToFit()
+                                                .frame(width: 30, height: 30)
                                         }
                                         .offset(x: 30, y: 30)
+                                    }
                                 }
                                 .frame(maxWidth: .infinity, maxHeight: .infinity)
                                 Text(model.getUserName())
@@ -153,28 +155,30 @@ struct NCAccountSettingsView: View {
                     }
                     ///
                     /// User Status
-                    Button(action: {
-                        showUserStatus = true
-                    }, label: {
-                        HStack {
-                            Image(systemName: "moon.fill")
-                                .resizable()
-                                .scaledToFit()
-                                .font(Font.system(.body).weight(.light))
-                                .frame(width: 20, height: 20)
-                                .foregroundStyle(Color(NCBrandColor.shared.iconImageColor))
-                            Text(NSLocalizedString("_set_user_status_", comment: ""))
-                                .lineLimit(1)
-                                .truncationMode(.middle)
-                                .foregroundStyle(Color(NCBrandColor.shared.textColor))
-                                .padding(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 20))
+                    if NCGlobal.shared.capabilityUserStatusEnabled {
+                        Button(action: {
+                            showUserStatus = true
+                        }, label: {
+                            HStack {
+                                Image(systemName: "moon.fill")
+                                    .resizable()
+                                    .scaledToFit()
+                                    .font(Font.system(.body).weight(.light))
+                                    .frame(width: 20, height: 20)
+                                    .foregroundStyle(Color(NCBrandColor.shared.iconImageColor))
+                                Text(NSLocalizedString("_set_user_status_", comment: ""))
+                                    .lineLimit(1)
+                                    .truncationMode(.middle)
+                                    .foregroundStyle(Color(NCBrandColor.shared.textColor))
+                                    .padding(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 20))
+                            }
+                            .font(.system(size: 14))
+                        })
+                        .sheet(isPresented: $showUserStatus) {
+                            UserStatusView(showUserStatus: $showUserStatus)
                         }
-                        .font(.system(size: 14))
-                    })
-                    .sheet(isPresented: $showUserStatus) {
-                        UserStatusView(showUserStatus: $showUserStatus)
+                        .onChange(of: showUserStatus) { _ in }
                     }
-                    .onChange(of: showUserStatus) { _ in }
                     ///
                     /// Certificate server
                     Button(action: {
diff --git a/iOSClient/Activity/NCActivity.storyboard b/iOSClient/Activity/NCActivity.storyboard
index 6e94864843..e68152fbbb 100644
--- a/iOSClient/Activity/NCActivity.storyboard
+++ b/iOSClient/Activity/NCActivity.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="nhT-TJ-YvX">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="nhT-TJ-YvX">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,93 +17,52 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="20" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="X49-xg-JXO">
-                                <rect key="frame" x="0.0" y="44" width="414" height="818"/>
+                                <rect key="frame" x="0.0" y="48" width="414" height="848"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="tableCell" rowHeight="120" id="ggj-aE-fnh" customClass="NCActivityTableViewCell" customModule="Nextcloud" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="44.5" width="414" height="120"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="tableCell" rowHeight="35" id="ggj-aE-fnh" customClass="NCActivityTableViewCell" customModule="Nextcloud" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="50" width="414" height="35"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ggj-aE-fnh" id="i35-U4-bEk">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="120"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="35"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fcO-YL-MuT">
-                                                    <rect key="frame" x="88" y="5" width="316" height="25"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" text="Label" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fcO-YL-MuT">
+                                                    <rect key="frame" x="100" y="0.0" width="304" height="18"/>
                                                     <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="15"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LQ8-cO-794" userLabel="avatar">
-                                                    <rect key="frame" x="50" y="0.0" width="30" height="30"/>
+                                                <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LQ8-cO-794" userLabel="avatar">
+                                                    <rect key="frame" x="50" y="0.0" width="35" height="35"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="30" id="OKz-e8-DzD"/>
-                                                        <constraint firstAttribute="height" constant="30" id="fwd-J4-5uY"/>
+                                                        <constraint firstAttribute="width" constant="35" id="OKz-e8-DzD"/>
+                                                        <constraint firstAttribute="height" constant="35" id="fwd-J4-5uY"/>
                                                     </constraints>
                                                 </imageView>
                                                 <imageView userInteractionEnabled="NO" alpha="0.59999999999999998" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xNG-sf-PnA">
-                                                    <rect key="frame" x="20" y="5" width="20" height="20"/>
+                                                    <rect key="frame" x="20" y="8" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="Lbv-yi-vAh"/>
                                                         <constraint firstAttribute="height" constant="20" id="TML-VJ-2i3"/>
                                                     </constraints>
                                                 </imageView>
-                                                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="KpO-no-BMl">
-                                                    <rect key="frame" x="50" y="40" width="364" height="60"/>
-                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="60" id="deQ-wc-jNT" userLabel="height = 60"/>
-                                                    </constraints>
-                                                    <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="nnU-ds-wda">
-                                                        <size key="itemSize" width="50" height="50"/>
-                                                        <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                                        <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                                        <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                                    </collectionViewFlowLayout>
-                                                    <cells>
-                                                        <collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="collectionCell" id="uIN-z5-7vk" customClass="NCActivityCollectionViewCell" customModule="Nextcloud" customModuleProvider="target">
-                                                            <rect key="frame" x="0.0" y="5" width="50" height="50"/>
-                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
-                                                                <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
-                                                                <autoresizingMask key="autoresizingMask"/>
-                                                                <subviews>
-                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J5b-2X-AsF">
-                                                                        <rect key="frame" x="0.0" y="-1" width="50" height="50"/>
-                                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                                    </imageView>
-                                                                </subviews>
-                                                            </view>
-                                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                            <connections>
-                                                                <outlet property="imageView" destination="J5b-2X-AsF" id="7dI-m8-o1E"/>
-                                                            </connections>
-                                                        </collectionViewCell>
-                                                    </cells>
-                                                </collectionView>
                                             </subviews>
-                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <constraints>
                                                 <constraint firstAttribute="trailing" secondItem="fcO-YL-MuT" secondAttribute="trailing" constant="10" id="1pG-qk-inI"/>
                                                 <constraint firstItem="LQ8-cO-794" firstAttribute="top" secondItem="i35-U4-bEk" secondAttribute="top" id="3fU-rp-D7s"/>
-                                                <constraint firstItem="xNG-sf-PnA" firstAttribute="top" secondItem="i35-U4-bEk" secondAttribute="top" constant="5" id="4EB-59-y1Y"/>
+                                                <constraint firstItem="xNG-sf-PnA" firstAttribute="top" secondItem="i35-U4-bEk" secondAttribute="top" constant="8" id="4EB-59-y1Y"/>
                                                 <constraint firstItem="xNG-sf-PnA" firstAttribute="leading" secondItem="i35-U4-bEk" secondAttribute="leading" constant="20" id="CRN-18-SeU"/>
-                                                <constraint firstAttribute="bottom" secondItem="KpO-no-BMl" secondAttribute="bottom" constant="20" id="ULe-Tt-dBj"/>
-                                                <constraint firstItem="fcO-YL-MuT" firstAttribute="leading" secondItem="xNG-sf-PnA" secondAttribute="trailing" constant="48" id="am5-CT-0kZ" userLabel="Subject.leading = Icon.trailing + 50"/>
+                                                <constraint firstItem="fcO-YL-MuT" firstAttribute="leading" secondItem="LQ8-cO-794" secondAttribute="trailing" constant="15" id="am5-CT-0kZ" userLabel="Subject.leading = Icon.trailing + 50"/>
                                                 <constraint firstItem="LQ8-cO-794" firstAttribute="leading" secondItem="xNG-sf-PnA" secondAttribute="trailing" constant="10" id="aqp-Wu-9Hk"/>
-                                                <constraint firstItem="fcO-YL-MuT" firstAttribute="top" secondItem="i35-U4-bEk" secondAttribute="top" constant="5" id="faC-by-km5"/>
-                                                <constraint firstItem="KpO-no-BMl" firstAttribute="leading" secondItem="i35-U4-bEk" secondAttribute="leading" constant="50" id="l0Y-89-eTm"/>
-                                                <constraint firstAttribute="trailing" secondItem="KpO-no-BMl" secondAttribute="trailing" id="vWj-9H-JLc"/>
-                                                <constraint firstItem="KpO-no-BMl" firstAttribute="top" secondItem="fcO-YL-MuT" secondAttribute="bottom" constant="10" id="z1e-vv-qJb"/>
+                                                <constraint firstItem="fcO-YL-MuT" firstAttribute="top" secondItem="i35-U4-bEk" secondAttribute="top" id="faC-by-km5"/>
                                             </constraints>
                                         </tableViewCellContentView>
-                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <connections>
                                             <outlet property="avatar" destination="LQ8-cO-794" id="2PE-uD-pug"/>
-                                            <outlet property="collectionView" destination="KpO-no-BMl" id="xvR-CA-cZx"/>
-                                            <outlet property="collectionViewHeightConstraint" destination="deQ-wc-jNT" id="nAT-iS-UjK"/>
                                             <outlet property="icon" destination="xNG-sf-PnA" id="hxb-Vr-oQX"/>
                                             <outlet property="subject" destination="fcO-YL-MuT" id="L4q-rj-l04"/>
-                                            <outlet property="subjectTrailingConstraint" destination="am5-CT-0kZ" id="PeK-M5-hHW"/>
+                                            <outlet property="subjectLeadingConstraint" destination="am5-CT-0kZ" id="J7c-Hb-2V2"/>
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>
@@ -115,10 +74,11 @@
                             </tableView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="USa-eR-a1s"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="X49-xg-JXO" firstAttribute="trailing" secondItem="USa-eR-a1s" secondAttribute="trailing" id="5we-Fh-GVu"/>
                             <constraint firstItem="X49-xg-JXO" firstAttribute="top" secondItem="USa-eR-a1s" secondAttribute="top" id="E1U-4Q-6uu"/>
-                            <constraint firstItem="USa-eR-a1s" firstAttribute="bottom" secondItem="X49-xg-JXO" secondAttribute="bottom" id="aHq-g4-dUG"/>
+                            <constraint firstAttribute="bottom" secondItem="X49-xg-JXO" secondAttribute="bottom" id="aHq-g4-dUG"/>
                             <constraint firstItem="X49-xg-JXO" firstAttribute="leading" secondItem="USa-eR-a1s" secondAttribute="leading" id="pfF-ag-f7x"/>
                         </constraints>
                     </view>
@@ -129,7 +89,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="UOE-pW-DRy" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-330.39999999999998" y="139.65517241379311"/>
+            <point key="canvasLocation" x="-330.43478260869568" y="139.28571428571428"/>
         </scene>
     </scenes>
 </document>
diff --git a/iOSClient/Activity/NCActivity.swift b/iOSClient/Activity/NCActivity.swift
index 56f03776c0..02efd0c9a9 100644
--- a/iOSClient/Activity/NCActivity.swift
+++ b/iOSClient/Activity/NCActivity.swift
@@ -27,15 +27,12 @@ import SwiftRichString
 import NextcloudKit
 
 class NCActivity: UIViewController, NCSharePagingContent {
-
+    @IBOutlet weak var viewContainerConstraint: NSLayoutConstraint!
     @IBOutlet weak var tableView: UITableView!
 
     var commentView: NCActivityCommentView?
-    var textField: UITextField? { commentView?.newCommentField }
-
-    @IBOutlet weak var viewContainerConstraint: NSLayoutConstraint!
+    var textField: UIView? { commentView?.newCommentField }
     var height: CGFloat = 0
-
     var metadata: tableMetadata?
     var showComments: Bool = false
 
@@ -46,7 +43,7 @@ class NCActivity: UIViewController, NCSharePagingContent {
     var sectionDates: [Date] = []
     var dataSourceTask: URLSessionTask?
 
-    var insets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+    var insets = UIEdgeInsets(top: 8, left: 0, bottom: 0, right: 0)
     var didSelectItemEnable: Bool = true
     var objectType: String?
 
@@ -117,7 +114,7 @@ class NCActivity: UIViewController, NCSharePagingContent {
         tableView.tableHeaderView = commentView
         commentView?.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
         commentView?.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
-        viewContainerConstraint.constant = height
+        viewContainerConstraint.constant = height - 10
     }
 
     func makeTableFooterView() -> UIView {
@@ -130,9 +127,12 @@ class NCActivity: UIViewController, NCSharePagingContent {
         label.textColor = NCBrandColor.shared.textColor2
         label.textAlignment = .center
         label.text = NSLocalizedString("_no_activity_footer_", comment: "")
-        label.frame = CGRect(x: 0, y: 10, width: tableView.frame.width, height: 60)
-
         view.addSubview(label)
+        label.translatesAutoresizingMaskIntoConstraints = false
+        label.topAnchor.constraint(equalTo: view.topAnchor, constant: 20).isActive = true
+        label.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
+        label.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
+
         return view
     }
 }
@@ -140,22 +140,16 @@ class NCActivity: UIViewController, NCSharePagingContent {
 // MARK: - Table View
 
 extension NCActivity: UITableViewDelegate {
-
-    func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 120
-    }
-
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 60
+        return 50
     }
 
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return UITableView.automaticDimension
+        return 80
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-
-        let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 60))
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.frame.width, height: 50))
         view.backgroundColor = .clear
 
         let label = UILabel()
@@ -163,20 +157,33 @@ extension NCActivity: UITableViewDelegate {
         label.textColor = NCBrandColor.shared.textColor
         label.text = utility.getTitleFromDate(sectionDates[section])
         label.textAlignment = .center
-        label.layer.cornerRadius = 11
-        label.layer.masksToBounds = true
-        label.layer.backgroundColor = UIColor(red: 152.0 / 255.0, green: 167.0 / 255.0, blue: 181.0 / 255.0, alpha: 0.8).cgColor
-        let widthFrame = label.intrinsicContentSize.width + 30
-        let xFrame = tableView.bounds.width / 2 - widthFrame / 2
-        label.frame = CGRect(x: xFrame, y: 10, width: widthFrame, height: 22)
 
+        let blur = UIBlurEffect(style: .systemMaterial)
+        let blurredEffectView = UIVisualEffectView(effect: blur)
+        blurredEffectView.layer.cornerRadius = 11
+        blurredEffectView.layer.masksToBounds = true
+
+        view.addSubview(blurredEffectView)
         view.addSubview(label)
+
+        blurredEffectView.translatesAutoresizingMaskIntoConstraints = false
+        label.translatesAutoresizingMaskIntoConstraints = false
+
+        NSLayoutConstraint.activate([
+            blurredEffectView.topAnchor.constraint(equalTo: view.topAnchor),
+            blurredEffectView.centerXAnchor.constraint(equalTo: view.centerXAnchor),
+            blurredEffectView.widthAnchor.constraint(equalToConstant: label.intrinsicContentSize.width + 30),
+            blurredEffectView.heightAnchor.constraint(equalToConstant: 22),
+            label.topAnchor.constraint(equalTo: view.topAnchor),
+            label.centerXAnchor.constraint(equalTo: view.centerXAnchor),
+            label.centerYAnchor.constraint(equalTo: blurredEffectView.centerYAnchor)
+        ])
+
         return view
     }
 }
 
 extension NCActivity: UITableViewDataSource {
-
     func numberOfSections(in tableView: UITableView) -> Int {
         return sectionDates.count
     }
@@ -237,27 +244,24 @@ extension NCActivity: UITableViewDataSource {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "tableCell", for: indexPath) as? NCActivityTableViewCell else {
             return UITableViewCell()
         }
-
         var orderKeysId: [String] = []
 
         cell.idActivity = activity.idActivity
         cell.indexPath = indexPath
         cell.avatar.image = nil
         cell.avatar.isHidden = true
-        cell.subjectTrailingConstraint.constant = 10
         cell.didSelectItemEnable = self.didSelectItemEnable
         cell.subject.textColor = NCBrandColor.shared.textColor
         cell.viewController = self
 
         // icon
         if !activity.icon.isEmpty {
-
             let fileNameIcon = (activity.icon as NSString).lastPathComponent
             let fileNameLocalPath = utilityFileSystem.directoryUserData + "/" + fileNameIcon
 
             if FileManager.default.fileExists(atPath: fileNameLocalPath) {
                 if let image = UIImage(contentsOfFile: fileNameLocalPath) {
-                    cell.icon.image = image
+                    cell.icon.image = image.withTintColor(NCBrandColor.shared.textColor, renderingMode: .alwaysOriginal)
                 }
             } else {
                 NextcloudKit.shared.downloadContent(serverUrl: activity.icon) { _, data, error in
@@ -273,20 +277,18 @@ extension NCActivity: UITableViewDataSource {
 
         // avatar
         if !activity.user.isEmpty && activity.user != appDelegate.userId {
-
-            cell.subjectTrailingConstraint.constant = 50
             cell.avatar.isHidden = false
             cell.fileUser = activity.user
-
             let fileName = appDelegate.userBaseUrl + "-" + activity.user + ".png"
-
             NCNetworking.shared.downloadAvatar(user: activity.user, dispalyName: nil, fileName: fileName, cell: cell, view: tableView)
+            cell.subjectLeadingConstraint.constant = 15
+        } else {
+            cell.subjectLeadingConstraint.constant = -30
         }
 
         // subject
         cell.subject.text = activity.subject
         if !activity.subjectRich.isEmpty {
-
             var subject = activity.subjectRich
             var keys: [String] = []
 
@@ -317,15 +319,6 @@ extension NCActivity: UITableViewDataSource {
             cell.subject.attributedText = subject.set(style: StyleGroup(base: normal, ["bold": bold, "date": date]))
         }
 
-        // CollectionView
-        cell.activityPreviews = NCManageDatabase.shared.getActivityPreview(account: activity.account, idActivity: activity.idActivity, orderKeysId: orderKeysId)
-        if cell.activityPreviews.isEmpty {
-            cell.collectionViewHeightConstraint.constant = 0
-        } else {
-            cell.collectionViewHeightConstraint.constant = 60
-        }
-        cell.collectionView.reloadData()
-
         return cell
     }
 }
@@ -345,16 +338,15 @@ extension NCActivity: UIScrollViewDelegate {
 // MARK: - NC API & Algorithm
 
 extension NCActivity {
-
     func fetchAll(isInitial: Bool) {
         guard !isFetchingActivity else { return }
         self.isFetchingActivity = true
-
         var bottom: CGFloat = 0
+
         if let mainTabBar = self.tabBarController?.tabBar as? NCMainTabBar {
             bottom = -mainTabBar.getHeight()
         }
-        NCActivityIndicator.shared.start(backgroundView: self.view, bottom: bottom - 5, style: .medium)
+        NCActivityIndicator.shared.start(backgroundView: self.view, bottom: bottom - 35, style: .medium)
 
         let dispatchGroup = DispatchGroup()
         loadComments(disptachGroup: dispatchGroup)
@@ -377,8 +369,8 @@ extension NCActivity {
     }
 
     func loadDataSource() {
-
         var newItems = [DateCompareable]()
+
         if showComments, let metadata = metadata, let account = NCManageDatabase.shared.getActiveAccount() {
             let comments = NCManageDatabase.shared.getComments(account: account.account, objectId: metadata.fileId)
             newItems += comments
@@ -450,10 +442,9 @@ extension NCActivity {
 
     func loadActivity(idActivity: Int, limit: Int = 200, disptachGroup: DispatchGroup) {
         guard hasActivityToLoad else { return }
-
         var resultActivityId = 0
-        disptachGroup.enter()
 
+        disptachGroup.enter()
         NextcloudKit.shared.getActivity(
             since: idActivity,
             limit: min(limit, 200),
diff --git a/iOSClient/Activity/NCActivityCommentView.swift b/iOSClient/Activity/NCActivityCommentView.swift
index 22f9072798..d308940641 100644
--- a/iOSClient/Activity/NCActivityCommentView.swift
+++ b/iOSClient/Activity/NCActivityCommentView.swift
@@ -25,7 +25,6 @@ import UIKit
 
 class NCActivityCommentView: UIView, UITextFieldDelegate {
     @IBOutlet weak var imageItem: UIImageView!
-    @IBOutlet weak var labelUser: UILabel!
     @IBOutlet weak var newCommentField: UITextField!
 
     var completionHandler: ((String?) -> Void)?
@@ -42,13 +41,6 @@ class NCActivityCommentView: UIView, UITextFieldDelegate {
         } else {
             imageItem.image = NCUtility().loadImage(named: "person.crop.circle", colors: [NCBrandColor.shared.iconImageColor])
         }
-
-        if account.displayName.isEmpty {
-            labelUser.text = account.user
-        } else {
-            labelUser.text = account.displayName
-        }
-        labelUser.textColor = NCBrandColor.shared.textColor
     }
 
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
@@ -57,3 +49,12 @@ class NCActivityCommentView: UIView, UITextFieldDelegate {
         return true
     }
 }
+
+extension NCActivityCommentView: UISearchBarDelegate {
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
+        searchBar.resignFirstResponder()
+        completionHandler?(searchBar.text)
+    }
+
+    func searchBarTextDidEndEditing(_ searchBar: UISearchBar) { }
+}
diff --git a/iOSClient/Activity/NCActivityCommentView.xib b/iOSClient/Activity/NCActivityCommentView.xib
index 0eba994ad3..e60f0514d4 100644
--- a/iOSClient/Activity/NCActivityCommentView.xib
+++ b/iOSClient/Activity/NCActivityCommentView.xib
@@ -1,60 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GuF-Pi-nHv" customClass="NCActivityCommentView" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="269" height="100"/>
+            <rect key="frame" x="0.0" y="0.0" width="269" height="55"/>
             <subviews>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="YXy-gE-g7y">
-                    <rect key="frame" x="10" y="10" width="40" height="40"/>
+                    <rect key="frame" x="15" y="10" width="35" height="35"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="40" id="kUz-t2-bFL"/>
-                        <constraint firstAttribute="height" constant="40" id="yRS-7c-bMw"/>
+                        <constraint firstAttribute="width" constant="35" id="kUz-t2-bFL"/>
+                        <constraint firstAttribute="height" constant="35" id="yRS-7c-bMw"/>
                     </constraints>
                 </imageView>
-                <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="5pv-VB-vbL">
-                    <rect key="frame" x="60" y="60" width="199" height="30"/>
+                <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Test" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="5pv-VB-vbL">
+                    <rect key="frame" x="65" y="13" width="188" height="30"/>
+                    <color key="backgroundColor" systemColor="systemGray6Color"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="OLX-lD-EIH"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <textInputTraits key="textInputTraits"/>
                 </textField>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="user" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Ja-ik-S0n">
-                    <rect key="frame" x="60" y="21.5" width="199" height="17"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                    <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <nil key="highlightedColor"/>
-                </label>
             </subviews>
             <viewLayoutGuide key="safeArea" id="Y5x-Vi-PYA"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="YXy-gE-g7y" firstAttribute="top" secondItem="GuF-Pi-nHv" secondAttribute="top" constant="10" id="26g-rF-Ags"/>
-                <constraint firstAttribute="trailing" secondItem="0Ja-ik-S0n" secondAttribute="trailing" constant="10" id="7ue-4o-ZT2"/>
-                <constraint firstAttribute="height" constant="100" id="IsL-V9-dXU"/>
-                <constraint firstItem="0Ja-ik-S0n" firstAttribute="centerY" secondItem="YXy-gE-g7y" secondAttribute="centerY" id="NxM-vu-j06"/>
-                <constraint firstItem="5pv-VB-vbL" firstAttribute="leading" secondItem="YXy-gE-g7y" secondAttribute="trailing" constant="10" id="Oza-Za-mDZ"/>
-                <constraint firstItem="5pv-VB-vbL" firstAttribute="top" secondItem="YXy-gE-g7y" secondAttribute="bottom" constant="10" id="iie-Nv-YUr"/>
-                <constraint firstItem="0Ja-ik-S0n" firstAttribute="leading" secondItem="YXy-gE-g7y" secondAttribute="trailing" constant="10" id="j0L-NP-Z4H"/>
-                <constraint firstAttribute="trailing" secondItem="5pv-VB-vbL" secondAttribute="trailing" constant="10" id="oXJ-ov-XCK"/>
-                <constraint firstItem="YXy-gE-g7y" firstAttribute="leading" secondItem="GuF-Pi-nHv" secondAttribute="leading" constant="10" id="t5p-fd-swt"/>
-                <constraint firstAttribute="bottom" secondItem="5pv-VB-vbL" secondAttribute="bottom" constant="10" id="yEr-QL-mtD"/>
+                <constraint firstAttribute="height" constant="55" id="IsL-V9-dXU"/>
+                <constraint firstItem="5pv-VB-vbL" firstAttribute="leading" secondItem="GuF-Pi-nHv" secondAttribute="leading" constant="65" id="Oza-Za-mDZ"/>
+                <constraint firstItem="5pv-VB-vbL" firstAttribute="top" secondItem="YXy-gE-g7y" secondAttribute="bottom" constant="-32" id="iie-Nv-YUr"/>
+                <constraint firstAttribute="trailing" secondItem="5pv-VB-vbL" secondAttribute="trailing" constant="16" id="oXJ-ov-XCK"/>
+                <constraint firstItem="YXy-gE-g7y" firstAttribute="leading" secondItem="GuF-Pi-nHv" secondAttribute="leading" constant="15" id="t5p-fd-swt"/>
+                <constraint firstAttribute="bottom" secondItem="5pv-VB-vbL" secondAttribute="bottom" constant="12" id="yEr-QL-mtD"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="imageItem" destination="YXy-gE-g7y" id="yWc-3P-gIU"/>
-                <outlet property="labelUser" destination="0Ja-ik-S0n" id="GkS-TV-2ic"/>
                 <outlet property="newCommentField" destination="5pv-VB-vbL" id="8vL-Mt-0rZ"/>
             </connections>
             <point key="canvasLocation" x="-231.15942028985509" y="-99.776785714285708"/>
         </view>
     </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemGray6Color">
+            <color red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/iOSClient/Activity/NCActivityTableViewCell.swift b/iOSClient/Activity/NCActivityTableViewCell.swift
index 4286b25902..13aa77ace8 100644
--- a/iOSClient/Activity/NCActivityTableViewCell.swift
+++ b/iOSClient/Activity/NCActivityTableViewCell.swift
@@ -28,7 +28,6 @@ import JGProgressHUD
 import Queuer
 
 class NCActivityCollectionViewCell: UICollectionViewCell {
-
     @IBOutlet weak var imageView: UIImageView!
 
     var fileId = ""
@@ -40,13 +39,10 @@ class NCActivityCollectionViewCell: UICollectionViewCell {
 }
 
 class NCActivityTableViewCell: UITableViewCell, NCCellProtocol {
-
-    @IBOutlet weak var collectionView: UICollectionView!
     @IBOutlet weak var icon: UIImageView!
     @IBOutlet weak var avatar: UIImageView!
     @IBOutlet weak var subject: UILabel!
-    @IBOutlet weak var subjectTrailingConstraint: NSLayoutConstraint!
-    @IBOutlet weak var collectionViewHeightConstraint: NSLayoutConstraint!
+    @IBOutlet weak var subjectLeadingConstraint: NSLayoutConstraint!
 
     private let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
     private var user: String = ""
@@ -73,8 +69,6 @@ class NCActivityTableViewCell: UITableViewCell, NCCellProtocol {
     override func awakeFromNib() {
         super.awakeFromNib()
 
-        collectionView.delegate = self
-        collectionView.dataSource = self
         let avatarRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapAvatarImage))
         avatar.addGestureRecognizer(avatarRecognizer)
     }
@@ -88,19 +82,16 @@ class NCActivityTableViewCell: UITableViewCell, NCCellProtocol {
 // MARK: - Collection View
 
 extension NCActivityTableViewCell: UICollectionViewDelegate {
-
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-
         // Select not permitted
         if !didSelectItemEnable {
             return
         }
-
         let activityPreview = activityPreviews[indexPath.row]
 
         if activityPreview.view == "trashbin" {
-
             var responder: UIResponder? = collectionView
+
             while !(responder is UIViewController) {
                 responder = responder?.next
                 if responder == nil {
@@ -119,23 +110,19 @@ extension NCActivityTableViewCell: UICollectionViewDelegate {
                     }
                 }
             }
-
             return
         }
 
         if activityPreview.view == NCGlobal.shared.appName && activityPreview.mimeType != "dir" {
-
             guard let activitySubjectRich = NCManageDatabase.shared.getActivitySubjectRich(account: activityPreview.account, idActivity: activityPreview.idActivity, id: String(activityPreview.fileId)) else {
                 return
             }
-
             NCActionCenter.shared.viewerFile(account: appDelegate.account, fileId: activitySubjectRich.id, viewController: viewController)
         }
     }
 }
 
 extension NCActivityTableViewCell: UICollectionViewDataSource {
-
     func numberOfSections(in collectionView: UICollectionView) -> Int {
         return 1
     }
@@ -146,7 +133,6 @@ extension NCActivityTableViewCell: UICollectionViewDataSource {
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-
         guard let cell: NCActivityCollectionViewCell = collectionView.dequeueReusableCell(withReuseIdentifier: "collectionCell", for: indexPath) as? NCActivityCollectionViewCell else {
             return UICollectionViewCell()
         }
@@ -159,7 +145,6 @@ extension NCActivityTableViewCell: UICollectionViewDataSource {
 
         // Trashbin
         if activityPreview.view == "trashbin" {
-
             let source = activityPreview.source
 
             utility.convertSVGtoPNGWriteToUserData(svgUrlString: source, width: 100, rewrite: false, account: appDelegate.account, id: idActivity) { imageNamePath, id in
@@ -169,11 +154,8 @@ extension NCActivityTableViewCell: UICollectionViewDataSource {
                     cell.imageView.image = NCImageCache.images.file
                 }
             }
-
         } else {
-
             if activityPreview.isMimeTypeIcon {
-
                 let source = activityPreview.source
 
                 utility.convertSVGtoPNGWriteToUserData(svgUrlString: source, width: 150, rewrite: false, account: appDelegate.account, id: idActivity) { imageNamePath, id in
@@ -183,11 +165,8 @@ extension NCActivityTableViewCell: UICollectionViewDataSource {
                         cell.imageView.image = NCImageCache.images.file
                     }
                 }
-
             } else {
-
                 if let activitySubjectRich = NCManageDatabase.shared.getActivitySubjectRich(account: activityPreview.account, idActivity: idActivity, id: fileId) {
-
                     let fileNamePath = NCUtilityFileSystem().directoryUserData + "/" + activitySubjectRich.name
 
                     if FileManager.default.fileExists(atPath: fileNamePath), let image = UIImage(contentsOfFile: fileNamePath) {
@@ -206,20 +185,17 @@ extension NCActivityTableViewCell: UICollectionViewDataSource {
                 }
             }
         }
-
         return cell
     }
-
 }
 
 extension NCActivityTableViewCell: UICollectionViewDelegateFlowLayout {
-
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        return CGSize(width: 50, height: 50)
+        return CGSize(width: 50, height: 30)
     }
 
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
-        return 20
+        return 0
     }
 
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
@@ -228,7 +204,6 @@ extension NCActivityTableViewCell: UICollectionViewDelegateFlowLayout {
 }
 
 class NCOperationDownloadThumbnailActivity: ConcurrentOperation {
-
     var cell: NCActivityCollectionViewCell?
     var collectionView: UICollectionView?
     var fileNamePreviewLocalPath: String
@@ -243,10 +218,10 @@ class NCOperationDownloadThumbnailActivity: ConcurrentOperation {
 
     override func start() {
         guard !isCancelled else { return self.finish() }
+
         NextcloudKit.shared.downloadPreview(fileId: fileId,
                                             fileNamePreviewLocalPath: fileNamePreviewLocalPath,
                                             options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { _, imagePreview, _, _, _, error in
-
             if error == .success, let imagePreview = imagePreview {
                 DispatchQueue.main.async {
                     if self.fileId == self.cell?.fileId, let imageView = self.cell?.imageView {
diff --git a/iOSClient/AppDelegate.swift b/iOSClient/AppDelegate.swift
index 54e7ed0a3d..5d1afabd3d 100644
--- a/iOSClient/AppDelegate.swift
+++ b/iOSClient/AppDelegate.swift
@@ -87,12 +87,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         NextcloudKit.shared.nkCommonInstance.pathLog = utilityFileSystem.directoryGroup
 
         if NCBrandOptions.shared.disable_log {
-
             utilityFileSystem.removeFile(atPath: NextcloudKit.shared.nkCommonInstance.filenamePathLog)
             utilityFileSystem.removeFile(atPath: NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first! + "/" + NextcloudKit.shared.nkCommonInstance.filenameLog)
-
         } else {
-
             levelLog = NCKeychain().logLevel
             NextcloudKit.shared.nkCommonInstance.levelLog = levelLog
             NextcloudKit.shared.nkCommonInstance.copyLogToDocumentDirectory = true
@@ -101,6 +98,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
         if let activeAccount = NCManageDatabase.shared.getActiveAccount() {
             NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Account active \(activeAccount.account)")
+
             if NCKeychain().getPassword(account: activeAccount.account).isEmpty {
                 NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] PASSWORD NOT FOUND for \(activeAccount.account)")
             }
@@ -111,16 +109,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             userId = activeAccount.userId
             password = NCKeychain().getPassword(account: account)
 
-            NextcloudKit.shared.setup(account: account, user: user, userId: userId, password: password, urlBase: urlBase)
+            NextcloudKit.shared.setup(account: account, user: user, userId: userId, password: password, urlBase: urlBase, groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
             NCManageDatabase.shared.setCapabilities(account: account)
 
             NCBrandColor.shared.settingThemingColor(account: activeAccount.account)
             DispatchQueue.global().async {
                 NCImageCache.shared.createMediaCache(account: self.account, withCacheSize: true)
             }
-
         } else {
-
             NCKeychain().removeAll()
             if let bundleID = Bundle.main.bundleIdentifier {
                 UserDefaults.standard.removePersistentDomain(forName: bundleID)
@@ -287,7 +283,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     }
 
     func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
-        if let pref = UserDefaults(suiteName: NCBrandOptions.shared.capabilitiesGroups),
+        if let pref = UserDefaults(suiteName: NCBrandOptions.shared.capabilitiesGroup),
            let data = pref.object(forKey: "NOTIFICATION_DATA") as? [String: AnyObject] {
             nextcloudPushNotificationAction(data: data)
             pref.set(nil, forKey: "NOTIFICATION_DATA")
@@ -321,8 +317,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 let accounts = NCManageDatabase.shared.getAllAccount()
                 for account in accounts {
                     if account.account == accountPush {
-                        self.changeAccount(account.account, userProfile: nil)
-                        findAccount = true
+                        self.changeAccount(account.account, userProfile: nil) {
+                            findAccount = true
+                        }
                     }
                 }
             }
@@ -363,22 +360,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             }
         }
 
-        // [WEBPersonalized] [AppConfig]
-        if NCBrandOptions.shared.use_AppConfig {
-            if activeLogin?.view.window == nil {
-                urlBase = NCBrandOptions.shared.loginBaseUrl
-                NextcloudKit.shared.getLoginFlowV2(serverUrl: urlBase) { token, endpoint, login, _, error in
-                    // Login Flow V2
-                    if error == .success, let token, let endpoint, let login {
-                        let vc = UIHostingController(rootView: NCLoginPoll(loginFlowV2Token: token, loginFlowV2Endpoint: endpoint, loginFlowV2Login: login, cancelButtonDisabled: NCManageDatabase.shared.getAccounts().isEmptyOrNil))
-                        UIApplication.shared.firstWindow?.rootViewController?.present(vc, animated: true)
-                    }
-                }
-
-                return
-            }
-        }
-
         // Nextcloud standard login
         if selector == NCGlobal.shared.introSignup {
             if activeLogin?.view.window == nil {
@@ -394,7 +375,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 }
             }
 
-        } else if NCBrandOptions.shared.disable_intro && NCBrandOptions.shared.disable_request_login_url {
+        } else if NCBrandOptions.shared.disable_request_login_url {
             if activeLogin?.view.window == nil {
                 activeLogin = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLogin") as? NCLogin
                 activeLogin?.urlBase = NCBrandOptions.shared.loginBaseUrl
@@ -468,42 +449,45 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
     // MARK: - Account
 
-    func createAccount(server: String, username: String, password: String, completion: @escaping (_ error: NKError) -> Void) {
-        var urlBase = server
+    func createAccount(urlBase: String,
+                       user: String,
+                       password: String,
+                       completion: @escaping (_ error: NKError) -> Void) {
+        var urlBase = urlBase
         if urlBase.last == "/" { urlBase = String(urlBase.dropLast()) }
-        let account: String = "\(username) \(urlBase)"
-        let user = username
+        let account: String = "\(user) \(urlBase)"
 
-        NextcloudKit.shared.setup(account: account, user: user, userId: user, password: password, urlBase: urlBase)
+        NextcloudKit.shared.setup(account: account, user: user, userId: user, password: password, urlBase: urlBase, groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
         NextcloudKit.shared.getUserProfile { _, userProfile, _, error in
-
             if error == .success, let userProfile {
-
                 NCManageDatabase.shared.deleteAccount(account)
                 NCManageDatabase.shared.addAccount(account, urlBase: urlBase, user: user, userId: userProfile.userId, password: password)
-
                 NCKeychain().setClientCertificate(account: account, p12Data: NCNetworking.shared.p12Data, p12Password: NCNetworking.shared.p12Password)
-
-                self.changeAccount(account, userProfile: userProfile)
+                self.changeAccount(account, userProfile: userProfile) {
+                    completion(error)
+                }
             } else {
-
+                NextcloudKit.shared.setup(account: self.account, user: self.user, userId: self.userId, password: self.password, urlBase: self.urlBase, groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
                 let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: error.errorDescription, preferredStyle: .alert)
                 alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in }))
                 UIApplication.shared.firstWindow?.rootViewController?.present(alertController, animated: true)
+                completion(error)
             }
-
-            completion(error)
         }
     }
 
-    func changeAccount(_ account: String, userProfile: NKUserProfile?) {
+    func changeAccount(_ account: String,
+                       userProfile: NKUserProfile?,
+                       completion: () -> Void) {
+        guard let tableAccount = NCManageDatabase.shared.setAccountActive(account) else {
+            return completion()
+        }
+
         NCNetworking.shared.cancelAllQueue()
         NCNetworking.shared.cancelDataTask()
         NCNetworking.shared.cancelDownloadTasks()
         NCNetworking.shared.cancelUploadTasks()
 
-        guard let tableAccount = NCManageDatabase.shared.setAccountActive(account) else { return }
-
         if account != self.account {
             DispatchQueue.global().async {
                 if NCManageDatabase.shared.getAccounts()?.count == 1 {
@@ -520,7 +504,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         self.userId = tableAccount.userId
         self.password = NCKeychain().getPassword(account: tableAccount.account)
 
-        NextcloudKit.shared.setup(account: account, user: user, userId: userId, password: password, urlBase: urlBase)
+        NextcloudKit.shared.setup(account: account, user: user, userId: userId, password: password, urlBase: urlBase, groupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
         NCManageDatabase.shared.setCapabilities(account: account)
 
         if let userProfile {
@@ -528,7 +512,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         }
 
         NCPushNotification.shared.pushNotification()
-
         NCService().startRequestServicesServer()
 
         NCAutoUpload.shared.initAutoUpload(viewController: nil) { items in
@@ -536,19 +519,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         }
 
         NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterChangeUser)
+        completion()
     }
 
-    func deleteAccount(_ account: String, wipe: Bool) {
+    func deleteAccount(_ account: String) {
         UIApplication.shared.allSceneSessionDestructionExceptFirst()
 
         if let account = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", account)) {
             NCPushNotification.shared.unsubscribingNextcloudServerPushNotification(account: account.account, urlBase: account.urlBase, user: account.user, withSubscribing: false)
         }
 
-        NextcloudKit.shared.deleteAppPassword(serverUrl: urlBase, username: userId, password: password) { _, error in
-            print(error)
-        }
-
         let results = NCManageDatabase.shared.getTableLocalFiles(predicate: NSPredicate(format: "account == %@", account), sorted: "ocId", ascending: false)
         let utilityFileSystem = NCUtilityFileSystem()
         for result in results {
@@ -566,22 +546,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         self.userId = ""
         self.password = ""
 
-        if wipe {
-            let accounts = NCManageDatabase.shared.getAccounts()
-            if accounts?.count ?? 0 > 0 {
-                if let newAccount = accounts?.first {
-                    self.changeAccount(newAccount, userProfile: nil)
-                }
-            } else {
-                openLogin(selector: NCGlobal.shared.introLogin, openLoginWeb: false)
-            }
+        /*
+        NextcloudKit.shared.deleteAppPassword(serverUrl: urlBase, username: userId, password: password) { _, error in
+            print(error)
         }
+        */
     }
 
     func deleteAllAccounts() {
         let accounts = NCManageDatabase.shared.getAccounts()
         accounts?.forEach({ account in
-            deleteAccount(account, wipe: true)
+            deleteAccount(account)
         })
     }
 
diff --git a/iOSClient/Data/NCDataSource.swift b/iOSClient/Data/NCDataSource.swift
index 1c235ce1b1..5575aca838 100644
--- a/iOSClient/Data/NCDataSource.swift
+++ b/iOSClient/Data/NCDataSource.swift
@@ -25,13 +25,13 @@ import UIKit
 import NextcloudKit
 
 class NCDataSource: NSObject {
-
     var metadatas: [tableMetadata] = []
     var metadatasForSection: [NCMetadataForSection] = []
-
     var directory: tableDirectory?
-    var groupByField: String = ""
+    var groupBy: String?
+    var layout: String?
 
+    private let utilityFileSystem = NCUtilityFileSystem()
     private var sectionsValue: [String] = []
     private var providers: [NKSearchProvider]?
     private var searchResults: [NKSearchResult]?
@@ -45,18 +45,25 @@ class NCDataSource: NSObject {
         super.init()
     }
 
-    init(metadatas: [tableMetadata], account: String, directory: tableDirectory? = nil, sort: String? = "none", ascending: Bool? = false, directoryOnTop: Bool? = true, favoriteOnTop: Bool? = true, groupByField: String = "name", providers: [NKSearchProvider]? = nil, searchResults: [NKSearchResult]? = nil) {
+    init(metadatas: [tableMetadata],
+         account: String,
+         directory: tableDirectory? = nil,
+         layoutForView: NCDBLayoutForView?,
+         favoriteOnTop: Bool = true,
+         providers: [NKSearchProvider]? = nil,
+         searchResults: [NKSearchResult]? = nil) {
         super.init()
 
         self.metadatas = metadatas.filter({
             !(NCGlobal.shared.includeHiddenFiles.contains($0.fileNameView) || $0.isTransferInForeground)
         })
         self.directory = directory
-        self.sort = sort ?? "none"
-        self.ascending = ascending ?? false
-        self.directoryOnTop = directoryOnTop ?? true
-        self.favoriteOnTop = favoriteOnTop ?? true
-        self.groupByField = groupByField
+        self.sort = layoutForView?.sort ?? "none"
+        self.ascending = layoutForView?.ascending ?? false
+        self.directoryOnTop = layoutForView?.directoryOnTop ?? true
+        self.favoriteOnTop = favoriteOnTop
+        self.groupBy = layoutForView?.groupBy ?? "none"
+        self.layout = layoutForView?.layout
         // unified search
         self.providers = providers
         self.searchResults = searchResults
@@ -67,7 +74,6 @@ class NCDataSource: NSObject {
     // MARK: -
 
     func clearDataSource() {
-
         self.metadatas.removeAll()
         self.metadatasForSection.removeAll()
         self.directory = nil
@@ -77,14 +83,12 @@ class NCDataSource: NSObject {
     }
 
     func clearDirectory() {
-
         self.directory = nil
     }
 
-    func changeGroupByField(_ groupByField: String) {
-
-        self.groupByField = groupByField
-        print("DATASOURCE: set group by filed " + groupByField)
+    func changeGroupByField(_ groupBy: String) {
+        self.groupBy = groupBy
+        print("DATASOURCE: set group by filed " + groupBy)
         self.metadatasForSection.removeAll()
         self.sectionsValue.removeAll()
         print("DATASOURCE: remove  all sections")
@@ -93,7 +97,6 @@ class NCDataSource: NSObject {
     }
 
     func addSection(metadatas: [tableMetadata], searchResult: NKSearchResult?) {
-
         self.metadatas.append(contentsOf: metadatas)
 
         if let searchResult = searchResult {
@@ -104,7 +107,6 @@ class NCDataSource: NSObject {
     }
 
     internal func createSections() {
-
         // get all Section
         for metadata in self.metadatas {
             // skipped livePhoto VIDEO part
@@ -115,8 +117,14 @@ class NCDataSource: NSObject {
             if !self.sectionsValue.contains(section) {
                 self.sectionsValue.append(section)
             }
+            // image Cache
+            if (layout == NCGlobal.shared.layoutPhotoRatio || layout == NCGlobal.shared.layoutPhotoSquare),
+               (metadata.isVideo || metadata.isImage),
+               NCImageCache.shared.getPreviewImageCache(ocId: metadata.ocId, etag: metadata.etag) == nil,
+               let image = UIImage(contentsOfFile: self.utilityFileSystem.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)) {
+                NCImageCache.shared.addPreviewImageCache(metadata: metadata, image: image)
+            }
         }
-
         // Unified search
         if let providers = self.providers, !providers.isEmpty {
             let sectionsDictionary = ThreadSafeDictionary<String, Int>()
@@ -134,9 +142,7 @@ class NCDataSource: NSObject {
                     self.sectionsValue.append(section.key)
                 }
             }
-
         } else {
-
             // normal
             let directory = NSLocalizedString("directory", comment: "").lowercased().firstUppercased
             self.sectionsValue = self.sectionsValue.sorted {
@@ -162,7 +168,6 @@ class NCDataSource: NSObject {
     }
 
     internal func createMetadataForSection(sectionValue: String) {
-
         var searchResult: NKSearchResult?
         if let providers = self.providers, !providers.isEmpty, let searchResults = self.searchResults {
             searchResult = searchResults.filter({ $0.id == sectionValue}).first
@@ -179,20 +184,17 @@ class NCDataSource: NSObject {
     }
 
     func getMetadataSourceForAllSections() -> [tableMetadata] {
-
         var metadatas: [tableMetadata] = []
 
         for section in metadatasForSection {
             metadatas.append(contentsOf: section.metadatas)
         }
-
         return metadatas
     }
 
     // MARK: -
 
     func appendMetadatasToSection(_ metadatas: [tableMetadata], metadataForSection: NCMetadataForSection, lastSearchResult: NKSearchResult) {
-
         guard let sectionIndex = getSectionIndex(metadataForSection.sectionValue) else { return }
         var indexPaths: [IndexPath] = []
 
@@ -241,7 +243,6 @@ class NCDataSource: NSObject {
     }
 
     func getFooterInformationAllMetadatas() -> (directories: Int, files: Int, size: Int64) {
-
         var directories: Int = 0
         var files: Int = 0
         var size: Int64 = 0
@@ -251,7 +252,6 @@ class NCDataSource: NSObject {
             files += metadataForSection.numFile
             size += metadataForSection.totalSize
         }
-
         return (directories, files, size)
     }
 
@@ -263,14 +263,13 @@ class NCDataSource: NSObject {
     }
 
     internal func getSectionValue(metadata: tableMetadata) -> String {
-
-        switch self.groupByField {
-        case "name":
+        switch self.groupBy {
+        case "name", "none":
             return NSLocalizedString(metadata.name, comment: "")
         case "classFile":
             return NSLocalizedString(metadata.classFile, comment: "").lowercased().firstUppercased
         default:
-            return NSLocalizedString(metadata.classFile, comment: "")
+            return NSLocalizedString(metadata.name, comment: "")
         }
     }
 
@@ -300,7 +299,6 @@ class NCDataSource: NSObject {
 // MARK: -
 
 class NCMetadataForSection: NSObject {
-
     var sectionValue: String
     var metadatas: [tableMetadata]
     var lastSearchResult: NKSearchResult?
@@ -337,7 +335,6 @@ class NCMetadataForSection: NSObject {
     }
 
     func createMetadatas() {
-
         // Clear
         //
         metadatasSorted.removeAll()
@@ -357,7 +354,6 @@ class NCMetadataForSection: NSObject {
         //
         if sort != "none" && !sort.isEmpty {
             metadatasSorted = metadatas.sorted {
-
                 switch sort {
                 case "date":
                     if ascending {
diff --git a/iOSClient/Data/NCManageDatabase+Account.swift b/iOSClient/Data/NCManageDatabase+Account.swift
index 6d2c7f4f31..567b60dfc0 100644
--- a/iOSClient/Data/NCManageDatabase+Account.swift
+++ b/iOSClient/Data/NCManageDatabase+Account.swift
@@ -80,22 +80,16 @@ class tableAccount: Object, NCUserBaseUrl {
 }
 
 extension NCManageDatabase {
-
     func addAccount(_ account: String, urlBase: String, user: String, userId: String, password: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
                 let addObject = tableAccount()
-
                 addObject.account = account
-
                 NCKeychain().setPassword(account: account, password: password)
-
                 addObject.urlBase = urlBase
                 addObject.user = user
                 addObject.userId = userId
-
                 realm.add(addObject, update: .all)
             }
         } catch let error {
@@ -103,8 +97,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func updateAccount(_ account: tableAccount) {
-
+    func updateAccount(_ account: tableAccount) {
         do {
             let realm = try Realm()
             try realm.write {
@@ -115,8 +108,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func deleteAccount(_ account: String) {
-
+    func deleteAccount(_ account: String) {
         do {
             let realm = try Realm()
             try realm.write {
@@ -128,8 +120,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func getActiveAccount() -> tableAccount? {
-
+    func getActiveAccount() -> tableAccount? {
         do {
             let realm = try Realm()
             guard let result = realm.objects(tableAccount.self).filter("active == true").first else { return nil }
@@ -137,12 +128,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
-    @objc func getAccounts() -> [String]? {
-
+    func getAccounts() -> [String]? {
         do {
             let realm = try Realm()
             let results = realm.objects(tableAccount.self).sorted(byKeyPath: "account", ascending: true)
@@ -152,12 +141,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
-    @objc func getAccount(predicate: NSPredicate) -> tableAccount? {
-
+    func getAccount(predicate: NSPredicate) -> tableAccount? {
         do {
             let realm = try Realm()
             guard let result = realm.objects(tableAccount.self).filter(predicate).first else { return nil }
@@ -165,12 +152,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
-    @objc func getAllAccount() -> [tableAccount] {
-
+    func getAllAccount() -> [tableAccount] {
         do {
             let realm = try Realm()
             let sorted = [SortDescriptor(keyPath: "active", ascending: false), SortDescriptor(keyPath: "user", ascending: true)]
@@ -179,12 +164,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
-    @objc func getAllAccountOrderAlias() -> [tableAccount] {
-
+    func getAllAccountOrderAlias() -> [tableAccount] {
         do {
             let realm = try Realm()
             let sorted = [SortDescriptor(keyPath: "active", ascending: false), SortDescriptor(keyPath: "alias", ascending: true), SortDescriptor(keyPath: "user", ascending: true)]
@@ -193,12 +176,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
-    @objc func getAccountAutoUploadFileName() -> String {
-
+    func getAccountAutoUploadFileName() -> String {
         do {
             let realm = try Realm()
             guard let result = realm.objects(tableAccount.self).filter("active == true").first else { return "" }
@@ -210,12 +191,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return ""
     }
 
-    @objc func getAccountAutoUploadDirectory(urlBase: String, userId: String, account: String) -> String {
-
+    func getAccountAutoUploadDirectory(urlBase: String, userId: String, account: String) -> String {
         do {
             let realm = try Realm()
             guard let result = realm.objects(tableAccount.self).filter("active == true").first else { return "" }
@@ -232,21 +211,17 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return ""
     }
 
-    @objc func getAccountAutoUploadPath(urlBase: String, userId: String, account: String) -> String {
-
+    func getAccountAutoUploadPath(urlBase: String, userId: String, account: String) -> String {
         let cameraFileName = self.getAccountAutoUploadFileName()
         let cameraDirectory = self.getAccountAutoUploadDirectory(urlBase: urlBase, userId: userId, account: account)
         let folderPhotos = utilityFileSystem.stringAppendServerUrl(cameraDirectory, addFileName: cameraFileName)
-
         return folderPhotos
     }
 
-    @objc func getAccountAutoUploadSubfolderGranularity() -> Int {
-
+    func getAccountAutoUploadSubfolderGranularity() -> Int {
         do {
             let realm = try Realm()
             guard let result = realm.objects(tableAccount.self).filter("active == true").first else { return NCGlobal.shared.subfolderGranularityMonthly }
@@ -254,12 +229,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return NCGlobal.shared.subfolderGranularityMonthly
     }
 
     func setAccountActive(_ account: String) -> tableAccount? {
-
         var accountReturn = tableAccount()
 
         do {
@@ -279,12 +252,10 @@ extension NCManageDatabase {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not write to database: \(error)")
             return nil
         }
-
         return tableAccount.init(value: accountReturn)
     }
 
-    @objc func removePasswordAccount(_ account: String) {
-
+    func removePasswordAccount(_ account: String) {
         do {
             let realm = try Realm()
             try realm.write {
@@ -297,8 +268,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountAutoUploadProperty(_ property: String, state: Bool) {
-
+    func setAccountAutoUploadProperty(_ property: String, state: Bool) {
         do {
             let realm = try Realm()
             try realm.write {
@@ -313,8 +283,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountAutoUploadGranularity(_ property: String, state: Int) {
-
+    func setAccountAutoUploadGranularity(_ property: String, state: Int) {
         do {
             let realm = try Realm()
             try realm.write {
@@ -327,8 +296,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountAutoUploadFileName(_ fileName: String) {
-
+    func setAccountAutoUploadFileName(_ fileName: String) {
         do {
             let realm = try Realm()
             try realm.write {
@@ -341,8 +309,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountAutoUploadDirectory(_ serverUrl: String?, urlBase: String, userId: String, account: String) {
-
+    func setAccountAutoUploadDirectory(_ serverUrl: String?, urlBase: String, userId: String, account: String) {
         do {
             let realm = try Realm()
             try realm.write {
@@ -359,8 +326,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountUserProfile(account: String, userProfile: NKUserProfile) {
-
+    func setAccountUserProfile(account: String, userProfile: NKUserProfile) {
         do {
             let realm = try Realm()
             try realm.write {
@@ -395,8 +361,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountMediaPath(_ path: String, account: String) {
-
+    func setAccountMediaPath(_ path: String, account: String) {
         do {
             let realm = try Realm()
             try realm.write {
@@ -409,13 +374,12 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountUserStatus(userStatusClearAt: NSDate?, userStatusIcon: String?, userStatusMessage: String?, userStatusMessageId: String?, userStatusMessageIsPredefined: Bool, userStatusStatus: String?, userStatusStatusIsUserDefined: Bool, account: String) {
-
+    func setAccountUserStatus(userStatusClearAt: Date?, userStatusIcon: String?, userStatusMessage: String?, userStatusMessageId: String?, userStatusMessageIsPredefined: Bool, userStatusStatus: String?, userStatusStatusIsUserDefined: Bool, account: String) {
         do {
             let realm = try Realm()
             try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("account == %@", account).first {
-                    result.userStatusClearAt = userStatusClearAt
+                    result.userStatusClearAt = userStatusClearAt as? NSDate
                     result.userStatusIcon = userStatusIcon
                     result.userStatusMessage = userStatusMessage
                     result.userStatusMessageId = userStatusMessageId
@@ -429,7 +393,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func setAccountAlias(_ account: String, alias: String) {
+    func setAccountAlias(_ account: String, alias: String) {
         let alias = alias.trimmingCharacters(in: .whitespacesAndNewlines)
 
         do {
diff --git a/iOSClient/Data/NCManageDatabase+Activity.swift b/iOSClient/Data/NCManageDatabase+Activity.swift
index 2392027075..543a02b40c 100644
--- a/iOSClient/Data/NCManageDatabase+Activity.swift
+++ b/iOSClient/Data/NCManageDatabase+Activity.swift
@@ -56,7 +56,6 @@ class tableActivity: Object, DateCompareable {
 }
 
 class tableActivityLatestId: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var activityFirstKnown: Int = 0
     @objc dynamic var activityLastGiven: Int = 0
@@ -67,7 +66,6 @@ class tableActivityLatestId: Object {
 }
 
 class tableActivityPreview: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var filename = ""
     @objc dynamic var idPrimaryKey = ""
@@ -85,7 +83,6 @@ class tableActivityPreview: Object {
 }
 
 class tableActivitySubjectRich: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var idActivity: Int = 0
     @objc dynamic var idPrimaryKey = ""
@@ -102,21 +99,17 @@ class tableActivitySubjectRich: Object {
 }
 
 extension NCManageDatabase {
-
     func addActivity(_ activities: [NKActivity], account: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
-
                 for activity in activities {
-
                     let addObjectActivity = tableActivity()
 
                     addObjectActivity.account = account
                     addObjectActivity.idActivity = activity.idActivity
                     addObjectActivity.idPrimaryKey = account + String(activity.idActivity)
-                    addObjectActivity.date = activity.date
+                    addObjectActivity.date = activity.date as NSDate
                     addObjectActivity.app = activity.app
                     addObjectActivity.type = activity.type
                     addObjectActivity.user = activity.user
@@ -193,7 +186,6 @@ extension NCManageDatabase {
     }
 
     func getActivity(predicate: NSPredicate, filterFileId: String?) -> (all: [tableActivity], filter: [tableActivity]) {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -208,12 +200,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return([], [])
     }
 
     func getActivitySubjectRich(account: String, idActivity: Int, key: String) -> tableActivitySubjectRich? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -222,12 +212,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getActivitySubjectRich(account: String, idActivity: Int, id: String) -> tableActivitySubjectRich? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -244,12 +232,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getActivityPreview(account: String, idActivity: Int, orderKeysId: [String]) -> [tableActivityPreview] {
-
         var results: [tableActivityPreview] = []
 
         do {
@@ -264,12 +250,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
    func updateLatestActivityId(activityFirstKnown: Int, activityLastGiven: Int, account: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -285,7 +269,6 @@ extension NCManageDatabase {
     }
 
     func getLatestActivityId(account: String) -> tableActivityLatestId? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -293,7 +276,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+Avatar.swift b/iOSClient/Data/NCManageDatabase+Avatar.swift
index bf43e0ceeb..6f398043a0 100644
--- a/iOSClient/Data/NCManageDatabase+Avatar.swift
+++ b/iOSClient/Data/NCManageDatabase+Avatar.swift
@@ -63,7 +63,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
@@ -102,7 +101,6 @@ extension NCManageDatabase {
         } catch let error {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not write to database: \(error)")
         }
-
         return image
     }
 
diff --git a/iOSClient/Data/NCManageDatabase+Capabilities.swift b/iOSClient/Data/NCManageDatabase+Capabilities.swift
index e3617650b5..73820d709a 100644
--- a/iOSClient/Data/NCManageDatabase+Capabilities.swift
+++ b/iOSClient/Data/NCManageDatabase+Capabilities.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableCapabilities: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var jsondata: Data?
 
@@ -36,9 +35,7 @@ class tableCapabilities: Object {
 }
 
 extension NCManageDatabase {
-
     func addCapabilitiesJSon(_ data: Data, account: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -53,7 +50,6 @@ extension NCManageDatabase {
     }
 
     func getCapabilities(account: String) -> Data? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -67,11 +63,9 @@ extension NCManageDatabase {
     }
 
     func setCapabilities(account: String, data: Data? = nil) {
-
         let jsonData: Data?
 
         struct CapabilityNextcloud: Codable {
-
             struct Ocs: Codable {
                 let meta: Meta
                 let data: Data
@@ -360,7 +354,7 @@ extension NCManageDatabase {
             global.capabilityFilesComments = data.capabilities.files?.comments ?? false
             global.capabilityFilesBigfilechunking = data.capabilities.files?.bigfilechunking ?? false
 
-            global.capabilityUserStatusEnabled = data.capabilities.files?.undelete ?? false
+            global.capabilityUserStatusEnabled = data.capabilities.userstatus?.enabled ?? false
             if data.capabilities.external != nil {
                 global.capabilityExternalSites = true
             }
diff --git a/iOSClient/Data/NCManageDatabase+Chunk.swift b/iOSClient/Data/NCManageDatabase+Chunk.swift
index 1bd8a87e1c..58468af836 100644
--- a/iOSClient/Data/NCManageDatabase+Chunk.swift
+++ b/iOSClient/Data/NCManageDatabase+Chunk.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableChunk: Object {
-
     @Persisted var account = ""
     @Persisted var chunkFolder = ""
     @Persisted(primaryKey: true) var index = ""
@@ -36,9 +35,7 @@ class tableChunk: Object {
 }
 
 extension NCManageDatabase {
-
     func getChunkFolder(account: String, ocId: String) -> String {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -47,12 +44,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return NSUUID().uuidString
     }
 
     func getChunks(account: String, ocId: String) -> [(fileName: String, size: Int64)] {
-
         var filesChunk: [(fileName: String, size: Int64)] = []
 
         do {
@@ -65,12 +60,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return filesChunk
     }
 
     func addChunks(account: String, ocId: String, chunkFolder: String, filesChunk: [(fileName: String, size: Int64)]) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -93,7 +86,6 @@ extension NCManageDatabase {
     }
 
     func deleteChunk(account: String, ocId: String, fileChunk: (fileName: String, size: Int64), directory: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -108,7 +100,6 @@ extension NCManageDatabase {
     }
 
     func deleteChunks(account: String, ocId: String, directory: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -123,5 +114,4 @@ extension NCManageDatabase {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not write to database: \(error)")
         }
     }
-
 }
diff --git a/iOSClient/Data/NCManageDatabase+Comments.swift b/iOSClient/Data/NCManageDatabase+Comments.swift
index 8141c1081d..0af3955943 100644
--- a/iOSClient/Data/NCManageDatabase+Comments.swift
+++ b/iOSClient/Data/NCManageDatabase+Comments.swift
@@ -47,9 +47,7 @@ class tableComments: Object, DateCompareable {
 }
 
 extension NCManageDatabase {
-
     func addComments(_ comments: [NKComments], account: String, objectId: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -78,7 +76,6 @@ extension NCManageDatabase {
     }
 
     func getComments(account: String, objectId: String) -> [tableComments] {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -87,7 +84,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+DashboardWidget.swift b/iOSClient/Data/NCManageDatabase+DashboardWidget.swift
index b770269828..70f0c0ec50 100644
--- a/iOSClient/Data/NCManageDatabase+DashboardWidget.swift
+++ b/iOSClient/Data/NCManageDatabase+DashboardWidget.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableDashboardWidget: Object {
-
     @Persisted(primaryKey: true) var index = ""
     @Persisted var account = ""
     @Persisted var id = ""
@@ -39,7 +38,6 @@ class tableDashboardWidget: Object {
 }
 
 class tableDashboardWidgetButton: Object {
-
     @Persisted(primaryKey: true) var index = ""
     @Persisted var account = ""
     @Persisted var id = ""
@@ -49,9 +47,7 @@ class tableDashboardWidgetButton: Object {
 }
 
 extension NCManageDatabase {
-
     func getDashboardWidget(account: String, id: String) -> (tableDashboardWidget?, [tableDashboardWidgetButton]?) {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -61,12 +57,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return (nil, nil)
     }
 
     func getDashboardWidgetApplications(account: String) -> [tableDashboardWidget] {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -76,19 +70,15 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
     func addDashboardWidget(account: String, dashboardWidgets: [NCCDashboardWidget]) {
-
         do {
             let realm = try Realm()
             try realm.write {
-
                 let resultDashboard = realm.objects(tableDashboardWidget.self).filter("account == %@", account)
                 realm.delete(resultDashboard)
-
                 let resultDashboardButton = realm.objects(tableDashboardWidgetButton.self).filter("account == %@", account)
                 realm.delete(resultDashboardButton)
 
diff --git a/iOSClient/Data/NCManageDatabase+DirectEditing.swift b/iOSClient/Data/NCManageDatabase+DirectEditing.swift
index c104da3bce..6226375539 100644
--- a/iOSClient/Data/NCManageDatabase+DirectEditing.swift
+++ b/iOSClient/Data/NCManageDatabase+DirectEditing.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableDirectEditingCreators: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var editor = ""
     @objc dynamic var ext = ""
@@ -37,7 +36,6 @@ class tableDirectEditingCreators: Object {
 }
 
 class tableDirectEditingEditors: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var editor = ""
     let mimetypes = List<String>()
@@ -47,21 +45,16 @@ class tableDirectEditingEditors: Object {
 }
 
 extension NCManageDatabase {
-
     func addDirectEditing(account: String, editors: [NKEditorDetailsEditors], creators: [NKEditorDetailsCreators]) {
-
         do {
             let realm = try Realm()
             try realm.write {
-
                 let resultsCreators = realm.objects(tableDirectEditingCreators.self).filter("account == %@", account)
                 realm.delete(resultsCreators)
-
                 let resultsEditors = realm.objects(tableDirectEditingEditors.self).filter("account == %@", account)
                 realm.delete(resultsEditors)
 
                 for creator in creators {
-
                     let addObject = tableDirectEditingCreators()
 
                     addObject.account = account
@@ -71,12 +64,10 @@ extension NCManageDatabase {
                     addObject.mimetype = creator.mimetype
                     addObject.name = creator.name
                     addObject.templates = creator.templates
-
                     realm.add(addObject)
                 }
 
                 for editor in editors {
-
                     let addObject = tableDirectEditingEditors()
 
                     addObject.account = account
@@ -93,7 +84,6 @@ extension NCManageDatabase {
                         addObject.optionalMimetypes.append(mimeType)
                     }
                     addObject.secure = editor.secure
-
                     realm.add(addObject)
                 }
             }
@@ -103,7 +93,6 @@ extension NCManageDatabase {
     }
 
     func getDirectEditingCreators(account: String) -> [tableDirectEditingCreators]? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -116,12 +105,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return nil
     }
 
     func getDirectEditingCreators(predicate: NSPredicate) -> [tableDirectEditingCreators]? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -134,12 +121,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return nil
     }
 
     func getDirectEditingEditors(account: String) -> [tableDirectEditingEditors]? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -152,7 +137,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return nil
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+Directory.swift b/iOSClient/Data/NCManageDatabase+Directory.swift
index b65e076e4e..cdd8ec70ec 100644
--- a/iOSClient/Data/NCManageDatabase+Directory.swift
+++ b/iOSClient/Data/NCManageDatabase+Directory.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableDirectory: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var colorFolder: String?
     @objc dynamic var e2eEncrypted: Bool = false
@@ -46,7 +45,6 @@ class tableDirectory: Object {
 }
 
 extension NCManageDatabase {
-
     func addDirectory(e2eEncrypted: Bool, favorite: Bool, ocId: String, fileId: String, etag: String? = nil, permissions: String? = nil, richWorkspace: String? = nil, serverUrl: String, account: String) {
         do {
             let realm = try Realm()
@@ -88,7 +86,6 @@ extension NCManageDatabase {
     }
 
     func deleteDirectoryAndSubDirectory(serverUrl: String, account: String) {
-
 #if !EXTENSION
         DispatchQueue.main.async {
             let windowScenes = UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }
@@ -208,7 +205,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
@@ -235,7 +231,7 @@ extension NCManageDatabase {
                     directory.serverUrl = serverUrl
                     directory.offline = offline
                     addDirectory(directory: directory, metadata: metadata)
-                    realm.add(directory)
+                    realm.add(directory, update: .all)
                 }
             }
         } catch let error {
diff --git a/iOSClient/Data/NCManageDatabase+E2EE.swift b/iOSClient/Data/NCManageDatabase+E2EE.swift
index 0ed415176c..86346cc5c3 100644
--- a/iOSClient/Data/NCManageDatabase+E2EE.swift
+++ b/iOSClient/Data/NCManageDatabase+E2EE.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableE2eEncryptionLock: Object {
-
     @Persisted(primaryKey: true) var fileId = ""
     @Persisted var account = ""
     @Persisted var date = Date()
@@ -36,7 +35,6 @@ class tableE2eEncryptionLock: Object {
 
 typealias tableE2eEncryption = tableE2eEncryptionV4
 class tableE2eEncryptionV4: Object {
-
     @Persisted(primaryKey: true) var primaryKey = ""
     @Persisted var account = ""
     @Persisted var authenticationTag: String = ""
@@ -65,7 +63,6 @@ class tableE2eEncryptionV4: Object {
 // MARK: Table V1, V1.2
 
 class tableE2eMetadata12: Object {
-
     @Persisted(primaryKey: true) var serverUrl = ""
     @Persisted var account = ""
     @Persisted var metadataKey = ""
@@ -77,7 +74,6 @@ class tableE2eMetadata12: Object {
 
 typealias tableE2eMetadata = tableE2eMetadataV2
 class tableE2eMetadataV2: Object {
-
     @Persisted(primaryKey: true) var primaryKey = ""
     @Persisted var account = ""
     @Persisted var deleted: Bool = false
@@ -96,7 +92,6 @@ class tableE2eMetadataV2: Object {
 }
 
 class tableE2eCounter: Object {
-
     @Persisted(primaryKey: true) var primaryKey: String
     @Persisted var account: String
     @Persisted var counter: Int
@@ -112,7 +107,6 @@ class tableE2eCounter: Object {
 }
 
 class tableE2eUsers: Object {
-
     @Persisted(primaryKey: true) var primaryKey = ""
     @Persisted var account = ""
     @Persisted var certificate = ""
@@ -132,12 +126,9 @@ class tableE2eUsers: Object {
 }
 
 extension NCManageDatabase {
-
     // MARK: -
     // MARK: tableE2eEncryption
-
     func addE2eEncryption(_ object: tableE2eEncryption) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -149,7 +140,6 @@ extension NCManageDatabase {
     }
 
     func deleteE2eEncryption(predicate: NSPredicate) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -162,7 +152,6 @@ extension NCManageDatabase {
     }
 
     func getE2eEncryption(predicate: NSPredicate) -> tableE2eEncryption? {
-
         do {
             let realm = try Realm()
             guard let result = realm.objects(tableE2eEncryption.self).filter(predicate).sorted(byKeyPath: "metadataKeyIndex", ascending: false).first else { return nil }
@@ -170,12 +159,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getE2eEncryptions(predicate: NSPredicate) -> [tableE2eEncryption] {
-
         do {
             let realm = try Realm()
             let results: Results<tableE2eEncryption>
@@ -184,12 +171,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
     func renameFileE2eEncryption(account: String, serverUrl: String, fileNameIdentifier: String, newFileName: String, newFileNamePath: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -206,7 +191,6 @@ extension NCManageDatabase {
     // MARK: Table e2e Encryption Lock
 
     func getE2ETokenLock(account: String, serverUrl: String) -> tableE2eEncryptionLock? {
-
         do {
             let realm = try Realm()
             guard let result = realm.objects(tableE2eEncryptionLock.self).filter("account == %@ AND serverUrl == %@", account, serverUrl).first else { return nil }
@@ -214,12 +198,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getE2EAllTokenLock(account: String) -> [tableE2eEncryptionLock] {
-
         do {
             let realm = try Realm()
             let results = realm.objects(tableE2eEncryptionLock.self).filter("account == %@", account)
@@ -231,12 +213,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
     func setE2ETokenLock(account: String, serverUrl: String, fileId: String, e2eToken: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -253,7 +233,6 @@ extension NCManageDatabase {
     }
 
     func deleteE2ETokenLock(account: String, serverUrl: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -270,7 +249,6 @@ extension NCManageDatabase {
     // MARK: V1
 
     func getE2eMetadata(account: String, serverUrl: String) -> tableE2eMetadata12? {
-
         do {
             let realm = try Realm()
             guard let result = realm.objects(tableE2eMetadata12.self).filter("account == %@ AND serverUrl == %@", account, serverUrl).first else { return nil }
@@ -278,12 +256,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func setE2eMetadata(account: String, serverUrl: String, metadataKey: String, version: Double) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -309,7 +285,6 @@ extension NCManageDatabase {
                      certificate: String,
                      encryptedMetadataKey: String?,
                      metadataKey: Data?) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -326,7 +301,6 @@ extension NCManageDatabase {
     }
 
     func deleteE2EUsers(account: String, ocIdServerUrl: String, userId: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -340,43 +314,36 @@ extension NCManageDatabase {
     }
 
     func getE2EUsers(account: String, ocIdServerUrl: String) -> Results<tableE2eUsers>? {
-
         do {
             let realm = try Realm()
             return realm.objects(tableE2eUsers.self).filter("account == %@ AND ocIdServerUrl == %@", account, ocIdServerUrl)
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getE2EUser(account: String, ocIdServerUrl: String, userId: String) -> tableE2eUsers? {
-
         do {
             let realm = try Realm()
             return realm.objects(tableE2eUsers.self).filter("account == %@ && ocIdServerUrl == %@ AND userId == %@", account, ocIdServerUrl, userId).first
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getE2eMetadata(account: String, ocIdServerUrl: String) -> tableE2eMetadata? {
-
         do {
             let realm = try Realm()
             return realm.objects(tableE2eMetadata.self).filter("account == %@ && ocIdServerUrl == %@", account, ocIdServerUrl).first
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func addE2eMetadata(account: String, serverUrl: String, ocIdServerUrl: String, keyChecksums: [String]?, deleted: Bool, folders: [String: String]?, version: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -401,7 +368,6 @@ extension NCManageDatabase {
     }
 
     func updateCounterE2eMetadata(account: String, ocIdServerUrl: String, counter: Int) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -414,14 +380,12 @@ extension NCManageDatabase {
     }
 
     func getCounterE2eMetadata(account: String, ocIdServerUrl: String) -> Int? {
-
         do {
             let realm = try Realm()
             return realm.objects(tableE2eCounter.self).filter("account == %@ && ocIdServerUrl == %@", account, ocIdServerUrl).first?.counter
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+ExternalSites.swift b/iOSClient/Data/NCManageDatabase+ExternalSites.swift
index 098042da56..3cb09b85f8 100644
--- a/iOSClient/Data/NCManageDatabase+ExternalSites.swift
+++ b/iOSClient/Data/NCManageDatabase+ExternalSites.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableExternalSites: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var icon = ""
     @objc dynamic var idExternalSite: Int = 0
@@ -37,9 +36,7 @@ class tableExternalSites: Object {
 }
 
 extension NCManageDatabase {
-
     func addExternalSites(_ externalSite: NKExternalSite, account: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -61,7 +58,6 @@ extension NCManageDatabase {
     }
 
     func deleteExternalSites(account: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -74,7 +70,6 @@ extension NCManageDatabase {
     }
 
     func getAllExternalSites(account: String) -> [tableExternalSites]? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -87,7 +82,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return nil
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+GPS.swift b/iOSClient/Data/NCManageDatabase+GPS.swift
index fae9896fbf..4e0c3928b6 100644
--- a/iOSClient/Data/NCManageDatabase+GPS.swift
+++ b/iOSClient/Data/NCManageDatabase+GPS.swift
@@ -33,9 +33,7 @@ class tableGPSV2: Object {
 }
 
 extension NCManageDatabase {
-
-    @objc func addGeocoderLocation(_ location: String, latitude: Double, longitude: Double) {
-
+    func addGeocoderLocation(_ location: String, latitude: Double, longitude: Double) {
         do {
             let realm = try Realm()
             realm.refresh()
@@ -52,7 +50,7 @@ extension NCManageDatabase {
         }
     }
 
-    @objc func getLocationFromLatAndLong(latitude: Double, longitude: Double) -> String? {
+    func getLocationFromLatAndLong(latitude: Double, longitude: Double) -> String? {
         do {
             let realm = try Realm()
             realm.refresh()
@@ -61,7 +59,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return nil
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+Groupfolders.swift b/iOSClient/Data/NCManageDatabase+Groupfolders.swift
index 83b2bf5a43..6251e02800 100644
--- a/iOSClient/Data/NCManageDatabase+Groupfolders.swift
+++ b/iOSClient/Data/NCManageDatabase+Groupfolders.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class TableGroupfolders: Object {
-
     @Persisted var account = ""
     @Persisted var acl: Bool = false
     @Persisted var groups: List<TableGroupfoldersGroups>
@@ -38,7 +37,6 @@ class TableGroupfolders: Object {
 }
 
 class TableGroupfoldersGroups: Object {
-
     @Persisted var account = ""
     @Persisted var group = ""
     @Persisted var permission: Int = 0
@@ -53,9 +51,7 @@ class TableGroupfoldersGroups: Object {
 }
 
 extension NCManageDatabase {
-
     func addGroupfolders(account: String, groupfolders: [NKGroupfolders]) {
-
         do {
             let realm = try Realm()
             try realm.write {
diff --git a/iOSClient/Data/NCManageDatabase+LayoutForView.swift b/iOSClient/Data/NCManageDatabase+LayoutForView.swift
index cbbbcff2e1..4286a84695 100644
--- a/iOSClient/Data/NCManageDatabase+LayoutForView.swift
+++ b/iOSClient/Data/NCManageDatabase+LayoutForView.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class NCDBLayoutForView: Object {
-
     @Persisted(primaryKey: true) var index = ""
     @Persisted var account = ""
     @Persisted var keyStore = ""
@@ -36,14 +35,23 @@ class NCDBLayoutForView: Object {
     @Persisted var groupBy: String = "none"
     @Persisted var directoryOnTop: Bool = true
     @Persisted var titleButtonHeader: String = "_sorted_by_name_a_z_"
-    @Persisted var itemForLine: Int = 3
+    @Persisted var columnGrid: Int = 3
+    @Persisted var columnPhoto: Int = 3
 }
 
 extension NCManageDatabase {
-
     @discardableResult
-    func setLayoutForView(account: String, key: String, serverUrl: String, layout: String? = nil, sort: String? = nil, ascending: Bool? = nil, groupBy: String? = nil, directoryOnTop: Bool? = nil, titleButtonHeader: String? = nil, itemForLine: Int? = nil) -> NCDBLayoutForView? {
-
+    func setLayoutForView(account: String,
+                          key: String,
+                          serverUrl: String,
+                          layout: String? = nil,
+                          sort: String? = nil,
+                          ascending: Bool? = nil,
+                          groupBy: String? = nil,
+                          directoryOnTop: Bool? = nil,
+                          titleButtonHeader: String? = nil,
+                          columnGrid: Int? = nil,
+                          columnPhoto: Int? = nil) -> NCDBLayoutForView? {
         var keyStore = key
         if !serverUrl.isEmpty { keyStore = serverUrl}
         let index = account + " " + keyStore
@@ -59,42 +67,43 @@ extension NCManageDatabase {
                 }
                 addObject.account = account
                 addObject.keyStore = keyStore
-                if let layout = layout {
+                if let layout {
                     addObject.layout = layout
                 }
-                if let sort = sort {
+                if let sort {
                     addObject.sort = sort
                 }
-                if let sort = sort {
+                if let sort {
                     addObject.sort = sort
                 }
-                if let ascending = ascending {
+                if let ascending {
                     addObject.ascending = ascending
                 }
-                if let groupBy = groupBy {
+                if let groupBy {
                     addObject.groupBy = groupBy
                 }
-                if let directoryOnTop = directoryOnTop {
+                if let directoryOnTop {
                     addObject.directoryOnTop = directoryOnTop
                 }
-                if let titleButtonHeader = titleButtonHeader {
+                if let titleButtonHeader {
                     addObject.titleButtonHeader = titleButtonHeader
                 }
-                if let itemForLine = itemForLine {
-                    addObject.itemForLine = itemForLine
+                if let columnGrid {
+                    addObject.columnGrid = columnGrid
+                }
+                if let columnPhoto {
+                    addObject.columnPhoto = columnPhoto
                 }
                 realm.add(addObject, update: .all)
             }
         } catch let error {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not write to database: \(error)")
         }
-
         return NCDBLayoutForView(value: addObject)
     }
 
     @discardableResult
     func setLayoutForView(layoutForView: NCDBLayoutForView) -> NCDBLayoutForView? {
-
         let result = NCDBLayoutForView(value: layoutForView)
 
         do {
@@ -110,7 +119,6 @@ extension NCManageDatabase {
     }
 
     func getLayoutForView(account: String, key: String, serverUrl: String) -> NCDBLayoutForView? {
-
         var keyStore = key
         if !serverUrl.isEmpty { keyStore = serverUrl}
         let index = account + " " + keyStore
@@ -126,7 +134,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return setLayoutForView(account: account, key: key, serverUrl: serverUrl)
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+LocalFile.swift b/iOSClient/Data/NCManageDatabase+LocalFile.swift
index 387470112d..608bae383b 100644
--- a/iOSClient/Data/NCManageDatabase+LocalFile.swift
+++ b/iOSClient/Data/NCManageDatabase+LocalFile.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableLocalFile: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var etag = ""
     @objc dynamic var exifDate: NSDate?
@@ -43,13 +42,11 @@ class tableLocalFile: Object {
         return "ocId"
     }
 }
-extension NCManageDatabase {
 
+extension NCManageDatabase {
     // MARK: -
     // MARK: Table LocalFile - return RESULT
-
     func getTableLocalFile(ocId: String) -> tableLocalFile? {
-
         do {
             let realm = try Realm()
             return realm.objects(tableLocalFile.self).filter("ocId == %@", ocId).first
@@ -63,7 +60,6 @@ extension NCManageDatabase {
     // MARK: Table LocalFile
 
     func addLocalFile(metadata: tableMetadata, offline: Bool? = nil) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -86,7 +82,6 @@ extension NCManageDatabase {
     }
 
     func addLocalFile(account: String, etag: String, ocId: String, fileName: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -106,7 +101,6 @@ extension NCManageDatabase {
     }
 
     func deleteLocalFile(predicate: NSPredicate) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -119,7 +113,6 @@ extension NCManageDatabase {
     }
 
     func setLocalFile(ocId: String, fileName: String?) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -134,7 +127,6 @@ extension NCManageDatabase {
     }
 
     @objc func setLocalFile(ocId: String, exifDate: NSDate?, exifLatitude: String, exifLongitude: String, exifLensModel: String?) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -153,7 +145,6 @@ extension NCManageDatabase {
     }
 
     func setOffLocalFile(ocId: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -166,7 +157,6 @@ extension NCManageDatabase {
     }
 
     func getTableLocalFile(account: String) -> [tableLocalFile] {
-
         do {
             let realm = try Realm()
             let results = realm.objects(tableLocalFile.self).filter("account == %@", account)
@@ -174,12 +164,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
     func getTableLocalFile(predicate: NSPredicate) -> tableLocalFile? {
-
         do {
             let realm = try Realm()
             guard let result = realm.objects(tableLocalFile.self).filter(predicate).first else { return nil }
@@ -187,24 +175,20 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getResultsTableLocalFile(predicate: NSPredicate) -> Results<tableLocalFile>? {
-
         do {
             let realm = try Realm()
             return realm.objects(tableLocalFile.self).filter(predicate)
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getTableLocalFiles(predicate: NSPredicate, sorted: String, ascending: Bool) -> [tableLocalFile] {
-
         do {
             let realm = try Realm()
             let results = realm.objects(tableLocalFile.self).filter(predicate).sorted(byKeyPath: sorted, ascending: ascending)
@@ -212,24 +196,20 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
     func getResultsTableLocalFile(predicate: NSPredicate, sorted: String, ascending: Bool) -> Results<tableLocalFile>? {
-
         do {
             let realm = try Realm()
             return realm.objects(tableLocalFile.self).filter(predicate).sorted(byKeyPath: sorted, ascending: ascending)
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func setLastOpeningDate(metadata: tableMetadata) {
-
         do {
             let realm = try Realm()
             try realm.write {
diff --git a/iOSClient/Data/NCManageDatabase+Metadata+Session.swift b/iOSClient/Data/NCManageDatabase+Metadata+Session.swift
index 924d0afd80..2d4328ed35 100644
--- a/iOSClient/Data/NCManageDatabase+Metadata+Session.swift
+++ b/iOSClient/Data/NCManageDatabase+Metadata+Session.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 extension NCManageDatabase {
-
     func setMetadataSession(ocId: String,
                             newFileName: String? = nil,
                             session: String? = nil,
@@ -80,7 +79,6 @@ extension NCManageDatabase {
     func setMetadataSession(ocId: String,
                             status: Int? = nil,
                             taskIdentifier: Int? = nil) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -160,6 +158,7 @@ extension NCManageDatabase {
     @discardableResult
     func setMetadataStatus(ocId: String, status: Int) -> tableMetadata? {
         var result: tableMetadata?
+
         do {
             let realm = try Realm()
             try realm.write {
diff --git a/iOSClient/Data/NCManageDatabase+Metadata.swift b/iOSClient/Data/NCManageDatabase+Metadata.swift
index 16c5716bd6..c1a1092a09 100644
--- a/iOSClient/Data/NCManageDatabase+Metadata.swift
+++ b/iOSClient/Data/NCManageDatabase+Metadata.swift
@@ -42,6 +42,11 @@ class tableMetadata: Object, NCUserBaseUrl {
            self.favorite == object.favorite,
            self.livePhotoFile == object.livePhotoFile,
            self.sharePermissionsCollaborationServices == object.sharePermissionsCollaborationServices,
+           self.height == object.height,
+           self.width == object.width,
+           self.latitude == object.latitude,
+           self.longitude == object.longitude,
+           self.altitude == object.altitude,
            Array(self.tags).elementsEqual(Array(object.tags)),
            Array(self.shareType).elementsEqual(Array(object.shareType)),
            Array(self.sharePermissionsCloudMesh).elementsEqual(Array(object.sharePermissionsCloudMesh)) {
@@ -82,6 +87,7 @@ class tableMetadata: Object, NCUserBaseUrl {
     @objc dynamic var name = "" // for unifiedSearch is the provider.id
     @objc dynamic var note = ""
     @objc dynamic var ocId = ""
+    @objc dynamic var ocIdTemp = ""
     @objc dynamic var ownerId = ""
     @objc dynamic var ownerDisplayName = ""
     @objc public var lock = false
@@ -132,7 +138,6 @@ class tableMetadata: Object, NCUserBaseUrl {
 }
 
 extension tableMetadata {
-
     var fileExtension: String {
         (fileNameView as NSString).pathExtension
     }
@@ -227,16 +232,6 @@ extension tableMetadata {
         return !isDirectoryE2EE && directory && size == 0 && e2eEncrypted && NCKeychain().isEndToEndEnabled(account: account)
     }
 
-    var canOpenExternalEditor: Bool {
-        if isDocumentViewableOnly {
-            return false
-        }
-        let utility = NCUtility()
-        let editors = utility.isDirectEditing(account: account, contentType: contentType)
-        let isRichDocument = utility.isRichDocument(self)
-        return classFile == NKCommon.TypeClassFile.document.rawValue && editors.contains(NCGlobal.shared.editorText) && ((editors.contains(NCGlobal.shared.editorOnlyoffice) || isRichDocument))
-    }
-
     var isWaitingTransfer: Bool {
         status == NCGlobal.shared.metadataStatusWaitDownload || status == NCGlobal.shared.metadataStatusWaitUpload || status == NCGlobal.shared.metadataStatusUploadError
     }
@@ -281,6 +276,41 @@ extension tableMetadata {
         !isImage && !isAudioOrVideo && hasPreview && NCUtilityFileSystem().fileProviderStoragePreviewIconExists(ocId, etag: etag)
     }
 
+    var isAvailableEditorView: Bool {
+        guard (classFile == NKCommon.TypeClassFile.document.rawValue) && NextcloudKit.shared.isNetworkReachable() else { return false }
+        let utility = NCUtility()
+        let directEditingEditors = utility.editorsDirectEditing(account: account, contentType: contentType)
+        let richDocumentEditor = utility.isTypeFileRichDocument(self)
+
+        if NCGlobal.shared.capabilityRichDocumentsEnabled && richDocumentEditor && directEditingEditors.isEmpty {
+            // RichDocument: Collabora
+            return true
+        } else if directEditingEditors.contains(NCGlobal.shared.editorText) || directEditingEditors.contains(NCGlobal.shared.editorOnlyoffice) {
+            // DirectEditing: Nextcloud Text - OnlyOffice
+           return true
+        }
+        return false
+    }
+
+    var isAvailableRichDocumentEditorView: Bool {
+        guard (classFile == NKCommon.TypeClassFile.document.rawValue) && NCGlobal.shared.capabilityRichDocumentsEnabled && NextcloudKit.shared.isNetworkReachable() else { return false }
+
+        if NCUtility().isTypeFileRichDocument(self) {
+            return true
+        }
+        return false
+    }
+
+    var isAvailableDirectEditingEditorView: Bool {
+        guard (classFile == NKCommon.TypeClassFile.document.rawValue) && NextcloudKit.shared.isNetworkReachable() else { return false }
+        let editors = NCUtility().editorsDirectEditing(account: account, contentType: contentType)
+
+        if editors.contains(NCGlobal.shared.editorText) || editors.contains(NCGlobal.shared.editorOnlyoffice) {
+            return true
+        }
+        return false
+    }
+
     /// Returns false if the user is lokced out of the file. I.e. The file is locked but by somone else
     func canUnlock(as user: String) -> Bool {
         return !lock || (lockOwner == user && lockOwnerType == 0)
@@ -296,9 +326,7 @@ extension tableMetadata {
 }
 
 extension NCManageDatabase {
-
     func convertFileToMetadata(_ file: NKFile, isDirectoryE2EE: Bool) -> tableMetadata {
-
         let metadata = tableMetadata()
 
         metadata.account = file.account
@@ -306,12 +334,12 @@ extension NCManageDatabase {
         metadata.commentsUnread = file.commentsUnread
         metadata.contentType = file.contentType
         if let date = file.creationDate {
-            metadata.creationDate = date
+            metadata.creationDate = date as NSDate
         } else {
-            metadata.creationDate = file.date
+            metadata.creationDate = file.date as NSDate
         }
         metadata.dataFingerprint = file.dataFingerprint
-        metadata.date = file.date
+        metadata.date = file.date as NSDate
         metadata.directory = file.directory
         metadata.downloadURL = file.downloadURL
         metadata.e2eEncrypted = file.e2eEncrypted
@@ -360,9 +388,9 @@ extension NCManageDatabase {
             metadata.classFile = NKCommon.TypeClassFile.document.rawValue
         }
         if let date = file.uploadDate {
-            metadata.uploadDate = date
+            metadata.uploadDate = date as NSDate
         } else {
-            metadata.uploadDate = file.date
+            metadata.uploadDate = file.date as NSDate
         }
         metadata.urlBase = file.urlBase
         metadata.user = file.user
@@ -385,21 +413,17 @@ extension NCManageDatabase {
                 metadata.classFile = results.classFile
             }
         }
-
         return metadata
     }
 
     func convertFilesToMetadatas(_ files: [NKFile], useFirstAsMetadataFolder: Bool, completion: @escaping (_ metadataFolder: tableMetadata, _ metadatas: [tableMetadata]) -> Void) {
-
         var counter: Int = 0
         var isDirectoryE2EE: Bool = false
         let listServerUrl = ThreadSafeDictionary<String, Bool>()
-
         var metadataFolder = tableMetadata()
         var metadatas: [tableMetadata] = []
 
         for file in files {
-
             if let key = listServerUrl[file.serverUrl] {
                 isDirectoryE2EE = key
             } else {
@@ -417,12 +441,10 @@ extension NCManageDatabase {
 
             counter += 1
         }
-
         completion(metadataFolder, metadatas)
     }
 
     func convertFilesToMetadatas(_ files: [NKFile], useFirstAsMetadataFolder: Bool) async -> (metadataFolder: tableMetadata, metadatas: [tableMetadata]) {
-
         await withUnsafeContinuation({ continuation in
             convertFilesToMetadatas(files, useFirstAsMetadataFolder: useFirstAsMetadataFolder) { metadataFolder, metadatas in
                 continuation.resume(returning: (metadataFolder, metadatas))
@@ -431,8 +453,8 @@ extension NCManageDatabase {
     }
 
     func createMetadata(account: String, user: String, userId: String, fileName: String, fileNameView: String, ocId: String, serverUrl: String, urlBase: String, url: String, contentType: String, isUrl: Bool = false, name: String = NCGlobal.shared.appName, subline: String? = nil, iconName: String? = nil, iconUrl: String? = nil) -> tableMetadata {
-
         let metadata = tableMetadata()
+
         if isUrl {
             metadata.contentType = "text/uri-list"
             if let iconName = iconName {
@@ -467,6 +489,7 @@ extension NCManageDatabase {
         metadata.fileNameView = fileName
         metadata.name = name
         metadata.ocId = ocId
+        metadata.ocIdTemp = ocId
         metadata.permissions = "RGDNVW"
         metadata.serverUrl = serverUrl
         metadata.subline = subline
@@ -479,7 +502,6 @@ extension NCManageDatabase {
         if !metadata.urlBase.isEmpty, metadata.serverUrl.hasPrefix(metadata.urlBase) {
             metadata.path = String(metadata.serverUrl.dropFirst(metadata.urlBase.count)) + "/"
         }
-
         return metadata
     }
 
@@ -689,12 +711,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getMetadatas(predicate: NSPredicate) -> [tableMetadata] {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -703,12 +723,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
     func getMetadatas(predicate: NSPredicate, sorted: String, ascending: Bool = false) -> [tableMetadata]? {
-
         do {
             let realm = try Realm()
             let results = realm.objects(tableMetadata.self).filter(predicate).sorted(byKeyPath: sorted, ascending: ascending)
@@ -716,7 +734,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
@@ -731,31 +748,26 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getResultsMetadatas(predicate: NSPredicate, sorted: [RealmSwift.SortDescriptor]) -> Results<tableMetadata>? {
-
         do {
             let realm = try Realm()
             return realm.objects(tableMetadata.self).filter(predicate).sorted(by: sorted)
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getResultMetadata(predicate: NSPredicate) -> tableMetadata? {
-
         do {
             let realm = try Realm()
             return realm.objects(tableMetadata.self).filter(predicate).first
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
@@ -774,12 +786,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return metadatas
     }
 
     func getMetadataAtIndex(predicate: NSPredicate, sorted: String, ascending: Bool, index: Int) -> tableMetadata? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -792,13 +802,12 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getMetadataFromOcId(_ ocId: String?) -> tableMetadata? {
-
         guard let ocId else { return nil }
+
         do {
             let realm = try Realm()
             realm.refresh()
@@ -807,12 +816,28 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
+        return nil
+    }
+
+    func getMetadataFromOcIdAndOcIdTemp(_ ocId: String?) -> tableMetadata? {
+        guard let ocId else { return nil }
 
+        do {
+            let realm = try Realm()
+            realm.refresh()
+            if let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first {
+                return tableMetadata(value: result)
+            }
+            if let result = realm.objects(tableMetadata.self).filter("ocIdTemp == %@", ocId).first {
+                return tableMetadata(value: result)
+            }
+        } catch let error as NSError {
+            NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
+        }
         return nil
     }
 
     func getMetadataFromFileName(_ fileName: String, serverUrl: String) -> tableMetadata? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -821,13 +846,12 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getMetadataFromFileNameLocalPath(_ fileNameLocalPath: String?) -> tableMetadata? {
-
         let components = fileNameLocalPath?.components(separatedBy: "/")
+
         if let count = components?.count,
            components?.count ?? 0 > 2,
            let ocId = components?[count - 2] {
@@ -840,13 +864,12 @@ extension NCManageDatabase {
                 NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
             }
         }
-
         return nil
     }
 
     func getTableMetadataFromOcId(_ ocId: String?) -> tableMetadata? {
-
         guard let ocId else { return nil }
+
         do {
             let realm = try Realm()
             realm.refresh()
@@ -858,7 +881,6 @@ extension NCManageDatabase {
     }
 
     func getMetadataFromFileId(_ fileId: String?) -> tableMetadata? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -868,16 +890,14 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getMetadataFolder(account: String, urlBase: String, userId: String, serverUrl: String) -> tableMetadata? {
-
         var serverUrl = serverUrl
         var fileName = ""
-
         let serverUrlHome = utilityFileSystem.getHomeServer(urlBase: urlBase, userId: userId)
+
         if serverUrlHome == serverUrl {
             fileName = "."
             serverUrl = ".."
@@ -896,7 +916,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
@@ -915,7 +934,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return listIdentifierRank
     }
 
@@ -958,7 +976,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
@@ -986,7 +1003,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
@@ -996,12 +1012,9 @@ extension NCManageDatabase {
         var isMounted = false
 
         if metadataFolder != nil {
-
             isShare = metadata.permissions.contains(permissions.permissionShared) && !metadataFolder!.permissions.contains(permissions.permissionShared)
             isMounted = metadata.permissions.contains(permissions.permissionMounted) && !metadataFolder!.permissions.contains(permissions.permissionMounted)
-
         } else if let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) {
-
             isShare = metadata.permissions.contains(permissions.permissionShared) && !directory.permissions.contains(permissions.permissionShared)
             isMounted = metadata.permissions.contains(permissions.permissionMounted) && !directory.permissions.contains(permissions.permissionMounted)
         }
@@ -1026,7 +1039,6 @@ extension NCManageDatabase {
     }
 
     func getNumMetadatasInUpload() -> Int {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -1034,7 +1046,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return 0
     }
 
@@ -1048,7 +1059,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
@@ -1071,7 +1081,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return metadatas
     }
 
@@ -1083,7 +1092,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
@@ -1114,7 +1122,6 @@ extension NCManageDatabase {
         } catch let error {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not write to database: \(error)")
         }
-
         return (metadatasDifferentCount, metadatasModified)
     }
 
@@ -1145,7 +1152,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+PhotoLibrary.swift b/iOSClient/Data/NCManageDatabase+PhotoLibrary.swift
index c97d5cc795..11656d3d90 100644
--- a/iOSClient/Data/NCManageDatabase+PhotoLibrary.swift
+++ b/iOSClient/Data/NCManageDatabase+PhotoLibrary.swift
@@ -28,7 +28,6 @@ import RealmSwift
 import NextcloudKit
 
 class tablePhotoLibrary: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var assetLocalIdentifier = ""
     @objc dynamic var creationDate: NSDate?
@@ -42,10 +41,8 @@ class tablePhotoLibrary: Object {
 }
 
 extension NCManageDatabase {
-
     @discardableResult
     func addPhotoLibrary(_ assets: [PHAsset], account: String) -> Bool {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -70,12 +67,10 @@ extension NCManageDatabase {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not write to database: \(error)")
             return false
         }
-
         return true
     }
 
     func getPhotoLibraryIdAsset(image: Bool, video: Bool, account: String) -> [String]? {
-
         var predicate = NSPredicate()
 
         if image && video {
@@ -95,8 +90,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return nil
     }
-
 }
diff --git a/iOSClient/Data/NCManageDatabase+SecurityGuard.swift b/iOSClient/Data/NCManageDatabase+SecurityGuard.swift
index fc4380a6f5..647ef65592 100644
--- a/iOSClient/Data/NCManageDatabase+SecurityGuard.swift
+++ b/iOSClient/Data/NCManageDatabase+SecurityGuard.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class TableSecurityGuardDiagnostics: Object {
-
     @Persisted var account = ""
     @Persisted(primaryKey: true) var primaryKey = ""
     @Persisted var issue: String = ""
@@ -48,9 +47,7 @@ class TableSecurityGuardDiagnostics: Object {
 }
 
 extension NCManageDatabase {
-
     func addDiagnostic(account: String, issue: String, error: String? = nil) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -69,7 +66,6 @@ extension NCManageDatabase {
     }
 
     func existsDiagnostics(account: String) -> Bool {
-
         do {
             let realm = try Realm()
             let results = realm.objects(TableSecurityGuardDiagnostics.self).where({
@@ -79,12 +75,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return false
     }
 
     func getDiagnostics(account: String, issue: String) -> Results<TableSecurityGuardDiagnostics>? {
-
         do {
             let realm = try Realm()
             let results = realm.objects(TableSecurityGuardDiagnostics.self).where({
@@ -94,12 +88,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func deleteDiagnostics(account: String, ids: [ObjectId]) {
-
         do {
             let realm = try Realm()
             try realm.write {
diff --git a/iOSClient/Data/NCManageDatabase+Share.swift b/iOSClient/Data/NCManageDatabase+Share.swift
index 14ebc82f5d..9618a80ad6 100644
--- a/iOSClient/Data/NCManageDatabase+Share.swift
+++ b/iOSClient/Data/NCManageDatabase+Share.swift
@@ -27,7 +27,6 @@ import NextcloudKit
 
 typealias tableShare = tableShareV2
 class tableShareV2: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var canEdit: Bool = false
     @objc dynamic var canDelete: Bool = false
@@ -75,9 +74,7 @@ class tableShareV2: Object {
 }
 
 extension NCManageDatabase {
-
     func addShare(account: String, home: String, shares: [NKShare]) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -92,7 +89,7 @@ extension NCManageDatabase {
                     object.serverUrl = serverUrl
                     object.canEdit = share.canEdit
                     object.canDelete = share.canDelete
-                    object.date = share.date
+                    object.date = share.date as? NSDate
                     object.displaynameFileOwner = share.displaynameFileOwner
                     object.displaynameOwner = share.displaynameOwner
                     object.expirationDate = share.expirationDate
@@ -122,7 +119,7 @@ extension NCManageDatabase {
                     object.uidOwner = share.uidOwner
                     object.uidFileOwner = share.uidFileOwner
                     object.url = share.url
-                    object.userClearAt = share.userClearAt
+                    object.userClearAt = share.userClearAt as? NSDate
                     object.userIcon = share.userIcon
                     object.userMessage = share.userMessage
                     object.userStatus = share.userStatus
@@ -136,7 +133,6 @@ extension NCManageDatabase {
     }
 
     func getTableShares(account: String) -> [tableShare] {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -146,12 +142,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
     func getTableShares(metadata: tableMetadata) -> (firstShareLink: tableShare?, share: [tableShare]?) {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -167,12 +161,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return (nil, nil)
     }
 
     func getTableShare(account: String, idShare: Int) -> tableShare? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -181,12 +173,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func getTableShares(account: String, serverUrl: String) -> [tableShare] {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -196,12 +186,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return []
     }
 
     func getTableShares(account: String, serverUrl: String, fileName: String) -> [tableShare] {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -216,7 +204,6 @@ extension NCManageDatabase {
     }
 
     func deleteTableShare(account: String, idShare: Int) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -229,7 +216,6 @@ extension NCManageDatabase {
     }
 
     func deleteTableShare(account: String, path: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -242,7 +228,6 @@ extension NCManageDatabase {
     }
 
     func deleteTableShare(account: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -280,5 +265,4 @@ extension NCManageDatabase {
         }
         return true
     }
-
 }
diff --git a/iOSClient/Data/NCManageDatabase+Tag.swift b/iOSClient/Data/NCManageDatabase+Tag.swift
index 51f05476c5..b92db45f0d 100644
--- a/iOSClient/Data/NCManageDatabase+Tag.swift
+++ b/iOSClient/Data/NCManageDatabase+Tag.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableTag: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var ocId = ""
     @objc dynamic var tagIOS: Data?
@@ -37,9 +36,7 @@ class tableTag: Object {
 }
 
 extension NCManageDatabase {
-
     func addTag(_ ocId: String, tagIOS: Data?, account: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -55,7 +52,6 @@ extension NCManageDatabase {
     }
 
     func deleteTag(_ ocId: String) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -68,7 +64,6 @@ extension NCManageDatabase {
     }
 
     func getTags(predicate: NSPredicate) -> [tableTag] {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -77,12 +72,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return []
     }
 
     func getTag(predicate: NSPredicate) -> tableTag? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -91,7 +84,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not acess to database: \(error)")
         }
-
         return nil
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+Tip.swift b/iOSClient/Data/NCManageDatabase+Tip.swift
index c6160b8c56..163a8d2a36 100644
--- a/iOSClient/Data/NCManageDatabase+Tip.swift
+++ b/iOSClient/Data/NCManageDatabase+Tip.swift
@@ -41,7 +41,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return false
     }
 
diff --git a/iOSClient/Data/NCManageDatabase+Trash.swift b/iOSClient/Data/NCManageDatabase+Trash.swift
index 39bbcf396d..186f031bae 100644
--- a/iOSClient/Data/NCManageDatabase+Trash.swift
+++ b/iOSClient/Data/NCManageDatabase+Trash.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableTrash: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var classFile = ""
     @objc dynamic var contentType = ""
@@ -48,9 +47,7 @@ class tableTrash: Object {
 }
 
 extension NCManageDatabase {
-
     func addTrash(account: String, items: [NKTrash]) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -58,7 +55,7 @@ extension NCManageDatabase {
                     let object = tableTrash()
                     object.account = account
                     object.contentType = trash.contentType
-                    object.date = trash.date
+                    object.date = trash.date as NSDate
                     object.directory = trash.directory
                     object.fileId = trash.fileId
                     object.fileName = trash.fileName
@@ -66,7 +63,7 @@ extension NCManageDatabase {
                     object.hasPreview = trash.hasPreview
                     object.iconName = trash.iconName
                     object.size = trash.size
-                    object.trashbinDeletionTime = trash.trashbinDeletionTime
+                    object.trashbinDeletionTime = trash.trashbinDeletionTime as NSDate
                     object.trashbinFileName = trash.trashbinFileName
                     object.trashbinOriginalLocation = trash.trashbinOriginalLocation
                     object.classFile = trash.classFile
@@ -79,7 +76,6 @@ extension NCManageDatabase {
     }
 
     func deleteTrash(filePath: String?, account: String) {
-
         var predicate = NSPredicate()
 
         do {
@@ -99,7 +95,6 @@ extension NCManageDatabase {
     }
 
     func deleteTrash(fileId: String?, account: String) {
-
         var predicate = NSPredicate()
 
         do {
@@ -127,12 +122,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return []
     }
 
     func getTrashItem(fileId: String, account: String) -> tableTrash? {
-
         do {
             let realm = try Realm()
             realm.refresh()
@@ -141,7 +134,6 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access to database: \(error)")
         }
-
         return nil
     }
 }
diff --git a/iOSClient/Data/NCManageDatabase+UserStatus.swift b/iOSClient/Data/NCManageDatabase+UserStatus.swift
index 0aeceb9c47..67babd1c31 100644
--- a/iOSClient/Data/NCManageDatabase+UserStatus.swift
+++ b/iOSClient/Data/NCManageDatabase+UserStatus.swift
@@ -26,7 +26,6 @@ import RealmSwift
 import NextcloudKit
 
 class tableUserStatus: Object {
-
     @objc dynamic var account = ""
     @objc dynamic var clearAt: NSDate?
     @objc dynamic var clearAtTime: String?
@@ -40,9 +39,7 @@ class tableUserStatus: Object {
 }
 
 extension NCManageDatabase {
-
     func addUserStatus(_ userStatuses: [NKUserStatus], account: String, predefined: Bool) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -51,7 +48,7 @@ extension NCManageDatabase {
                 for userStatus in userStatuses {
                     let object = tableUserStatus()
                     object.account = account
-                    object.clearAt = userStatus.clearAt
+                    object.clearAt = userStatus.clearAt as? NSDate
                     object.clearAtTime = userStatus.clearAtTime
                     object.clearAtType = userStatus.clearAtType
                     object.icon = userStatus.icon
diff --git a/iOSClient/Data/NCManageDatabase+Video.swift b/iOSClient/Data/NCManageDatabase+Video.swift
index 65f15dac29..9034b2cddb 100644
--- a/iOSClient/Data/NCManageDatabase+Video.swift
+++ b/iOSClient/Data/NCManageDatabase+Video.swift
@@ -27,7 +27,6 @@ import NextcloudKit
 
 typealias tableVideo = tableVideoV4
 class tableVideoV4: Object {
-
     @Persisted var account = ""
     @Persisted(primaryKey: true) var ocId = ""
     @Persisted var position: Float?
@@ -45,9 +44,7 @@ class tableVideoV4: Object {
 }
 
 extension NCManageDatabase {
-
     func addVideo(metadata: tableMetadata, position: Float? = nil, width: Int? = nil, height: Int? = nil, length: Int? = nil, currentAudioTrackIndex: Int? = nil, currentVideoSubTitleIndex: Int? = nil) {
-
         if metadata.isLivePhoto { return }
 
         do {
@@ -104,7 +101,6 @@ extension NCManageDatabase {
     }
 
     func addVideoCodec(metadata: tableMetadata, codecNameVideo: String?, codecNameAudio: String?, codecAudioChannelLayout: String?, codecAudioLanguage: String?, codecMaxCompatibility: Bool, codecQuality: String?) {
-
         do {
             let realm = try Realm()
             try realm.write {
@@ -135,7 +131,6 @@ extension NCManageDatabase {
     }
 
     func getVideo(metadata: tableMetadata?) -> tableVideo? {
-
         guard let metadata = metadata else { return nil }
 
         do {
@@ -146,12 +141,10 @@ extension NCManageDatabase {
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")
         }
-
         return nil
     }
 
     func deleteVideo(metadata: tableMetadata) {
-
         do {
             let realm = try Realm()
             try realm.write {
diff --git a/iOSClient/Data/NCManageDatabase.swift b/iOSClient/Data/NCManageDatabase.swift
index cdac63760b..44ce135ab7 100644
--- a/iOSClient/Data/NCManageDatabase.swift
+++ b/iOSClient/Data/NCManageDatabase.swift
@@ -37,18 +37,12 @@ class NCManageDatabase: NSObject {
         let instance = NCManageDatabase()
         return instance
     }()
-
     let utilityFileSystem = NCUtilityFileSystem()
 
     override init() {
-
-        let dirGroup = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroups)
+        let dirGroup = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroup)
         let databaseFileUrlPath = dirGroup?.appendingPathComponent(NCGlobal.shared.appDatabaseNextcloud + "/" + databaseName)
 
-        let bundleUrl: URL = Bundle.main.bundleURL
-        let bundlePathExtension: String = bundleUrl.pathExtension
-        let isAppex: Bool = bundlePathExtension == "appex"
-
         if let databaseFilePath = databaseFileUrlPath?.path {
             if FileManager.default.fileExists(atPath: databaseFilePath) {
                 NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] DATABASE FOUND in " + databaseFilePath)
@@ -68,98 +62,40 @@ class NCManageDatabase: NSObject {
             }
         }
 
-        if isAppex {
-
-            Realm.Configuration.defaultConfiguration = Realm.Configuration(
-                fileURL: dirGroup?.appendingPathComponent(NCGlobal.shared.appDatabaseNextcloud + "/" + databaseName),
+        do {
+            _ = try Realm(configuration: Realm.Configuration(
+                fileURL: databaseFileUrlPath,
                 schemaVersion: databaseSchemaVersion,
-                objectTypes: [tableMetadata.self,
-                              tableLocalFile.self,
-                              tableDirectory.self,
-                              tableTag.self,
-                              tableAccount.self,
-                              tableCapabilities.self,
-                              tablePhotoLibrary.self,
-                              tableE2eEncryption.self,
-                              tableE2eEncryptionLock.self,
-                              tableE2eMetadata12.self,
-                              tableE2eMetadata.self,
-                              tableE2eUsers.self,
-                              tableE2eCounter.self,
-                              tableShare.self,
-                              tableChunk.self,
-                              tableAvatar.self,
-                              tableDashboardWidget.self,
-                              tableDashboardWidgetButton.self,
-                              NCDBLayoutForView.self,
-                              TableSecurityGuardDiagnostics.self]
-            )
-
-        } else {
-
-            do {
-                _ = try Realm(configuration: Realm.Configuration(
-
-                    fileURL: databaseFileUrlPath,
-                    schemaVersion: databaseSchemaVersion,
-
-                    migrationBlock: { migration, oldSchemaVersion in
-
-                        if oldSchemaVersion < 255 {
-                            migration.deleteData(forType: tableActivity.className())
-                            migration.deleteData(forType: tableActivityLatestId.className())
-                            migration.deleteData(forType: tableActivityPreview.className())
-                            migration.deleteData(forType: tableActivitySubjectRich.className())
-                        }
-
-                        if oldSchemaVersion < 292 {
-                            migration.deleteData(forType: tableVideo.className())
-                        }
-
-                        if oldSchemaVersion < 319 {
-                            migration.deleteData(forType: tableChunk.className())
-                            migration.deleteData(forType: tableDirectory.className())
-                            migration.deleteData(forType: tableE2eEncryptionLock.className())
-                            migration.deleteData(forType: tableGPS.className())
-                        }
-
-                        if oldSchemaVersion < 333 {
-                            migration.deleteData(forType: tableMetadata.className())
-                            migration.enumerateObjects(ofType: tableDirectory.className()) { _, newObject in
-                                newObject?["etag"] = ""
-                            }
-                        }
-
-                    }, shouldCompactOnLaunch: { totalBytes, usedBytes in
-
-                        // totalBytes refers to the size of the file on disk in bytes (data + free space)
-                        // usedBytes refers to the number of bytes used by data in the file
-
-                        // Compact if the file is over 100MB in size and less than 50% 'used'
-                        let oneHundredMB = 100 * 1024 * 1024
-                        return (totalBytes > oneHundredMB) && (Double(usedBytes) / Double(totalBytes)) < 0.5
+                migrationBlock: { migration, oldSchemaVersion in
+                    if oldSchemaVersion < 354 {
+                        migration.deleteData(forType: NCDBLayoutForView.className())
                     }
-                ))
-
-            } catch let error {
-                if let databaseFileUrlPath = databaseFileUrlPath {
-                    do {
+                }, shouldCompactOnLaunch: { totalBytes, usedBytes in
+                    // totalBytes refers to the size of the file on disk in bytes (data + free space)
+                    // usedBytes refers to the number of bytes used by data in the file
+                    // Compact if the file is over 100MB in size and less than 50% 'used'
+                    let oneHundredMB = 100 * 1024 * 1024
+                    return (totalBytes > oneHundredMB) && (Double(usedBytes) / Double(totalBytes)) < 0.5
+                }
+            ))
+        } catch let error {
+            if let databaseFileUrlPath = databaseFileUrlPath {
+                do {
 #if !EXTENSION
-                        let nkError = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: error.localizedDescription)
-                        NCContentPresenter().showError(error: nkError, priority: .max)
+                    let nkError = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: error.localizedDescription)
+                    NCContentPresenter().showError(error: nkError, priority: .max)
 #endif
-                        NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] DATABASE ERROR: \(error.localizedDescription)")
-                        try FileManager.default.removeItem(at: databaseFileUrlPath)
-                    } catch {}
-                }
+                    NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] DATABASE ERROR: \(error.localizedDescription)")
+                    try FileManager.default.removeItem(at: databaseFileUrlPath)
+                } catch {}
             }
-
-            Realm.Configuration.defaultConfiguration = Realm.Configuration(
-                fileURL: dirGroup?.appendingPathComponent(NCGlobal.shared.appDatabaseNextcloud + "/" + databaseName),
-                schemaVersion: databaseSchemaVersion
-            )
         }
 
+        Realm.Configuration.defaultConfiguration = Realm.Configuration(
+            fileURL: dirGroup?.appendingPathComponent(NCGlobal.shared.appDatabaseNextcloud + "/" + databaseName),
+            schemaVersion: databaseSchemaVersion
+        )
+
         // Verify Database, if corrupt remove it
         do {
             _ = try Realm()
@@ -228,7 +164,6 @@ class NCManageDatabase: NSObject {
         self.clearTable(tableGPS.self, account: nil)
         self.clearTable(TableGroupfolders.self, account: account)
         self.clearTable(TableGroupfoldersGroups.self, account: account)
-        self.clearTable(NCDBLayoutForView.self, account: account)
         self.clearTable(tableLocalFile.self, account: account)
         self.clearTable(tableMetadata.self, account: account)
         self.clearTable(tablePhotoLibrary.self, account: account)
@@ -241,7 +176,6 @@ class NCManageDatabase: NSObject {
     }
 
     func clearTablesE2EE(account: String?) {
-
         self.clearTable(tableE2eEncryption.self, account: account)
         self.clearTable(tableE2eEncryptionLock.self, account: account)
         self.clearTable(tableE2eMetadata12.self, account: account)
@@ -251,7 +185,6 @@ class NCManageDatabase: NSObject {
     }
 
     @objc func removeDB() {
-
         let realmURL = Realm.Configuration.defaultConfiguration.fileURL!
         let realmURLs = [
             realmURL,
@@ -259,6 +192,7 @@ class NCManageDatabase: NSObject {
             realmURL.appendingPathExtension("note"),
             realmURL.appendingPathExtension("management")
         ]
+
         for URL in realmURLs {
             do {
                 try FileManager.default.removeItem(at: URL)
@@ -269,22 +203,46 @@ class NCManageDatabase: NSObject {
     }
 
     func getThreadConfined(_ object: Object) -> Any {
-
         return ThreadSafeReference(to: object)
     }
 
     func putThreadConfined(_ tableRef: ThreadSafeReference<Object>) -> Object? {
-
         do {
             let realm = try Realm()
             return realm.resolve(tableRef)
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not write to database: \(error)")
         }
-
         return nil
     }
 
+    // MARK: -
+    // MARK: Func T
+
+    func fetchPagedResults<T: Object>(ofType type: T.Type, primaryKey: String, recordsPerPage: Int, pageNumber: Int, filter: NSPredicate? = nil, sortedByKeyPath: String? = nil, sortedAscending: Bool = true) -> Results<T>? {
+        let startIndex = recordsPerPage * (pageNumber - 1)
+
+        do {
+            let realm = try Realm()
+            var results = realm.objects(type)
+
+            if let filter, let sortedByKeyPath {
+                results = results.filter(filter).sorted(byKeyPath: sortedByKeyPath, ascending: sortedAscending)
+            }
+
+            guard startIndex < results.count else {
+                return nil
+            }
+            let pagedResults = results.dropFirst(startIndex).prefix(recordsPerPage)
+            let pagedResultsKeys = pagedResults.compactMap { $0.value(forKey: primaryKey) as? String }
+
+            return realm.objects(type).filter("\(primaryKey) IN %@", Array(pagedResultsKeys))
+        } catch {
+            print("Error opening Realm: \(error)")
+            return nil
+        }
+    }
+
     // MARK: -
     // MARK: SWIFTUI PREVIEW
 
diff --git a/iOSClient/Extensions/UIAlertController+Extension.swift b/iOSClient/Extensions/UIAlertController+Extension.swift
index f75fac1cce..755c8f7ee9 100644
--- a/iOSClient/Extensions/UIAlertController+Extension.swift
+++ b/iOSClient/Extensions/UIAlertController+Extension.swift
@@ -39,7 +39,7 @@ extension UIAlertController {
             guard let fileNameFolder = alertController.textFields?.first?.text else { return }
             if markE2ee {
                 Task {
-                    let createFolderResults = await NextcloudKit.shared.createFolder(serverUrlFileName: serverUrl + "/" + fileNameFolder)
+                    let createFolderResults = await NCNetworking.shared.createFolder(serverUrlFileName: serverUrl + "/" + fileNameFolder)
                     if createFolderResults.error == .success {
                         let error = await NCNetworkingE2EEMarkFolder().markFolderE2ee(account: urlBase.account, fileName: fileNameFolder, serverUrl: serverUrl, userId: urlBase.userId)
                         if error != .success {
diff --git a/iOSClient/Extensions/UIView+Extension.swift b/iOSClient/Extensions/UIView+Extension.swift
index a57cde15fc..a49d1300f0 100644
--- a/iOSClient/Extensions/UIView+Extension.swift
+++ b/iOSClient/Extensions/UIView+Extension.swift
@@ -55,6 +55,15 @@ extension UIView {
         self.addSubview(blurredEffectView)
     }
 
+    func insertBlur(style: UIBlurEffect.Style) {
+        let blur = UIBlurEffect(style: style)
+        let blurredEffectView = UIVisualEffectView(effect: blur)
+        blurredEffectView.frame = self.bounds
+        blurredEffectView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        blurredEffectView.isUserInteractionEnabled = false
+        self.insertSubview(blurredEffectView, at: 0)
+    }
+
     func makeCircularBackground(withColor backgroundColor: UIColor) {
         self.backgroundColor = backgroundColor
         self.layer.cornerRadius = self.frame.size.width / 2
diff --git a/iOSClient/Favorites/NCFavorite.swift b/iOSClient/Favorites/NCFavorite.swift
index ff2b5f39ea..f7b79bc8cd 100644
--- a/iOSClient/Favorites/NCFavorite.swift
+++ b/iOSClient/Favorites/NCFavorite.swift
@@ -62,15 +62,7 @@ class NCFavorite: NCCollectionViewCommon {
             metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", self.appDelegate.account, self.serverUrl))
         }
 
-        self.dataSource = NCDataSource(metadatas: metadatas,
-                                       account: self.appDelegate.account,
-                                       sort: self.layoutForView?.sort,
-                                       ascending: self.layoutForView?.ascending,
-                                       directoryOnTop: self.layoutForView?.directoryOnTop,
-                                       favoriteOnTop: true,
-                                       groupByField: self.groupByField,
-                                       providers: self.providers,
-                                       searchResults: self.searchResults)
+        self.dataSource = NCDataSource(metadatas: metadatas, account: self.appDelegate.account, layoutForView: layoutForView, providers: self.providers, searchResults: self.searchResults)
     }
 
     override func reloadDataSourceNetwork(withQueryDB: Bool = false) {
diff --git a/iOSClient/Files/NCFiles.swift b/iOSClient/Files/NCFiles.swift
index d5084f6a1c..b6c6a181bf 100644
--- a/iOSClient/Files/NCFiles.swift
+++ b/iOSClient/Files/NCFiles.swift
@@ -58,11 +58,12 @@ class NCFiles: NCCollectionViewCommon {
                 self.selectOcId.removeAll()
 
                 self.layoutForView = NCManageDatabase.shared.getLayoutForView(account: self.appDelegate.account, key: self.layoutKey, serverUrl: self.serverUrl)
-                self.gridLayout.itemForLine = CGFloat(self.layoutForView?.itemForLine ?? 3)
                 if self.layoutForView?.layout == NCGlobal.shared.layoutList {
                     self.collectionView?.collectionViewLayout = self.listLayout
-                } else {
+                } else if self.layoutForView?.layout == NCGlobal.shared.layoutGrid {
                     self.collectionView?.collectionViewLayout = self.gridLayout
+                } else if self.layoutForView?.layout == NCGlobal.shared.layoutPhotoSquare || self.layoutForView?.layout == NCGlobal.shared.layoutPhotoRatio {
+                    self.collectionView?.collectionViewLayout = self.mediaLayout
                 }
 
                 self.titleCurrentFolder = self.getNavigationTitle()
@@ -111,17 +112,7 @@ class NCFiles: NCCollectionViewCommon {
         }
 
         self.richWorkspaceText = directory?.richWorkspace
-        self.dataSource = NCDataSource(
-            metadatas: metadatas,
-            account: self.appDelegate.account,
-            directory: directory,
-            sort: self.layoutForView?.sort,
-            ascending: self.layoutForView?.ascending,
-            directoryOnTop: self.layoutForView?.directoryOnTop,
-            favoriteOnTop: true,
-            groupByField: self.groupByField,
-            providers: self.providers,
-            searchResults: self.searchResults)
+        self.dataSource = NCDataSource(metadatas: metadatas, account: self.appDelegate.account, layoutForView: layoutForView, providers: self.providers, searchResults: self.searchResults)
     }
 
     override func reloadDataSource(withQueryDB: Bool = true) {
@@ -298,7 +289,7 @@ class NCFiles: NCCollectionViewCommon {
         if NCManageDatabase.shared.getAllAccount().isEmpty {
             appDelegate.openLogin(selector: NCGlobal.shared.introLogin, openLoginWeb: false)
         } else if let account = tableAccount?.account, account != appDelegate.account {
-            appDelegate.changeAccount(account, userProfile: nil)
+            appDelegate.changeAccount(account, userProfile: nil) { }
         } else if isRoot {
             titleCurrentFolder = getNavigationTitle()
             navigationItem.title = titleCurrentFolder
diff --git a/iOSClient/Groupfolders/NCGroupfolders.swift b/iOSClient/Groupfolders/NCGroupfolders.swift
index 8263ac7415..b067e4aac4 100644
--- a/iOSClient/Groupfolders/NCGroupfolders.swift
+++ b/iOSClient/Groupfolders/NCGroupfolders.swift
@@ -62,16 +62,7 @@ class NCGroupfolders: NCCollectionViewCommon {
             metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", self.appDelegate.account, self.serverUrl))
         }
 
-        self.dataSource = NCDataSource(
-            metadatas: metadatas,
-            account: self.appDelegate.account,
-            sort: self.layoutForView?.sort,
-            ascending: self.layoutForView?.ascending,
-            directoryOnTop: self.layoutForView?.directoryOnTop,
-            favoriteOnTop: true,
-            groupByField: self.groupByField,
-            providers: self.providers,
-            searchResults: self.searchResults)
+        self.dataSource = NCDataSource(metadatas: metadatas, account: self.appDelegate.account, layoutForView: layoutForView, providers: self.providers, searchResults: self.searchResults)
     }
 
     override func reloadDataSourceNetwork(withQueryDB: Bool = false) {
@@ -90,7 +81,7 @@ class NCGroupfolders: NCCollectionViewCommon {
                         let mountPoint = groupfolder.mountPoint.hasPrefix("/") ? groupfolder.mountPoint : "/" + groupfolder.mountPoint
                         let serverUrlFileName = homeServerUrl + mountPoint
                         if NCManageDatabase.shared.getMetadataFromDirectory(account: self.appDelegate.account, serverUrl: serverUrlFileName) == nil {
-                            let results = await NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0", showHiddenFiles: NCKeychain().showHiddenFiles)
+                            let results = await NCNetworking.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0", showHiddenFiles: NCKeychain().showHiddenFiles)
                             if results.error == .success, let file = results.files.first {
                                 let isDirectoryE2EE = self.utilityFileSystem.isDirectoryE2EE(file: file)
                                 let metadata = NCManageDatabase.shared.convertFileToMetadata(file, isDirectoryE2EE: isDirectoryE2EE)
diff --git a/iOSClient/Images.xcassets/qrcode.imageset/Contents.json b/iOSClient/Images.xcassets/qrcode.imageset/Contents.json
deleted file mode 100644
index 3d370c566d..0000000000
--- a/iOSClient/Images.xcassets/qrcode.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "qrcode.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
diff --git a/iOSClient/Images.xcassets/qrcode.imageset/qrcode.pdf b/iOSClient/Images.xcassets/qrcode.imageset/qrcode.pdf
deleted file mode 100644
index d2c7194a64..0000000000
Binary files a/iOSClient/Images.xcassets/qrcode.imageset/qrcode.pdf and /dev/null differ
diff --git a/iOSClient/Login/NCLogin.swift b/iOSClient/Login/NCLogin.swift
index 8a510faea1..5f7b45f28e 100644
--- a/iOSClient/Login/NCLogin.swift
+++ b/iOSClient/Login/NCLogin.swift
@@ -28,7 +28,6 @@ import SwiftEntryKit
 import SwiftUI
 
 class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
-
     @IBOutlet weak var imageBrand: UIImageView!
     @IBOutlet weak var imageBrandConstraintY: NSLayoutConstraint!
     @IBOutlet weak var baseUrl: UITextField!
@@ -108,11 +107,13 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         // brand
         if NCBrandOptions.shared.disable_request_login_url {
             baseUrl.text = NCBrandOptions.shared.loginBaseUrl
-            baseUrl.isHidden = true
+            baseUrl.isEnabled = false
+            baseUrl.isUserInteractionEnabled = false
+            baseUrl.alpha = 0.5
         }
 
         // qrcode
-        qrCode.setImage(UIImage(named: "qrcode")?.image(color: textColor, size: 100), for: .normal)
+        qrCode.setImage(UIImage(systemName: "qrcode.viewfinder")?.image(color: textColor, size: 100), for: .normal)
 
         // certificate
         certificate.setImage(UIImage(named: "certificate")?.image(color: textColor, size: 100), for: .normal)
@@ -165,10 +166,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardWillShowNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardWillHideNotification, object: nil)
 
-        NCNetworking.shared.delegate = self
-
         handleLoginWithAppConfig()
-
         baseUrl.text = urlBase
     }
 
@@ -201,15 +199,12 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                 if let serverUrl = configurationManaged[NCGlobal.shared.configuration_serverUrl] as? String {
                     self.configServerUrl = serverUrl
                 }
-
                 if let username = configurationManaged[NCGlobal.shared.configuration_username] as? String, !username.isEmpty, username.lowercased() != "username" {
                     self.configUsername = username
                 }
-
                 if let password = configurationManaged[NCGlobal.shared.configuration_password] as? String, !password.isEmpty, password.lowercased() != "password" {
                     self.configPassword = password
                 }
-
                 if let apppassword = configurationManaged[NCGlobal.shared.configuration_apppassword] as? String, !apppassword.isEmpty, apppassword.lowercased() != "apppassword" {
                     self.configAppPassword = apppassword
                 }
@@ -217,15 +212,13 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         }
 
         // AppConfig
-        if let serverUrl = configServerUrl {
-            if let username = self.configUsername, let password = configAppPassword {
-                createAccount(server: serverUrl, username: username, password: password)
-                return
-            } else if let username = self.configUsername, let password = configPassword {
-                getAppPassword(serverUrl: serverUrl, username: username, password: password)
-                return
+        if let url = configServerUrl {
+            if let user = self.configUsername, let password = configAppPassword {
+                return createAccount(urlBase: url, user: user, password: password)
+            } else if let user = self.configUsername, let password = configPassword {
+                return getAppPassword(urlBase: url, user: user, password: password)
             } else {
-                urlBase = serverUrl
+                urlBase = url
             }
         }
     }
@@ -239,16 +232,13 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
     }
 
     func textFieldDidBeginEditing(_ textField: UITextField) {
-
         self.activeTextField = textField
     }
 
     // MARK: - Keyboard notification
 
     @objc internal func keyboardWillShow(_ notification: Notification?) {
-
         activeTextfieldDiff = 0
-
         if let info = notification?.userInfo, let centerObject = self.activeTextField.superview?.convert(self.activeTextField.center, to: nil) {
 
             let frameEndUserInfoKey = UIResponder.keyboardFrameEndUserInfoKey
@@ -291,9 +281,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
     // MARK: - Share accounts View Controller
 
     @objc func openShareAccountsViewController() {
-
         if let shareAccounts = self.shareAccounts, let vc = UIStoryboard(name: "NCShareAccounts", bundle: nil).instantiateInitialViewController() as? NCShareAccounts {
-
             vc.accounts = shareAccounts
             vc.enableTimerProgress = false
             vc.dismissDidEnterBackground = false
@@ -302,7 +290,6 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
             let screenHeighMax = UIScreen.main.bounds.height - (UIScreen.main.bounds.height / 5)
             let numberCell = shareAccounts.count
             let height = min(CGFloat(numberCell * Int(vc.heightCell) + 45), screenHeighMax)
-
             let popup = NCPopupViewController(contentController: vc, popupWidth: 300, popupHeight: height + 20)
 
             self.present(popup, animated: true)
@@ -315,7 +302,6 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         guard var url = baseUrl.text?.trimmingCharacters(in: .whitespacesAndNewlines) else { return }
         if url.hasSuffix("/") { url = String(url.dropLast()) }
         if url.isEmpty { return }
-
         // Check whether baseUrl contain protocol. If not add https:// by default.
         if url.hasPrefix("https") == false && url.hasPrefix("http") == false {
             url = "https://" + url
@@ -325,53 +311,35 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
     }
 
     func isUrlValid(url: String, user: String? = nil) {
-
         loginButton.isEnabled = false
-
         NextcloudKit.shared.getServerStatus(serverUrl: url) { serverInfoResult in
-
             switch serverInfoResult {
             case .success(let serverInfo):
-
                 if let host = URL(string: url)?.host {
                     NCNetworking.shared.writeCertificate(host: host)
                 }
-
                 NextcloudKit.shared.getLoginFlowV2(serverUrl: url) { token, endpoint, login, _, error in
-
                     self.loginButton.isEnabled = true
-
                     // Login Flow V2
                     if error == .success, let token, let endpoint, let login {
                         let vc = UIHostingController(rootView: NCLoginPoll(loginFlowV2Token: token, loginFlowV2Endpoint: endpoint, loginFlowV2Login: login))
-
                         self.present(vc, animated: true)
                     } else if serverInfo.versionMajor < NCGlobal.shared.nextcloudVersion12 { // No login flow available
-
                         let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: NSLocalizedString("_webflow_not_available_", comment: ""), preferredStyle: .alert)
-
                         alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in }))
-
                         self.present(alertController, animated: true, completion: { })
                     }
                 }
-
             case .failure(let error):
-
                 self.loginButton.isEnabled = true
-
                 if error.errorCode == NSURLErrorServerCertificateUntrusted {
-
                     let alertController = UIAlertController(title: NSLocalizedString("_ssl_certificate_untrusted_", comment: ""), message: NSLocalizedString("_connect_server_anyway_", comment: ""), preferredStyle: .alert)
-
                     alertController.addAction(UIAlertAction(title: NSLocalizedString("_yes_", comment: ""), style: .default, handler: { _ in
                         if let host = URL(string: url)?.host {
                             NCNetworking.shared.writeCertificate(host: host)
                         }
                     }))
-
                     alertController.addAction(UIAlertAction(title: NSLocalizedString("_no_", comment: ""), style: .default, handler: { _ in }))
-
                     alertController.addAction(UIAlertAction(title: NSLocalizedString("_certificate_details_", comment: ""), style: .default, handler: { _ in
                         if let navigationController = UIStoryboard(name: "NCViewCertificateDetails", bundle: nil).instantiateInitialViewController() as? UINavigationController,
                            let viewController = navigationController.topViewController as? NCViewCertificateDetails {
@@ -381,15 +349,10 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                             self.present(navigationController, animated: true)
                         }
                     }))
-
                     self.present(alertController, animated: true)
-
                 } else {
-
                     let alertController = UIAlertController(title: NSLocalizedString("_connection_error_", comment: ""), message: error.errorDescription, preferredStyle: .alert)
-
                     alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in }))
-
                     self.present(alertController, animated: true, completion: { })
                 }
             }
@@ -399,135 +362,70 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
     // MARK: - QRCode
 
     func dismissQRCode(_ value: String?, metadataType: String?) {
-
         guard var value = value else { return }
-
         let protocolLogin = NCBrandOptions.shared.webLoginAutenticationProtocol + "login/"
-
         if value.hasPrefix(protocolLogin) && value.contains("user:") && value.contains("password:") && value.contains("server:") {
-
             value = value.replacingOccurrences(of: protocolLogin, with: "")
             let valueArray = value.components(separatedBy: "&")
             if valueArray.count == 3 {
-
                 let user = valueArray[0].replacingOccurrences(of: "user:", with: "")
                 let password = valueArray[1].replacingOccurrences(of: "password:", with: "")
                 let urlBase = valueArray[2].replacingOccurrences(of: "server:", with: "")
                 let serverUrl = urlBase + "/" + NextcloudKit.shared.nkCommonInstance.dav
-
                 loginButton.isEnabled = false
-
                 NextcloudKit.shared.checkServer(serverUrl: serverUrl) { error in
-
                     self.loginButton.isEnabled = true
-                    self.standardLogin(url: urlBase, user: user, password: password, error: error)
+                    if error == .success {
+                        self.createAccount(urlBase: urlBase, user: user, password: password)
+                    } else {
+                        let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: error.errorDescription, preferredStyle: .alert)
+                        alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in }))
+                        self.present(alertController, animated: true)
+                    }
                 }
             }
         }
     }
 
-    func standardLogin(url: String, user: String, password: String, error: NKError) {
-
-        if error == .success {
-
-            if let host = URL(string: url)?.host {
-                NCNetworking.shared.writeCertificate(host: host)
-            }
-            let urlBase = url
-            let account = user + " " + user
-
-            NextcloudKit.shared.setup(account: account, user: user, userId: user, password: password, urlBase: urlBase)
-            NextcloudKit.shared.getUserProfile { _, userProfile, _, error in
-
-                if error == .success, let userProfile {
-
-                    NCManageDatabase.shared.deleteAccount(account)
-                    NCManageDatabase.shared.addAccount(account, urlBase: url, user: user, userId: userProfile.userId, password: password)
-
-                    self.appDelegate.changeAccount(account, userProfile: userProfile)
-
-                    let window = UIApplication.shared.firstWindow
-                    if window?.rootViewController is NCMainTabBarController {
-                        self.dismiss(animated: true)
-                    } else {
-                        if let controller = UIStoryboard(name: "Main", bundle: nil).instantiateInitialViewController() as? NCMainTabBarController {
-                            controller.modalPresentationStyle = .fullScreen
-                            controller.view.alpha = 0
-                            window?.rootViewController = controller
-                            window?.makeKeyAndVisible()
-                            UIView.animate(withDuration: 0.5) {
-                                controller.view.alpha = 1
-                            }
-                        }
-                    }
-                } else {
-
-                    let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: error.errorDescription, preferredStyle: .alert)
-                    alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in }))
-                    self.present(alertController, animated: true)
-                }
+    private func getAppPassword(urlBase: String, user: String, password: String) {
+        NextcloudKit.shared.getAppPassword(url: urlBase, user: user, password: password) { token, _, error in
+            if error == .success, let password = token {
+                self.createAccount(urlBase: urlBase, user: user, password: password)
+            } else {
+                NCContentPresenter().showError(error: error)
+                self.dismiss(animated: true, completion: nil)
             }
-
-        } else if error.errorCode == NSURLErrorServerCertificateUntrusted {
-
-            let alertController = UIAlertController(title: NSLocalizedString("_ssl_certificate_untrusted_", comment: ""), message: NSLocalizedString("_connect_server_anyway_", comment: ""), preferredStyle: .alert)
-
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("_yes_", comment: ""), style: .default, handler: { _ in
-                if let host = URL(string: url)?.host {
-                    NCNetworking.shared.writeCertificate(host: host)
-                }
-            }))
-
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("_no_", comment: ""), style: .default, handler: { _ in }))
-
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("_certificate_details_", comment: ""), style: .default, handler: { _ in
-                if let navigationController = UIStoryboard(name: "NCViewCertificateDetails", bundle: nil).instantiateInitialViewController() {
-                    self.present(navigationController, animated: true)
-                }
-            }))
-
-            self.present(alertController, animated: true)
-
-        } else {
-
-            let message = NSLocalizedString("_not_possible_connect_to_server_", comment: "") + ".\n" + error.errorDescription
-            let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: message, preferredStyle: .alert)
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in }))
-            self.present(alertController, animated: true, completion: { })
         }
     }
 
-    private func createAccount(server: String, username: String, password: String) {
-        appDelegate.createAccount(server: server, username: username, password: password) { error in
+    private func createAccount(urlBase: String, user: String, password: String) {
+        if let host = URL(string: urlBase)?.host {
+            NCNetworking.shared.writeCertificate(host: host)
+        }
+        self.appDelegate.createAccount(urlBase: urlBase, user: user, password: password) { error in
             if error == .success {
                 let window = UIApplication.shared.firstWindow
                 if window?.rootViewController is NCMainTabBarController {
                     self.dismiss(animated: true)
                 } else {
-                    if let mainTabBarController = UIStoryboard(name: "Main", bundle: nil).instantiateInitialViewController() as? NCMainTabBarController {
-                        mainTabBarController.modalPresentationStyle = .fullScreen
-                        mainTabBarController.view.alpha = 0
-                        window?.rootViewController = mainTabBarController
+                    if let controller = UIStoryboard(name: "Main", bundle: nil).instantiateInitialViewController() as? NCMainTabBarController {
+                        controller.modalPresentationStyle = .fullScreen
+                        controller.view.alpha = 0
+                        window?.rootViewController = controller
                         window?.makeKeyAndVisible()
                         UIView.animate(withDuration: 0.5) {
-                            mainTabBarController.view.alpha = 1
+                            controller.view.alpha = 1
                         }
                     }
                 }
-            }
-        }
-    }
-
-    private func getAppPassword(serverUrl: String, username: String, password: String) {
-        NextcloudKit.shared.getAppPassword(serverUrl: serverUrl, username: username, password: password) { token, _, error in
-            if error == .success, let password = token {
-                self.createAccount(server: serverUrl, username: username, password: password)
             } else {
-                NCContentPresenter().showError(error: error)
-                self.dismiss(animated: true, completion: nil)
+                let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: error.errorDescription, preferredStyle: .alert)
+                alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in }))
+                self.present(alertController, animated: true)
             }
         }
     }
+
 }
 
 extension NCLogin: NCShareAccountsDelegate {
@@ -539,47 +437,35 @@ extension NCLogin: NCShareAccountsDelegate {
 extension NCLogin: ClientCertificateDelegate, UIDocumentPickerDelegate {
     func didAskForClientCertificate() {
         let alertNoCertFound = UIAlertController(title: NSLocalizedString("_no_client_cert_found_", comment: ""), message: NSLocalizedString("_no_client_cert_found_desc_", comment: ""), preferredStyle: .alert)
-
         alertNoCertFound.addAction(UIAlertAction(title: NSLocalizedString("_cancel_", comment: ""), style: .cancel, handler: nil))
-
         alertNoCertFound.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in
             let documentProviderMenu = UIDocumentPickerViewController(forOpeningContentTypes: [UTType.pkcs12])
             documentProviderMenu.delegate = self
-
             self.present(documentProviderMenu, animated: true, completion: nil)
         }))
-
         present(alertNoCertFound, animated: true)
     }
 
     func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
         let alertEnterPassword = UIAlertController(title: NSLocalizedString("_client_cert_enter_password_", comment: ""), message: "", preferredStyle: .alert)
-
         alertEnterPassword.addAction(UIAlertAction(title: NSLocalizedString("_cancel_", comment: ""), style: .cancel, handler: nil))
-
         alertEnterPassword.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in
             // let documentProviderMenu = UIDocumentPickerViewController(forOpeningContentTypes: [UTType.pkcs12])
             NCNetworking.shared.p12Data = try? Data(contentsOf: urls[0])
             NCNetworking.shared.p12Password = alertEnterPassword.textFields?[0].text
-
             self.login()
         }))
-
         alertEnterPassword.addTextField { textField in
             textField.isSecureTextEntry = true
         }
-
         present(alertEnterPassword, animated: true)
     }
 
     func onIncorrectPassword() {
         NCNetworking.shared.p12Data = nil
         NCNetworking.shared.p12Password = nil
-
         let alertWrongPassword = UIAlertController(title: NSLocalizedString("_client_cert_wrong_password_", comment: ""), message: "", preferredStyle: .alert)
-
         alertWrongPassword.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default))
-
         present(alertWrongPassword, animated: true)
     }
 }
diff --git a/iOSClient/Login/NCLoginPoll.swift b/iOSClient/Login/NCLoginPoll.swift
index c7a7a4edaa..d1d38d0d79 100644
--- a/iOSClient/Login/NCLoginPoll.swift
+++ b/iOSClient/Login/NCLoginPoll.swift
@@ -125,9 +125,13 @@ private class LoginManager: ObservableObject {
 
     func poll() {
         NextcloudKit.shared.getLoginFlowV2Poll(token: self.loginFlowV2Token, endpoint: self.loginFlowV2Endpoint) { server, loginName, appPassword, _, error in
-            if error == .success, let server, let loginName, let appPassword {
+            if error == .success, let urlBase = server, let user = loginName, let appPassword {
                 self.isLoading = true
-                self.createAccount(server: server, username: loginName, password: appPassword)
+                self.appDelegate.createAccount(urlBase: urlBase, user: user, password: appPassword) { error in
+                    if error == .success {
+                        self.pollFinished = true
+                    }
+                }
             }
         }
     }
@@ -135,12 +139,4 @@ private class LoginManager: ObservableObject {
     func openLoginInBrowser() {
         UIApplication.shared.open(URL(string: loginFlowV2Login)!)
     }
-
-    private func createAccount(server: String, username: String, password: String) {
-        appDelegate.createAccount(server: server, username: username, password: password) { error in
-            if error == .success {
-                self.pollFinished = true
-            }
-        }
-    }
 }
diff --git a/iOSClient/Login/NCLoginProvider.swift b/iOSClient/Login/NCLoginProvider.swift
index ed231ffec3..a7deec3ce2 100644
--- a/iOSClient/Login/NCLoginProvider.swift
+++ b/iOSClient/Login/NCLoginProvider.swift
@@ -128,11 +128,9 @@ extension NCLoginProvider: WKNavigationDelegate {
             }
 
             if !server.isEmpty, !user.isEmpty, !password.isEmpty {
-
                 let server: String = server.replacingOccurrences(of: "/server:", with: "")
                 let username: String = user.replacingOccurrences(of: "user:", with: "").replacingOccurrences(of: "+", with: " ")
                 let password: String = password.replacingOccurrences(of: "password:", with: "")
-
                 createAccount(server: server, username: username, password: password)
             }
         }
@@ -170,14 +168,10 @@ extension NCLoginProvider: WKNavigationDelegate {
 
         NextcloudKit.shared.setup(account: account, user: user, userId: user, password: password, urlBase: urlBase)
         NextcloudKit.shared.getUserProfile { _, userProfile, _, error in
-
             if error == .success, let userProfile {
-
                 NCManageDatabase.shared.deleteAccount(account)
                 NCManageDatabase.shared.addAccount(account, urlBase: urlBase, user: user, userId: userProfile.userId, password: password)
-
-                self.appDelegate.changeAccount(account, userProfile: userProfile)
-
+                self.appDelegate.changeAccount(account, userProfile: userProfile) { }
                 let window = UIApplication.shared.firstWindow
                 if window?.rootViewController is NCMainTabBarController {
                     self.dismiss(animated: true)
@@ -192,7 +186,6 @@ extension NCLoginProvider: WKNavigationDelegate {
                         }
                     }
                 }
-
             } else {
                 let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: error.errorDescription, preferredStyle: .alert)
                 alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in }))
diff --git a/iOSClient/Login/NCLoginQRCode.swift b/iOSClient/Login/NCLoginQRCode.swift
index 1c80918c7f..9712befe4d 100644
--- a/iOSClient/Login/NCLoginQRCode.swift
+++ b/iOSClient/Login/NCLoginQRCode.swift
@@ -59,7 +59,6 @@ class NCLoginQRCode: NSObject, QRCodeReaderViewControllerDelegate {
         readerVC.completionBlock = { (_: QRCodeReaderResult?) in
             self.readerVC.dismiss(animated: true, completion: nil)
         }
-
         delegate?.present(readerVC, animated: true, completion: nil)
     }
 
@@ -68,11 +67,9 @@ class NCLoginQRCode: NSObject, QRCodeReaderViewControllerDelegate {
             return try QRCodeReader.supportsMetadataObjectTypes()
         } catch let error as NSError {
             let alert: UIAlertController
-
             switch error.code {
             case -11852:
                 alert = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: NSLocalizedString("_qrcode_not_authorized_", comment: ""), preferredStyle: .alert)
-
                 alert.addAction(UIAlertAction(title: NSLocalizedString("_settings_", comment: ""), style: .default, handler: { _ in
                     DispatchQueue.main.async {
                         if let settingsURL = URL(string: UIApplication.openSettingsURLString) {
@@ -86,9 +83,7 @@ class NCLoginQRCode: NSObject, QRCodeReaderViewControllerDelegate {
                 alert = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: NSLocalizedString("_qrcode_not_supported_", comment: ""), preferredStyle: .alert)
                 alert.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .cancel, handler: nil))
             }
-
             delegate?.present(alert, animated: true, completion: nil)
-
             return false
         }
     }
diff --git a/iOSClient/Main/Collection Common/Cell/NCCellProtocol.swift b/iOSClient/Main/Collection Common/Cell/NCCellProtocol.swift
index 9dd1c4ac4e..8a315baa1d 100644
--- a/iOSClient/Main/Collection Common/Cell/NCCellProtocol.swift	
+++ b/iOSClient/Main/Collection Common/Cell/NCCellProtocol.swift	
@@ -24,16 +24,15 @@
 import UIKit
 
 protocol NCCellProtocol {
-
     var fileAvatarImageView: UIImageView? { get }
     var fileObjectId: String? { get set }
     var filePreviewImageView: UIImageView? { get set }
+    var filePreviewImageBottom: NSLayoutConstraint? { get set }
     var fileUser: String? { get set }
     var fileTitleLabel: UILabel? { get set }
     var fileInfoLabel: UILabel? { get set }
     var fileSubinfoLabel: UILabel? { get set }
     var fileProgressView: UIProgressView? { get set }
-    var fileSelectImage: UIImageView? { get set }
     var fileStatusImage: UIImageView? { get set }
     var fileLocalImage: UIImageView? { get set }
     var fileFavoriteImage: UIImageView? { get set }
@@ -48,8 +47,7 @@ protocol NCCellProtocol {
     func setButtonMore(named: String, image: UIImage)
     func hideButtonShare(_ status: Bool)
     func hideButtonMore(_ status: Bool)
-    func selectMode(_ status: Bool)
-    func selected(_ status: Bool)
+    func selected(_ status: Bool, isEditMode: Bool)
     func setAccessibility(label: String, value: String)
     func setTags(tags: [String])
     func setIconOutlines()
@@ -68,6 +66,10 @@ extension NCCellProtocol {
         get { return nil }
         set {}
     }
+    var filePreviewImageBottom: NSLayoutConstraint? {
+        get { return nil }
+        set {}
+    }
     var fileTitleLabel: UILabel? {
         get { return nil }
         set {}
@@ -84,10 +86,6 @@ extension NCCellProtocol {
         get { return nil }
         set {}
     }
-    var fileSelectImage: UIImageView? {
-        get { return nil }
-        set {}
-    }
     var fileStatusImage: UIImageView? {
         get { return nil }
         set {}
@@ -119,8 +117,7 @@ extension NCCellProtocol {
     func setButtonMore(named: String, image: UIImage) {}
     func hideButtonShare(_ status: Bool) {}
     func hideButtonMore(_ status: Bool) {}
-    func selectMode(_ status: Bool) {}
-    func selected(_ status: Bool) {}
+    func selected(_ status: Bool, isEditMode: Bool) {}
     func setAccessibility(label: String, value: String) {}
     func setTags(tags: [String]) {}
     func setIconOutlines() {}
diff --git a/iOSClient/Main/Collection Common/Cell/NCGridCell.swift b/iOSClient/Main/Collection Common/Cell/NCGridCell.swift
index 7198938b74..2e262ed129 100644
--- a/iOSClient/Main/Collection Common/Cell/NCGridCell.swift	
+++ b/iOSClient/Main/Collection Common/Cell/NCGridCell.swift	
@@ -24,7 +24,6 @@
 import UIKit
 
 class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProtocol {
-
     @IBOutlet weak var imageItem: UIImageView!
     @IBOutlet weak var imageSelect: UIImageView!
     @IBOutlet weak var imageStatus: UIImageView!
@@ -67,10 +66,6 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         get { return labelSubinfo }
         set { labelSubinfo = newValue }
     }
-    var fileSelectImage: UIImageView? {
-        get { return imageSelect }
-        set { imageSelect = newValue }
-    }
     var fileStatusImage: UIImageView? {
         get { return imageStatus }
         set { imageStatus = newValue }
@@ -86,8 +81,15 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        initCell()
+    }
+
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        initCell()
+    }
 
-        // use entire cell as accessibility element
+    func initCell() {
         accessibilityHint = nil
         accessibilityLabel = nil
         accessibilityValue = nil
@@ -100,31 +102,20 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         imageVisualEffect.clipsToBounds = true
         imageVisualEffect.alpha = 0.5
 
+        imageSelect.isHidden = true
+        imageSelect.image = NCImageCache.images.checkedYes
+
         let longPressedGesture = UILongPressGestureRecognizer(target: self, action: #selector(longPress(gestureRecognizer:)))
         longPressedGesture.minimumPressDuration = 0.5
         longPressedGesture.delegate = self
         longPressedGesture.delaysTouchesBegan = true
         self.addGestureRecognizer(longPressedGesture)
 
-        let longPressedGestureMore = UILongPressGestureRecognizer(target: self, action: #selector(longPressInsideMore(gestureRecognizer:)))
-        longPressedGestureMore.minimumPressDuration = 0.5
-        longPressedGestureMore.delegate = self
-        longPressedGestureMore.delaysTouchesBegan = true
-        buttonMore.addGestureRecognizer(longPressedGestureMore)
-
         labelTitle.text = ""
         labelInfo.text = ""
         labelSubinfo.text = ""
     }
 
-    override func prepareForReuse() {
-        super.prepareForReuse()
-        imageItem.backgroundColor = nil
-        accessibilityHint = nil
-        accessibilityLabel = nil
-        accessibilityValue = nil
-    }
-
     override func snapshotView(afterScreenUpdates afterUpdates: Bool) -> UIView? {
         return nil
     }
@@ -133,10 +124,6 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         gridCellDelegate?.tapMoreGridItem(with: objectId, namedButtonMore: namedButtonMore, image: imageItem.image, indexPath: indexPath, sender: sender)
     }
 
-    @objc func longPressInsideMore(gestureRecognizer: UILongPressGestureRecognizer) {
-        gridCellDelegate?.longPressMoreGridItem(with: objectId, namedButtonMore: namedButtonMore, indexPath: indexPath, gestureRecognizer: gestureRecognizer)
-    }
-
     @objc func longPress(gestureRecognizer: UILongPressGestureRecognizer) {
         gridCellDelegate?.longPressGridItem(with: objectId, indexPath: indexPath, gestureRecognizer: gestureRecognizer)
     }
@@ -162,34 +149,16 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         buttonMore.isHidden = status
     }
 
-    func selectMode(_ status: Bool) {
-        if status {
-            imageSelect.isHidden = false
+    func selected(_ status: Bool, isEditMode: Bool) {
+        if isEditMode {
             buttonMore.isHidden = true
             accessibilityCustomActions = nil
         } else {
-            imageSelect.isHidden = true
-            imageVisualEffect.isHidden = true
             buttonMore.isHidden = false
             setA11yActions()
         }
-    }
-
-    func selected(_ status: Bool) {
-        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(objectId), !metadata.isInTransfer else {
-            imageSelect.isHidden = true
-            imageVisualEffect.isHidden = true
-            return
-        }
         if status {
-            if traitCollection.userInterfaceStyle == .dark {
-                imageVisualEffect.effect = UIBlurEffect(style: .dark)
-                imageVisualEffect.backgroundColor = .black
-            } else {
-                imageVisualEffect.effect = UIBlurEffect(style: .extraLight)
-                imageVisualEffect.backgroundColor = .lightGray
-            }
-            imageSelect.image = NCImageCache.images.checkedYes
+            imageSelect.isHidden = false
             imageVisualEffect.isHidden = false
         } else {
             imageSelect.isHidden = true
@@ -198,7 +167,6 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     }
 
     func writeInfoDateSize(date: NSDate, size: Int64) {
-
         let dateFormatter = DateFormatter()
         dateFormatter.dateStyle = .short
         dateFormatter.timeStyle = .none
@@ -224,28 +192,17 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
 
 protocol NCGridCellDelegate: AnyObject {
     func tapMoreGridItem(with objectId: String, namedButtonMore: String, image: UIImage?, indexPath: IndexPath, sender: Any)
-    func longPressMoreGridItem(with objectId: String, namedButtonMore: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer)
     func longPressGridItem(with objectId: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer)
 }
 
-// optional func
-extension NCGridCellDelegate {
-    func tapMoreGridItem(with objectId: String, namedButtonMore: String, image: UIImage?, indexPath: IndexPath, sender: Any) {}
-    func longPressMoreGridItem(with objectId: String, namedButtonMore: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer) {}
-    func longPressGridItem(with objectId: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer) {}
-}
-
 // MARK: - Grid Layout
 
 class NCGridLayout: UICollectionViewFlowLayout {
-
     var heightLabelPlusButton: CGFloat = 60
     var marginLeftRight: CGFloat = 10
-    var itemForLine: CGFloat = 3
+    var column: CGFloat = 3
     var itemWidthDefault: CGFloat = 140
 
-    // MARK: - View Life Cycle
-
     override init() {
         super.init()
 
@@ -265,20 +222,15 @@ class NCGridLayout: UICollectionViewFlowLayout {
     override var itemSize: CGSize {
         get {
             if let collectionView = collectionView {
-
                 if collectionView.frame.width < 400 {
-                    itemForLine = 3
+                    column = 3
                 } else {
-                    itemForLine = collectionView.frame.width / itemWidthDefault
+                    column = collectionView.frame.width / itemWidthDefault
                 }
-
-                let itemWidth: CGFloat = (collectionView.frame.width - marginLeftRight * 2 - marginLeftRight * (itemForLine - 1)) / itemForLine
+                let itemWidth: CGFloat = (collectionView.frame.width - marginLeftRight * 2 - marginLeftRight * (column - 1)) / column
                 let itemHeight: CGFloat = itemWidth + heightLabelPlusButton
-
                 return CGSize(width: itemWidth, height: itemHeight)
             }
-
-            // Default fallback
             return CGSize(width: itemWidthDefault, height: itemWidthDefault)
         }
         set {
diff --git a/iOSClient/Main/Collection Common/Cell/NCGridCell.xib b/iOSClient/Main/Collection Common/Cell/NCGridCell.xib
index a69853c857..8a2beec3a7 100644
--- a/iOSClient/Main/Collection Common/Cell/NCGridCell.xib	
+++ b/iOSClient/Main/Collection Common/Cell/NCGridCell.xib	
@@ -18,43 +18,18 @@
                 <rect key="frame" x="0.0" y="0.0" width="416" height="529"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
+                    <visualEffectView hidden="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="LfR-yV-Xml" userLabel="VisualEffect">
+                        <rect key="frame" x="0.0" y="20" width="416" height="419"/>
+                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="h0r-Oi-xfW">
+                            <rect key="frame" x="0.0" y="0.0" width="416" height="419"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        </view>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <blurEffect style="extraLight"/>
+                    </visualEffectView>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Ci-V1-hf5" userLabel="imageItem">
                         <rect key="frame" x="0.0" y="20" width="416" height="419"/>
                     </imageView>
-                    <stackView opaque="NO" contentMode="scaleToFill" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="VRH-IZ-lXO">
-                        <rect key="frame" x="5" y="447" width="406" height="36"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="254" horizontalCompressionResistancePriority="756" verticalCompressionResistancePriority="759" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eU3-lY-fKr" userLabel="labelTitle">
-                                <rect key="frame" x="0.0" y="0.0" width="406" height="18"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="36" id="Soj-7j-hoM"/>
-                        </constraints>
-                    </stackView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2po-8g-XeS">
-                        <rect key="frame" x="25" y="490" width="366" height="12"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                        <color key="textColor" systemColor="systemGrayColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="12P-pO-DHO" userLabel="Label Size">
-                        <rect key="frame" x="25" y="505" width="366" height="12"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                        <color key="textColor" systemColor="systemGrayColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="star.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="cgB-lu-t0g">
-                        <rect key="frame" x="388" y="21" width="26" height="26"/>
-                        <color key="tintColor" systemColor="tertiarySystemFillColor"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="26" id="5aP-9X-SuS"/>
-                            <constraint firstAttribute="height" constant="26" id="dat-R5-5vy"/>
-                        </constraints>
-                    </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="star.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="AYs-f2-vve" userLabel="imageFavorite">
                         <rect key="frame" x="391" y="24.5" width="20" height="20"/>
                         <color key="tintColor" systemColor="separatorColor"/>
@@ -77,14 +52,6 @@
                             <constraint firstAttribute="width" constant="20" id="xLe-lb-N1p"/>
                         </constraints>
                     </imageView>
-                    <visualEffectView hidden="YES" opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W0L-HY-al1">
-                        <rect key="frame" x="0.0" y="20" width="416" height="419"/>
-                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="0m6-A2-SwD">
-                            <rect key="frame" x="0.0" y="0.0" width="416" height="419"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        </view>
-                        <blurEffect style="extraLight"/>
-                    </visualEffectView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DHy-Up-3Bh" userLabel="imageSelect">
                         <rect key="frame" x="5" y="25" width="25" height="25"/>
                         <constraints>
@@ -92,6 +59,32 @@
                             <constraint firstAttribute="width" constant="25" id="cZG-gx-gwt"/>
                         </constraints>
                     </imageView>
+                    <stackView opaque="NO" contentMode="scaleToFill" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="VRH-IZ-lXO">
+                        <rect key="frame" x="5" y="447" width="406" height="36"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="254" horizontalCompressionResistancePriority="756" verticalCompressionResistancePriority="759" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eU3-lY-fKr" userLabel="labelTitle">
+                                <rect key="frame" x="0.0" y="0.0" width="406" height="18"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="36" id="Soj-7j-hoM"/>
+                        </constraints>
+                    </stackView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2po-8g-XeS">
+                        <rect key="frame" x="25" y="490" width="366" height="12"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                        <color key="textColor" systemColor="systemGrayColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="12P-pO-DHO" userLabel="Label Size">
+                        <rect key="frame" x="25" y="505" width="366" height="12"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                        <color key="textColor" systemColor="systemGrayColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EJs-Ro-nbe" userLabel="buttonMoreGrid">
                         <rect key="frame" x="396" y="492" width="20" height="20"/>
                         <constraints>
@@ -109,51 +102,35 @@
             </view>
             <viewLayoutGuide key="safeArea" id="VXh-sQ-LeX"/>
             <constraints>
-                <constraint firstItem="cgB-lu-t0g" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="top" constant="1.5" id="0mO-lw-JH1"/>
                 <constraint firstItem="DHy-Up-3Bh" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" constant="5" id="1T3-8p-uIW"/>
                 <constraint firstItem="AYs-f2-vve" firstAttribute="leading" secondItem="5Ci-V1-hf5" secondAttribute="trailing" constant="-25" id="3e3-0A-NSl"/>
-                <constraint firstItem="W0L-HY-al1" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" id="6tC-PK-fYX"/>
                 <constraint firstItem="2po-8g-XeS" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="25" id="9JI-KS-d7J"/>
                 <constraint firstItem="DHy-Up-3Bh" firstAttribute="top" secondItem="VXh-sQ-LeX" secondAttribute="top" constant="5" id="ESV-qE-tbO"/>
                 <constraint firstAttribute="trailing" secondItem="VRH-IZ-lXO" secondAttribute="trailing" constant="5" id="HAS-uF-AuS"/>
                 <constraint firstItem="2po-8g-XeS" firstAttribute="top" secondItem="VRH-IZ-lXO" secondAttribute="bottom" constant="7" id="OPl-xq-XOx"/>
                 <constraint firstItem="5Ci-V1-hf5" firstAttribute="top" secondItem="VXh-sQ-LeX" secondAttribute="top" id="Ouj-ZD-UFm"/>
-                <constraint firstItem="W0L-HY-al1" firstAttribute="top" secondItem="VXh-sQ-LeX" secondAttribute="top" id="Py6-0z-K3t"/>
                 <constraint firstItem="2po-8g-XeS" firstAttribute="centerX" secondItem="vf1-Kf-9uL" secondAttribute="centerX" id="TTW-HT-yEO"/>
                 <constraint firstItem="5Ci-V1-hf5" firstAttribute="leading" secondItem="a0p-rj-jnV" secondAttribute="trailing" constant="-25" id="UtQ-6D-cYc"/>
-                <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="W0L-HY-al1" secondAttribute="trailing" id="VMW-0Y-aOH"/>
+                <constraint firstItem="LfR-yV-Xml" firstAttribute="leading" secondItem="5Ci-V1-hf5" secondAttribute="leading" id="XVl-U4-maN"/>
+                <constraint firstItem="LfR-yV-Xml" firstAttribute="trailing" secondItem="5Ci-V1-hf5" secondAttribute="trailing" id="ZT5-7T-eis"/>
                 <constraint firstItem="81G-wH-fjN" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="-25" id="aEb-vq-8sk"/>
                 <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="5Ci-V1-hf5" secondAttribute="trailing" id="cHT-cP-NN6"/>
+                <constraint firstItem="LfR-yV-Xml" firstAttribute="bottom" secondItem="5Ci-V1-hf5" secondAttribute="bottom" id="cVe-LC-fxg"/>
                 <constraint firstItem="VRH-IZ-lXO" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="8" id="cj5-Ez-3cy"/>
                 <constraint firstItem="VRH-IZ-lXO" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="5" id="dTF-dl-Awr"/>
                 <constraint firstItem="VXh-sQ-LeX" firstAttribute="bottom" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="90" id="eEC-eB-alE"/>
+                <constraint firstItem="LfR-yV-Xml" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="top" id="eLX-1I-820"/>
                 <constraint firstItem="12P-pO-DHO" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="25" id="fTQ-Ye-Xj2"/>
                 <constraint firstItem="12P-pO-DHO" firstAttribute="top" secondItem="2po-8g-XeS" secondAttribute="bottom" constant="3" id="hbc-KL-fRj"/>
-                <constraint firstItem="VXh-sQ-LeX" firstAttribute="bottom" secondItem="W0L-HY-al1" secondAttribute="bottom" constant="90" id="jI9-M1-Nl8"/>
                 <constraint firstItem="EJs-Ro-nbe" firstAttribute="trailing" secondItem="5Ci-V1-hf5" secondAttribute="trailing" id="l6Z-DK-OZi"/>
                 <constraint firstItem="81G-wH-fjN" firstAttribute="leading" secondItem="5Ci-V1-hf5" secondAttribute="trailing" constant="-25" id="nFH-Pc-end"/>
                 <constraint firstItem="EJs-Ro-nbe" firstAttribute="top" secondItem="VRH-IZ-lXO" secondAttribute="bottom" constant="9" id="o5n-Oi-Uh7"/>
-                <constraint firstItem="5Ci-V1-hf5" firstAttribute="trailing" secondItem="cgB-lu-t0g" secondAttribute="trailing" constant="2" id="q5r-Pz-Tnq"/>
                 <constraint firstItem="5Ci-V1-hf5" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" id="qT3-WD-iTV"/>
                 <constraint firstItem="5Ci-V1-hf5" firstAttribute="top" secondItem="AYs-f2-vve" secondAttribute="bottom" constant="-25" id="rLL-6g-ypv"/>
                 <constraint firstItem="a0p-rj-jnV" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="-25" id="upV-Ov-WWd"/>
                 <constraint firstItem="12P-pO-DHO" firstAttribute="centerX" secondItem="vf1-Kf-9uL" secondAttribute="centerX" id="xhm-Np-2Ua"/>
             </constraints>
             <size key="customSize" width="416" height="524"/>
-            <variation key="default">
-                <mask key="subviews">
-                    <exclude reference="cgB-lu-t0g"/>
-                    <exclude reference="W0L-HY-al1"/>
-                </mask>
-                <mask key="constraints">
-                    <exclude reference="0mO-lw-JH1"/>
-                    <exclude reference="6tC-PK-fYX"/>
-                    <exclude reference="Py6-0z-K3t"/>
-                    <exclude reference="VMW-0Y-aOH"/>
-                    <exclude reference="jI9-M1-Nl8"/>
-                    <exclude reference="q5r-Pz-Tnq"/>
-                </mask>
-            </variation>
             <connections>
                 <outlet property="buttonMore" destination="EJs-Ro-nbe" id="BdI-ay-LuX"/>
                 <outlet property="imageFavorite" destination="AYs-f2-vve" id="UeH-R7-bZr"/>
@@ -161,7 +138,7 @@
                 <outlet property="imageLocal" destination="81G-wH-fjN" id="bqj-wQ-CBV"/>
                 <outlet property="imageSelect" destination="DHy-Up-3Bh" id="mo9-rP-P4I"/>
                 <outlet property="imageStatus" destination="a0p-rj-jnV" id="6Dg-tf-evd"/>
-                <outlet property="imageVisualEffect" destination="W0L-HY-al1" id="WDW-2d-Npa"/>
+                <outlet property="imageVisualEffect" destination="LfR-yV-Xml" id="KSf-fc-rLn"/>
                 <outlet property="labelInfo" destination="2po-8g-XeS" id="FJ4-wI-9cW"/>
                 <outlet property="labelSubinfo" destination="12P-pO-DHO" id="K6d-7r-FGh"/>
                 <outlet property="labelTitle" destination="eU3-lY-fKr" id="0P7-yM-Asb"/>
@@ -173,16 +150,13 @@
         <image name="ellipsis" catalog="system" width="128" height="37"/>
         <image name="star.fill" catalog="system" width="128" height="116"/>
         <systemColor name="separatorColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemGray2Color">
-            <color red="0.68235294117647061" green="0.68235294117647061" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.68235294120000001" green="0.68235294120000001" blue="0.69803921570000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemGrayColor">
-            <color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
-        <systemColor name="tertiarySystemFillColor">
-            <color red="0.46274509803921571" green="0.46274509803921571" blue="0.50196078431372548" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/iOSClient/Main/Collection Common/Cell/NCListCell.swift b/iOSClient/Main/Collection Common/Cell/NCListCell.swift
index 0168aaa376..8f13107769 100755
--- a/iOSClient/Main/Collection Common/Cell/NCListCell.swift	
+++ b/iOSClient/Main/Collection Common/Cell/NCListCell.swift	
@@ -24,7 +24,6 @@
 import UIKit
 
 class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProtocol {
-
     @IBOutlet weak var imageItem: UIImageView!
     @IBOutlet weak var imageSelect: UIImageView!
     @IBOutlet weak var imageStatus: UIImageView!
@@ -86,10 +85,6 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         get { return progressView }
         set { progressView = newValue }
     }
-    var fileSelectImage: UIImageView? {
-        get { return imageSelect }
-        set { imageSelect = newValue }
-    }
     var fileStatusImage: UIImageView? {
         get { return imageStatus }
         set { imageStatus = newValue }
@@ -137,12 +132,6 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         longPressedGesture.delaysTouchesBegan = true
         self.addGestureRecognizer(longPressedGesture)
 
-        let longPressedGestureMore = UILongPressGestureRecognizer(target: self, action: #selector(longPressInsideMore(gestureRecognizer:)))
-        longPressedGestureMore.minimumPressDuration = 0.5
-        longPressedGestureMore.delegate = self
-        longPressedGestureMore.delaysTouchesBegan = true
-        buttonMore.addGestureRecognizer(longPressedGestureMore)
-
         separator.backgroundColor = .separator
         separatorHeightConstraint.constant = 0.5
 
@@ -182,10 +171,6 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         listCellDelegate?.tapMoreListItem(with: objectId, namedButtonMore: namedButtonMore, image: imageItem.image, indexPath: indexPath, sender: sender)
     }
 
-    @objc func longPressInsideMore(gestureRecognizer: UILongPressGestureRecognizer) {
-        listCellDelegate?.longPressMoreListItem(with: objectId, namedButtonMore: namedButtonMore, indexPath: indexPath, gestureRecognizer: gestureRecognizer)
-    }
-
     @objc func longPress(gestureRecognizer: UILongPressGestureRecognizer) {
         listCellDelegate?.longPressListItem(with: objectId, indexPath: indexPath, gestureRecognizer: gestureRecognizer)
     }
@@ -235,8 +220,8 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         separator.isHidden = status
     }
 
-    func selectMode(_ status: Bool) {
-        if status {
+    func selected(_ status: Bool, isEditMode: Bool) {
+        if isEditMode {
             imageItemLeftConstraint.constant = 45
             imageSelect.isHidden = false
             imageShared.isHidden = true
@@ -254,29 +239,13 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
             backgroundView = nil
             setA11yActions()
         }
-    }
-
-    func selected(_ status: Bool) {
-        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(objectId), !metadata.isInTransfer else {
-            backgroundView = nil
-            separator.isHidden = false
-            return
-        }
         if status {
-            var blurEffect: UIVisualEffect?
             var blurEffectView: UIView?
-            imageSelect.image = NCImageCache.images.checkedYes
-            if traitCollection.userInterfaceStyle == .dark {
-                blurEffect = UIBlurEffect(style: .dark)
-                blurEffectView = UIVisualEffectView(effect: blurEffect)
-                blurEffectView?.backgroundColor = .black
-            } else {
-                blurEffect = UIBlurEffect(style: .extraLight)
-                blurEffectView = UIVisualEffectView(effect: blurEffect)
-                blurEffectView?.backgroundColor = .lightGray
-            }
+            blurEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
+            blurEffectView?.backgroundColor = .lightGray
             blurEffectView?.frame = self.bounds
             blurEffectView?.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+            imageSelect.image = NCImageCache.images.checkedYes
             backgroundView = blurEffectView
             separator.isHidden = true
         } else {
@@ -284,6 +253,7 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
             backgroundView = nil
             separator.isHidden = false
         }
+
     }
 
     func writeInfoDateSize(date: NSDate, size: Int64) {
@@ -338,26 +308,14 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
 protocol NCListCellDelegate: AnyObject {
     func tapShareListItem(with objectId: String, indexPath: IndexPath, sender: Any)
     func tapMoreListItem(with objectId: String, namedButtonMore: String, image: UIImage?, indexPath: IndexPath, sender: Any)
-    func longPressMoreListItem(with objectId: String, namedButtonMore: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer)
     func longPressListItem(with objectId: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer)
 }
 
-// optional func
-extension NCListCellDelegate {
-    func tapShareListItem(with objectId: String, indexPath: IndexPath, sender: Any) {}
-    func tapMoreListItem(with objectId: String, namedButtonMore: String, image: UIImage?, indexPath: IndexPath, sender: Any) {}
-    func longPressMoreListItem(with objectId: String, namedButtonMore: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer) {}
-    func longPressListItem(with objectId: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer) {}
-}
-
 // MARK: - List Layout
 
 class NCListLayout: UICollectionViewFlowLayout {
-
     var itemHeight: CGFloat = 60
 
-    // MARK: - View Life Cycle
-
     override init() {
         super.init()
 
@@ -380,8 +338,6 @@ class NCListLayout: UICollectionViewFlowLayout {
                 let itemWidth: CGFloat = collectionView.frame.width
                 return CGSize(width: itemWidth, height: self.itemHeight)
             }
-
-            // Default fallback
             return CGSize(width: 100, height: 100)
         }
         set {
diff --git a/iOSClient/Main/Collection Common/Cell/NCListCell.xib b/iOSClient/Main/Collection Common/Cell/NCListCell.xib
index 3ff9462e83..8422b1cfae 100755
--- a/iOSClient/Main/Collection Common/Cell/NCListCell.xib	
+++ b/iOSClient/Main/Collection Common/Cell/NCListCell.xib	
@@ -18,6 +18,13 @@
                 <rect key="frame" x="0.0" y="0.0" width="669" height="148"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="AyA-hP-r6w" userLabel="imageSelect">
+                        <rect key="frame" x="10" y="61.666666666666657" width="25" height="25"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="25" id="bIF-gu-6Jj"/>
+                            <constraint firstAttribute="height" constant="25" id="nJa-oj-gcQ"/>
+                        </constraints>
+                    </imageView>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="w2m-Vw-hpd" userLabel="ImageItem">
                         <rect key="frame" x="57" y="54" width="40" height="40"/>
                         <constraints>
@@ -47,13 +54,6 @@
                             <constraint firstAttribute="height" constant="15" id="mPH-zc-eH5"/>
                         </constraints>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="AyA-hP-r6w" userLabel="imageSelect">
-                        <rect key="frame" x="10" y="61.666666666666657" width="25" height="25"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="25" id="bIF-gu-6Jj"/>
-                            <constraint firstAttribute="height" constant="25" id="nJa-oj-gcQ"/>
-                        </constraints>
-                    </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="H4E-G2-C1H" userLabel="imageLocal">
                         <rect key="frame" x="87" y="84" width="15" height="15"/>
                         <constraints>
@@ -267,10 +267,10 @@
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemGray5Color">
-            <color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.8980392157" green="0.8980392157" blue="0.91764705879999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemGrayColor">
-            <color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/iOSClient/Main/Collection Common/Cell/NCPhotoCell.swift b/iOSClient/Main/Collection Common/Cell/NCPhotoCell.swift
new file mode 100644
index 0000000000..2b4f9e2af9
--- /dev/null
+++ b/iOSClient/Main/Collection Common/Cell/NCPhotoCell.swift	
@@ -0,0 +1,145 @@
+//
+//  NCPhotoCell.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 13/07/2024.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import UIKit
+
+class NCPhotoCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProtocol {
+
+    @IBOutlet weak var imageItem: UIImageView!
+    @IBOutlet weak var imageSelect: UIImageView!
+    @IBOutlet weak var imageStatus: UIImageView!
+    @IBOutlet weak var imageVisualEffect: UIVisualEffectView!
+    @IBOutlet weak var labelTitle: UILabel!
+    @IBOutlet weak var imageItemBottom: NSLayoutConstraint!
+
+    var objectId = ""
+    var indexPath = IndexPath()
+    private var user = ""
+
+    weak var photoCellDelegate: NCPhotoCellDelegate?
+    var namedButtonMore = ""
+
+    var fileObjectId: String? {
+        get { return objectId }
+        set { objectId = newValue ?? "" }
+    }
+    var filePreviewImageView: UIImageView? {
+        get { return imageItem }
+        set { imageItem = newValue }
+    }
+    var filePreviewImageBottom: NSLayoutConstraint? {
+        get { return imageItemBottom }
+        set { imageItemBottom = newValue}
+    }
+    var fileUser: String? {
+        get { return user }
+        set { user = newValue ?? "" }
+    }
+    var fileTitleLabel: UILabel? {
+        get { return labelTitle }
+        set { labelTitle = newValue }
+    }
+    var fileInfoLabel: UILabel? {
+        get { return nil }
+        set { }
+    }
+    var fileSubinfoLabel: UILabel? {
+        get { return nil }
+        set { }
+    }
+    var fileStatusImage: UIImageView? {
+        get { return imageStatus }
+        set { imageStatus = newValue }
+    }
+    var fileLocalImage: UIImageView? {
+        get { return nil }
+        set { }
+    }
+    var fileFavoriteImage: UIImageView? {
+        get { return nil }
+        set { }
+    }
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        initCell()
+    }
+
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        initCell()
+    }
+
+    func initCell() {
+        accessibilityHint = nil
+        accessibilityLabel = nil
+        accessibilityValue = nil
+
+        imageVisualEffect.clipsToBounds = true
+        imageVisualEffect.alpha = 0.5
+
+        imageSelect.isHidden = true
+        imageSelect.image = NCImageCache.images.checkedYes
+
+        let longPressedGesture = UILongPressGestureRecognizer(target: self, action: #selector(longPress(gestureRecognizer:)))
+        longPressedGesture.minimumPressDuration = 0.5
+        longPressedGesture.delegate = self
+        longPressedGesture.delaysTouchesBegan = true
+        self.addGestureRecognizer(longPressedGesture)
+    }
+
+    override func snapshotView(afterScreenUpdates afterUpdates: Bool) -> UIView? {
+        return nil
+    }
+
+    @objc func longPress(gestureRecognizer: UILongPressGestureRecognizer) {
+        photoCellDelegate?.longPressGridItem(with: objectId, indexPath: indexPath, gestureRecognizer: gestureRecognizer)
+    }
+
+    func selected(_ status: Bool, isEditMode: Bool) {
+        if status {
+            imageSelect.isHidden = false
+            imageVisualEffect.isHidden = false
+        } else {
+            imageSelect.isHidden = true
+            imageVisualEffect.isHidden = true
+        }
+    }
+
+    func setAccessibility(label: String, value: String) {
+        accessibilityLabel = label
+        accessibilityValue = value
+    }
+
+    func setIconOutlines() {
+        if imageStatus.image != nil {
+            imageStatus.makeCircularBackground(withColor: .systemBackground)
+        } else {
+            imageStatus.backgroundColor = .clear
+        }
+    }
+}
+
+protocol NCPhotoCellDelegate: AnyObject {
+    func longPressGridItem(with objectId: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer)
+}
diff --git a/iOSClient/Main/Collection Common/Cell/NCPhotoCell.xib b/iOSClient/Main/Collection Common/Cell/NCPhotoCell.xib
new file mode 100644
index 0000000000..778d6e5e2f
--- /dev/null
+++ b/iOSClient/Main/Collection Common/Cell/NCPhotoCell.xib	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="dark"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="photoCell" id="vf1-Kf-9uL" customClass="NCPhotoCell" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="400" height="400"/>
+            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
+                <rect key="frame" x="0.0" y="0.0" width="400" height="400"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Ci-V1-hf5" userLabel="imageItem">
+                        <rect key="frame" x="0.0" y="0.0" width="400" height="400"/>
+                    </imageView>
+                    <visualEffectView hidden="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="bQY-LA-65a" userLabel="VisualEffect">
+                        <rect key="frame" x="0.0" y="0.0" width="400" height="400"/>
+                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="kdN-fK-b6F">
+                            <rect key="frame" x="0.0" y="0.0" width="400" height="400"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        </view>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <blurEffect style="extraLight"/>
+                    </visualEffectView>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="a0p-rj-jnV" userLabel="imageStatus">
+                        <rect key="frame" x="5" y="383" width="12" height="12"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="12" id="gq1-0a-eLC"/>
+                            <constraint firstAttribute="width" constant="12" id="uJE-4b-Qt7"/>
+                        </constraints>
+                    </imageView>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DHy-Up-3Bh" userLabel="imageSelect">
+                        <rect key="frame" x="5" y="5" width="15" height="15"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="15" id="SoZ-J3-98x"/>
+                            <constraint firstAttribute="width" constant="15" id="cZG-gx-gwt"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="254" horizontalCompressionResistancePriority="756" verticalCompressionResistancePriority="759" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AKw-Xc-akO" userLabel="labelTitle">
+                        <rect key="frame" x="10" y="382" width="380" height="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstItem="DHy-Up-3Bh" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="5" id="1T3-8p-uIW"/>
+                <constraint firstItem="AKw-Xc-akO" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="10" id="42P-uq-qMZ"/>
+                <constraint firstAttribute="trailing" secondItem="AKw-Xc-akO" secondAttribute="trailing" constant="10" id="78q-3N-aQm"/>
+                <constraint firstAttribute="bottom" secondItem="a0p-rj-jnV" secondAttribute="bottom" constant="5" id="9Qc-jT-y8N"/>
+                <constraint firstItem="bQY-LA-65a" firstAttribute="top" secondItem="vf1-Kf-9uL" secondAttribute="top" id="A1R-of-6Ra"/>
+                <constraint firstItem="DHy-Up-3Bh" firstAttribute="top" secondItem="vf1-Kf-9uL" secondAttribute="top" constant="5" id="ESV-qE-tbO"/>
+                <constraint firstAttribute="bottom" secondItem="bQY-LA-65a" secondAttribute="bottom" id="ET1-N7-SQl"/>
+                <constraint firstAttribute="bottom" secondItem="AKw-Xc-akO" secondAttribute="bottom" constant="2" id="JkG-ef-Hn5"/>
+                <constraint firstItem="5Ci-V1-hf5" firstAttribute="top" secondItem="vf1-Kf-9uL" secondAttribute="top" id="Ouj-ZD-UFm"/>
+                <constraint firstItem="bQY-LA-65a" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" id="Q47-7m-Z2O"/>
+                <constraint firstAttribute="trailing" secondItem="5Ci-V1-hf5" secondAttribute="trailing" id="cHT-cP-NN6"/>
+                <constraint firstAttribute="bottom" secondItem="5Ci-V1-hf5" secondAttribute="bottom" id="eEC-eB-alE"/>
+                <constraint firstAttribute="trailing" secondItem="bQY-LA-65a" secondAttribute="trailing" id="q1v-Cn-HZf"/>
+                <constraint firstItem="5Ci-V1-hf5" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" id="qT3-WD-iTV"/>
+                <constraint firstItem="a0p-rj-jnV" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="5" id="vjD-yv-602"/>
+            </constraints>
+            <size key="customSize" width="416" height="524"/>
+            <connections>
+                <outlet property="imageItem" destination="5Ci-V1-hf5" id="xky-Nw-NUb"/>
+                <outlet property="imageItemBottom" destination="eEC-eB-alE" id="FyV-lA-B3t"/>
+                <outlet property="imageSelect" destination="DHy-Up-3Bh" id="mo9-rP-P4I"/>
+                <outlet property="imageStatus" destination="a0p-rj-jnV" id="6Dg-tf-evd"/>
+                <outlet property="imageVisualEffect" destination="bQY-LA-65a" id="NMK-Ke-CSu"/>
+                <outlet property="labelTitle" destination="AKw-Xc-akO" id="f1O-Qv-Riz"/>
+            </connections>
+            <point key="canvasLocation" x="233.59999999999999" y="241.97901049475263"/>
+        </collectionViewCell>
+    </objects>
+</document>
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDataSource.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDataSource.swift
new file mode 100644
index 0000000000..cc4403d047
--- /dev/null
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDataSource.swift	
@@ -0,0 +1,528 @@
+//
+//  NCCollectionViewCommon+CollectionViewDataSource.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 02/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+import NextcloudKit
+
+extension NCCollectionViewCommon: UICollectionViewDataSource {
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return dataSource.numberOfSections()
+    }
+
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return dataSource.numberOfItemsInSection(section)
+    }
+
+    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        guard let metadata = dataSource.cellForItemAt(indexPath: indexPath),
+              let cell = (cell as? NCCellProtocol) else { return }
+        let existsIcon = utilityFileSystem.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)
+
+        func downloadAvatar(fileName: String, user: String, dispalyName: String?) {
+            if let image = NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) {
+                cell.fileAvatarImageView?.contentMode = .scaleAspectFill
+                cell.fileAvatarImageView?.image = image
+            } else {
+                NCNetworking.shared.downloadAvatar(user: user, dispalyName: dispalyName, fileName: fileName, cell: cell, view: collectionView)
+            }
+        }
+        /// CONTENT MODE
+        cell.filePreviewImageView?.layer.borderWidth = 0
+        if existsIcon {
+            cell.filePreviewImageView?.contentMode = .scaleAspectFill
+        } else {
+            cell.filePreviewImageView?.contentMode = .scaleAspectFit
+        }
+        cell.fileAvatarImageView?.contentMode = .center
+        /// THUMBNAIL
+        if !metadata.directory {
+            if metadata.hasPreviewBorder {
+                cell.filePreviewImageView?.layer.borderWidth = 0.2
+                cell.filePreviewImageView?.layer.borderColor = UIColor.lightGray.cgColor
+            }
+            if metadata.name == NCGlobal.shared.appName {
+                if layoutForView?.layout == NCGlobal.shared.layoutPhotoRatio || layoutForView?.layout == NCGlobal.shared.layoutPhotoSquare {
+                    if let image = NCImageCache.shared.getPreviewImageCache(ocId: metadata.ocId, etag: metadata.etag) {
+                        cell.filePreviewImageView?.image = image
+                    } else if let image = UIImage(contentsOfFile: self.utilityFileSystem.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)) {
+                        cell.filePreviewImageView?.image = image
+                        NCImageCache.shared.addPreviewImageCache(metadata: metadata, image: image)
+                    }
+                } else {
+                    if let image = NCImageCache.shared.getIconImageCache(ocId: metadata.ocId, etag: metadata.etag) {
+                        cell.filePreviewImageView?.image = image
+                    } else if metadata.hasPreview {
+                        cell.filePreviewImageView?.image = utility.getIcon(metadata: metadata)
+                    }
+                }
+                if cell.filePreviewImageView?.image == nil {
+                    if metadata.iconName.isEmpty {
+                        cell.filePreviewImageView?.image = NCImageCache.images.file
+                    } else {
+                        cell.filePreviewImageView?.image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true)
+                    }
+                    if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal && !existsIcon {
+                        for case let operation as NCCollectionViewDownloadThumbnail in NCNetworking.shared.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId { return }
+                        NCNetworking.shared.downloadThumbnailQueue.addOperation(NCCollectionViewDownloadThumbnail(metadata: metadata, cell: cell, collectionView: collectionView))
+                    }
+                }
+            } else {
+                /// APP NAME - UNIFIED SEARCH
+                switch metadata.iconName {
+                case let str where str.contains("contacts"):
+                    cell.filePreviewImageView?.image = NCImageCache.images.iconContacts
+                case let str where str.contains("conversation"):
+                    cell.filePreviewImageView?.image = NCImageCache.images.iconTalk
+                case let str where str.contains("calendar"):
+                    cell.filePreviewImageView?.image = NCImageCache.images.iconCalendar
+                case let str where str.contains("deck"):
+                    cell.filePreviewImageView?.image = NCImageCache.images.iconDeck
+                case let str where str.contains("mail"):
+                    cell.filePreviewImageView?.image = NCImageCache.images.iconMail
+                case let str where str.contains("talk"):
+                    cell.filePreviewImageView?.image = NCImageCache.images.iconTalk
+                case let str where str.contains("confirm"):
+                    cell.filePreviewImageView?.image = NCImageCache.images.iconConfirm
+                case let str where str.contains("pages"):
+                    cell.filePreviewImageView?.image = NCImageCache.images.iconPages
+                default:
+                    cell.filePreviewImageView?.image = NCImageCache.images.iconFile
+                }
+                if !metadata.iconUrl.isEmpty {
+                    if let ownerId = getAvatarFromIconUrl(metadata: metadata) {
+                        let fileName = metadata.userBaseUrl + "-" + ownerId + ".png"
+                        downloadAvatar(fileName: fileName, user: ownerId, dispalyName: nil)
+                    }
+                }
+            }
+        }
+        /// AVATAR
+        if !metadata.ownerId.isEmpty,
+           metadata.ownerId != appDelegate.userId,
+           appDelegate.account == metadata.account {
+            let fileName = metadata.userBaseUrl + "-" + metadata.ownerId + ".png"
+            downloadAvatar(fileName: fileName, user: metadata.ownerId, dispalyName: metadata.ownerDisplayName)
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        if !collectionView.indexPathsForVisibleItems.contains(indexPath) {
+            guard let metadata = dataSource.cellForItemAt(indexPath: indexPath) else { return }
+            for case let operation as NCCollectionViewDownloadThumbnail in NCNetworking.shared.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId {
+                operation.cancel()
+            }
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        var cell: NCCellProtocol & UICollectionViewCell
+        let permissions = NCPermissions()
+        var isShare = false
+        var isMounted = false
+        var a11yValues: [String] = []
+
+        // LAYOUT PHOTO
+        if layoutForView?.layout == NCGlobal.shared.layoutPhotoRatio || layoutForView?.layout == NCGlobal.shared.layoutPhotoSquare {
+            guard let photoCell = collectionView.dequeueReusableCell(withReuseIdentifier: "photoCell", for: indexPath) as? NCPhotoCell else { return NCPhotoCell() }
+            photoCell.photoCellDelegate = self
+            cell = photoCell
+        } else if layoutForView?.layout == NCGlobal.shared.layoutGrid {
+        // LAYOUT GRID
+            guard let gridCell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as? NCGridCell else { return NCGridCell() }
+            gridCell.gridCellDelegate = self
+            cell = gridCell
+        } else {
+        // LAYOUT LIST
+            guard let listCell = collectionView.dequeueReusableCell(withReuseIdentifier: "listCell", for: indexPath) as? NCListCell else { return NCListCell() }
+            listCell.listCellDelegate = self
+            cell = listCell
+        }
+        guard let metadata = dataSource.cellForItemAt(indexPath: indexPath) else { return cell }
+
+        defer {
+            if NCGlobal.shared.disableSharesView || !metadata.isSharable() {
+                cell.hideButtonShare(true)
+            }
+        }
+
+        if metadataFolder != nil {
+            isShare = metadata.permissions.contains(permissions.permissionShared) && !metadataFolder!.permissions.contains(permissions.permissionShared)
+            isMounted = metadata.permissions.contains(permissions.permissionMounted) && !metadataFolder!.permissions.contains(permissions.permissionMounted)
+        }
+
+        cell.fileStatusImage?.image = nil
+        cell.fileLocalImage?.image = nil
+        cell.fileFavoriteImage?.image = nil
+        cell.fileSharedImage?.image = nil
+        cell.fileMoreImage?.image = nil
+        cell.filePreviewImageView?.image = nil
+        cell.filePreviewImageView?.backgroundColor = nil
+        cell.fileObjectId = metadata.ocId
+        cell.indexPath = indexPath
+        cell.fileUser = metadata.ownerId
+        cell.fileProgressView?.isHidden = true
+        cell.fileProgressView?.progress = 0.0
+        cell.hideButtonShare(false)
+        cell.hideButtonMore(false)
+        cell.titleInfoTrailingDefault()
+
+        if isSearchingMode {
+            cell.fileTitleLabel?.text = metadata.fileName
+            cell.fileTitleLabel?.lineBreakMode = .byTruncatingTail
+            if metadata.name == NCGlobal.shared.appName {
+                cell.fileInfoLabel?.text = NSLocalizedString("_in_", comment: "") + " " + utilityFileSystem.getPath(path: metadata.path, user: metadata.user)
+            } else {
+                cell.fileInfoLabel?.text = metadata.subline
+            }
+            cell.fileSubinfoLabel?.isHidden = true
+        } else {
+            cell.fileSubinfoLabel?.isHidden = false
+            cell.fileTitleLabel?.text = metadata.fileNameView
+            cell.fileTitleLabel?.lineBreakMode = .byTruncatingMiddle
+            cell.writeInfoDateSize(date: metadata.date, size: metadata.size)
+        }
+
+        if metadata.status == NCGlobal.shared.metadataStatusDownloading || metadata.status == NCGlobal.shared.metadataStatusUploading {
+            cell.fileProgressView?.isHidden = false
+        }
+
+        // Accessibility [shared]
+        if metadata.ownerId != appDelegate.userId, appDelegate.account == metadata.account {
+            a11yValues.append(NSLocalizedString("_shared_with_you_by_", comment: "") + " " + metadata.ownerDisplayName)
+        }
+
+        if metadata.directory {
+            let tableDirectory = NCManageDatabase.shared.getTableDirectory(ocId: metadata.ocId)
+            if metadata.e2eEncrypted {
+                cell.filePreviewImageView?.image = NCImageCache.images.folderEncrypted
+            } else if isShare {
+                cell.filePreviewImageView?.image = NCImageCache.images.folderSharedWithMe
+            } else if !metadata.shareType.isEmpty {
+                metadata.shareType.contains(3) ?
+                (cell.filePreviewImageView?.image = NCImageCache.images.folderPublic) :
+                (cell.filePreviewImageView?.image = NCImageCache.images.folderSharedWithMe)
+            } else if !metadata.shareType.isEmpty && metadata.shareType.contains(3) {
+                cell.filePreviewImageView?.image = NCImageCache.images.folderPublic
+            } else if metadata.mountType == "group" {
+                cell.filePreviewImageView?.image = NCImageCache.images.folderGroup
+            } else if isMounted {
+                cell.filePreviewImageView?.image = NCImageCache.images.folderExternal
+            } else if metadata.fileName == autoUploadFileName && metadata.serverUrl == autoUploadDirectory {
+                cell.filePreviewImageView?.image = NCImageCache.images.folderAutomaticUpload
+            } else {
+                cell.filePreviewImageView?.image = NCImageCache.images.folder
+            }
+
+            // Local image: offline
+            if let tableDirectory, tableDirectory.offline {
+                cell.fileLocalImage?.image = NCImageCache.images.offlineFlag
+            }
+
+            // color folder
+            cell.filePreviewImageView?.image = cell.filePreviewImageView?.image?.colorizeFolder(metadata: metadata, tableDirectory: tableDirectory)
+        } else {
+            let tableLocalFile = NCManageDatabase.shared.getResultsTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))?.first
+            // image local
+            if let tableLocalFile, tableLocalFile.offline {
+                a11yValues.append(NSLocalizedString("_offline_", comment: ""))
+                cell.fileLocalImage?.image = NCImageCache.images.offlineFlag
+            } else if utilityFileSystem.fileProviderStorageExists(metadata) {
+                cell.fileLocalImage?.image = NCImageCache.images.local
+            }
+        }
+
+        // image Favorite
+        if metadata.favorite {
+            cell.fileFavoriteImage?.image = NCImageCache.images.favorite
+            a11yValues.append(NSLocalizedString("_favorite_short_", comment: ""))
+        }
+
+        // Share image
+        if isShare {
+            cell.fileSharedImage?.image = NCImageCache.images.shared
+        } else if !metadata.shareType.isEmpty {
+            metadata.shareType.contains(3) ?
+            (cell.fileSharedImage?.image = NCImageCache.images.shareByLink) :
+            (cell.fileSharedImage?.image = NCImageCache.images.shared)
+        } else {
+            cell.fileSharedImage?.image = NCImageCache.images.canShare
+        }
+        if appDelegate.account != metadata.account {
+            cell.fileSharedImage?.image = NCImageCache.images.shared
+        }
+
+        // Button More
+        if metadata.isInTransfer || metadata.isWaitingTransfer {
+            cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCImageCache.images.buttonStop)
+        } else if metadata.lock == true {
+            cell.setButtonMore(named: NCGlobal.shared.buttonMoreLock, image: NCImageCache.images.buttonMoreLock)
+            a11yValues.append(String(format: NSLocalizedString("_locked_by_", comment: ""), metadata.lockOwnerDisplayName))
+        } else {
+            cell.setButtonMore(named: NCGlobal.shared.buttonMoreMore, image: NCImageCache.images.buttonMore)
+        }
+
+        // Write status on Label Info
+        switch metadata.status {
+        case NCGlobal.shared.metadataStatusWaitDownload:
+            cell.fileInfoLabel?.text = utilityFileSystem.transformedSize(metadata.size)
+            cell.fileSubinfoLabel?.text = infoLabelsSeparator + NSLocalizedString("_status_wait_download_", comment: "")
+        case NCGlobal.shared.metadataStatusDownloading:
+            cell.fileInfoLabel?.text = utilityFileSystem.transformedSize(metadata.size)
+            cell.fileSubinfoLabel?.text = infoLabelsSeparator + "↓ …"
+        case NCGlobal.shared.metadataStatusWaitUpload:
+            cell.fileInfoLabel?.text = utilityFileSystem.transformedSize(metadata.size)
+            cell.fileSubinfoLabel?.text = infoLabelsSeparator + NSLocalizedString("_status_wait_upload_", comment: "")
+            cell.fileLocalImage?.image = nil
+        case NCGlobal.shared.metadataStatusUploading:
+            cell.fileInfoLabel?.text = utilityFileSystem.transformedSize(metadata.size)
+            cell.fileSubinfoLabel?.text = infoLabelsSeparator + "↑ …"
+            cell.fileLocalImage?.image = nil
+        case NCGlobal.shared.metadataStatusUploadError:
+            if metadata.sessionError.isEmpty {
+                cell.fileInfoLabel?.text = NSLocalizedString("_status_wait_upload_", comment: "")
+            } else {
+                cell.fileInfoLabel?.text = NSLocalizedString("_status_wait_upload_", comment: "") + " " + metadata.sessionError
+            }
+        default:
+            break
+        }
+
+        // Live Photo
+        if metadata.isLivePhoto {
+            cell.fileStatusImage?.image = NCImageCache.images.livePhoto
+            a11yValues.append(NSLocalizedString("_upload_mov_livephoto_", comment: ""))
+        }
+
+        // URL
+        if metadata.classFile == NKCommon.TypeClassFile.url.rawValue {
+            cell.fileLocalImage?.image = nil
+            cell.hideButtonShare(true)
+            cell.hideButtonMore(true)
+            if let ownerId = getAvatarFromIconUrl(metadata: metadata) {
+                cell.fileUser = ownerId
+            }
+        }
+
+        // Separator
+        if collectionView.numberOfItems(inSection: indexPath.section) == indexPath.row + 1 || isSearchingMode {
+            cell.cellSeparatorView?.isHidden = true
+        } else {
+            cell.cellSeparatorView?.isHidden = false
+        }
+
+        // Edit mode
+        if selectOcId.contains(metadata.ocId) {
+            cell.selected(true, isEditMode: isEditMode)
+            a11yValues.append(NSLocalizedString("_selected_", comment: ""))
+        } else {
+            cell.selected(false, isEditMode: isEditMode)
+        }
+
+        // Accessibility
+        cell.setAccessibility(label: metadata.fileNameView + ", " + (cell.fileInfoLabel?.text ?? "") + (cell.fileSubinfoLabel?.text ?? ""), value: a11yValues.joined(separator: ", "))
+
+        // Color string find in search
+        cell.fileTitleLabel?.textColor = NCBrandColor.shared.textColor
+        cell.fileTitleLabel?.font = .systemFont(ofSize: 15)
+
+        if isSearchingMode, let literalSearch = self.literalSearch, let title = cell.fileTitleLabel?.text {
+            let longestWordRange = (title.lowercased() as NSString).range(of: literalSearch)
+            let attributedString = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.font: UIFont.systemFont(ofSize: 15)])
+            attributedString.setAttributes([NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 15), NSAttributedString.Key.foregroundColor: UIColor.systemBlue], range: longestWordRange)
+            cell.fileTitleLabel?.attributedText = attributedString
+        }
+
+        // Layout photo
+        if layoutForView?.layout == NCGlobal.shared.layoutPhotoRatio || layoutForView?.layout == NCGlobal.shared.layoutPhotoSquare {
+            if metadata.directory {
+                cell.filePreviewImageBottom?.constant = 10
+                cell.fileTitleLabel?.text = metadata.fileNameView
+            } else {
+                cell.filePreviewImageBottom?.constant = 0
+                cell.fileTitleLabel?.text = ""
+            }
+        }
+
+        // TAGS
+        cell.setTags(tags: Array(metadata.tags))
+
+        // Hide buttons
+        if metadata.name != NCGlobal.shared.appName {
+            cell.titleInfoTrailingFull()
+            cell.hideButtonShare(true)
+            cell.hideButtonMore(true)
+        }
+
+        cell.setIconOutlines()
+        return cell
+    }
+
+    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+
+        if kind == UICollectionView.elementKindSectionHeader || kind == mediaSectionHeader {
+
+            if dataSource.getMetadataSourceForAllSections().isEmpty {
+
+                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFirstHeaderEmptyData", for: indexPath) as? NCSectionFirstHeaderEmptyData else { return NCSectionFirstHeaderEmptyData() }
+                self.sectionFirstHeaderEmptyData = header
+                header.delegate = self
+
+                if !isSearchingMode, headerMenuTransferView, let ocId = NCNetworking.shared.transferInForegorund?.ocId {
+                    let text = String(format: NSLocalizedString("_upload_foreground_msg_", comment: ""), NCBrandOptions.shared.brand)
+                    header.setViewTransfer(isHidden: false, ocId: ocId, text: text, progress: NCNetworking.shared.transferInForegorund?.progress)
+                } else {
+                    header.setViewTransfer(isHidden: true)
+                }
+
+                if isSearchingMode {
+                    header.emptyImage.image = utility.loadImage(named: "magnifyingglass", colors: [NCBrandColor.shared.brandElement])
+                    if self.dataSourceTask?.state == .running {
+                        header.emptyTitle.text = NSLocalizedString("_search_in_progress_", comment: "")
+                    } else {
+                        header.emptyTitle.text = NSLocalizedString("_search_no_record_found_", comment: "")
+                    }
+                    header.emptyDescription.text = NSLocalizedString("_search_instruction_", comment: "")
+                } else if self.dataSourceTask?.state == .running {
+                    header.emptyImage.image = utility.loadImage(named: "wifi", colors: [NCBrandColor.shared.brandElement])
+                    header.emptyTitle.text = NSLocalizedString("_request_in_progress_", comment: "")
+                    header.emptyDescription.text = ""
+                } else {
+                    if serverUrl.isEmpty {
+                        header.emptyImage.image = emptyImage
+                        header.emptyTitle.text = NSLocalizedString(emptyTitle, comment: "")
+                        header.emptyDescription.text = NSLocalizedString(emptyDescription, comment: "")
+                    } else {
+                        header.emptyImage.image = NCImageCache.images.folder
+                        header.emptyTitle.text = NSLocalizedString("_files_no_files_", comment: "")
+                        header.emptyDescription.text = NSLocalizedString("_no_file_pull_down_", comment: "")
+                    }
+                }
+
+                return header
+
+            } else if indexPath.section == 0 {
+
+                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFirstHeader", for: indexPath) as? NCSectionFirstHeader else { return NCSectionFirstHeader() }
+                let (_, heightHeaderRichWorkspace, heightHeaderSection) = getHeaderHeight(section: indexPath.section)
+                self.sectionFirstHeader = header
+                header.delegate = self
+
+                if !isSearchingMode, headerMenuTransferView, let ocId = NCNetworking.shared.transferInForegorund?.ocId {
+                    let text = String(format: NSLocalizedString("_upload_foreground_msg_", comment: ""), NCBrandOptions.shared.brand)
+                    header.setViewTransfer(isHidden: false, ocId: ocId, text: text, progress: NCNetworking.shared.transferInForegorund?.progress)
+                } else {
+                    header.setViewTransfer(isHidden: true)
+                }
+
+                header.setRichWorkspaceHeight(heightHeaderRichWorkspace)
+                header.setRichWorkspaceText(richWorkspaceText)
+
+                header.setSectionHeight(heightHeaderSection)
+                if heightHeaderSection == 0 {
+                    header.labelSection.text = ""
+                } else {
+                    header.labelSection.text = self.dataSource.getSectionValueLocalization(indexPath: indexPath)
+                }
+                header.labelSection.textColor = NCBrandColor.shared.textColor
+
+                return header
+
+            } else {
+
+                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeader", for: indexPath) as? NCSectionHeader else { return NCSectionHeader() }
+
+                header.labelSection.text = self.dataSource.getSectionValueLocalization(indexPath: indexPath)
+                header.labelSection.textColor = NCBrandColor.shared.textColor
+
+                return header
+            }
+
+        } else {
+
+            guard let footer = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFooter", for: indexPath) as? NCSectionFooter else { return NCSectionFooter() }
+            let sections = dataSource.numberOfSections()
+            let section = indexPath.section
+            let metadataForSection = self.dataSource.getMetadataForSection(indexPath.section)
+            let isPaginated = metadataForSection?.lastSearchResult?.isPaginated ?? false
+            let metadatasCount: Int = metadataForSection?.metadatas.count ?? 0
+            let unifiedSearchInProgress = metadataForSection?.unifiedSearchInProgress ?? false
+
+            footer.delegate = self
+            footer.metadataForSection = metadataForSection
+
+            footer.setTitleLabel("")
+            footer.setButtonText(NSLocalizedString("_show_more_results_", comment: ""))
+            footer.separatorIsHidden(true)
+            footer.buttonIsHidden(true)
+            footer.hideActivityIndicatorSection()
+
+            if isSearchingMode {
+                if sections > 1 && section != sections - 1 {
+                    footer.separatorIsHidden(false)
+                }
+
+                // If the number of entries(metadatas) is lower than the cursor, then there are no more entries.
+                // The blind spot in this is when the number of entries is the same as the cursor. If so, we don't have a way of knowing if there are no more entries.
+                // This is as good as it gets for determining last page without server-side flag.
+                let isLastPage = (metadatasCount < metadataForSection?.lastSearchResult?.cursor ?? 0) || metadataForSection?.lastSearchResult?.entries.isEmpty == true
+
+                if isSearchingMode && isPaginated && metadatasCount > 0 && !isLastPage {
+                    footer.buttonIsHidden(false)
+                }
+
+                if unifiedSearchInProgress {
+                    footer.showActivityIndicatorSection()
+                }
+            } else {
+                if sections == 1 || section == sections - 1 {
+                    let info = dataSource.getFooterInformationAllMetadatas()
+                    footer.setTitleLabel(directories: info.directories, files: info.files, size: info.size)
+                } else {
+                    footer.separatorIsHidden(false)
+                }
+            }
+
+            return footer
+        }
+    }
+
+    // MARK: -
+
+    func getAvatarFromIconUrl(metadata: tableMetadata) -> String? {
+        var ownerId: String?
+
+        if metadata.iconUrl.contains("http") && metadata.iconUrl.contains("avatar") {
+            let splitIconUrl = metadata.iconUrl.components(separatedBy: "/")
+            var found: Bool = false
+            for item in splitIconUrl {
+                if found {
+                    ownerId = item
+                    break
+                }
+                if item == "avatar" { found = true}
+            }
+        }
+        return ownerId
+    }
+}
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDelegate.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDelegate.swift
new file mode 100644
index 0000000000..b57e30a253
--- /dev/null
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDelegate.swift	
@@ -0,0 +1,115 @@
+//
+//  NCCollectionViewCommon+CollectionViewDelegate.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 02/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+import NextcloudKit
+
+extension NCCollectionViewCommon: UICollectionViewDelegate {
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        guard let metadata = dataSource.cellForItemAt(indexPath: indexPath), !metadata.isInvalidated else { return }
+
+        if isEditMode {
+            if let index = selectOcId.firstIndex(of: metadata.ocId) {
+                selectOcId.remove(at: index)
+            } else {
+                selectOcId.append(metadata.ocId)
+            }
+            collectionView.reloadItems(at: [indexPath])
+            tabBarSelect.update(selectOcId: selectOcId, metadatas: getSelectedMetadatas(), userId: appDelegate.userId)
+            return
+        }
+
+        if metadata.e2eEncrypted {
+            if NCGlobal.shared.capabilityE2EEEnabled {
+                if !NCKeychain().isEndToEndEnabled(account: appDelegate.account) {
+                    let e2ee = NCEndToEndInitialize()
+                    e2ee.delegate = self
+                    e2ee.initEndToEndEncryption(viewController: self.tabBarController, metadata: metadata)
+                    return
+                }
+            } else {
+                NCContentPresenter().showInfo(error: NKError(errorCode: NCGlobal.shared.errorE2EENotEnabled, errorDescription: "_e2e_server_disabled_"))
+                return
+            }
+        }
+
+        if metadata.directory {
+            pushMetadata(metadata)
+        } else {
+            let imageIcon = UIImage(contentsOfFile: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
+
+            if !metadata.isDirectoryE2EE && (metadata.isImage || metadata.isAudioOrVideo) {
+                var metadatas: [tableMetadata] = []
+                for metadata in dataSource.getMetadataSourceForAllSections() {
+                    if metadata.isImage || metadata.isAudioOrVideo {
+                        metadatas.append(metadata)
+                    }
+                }
+                NCViewer().view(viewController: self, metadata: metadata, metadatas: metadatas, imageIcon: imageIcon)
+                return
+            } else if metadata.isAvailableEditorView || utilityFileSystem.fileProviderStorageExists(metadata) {
+                NCViewer().view(viewController: self, metadata: metadata, metadatas: [metadata], imageIcon: imageIcon)
+            } else if NextcloudKit.shared.isNetworkReachable(),
+                      let metadata = NCManageDatabase.shared.setMetadatasSessionInWaitDownload(metadatas: [metadata],
+                                                                                               session: NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload,
+                                                                                               selector: NCGlobal.shared.selectorLoadFileView,
+                                                                                               sceneIdentifier: (self.tabBarController as? NCMainTabBarController)?.sceneIdentifier) {
+                NCNetworking.shared.download(metadata: metadata, withNotificationProgressTask: true)
+            } else {
+                let error = NKError(errorCode: NCGlobal.shared.errorOffline, errorDescription: "_go_online_")
+                NCContentPresenter().showInfo(error: error)
+            }
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
+        guard let metadata = dataSource.cellForItemAt(indexPath: indexPath) else { return nil }
+        if isEditMode || metadata.classFile == NKCommon.TypeClassFile.url.rawValue { return nil }
+        let identifier = indexPath as NSCopying
+        var image: UIImage?
+        let cell = collectionView.cellForItem(at: indexPath)
+
+        if cell is NCListCell {
+            image = (cell as? NCListCell)?.imageItem.image
+        } else if cell is NCGridCell {
+            image = (cell as? NCGridCell)?.imageItem.image
+        } else if cell is NCPhotoCell {
+            image = (cell as? NCPhotoCell)?.imageItem.image
+        }
+
+        return UIContextMenuConfiguration(identifier: identifier, previewProvider: {
+            return NCViewerProviderContextMenu(metadata: metadata, image: image)
+        }, actionProvider: { _ in
+            return NCContextMenu().viewMenu(ocId: metadata.ocId, viewController: self, image: image)
+        })
+    }
+
+    func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
+        animator.addCompletion {
+            if let indexPath = configuration.identifier as? IndexPath {
+                self.collectionView(collectionView, didSelectItemAt: indexPath)
+            }
+        }
+    }
+}
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift
new file mode 100644
index 0000000000..76258bdfc9
--- /dev/null
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift	
@@ -0,0 +1,35 @@
+//
+//  NCCollectionViewCommon+CollectionViewDelegateFlowLayout.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 19/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+
+extension NCCollectionViewCommon: UICollectionViewDelegateFlowLayout {
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
+        return sizeForHeaderInSection(section: section)
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForFooterInSection section: Int) -> CGSize {
+       return sizeForFooterInSection(section: section)
+    }
+}
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+DragDrop.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+DragDrop.swift
index 1f290adcc6..9b02c08b48 100644
--- a/iOSClient/Main/Collection Common/NCCollectionViewCommon+DragDrop.swift	
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon+DragDrop.swift	
@@ -29,28 +29,29 @@ import JGProgressHUD
 
 extension NCCollectionViewCommon: UICollectionViewDragDelegate {
     func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
-
         if isEditMode {
             return NCDragDrop().performDrag(selectOcId: selectOcId)
         } else if let metadata = dataSource.cellForItemAt(indexPath: indexPath) {
             return NCDragDrop().performDrag(metadata: metadata)
         }
-
         return []
     }
 
     func collectionView(_ collectionView: UICollectionView, dragPreviewParametersForItemAt indexPath: IndexPath) -> UIDragPreviewParameters? {
         let previewParameters = UIDragPreviewParameters()
 
-        if layoutForView?.layout == NCGlobal.shared.layoutList, let cell = collectionView.cellForItem(at: indexPath) as? NCListCell {
+        if layoutForView?.layout == NCGlobal.shared.layoutList,
+            let cell = collectionView.cellForItem(at: indexPath) as? NCListCell {
             let width = (collectionView.frame.width / 3) * 2
             previewParameters.visiblePath = UIBezierPath(roundedRect: CGRect(x: 0, y: 0, width: width, height: cell.frame.height), cornerRadius: 10)
             return previewParameters
         } else if let cell = collectionView.cellForItem(at: indexPath) as? NCGridCell {
             previewParameters.visiblePath = UIBezierPath(roundedRect: CGRect(x: 0, y: 0, width: cell.frame.width, height: cell.frame.height - 40), cornerRadius: 10)
             return previewParameters
+        } else if let cell = collectionView.cellForItem(at: indexPath) as? NCPhotoCell {
+            previewParameters.visiblePath = UIBezierPath(roundedRect: CGRect(x: 0, y: 0, width: cell.frame.width, height: cell.frame.height), cornerRadius: 10)
+            return previewParameters
         }
-
         return nil
     }
 }
@@ -64,6 +65,7 @@ extension NCCollectionViewCommon: UICollectionViewDropDelegate {
 
     func collectionView(_ collectionView: UICollectionView, dropSessionDidUpdate session: UIDropSession, withDestinationIndexPath destinationIndexPath: IndexPath?) -> UICollectionViewDropProposal {
         var destinationMetadata: tableMetadata?
+
         if let destinationIndexPath {
             destinationMetadata = dataSource.cellForItemAt(indexPath: destinationIndexPath)
         }
@@ -102,7 +104,6 @@ extension NCCollectionViewCommon: UICollectionViewDropDelegate {
                 }
             }
         }
-
         return UICollectionViewDropProposal(operation: .copy)
     }
 
@@ -138,20 +139,20 @@ extension NCCollectionViewCommon: UICollectionViewDropDelegate {
     @objc func copyMenuFile() {
         guard let sourceMetadatas = DragDropHover.shared.sourceMetadatas else { return }
         var serverUrl: String = self.serverUrl
+
         if let destinationMetadata = DragDropHover.shared.destinationMetadata, destinationMetadata.directory {
             serverUrl = destinationMetadata.serverUrl + "/" + destinationMetadata.fileName
         }
-
         NCDragDrop().copyFile(metadatas: sourceMetadatas, serverUrl: serverUrl)
     }
 
     @objc func moveMenuFile() {
         guard let sourceMetadatas = DragDropHover.shared.sourceMetadatas else { return }
         var serverUrl: String = self.serverUrl
+
         if let destinationMetadata = DragDropHover.shared.destinationMetadata, destinationMetadata.directory {
             serverUrl = destinationMetadata.serverUrl + "/" + destinationMetadata.fileName
         }
-
         NCDragDrop().moveFile(metadatas: sourceMetadatas, serverUrl: serverUrl)
     }
 }
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+EasyTipView.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+EasyTipView.swift
new file mode 100644
index 0000000000..562d2f40e5
--- /dev/null
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon+EasyTipView.swift	
@@ -0,0 +1,70 @@
+//
+//  NCCollectionViewCommon+EasyTipView.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 20/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+import EasyTipView
+
+extension NCCollectionViewCommon: EasyTipViewDelegate {
+    func showTip() {
+        guard !appDelegate.account.isEmpty,
+              self is NCFiles,
+              self.view.window != nil,
+              !NCBrandOptions.shared.disable_multiaccount,
+              self.serverUrl == utilityFileSystem.getHomeServer(urlBase: appDelegate.urlBase, userId: appDelegate.userId),
+              let view = self.navigationItem.leftBarButtonItem?.customView,
+              !NCManageDatabase.shared.tipExists(NCGlobal.shared.tipNCCollectionViewCommonAccountRequest) else { return }
+        var preferences = EasyTipView.Preferences()
+
+        preferences.drawing.foregroundColor = .white
+        preferences.drawing.backgroundColor = NCBrandColor.shared.nextcloud
+        preferences.drawing.textAlignment = .left
+        preferences.drawing.arrowPosition = .top
+        preferences.drawing.cornerRadius = 10
+
+        preferences.animating.dismissTransform = CGAffineTransform(translationX: 0, y: 100)
+        preferences.animating.showInitialTransform = CGAffineTransform(translationX: 0, y: -100)
+        preferences.animating.showInitialAlpha = 0
+        preferences.animating.showDuration = 1.5
+        preferences.animating.dismissDuration = 1.5
+
+        if appDelegate.tipView == nil {
+            appDelegate.tipView = EasyTipView(text: NSLocalizedString("_tip_accountrequest_", comment: ""), preferences: preferences, delegate: self)
+            appDelegate.tipView?.show(forView: view)
+        }
+    }
+
+    func easyTipViewDidTap(_ tipView: EasyTipView) {
+        NCManageDatabase.shared.addTip(NCGlobal.shared.tipNCCollectionViewCommonAccountRequest)
+    }
+
+    func easyTipViewDidDismiss(_ tipView: EasyTipView) { }
+
+    func dismissTip() {
+        if !NCManageDatabase.shared.tipExists(NCGlobal.shared.tipNCCollectionViewCommonAccountRequest) {
+            NCManageDatabase.shared.addTip(NCGlobal.shared.tipNCCollectionViewCommonAccountRequest)
+        }
+        appDelegate.tipView?.dismiss()
+        appDelegate.tipView = nil
+    }
+}
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+EndToEndInitialize.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+EndToEndInitialize.swift
new file mode 100644
index 0000000000..e75f66d102
--- /dev/null
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon+EndToEndInitialize.swift	
@@ -0,0 +1,33 @@
+//
+//  NCCollectionViewCommon+EndToEndInitialize.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 20/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+
+extension NCCollectionViewCommon: NCEndToEndInitializeDelegate {
+    func endToEndInitializeSuccess(metadata: tableMetadata?) {
+        if let metadata {
+            pushMetadata(metadata)
+        }
+    }
+}
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+MediaLayout.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+MediaLayout.swift
new file mode 100644
index 0000000000..2d8ba439c7
--- /dev/null
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon+MediaLayout.swift	
@@ -0,0 +1,78 @@
+//
+//  NCCollectionViewCommon+MediaLayout.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 13/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+import NextcloudKit
+
+extension NCCollectionViewCommon: NCMediaLayoutDelegate {
+    func getColumnCount() -> Int {
+        if let column = self.layoutForView?.columnPhoto, column > 0 {
+            return column
+        }
+        self.layoutForView?.columnPhoto = 3
+        return 3
+    }
+
+    func getLayout() -> String? {
+        return NCManageDatabase.shared.getLayoutForView(account: appDelegate.account, key: NCGlobal.shared.layoutViewFiles, serverUrl: serverUrl)?.layout
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForHeaderInSection section: Int) -> Float {
+        return Float(sizeForHeaderInSection(section: section).height)
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForFooterInSection section: Int) -> Float {
+        return Float(sizeForFooterInSection(section: section).height)
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForSection section: Int) -> UIEdgeInsets {
+        return .zero
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForHeaderInSection section: Int) -> UIEdgeInsets {
+        return .zero
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForFooterInSection section: Int) -> UIEdgeInsets {
+        return .zero
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, minimumInteritemSpacingForSection section: Int) -> Float {
+        return 1.0
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath, columnCount: Int, typeLayout: String) -> CGSize {
+        let size = CGSize(width: collectionView.frame.width / CGFloat(columnCount), height: collectionView.frame.width / CGFloat(columnCount))
+        if typeLayout == NCGlobal.shared.layoutPhotoRatio {
+            let metadata = self.dataSource.metadatas[indexPath.row]
+
+            if metadata.imageSize != CGSize.zero {
+                return metadata.imageSize
+            } else if let size = NCImageCache.shared.getPreviewSizeCache(ocId: metadata.ocId, etag: metadata.etag) {
+                return size
+            }
+        }
+        return size
+    }
+}
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+SelectTabBarDelegate.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+SelectTabBar.swift
similarity index 76%
rename from iOSClient/Main/Collection Common/NCCollectionViewCommon+SelectTabBarDelegate.swift
rename to iOSClient/Main/Collection Common/NCCollectionViewCommon+SelectTabBar.swift
index f948f61602..56fc6d6eed 100644
--- a/iOSClient/Main/Collection Common/NCCollectionViewCommon+SelectTabBarDelegate.swift	
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon+SelectTabBar.swift	
@@ -1,5 +1,5 @@
 //
-//  NCCollectionViewCommon+SelectTabBarDelegate.swift
+//  NCCollectionViewCommon+SelectTabBar.swift
 //  Nextcloud
 //
 //  Created by Milen on 01.03.24.
@@ -26,40 +26,6 @@ import Foundation
 import NextcloudKit
 
 extension NCCollectionViewCommon: NCCollectionViewCommonSelectTabBarDelegate {
-    func onListSelected() {
-        if layoutForView?.layout == NCGlobal.shared.layoutGrid {
-            layoutForView?.layout = NCGlobal.shared.layoutList
-            NCManageDatabase.shared.setLayoutForView(account: appDelegate.account, key: layoutKey, serverUrl: serverUrl, layout: layoutForView?.layout)
-            self.groupByField = "name"
-            if self.dataSource.groupByField != self.groupByField {
-                self.dataSource.changeGroupByField(self.groupByField)
-            }
-
-            self.collectionView.reloadData()
-            self.collectionView.collectionViewLayout.invalidateLayout()
-            self.collectionView.setCollectionViewLayout(self.listLayout, animated: true) {_ in self.isTransitioning = false }
-        }
-    }
-
-    func onGridSelected() {
-        if layoutForView?.layout == NCGlobal.shared.layoutList {
-            layoutForView?.layout = NCGlobal.shared.layoutGrid
-            NCManageDatabase.shared.setLayoutForView(account: appDelegate.account, key: layoutKey, serverUrl: serverUrl, layout: layoutForView?.layout)
-            if isSearchingMode {
-                self.groupByField = "name"
-            } else {
-                self.groupByField = "classFile"
-            }
-            if self.dataSource.groupByField != self.groupByField {
-                self.dataSource.changeGroupByField(self.groupByField)
-            }
-
-            self.collectionView.reloadData()
-            self.collectionView.collectionViewLayout.invalidateLayout()
-            self.collectionView.setCollectionViewLayout(self.gridLayout, animated: true) {_ in self.isTransitioning = false }
-        }
-    }
-
     func selectAll() {
         if !selectOcId.isEmpty, dataSource.getMetadataSourceForAllSections().count == selectOcId.count {
             selectOcId = []
@@ -79,7 +45,6 @@ extension NCCollectionViewCommon: NCCollectionViewCommonSelectTabBarDelegate {
 
         if canDeleteServer {
             let copyMetadatas = metadatas
-
             alertController.addAction(UIAlertAction(title: NSLocalizedString("_yes_", comment: ""), style: .destructive) { _ in
                 Task {
                     var error = NKError()
@@ -159,12 +124,6 @@ extension NCCollectionViewCommon: NCCollectionViewCommonSelectTabBarDelegate {
         setEditMode(false)
     }
 
-    func saveLayout(_ layoutForView: NCDBLayoutForView) {
-        NCManageDatabase.shared.setLayoutForView(layoutForView: layoutForView)
-        NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource)
-        setNavigationRightItems()
-    }
-
     func getSelectedMetadatas() -> [tableMetadata] {
         var selectedMetadatas: [tableMetadata] = []
         for ocId in selectOcId {
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift
index 340c157244..85dd37e79f 100644
--- a/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift	
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift	
@@ -23,18 +23,17 @@
 
 import UIKit
 import SwiftUI
-import Realm
+import RealmSwift
 import NextcloudKit
 import EasyTipView
 import JGProgressHUD
 
-class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UISearchResultsUpdating, UISearchControllerDelegate, UISearchBarDelegate, NCListCellDelegate, NCGridCellDelegate, NCSectionHeaderMenuDelegate, NCSectionFooterDelegate, NCSectionHeaderEmptyDataDelegate, NCAccountSettingsModelDelegate, UIAdaptivePresentationControllerDelegate, UIContextMenuInteractionDelegate {
+class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UISearchResultsUpdating, UISearchControllerDelegate, UISearchBarDelegate, NCListCellDelegate, NCGridCellDelegate, NCPhotoCellDelegate, NCSectionFirstHeaderDelegate, NCSectionFooterDelegate, NCSectionFirstHeaderEmptyDataDelegate, NCAccountSettingsModelDelegate, UIAdaptivePresentationControllerDelegate, UIContextMenuInteractionDelegate {
 
     @IBOutlet weak var collectionView: UICollectionView!
 
-    private var autoUploadFileName = ""
-    private var autoUploadDirectory = ""
-
+    var autoUploadFileName = ""
+    var autoUploadDirectory = ""
     var isTransitioning: Bool = false
     let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
     let utilityFileSystem = NCUtilityFileSystem()
@@ -48,21 +47,24 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     var metadataFolder: tableMetadata?
     var dataSource = NCDataSource()
     var richWorkspaceText: String?
-    var headerMenu: NCSectionHeaderMenu?
-    var headerEmptyData: NCSectionHeaderEmptyData?
+    var sectionFirstHeader: NCSectionFirstHeader?
+    var sectionFirstHeaderEmptyData: NCSectionFirstHeaderEmptyData?
     var isSearchingMode: Bool = false
     var layoutForView: NCDBLayoutForView?
     var dataSourceTask: URLSessionTask?
-    var groupByField = "name"
     var providers: [NKSearchProvider]?
     var searchResults: [NKSearchResult]?
-    var listLayout: NCListLayout!
-    var gridLayout: NCGridLayout!
+    var listLayout = NCListLayout()
+    var gridLayout = NCGridLayout()
+    var mediaLayout = NCMediaLayout()
     var literalSearch: String?
     var tabBarSelect: NCCollectionViewCommonSelectTabBar!
     var timerNotificationCenter: Timer?
     var notificationReloadDataSource: Int = 0
     var notificationReloadDataSourceNetwork: Int = 0
+    var attributesZoomIn: UIMenuElement.Attributes = []
+    var attributesZoomOut: UIMenuElement.Attributes = []
+    let maxImageGrid: CGFloat = 7
 
     // DECLARE
     var layoutKey = ""
@@ -77,11 +79,11 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     var emptyDataPortaitOffset: CGFloat = 0
     var emptyDataLandscapeOffset: CGFloat = -20
 
-    private var showDescription: Bool {
+    var showDescription: Bool {
         !headerRichWorkspaceDisable && NCKeychain().showDescription
     }
 
-    private var infoLabelsSeparator: String {
+    var infoLabelsSeparator: String {
         layoutForView?.layout == NCGlobal.shared.layoutList ? " - " : ""
     }
 
@@ -92,11 +94,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
         tabBarSelect = NCCollectionViewCommonSelectTabBar(controller: tabBarController as? NCMainTabBarController, delegate: self)
         self.navigationController?.presentationController?.delegate = self
-
-        // CollectionView & layout
         collectionView.alwaysBounceVertical = true
-        listLayout = NCListLayout()
-        gridLayout = NCGridLayout()
 
         // Color
         view.backgroundColor = .systemBackground
@@ -117,15 +115,20 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         // Cell
         collectionView.register(UINib(nibName: "NCListCell", bundle: nil), forCellWithReuseIdentifier: "listCell")
         collectionView.register(UINib(nibName: "NCGridCell", bundle: nil), forCellWithReuseIdentifier: "gridCell")
+        collectionView.register(UINib(nibName: "NCPhotoCell", bundle: nil), forCellWithReuseIdentifier: "photoCell")
         collectionView.register(UINib(nibName: "NCTransferCell", bundle: nil), forCellWithReuseIdentifier: "transferCell")
 
         // Header
-        collectionView.register(UINib(nibName: "NCSectionHeaderMenu", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionHeaderMenu")
+        collectionView.register(UINib(nibName: "NCSectionFirstHeader", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionFirstHeader")
+        collectionView.register(UINib(nibName: "NCSectionFirstHeader", bundle: nil), forSupplementaryViewOfKind: mediaSectionHeader, withReuseIdentifier: "sectionFirstHeader")
         collectionView.register(UINib(nibName: "NCSectionHeader", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionHeader")
-        collectionView.register(UINib(nibName: "NCSectionHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionHeaderEmptyData")
+        collectionView.register(UINib(nibName: "NCSectionHeader", bundle: nil), forSupplementaryViewOfKind: mediaSectionHeader, withReuseIdentifier: "sectionHeader")
+        collectionView.register(UINib(nibName: "NCSectionFirstHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionFirstHeaderEmptyData")
+        collectionView.register(UINib(nibName: "NCSectionFirstHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: mediaSectionHeader, withReuseIdentifier: "sectionFirstHeaderEmptyData")
 
         // Footer
         collectionView.register(UINib(nibName: "NCSectionFooter", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "sectionFooter")
+        collectionView.register(UINib(nibName: "NCSectionFooter", bundle: nil), forSupplementaryViewOfKind: mediaSectionFooter, withReuseIdentifier: "sectionFooter")
 
         // Refresh Control
         collectionView.refreshControl = refreshControl
@@ -166,11 +169,12 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         setNavigationRightItems()
 
         layoutForView = NCManageDatabase.shared.getLayoutForView(account: appDelegate.account, key: layoutKey, serverUrl: serverUrl)
-        gridLayout.itemForLine = CGFloat(layoutForView?.itemForLine ?? 3)
         if layoutForView?.layout == NCGlobal.shared.layoutList {
             collectionView?.collectionViewLayout = listLayout
-        } else {
+        } else if layoutForView?.layout == NCGlobal.shared.layoutGrid {
             collectionView?.collectionViewLayout = gridLayout
+        } else if layoutForView?.layout == NCGlobal.shared.layoutPhotoRatio || layoutForView?.layout == NCGlobal.shared.layoutPhotoSquare {
+            collectionView?.collectionViewLayout = mediaLayout
         }
 
         // FIXME: iPAD PDF landscape mode iOS 16
@@ -256,8 +260,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     }
 
     func presentationControllerDidDismiss( _ presentationController: UIPresentationController) {
-
         let viewController = presentationController.presentedViewController
+
         if viewController is NCViewerRichWorkspaceWebView {
             closeRichWorkspaceWebView()
         }
@@ -301,7 +305,6 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
             self.showTip()
         }
-
         guard let userInfo = notification.userInfo as NSDictionary?,
               let error = userInfo["error"] as? NKError,
               error.errorCode != NCGlobal.shared.errorNotModified else { return }
@@ -319,6 +322,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
     @objc func reloadDataSourceNetwork(_ notification: NSNotification) {
         var withQueryDB = false
+
         if let userInfo = notification.userInfo as NSDictionary?,
            let reload = userInfo["withQueryDB"] as? Bool {
             withQueryDB = reload
@@ -535,7 +539,6 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
               let totalBytesExpected = userInfo["totalBytesExpected"] as? Int64,
               let ocId = userInfo["ocId"] as? String
         else { return }
-
         let chunk: Int = userInfo["chunk"] as? Int ?? 0
         let e2eEncrypted: Bool = userInfo["e2eEncrypted"] as? Bool ?? false
 
@@ -547,8 +550,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                     NCNetworking.shared.transferInForegorund = NCNetworking.TransferInForegorund(ocId: ocId, progress: progressNumber.floatValue)
                     self.collectionView.reloadData()
                 }
-                self.headerMenu?.progressTransfer.progress = progressNumber.floatValue
-                self.headerEmptyData?.progressTransfer.progress = progressNumber.floatValue
+                self.sectionFirstHeader?.progressTransfer.progress = progressNumber.floatValue
+                self.sectionFirstHeaderEmptyData?.progressTransfer.progress = progressNumber.floatValue
             } else {
                 guard let indexPath = self.dataSource.getIndexPathMetadata(ocId: ocId).indexPath,
                       let cell = self.collectionView?.cellForItem(at: indexPath),
@@ -592,18 +595,16 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         let activeAccount = NCManageDatabase.shared.getActiveAccount()
         let image = utility.loadUserImage(for: appDelegate.user, displayName: activeAccount?.displayName, userBaseUrl: appDelegate)
         let accountButton = AccountSwitcherButton(type: .custom)
+        let accounts = NCManageDatabase.shared.getAllAccountOrderAlias()
 
         accountButton.setImage(image, for: .normal)
         accountButton.setImage(image, for: .highlighted)
         accountButton.semanticContentAttribute = .forceLeftToRight
         accountButton.sizeToFit()
 
-        let accounts = NCManageDatabase.shared.getAllAccountOrderAlias()
-
         if !accounts.isEmpty, !NCBrandOptions.shared.disable_multiaccount {
             let accountActions: [UIAction] = accounts.map { account in
                 let image = utility.loadUserImage(for: account.user, displayName: account.displayName, userBaseUrl: account)
-
                 var name: String = ""
                 var url: String = ""
 
@@ -616,13 +617,12 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
                 let action = UIAction(title: name, image: image, state: account.active ? .on : .off) { _ in
                     if !account.active {
-                        self.appDelegate.changeAccount(account.account, userProfile: nil)
+                        self.appDelegate.changeAccount(account.account, userProfile: nil) { }
                         self.setEditMode(false)
                     }
                 }
 
                 action.subtitle = url
-
                 return action
             }
 
@@ -666,22 +666,101 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
         func createMenuActions() -> [UIMenuElement] {
             guard let layoutForView = NCManageDatabase.shared.getLayoutForView(account: appDelegate.account, key: layoutKey, serverUrl: serverUrl) else { return [] }
+            let columnPhoto = self.layoutForView?.columnPhoto ?? 3
+
+            func saveLayout(_ layoutForView: NCDBLayoutForView) {
+                NCManageDatabase.shared.setLayoutForView(layoutForView: layoutForView)
+                NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource)
+                setNavigationRightItems()
+            }
+
+            if layoutForView.layout != NCGlobal.shared.layoutPhotoSquare && layoutForView.layout != NCGlobal.shared.layoutPhotoRatio {
+                self.attributesZoomIn = .disabled
+                self.attributesZoomOut = .disabled
+            } else if CGFloat(columnPhoto) >= maxImageGrid - 1 {
+                self.attributesZoomIn = []
+                self.attributesZoomOut = .disabled
+            } else if columnPhoto <= 1 {
+                self.attributesZoomIn = .disabled
+                self.attributesZoomOut = []
+            } else {
+                self.attributesZoomIn = []
+                self.attributesZoomOut = []
+            }
 
             let select = UIAction(title: NSLocalizedString("_select_", comment: ""), image: utility.loadImage(named: "checkmark.circle"), attributes: self.dataSource.getMetadataSourceForAllSections().isEmpty ? .disabled : []) { _ in
                 self.setEditMode(true)
             }
 
             let list = UIAction(title: NSLocalizedString("_list_", comment: ""), image: utility.loadImage(named: "list.bullet"), state: layoutForView.layout == NCGlobal.shared.layoutList ? .on : .off) { _ in
-                self.onListSelected()
+                layoutForView.layout = NCGlobal.shared.layoutList
+                self.layoutForView = NCManageDatabase.shared.setLayoutForView(layoutForView: layoutForView)
+
+                self.collectionView.reloadData()
+                self.collectionView.collectionViewLayout.invalidateLayout()
+                self.collectionView.setCollectionViewLayout(self.listLayout, animated: true) {_ in self.isTransitioning = false }
+
                 self.setNavigationRightItems()
             }
 
             let grid = UIAction(title: NSLocalizedString("_icons_", comment: ""), image: utility.loadImage(named: "square.grid.2x2"), state: layoutForView.layout == NCGlobal.shared.layoutGrid ? .on : .off) { _ in
-                self.onGridSelected()
+                layoutForView.layout = NCGlobal.shared.layoutGrid
+                self.layoutForView = NCManageDatabase.shared.setLayoutForView(layoutForView: layoutForView)
+
+                self.collectionView.reloadData()
+                self.collectionView.collectionViewLayout.invalidateLayout()
+                self.collectionView.setCollectionViewLayout(self.gridLayout, animated: true) {_ in self.isTransitioning = false }
+
                 self.setNavigationRightItems()
             }
 
-            let viewStyleSubmenu = UIMenu(title: "", options: .displayInline, children: [list, grid])
+            let menuPhoto = UIMenu(title: "", options: .displayInline, children: [
+                UIAction(title: NSLocalizedString("_media_square_", comment: ""), image: utility.loadImage(named: "square.grid.3x3"), state: layoutForView.layout == NCGlobal.shared.layoutPhotoSquare ? .on : .off) { _ in
+                    layoutForView.layout = NCGlobal.shared.layoutPhotoSquare
+                    self.layoutForView = NCManageDatabase.shared.setLayoutForView(layoutForView: layoutForView)
+
+                    self.collectionView.reloadData()
+                    self.collectionView.collectionViewLayout.invalidateLayout()
+                    self.collectionView.setCollectionViewLayout(self.mediaLayout, animated: true) {_ in self.isTransitioning = false }
+
+                    self.reloadDataSource()
+                    self.setNavigationRightItems()
+                },
+                UIAction(title: NSLocalizedString("_media_ratio_", comment: ""), image: utility.loadImage(named: "rectangle.grid.3x2"), state: layoutForView.layout == NCGlobal.shared.layoutPhotoRatio ? .on : .off) { _ in
+                    layoutForView.layout = NCGlobal.shared.layoutPhotoRatio
+                    self.layoutForView = NCManageDatabase.shared.setLayoutForView(layoutForView: layoutForView)
+
+                    self.collectionView.reloadData()
+                    self.collectionView.collectionViewLayout.invalidateLayout()
+                    self.collectionView.setCollectionViewLayout(self.mediaLayout, animated: true) {_ in self.isTransitioning = false }
+
+                    self.reloadDataSource()
+                    self.setNavigationRightItems()
+                }
+            ])
+
+            let menuZoom = UIMenu(title: "", options: .displayInline, children: [
+                UIAction(title: NSLocalizedString("_zoom_out_", comment: ""), image: utility.loadImage(named: "minus.magnifyingglass"), attributes: self.attributesZoomOut) { _ in
+                    UIView.animate(withDuration: 0.0, animations: {
+                        layoutForView.columnPhoto = columnPhoto + 1
+                        self.layoutForView = NCManageDatabase.shared.setLayoutForView(layoutForView: layoutForView)
+
+                        self.collectionView.reloadData()
+                        self.setNavigationRightItems()
+                    })
+                },
+                UIAction(title: NSLocalizedString("_zoom_in_", comment: ""), image: utility.loadImage(named: "plus.magnifyingglass"), attributes: self.attributesZoomIn) { _ in
+                    UIView.animate(withDuration: 0.0, animations: {
+                        layoutForView.columnPhoto = columnPhoto - 1
+                        self.layoutForView = NCManageDatabase.shared.setLayoutForView(layoutForView: layoutForView)
+
+                        self.collectionView.reloadData()
+                        self.setNavigationRightItems()
+                    })
+                }
+            ])
+
+            let viewStyleSubmenu = UIMenu(title: "", options: .displayInline, children: [list, grid, UIMenu(title: NSLocalizedString("_photo_", comment: ""), children: [menuPhoto, menuZoom])])
 
             let ascending = layoutForView.ascending
             let ascendingChevronImage = utility.loadImage(named: ascending ? "chevron.up" : "chevron.down")
@@ -694,7 +773,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                     layoutForView.ascending = !layoutForView.ascending
                 }
                 layoutForView.sort = "fileName"
-                self.saveLayout(layoutForView)
+                saveLayout(layoutForView)
             }
 
             let byNewest = UIAction(title: NSLocalizedString("_date_", comment: ""), image: isDate ? ascendingChevronImage : nil, state: isDate ? .on : .off) { _ in
@@ -702,7 +781,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                     layoutForView.ascending = !layoutForView.ascending
                 }
                 layoutForView.sort = "date"
-                self.saveLayout(layoutForView)
+                saveLayout(layoutForView)
             }
 
             let byLargest = UIAction(title: NSLocalizedString("_size_", comment: ""), image: isSize ? ascendingChevronImage : nil, state: isSize ? .on : .off) { _ in
@@ -710,14 +789,14 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                     layoutForView.ascending = !layoutForView.ascending
                 }
                 layoutForView.sort = "size"
-                self.saveLayout(layoutForView)
+                saveLayout(layoutForView)
             }
 
             let sortSubmenu = UIMenu(title: NSLocalizedString("_order_by_", comment: ""), options: .displayInline, children: [byName, byNewest, byLargest])
 
             let foldersOnTop = UIAction(title: NSLocalizedString("_directory_on_top_no_", comment: ""), image: utility.loadImage(named: "folder"), state: layoutForView.directoryOnTop ? .on : .off) { _ in
                 layoutForView.directoryOnTop = !layoutForView.directoryOnTop
-                self.saveLayout(layoutForView)
+                saveLayout(layoutForView)
             }
 
             let personalFilesOnly = NCKeychain().getPersonalFilesOnly(account: appDelegate.account)
@@ -833,6 +912,107 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
     // MARK: - TAP EVENT
 
+    // sessionIdentifierDownload: String = "com.nextcloud.nextcloudkit.session.download"
+    // sessionIdentifierUpload: String = "com.nextcloud.nextcloudkit.session.upload"
+
+    // sessionUploadBackground: String = "com.nextcloud.session.upload.background"
+    // sessionUploadBackgroundWWan: String = "com.nextcloud.session.upload.backgroundWWan"
+    // sessionUploadBackgroundExtension: String = "com.nextcloud.session.upload.extension"
+
+    func cancelSession(metadata: tableMetadata) async {
+        let fileNameLocalPath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
+
+        utilityFileSystem.removeFile(atPath: utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId))
+
+        // No session found
+        if metadata.session.isEmpty {
+            NCNetworking.shared.uploadRequest.removeValue(forKey: fileNameLocalPath)
+            NCNetworking.shared.downloadRequest.removeValue(forKey: fileNameLocalPath)
+            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
+            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource)
+            return
+        }
+
+        // DOWNLOAD FOREGROUND
+        if metadata.session == NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload {
+            if let request = NCNetworking.shared.downloadRequest[fileNameLocalPath] {
+                request.cancel()
+            } else if let metadata = NCManageDatabase.shared.getMetadataFromOcId(metadata.ocId) {
+                NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
+                                                           session: "",
+                                                           sessionError: "",
+                                                           selector: "",
+                                                           status: NCGlobal.shared.metadataStatusNormal)
+                NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterDownloadCancelFile),
+                                                object: nil,
+                                                userInfo: ["ocId": metadata.ocId,
+                                                           "serverUrl": metadata.serverUrl,
+                                                           "account": metadata.account])
+            }
+            return
+        }
+
+        // DOWNLOAD BACKGROUND
+        if metadata.session == NCNetworking.shared.sessionDownloadBackground {
+            let session: URLSession? = NCNetworking.shared.sessionManagerDownloadBackground
+            if let tasks = await session?.tasks {
+                for task in tasks.2 { // ([URLSessionDataTask], [URLSessionUploadTask], [URLSessionDownloadTask])
+                    if task.taskIdentifier == metadata.sessionTaskIdentifier {
+                        task.cancel()
+                    }
+                }
+            }
+            NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
+                                                       session: "",
+                                                       sessionError: "",
+                                                       selector: "",
+                                                       status: NCGlobal.shared.metadataStatusNormal)
+            NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterDownloadCancelFile),
+                                            object: nil,
+                                            userInfo: ["ocId": metadata.ocId,
+                                                       "serverUrl": metadata.serverUrl,
+                                                       "account": metadata.account])
+        }
+
+        // UPLOAD FOREGROUND
+        if metadata.session == NextcloudKit.shared.nkCommonInstance.sessionIdentifierUpload {
+            if let request = NCNetworking.shared.uploadRequest[fileNameLocalPath] {
+                request.cancel()
+                NCNetworking.shared.uploadRequest.removeValue(forKey: fileNameLocalPath)
+            }
+            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
+            NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterUploadCancelFile),
+                                            object: nil,
+                                            userInfo: ["ocId": metadata.ocId,
+                                                       "serverUrl": metadata.serverUrl,
+                                                       "account": metadata.account])
+            return
+        }
+
+        // UPLOAD BACKGROUND
+        var session: URLSession?
+        if metadata.session == NCNetworking.shared.sessionUploadBackground {
+            session = NCNetworking.shared.sessionManagerUploadBackground
+        } else if metadata.session == NCNetworking.shared.sessionUploadBackgroundWWan {
+            session = NCNetworking.shared.sessionManagerUploadBackgroundWWan
+        } else if metadata.session == NCNetworking.shared.sessionUploadBackgroundExtension {
+            session = NCNetworking.shared.sessionManagerUploadBackgroundExtension
+        }
+        if let tasks = await session?.tasks {
+            for task in tasks.1 { // ([URLSessionDataTask], [URLSessionUploadTask], [URLSessionDownloadTask])
+                if task.taskIdentifier == metadata.sessionTaskIdentifier {
+                    task.cancel()
+                }
+            }
+            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
+            NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterUploadCancelFile),
+                                            object: nil,
+                                            userInfo: ["ocId": metadata.ocId,
+                                                       "serverUrl": metadata.serverUrl,
+                                                       "account": metadata.account])
+        }
+    }
+
     func tapMoreListItem(with objectId: String, namedButtonMore: String, image: UIImage?, indexPath: IndexPath, sender: Any) {
         tapMoreGridItem(with: objectId, namedButtonMore: namedButtonMore, image: image, indexPath: indexPath, sender: sender)
     }
@@ -894,12 +1074,10 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     }
 
     @objc func longPressCollecationView(_ gestureRecognizer: UILongPressGestureRecognizer) {
-
         openMenuItems(with: nil, gestureRecognizer: gestureRecognizer)
     }
 
     func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configurationForMenuAtLocation location: CGPoint) -> UIContextMenuConfiguration? {
-
         return UIContextMenuConfiguration(identifier: nil, previewProvider: {
             return nil
         }, actionProvider: { _ in
@@ -908,7 +1086,6 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     }
 
     func openMenuItems(with objectId: String?, gestureRecognizer: UILongPressGestureRecognizer) {
-
         if gestureRecognizer.state != .began { return }
 
         var listMenuItems: [UIMenuItem] = []
@@ -957,17 +1134,9 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         // get auto upload folder
         autoUploadFileName = NCManageDatabase.shared.getAccountAutoUploadFileName()
         autoUploadDirectory = NCManageDatabase.shared.getAccountAutoUploadDirectory(urlBase: appDelegate.urlBase, userId: appDelegate.userId, account: appDelegate.account)
-
         // get layout for view
         layoutForView = NCManageDatabase.shared.getLayoutForView(account: appDelegate.account, key: layoutKey, serverUrl: serverUrl)
 
-        // set GroupField for Grid
-        if !isSearchingMode && layoutForView?.layout == NCGlobal.shared.layoutGrid {
-            groupByField = "classFile"
-        } else {
-            groupByField = "name"
-        }
-
         DispatchQueue.global(qos: .userInteractive).async {
             if withQueryDB { self.queryDB() }
             DispatchQueue.main.async {
@@ -999,15 +1168,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             } providers: { _, searchProviders in
                 self.providers = searchProviders
                 self.searchResults = []
-                self.dataSource = NCDataSource(
-                    metadatas: [],
-                    account: self.appDelegate.account,
-                    sort: self.layoutForView?.sort,
-                    ascending: self.layoutForView?.ascending,
-                    directoryOnTop: self.layoutForView?.directoryOnTop,
-                    favoriteOnTop: true,
-                    providers: self.providers,
-                    searchResults: self.searchResults)
+                self.dataSource = NCDataSource(metadatas: [], account: self.appDelegate.account, layoutForView: self.layoutForView, providers: self.providers, searchResults: self.searchResults)
             } update: { _, _, searchResult, metadatas in
                 guard let metadatas, !metadatas.isEmpty, self.isSearchingMode, let searchResult else { return }
                 NCNetworking.shared.unifiedSearchQueue.addOperation(NCCollectionViewUnifiedSearch(collectionViewCommon: self, metadatas: metadatas, searchResult: searchResult))
@@ -1025,22 +1186,12 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                     self.collectionView.reloadData()
                 }
                 guard let metadatas = metadatas, error == .success, self.isSearchingMode else { return }
-                self.dataSource = NCDataSource(
-                    metadatas: metadatas,
-                    account: self.appDelegate.account,
-                    sort: self.layoutForView?.sort,
-                    ascending: self.layoutForView?.ascending,
-                    directoryOnTop: self.layoutForView?.directoryOnTop,
-                    favoriteOnTop: true,
-                    groupByField: self.groupByField,
-                    providers: self.providers,
-                    searchResults: self.searchResults)
+                self.dataSource = NCDataSource(metadatas: metadatas, account: self.appDelegate.account, layoutForView: self.layoutForView, providers: self.providers, searchResults: self.searchResults)
             }
         }
     }
 
     func unifiedSearchMore(metadataForSection: NCMetadataForSection?) {
-
         guard let metadataForSection = metadataForSection, let lastSearchResult = metadataForSection.lastSearchResult, let cursor = lastSearchResult.cursor, let term = literalSearch else { return }
 
         metadataForSection.unifiedSearchInProgress = true
@@ -1083,623 +1234,34 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             }
         }
     }
-}
-
-// MARK: - E2EE
-
-extension NCCollectionViewCommon: NCEndToEndInitializeDelegate {
-
-    func endToEndInitializeSuccess(metadata: tableMetadata?) {
-        if let metadata {
-            pushMetadata(metadata)
-        }
-    }
-}
-
-// MARK: - Collection View
-
-extension NCCollectionViewCommon: UICollectionViewDelegate {
-
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        guard let metadata = dataSource.cellForItemAt(indexPath: indexPath) else { return }
-
-        if isEditMode {
-            if let index = selectOcId.firstIndex(of: metadata.ocId) {
-                selectOcId.remove(at: index)
-            } else {
-                selectOcId.append(metadata.ocId)
-            }
-            collectionView.reloadItems(at: [indexPath])
-            tabBarSelect.update(selectOcId: selectOcId, metadatas: getSelectedMetadatas(), userId: appDelegate.userId)
-            return
-        }
-
-        if metadata.e2eEncrypted {
-            if NCGlobal.shared.capabilityE2EEEnabled {
-                if !NCKeychain().isEndToEndEnabled(account: appDelegate.account) {
-                    let e2ee = NCEndToEndInitialize()
-                    e2ee.delegate = self
-                    e2ee.initEndToEndEncryption(viewController: self.tabBarController, metadata: metadata)
-                    return
-                }
-            } else {
-                NCContentPresenter().showInfo(error: NKError(errorCode: NCGlobal.shared.errorE2EENotEnabled, errorDescription: "_e2e_server_disabled_"))
-                return
-            }
-        }
-
-        if metadata.directory {
-
-            pushMetadata(metadata)
-
-        } else {
-
-            let imageIcon = UIImage(contentsOfFile: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
-
-            if !metadata.isDirectoryE2EE && (metadata.isImage || metadata.isAudioOrVideo) {
-                var metadatas: [tableMetadata] = []
-                for metadata in dataSource.getMetadataSourceForAllSections() {
-                    if metadata.isImage || metadata.isAudioOrVideo {
-                        metadatas.append(metadata)
-                    }
-                }
-                NCViewer().view(viewController: self, metadata: metadata, metadatas: metadatas, imageIcon: imageIcon)
-                return
-            }
-
-            if utilityFileSystem.fileProviderStorageExists(metadata) {
-                NCViewer().view(viewController: self, metadata: metadata, metadatas: [metadata], imageIcon: imageIcon)
-            } else if NextcloudKit.shared.isNetworkReachable(),
-                      let metadata = NCManageDatabase.shared.setMetadatasSessionInWaitDownload(metadatas: [metadata],
-                                                                                               session: NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload,
-                                                                                               selector: NCGlobal.shared.selectorLoadFileView,
-                                                                                               sceneIdentifier: (self.tabBarController as? NCMainTabBarController)?.sceneIdentifier) {
-                NCNetworking.shared.download(metadata: metadata, withNotificationProgressTask: true)
-            } else {
-                let error = NKError(errorCode: NCGlobal.shared.errorOffline, errorDescription: "_go_online_")
-                NCContentPresenter().showInfo(error: error)
-            }
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
-
-        guard let metadata = dataSource.cellForItemAt(indexPath: indexPath) else { return nil }
-        if isEditMode || metadata.classFile == NKCommon.TypeClassFile.url.rawValue { return nil }
-
-        let identifier = indexPath as NSCopying
-        var image: UIImage?
-        let cell = collectionView.cellForItem(at: indexPath)
-        if cell is NCListCell {
-            image = (cell as? NCListCell)?.imageItem.image
-        } else if cell is NCGridCell {
-            image = (cell as? NCGridCell)?.imageItem.image
-        }
-
-        return UIContextMenuConfiguration(identifier: identifier, previewProvider: {
-
-            return NCViewerProviderContextMenu(metadata: metadata, image: image)
-
-        }, actionProvider: { _ in
-
-            return NCContextMenu().viewMenu(ocId: metadata.ocId, viewController: self, image: image)
-        })
-    }
-
-    func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
-
-        animator.addCompletion {
-            if let indexPath = configuration.identifier as? IndexPath {
-                self.collectionView(collectionView, didSelectItemAt: indexPath)
-            }
-        }
-    }
-}
-
-extension NCCollectionViewCommon: UICollectionViewDataSource {
-
-    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        guard let metadata = dataSource.cellForItemAt(indexPath: indexPath),
-              let cell = (cell as? NCCellProtocol) else { return }
-        let existsIcon = utilityFileSystem.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)
-
-        func downloadAvatar(fileName: String, user: String, dispalyName: String?) {
-            if let image = NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) {
-                cell.fileAvatarImageView?.contentMode = .scaleAspectFill
-                cell.fileAvatarImageView?.image = image
-            } else {
-                NCNetworking.shared.downloadAvatar(user: user, dispalyName: dispalyName, fileName: fileName, cell: cell, view: collectionView)
-            }
-        }
-        /// CONTENT MODE
-        cell.filePreviewImageView?.layer.borderWidth = 0
-        if existsIcon {
-            cell.filePreviewImageView?.contentMode = .scaleAspectFill
-        } else {
-            cell.filePreviewImageView?.contentMode = .scaleAspectFit
-        }
-        cell.fileAvatarImageView?.contentMode = .center
-
-        /// THUMBNAIL
-        if !metadata.directory {
-            if metadata.hasPreviewBorder {
-                cell.filePreviewImageView?.layer.borderWidth = 0.2
-                cell.filePreviewImageView?.layer.borderColor = UIColor.lightGray.cgColor
-            }
-            if metadata.name == NCGlobal.shared.appName {
-                if let image = NCImageCache.shared.getIconImage(ocId: metadata.ocId, etag: metadata.etag) {
-                    cell.filePreviewImageView?.image = image
-                } else if let image = utility.createFilePreviewImage(ocId: metadata.ocId, etag: metadata.etag, fileNameView: metadata.fileNameView, classFile: metadata.classFile, status: metadata.status, createPreviewMedia: !metadata.hasPreview) {
-                    let fileNamePathIcon = utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)
-                    let fileSizeIcon = self.utilityFileSystem.getFileSize(filePath: fileNamePathIcon)
-                    if NCImageCache.shared.hasIconImageEnoughSize(fileSizeIcon) {
-                        NCImageCache.shared.setIconImage(ocId: metadata.ocId, etag: metadata.etag, image: image)
-                    }
-                    cell.filePreviewImageView?.image = image
-                } else {
-                    if metadata.iconName.isEmpty {
-                        cell.filePreviewImageView?.image = NCImageCache.images.file
-                    } else {
-                        cell.filePreviewImageView?.image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true)
-                    }
-                    if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal && !existsIcon {
-                        for case let operation as NCCollectionViewDownloadThumbnail in NCNetworking.shared.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId { return }
-                        NCNetworking.shared.downloadThumbnailQueue.addOperation(NCCollectionViewDownloadThumbnail(metadata: metadata, cell: cell, collectionView: collectionView))
-                    }
-                }
-            } else {
-                /// APP NAME - UNIFIED SEARCH
-                switch metadata.iconName {
-                case let str where str.contains("contacts"):
-                    cell.filePreviewImageView?.image = NCImageCache.images.iconContacts
-                case let str where str.contains("conversation"):
-                    cell.filePreviewImageView?.image = NCImageCache.images.iconTalk
-                case let str where str.contains("calendar"):
-                    cell.filePreviewImageView?.image = NCImageCache.images.iconCalendar
-                case let str where str.contains("deck"):
-                    cell.filePreviewImageView?.image = NCImageCache.images.iconDeck
-                case let str where str.contains("mail"):
-                    cell.filePreviewImageView?.image = NCImageCache.images.iconMail
-                case let str where str.contains("talk"):
-                    cell.filePreviewImageView?.image = NCImageCache.images.iconTalk
-                case let str where str.contains("confirm"):
-                    cell.filePreviewImageView?.image = NCImageCache.images.iconConfirm
-                case let str where str.contains("pages"):
-                    cell.filePreviewImageView?.image = NCImageCache.images.iconPages
-                default:
-                    cell.filePreviewImageView?.image = NCImageCache.images.iconFile
-                }
-                if !metadata.iconUrl.isEmpty {
-                    if let ownerId = getAvatarFromIconUrl(metadata: metadata) {
-                        let fileName = metadata.userBaseUrl + "-" + ownerId + ".png"
-                        downloadAvatar(fileName: fileName, user: ownerId, dispalyName: nil)
-                    }
-                }
-            }
-        }
-
-        /// AVATAR
-        if !metadata.ownerId.isEmpty,
-           metadata.ownerId != appDelegate.userId,
-           appDelegate.account == metadata.account {
-            let fileName = metadata.userBaseUrl + "-" + metadata.ownerId + ".png"
-            downloadAvatar(fileName: fileName, user: metadata.ownerId, dispalyName: metadata.ownerDisplayName)
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if !collectionView.indexPathsForVisibleItems.contains(indexPath) {
-            guard let metadata = dataSource.cellForItemAt(indexPath: indexPath) else { return }
-            for case let operation as NCCollectionViewDownloadThumbnail in NCNetworking.shared.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId {
-                operation.cancel()
-            }
-        }
-    }
-
-    func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return dataSource.numberOfSections()
-    }
-
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return dataSource.numberOfItemsInSection(section)
-    }
-
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        var cell: NCCellProtocol & UICollectionViewCell
-        let permissions = NCPermissions()
-
-        // LAYOUT LIST
-        if layoutForView?.layout == NCGlobal.shared.layoutList {
-            guard let listCell = collectionView.dequeueReusableCell(withReuseIdentifier: "listCell", for: indexPath) as? NCListCell else { return NCListCell() }
-            listCell.listCellDelegate = self
-            cell = listCell
-        } else {
-        // LAYOUT GRID
-            guard let gridCell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as? NCGridCell else { return NCGridCell() }
-            gridCell.gridCellDelegate = self
-            cell = gridCell
-        }
 
-        guard let metadata = dataSource.cellForItemAt(indexPath: indexPath) else { return cell }
-
-        defer {
-            if NCGlobal.shared.disableSharesView || !metadata.isSharable() {
-                cell.hideButtonShare(true)
-            }
-        }
-
-        var isShare = false
-        var isMounted = false
-        var a11yValues: [String] = []
-
-        if metadataFolder != nil {
-            isShare = metadata.permissions.contains(permissions.permissionShared) && !metadataFolder!.permissions.contains(permissions.permissionShared)
-            isMounted = metadata.permissions.contains(permissions.permissionMounted) && !metadataFolder!.permissions.contains(permissions.permissionMounted)
-        }
-
-        cell.fileSelectImage?.image = nil
-        cell.fileStatusImage?.image = nil
-        cell.fileLocalImage?.image = nil
-        cell.fileFavoriteImage?.image = nil
-        cell.fileSharedImage?.image = nil
-        cell.fileMoreImage?.image = nil
-        cell.filePreviewImageView?.image = nil
-        cell.filePreviewImageView?.backgroundColor = nil
-        cell.fileObjectId = metadata.ocId
-        cell.indexPath = indexPath
-        cell.fileUser = metadata.ownerId
-        cell.fileProgressView?.isHidden = true
-        cell.fileProgressView?.progress = 0.0
-        cell.hideButtonShare(false)
-        cell.hideButtonMore(false)
-        cell.titleInfoTrailingDefault()
-
-        if isSearchingMode {
-            cell.fileTitleLabel?.text = metadata.fileName
-            cell.fileTitleLabel?.lineBreakMode = .byTruncatingTail
-            if metadata.name == NCGlobal.shared.appName {
-                cell.fileInfoLabel?.text = NSLocalizedString("_in_", comment: "") + " " + utilityFileSystem.getPath(path: metadata.path, user: metadata.user)
-            } else {
-                cell.fileInfoLabel?.text = metadata.subline
-            }
-            cell.fileSubinfoLabel?.isHidden = true
-        } else {
-            cell.fileSubinfoLabel?.isHidden = false
-            cell.fileTitleLabel?.text = metadata.fileNameView
-            cell.fileTitleLabel?.lineBreakMode = .byTruncatingMiddle
-            cell.writeInfoDateSize(date: metadata.date, size: metadata.size)
-        }
-
-        if metadata.status == NCGlobal.shared.metadataStatusDownloading || metadata.status == NCGlobal.shared.metadataStatusUploading {
-            cell.fileProgressView?.isHidden = false
-        }
-
-        // Accessibility [shared]
-        if metadata.ownerId != appDelegate.userId, appDelegate.account == metadata.account {
-            a11yValues.append(NSLocalizedString("_shared_with_you_by_", comment: "") + " " + metadata.ownerDisplayName)
-        }
-
-        if metadata.directory {
-            let tableDirectory = NCManageDatabase.shared.getTableDirectory(ocId: metadata.ocId)
-            if metadata.e2eEncrypted {
-                cell.filePreviewImageView?.image = NCImageCache.images.folderEncrypted
-            } else if isShare {
-                cell.filePreviewImageView?.image = NCImageCache.images.folderSharedWithMe
-            } else if !metadata.shareType.isEmpty {
-                metadata.shareType.contains(3) ?
-                (cell.filePreviewImageView?.image = NCImageCache.images.folderPublic) :
-                (cell.filePreviewImageView?.image = NCImageCache.images.folderSharedWithMe)
-            } else if !metadata.shareType.isEmpty && metadata.shareType.contains(3) {
-                cell.filePreviewImageView?.image = NCImageCache.images.folderPublic
-            } else if metadata.mountType == "group" {
-                cell.filePreviewImageView?.image = NCImageCache.images.folderGroup
-            } else if isMounted {
-                cell.filePreviewImageView?.image = NCImageCache.images.folderExternal
-            } else if metadata.fileName == autoUploadFileName && metadata.serverUrl == autoUploadDirectory {
-                cell.filePreviewImageView?.image = NCImageCache.images.folderAutomaticUpload
-            } else {
-                cell.filePreviewImageView?.image = NCImageCache.images.folder
-            }
-
-            // Local image: offline
-            if let tableDirectory, tableDirectory.offline {
-                cell.fileLocalImage?.image = NCImageCache.images.offlineFlag
-            }
-
-            // color folder
-            cell.filePreviewImageView?.image = cell.filePreviewImageView?.image?.colorizeFolder(metadata: metadata, tableDirectory: tableDirectory)
-
-        } else {
-
-            let tableLocalFile = NCManageDatabase.shared.getResultsTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))?.first
-
-            // image local
-            if let tableLocalFile, tableLocalFile.offline {
-                a11yValues.append(NSLocalizedString("_offline_", comment: ""))
-                cell.fileLocalImage?.image = NCImageCache.images.offlineFlag
-            } else if utilityFileSystem.fileProviderStorageExists(metadata) {
-                cell.fileLocalImage?.image = NCImageCache.images.local
-            }
-        }
-
-        // image Favorite
-        if metadata.favorite {
-            cell.fileFavoriteImage?.image = NCImageCache.images.favorite
-            a11yValues.append(NSLocalizedString("_favorite_short_", comment: ""))
-        }
-
-        // Share image
-        if isShare {
-            cell.fileSharedImage?.image = NCImageCache.images.shared
-        } else if !metadata.shareType.isEmpty {
-            metadata.shareType.contains(3) ?
-            (cell.fileSharedImage?.image = NCImageCache.images.shareByLink) :
-            (cell.fileSharedImage?.image = NCImageCache.images.shared)
-        } else {
-            cell.fileSharedImage?.image = NCImageCache.images.canShare
-        }
-        if appDelegate.account != metadata.account {
-            cell.fileSharedImage?.image = NCImageCache.images.shared
-        }
-
-        // Button More
-        if metadata.isInTransfer || metadata.isWaitingTransfer {
-            cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCImageCache.images.buttonStop)
-        } else if metadata.lock == true {
-            cell.setButtonMore(named: NCGlobal.shared.buttonMoreLock, image: NCImageCache.images.buttonMoreLock)
-            a11yValues.append(String(format: NSLocalizedString("_locked_by_", comment: ""), metadata.lockOwnerDisplayName))
-        } else {
-            cell.setButtonMore(named: NCGlobal.shared.buttonMoreMore, image: NCImageCache.images.buttonMore)
-        }
-
-        // Write status on Label Info
-        switch metadata.status {
-        case NCGlobal.shared.metadataStatusWaitDownload:
-            cell.fileInfoLabel?.text = utilityFileSystem.transformedSize(metadata.size)
-            cell.fileSubinfoLabel?.text = infoLabelsSeparator + NSLocalizedString("_status_wait_download_", comment: "")
-        case NCGlobal.shared.metadataStatusDownloading:
-            cell.fileInfoLabel?.text = utilityFileSystem.transformedSize(metadata.size)
-            cell.fileSubinfoLabel?.text = infoLabelsSeparator + "↓ …"
-        case NCGlobal.shared.metadataStatusWaitUpload:
-            cell.fileInfoLabel?.text = utilityFileSystem.transformedSize(metadata.size)
-            cell.fileSubinfoLabel?.text = infoLabelsSeparator + NSLocalizedString("_status_wait_upload_", comment: "")
-            cell.fileLocalImage?.image = nil
-        case NCGlobal.shared.metadataStatusUploading:
-            cell.fileInfoLabel?.text = utilityFileSystem.transformedSize(metadata.size)
-            cell.fileSubinfoLabel?.text = infoLabelsSeparator + "↑ …"
-            cell.fileLocalImage?.image = nil
-        case NCGlobal.shared.metadataStatusUploadError:
-            if metadata.sessionError.isEmpty {
-                cell.fileInfoLabel?.text = NSLocalizedString("_status_wait_upload_", comment: "")
-            } else {
-                cell.fileInfoLabel?.text = NSLocalizedString("_status_wait_upload_", comment: "") + " " + metadata.sessionError
-            }
-        default:
-            break
-        }
-
-        // Live Photo
-        if metadata.isLivePhoto {
-            cell.fileStatusImage?.image = NCImageCache.images.livePhoto
-            a11yValues.append(NSLocalizedString("_upload_mov_livephoto_", comment: ""))
-        }
-
-        // URL
-        if metadata.classFile == NKCommon.TypeClassFile.url.rawValue {
-            cell.fileLocalImage?.image = nil
-            cell.hideButtonShare(true)
-            cell.hideButtonMore(true)
-            if let ownerId = getAvatarFromIconUrl(metadata: metadata) {
-                cell.fileUser = ownerId
-            }
-        }
-
-        // Separator
-        if collectionView.numberOfItems(inSection: indexPath.section) == indexPath.row + 1 || isSearchingMode {
-            cell.cellSeparatorView?.isHidden = true
-        } else {
-            cell.cellSeparatorView?.isHidden = false
-        }
-
-        // Edit mode
-        if isEditMode {
-            cell.selectMode(true)
-            if selectOcId.contains(metadata.ocId) {
-                cell.selected(true)
-                a11yValues.append(NSLocalizedString("_selected_", comment: ""))
-            } else {
-                cell.selected(false)
-            }
-        } else {
-            cell.selectMode(false)
-        }
-
-        // Accessibility
-        cell.setAccessibility(label: metadata.fileNameView + ", " + (cell.fileInfoLabel?.text ?? "") + (cell.fileSubinfoLabel?.text ?? ""), value: a11yValues.joined(separator: ", "))
-
-        // Color string find in search
-
-        cell.fileTitleLabel?.textColor = NCBrandColor.shared.textColor
-        cell.fileTitleLabel?.font = .systemFont(ofSize: 15)
-
-        if isSearchingMode, let literalSearch = self.literalSearch, let title = cell.fileTitleLabel?.text {
-            let longestWordRange = (title.lowercased() as NSString).range(of: literalSearch)
-            let attributedString = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.font: UIFont.systemFont(ofSize: 15)])
-            attributedString.setAttributes([NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 15), NSAttributedString.Key.foregroundColor: UIColor.systemBlue], range: longestWordRange)
-            cell.fileTitleLabel?.attributedText = attributedString
-        }
-
-        // Add TAGS
-        cell.setTags(tags: Array(metadata.tags))
-
-        // Hide buttons
-        if metadata.name != NCGlobal.shared.appName {
-            cell.titleInfoTrailingFull()
-            cell.hideButtonShare(true)
-            cell.hideButtonMore(true)
-        }
-
-        cell.setIconOutlines()
-
-        return cell
-    }
-
-    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
-
-        if kind == UICollectionView.elementKindSectionHeader {
-
-            if dataSource.getMetadataSourceForAllSections().isEmpty {
-
-                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeaderEmptyData", for: indexPath) as? NCSectionHeaderEmptyData else { return NCSectionHeaderEmptyData() }
-                self.headerEmptyData = header
-                header.delegate = self
-
-                if !isSearchingMode, headerMenuTransferView, let ocId = NCNetworking.shared.transferInForegorund?.ocId {
-                    let text = String(format: NSLocalizedString("_upload_foreground_msg_", comment: ""), NCBrandOptions.shared.brand)
-                    header.setViewTransfer(isHidden: false, ocId: ocId, text: text, progress: NCNetworking.shared.transferInForegorund?.progress)
-                } else {
-                    header.setViewTransfer(isHidden: true)
-                }
-
-                if isSearchingMode {
-                    header.emptyImage.image = utility.loadImage(named: "magnifyingglass", colors: [NCBrandColor.shared.brandElement])
-                    if self.dataSourceTask?.state == .running {
-                        header.emptyTitle.text = NSLocalizedString("_search_in_progress_", comment: "")
-                    } else {
-                        header.emptyTitle.text = NSLocalizedString("_search_no_record_found_", comment: "")
-                    }
-                    header.emptyDescription.text = NSLocalizedString("_search_instruction_", comment: "")
-                } else if self.dataSourceTask?.state == .running {
-                    header.emptyImage.image = utility.loadImage(named: "wifi", colors: [NCBrandColor.shared.brandElement])
-                    header.emptyTitle.text = NSLocalizedString("_request_in_progress_", comment: "")
-                    header.emptyDescription.text = ""
-                } else {
-                    if serverUrl.isEmpty {
-                        header.emptyImage.image = emptyImage
-                        header.emptyTitle.text = NSLocalizedString(emptyTitle, comment: "")
-                        header.emptyDescription.text = NSLocalizedString(emptyDescription, comment: "")
-                    } else {
-                        header.emptyImage.image = NCImageCache.images.folder
-                        header.emptyTitle.text = NSLocalizedString("_files_no_files_", comment: "")
-                        header.emptyDescription.text = NSLocalizedString("_no_file_pull_down_", comment: "")
-                    }
-                }
-
-                return header
-
-            } else if indexPath.section == 0 {
-
-                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeaderMenu", for: indexPath) as? NCSectionHeaderMenu else { return NCSectionHeaderMenu() }
-                let (_, heightHeaderRichWorkspace, heightHeaderSection) = getHeaderHeight(section: indexPath.section)
-                self.headerMenu = header
-                header.delegate = self
-
-                if !isSearchingMode, headerMenuTransferView, let ocId = NCNetworking.shared.transferInForegorund?.ocId {
-                    let text = String(format: NSLocalizedString("_upload_foreground_msg_", comment: ""), NCBrandOptions.shared.brand)
-                    header.setViewTransfer(isHidden: false, ocId: ocId, text: text, progress: NCNetworking.shared.transferInForegorund?.progress)
-                } else {
-                    header.setViewTransfer(isHidden: true)
-                }
-
-                header.setRichWorkspaceHeight(heightHeaderRichWorkspace)
-                header.setRichWorkspaceText(richWorkspaceText)
-
-                header.setSectionHeight(heightHeaderSection)
-                if heightHeaderSection == 0 {
-                    header.labelSection.text = ""
-                } else {
-                    header.labelSection.text = self.dataSource.getSectionValueLocalization(indexPath: indexPath)
-                }
-                header.labelSection.textColor = NCBrandColor.shared.textColor
-
-                return header
-
-            } else {
-
-                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeader", for: indexPath) as? NCSectionHeader else { return NCSectionHeader() }
-
-                header.labelSection.text = self.dataSource.getSectionValueLocalization(indexPath: indexPath)
-                header.labelSection.textColor = NCBrandColor.shared.textColor
-
-                return header
-            }
-
-        } else {
-
-            guard let footer = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFooter", for: indexPath) as? NCSectionFooter else { return NCSectionFooter() }
-            let sections = dataSource.numberOfSections()
-            let section = indexPath.section
-            let metadataForSection = self.dataSource.getMetadataForSection(indexPath.section)
-            let isPaginated = metadataForSection?.lastSearchResult?.isPaginated ?? false
-            let metadatasCount: Int = metadataForSection?.metadatas.count ?? 0
-            let unifiedSearchInProgress = metadataForSection?.unifiedSearchInProgress ?? false
-
-            footer.delegate = self
-            footer.metadataForSection = metadataForSection
-
-            footer.setTitleLabel("")
-            footer.setButtonText(NSLocalizedString("_show_more_results_", comment: ""))
-            footer.separatorIsHidden(true)
-            footer.buttonIsHidden(true)
-            footer.hideActivityIndicatorSection()
-
-            if isSearchingMode {
-                if sections > 1 && section != sections - 1 {
-                    footer.separatorIsHidden(false)
-                }
-
-                // If the number of entries(metadatas) is lower than the cursor, then there are no more entries.
-                // The blind spot in this is when the number of entries is the same as the cursor. If so, we don't have a way of knowing if there are no more entries.
-                // This is as good as it gets for determining last page without server-side flag.
-                let isLastPage = (metadatasCount < metadataForSection?.lastSearchResult?.cursor ?? 0) || metadataForSection?.lastSearchResult?.entries.isEmpty == true
-
-                if isSearchingMode && isPaginated && metadatasCount > 0 && !isLastPage {
-                    footer.buttonIsHidden(false)
-                }
-
-                if unifiedSearchInProgress {
-                    footer.showActivityIndicatorSection()
-                }
-            } else {
-                if sections == 1 || section == sections - 1 {
-                    let info = dataSource.getFooterInformationAllMetadatas()
-                    footer.setTitleLabel(directories: info.directories, files: info.files, size: info.size)
-                } else {
-                    footer.separatorIsHidden(false)
-                }
-            }
-
-            return footer
-        }
-    }
-}
-
-extension NCCollectionViewCommon: UICollectionViewDelegateFlowLayout {
+    // MARK: - Header size
 
     func isHeaderMenuTransferViewEnabled() -> Bool {
-        if headerMenuTransferView, let metadata = NCManageDatabase.shared.getMetadataFromOcId(NCNetworking.shared.transferInForegorund?.ocId), metadata.isTransferInForeground {
+        if headerMenuTransferView,
+           let metadata = NCManageDatabase.shared.getMetadataFromOcId(NCNetworking.shared.transferInForegorund?.ocId),
+           metadata.isTransferInForeground {
             return true
         }
         return false
     }
 
-    func getHeaderHeight() -> CGFloat {
-        var size: CGFloat = 0
+    func getHeaderHeight(section: Int) -> (heightHeaderCommands: CGFloat, heightHeaderRichWorkspace: CGFloat, heightHeaderSection: CGFloat) {
+        var headerRichWorkspace: CGFloat = 0
 
-        if isHeaderMenuTransferViewEnabled() {
-            if !isSearchingMode {
-                size += NCGlobal.shared.heightHeaderTransfer
+        func getHeaderHeight() -> CGFloat {
+            var size: CGFloat = 0
+
+            if isHeaderMenuTransferViewEnabled() {
+                if !isSearchingMode {
+                    size += NCGlobal.shared.heightHeaderTransfer
+                }
+            } else {
+                NCNetworking.shared.transferInForegorund = nil
             }
-        } else {
-            NCNetworking.shared.transferInForegorund = nil
+            return size
         }
 
-        return size
-    }
-
-    func getHeaderHeight(section: Int) -> (heightHeaderCommands: CGFloat, heightHeaderRichWorkspace: CGFloat, heightHeaderSection: CGFloat) {
-        var headerRichWorkspace: CGFloat = 0
-
         if let richWorkspaceText = richWorkspaceText, showDescription {
             let trimmed = richWorkspaceText.trimmingCharacters(in: .whitespaces)
             if !trimmed.isEmpty && !isSearchingMode {
@@ -1707,7 +1269,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegateFlowLayout {
             }
         }
 
-        if isSearchingMode || layoutForView?.layout == NCGlobal.shared.layoutGrid || dataSource.numberOfSections() > 1 {
+        if isSearchingMode || layoutForView?.groupBy != "none" || dataSource.numberOfSections() > 1 {
             if section == 0 {
                 return (getHeaderHeight(), headerRichWorkspace, NCGlobal.shared.heightSection)
             } else {
@@ -1718,8 +1280,9 @@ extension NCCollectionViewCommon: UICollectionViewDelegateFlowLayout {
         }
     }
 
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
+    func sizeForHeaderInSection(section: Int) -> CGSize {
         var height: CGFloat = 0
+
         if isEditMode {
             return CGSize.zero
         } else if dataSource.getMetadataSourceForAllSections().isEmpty {
@@ -1731,7 +1294,9 @@ extension NCCollectionViewCommon: UICollectionViewDelegateFlowLayout {
         return CGSize(width: collectionView.frame.width, height: height)
     }
 
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForFooterInSection section: Int) -> CGSize {
+    // MARK: - Footer size
+
+    func sizeForFooterInSection(section: Int) -> CGSize {
         let sections = dataSource.numberOfSections()
         let metadataForSection = self.dataSource.getMetadataForSection(section)
         let isPaginated = metadataForSection?.lastSearchResult?.isPaginated ?? false
@@ -1747,176 +1312,10 @@ extension NCCollectionViewCommon: UICollectionViewDelegateFlowLayout {
         if isSearchingMode && isPaginated && metadatasCount > 0 {
             size.height += NCGlobal.shared.heightFooterButton
         }
-
         return size
     }
 }
 
-extension NCCollectionViewCommon: EasyTipViewDelegate {
-    func showTip() {
-        guard !appDelegate.account.isEmpty,
-              self is NCFiles,
-              self.view.window != nil,
-              !NCBrandOptions.shared.disable_multiaccount,
-              self.serverUrl == utilityFileSystem.getHomeServer(urlBase: appDelegate.urlBase, userId: appDelegate.userId),
-              let view = self.navigationItem.leftBarButtonItem?.customView,
-              !NCManageDatabase.shared.tipExists(NCGlobal.shared.tipNCCollectionViewCommonAccountRequest) else { return }
-
-        var preferences = EasyTipView.Preferences()
-        preferences.drawing.foregroundColor = .white
-        preferences.drawing.backgroundColor = NCBrandColor.shared.nextcloud
-        preferences.drawing.textAlignment = .left
-        preferences.drawing.arrowPosition = .top
-        preferences.drawing.cornerRadius = 10
-
-        preferences.animating.dismissTransform = CGAffineTransform(translationX: 0, y: 100)
-        preferences.animating.showInitialTransform = CGAffineTransform(translationX: 0, y: -100)
-        preferences.animating.showInitialAlpha = 0
-        preferences.animating.showDuration = 1.5
-        preferences.animating.dismissDuration = 1.5
-
-        if appDelegate.tipView == nil {
-            appDelegate.tipView = EasyTipView(text: NSLocalizedString("_tip_accountrequest_", comment: ""), preferences: preferences, delegate: self)
-            appDelegate.tipView?.show(forView: view)
-        }
-    }
-
-    func easyTipViewDidTap(_ tipView: EasyTipView) {
-        NCManageDatabase.shared.addTip(NCGlobal.shared.tipNCCollectionViewCommonAccountRequest)
-    }
-
-    func easyTipViewDidDismiss(_ tipView: EasyTipView) { }
-
-    func dismissTip() {
-        if !NCManageDatabase.shared.tipExists(NCGlobal.shared.tipNCCollectionViewCommonAccountRequest) {
-            NCManageDatabase.shared.addTip(NCGlobal.shared.tipNCCollectionViewCommonAccountRequest)
-        }
-        appDelegate.tipView?.dismiss()
-        appDelegate.tipView = nil
-    }
-}
-
-extension NCCollectionViewCommon {
-
-    func getAvatarFromIconUrl(metadata: tableMetadata) -> String? {
-
-        var ownerId: String?
-        if metadata.iconUrl.contains("http") && metadata.iconUrl.contains("avatar") {
-            let splitIconUrl = metadata.iconUrl.components(separatedBy: "/")
-            var found: Bool = false
-            for item in splitIconUrl {
-                if found {
-                    ownerId = item
-                    break
-                }
-                if item == "avatar" { found = true}
-            }
-        }
-        return ownerId
-    }
-
-    // MARK: - Cancel (Download Upload)
-
-    // sessionIdentifierDownload: String = "com.nextcloud.nextcloudkit.session.download"
-    // sessionIdentifierUpload: String = "com.nextcloud.nextcloudkit.session.upload"
-
-    // sessionUploadBackground: String = "com.nextcloud.session.upload.background"
-    // sessionUploadBackgroundWWan: String = "com.nextcloud.session.upload.backgroundWWan"
-    // sessionUploadBackgroundExtension: String = "com.nextcloud.session.upload.extension"
-
-    func cancelSession(metadata: tableMetadata) async {
-
-        let fileNameLocalPath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
-        utilityFileSystem.removeFile(atPath: utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId))
-
-        // No session found
-        if metadata.session.isEmpty {
-            NCNetworking.shared.uploadRequest.removeValue(forKey: fileNameLocalPath)
-            NCNetworking.shared.downloadRequest.removeValue(forKey: fileNameLocalPath)
-            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
-            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource)
-            return
-        }
-
-        // DOWNLOAD FOREGROUND
-        if metadata.session == NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload {
-            if let request = NCNetworking.shared.downloadRequest[fileNameLocalPath] {
-                request.cancel()
-            } else if let metadata = NCManageDatabase.shared.getMetadataFromOcId(metadata.ocId) {
-                NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
-                                                           session: "",
-                                                           sessionError: "",
-                                                           selector: "",
-                                                           status: NCGlobal.shared.metadataStatusNormal)
-                NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterDownloadCancelFile),
-                                                object: nil,
-                                                userInfo: ["ocId": metadata.ocId,
-                                                           "serverUrl": metadata.serverUrl,
-                                                           "account": metadata.account])
-            }
-            return
-        }
-
-        // DOWNLOAD BACKGROUND
-        if metadata.session == NCNetworking.shared.sessionDownloadBackground {
-            let session: URLSession? = NCNetworking.shared.sessionManagerDownloadBackground
-            if let tasks = await session?.tasks {
-                for task in tasks.2 { // ([URLSessionDataTask], [URLSessionUploadTask], [URLSessionDownloadTask])
-                    if task.taskIdentifier == metadata.sessionTaskIdentifier {
-                        task.cancel()
-                    }
-                }
-            }
-            NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
-                                                       session: "",
-                                                       sessionError: "",
-                                                       selector: "",
-                                                       status: NCGlobal.shared.metadataStatusNormal)
-            NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterDownloadCancelFile),
-                                            object: nil,
-                                            userInfo: ["ocId": metadata.ocId,
-                                                       "serverUrl": metadata.serverUrl,
-                                                       "account": metadata.account])
-        }
-
-        // UPLOAD FOREGROUND
-        if metadata.session == NextcloudKit.shared.nkCommonInstance.sessionIdentifierUpload {
-            if let request = NCNetworking.shared.uploadRequest[fileNameLocalPath] {
-                request.cancel()
-                NCNetworking.shared.uploadRequest.removeValue(forKey: fileNameLocalPath)
-            }
-            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
-            NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterUploadCancelFile),
-                                            object: nil,
-                                            userInfo: ["ocId": metadata.ocId,
-                                                       "serverUrl": metadata.serverUrl,
-                                                       "account": metadata.account])
-            return
-        }
-
-        // UPLOAD BACKGROUND
-        var session: URLSession?
-        if metadata.session == NCNetworking.shared.sessionUploadBackground {
-            session = NCNetworking.shared.sessionManagerUploadBackground
-        } else if metadata.session == NCNetworking.shared.sessionUploadBackgroundWWan {
-            session = NCNetworking.shared.sessionManagerUploadBackgroundWWan
-        }
-        if let tasks = await session?.tasks {
-            for task in tasks.1 { // ([URLSessionDataTask], [URLSessionUploadTask], [URLSessionDownloadTask])
-                if task.taskIdentifier == metadata.sessionTaskIdentifier {
-                    task.cancel()
-                }
-            }
-            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
-            NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterUploadCancelFile),
-                                            object: nil,
-                                            userInfo: ["ocId": metadata.ocId,
-                                                       "serverUrl": metadata.serverUrl,
-                                                       "account": metadata.account])
-        }
-    }
-}
-
 // MARK: -
 
 private class AccountSwitcherButton: UIButton {
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewDownloadThumbnail.swift b/iOSClient/Main/Collection Common/NCCollectionViewDownloadThumbnail.swift
index 3def4e48ba..928bc87523 100644
--- a/iOSClient/Main/Collection Common/NCCollectionViewDownloadThumbnail.swift	
+++ b/iOSClient/Main/Collection Common/NCCollectionViewDownloadThumbnail.swift	
@@ -25,10 +25,9 @@ import Foundation
 import UIKit
 import Queuer
 import NextcloudKit
-import Realm
+import RealmSwift
 
 class NCCollectionViewDownloadThumbnail: ConcurrentOperation {
-
     var metadata: tableMetadata
     var cell: NCCellProtocol?
     var collectionView: UICollectionView?
@@ -46,7 +45,6 @@ class NCCollectionViewDownloadThumbnail: ConcurrentOperation {
 
     override func start() {
         guard !isCancelled else { return self.finish() }
-
         var etagResource: String?
         let sizePreview = NCUtility().getSizePreview(width: metadata.width, height: metadata.height)
 
@@ -62,7 +60,6 @@ class NCCollectionViewDownloadThumbnail: ConcurrentOperation {
                                             sizeIcon: NCGlobal.shared.sizeIcon,
                                             etag: etagResource,
                                             options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { _, _, imageIcon, _, etag, error in
-
             if error == .success, let imageIcon {
                 NCManageDatabase.shared.setMetadataEtagResource(ocId: self.metadata.ocId, etagResource: etag)
                 DispatchQueue.main.async {
@@ -81,10 +78,6 @@ class NCCollectionViewDownloadThumbnail: ConcurrentOperation {
                         self.collectionView?.reloadData()
                     }
                 }
-                let fileSizeIcon = self.utilityFileSystem.getFileSize(filePath: self.fileNameIconLocalPath)
-                if NCImageCache.shared.hasIconImageEnoughSize(fileSizeIcon) {
-                    NCImageCache.shared.setIconImage(ocId: self.metadata.ocId, etag: self.metadata.etag, image: imageIcon)
-                }
             }
             self.finish()
         }
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewUnifiedSearch.swift b/iOSClient/Main/Collection Common/NCCollectionViewUnifiedSearch.swift
index 7083ed754f..a60177e494 100644
--- a/iOSClient/Main/Collection Common/NCCollectionViewUnifiedSearch.swift	
+++ b/iOSClient/Main/Collection Common/NCCollectionViewUnifiedSearch.swift	
@@ -24,10 +24,9 @@
 import Foundation
 import Queuer
 import NextcloudKit
-import Realm
+import RealmSwift
 
 class NCCollectionViewUnifiedSearch: ConcurrentOperation {
-
     var collectionViewCommon: NCCollectionViewCommon
     var metadatas: [tableMetadata]
     var searchResult: NKSearchResult
@@ -48,7 +47,6 @@ class NCCollectionViewUnifiedSearch: ConcurrentOperation {
     }
 
     override func start() {
-
         guard !isCancelled else { return self.finish() }
 
         self.collectionViewCommon.dataSource.addSection(metadatas: metadatas, searchResult: searchResult)
diff --git a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderMenu.swift b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeader.swift
similarity index 66%
rename from iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderMenu.swift
rename to iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeader.swift
index 532d2c685e..e71baa5fae 100644
--- a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderMenu.swift	
+++ b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeader.swift	
@@ -1,5 +1,5 @@
 //
-//  NCSectionHeaderFooter.swift
+//  NCSectionFirstHeader.swift
 //  Nextcloud
 //
 //  Created by Marino Faggiana on 09/10/2018.
@@ -24,7 +24,12 @@
 import UIKit
 import MarkdownKit
 
-class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate {
+protocol NCSectionFirstHeaderDelegate: AnyObject {
+    func tapButtonTransfer(_ sender: Any)
+    func tapRichWorkspace(_ sender: Any)
+}
+
+class NCSectionFirstHeader: UICollectionReusableView, UIGestureRecognizerDelegate {
 
     @IBOutlet weak var buttonTransfer: UIButton!
     @IBOutlet weak var imageButtonTransfer: UIImageView!
@@ -42,7 +47,7 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
     @IBOutlet weak var viewSectionHeightConstraint: NSLayoutConstraint!
     @IBOutlet weak var transferSeparatorBottomHeightConstraint: NSLayoutConstraint!
 
-    weak var delegate: NCSectionHeaderMenuDelegate?
+    weak var delegate: NCSectionFirstHeaderDelegate?
     let utility = NCUtility()
     private var markdownParser = MarkdownParser()
     private var richWorkspaceText: String?
@@ -103,7 +108,6 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
     // MARK: - RichWorkspace
 
     func setRichWorkspaceHeight(_ size: CGFloat) {
-
         viewRichWorkspaceHeightConstraint.constant = size
         if size == 0 {
             viewRichWorkspace.isHidden = true
@@ -113,7 +117,6 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
     }
 
     func setInterfaceColor() {
-
         if traitCollection.userInterfaceStyle == .dark {
             gradient.colors = [UIColor(white: 0, alpha: 0).cgColor, UIColor.black.cgColor]
         } else {
@@ -133,7 +136,6 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
     // MARK: - Transfer
 
     func setViewTransfer(isHidden: Bool, ocId: String? = nil, text: String? = nil, progress: Float? = nil) {
-
         labelTransfer.text = text
         viewTransfer.isHidden = isHidden
         progressTransfer.progress = 0
@@ -144,14 +146,13 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
             var image: UIImage?
             if let ocId,
                let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
-                image = utility.createFilePreviewImage(ocId: metadata.ocId, etag: metadata.etag, fileNameView: metadata.fileNameView, classFile: metadata.classFile, status: metadata.status, createPreviewMedia: true)?.darken()
+                image = utility.getIcon(metadata: metadata)?.darken()
                 if image == nil {
                     image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true)
                     buttonTransfer.backgroundColor = .lightGray
                 } else {
                     buttonTransfer.backgroundColor = .clear
                 }
-                buttonTransfer.setImage(image, for: .normal)
             }
             viewTransferHeightConstraint.constant = NCGlobal.shared.heightHeaderTransfer
             if let progress {
@@ -163,8 +164,8 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
     // MARK: - Section
 
     func setSectionHeight(_ size: CGFloat) {
-
         viewSectionHeightConstraint.constant = size
+
         if size == 0 {
             viewSection.isHidden = true
         } else {
@@ -183,139 +184,6 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
     }
 }
 
-protocol NCSectionHeaderMenuDelegate: AnyObject {
-    func tapButtonTransfer(_ sender: Any)
-    func tapRichWorkspace(_ sender: Any)
-}
-
-// optional func
-extension NCSectionHeaderMenuDelegate {
-    func tapButtonTransfer(_ sender: Any) {}
-    func tapRichWorkspace(_ sender: Any) {}
-}
-
-class NCSectionHeader: UICollectionReusableView {
-
-    @IBOutlet weak var labelSection: UILabel!
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-
-        self.backgroundColor = UIColor.clear
-        self.labelSection.text = ""
-    }
-}
-
-class NCSectionFooter: UICollectionReusableView, NCSectionFooterDelegate {
-
-    @IBOutlet weak var buttonSection: UIButton!
-    @IBOutlet weak var activityIndicatorSection: UIActivityIndicatorView!
-    @IBOutlet weak var labelSection: UILabel!
-    @IBOutlet weak var separator: UIView!
-    @IBOutlet weak var separatorHeightConstraint: NSLayoutConstraint!
-    @IBOutlet weak var buttonSectionHeightConstraint: NSLayoutConstraint!
-
-    weak var delegate: NCSectionFooterDelegate?
-    var metadataForSection: NCMetadataForSection?
-    let utilityFileSystem = NCUtilityFileSystem()
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-
-        self.backgroundColor = .clear
-        labelSection.textColor = NCBrandColor.shared.textColor2
-        labelSection.text = ""
-
-        separator.backgroundColor = .separator
-        separatorHeightConstraint.constant = 0.5
-
-        buttonIsHidden(true)
-        activityIndicatorSection.isHidden = true
-        activityIndicatorSection.color = NCBrandColor.shared.textColor
-    }
-
-    func setTitleLabel(directories: Int, files: Int, size: Int64) {
-
-        var foldersText = ""
-        var filesText = ""
-
-        if directories > 1 {
-            foldersText = "\(directories) " + NSLocalizedString("_folders_", comment: "")
-        } else if directories == 1 {
-            foldersText = "1 " + NSLocalizedString("_folder_", comment: "")
-        }
-
-        if files > 1 {
-            filesText = "\(files) " + NSLocalizedString("_files_", comment: "") + " • " + utilityFileSystem.transformedSize(size)
-        } else if files == 1 {
-            filesText = "1 " + NSLocalizedString("_file_", comment: "") + " • " + utilityFileSystem.transformedSize(size)
-        }
-
-        if foldersText.isEmpty {
-            labelSection.text = filesText
-        } else if filesText.isEmpty {
-            labelSection.text = foldersText
-        } else {
-            labelSection.text = foldersText + " • " + filesText
-        }
-    }
-
-    func setTitleLabel(_ text: String) {
-
-        labelSection.text = text
-    }
-
-    func setButtonText(_ text: String) {
-
-        buttonSection.setTitle(text, for: .normal)
-    }
-
-    func separatorIsHidden(_ isHidden: Bool) {
-
-        separator.isHidden = isHidden
-    }
-
-    func buttonIsHidden(_ isHidden: Bool) {
-
-        buttonSection.isHidden = isHidden
-        if isHidden {
-            buttonSectionHeightConstraint.constant = 0
-        } else {
-            buttonSectionHeightConstraint.constant = NCGlobal.shared.heightFooterButton
-        }
-    }
-
-    func showActivityIndicatorSection() {
-
-        buttonSection.isHidden = true
-        buttonSectionHeightConstraint.constant = NCGlobal.shared.heightFooterButton
-
-        activityIndicatorSection.isHidden = false
-        activityIndicatorSection.startAnimating()
-    }
-
-    func hideActivityIndicatorSection() {
-
-        activityIndicatorSection.stopAnimating()
-        activityIndicatorSection.isHidden = true
-    }
-
-    // MARK: - Action
-
-    @IBAction func touchUpInsideButton(_ sender: Any) {
-        delegate?.tapButtonSection(sender, metadataForSection: metadataForSection)
-    }
-}
-
-protocol NCSectionFooterDelegate: AnyObject {
-    func tapButtonSection(_ sender: Any, metadataForSection: NCMetadataForSection?)
-}
-
-// optional func
-extension NCSectionFooterDelegate {
-    func tapButtonSection(_ sender: Any, metadataForSection: NCMetadataForSection?) {}
-}
-
 // https://stackoverflow.com/questions/16278463/darken-an-uiimage
 public extension UIImage {
 
diff --git a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderMenu.xib b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeader.xib
similarity index 98%
rename from iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderMenu.xib
rename to iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeader.xib
index a0a1c8cbbc..9568658d6b 100644
--- a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderMenu.xib	
+++ b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeader.xib	
@@ -11,7 +11,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="sectionHeaderMenu" id="tys-A2-nDX" customClass="NCSectionHeaderMenu" customModule="Nextcloud" customModuleProvider="target">
+        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="sectionFirstHeader" id="tys-A2-nDX" customClass="NCSectionFirstHeader" customModule="Nextcloud" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="574" height="438"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
diff --git a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderEmptyData.swift b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeaderEmptyData.swift
similarity index 88%
rename from iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderEmptyData.swift
rename to iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeaderEmptyData.swift
index 11c8df892d..7737715a95 100644
--- a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderEmptyData.swift	
+++ b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeaderEmptyData.swift	
@@ -1,5 +1,5 @@
 //
-//  NCSectionHeaderEmptyData.swift
+//  NCSectionFirstHeaderEmptyData.swift
 //  Nextcloud
 //
 //  Created by Marino Faggiana on 09/10/2018.
@@ -24,11 +24,11 @@
 import UIKit
 import MarkdownKit
 
-protocol NCSectionHeaderEmptyDataDelegate: AnyObject {
+protocol NCSectionFirstHeaderEmptyDataDelegate: AnyObject {
     func tapButtonTransfer(_ sender: Any)
 }
 
-class NCSectionHeaderEmptyData: UICollectionReusableView {
+class NCSectionFirstHeaderEmptyData: UICollectionReusableView {
 
     @IBOutlet weak var viewTransfer: UIView!
     @IBOutlet weak var viewTransferHeightConstraint: NSLayoutConstraint!
@@ -43,7 +43,7 @@ class NCSectionHeaderEmptyData: UICollectionReusableView {
     @IBOutlet weak var emptyTitle: UILabel!
     @IBOutlet weak var emptyDescription: UILabel!
 
-    weak var delegate: NCSectionHeaderEmptyDataDelegate?
+    weak var delegate: NCSectionFirstHeaderEmptyDataDelegate?
 
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -84,7 +84,6 @@ class NCSectionHeaderEmptyData: UICollectionReusableView {
     // MARK: - Transfer
 
     func setViewTransfer(isHidden: Bool, ocId: String? = nil, text: String? = nil, progress: Float? = nil) {
-
         labelTransfer.text = text
         viewTransfer.isHidden = isHidden
         progressTransfer.progress = 0
@@ -95,14 +94,13 @@ class NCSectionHeaderEmptyData: UICollectionReusableView {
             var image: UIImage?
             if let ocId,
                let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
-                image = NCUtility().createFilePreviewImage(ocId: metadata.ocId, etag: metadata.etag, fileNameView: metadata.fileNameView, classFile: metadata.classFile, status: metadata.status, createPreviewMedia: true)?.darken()
+                image = NCUtility().getIcon(metadata: metadata)?.darken()
                 if image == nil {
                     image = NCUtility().loadImage(named: metadata.iconName, useTypeIconFile: true)
                     buttonTransfer.backgroundColor = .lightGray
                 } else {
                     buttonTransfer.backgroundColor = .clear
                 }
-                buttonTransfer.setImage(image, for: .normal)
             }
             viewTransferHeightConstraint.constant = NCGlobal.shared.heightHeaderTransfer
             if let progress {
diff --git a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderEmptyData.xib b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeaderEmptyData.xib
similarity index 97%
rename from iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderEmptyData.xib
rename to iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeaderEmptyData.xib
index 16a8cc3836..048352f250 100644
--- a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeaderEmptyData.xib	
+++ b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeaderEmptyData.xib	
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="sectionHeaderEmptyData" id="tys-A2-nDX" customClass="NCSectionHeaderEmptyData" customModule="Nextcloud" customModuleProvider="target">
+        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="sectionFirstHeaderEmptyData" id="tys-A2-nDX" customClass="NCSectionFirstHeaderEmptyData" customModule="Nextcloud" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="656" height="623"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
@@ -121,7 +121,7 @@
     <resources>
         <image name="stop.circle" catalog="system" width="128" height="123"/>
         <systemColor name="systemGrayColor">
-            <color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFooter.swift b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFooter.swift
new file mode 100644
index 0000000000..c03f8d742e
--- /dev/null
+++ b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionFooter.swift	
@@ -0,0 +1,122 @@
+//
+//  NCSectionFooter.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 20/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+
+protocol NCSectionFooterDelegate: AnyObject {
+    func tapButtonSection(_ sender: Any, metadataForSection: NCMetadataForSection?)
+}
+
+class NCSectionFooter: UICollectionReusableView {
+    @IBOutlet weak var buttonSection: UIButton!
+    @IBOutlet weak var activityIndicatorSection: UIActivityIndicatorView!
+    @IBOutlet weak var labelSection: UILabel!
+    @IBOutlet weak var separator: UIView!
+    @IBOutlet weak var separatorHeightConstraint: NSLayoutConstraint!
+    @IBOutlet weak var buttonSectionHeightConstraint: NSLayoutConstraint!
+
+    weak var delegate: NCSectionFooterDelegate?
+    var metadataForSection: NCMetadataForSection?
+    let utilityFileSystem = NCUtilityFileSystem()
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        self.backgroundColor = .clear
+        labelSection.textColor = NCBrandColor.shared.textColor2
+        labelSection.text = ""
+
+        separator.backgroundColor = .separator
+        separatorHeightConstraint.constant = 0.5
+
+        buttonIsHidden(true)
+        activityIndicatorSection.isHidden = true
+        activityIndicatorSection.color = NCBrandColor.shared.textColor
+    }
+
+    func setTitleLabel(directories: Int, files: Int, size: Int64) {
+        var foldersText = ""
+        var filesText = ""
+
+        if directories > 1 {
+            foldersText = "\(directories) " + NSLocalizedString("_folders_", comment: "")
+        } else if directories == 1 {
+            foldersText = "1 " + NSLocalizedString("_folder_", comment: "")
+        }
+
+        if files > 1 {
+            filesText = "\(files) " + NSLocalizedString("_files_", comment: "") + " • " + utilityFileSystem.transformedSize(size)
+        } else if files == 1 {
+            filesText = "1 " + NSLocalizedString("_file_", comment: "") + " • " + utilityFileSystem.transformedSize(size)
+        }
+
+        if foldersText.isEmpty {
+            labelSection.text = filesText
+        } else if filesText.isEmpty {
+            labelSection.text = foldersText
+        } else {
+            labelSection.text = foldersText + " • " + filesText
+        }
+    }
+
+    func setTitleLabel(_ text: String) {
+        labelSection.text = text
+    }
+
+    func setButtonText(_ text: String) {
+        buttonSection.setTitle(text, for: .normal)
+    }
+
+    func separatorIsHidden(_ isHidden: Bool) {
+        separator.isHidden = isHidden
+    }
+
+    func buttonIsHidden(_ isHidden: Bool) {
+        buttonSection.isHidden = isHidden
+        if isHidden {
+            buttonSectionHeightConstraint.constant = 0
+        } else {
+            buttonSectionHeightConstraint.constant = NCGlobal.shared.heightFooterButton
+        }
+    }
+
+    func showActivityIndicatorSection() {
+        buttonSection.isHidden = true
+        buttonSectionHeightConstraint.constant = NCGlobal.shared.heightFooterButton
+
+        activityIndicatorSection.isHidden = false
+        activityIndicatorSection.startAnimating()
+    }
+
+    func hideActivityIndicatorSection() {
+        activityIndicatorSection.stopAnimating()
+        activityIndicatorSection.isHidden = true
+    }
+
+    // MARK: - Action
+
+    @IBAction func touchUpInsideButton(_ sender: Any) {
+        delegate?.tapButtonSection(sender, metadataForSection: metadataForSection)
+    }
+}
diff --git a/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeader.swift b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeader.swift
new file mode 100644
index 0000000000..d0683ccca4
--- /dev/null
+++ b/iOSClient/Main/Collection Common/Section Header Footer/NCSectionHeader.swift	
@@ -0,0 +1,35 @@
+//
+//  NCSectionHeader.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 20/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+
+class NCSectionHeader: UICollectionReusableView {
+    @IBOutlet weak var labelSection: UILabel!
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.backgroundColor = UIColor.clear
+        self.labelSection.text = ""
+    }
+}
diff --git a/iOSClient/Main/NCActionCenter.swift b/iOSClient/Main/NCActionCenter.swift
index 985d53a3ec..7c5b68d3d9 100644
--- a/iOSClient/Main/NCActionCenter.swift
+++ b/iOSClient/Main/NCActionCenter.swift
@@ -116,7 +116,7 @@ class NCActionCenter: NSObject, UIDocumentInteractionControllerDelegate, NCSelec
             case NCGlobal.shared.selectorLoadFileView:
 
                 guard UIApplication.shared.applicationState == .active else { return }
-                if metadata.contentType.contains("opendocument") && !self.utility.isRichDocument(metadata) {
+                if metadata.contentType.contains("opendocument") && !self.utility.isTypeFileRichDocument(metadata) {
                     self.openDocumentController(metadata: metadata, controller: controller)
                 } else if metadata.classFile == NKCommon.TypeClassFile.compress.rawValue || metadata.classFile == NKCommon.TypeClassFile.unknow.rawValue {
                     self.openDocumentController(metadata: metadata, controller: controller)
diff --git a/iOSClient/Media/NCMedia+CollectionViewDataSource.swift b/iOSClient/Media/NCMedia+CollectionViewDataSource.swift
new file mode 100644
index 0000000000..eb69de3ad5
--- /dev/null
+++ b/iOSClient/Media/NCMedia+CollectionViewDataSource.swift
@@ -0,0 +1,128 @@
+//
+//  NCMedia+CollectionViewDataSource.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 16/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import UIKit
+import NextcloudKit
+import RealmSwift
+
+extension NCMedia: UICollectionViewDataSource {
+    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+        if kind == mediaSectionHeader {
+            guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFirstHeaderEmptyData", for: indexPath) as? NCSectionFirstHeaderEmptyData else { return NCSectionFirstHeaderEmptyData() }
+            header.emptyImage.image = utility.loadImage(named: "photo", colors: [NCBrandColor.shared.brandElement])
+            if loadingTask != nil || imageCache.createMediaCacheInProgress {
+                header.emptyTitle.text = NSLocalizedString("_search_in_progress_", comment: "")
+            } else {
+                header.emptyTitle.text = NSLocalizedString("_tutorial_photo_view_", comment: "")
+            }
+            header.emptyDescription.text = ""
+            return header
+        }
+        return UICollectionReusableView()
+    }
+
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        var numberOfItemsInSection = 0
+        if let metadatas { numberOfItemsInSection = metadatas.count }
+        if numberOfItemsInSection == 0 {
+            selectOrCancelButton.isHidden = true
+            menuButton.isHidden = false
+            gradientView.isHidden = true
+            activityIndicatorTrailing.constant = 50
+        } else if isEditMode {
+            selectOrCancelButton.isHidden = false
+            menuButton.isHidden = true
+            activityIndicatorTrailing.constant = 150
+        } else {
+            selectOrCancelButton.isHidden = false
+            menuButton.isHidden = false
+            activityIndicatorTrailing.constant = 150
+        }
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { self.setTitleDate() }
+        return numberOfItemsInSection
+    }
+
+    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        guard let metadatas else { return }
+
+        if !collectionView.indexPathsForVisibleItems.contains(indexPath) && indexPath.row < metadatas.count {
+            guard let metadata = metadatas[indexPath.row] else { return }
+            for case let operation as NCMediaDownloadThumbnaill in NCNetworking.shared.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId {
+                operation.cancel()
+            }
+            for case let operation as NCOperationConvertLivePhoto in NCNetworking.shared.convertLivePhotoQueue.operations where operation.ocId == metadata.ocId {
+                operation.cancel()
+            }
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as? NCGridMediaCell,
+              let metadatas = self.metadatas,
+              let metadata = metadatas[indexPath.row]
+        else {
+            return NCGridMediaCell()
+        }
+
+        cell.date = metadata.date as Date
+        cell.ocId = metadata.ocId
+        cell.indexPath = indexPath
+        cell.user = metadata.ownerId
+        cell.imageStatus.image = nil
+        cell.imageItem.contentMode = .scaleAspectFill
+
+        if let image = getImage(metadata: metadata) {
+            cell.imageItem.image = image
+        } else if !metadata.hasPreview {
+            cell.imageItem.backgroundColor = .clear
+            cell.imageItem.contentMode = .center
+            if metadata.isImage {
+                cell.imageItem.image = photoImage
+            } else {
+                cell.imageItem.image = videoImage
+            }
+        }
+
+        // Convert OLD Live Photo
+        if NCGlobal.shared.isLivePhotoServerAvailable, metadata.isLivePhoto, metadata.isNotFlaggedAsLivePhotoByServer {
+            NCNetworking.shared.convertLivePhoto(metadata: metadata)
+        }
+
+        if metadata.isAudioOrVideo {
+           cell.imageStatus.image = playImage
+        } else if metadata.isLivePhoto {
+            cell.imageStatus.image = livePhotoImage
+        } else {
+            cell.imageStatus.image = nil
+        }
+
+        if isEditMode, selectOcId.contains(metadata.ocId) {
+            cell.selected(true)
+        } else {
+            cell.selected(false)
+        }
+
+        return cell
+    }
+}
diff --git a/iOSClient/Media/NCMedia+CollectionViewDelegate.swift b/iOSClient/Media/NCMedia+CollectionViewDelegate.swift
new file mode 100644
index 0000000000..86e5f19b65
--- /dev/null
+++ b/iOSClient/Media/NCMedia+CollectionViewDelegate.swift
@@ -0,0 +1,80 @@
+//
+//  NCMedia+CollectionViewDelegate.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 16/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import UIKit
+import NextcloudKit
+import RealmSwift
+
+extension NCMedia: UICollectionViewDelegate {
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        var mediaCell: NCGridMediaCell?
+        if let metadata = self.metadatas?[indexPath.row] {
+            if let visibleCells = self.collectionView?.indexPathsForVisibleItems.compactMap({ self.collectionView?.cellForItem(at: $0) }) {
+                for case let cell as NCGridMediaCell in visibleCells {
+                    if cell.ocId == metadata.ocId {
+                        mediaCell = cell
+                    }
+                }
+            }
+            if isEditMode {
+                if let index = selectOcId.firstIndex(of: metadata.ocId) {
+                    selectOcId.remove(at: index)
+                    mediaCell?.selected(false)
+                } else {
+                    selectOcId.append(metadata.ocId)
+                    mediaCell?.selected(true)
+
+                }
+                tabBarSelect.selectCount = selectOcId.count
+            } else {
+                // ACTIVE SERVERURL
+                serverUrl = metadata.serverUrl
+                if let metadatas = self.metadatas?.getArray() {
+                    NCViewer().view(viewController: self, metadata: metadata, metadatas: metadatas, imageIcon: getImage(metadata: metadata))
+                }
+            }
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
+        guard let cell = collectionView.cellForItem(at: indexPath) as? NCGridMediaCell,
+              let metadata = self.metadatas?[indexPath.row] else { return nil }
+        let identifier = indexPath as NSCopying
+        let image = cell.imageItem.image
+        self.serverUrl = metadata.serverUrl
+
+        return UIContextMenuConfiguration(identifier: identifier, previewProvider: {
+            return NCViewerProviderContextMenu(metadata: metadata, image: image)
+        }, actionProvider: { _ in
+            return NCContextMenu().viewMenu(ocId: metadata.ocId, viewController: self, image: image)
+        })
+    }
+
+    func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
+        animator.addCompletion {
+            if let indexPath = configuration.identifier as? IndexPath {
+                self.collectionView(collectionView, didSelectItemAt: indexPath)
+            }
+        }
+    }
+}
diff --git a/iOSClient/Media/NCMedia+Command.swift b/iOSClient/Media/NCMedia+Command.swift
index c5f8b90596..baedb8b00d 100644
--- a/iOSClient/Media/NCMedia+Command.swift
+++ b/iOSClient/Media/NCMedia+Command.swift
@@ -5,6 +5,21 @@
 //  Created by Marino Faggiana on 24/02/24.
 //  Copyright © 2024 Marino Faggiana. All rights reserved.
 //
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
 
 import Foundation
 import NextcloudKit
@@ -73,31 +88,28 @@ extension NCMedia {
             titleDate?.textColor = NCBrandColor.shared.textColor
             activityIndicator.color = NCBrandColor.shared.textColor
             selectOrCancelButton.setTitleColor(NCBrandColor.shared.textColor, for: .normal)
-            menuButton.setImage(NCUtility().loadImage(named: "ellipsis", colors: [NCBrandColor.shared.iconImageColor]), for: .normal)
+            menuButton.setImage(NCUtility().loadImage(named: "ellipsis", colors: [NCBrandColor.shared.textColor]), for: .normal)
             gradientView.isHidden = true
         } else {
             titleDate?.textColor = .white
             activityIndicator.color = .white
             selectOrCancelButton.setTitleColor(.white, for: .normal)
-            menuButton.setImage(NCUtility().loadImage(named: "ellipsis", colors: [NCBrandColor.shared.iconImageColor]), for: .normal)
+            menuButton.setImage(NCUtility().loadImage(named: "ellipsis", colors: [.white]), for: .normal)
             gradientView.isHidden = false
         }
     }
 
     func createMenu() {
-        var columnCount = NCKeychain().mediaColumnCount
-        let layout = NCKeychain().mediaTypeLayout
+        var layoutForView = NCManageDatabase.shared.getLayoutForView(account: appDelegate.account, key: NCGlobal.shared.layoutViewMedia, serverUrl: "")
+        var columnPhoto = layoutForView?.columnPhoto ?? 3
+        let layout = layoutForView?.layout ?? NCGlobal.shared.mediaLayoutRatio
         let layoutTitle = (layout == NCGlobal.shared.mediaLayoutRatio) ? NSLocalizedString("_media_square_", comment: "") : NSLocalizedString("_media_ratio_", comment: "")
         let layoutImage = (layout == NCGlobal.shared.mediaLayoutRatio) ? utility.loadImage(named: "square.grid.3x3") : utility.loadImage(named: "rectangle.grid.3x2")
 
-        if UIDevice.current.userInterfaceIdiom == .phone, UIDevice.current.orientation.isLandscape {
-            columnCount += 2
-        }
-
-        if CGFloat(columnCount) >= maxImageGrid - 1 {
+        if CGFloat(columnPhoto) >= maxImageGrid - 1 {
             self.attributesZoomIn = []
             self.attributesZoomOut = .disabled
-        } else if columnCount <= 1 {
+        } else if columnPhoto <= 1 {
             self.attributesZoomIn = .disabled
             self.attributesZoomOut = []
         } else {
@@ -124,9 +136,9 @@ extension NCMedia {
         ])
         let viewLayoutMenu = UIAction(title: layoutTitle, image: layoutImage) { _ in
             if layout == NCGlobal.shared.mediaLayoutRatio {
-                NCKeychain().mediaTypeLayout = NCGlobal.shared.mediaLayoutSquare
+                NCManageDatabase.shared.setLayoutForView(account: self.appDelegate.account, key: NCGlobal.shared.layoutViewMedia, serverUrl: "", layout: NCGlobal.shared.mediaLayoutSquare)
             } else {
-                NCKeychain().mediaTypeLayout = NCGlobal.shared.mediaLayoutRatio
+                NCManageDatabase.shared.setLayoutForView(account: self.appDelegate.account, key: NCGlobal.shared.layoutViewMedia, serverUrl: "", layout: NCGlobal.shared.mediaLayoutRatio)
             }
             self.createMenu()
             self.collectionViewReloadData()
@@ -136,14 +148,16 @@ extension NCMedia {
             UIMenu(title: NSLocalizedString("_zoom_", comment: ""), children: [
                 UIAction(title: NSLocalizedString("_zoom_out_", comment: ""), image: utility.loadImage(named: "minus.magnifyingglass"), attributes: self.attributesZoomOut) { _ in
                     UIView.animate(withDuration: 0.0, animations: {
-                        NCKeychain().mediaColumnCount = columnCount + 1
+                        let column = columnPhoto + 1
+                        NCManageDatabase.shared.setLayoutForView(account: self.appDelegate.account, key: NCGlobal.shared.layoutViewMedia, serverUrl: "", columnPhoto: column)
                         self.createMenu()
                         self.collectionViewReloadData()
                     })
                 },
                 UIAction(title: NSLocalizedString("_zoom_in_", comment: ""), image: utility.loadImage(named: "plus.magnifyingglass"), attributes: self.attributesZoomIn) { _ in
                     UIView.animate(withDuration: 0.0, animations: {
-                        NCKeychain().mediaColumnCount = columnCount - 1
+                        let column = columnPhoto - 1
+                        NCManageDatabase.shared.setLayoutForView(account: self.appDelegate.account, key: NCGlobal.shared.layoutViewMedia, serverUrl: "", columnPhoto: column)
                         self.createMenu()
                         self.collectionViewReloadData()
                     })
diff --git a/iOSClient/Media/NCMedia+DragDrop.swift b/iOSClient/Media/NCMedia+DragDrop.swift
index 304c8bac13..c5bac8b230 100644
--- a/iOSClient/Media/NCMedia+DragDrop.swift
+++ b/iOSClient/Media/NCMedia+DragDrop.swift
@@ -29,13 +29,11 @@ import NextcloudKit
 
 extension NCMedia: UICollectionViewDragDelegate {
     func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
-
         if isEditMode {
             return NCDragDrop().performDrag(selectOcId: selectOcId)
         } else if let metadata = self.metadatas?[indexPath.row] {
             return NCDragDrop().performDrag(metadata: metadata)
         }
-
         return []
     }
 }
diff --git a/iOSClient/Media/NCMedia+MediaLayout.swift b/iOSClient/Media/NCMedia+MediaLayout.swift
new file mode 100644
index 0000000000..0823ea7999
--- /dev/null
+++ b/iOSClient/Media/NCMedia+MediaLayout.swift
@@ -0,0 +1,90 @@
+//
+//  NCMedia+MediaLayout.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 16/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  NCMedia+CollectionViewDelegate.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 16/07/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import UIKit
+import NextcloudKit
+import RealmSwift
+
+extension NCMedia: NCMediaLayoutDelegate {
+    func getColumnCount() -> Int {
+        let layoutForView = NCManageDatabase.shared.getLayoutForView(account: appDelegate.account, key: NCGlobal.shared.layoutViewMedia, serverUrl: "")
+        if let column = layoutForView?.columnPhoto, column > 0 {
+            return column
+        }
+        return 3
+    }
+
+    func getLayout() -> String? {
+        let layoutForView = NCManageDatabase.shared.getLayoutForView(account: appDelegate.account, key: NCGlobal.shared.layoutViewMedia, serverUrl: "")
+        return layoutForView?.layout ?? NCGlobal.shared.mediaLayoutRatio
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForHeaderInSection section: Int) -> Float {
+        var height: Double = 0
+        if metadatas?.count ?? 0 == 0 {
+            height = NCGlobal.shared.getHeightHeaderEmptyData(view: view, portraitOffset: 0, landscapeOffset: -20)
+        }
+        return Float(height)
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForFooterInSection section: Int) -> Float {
+        return .zero
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForSection section: Int) -> UIEdgeInsets {
+        return .zero
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForHeaderInSection section: Int) -> UIEdgeInsets {
+        return .zero
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForFooterInSection section: Int) -> UIEdgeInsets {
+        return .zero
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, minimumInteritemSpacingForSection section: Int) -> Float {
+        return 1.0
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath, columnCount: Int, typeLayout: String) -> CGSize {
+        let size = CGSize(width: collectionView.frame.width / CGFloat(columnCount), height: collectionView.frame.width / CGFloat(columnCount))
+        if typeLayout == NCGlobal.shared.mediaLayoutRatio {
+            guard let metadatas = self.metadatas,
+                  let metadata = metadatas[indexPath.row] else { return size }
+
+            if metadata.imageSize != CGSize.zero {
+                return metadata.imageSize
+            } else if let size = imageCache.getPreviewSizeCache(ocId: metadata.ocId, etag: metadata.etag) {
+                return size
+            }
+        }
+        return size
+    }
+}
diff --git a/iOSClient/Media/NCMedia.swift b/iOSClient/Media/NCMedia.swift
index 2d8169bc80..8b96d39fc9 100644
--- a/iOSClient/Media/NCMedia.swift
+++ b/iOSClient/Media/NCMedia.swift
@@ -74,7 +74,7 @@ class NCMedia: UIViewController {
 
         view.backgroundColor = .systemBackground
 
-        collectionView.register(UINib(nibName: "NCSectionHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: collectionViewMediaElementKindSectionHeader, withReuseIdentifier: "sectionHeaderEmptyData")
+        collectionView.register(UINib(nibName: "NCSectionFirstHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: mediaSectionHeader, withReuseIdentifier: "sectionFirstHeaderEmptyData")
         collectionView.register(UINib(nibName: "NCGridMediaCell", bundle: nil), forCellWithReuseIdentifier: "gridCell")
         collectionView.alwaysBounceVertical = true
         collectionView.contentInset = UIEdgeInsets(top: insetsTop, left: 0, bottom: 50, right: 0)
@@ -87,7 +87,6 @@ class NCMedia: UIViewController {
         collectionView.dropDelegate = self
 
         layout.sectionInset = UIEdgeInsets(top: 0, left: 2, bottom: 0, right: 2)
-        layout.mediaViewController = self
         collectionView.collectionViewLayout = layout
 
         tabBarSelect = NCMediaSelectTabBar(tabBarController: self.tabBarController, delegate: self)
@@ -285,9 +284,10 @@ class NCMedia: UIViewController {
     func getImage(metadata: tableMetadata) -> UIImage? {
         let fileNamePathPreview = utilityFileSystem.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)
 
-        if let image = imageCache.getMediaImage(ocId: metadata.ocId, etag: metadata.etag) {
+        if let image = imageCache.getPreviewImageCache(ocId: metadata.ocId, etag: metadata.etag) {
             return image
         } else if FileManager().fileExists(atPath: fileNamePathPreview), let image = UIImage(contentsOfFile: fileNamePathPreview) {
+            imageCache.addPreviewImageCache(metadata: metadata, image: image)
             return image
         } else if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal,
                   (!utilityFileSystem.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)),
@@ -316,217 +316,12 @@ class NCMedia: UIViewController {
     }
 }
 
-// MARK: - Collection View
-
-extension NCMedia: UICollectionViewDelegate {
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        var mediaCell: NCGridMediaCell?
-        if let metadata = self.metadatas?[indexPath.row] {
-            if let visibleCells = self.collectionView?.indexPathsForVisibleItems.compactMap({ self.collectionView?.cellForItem(at: $0) }) {
-                for case let cell as NCGridMediaCell in visibleCells {
-                    if cell.ocId == metadata.ocId {
-                        mediaCell = cell
-                    }
-                }
-            }
-            if isEditMode {
-                if let index = selectOcId.firstIndex(of: metadata.ocId) {
-                    selectOcId.remove(at: index)
-                    mediaCell?.selected(false)
-                } else {
-                    selectOcId.append(metadata.ocId)
-                    mediaCell?.selected(true)
-
-                }
-                tabBarSelect.selectCount = selectOcId.count
-            } else {
-                // ACTIVE SERVERURL
-                serverUrl = metadata.serverUrl
-                if let metadatas = self.metadatas?.getArray() {
-                    NCViewer().view(viewController: self, metadata: metadata, metadatas: metadatas, imageIcon: getImage(metadata: metadata))
-                }
-            }
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
-        guard let cell = collectionView.cellForItem(at: indexPath) as? NCGridMediaCell,
-              let metadata = self.metadatas?[indexPath.row] else { return nil }
-        let identifier = indexPath as NSCopying
-        let image = cell.imageItem.image
-        self.serverUrl = metadata.serverUrl
-
-        return UIContextMenuConfiguration(identifier: identifier, previewProvider: {
-            return NCViewerProviderContextMenu(metadata: metadata, image: image)
-        }, actionProvider: { _ in
-            return NCContextMenu().viewMenu(ocId: metadata.ocId, viewController: self, image: image)
-        })
-    }
-
-    func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
-        animator.addCompletion {
-            if let indexPath = configuration.identifier as? IndexPath {
-                self.collectionView(collectionView, didSelectItemAt: indexPath)
-            }
-        }
-    }
-}
-
 extension NCMedia: UICollectionViewDataSourcePrefetching {
     func collectionView(_ collectionView: UICollectionView, prefetchItemsAt indexPaths: [IndexPath]) {
         // print("[INFO] n. " + String(indexPaths.count))
     }
 }
 
-extension NCMedia: UICollectionViewDataSource {
-    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
-        if kind == "collectionViewMediaElementKindSectionHeader" {
-            guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeaderEmptyData", for: indexPath) as? NCSectionHeaderEmptyData else { return NCSectionHeaderEmptyData() }
-            header.emptyImage.image = utility.loadImage(named: "photo", colors: [NCBrandColor.shared.brandElement])
-            if loadingTask != nil || imageCache.createMediaCacheInProgress {
-                header.emptyTitle.text = NSLocalizedString("_search_in_progress_", comment: "")
-            } else {
-                header.emptyTitle.text = NSLocalizedString("_tutorial_photo_view_", comment: "")
-            }
-            header.emptyDescription.text = ""
-            return header
-        }
-        return UICollectionReusableView()
-    }
-
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        var numberOfItemsInSection = 0
-        if let metadatas { numberOfItemsInSection = metadatas.count }
-        if numberOfItemsInSection == 0 {
-            selectOrCancelButton.isHidden = true
-            menuButton.isHidden = false
-            gradientView.isHidden = true
-            activityIndicatorTrailing.constant = 50
-        } else if isEditMode {
-            selectOrCancelButton.isHidden = false
-            menuButton.isHidden = true
-            activityIndicatorTrailing.constant = 150
-        } else {
-            selectOrCancelButton.isHidden = false
-            menuButton.isHidden = false
-            activityIndicatorTrailing.constant = 150
-        }
-
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { self.setTitleDate() }
-        return numberOfItemsInSection
-    }
-
-    func collectionView(_ collectionView: UICollectionView, didEndDisplaying cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        guard let metadatas else { return }
-
-        if !collectionView.indexPathsForVisibleItems.contains(indexPath) && indexPath.row < metadatas.count {
-            guard let metadata = metadatas[indexPath.row] else { return }
-            for case let operation as NCMediaDownloadThumbnaill in NCNetworking.shared.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId {
-                operation.cancel()
-            }
-            for case let operation as NCOperationConvertLivePhoto in NCNetworking.shared.convertLivePhotoQueue.operations where operation.ocId == metadata.ocId {
-                operation.cancel()
-            }
-        }
-    }
-
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as? NCGridMediaCell,
-              let metadatas = self.metadatas,
-              let metadata = metadatas[indexPath.row]
-        else {
-            return NCGridMediaCell()
-        }
-
-        cell.date = metadata.date as Date
-        cell.ocId = metadata.ocId
-        cell.indexPath = indexPath
-        cell.user = metadata.ownerId
-        cell.imageStatus.image = nil
-        cell.imageItem.contentMode = .scaleAspectFill
-
-        if let image = getImage(metadata: metadata) {
-            cell.imageItem.image = image
-        } else if !metadata.hasPreview {
-            cell.imageItem.backgroundColor = .clear
-            cell.imageItem.contentMode = .center
-            if metadata.isImage {
-                cell.imageItem.image = photoImage
-            } else {
-                cell.imageItem.image = videoImage
-            }
-        }
-
-        // Convert OLD Live Photo
-        if NCGlobal.shared.isLivePhotoServerAvailable, metadata.isLivePhoto, metadata.isNotFlaggedAsLivePhotoByServer {
-            NCNetworking.shared.convertLivePhoto(metadata: metadata)
-        }
-
-        if metadata.isAudioOrVideo {
-           cell.imageStatus.image = playImage
-        } else if metadata.isLivePhoto {
-            cell.imageStatus.image = livePhotoImage
-        } else {
-            cell.imageStatus.image = nil
-        }
-
-        if isEditMode, selectOcId.contains(metadata.ocId) {
-            cell.selected(true)
-        } else {
-            cell.selected(false)
-        }
-
-        return cell
-    }
-}
-
-// MARK: -
-
-extension NCMedia: NCMediaLayoutDelegate {
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForHeaderInSection section: Int) -> Float {
-        var height: Double = 0
-        if metadatas?.count ?? 0 == 0 {
-            height = NCGlobal.shared.getHeightHeaderEmptyData(view: view, portraitOffset: 0, landscapeOffset: -20)
-        }
-        return Float(height)
-    }
-
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForFooterInSection section: Int) -> Float {
-        return .zero
-    }
-
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForSection section: Int) -> UIEdgeInsets {
-        return .zero
-    }
-
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForHeaderInSection section: Int) -> UIEdgeInsets {
-        return .zero
-    }
-
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForFooterInSection section: Int) -> UIEdgeInsets {
-        return .zero
-    }
-
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, minimumInteritemSpacingForSection section: Int) -> Float {
-        return .zero
-    }
-
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath, columnCount: Int, mediaLayout: String) -> CGSize {
-        let size = CGSize(width: collectionView.frame.width / CGFloat(columnCount), height: collectionView.frame.width / CGFloat(columnCount))
-        if mediaLayout == NCGlobal.shared.mediaLayoutRatio {
-            guard let metadatas = self.metadatas,
-                  let metadata = metadatas[indexPath.row] else { return size }
-
-            if metadata.imageSize != CGSize.zero {
-                return metadata.imageSize
-            } else if let size = imageCache.getMediaSize(ocId: metadata.ocId, etag: metadata.etag) {
-                return size
-            }
-        }
-        return size
-    }
-}
-
 // MARK: -
 
 extension NCMedia: UIScrollViewDelegate {
diff --git a/iOSClient/Media/NCMediaDataSource.swift b/iOSClient/Media/NCMediaDataSource.swift
index 273807de31..71f29cdcd6 100644
--- a/iOSClient/Media/NCMediaDataSource.swift
+++ b/iOSClient/Media/NCMediaDataSource.swift
@@ -25,7 +25,6 @@ import UIKit
 import NextcloudKit
 
 extension NCMedia {
-
     func reloadDataSource() {
         self.metadatas = imageCache.getMediaMetadatas(account: activeAccount.account, predicate: self.getPredicate())
         self.collectionViewReloadData()
@@ -127,7 +126,7 @@ extension NCMedia {
         }
         NextcloudKit.shared.nkCommonInstance.writeLog("[DEBUG] Start searchMedia with lessDate \(lessDate), greaterDate \(greaterDate)")
         let options = NKRequestOptions(timeout: timeout, taskDescription: self.taskDescriptionRetrievesProperties, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)
-        let results = await NextcloudKit.shared.searchMedia(path: mediaPath, lessDate: lessDate, greaterDate: greaterDate, elementDate: "d:getlastmodified/", limit: limit, showHiddenFiles: NCKeychain().showHiddenFiles, includeHiddenFiles: [], options: options)
+        let results = await NCNetworking.shared.searchMedia(path: mediaPath, lessDate: lessDate, greaterDate: greaterDate, elementDate: "d:getlastmodified/", limit: limit, showHiddenFiles: NCKeychain().showHiddenFiles, includeHiddenFiles: [], options: options)
         if results.account != self.activeAccount.account {
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "User changed")
             return(lessDate, greaterDate, 0, false, error)
diff --git a/iOSClient/Media/NCMediaDownloadThumbnaill.swift b/iOSClient/Media/NCMediaDownloadThumbnaill.swift
index 0817497581..ab07816aaf 100644
--- a/iOSClient/Media/NCMediaDownloadThumbnaill.swift
+++ b/iOSClient/Media/NCMediaDownloadThumbnaill.swift
@@ -26,7 +26,6 @@ import NextcloudKit
 import Queuer
 
 class NCMediaDownloadThumbnaill: ConcurrentOperation {
-
     var metadata: tableMetadata
     var media: NCMedia
     var fileNamePreviewLocalPath: String
@@ -42,7 +41,6 @@ class NCMediaDownloadThumbnaill: ConcurrentOperation {
 
     override func start() {
         guard !isCancelled else { return self.finish() }
-
         var etagResource: String?
         let sizePreview = NCUtility().getSizePreview(width: metadata.width, height: metadata.height)
 
@@ -58,7 +56,6 @@ class NCMediaDownloadThumbnaill: ConcurrentOperation {
                                             sizeIcon: NCGlobal.shared.sizeIcon,
                                             etag: etagResource,
                                             options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { _, imagePreview, _, _, etag, error in
-
             if error == .success, let imagePreview {
                 NCManageDatabase.shared.setMetadataEtagResource(ocId: self.metadata.ocId, etagResource: etag)
                 DispatchQueue.main.async {
@@ -75,11 +72,7 @@ class NCMediaDownloadThumbnaill: ConcurrentOperation {
                         }
                     }
                 }
-                NCImageCache.shared.setMediaSize(ocId: self.metadata.ocId, etag: self.metadata.etag, size: imagePreview.size)
-                let fileSizePreview = self.utilityFileSystem.getFileSize(filePath: self.fileNamePreviewLocalPath)
-                if NCImageCache.shared.hasMediaImageEnoughSize(fileSizePreview), NCImageCache.shared.hasMediaImageEnoughSpace() {
-                    NCImageCache.shared.setMediaImage(ocId: self.metadata.ocId, etag: self.metadata.etag, image: imagePreview, date: self.metadata.date as Date)
-                }
+                NCImageCache.shared.addPreviewImageCache(metadata: self.metadata, image: imagePreview)
             }
             self.finish()
         }
diff --git a/iOSClient/Media/NCMediaLayout.swift b/iOSClient/Media/NCMediaLayout.swift
index c7aa6243ff..f41c0026db 100644
--- a/iOSClient/Media/NCMediaLayout.swift
+++ b/iOSClient/Media/NCMediaLayout.swift
@@ -21,17 +21,19 @@
 
 import UIKit
 
-public let collectionViewMediaElementKindSectionHeader = "collectionViewMediaElementKindSectionHeader"
-public let collectionViewMediaElementKindSectionFooter = "collectionViewMediaElementKindSectionFooter"
+public let mediaSectionHeader = "mediaSectionHeader"
+public let mediaSectionFooter = "mediaSectionFooter"
 
 protocol NCMediaLayoutDelegate: UICollectionViewDelegate {
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath, columnCount: Int, mediaLayout: String) -> CGSize
+    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath, columnCount: Int, typeLayout: String) -> CGSize
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForHeaderInSection section: Int) -> Float
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForFooterInSection section: Int) -> Float
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForSection section: Int) -> UIEdgeInsets
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForHeaderInSection section: Int) -> UIEdgeInsets
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForFooterInSection section: Int) -> UIEdgeInsets
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, minimumInteritemSpacingForSection section: Int) -> Float
+    func getLayout() -> String?
+    func getColumnCount() -> Int
 }
 
 public class NCMediaLayout: UICollectionViewLayout {
@@ -46,22 +48,22 @@ public class NCMediaLayout: UICollectionViewLayout {
             invalidateIfNotEqual(oldValue, newValue: columnCount)
         }
     }
-    public var minimumColumnSpacing: Float = 2.0 {
+    public var minimumColumnSpacing: Float = 1.0 {
         didSet {
             invalidateIfNotEqual(oldValue, newValue: minimumColumnSpacing)
         }
     }
-    public var minimumInteritemSpacing: Float = 2.0 {
+    public var minimumInteritemSpacing: Float = .zero {
         didSet {
             invalidateIfNotEqual(oldValue, newValue: minimumInteritemSpacing)
         }
     }
-    public var headerHeight: Float = 0.0 {
+    public var headerHeight: Float = .zero {
         didSet {
             invalidateIfNotEqual(oldValue, newValue: headerHeight)
         }
     }
-    public var footerHeight: Float = 0.0 {
+    public var footerHeight: Float = .zero {
         didSet {
             invalidateIfNotEqual(oldValue, newValue: footerHeight)
         }
@@ -81,18 +83,14 @@ public class NCMediaLayout: UICollectionViewLayout {
             invalidateIfNotEqual(oldValue, newValue: sectionInset)
         }
     }
-    var mediaViewController: NCMedia?
-    var mediaLayout = ""
-
     public override var collectionViewContentSize: CGSize {
         let numberOfSections = collectionView?.numberOfSections
         if numberOfSections == 0 {
             return CGSize.zero
         }
-
         var contentSize = collectionView?.bounds.size
-        contentSize?.height = CGFloat(columnHeights[0])
 
+        contentSize?.height = CGFloat(columnHeights[0])
         return contentSize!
     }
 
@@ -115,9 +113,8 @@ public class NCMediaLayout: UICollectionViewLayout {
               let collectionView = collectionView,
               let delegate = delegate else { return }
 
-        mediaLayout = NCKeychain().mediaTypeLayout
-        columnCount = NCKeychain().mediaColumnCount
-        mediaViewController?.buildMediaPhotoVideo(columnCount: columnCount)
+        columnCount = delegate.getColumnCount()
+        (delegate as? NCMedia)?.buildMediaPhotoVideo(columnCount: columnCount)
         if UIDevice.current.userInterfaceIdiom == .phone,
            (UIDevice.current.orientation == .landscapeLeft || UIDevice.current.orientation == .landscapeRight) {
             columnCount += 2
@@ -157,7 +154,7 @@ public class NCMediaLayout: UICollectionViewLayout {
             top += Float(headerInset.top)
 
             if headerHeight > 0 {
-                attributes = UICollectionViewLayoutAttributes(forSupplementaryViewOfKind: collectionViewMediaElementKindSectionHeader, with: NSIndexPath(item: 0, section: section) as IndexPath)
+                attributes = UICollectionViewLayoutAttributes(forSupplementaryViewOfKind: mediaSectionHeader, with: NSIndexPath(item: 0, section: section) as IndexPath)
                 attributes.frame = CGRect(x: headerInset.left, y: CGFloat(top), width: collectionView.frame.size.width - (headerInset.left + headerInset.right), height: CGFloat(headerHeight))
 
                 headersAttribute[section] = attributes
@@ -184,7 +181,8 @@ public class NCMediaLayout: UICollectionViewLayout {
 
                 let xOffset = Float(sectionInset.left) + Float(itemWidth + minimumColumnSpacing) * Float(columnIndex)
                 let yOffset = columnHeights[columnIndex]
-                let itemSize = delegate.collectionView(collectionView, layout: self, sizeForItemAtIndexPath: indexPath, columnCount: self.columnCount, mediaLayout: self.mediaLayout)
+                let typeLayout = delegate.getLayout() ?? NCGlobal.shared.mediaLayoutRatio
+                let itemSize = delegate.collectionView(collectionView, layout: self, sizeForItemAtIndexPath: indexPath, columnCount: self.columnCount, typeLayout: typeLayout)
                 var itemHeight: Float = 0.0
                 if itemSize.height > 0 && itemSize.width > 0 {
                     itemHeight = Float(itemSize.height) * itemWidth / Float(itemSize.width)
@@ -205,9 +203,10 @@ public class NCMediaLayout: UICollectionViewLayout {
             let columnIndex = longestColumnIndex()
             top = columnHeights[columnIndex] - minimumInteritemSpacing + Float(sectionInset.bottom)
             top += Float(footerInset.top)
+            let footerHeight = delegate.collectionView(collectionView, layout: self, heightForFooterInSection: section)
 
             if footerHeight > 0 {
-                attributes = UICollectionViewLayoutAttributes(forSupplementaryViewOfKind: collectionViewMediaElementKindSectionFooter, with: NSIndexPath(item: 0, section: section) as IndexPath)
+                attributes = UICollectionViewLayoutAttributes(forSupplementaryViewOfKind: mediaSectionFooter, with: NSIndexPath(item: 0, section: section) as IndexPath)
                 attributes.frame = CGRect(x: footerInset.left, y: CGFloat(top), width: collectionView.frame.size.width - (footerInset.left + footerInset.right), height: CGFloat(footerHeight))
 
                 footersAttribute[section] = attributes
@@ -249,9 +248,9 @@ public class NCMediaLayout: UICollectionViewLayout {
     public override func layoutAttributesForSupplementaryView(ofKind elementKind: String, at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? {
         var attribute: UICollectionViewLayoutAttributes?
 
-        if elementKind == collectionViewMediaElementKindSectionHeader {
+        if elementKind == mediaSectionHeader {
             attribute = headersAttribute[indexPath.section]
-        } else if elementKind == collectionViewMediaElementKindSectionFooter {
+        } else if elementKind == mediaSectionFooter {
             attribute = footersAttribute[indexPath.section]
         }
 
diff --git a/iOSClient/Menu/NCCollectionViewCommon+Menu.swift b/iOSClient/Menu/NCCollectionViewCommon+Menu.swift
index 1af3dac5c9..3b64e428ea 100644
--- a/iOSClient/Menu/NCCollectionViewCommon+Menu.swift
+++ b/iOSClient/Menu/NCCollectionViewCommon+Menu.swift
@@ -37,6 +37,8 @@ extension NCCollectionViewCommon {
         var actions = [NCMenuAction]()
         let serverUrl = metadata.serverUrl + "/" + metadata.fileName
         var isOffline: Bool = false
+        let applicationHandle = NCApplicationHandle()
+        var iconHeader: UIImage!
 
         if metadata.directory, let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", appDelegate.account, serverUrl)) {
             isOffline = directory.offline
@@ -44,12 +46,6 @@ extension NCCollectionViewCommon {
             isOffline = localFile.offline
         }
 
-        let editors = utility.isDirectEditing(account: metadata.account, contentType: metadata.contentType)
-        let isRichDocument = utility.isRichDocument(metadata)
-        let applicationHandle = NCApplicationHandle()
-
-        var iconHeader: UIImage!
-
         if imageIcon != nil {
             iconHeader = imageIcon!
         } else {
@@ -221,39 +217,6 @@ extension NCCollectionViewCommon {
             }))
         }
 
-        //
-        // OPEN with external editor
-        //
-        if metadata.canOpenExternalEditor {
-
-            var editor = ""
-            var title = ""
-            var icon: UIImage?
-
-            if editors.contains(NCGlobal.shared.editorOnlyoffice) {
-                editor = NCGlobal.shared.editorOnlyoffice
-                title = NSLocalizedString("_open_in_onlyoffice_", comment: "")
-                icon = utility.loadImage(named: "onlyoffice", colors: [NCBrandColor.shared.iconImageColor])
-            } else if isRichDocument {
-                editor = NCGlobal.shared.editorCollabora
-                title = NSLocalizedString("_open_in_collabora_", comment: "")
-                icon = utility.loadImage(named: "collabora", colors: [NCBrandColor.shared.iconImageColor])
-            }
-
-            if !editor.isEmpty {
-                actions.append(
-                    NCMenuAction(
-                        title: title,
-                        icon: icon!,
-                        order: 70,
-                        action: { _ in
-                            NCViewer().view(viewController: self, metadata: metadata, metadatas: [metadata], imageIcon: imageIcon, editor: editor, isRichDocument: isRichDocument)
-                        }
-                    )
-                )
-            }
-        }
-
         //
         // SHARE
         //
diff --git a/iOSClient/Menu/NCShare+Menu.swift b/iOSClient/Menu/NCShare+Menu.swift
index d497981031..a465c7ebd5 100644
--- a/iOSClient/Menu/NCShare+Menu.swift
+++ b/iOSClient/Menu/NCShare+Menu.swift
@@ -63,7 +63,7 @@ extension NCShare {
             NCMenuAction(
                 title: NSLocalizedString("_share_unshare_", comment: ""),
                 destructive: true,
-                icon: utility.loadImage(named: "trash", colors: [.red]),
+                icon: utility.loadImage(named: "person.2.slash"),
                 action: { _ in
                     Task {
                         if share.shareType != NCShareCommon().SHARE_TYPE_LINK, let metadata = self.metadata, metadata.e2eEncrypted && NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV20 {
diff --git a/iOSClient/More/NCMore.swift b/iOSClient/More/NCMore.swift
index d88fbe9301..688ac0ad7e 100644
--- a/iOSClient/More/NCMore.swift
+++ b/iOSClient/More/NCMore.swift
@@ -290,7 +290,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, heightForHeaderInSection index: Int) -> CGFloat {
         let section = sections[index]
 
-        if section.type == .moreApps || sections[index - 1].type == .moreApps {
+        if section.type == .moreApps || (index > 0 && sections[index - 1].type == .moreApps) {
             return 1
         } else {
             return 20
@@ -367,8 +367,6 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         } else if item.url == "logout" {
             let alertController = UIAlertController(title: "", message: NSLocalizedString("_want_delete_", comment: ""), preferredStyle: .alert)
             let actionYes = UIAlertAction(title: NSLocalizedString("_yes_delete_", comment: ""), style: .default) { (_: UIAlertAction) in
-                // let manageAccount = CCManageAccount()
-                // manageAccount.delete(self.appDelegate.account)
                 self.appDelegate.openLogin(selector: NCGlobal.shared.introLogin, openLoginWeb: false)
             }
 
diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift
index c9e20b7641..f5b8b12e32 100644
--- a/iOSClient/NCGlobal.swift
+++ b/iOSClient/NCGlobal.swift
@@ -167,6 +167,8 @@ class NCGlobal: NSObject {
     //
     let layoutList                                  = "typeLayoutList"
     let layoutGrid                                  = "typeLayoutGrid"
+    let layoutPhotoRatio                            = "typeLayoutPhotoRatio"
+    let layoutPhotoSquare                           = "typeLayoutPhotoSquare"
 
     let layoutViewTrash                             = "LayoutTrash"
     let layoutViewOffline                           = "LayoutOffline"
@@ -177,6 +179,7 @@ class NCGlobal: NSObject {
     let layoutViewShares                            = "LayoutShares"
     let layoutViewShareExtension                    = "LayoutShareExtension"
     let layoutViewGroupfolders                      = "LayoutGroupfolders"
+    let layoutViewMedia                             = "LayoutMedia"
 
     // Button Type in Cell list/grid
     //
diff --git a/iOSClient/NCImageCache.swift b/iOSClient/NCImageCache.swift
index 4cfca48207..de7fb35df7 100644
--- a/iOSClient/NCImageCache.swift
+++ b/iOSClient/NCImageCache.swift
@@ -35,9 +35,6 @@ class NCImageCache: NSObject {
     // MARK: -
 
     private let limitCacheImagePreview: Int = 1000
-    private let limitSizeImagePreview: Int = 100000
-    private let limitSizeImageIcon: Int = 100000
-
     private var brandElementColor: UIColor?
     private var totalSize: Int64 = 0
 
@@ -148,7 +145,7 @@ class NCImageCache: NSObject {
             }
             autoreleasepool {
                 if let image = UIImage(contentsOfFile: file.path.path) {
-                    if counter < limitCacheImagePreview, file.fileSize > limitSizeImagePreview {
+                    if counter < limitCacheImagePreview {
                         cacheImagePreview.setValue(imageInfo(image: image, size: image.size, date: file.date), forKey: file.ocIdEtag)
                         totalSize = totalSize + Int64(file.fileSize)
                         counter += 1
@@ -177,58 +174,50 @@ class NCImageCache: NSObject {
         return self.metadatas
     }
 
+    func getMediaMetadatas(account: String, predicate: NSPredicate? = nil) -> ThreadSafeArray<tableMetadata>? {
+        guard let tableAccount = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", account)) else { return nil }
+        let startServerUrl = NCUtilityFileSystem().getHomeServer(urlBase: tableAccount.urlBase, userId: tableAccount.userId) + tableAccount.mediaPath
+        let predicateBoth = NSPredicate(format: showBothPredicateMediaString, account, startServerUrl)
+        return NCManageDatabase.shared.getMediaMetadatas(predicate: predicate ?? predicateBoth)
+    }
+
     ///
-    /// MEDIA PREVIEW CACHE
+    /// PREVIEW CACHE
     ///
-    func setMediaImage(ocId: String, etag: String, image: UIImage, date: Date) {
-        cacheImagePreview.setValue(imageInfo(image: image, size: image.size, date: date), forKey: ocId + etag)
+    func addPreviewImageCache(metadata: tableMetadata, image: UIImage) {
+        cacheImagePreview.setValue(imageInfo(image: image, size: image.size, date: metadata.date as Date), forKey: metadata.ocId + metadata.etag)
+        cacheSizePreview.setValue(image.size, forKey: metadata.ocId + metadata.etag)
     }
 
-    func getMediaImage(ocId: String, etag: String) -> UIImage? {
+    func getPreviewImageCache(ocId: String, etag: String) -> UIImage? {
         if let cache = cacheImagePreview.value(forKey: ocId + etag) {
             return cache.image
         }
         return nil
     }
 
-    func hasMediaImageEnoughSpace() -> Bool {
-        return limitCacheImagePreview > cacheImagePreview.count
-    }
-
-    func hasMediaImageEnoughSize(_ size: Int64) -> Bool {
-        return limitSizeImagePreview < size
-    }
-
     ///
-    /// MEDIA SIZE CACHE
+    /// SIZE CACHE
     ///
-    func setMediaSize(ocId: String, etag: String, size: CGSize) {
-        cacheSizePreview.setValue(size, forKey: ocId + etag)
-    }
-
-    func getMediaSize(ocId: String, etag: String) -> CGSize? {
-        return cacheSizePreview.value(forKey: ocId + etag) ?? nil
-    }
-
-    func getMediaMetadatas(account: String, predicate: NSPredicate? = nil) -> ThreadSafeArray<tableMetadata>? {
-        guard let tableAccount = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", account)) else { return nil }
-        let startServerUrl = NCUtilityFileSystem().getHomeServer(urlBase: tableAccount.urlBase, userId: tableAccount.userId) + tableAccount.mediaPath
-        let predicateBoth = NSPredicate(format: showBothPredicateMediaString, account, startServerUrl)
-        return NCManageDatabase.shared.getMediaMetadatas(predicate: predicate ?? predicateBoth)
+    func getPreviewSizeCache(ocId: String, etag: String) -> CGSize? {
+        if let size = cacheSizePreview.value(forKey: ocId + etag) {
+            return size
+        } else {
+            if let image = UIImage(contentsOfFile: NCUtilityFileSystem().getDirectoryProviderStoragePreviewOcId(ocId, etag: etag)) {
+                return image.size
+            }
+        }
+        return nil
     }
 
     ///
     /// ICON CACHE
     ///
-    func hasIconImageEnoughSize(_ size: Int64) -> Bool {
-        return limitSizeImageIcon < size
-    }
-
-    func setIconImage(ocId: String, etag: String, image: UIImage) {
+    func setIconImageCache(ocId: String, etag: String, image: UIImage) {
         cacheImageIcon.setValue(image, forKey: ocId + etag)
     }
 
-    func getIconImage(ocId: String, etag: String) -> UIImage? {
+    func getIconImageCache(ocId: String, etag: String) -> UIImage? {
         return cacheImageIcon.value(forKey: ocId + etag)
     }
 
diff --git a/iOSClient/Networking/E2EE/NCNetworkingE2EE.swift b/iOSClient/Networking/E2EE/NCNetworkingE2EE.swift
index ffa369f834..51cdb8cc41 100644
--- a/iOSClient/Networking/E2EE/NCNetworkingE2EE.swift
+++ b/iOSClient/Networking/E2EE/NCNetworkingE2EE.swift
@@ -103,7 +103,7 @@ class NCNetworkingE2EE: NSObject {
         }
 
         if let addUserId {
-            let results = await NextcloudKit.shared.getE2EECertificate(user: addUserId, options: NCNetworkingE2EE().getOptions())
+            let results = await NCNetworking.shared.getE2EECertificate(user: addUserId, options: NCNetworkingE2EE().getOptions())
             if results.error == .success, let certificateUser = results.certificateUser {
                 addCertificate = certificateUser
             } else {
@@ -174,7 +174,7 @@ class NCNetworkingE2EE: NSObject {
             return resultsEncodeMetadata.error
         }
 
-        let putE2EEMetadataResults = await NextcloudKit.shared.putE2EEMetadata(fileId: fileId, e2eToken: e2eToken, e2eMetadata: e2eMetadata, signature: resultsEncodeMetadata.signature, method: method, options: NCNetworkingE2EE().getOptions())
+        let putE2EEMetadataResults = await NCNetworking.shared.putE2EEMetadata(fileId: fileId, e2eToken: e2eToken, e2eMetadata: e2eMetadata, signature: resultsEncodeMetadata.signature, method: method, options: NCNetworkingE2EE().getOptions())
         guard putE2EEMetadataResults.error == .success else {
             return putE2EEMetadataResults.error
         }
@@ -233,7 +233,7 @@ class NCNetworkingE2EE: NSObject {
             e2eCounter = "\(counter)"
         }
 
-        let resultsLockE2EEFolder = await NextcloudKit.shared.lockE2EEFolder(fileId: directory.fileId, e2eToken: e2eToken, e2eCounter: e2eCounter, method: "POST", options: NCNetworkingE2EE().getOptions())
+        let resultsLockE2EEFolder = await NCNetworking.shared.lockE2EEFolder(fileId: directory.fileId, e2eToken: e2eToken, e2eCounter: e2eCounter, method: "POST", options: NCNetworkingE2EE().getOptions())
         if resultsLockE2EEFolder.error == .success, let e2eToken = resultsLockE2EEFolder.e2eToken {
             NCManageDatabase.shared.setE2ETokenLock(account: account, serverUrl: serverUrl, fileId: directory.fileId, e2eToken: e2eToken)
         }
@@ -247,7 +247,7 @@ class NCNetworkingE2EE: NSObject {
             return
         }
 
-        let resultsLockE2EEFolder = await NextcloudKit.shared.lockE2EEFolder(fileId: tableLock.fileId, e2eToken: tableLock.e2eToken, e2eCounter: nil, method: "DELETE", options: NCNetworkingE2EE().getOptions())
+        let resultsLockE2EEFolder = await NCNetworking.shared.lockE2EEFolder(fileId: tableLock.fileId, e2eToken: tableLock.e2eToken, e2eCounter: nil, method: "DELETE", options: NCNetworkingE2EE().getOptions())
         if resultsLockE2EEFolder.error == .success {
             NCManageDatabase.shared.deleteE2ETokenLock(account: account, serverUrl: serverUrl)
         }
@@ -261,7 +261,7 @@ class NCNetworkingE2EE: NSObject {
 
         Task {
             for result in NCManageDatabase.shared.getE2EAllTokenLock(account: account) {
-                let resultsLockE2EEFolder = await NextcloudKit.shared.lockE2EEFolder(fileId: result.fileId, e2eToken: result.e2eToken, e2eCounter: nil, method: "DELETE", options: NCNetworkingE2EE().getOptions())
+                let resultsLockE2EEFolder = await NCNetworking.shared.lockE2EEFolder(fileId: result.fileId, e2eToken: result.e2eToken, e2eCounter: nil, method: "DELETE", options: NCNetworkingE2EE().getOptions())
                 if resultsLockE2EEFolder.error == .success {
                     NCManageDatabase.shared.deleteE2ETokenLock(account: account, serverUrl: result.serverUrl)
                 }
diff --git a/iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift b/iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift
index 9f3fd9d26c..92078e7edb 100644
--- a/iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift
+++ b/iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift
@@ -123,7 +123,7 @@ class NCNetworkingE2EECreateFolder: NSObject {
 
         // CREATE FOLDER
         //
-        let resultsCreateFolder = await NextcloudKit.shared.createFolder(serverUrlFileName: serverUrlFileName, options: NKRequestOptions(customHeader: ["e2e-token": e2eToken]))
+        let resultsCreateFolder = await NCNetworking.shared.createFolder(serverUrlFileName: serverUrlFileName, options: NKRequestOptions(customHeader: ["e2e-token": e2eToken]))
         guard resultsCreateFolder.error == .success, let ocId = resultsCreateFolder.ocId, let fileId = utility.ocIdToFileId(ocId: ocId) else {
             await networkingE2EE.unlock(account: account, serverUrl: serverUrl)
             return resultsCreateFolder.error
@@ -131,7 +131,7 @@ class NCNetworkingE2EECreateFolder: NSObject {
 
         // SET FOLDER AS E2EE
         //
-        let resultsMarkE2EEFolder = await NextcloudKit.shared.markE2EEFolder(fileId: fileId, delete: false, options: NCNetworkingE2EE().getOptions())
+        let resultsMarkE2EEFolder = await NCNetworking.shared.markE2EEFolder(fileId: fileId, delete: false, options: NCNetworkingE2EE().getOptions())
         guard resultsMarkE2EEFolder.error == .success  else {
             await networkingE2EE.unlock(account: account, serverUrl: serverUrl)
             return resultsMarkE2EEFolder.error
@@ -143,7 +143,7 @@ class NCNetworkingE2EECreateFolder: NSObject {
 
         // WRITE DB (DIRECTORY - METADATA)
         //
-        let resultsReadFileOrFolder = await NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0")
+        let resultsReadFileOrFolder = await NCNetworking.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0")
         guard resultsReadFileOrFolder.error == .success, let file = resultsReadFileOrFolder.files.first else {
             await networkingE2EE.unlock(account: account, serverUrl: serverUrl)
             return resultsReadFileOrFolder.error
diff --git a/iOSClient/Networking/E2EE/NCNetworkingE2EEMarkFolder.swift b/iOSClient/Networking/E2EE/NCNetworkingE2EEMarkFolder.swift
index ea03bcbfde..7d8451b1e4 100644
--- a/iOSClient/Networking/E2EE/NCNetworkingE2EEMarkFolder.swift
+++ b/iOSClient/Networking/E2EE/NCNetworkingE2EEMarkFolder.swift
@@ -28,10 +28,10 @@ class NCNetworkingE2EEMarkFolder: NSObject {
 
         let serverUrlFileName = serverUrl + "/" + fileName
 
-        let resultsReadFileOrFolder = await NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0")
+        let resultsReadFileOrFolder = await NCNetworking.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0")
         guard resultsReadFileOrFolder.error == .success, let file = resultsReadFileOrFolder.files.first else { return resultsReadFileOrFolder.error }
 
-        let resultsMarkE2EEFolder = await NextcloudKit.shared.markE2EEFolder(fileId: file.fileId, delete: false, options: NCNetworkingE2EE().getOptions())
+        let resultsMarkE2EEFolder = await NCNetworking.shared.markE2EEFolder(fileId: file.fileId, delete: false, options: NCNetworkingE2EE().getOptions())
         guard resultsMarkE2EEFolder.error == .success else { return resultsMarkE2EEFolder.error }
 
         file.e2eEncrypted = true
diff --git a/iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift b/iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift
index 18c7170635..40ed82627a 100644
--- a/iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift
+++ b/iOSClient/Networking/E2EE/NCNetworkingE2EEUpload.swift
@@ -211,7 +211,7 @@ class NCNetworkingE2EEUpload: NSObject {
             NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
             utilityFileSystem.moveFileInBackground(atPath: utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId), toPath: utilityFileSystem.getDirectoryProviderStorageOcId(ocId))
 
-            metadata.date = resultsSendFile.date ?? NSDate()
+            metadata.date = (resultsSendFile.date as? NSDate) ?? NSDate()
             metadata.etag = resultsSendFile.etag ?? ""
             metadata.ocId = ocId
             metadata.chunk = 0
@@ -255,7 +255,7 @@ class NCNetworkingE2EEUpload: NSObject {
 
     // BRIDGE for chunk
     //
-    private func sendFile(metadata: tableMetadata, e2eToken: String, hud: JGProgressHUD?, uploadE2EEDelegate: uploadE2EEDelegate? = nil) async -> (ocId: String?, etag: String?, date: NSDate?, afError: AFError?, error: NKError) {
+    private func sendFile(metadata: tableMetadata, e2eToken: String, hud: JGProgressHUD?, uploadE2EEDelegate: uploadE2EEDelegate? = nil) async -> (ocId: String?, etag: String?, date: Date?, afError: AFError?, error: NKError) {
 
         if metadata.chunk > 0 {
 
diff --git a/iOSClient/Networking/NCAutoUpload.swift b/iOSClient/Networking/NCAutoUpload.swift
index bc4a565a8d..fd4bf4062e 100644
--- a/iOSClient/Networking/NCAutoUpload.swift
+++ b/iOSClient/Networking/NCAutoUpload.swift
@@ -67,7 +67,6 @@ class NCAutoUpload: NSObject {
     }
 
     @objc func autoUploadFullPhotos(viewController: UIViewController?, log: String) {
-
         applicationState = UIApplication.shared.applicationState
 
         NCAskAuthorization().askAuthorizationPhotoLibrary(viewController: viewController) { hasPermission in
@@ -84,7 +83,6 @@ class NCAutoUpload: NSObject {
     }
 
     private func uploadAssetsNewAndFull(viewController: UIViewController?, selector: String, log: String, completion: @escaping (_ items: Int) -> Void) {
-
         guard let account = NCManageDatabase.shared.getActiveAccount() else { return completion(0) }
         let autoUploadPath = NCManageDatabase.shared.getAccountAutoUploadPath(urlBase: account.urlBase, userId: account.userId, account: account.account)
         var metadatas: [tableMetadata] = []
@@ -109,7 +107,6 @@ class NCAutoUpload: NSObject {
             self.endForAssetToUpload = false
 
             for asset in assets {
-
                 var isLivePhoto = false
                 var session: String = ""
                 let assetDate = asset.creationDate ?? Date()
@@ -186,7 +183,6 @@ class NCAutoUpload: NSObject {
     // MARK: -
 
     @objc func alignPhotoLibrary(viewController: UIViewController?) {
-
         guard let activeAccount = NCManageDatabase.shared.getActiveAccount() else { return }
 
         getCameraRollAssets(viewController: viewController, account: activeAccount, selector: NCGlobal.shared.selectorUploadAutoUploadAll, alignPhotoLibrary: true) { assets in
@@ -199,13 +195,10 @@ class NCAutoUpload: NSObject {
     }
 
     private func getCameraRollAssets(viewController: UIViewController?, account: tableAccount, selector: String, alignPhotoLibrary: Bool, completion: @escaping (_ assets: [PHAsset]?) -> Void) {
-
         NCAskAuthorization().askAuthorizationPhotoLibrary(viewController: viewController) { hasPermission in
-
             guard hasPermission else { return completion(nil) }
             let assetCollection = PHAssetCollection.fetchAssetCollections(with: PHAssetCollectionType.smartAlbum, subtype: PHAssetCollectionSubtype.smartAlbumUserLibrary, options: nil)
             guard let assetCollection = assetCollection.firstObject else { return completion(nil) }
-
             let predicateImage = NSPredicate(format: "mediaType == %i", PHAssetMediaType.image.rawValue)
             let predicateVideo = NSPredicate(format: "mediaType == %i", PHAssetMediaType.video.rawValue)
             var predicate: NSPredicate?
diff --git a/iOSClient/Networking/NCConfigServer.swift b/iOSClient/Networking/NCConfigServer.swift
index 9a568aede6..67ca3d0b8b 100644
--- a/iOSClient/Networking/NCConfigServer.swift
+++ b/iOSClient/Networking/NCConfigServer.swift
@@ -22,6 +22,7 @@
 //
 
 import Foundation
+import UIKit
 import Swifter
 import NextcloudKit
 
@@ -29,13 +30,10 @@ import NextcloudKit
 // https://stackoverflow.com/questions/2338035/installing-a-configuration-profile-on-iphone-programmatically
 
 @objc class NCConfigServer: NSObject, UIActionSheetDelegate, URLSessionDelegate {
-
     // Start service
     @objc func startService(url: URL) {
-
         let defaultSessionConfiguration = URLSessionConfiguration.default
         let defaultSession = URLSession(configuration: defaultSessionConfiguration, delegate: self, delegateQueue: .main)
-
         var urlRequest = URLRequest(url: url)
         urlRequest.headers = NextcloudKit.shared.nkCommonInstance.getStandardHeaders()
 
diff --git a/iOSClient/Networking/NCNetworking+AsyncAwait.swift b/iOSClient/Networking/NCNetworking+AsyncAwait.swift
new file mode 100644
index 0000000000..6acf7f5175
--- /dev/null
+++ b/iOSClient/Networking/NCNetworking+AsyncAwait.swift
@@ -0,0 +1,259 @@
+//
+//  NCNetworking+AsyncAwait.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 30/06/24.
+//  Copyright © 2024 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import UIKit
+import NextcloudKit
+import Alamofire
+
+extension NCNetworking {
+    func getServerStatus(serverUrl: String,
+                         options: NKRequestOptions = NKRequestOptions()) async -> NextcloudKit.ServerInfoResult {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.getServerStatus(serverUrl: serverUrl) { serverInfoResult in
+                continuation.resume(returning: serverInfoResult)
+            }
+        })
+    }
+
+    func setLivephoto(serverUrlfileNamePath: String,
+                      livePhotoFile: String,
+                      options: NKRequestOptions = NKRequestOptions()) async -> (account: String, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: livePhotoFile, options: options) { account, error in
+                continuation.resume(returning: (account: account, error: error))
+            }
+        })
+    }
+
+    func getUserProfile(options: NKRequestOptions = NKRequestOptions()) async -> (account: String, userProfile: NKUserProfile?, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.getUserProfile(options: options) { account, userProfile, data, error in
+                continuation.resume(returning: (account: account, userProfile: userProfile, data: data, error: error))
+            }
+        })
+    }
+
+    func sendClientDiagnosticsRemoteOperation(data: Data,
+                                              options: NKRequestOptions = NKRequestOptions()) async -> (account: String, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.sendClientDiagnosticsRemoteOperation(data: data, options: options) { account, error in
+                continuation.resume(returning: (account: account, error: error))
+            }
+        })
+    }
+
+    func downloadPreview(url: URL, options: NKRequestOptions = NKRequestOptions()) async -> (account: String, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.downloadPreview(url: url, options: options) { account, data, error in
+                continuation.resume(returning: (account: account, data: data, error: error))
+            }
+        })
+    }
+
+    func downloadPreview(fileId: String,
+                         fileNamePreviewLocalPath: String,
+                         fileNameIconLocalPath: String? = nil,
+                         widthPreview: Int = 512,
+                         heightPreview: Int = 512,
+                         sizeIcon: Int = 512,
+                         etag: String? = nil,
+                         options: NKRequestOptions = NKRequestOptions()) async -> (account: String, imagePreview: UIImage?, imageIcon: UIImage?, imageOriginal: UIImage?, etag: String?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.downloadPreview(fileId: fileId, fileNamePreviewLocalPath: fileNamePreviewLocalPath, fileNameIconLocalPath: fileNameIconLocalPath, widthPreview: widthPreview, heightPreview: heightPreview, sizeIcon: sizeIcon, etag: etag, options: options) { account, imagePreview, imageIcon, imageOriginal, etag, error in
+                continuation.resume(returning: (account: account, imagePreview: imagePreview, imageIcon: imageIcon, imageOriginal: imageOriginal, etag: etag, error: error))
+            }
+        })
+    }
+
+    func deleteFileOrFolder(serverUrlFileName: String,
+                            options: NKRequestOptions = NKRequestOptions()) async -> (account: String, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.deleteFileOrFolder(serverUrlFileName: serverUrlFileName, options: options) { account, error in
+                continuation.resume(returning: (account: account, error: error))
+            }
+        })
+    }
+
+    func moveFileOrFolder(serverUrlFileNameSource: String,
+                          serverUrlFileNameDestination: String,
+                          overwrite: Bool,
+                          options: NKRequestOptions = NKRequestOptions()) async -> (account: String, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.moveFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite, options: options) { account, error in
+                continuation.resume(returning: (account: account, error: error))
+            }
+        })
+    }
+
+    func copyFileOrFolder(serverUrlFileNameSource: String,
+                          serverUrlFileNameDestination: String,
+                          overwrite: Bool,
+                          options: NKRequestOptions = NKRequestOptions()) async -> (account: String, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.copyFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite, options: options) { account, error in
+                continuation.resume(returning: (account: account, error: error))
+            }
+        })
+    }
+
+    func createFolder(serverUrlFileName: String,
+                      options: NKRequestOptions = NKRequestOptions()) async -> (account: String, ocId: String?, date: Date?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.createFolder(serverUrlFileName: serverUrlFileName, options: options) { account, ocId, date, error in
+                continuation.resume(returning: (account: account, ocId: ocId, date: date, error: error))
+            }
+        })
+    }
+
+    func readFileOrFolder(serverUrlFileName: String,
+                          depth: String,
+                          showHiddenFiles: Bool = true,
+                          requestBody: Data? = nil,
+                          options: NKRequestOptions = NKRequestOptions()) async -> (account: String, files: [NKFile], data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: depth, showHiddenFiles: showHiddenFiles, requestBody: requestBody, options: options) { account, files, data, error in
+                continuation.resume(returning: (account: account, files: files, data: data, error: error))
+            }
+        })
+    }
+
+    func searchMedia(path: String = "",
+                     lessDate: Any,
+                     greaterDate: Any,
+                     elementDate: String,
+                     limit: Int,
+                     showHiddenFiles: Bool,
+                     includeHiddenFiles: [String] = [],
+                     options: NKRequestOptions = NKRequestOptions()) async -> (account: String, files: [NKFile], data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.searchMedia(path: path, lessDate: lessDate, greaterDate: greaterDate, elementDate: elementDate, limit: limit, showHiddenFiles: showHiddenFiles, includeHiddenFiles: includeHiddenFiles, options: options) { account, files, data, error in
+                continuation.resume(returning: (account, files, data, error))
+            }
+        })
+    }
+
+    func markE2EEFolder(fileId: String,
+                        delete: Bool,
+                        options: NKRequestOptions = NKRequestOptions()) async -> (account: String, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.markE2EEFolder(fileId: fileId, delete: delete, options: options) { account, error in
+                continuation.resume(returning: (account: account, error: error))
+            }
+        })
+    }
+
+    func lockE2EEFolder(fileId: String,
+                        e2eToken: String?,
+                        e2eCounter: String?,
+                        method: String,
+                        options: NKRequestOptions = NKRequestOptions()) async -> (account: String, e2eToken: String?, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.lockE2EEFolder(fileId: fileId, e2eToken: e2eToken, e2eCounter: e2eCounter, method: method, options: options) { account, e2eToken, data, error in
+                continuation.resume(returning: (account: account, e2eToken: e2eToken, data: data, error: error))
+            }
+        })
+    }
+
+    func getE2EEMetadata(fileId: String,
+                         e2eToken: String?,
+                         options: NKRequestOptions = NKRequestOptions()) async -> (account: String, e2eMetadata: String?, signature: String?, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.getE2EEMetadata(fileId: fileId, e2eToken: e2eToken, options: options) { account, e2eMetadata, signature, data, error in
+                continuation.resume(returning: (account: account, e2eMetadata: e2eMetadata, signature: signature, data: data, error: error))
+            }
+        })
+    }
+
+    func putE2EEMetadata(fileId: String,
+                         e2eToken: String,
+                         e2eMetadata: String?,
+                         signature: String?,
+                         method: String,
+                         options: NKRequestOptions = NKRequestOptions()) async -> (account: String, metadata: String?, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.putE2EEMetadata(fileId: fileId, e2eToken: e2eToken, e2eMetadata: e2eMetadata, signature: signature, method: method, options: options) { account, metadata, data, error in
+                continuation.resume(returning: (account: account, metadata: metadata, data: data, error: error))
+            }
+        })
+    }
+
+    func getE2EECertificate(user: String? = nil,
+                            options: NKRequestOptions = NKRequestOptions()) async -> (account: String, certificate: String?, certificateUser: String?, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.getE2EECertificate(user: user, options: options) { account, certificate, certificateUser, data, error in
+                continuation.resume(returning: (account: account, certificate: certificate, certificateUser: certificateUser, data: data, error: error))
+            }
+        })
+    }
+
+    func getE2EEPrivateKey(options: NKRequestOptions = NKRequestOptions()) async -> (account: String, privateKey: String?, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.getE2EEPrivateKey(options: options) { account, privateKey, data, error in
+                continuation.resume(returning: (account: account, privateKey: privateKey, data: data, error: error))
+            }
+        })
+    }
+
+    func getE2EEPublicKey(options: NKRequestOptions = NKRequestOptions()) async -> (account: String, publicKey: String?, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.getE2EEPublicKey(options: options) { account, publicKey, data, error in
+                continuation.resume(returning: (account: account, publicKey: publicKey, data: data, error: error))
+            }
+        })
+    }
+
+    func signE2EECertificate(certificate: String,
+                             options: NKRequestOptions = NKRequestOptions()) async -> (account: String, certificate: String?, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.signE2EECertificate(certificate: certificate, options: options) { account, certificate, data, error in
+                continuation.resume(returning: (account: account, certificate: certificate, data: data, error: error))
+            }
+        })
+    }
+
+    func storeE2EEPrivateKey(privateKey: String,
+                             options: NKRequestOptions = NKRequestOptions()) async -> (account: String, privateKey: String?, data: Data?, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.storeE2EEPrivateKey(privateKey: privateKey, options: options) { account, privateKey, data, error in
+                continuation.resume(returning: (account: account, privateKey: privateKey, data: data, error: error))
+            }
+        })
+    }
+
+    func deleteE2EECertificate(options: NKRequestOptions = NKRequestOptions()) async -> (account: String, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.deleteE2EECertificate(options: options) { account, error in
+                continuation.resume(returning: (account: account, error: error))
+            }
+        })
+    }
+
+    func deleteE2EEPrivateKey(options: NKRequestOptions = NKRequestOptions()) async -> (account: String, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.deleteE2EEPrivateKey(options: options) { account, error in
+                continuation.resume(returning: (account: account, error: error))
+            }
+        })
+    }
+}
diff --git a/iOSClient/Networking/NCNetworking+Download.swift b/iOSClient/Networking/NCNetworking+Download.swift
index 9cebb9681f..1e422ec354 100644
--- a/iOSClient/Networking/NCNetworking+Download.swift
+++ b/iOSClient/Networking/NCNetworking+Download.swift
@@ -28,14 +28,12 @@ import Alamofire
 import Queuer
 
 extension NCNetworking {
-
     func download(metadata: tableMetadata,
                   withNotificationProgressTask: Bool,
                   start: @escaping () -> Void = { },
                   requestHandler: @escaping (_ request: DownloadRequest) -> Void = { _ in },
                   progressHandler: @escaping (_ progress: Progress) -> Void = { _ in },
                   completion: @escaping (_ afError: AFError?, _ error: NKError) -> Void = { _, _ in }) {
-
         if metadata.session == NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload {
             downloadFile(metadata: metadata, withNotificationProgressTask: withNotificationProgressTask) {
                 start()
@@ -59,7 +57,6 @@ extension NCNetworking {
                               requestHandler: @escaping (_ request: DownloadRequest) -> Void = { _ in },
                               progressHandler: @escaping (_ progress: Progress) -> Void = { _ in },
                               completion: @escaping (_ afError: AFError?, _ error: NKError) -> Void = { _, _ in }) {
-
         guard !metadata.isInTransfer else { return completion(nil, NKError()) }
         var downloadTask: URLSessionTask?
         let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
@@ -71,27 +68,21 @@ extension NCNetworking {
         }
 
         NextcloudKit.shared.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, options: options, requestHandler: { request in
-
             self.downloadRequest[fileNameLocalPath] = request
             NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                        status: NCGlobal.shared.metadataStatusDownloading)
             requestHandler(request)
-
         }, taskHandler: { task in
-
             downloadTask = task
             NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                        taskIdentifier: task.taskIdentifier)
-
             NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterDownloadStartFile),
                                             object: nil,
                                             userInfo: ["ocId": metadata.ocId,
                                                        "serverUrl": metadata.serverUrl,
                                                        "account": metadata.account])
             start()
-
         }, progressHandler: { progress in
-
             NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterProgressTask),
                                             object: nil,
                                             userInfo: ["account": metadata.account,
@@ -102,13 +93,11 @@ extension NCNetworking {
                                                        "progress": NSNumber(value: progress.fractionCompleted),
                                                        "totalBytes": NSNumber(value: progress.totalUnitCount),
                                                        "totalBytesExpected": NSNumber(value: progress.completedUnitCount)])
-
             progressHandler(progress)
-
         }) { _, etag, date, length, allHeaderFields, afError, error in
-
             var error = error
-            var dateLastModified: NSDate?
+            var dateLastModified: Date?
+
             self.downloadRequest.removeValue(forKey: fileNameLocalPath)
             // this delay was added because for small file the "taskHandler: { task" is not called, so this part of code is not executed
             NextcloudKit.shared.nkCommonInstance.backgroundQueue.asyncAfter(deadline: .now() + 0.5) {
@@ -131,7 +120,6 @@ extension NCNetworking {
                                           requestHandler: @escaping (_ request: DownloadRequest) -> Void = { _ in },
                                           progressHandler: @escaping (_ progress: Progress) -> Void = { _ in },
                                           completion: @escaping (_ afError: AFError?, _ error: NKError) -> Void = { _, _ in }) {
-
         let session: URLSession = sessionManagerDownloadBackground
         let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
         let fileNameLocalPath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
@@ -139,22 +127,17 @@ extension NCNetworking {
         start()
 
         if let task = nkBackground.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, session: session) {
-
             NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Download file \(metadata.fileNameView) with task with taskIdentifier \(task.taskIdentifier)")
-
             NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                        status: NCGlobal.shared.metadataStatusDownloading,
                                                        taskIdentifier: task.taskIdentifier)
-
             NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterDownloadStartFile),
                                             object: nil,
                                             userInfo: ["ocId": metadata.ocId,
                                                        "serverUrl": metadata.serverUrl,
                                                        "account": metadata.account])
             completion(nil, NKError())
-
         } else {
-
             NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                        session: "",
                                                        sessionError: "",
@@ -165,7 +148,6 @@ extension NCNetworking {
     }
 
     func downloadingFinish(_ session: URLSession, downloadTask: URLSessionDownloadTask, didFinishDownloadingTo location: URL) {
-
         if let httpResponse = (downloadTask.response as? HTTPURLResponse) {
             if httpResponse.statusCode >= 200 && httpResponse.statusCode < 300,
                let url = downloadTask.currentRequest?.url,
@@ -183,11 +165,14 @@ extension NCNetworking {
     func downloadComplete(fileName: String,
                           serverUrl: String,
                           etag: String?,
-                          date: NSDate?,
-                          dateLastModified: NSDate?,
+                          date: Date?,
+                          dateLastModified: Date?,
                           length: Int64,
                           task: URLSessionTask,
                           error: NKError) {
+        if let delegate {
+            return delegate.downloadComplete(fileName: fileName, serverUrl: serverUrl, etag: etag, date: date, dateLastModified: dateLastModified, length: length, task: task, error: error)
+        }
 
         DispatchQueue.global(qos: .userInteractive).async {
             guard let url = task.currentRequest?.url,
@@ -196,7 +181,6 @@ extension NCNetworking {
             self.downloadMetadataInBackground.removeValue(forKey: FileNameServerUrl(fileName: fileName, serverUrl: serverUrl))
 
             if error == .success {
-
                 self.removeTransferInError(ocId: metadata.ocId)
 #if !EXTENSION
                 if let result = NCManageDatabase.shared.getE2eEncryption(predicate: NSPredicate(format: "fileNameIdentifier == %@ AND serverUrl == %@", metadata.fileName, metadata.serverUrl)) {
@@ -216,9 +200,7 @@ extension NCNetworking {
                                                            "account": metadata.account,
                                                            "selector": metadata.sessionSelector,
                                                            "error": error])
-
             } else if error.errorCode == NSURLErrorCancelled || error.errorCode == NCGlobal.shared.errorRequestExplicityCancelled {
-
                 self.removeTransferInError(ocId: metadata.ocId)
                 NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                            session: "",
@@ -230,9 +212,7 @@ extension NCNetworking {
                                                 userInfo: ["ocId": metadata.ocId,
                                                            "serverUrl": metadata.serverUrl,
                                                            "account": metadata.account])
-
             } else {
-
                 self.transferInError(ocId: metadata.ocId)
                 NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                            session: "",
@@ -257,8 +237,11 @@ extension NCNetworking {
                           serverUrl: String,
                           session: URLSession,
                           task: URLSessionTask) {
+        if let delegate {
+            return delegate.downloadProgress(progress, totalBytes: totalBytes, totalBytesExpected: totalBytesExpected, fileName: fileName, serverUrl: serverUrl, session: session, task: task)
+        }
 
-        DispatchQueue.global().async {
+        DispatchQueue.global(qos: .userInteractive).async {
             var metadata: tableMetadata?
 
             if let metadataTmp = self.downloadMetadataInBackground[FileNameServerUrl(fileName: fileName, serverUrl: serverUrl)] {
@@ -332,7 +315,6 @@ extension NCNetworking {
 }
 
 class NCOperationDownload: ConcurrentOperation {
-
     var metadata: tableMetadata
     var selector: String
 
@@ -342,7 +324,6 @@ class NCOperationDownload: ConcurrentOperation {
     }
 
     override func start() {
-
         guard !isCancelled else { return self.finish() }
 
         metadata.session = NextcloudKit.shared.nkCommonInstance.sessionIdentifierDownload
diff --git a/iOSClient/Networking/NCNetworking+LivePhoto.swift b/iOSClient/Networking/NCNetworking+LivePhoto.swift
index 057eeabe63..8d5f4fab17 100644
--- a/iOSClient/Networking/NCNetworking+LivePhoto.swift
+++ b/iOSClient/Networking/NCNetworking+LivePhoto.swift
@@ -28,9 +28,7 @@ import Alamofire
 import Queuer
 
 extension NCNetworking {
-
     func uploadLivePhoto(metadata: tableMetadata, userInfo aUserInfo: [AnyHashable: Any]) {
-
         guard let metadata1 = NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "account == %@ AND urlBase == %@ AND path == %@ AND fileName == %@", metadata.account, metadata.urlBase, metadata.path, metadata.livePhotoFile)) else {
             metadata.livePhotoFile = ""
             NCManageDatabase.shared.addMetadata(metadata)
@@ -43,7 +41,7 @@ extension NCNetworking {
         Task {
             let serverUrlfileNamePath = metadata.urlBase + metadata.path + metadata.fileName
             var livePhotoFile = metadata1.fileId
-            let results = await NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: livePhotoFile)
+            let results = await setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: livePhotoFile)
             if results.error == .success {
                 NCManageDatabase.shared.setMetadataLivePhotoByServer(account: metadata.account, ocId: metadata.ocId, livePhotoFile: livePhotoFile)
             } else {
@@ -52,7 +50,7 @@ extension NCNetworking {
 
             let serverUrlfileNamePath1 = metadata1.urlBase + metadata1.path + metadata1.fileName
             livePhotoFile = metadata.fileId
-            let results1 = await NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath1, livePhotoFile: livePhotoFile)
+            let results1 = await setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath1, livePhotoFile: livePhotoFile)
             if results1.error == .success {
                 NCManageDatabase.shared.setMetadataLivePhotoByServer(account: metadata1.account, ocId: metadata1.ocId, livePhotoFile: livePhotoFile)
             } else {
@@ -69,9 +67,7 @@ extension NCNetworking {
     }
 
     func convertLivePhoto(metadata: tableMetadata) {
-
         guard metadata.status == NCGlobal.shared.metadataStatusNormal else { return }
-
         let account = metadata.account
         let livePhotoFile = metadata.livePhotoFile
         let serverUrlfileNamePath = metadata.urlBase + metadata.path + metadata.fileName
@@ -88,7 +84,6 @@ extension NCNetworking {
 }
 
 class NCOperationConvertLivePhoto: ConcurrentOperation {
-
     var serverUrlfileNamePath, livePhotoFile, account, ocId: String
 
     init(serverUrlfileNamePath: String, livePhotoFile: String, account: String, ocId: String) {
@@ -99,8 +94,10 @@ class NCOperationConvertLivePhoto: ConcurrentOperation {
     }
 
     override func start() {
+        guard !isCancelled else {
+            return self.finish()
+        }
 
-        guard !isCancelled else { return self.finish() }
         NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: livePhotoFile, options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { _, error in
             if error == .success {
                 NCManageDatabase.shared.setMetadataLivePhotoByServer(account: self.account, ocId: self.ocId, livePhotoFile: self.livePhotoFile)
diff --git a/iOSClient/Networking/NCNetworking+Synchronization.swift b/iOSClient/Networking/NCNetworking+Synchronization.swift
index c0ed548d74..23d887e8fd 100644
--- a/iOSClient/Networking/NCNetworking+Synchronization.swift
+++ b/iOSClient/Networking/NCNetworking+Synchronization.swift
@@ -32,17 +32,17 @@ extension NCNetworking {
                          serverUrl: String,
                          add: Bool,
                          completion: @escaping (_ errorCode: Int, _ items: Int) -> Void = { _, _ in }) {
-
         let startDate = Date()
         let options = NKRequestOptions(timeout: 120, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)
+
         NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrl,
                                              depth: "infinity",
                                              showHiddenFiles: NCKeychain().showHiddenFiles,
                                              options: options) { resultAccount, files, _, error in
-
             guard account == resultAccount else { return }
             var metadatasDirectory: [tableMetadata] = []
             var metadatasSynchronizationOffline: [tableMetadata] = []
+
             if !add {
                 if NCManageDatabase.shared.getResultMetadata(predicate: NSPredicate(format: "account == %@ AND sessionSelector == %@ AND (status == %d OR status == %d)", account, NCGlobal.shared.selectorSynchronizationOffline, NCGlobal.shared.metadataStatusWaitDownload, NCGlobal.shared.metadataStatusDownloading)) != nil { return }
             }
diff --git a/iOSClient/Networking/NCNetworking+Upload.swift b/iOSClient/Networking/NCNetworking+Upload.swift
index f7309f5f27..fa079d4d6c 100644
--- a/iOSClient/Networking/NCNetworking+Upload.swift
+++ b/iOSClient/Networking/NCNetworking+Upload.swift
@@ -27,7 +27,6 @@ import NextcloudKit
 import Alamofire
 
 extension NCNetworking {
-
     func upload(metadata: tableMetadata,
                 uploadE2EEDelegate: uploadE2EEDelegate? = nil,
                 hudView: UIView?,
@@ -36,7 +35,6 @@ extension NCNetworking {
                 requestHandler: @escaping (_ request: UploadRequest) -> Void = { _ in },
                 progressHandler: @escaping (_ totalBytesExpected: Int64, _ totalBytes: Int64, _ fractionCompleted: Double) -> Void = { _, _, _ in },
                 completion: @escaping (_ afError: AFError?, _ error: NKError) -> Void = { _, _ in }) {
-
         let metadata = tableMetadata.init(value: metadata)
         var numChunks: Int = 0
         NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Upload file \(metadata.fileNameView) with Identifier \(metadata.assetLocalIdentifier) with size \(metadata.size) [CHUNK \(metadata.chunk), E2EE \(metadata.isDirectoryE2EE)]")
@@ -115,8 +113,7 @@ extension NCNetworking {
                     start: @escaping () -> Void = { },
                     requestHandler: @escaping (_ request: UploadRequest) -> Void = { _ in },
                     progressHandler: @escaping (_ totalBytesExpected: Int64, _ totalBytes: Int64, _ fractionCompleted: Double) -> Void = { _, _, _ in },
-                    completion: @escaping (_ account: String, _ ocId: String?, _ etag: String?, _ date: NSDate?, _ size: Int64, _ allHeaderFields: [AnyHashable: Any]?, _ afError: AFError?, _ error: NKError) -> Void) {
-
+                    completion: @escaping (_ account: String, _ ocId: String?, _ etag: String?, _ date: Date?, _ size: Int64, _ allHeaderFields: [AnyHashable: Any]?, _ afError: AFError?, _ error: NKError) -> Void) {
         let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
         let options = NKRequestOptions(customHeader: customHeaders, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)
 
@@ -126,9 +123,7 @@ extension NCNetworking {
             NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                        status: NCGlobal.shared.metadataStatusUploading)
             requestHandler(request)
-
         }, taskHandler: { task in
-
             NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                        taskIdentifier: task.taskIdentifier)
 
@@ -140,9 +135,7 @@ extension NCNetworking {
                                                        "fileName": metadata.fileName,
                                                        "sessionSelector": metadata.sessionSelector])
             start()
-
         }, progressHandler: { progress in
-
             NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterProgressTask),
                                             object: nil,
                                             userInfo: ["account": metadata.account,
@@ -153,11 +146,8 @@ extension NCNetworking {
                                                        "progress": NSNumber(value: progress.fractionCompleted),
                                                        "totalBytes": NSNumber(value: progress.totalUnitCount),
                                                        "totalBytesExpected": NSNumber(value: progress.completedUnitCount)])
-
             progressHandler(progress.completedUnitCount, progress.totalUnitCount, progress.fractionCompleted)
-
         }) { account, ocId, etag, date, size, allHeaderFields, afError, error in
-
             var error = error
             self.uploadRequest.removeValue(forKey: fileNameLocalPath)
             if withUploadComplete {
@@ -178,12 +168,10 @@ extension NCNetworking {
                          start: @escaping () -> Void = { },
                          progressHandler: @escaping (_ totalBytesExpected: Int64, _ totalBytes: Int64, _ fractionCompleted: Double) -> Void = { _, _, _ in },
                          completion: @escaping (_ account: String, _ file: NKFile?, _ afError: AFError?, _ error: NKError) -> Void) {
-
         let directory = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId)
         let fileNameLocalPath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
         let chunkFolder = NCManageDatabase.shared.getChunkFolder(account: metadata.account, ocId: metadata.ocId)
         let filesChunk = NCManageDatabase.shared.getChunks(account: metadata.account, ocId: metadata.ocId)
-
         var chunkSize = NCGlobal.shared.chunkSizeMBCellular
         if NCNetworking.shared.networkReachability == NKCommon.TypeReachability.reachableEthernetOrWiFi {
             chunkSize = NCGlobal.shared.chunkSizeMBEthernetOrWiFi
@@ -191,15 +179,10 @@ extension NCNetworking {
         let options = NKRequestOptions(customHeader: customHeaders, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)
 
         NextcloudKit.shared.uploadChunk(directory: directory, fileName: metadata.fileName, date: metadata.date as Date, creationDate: metadata.creationDate as Date, serverUrl: metadata.serverUrl, chunkFolder: chunkFolder, filesChunk: filesChunk, chunkSize: chunkSize, options: options) { num in
-
             numChunks(num)
-
         } counterChunk: { counter in
-
             counterChunk(counter)
-
         } start: { filesChunk in
-
             start()
             NCManageDatabase.shared.addChunks(account: metadata.account, ocId: metadata.ocId, chunkFolder: chunkFolder, filesChunk: filesChunk)
             NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterUploadStartFile),
@@ -209,20 +192,14 @@ extension NCNetworking {
                                                        "account": metadata.account,
                                                        "fileName": metadata.fileName,
                                                        "sessionSelector": metadata.sessionSelector])
-
         } requestHandler: { request in
-
             self.uploadRequest[fileNameLocalPath] = request
             NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                        status: NCGlobal.shared.metadataStatusUploading)
-
         } taskHandler: { task in
-
             NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                        taskIdentifier: task.taskIdentifier)
-
         } progressHandler: { totalBytesExpected, totalBytes, fractionCompleted in
-
             NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterProgressTask),
                                             object: nil,
                                             userInfo: ["account": metadata.account,
@@ -237,13 +214,9 @@ extension NCNetworking {
                                                        "totalBytesExpected": NSNumber(value: totalBytesExpected)])
 
             progressHandler(totalBytesExpected, totalBytes, fractionCompleted)
-
         } uploaded: { fileChunk in
-
             NCManageDatabase.shared.deleteChunk(account: metadata.account, ocId: metadata.ocId, fileChunk: fileChunk, directory: directory)
-
         } completion: { account, _, file, afError, error in
-
             self.uploadRequest.removeValue(forKey: fileNameLocalPath)
             if error == .success {
                 NCManageDatabase.shared.deleteChunks(account: account, ocId: metadata.ocId, directory: directory)
@@ -273,20 +246,15 @@ extension NCNetworking {
 
         // Check file dim > 0
         if utilityFileSystem.getFileSize(filePath: fileNameLocalPath) == 0 && metadata.size != 0 {
-
             NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
             completion(NKError(errorCode: NCGlobal.shared.errorResourceNotFound, errorDescription: NSLocalizedString("_error_not_found_", value: "The requested resource could not be found", comment: "")))
-
         } else {
-
             if let task = nkBackground.upload(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, dateCreationFile: metadata.creationDate as Date, dateModificationFile: metadata.date as Date, session: session!) {
 
                 NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Upload file \(metadata.fileNameView) with task with taskIdentifier \(task.taskIdentifier)")
-
                 NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                            status: NCGlobal.shared.metadataStatusUploading,
                                                            taskIdentifier: task.taskIdentifier)
-
                 NotificationCenter.default.post(name: Notification.Name(rawValue: NCGlobal.shared.notificationCenterUploadStartFile),
                                                 object: nil,
                                                 userInfo: ["ocId": metadata.ocId,
@@ -295,9 +263,7 @@ extension NCNetworking {
                                                            "fileName": metadata.fileName,
                                                            "sessionSelector": metadata.sessionSelector])
                 completion(NKError())
-
             } else {
-
                 NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
                 completion(NKError(errorCode: NCGlobal.shared.errorResourceNotFound, errorDescription: "task null"))
             }
@@ -308,10 +274,14 @@ extension NCNetworking {
                         serverUrl: String,
                         ocId: String?,
                         etag: String?,
-                        date: NSDate?,
+                        date: Date?,
                         size: Int64,
                         task: URLSessionTask,
                         error: NKError) {
+        if let delegate {
+            return delegate.uploadComplete(fileName: fileName, serverUrl: serverUrl, ocId: ocId, etag: etag, date: date, size: size, task: task, error: error)
+        }
+
         guard let url = task.currentRequest?.url,
               let metadata = NCManageDatabase.shared.getMetadata(from: url, sessionTaskIdentifier: task.taskIdentifier) else { return }
         uploadComplete(metadata: metadata, ocId: ocId, etag: etag, date: date, size: size, error: error)
@@ -320,28 +290,25 @@ extension NCNetworking {
     func uploadComplete(metadata: tableMetadata,
                         ocId: String?,
                         etag: String?,
-                        date: NSDate?,
+                        date: Date?,
                         size: Int64,
                         error: NKError) {
-
         DispatchQueue.main.async {
             var isApplicationStateActive = false
 #if !EXTENSION
             isApplicationStateActive = UIApplication.shared.applicationState == .active
 #endif
             DispatchQueue.global(qos: .userInteractive).async {
-
                 let ocIdTemp = metadata.ocId
                 let selector = metadata.sessionSelector
 
                 self.uploadMetadataInBackground.removeValue(forKey: FileNameServerUrl(fileName: metadata.fileName, serverUrl: metadata.serverUrl))
 
                 if error == .success, let ocId = ocId, size == metadata.size {
-
                     self.removeTransferInError(ocId: ocIdTemp)
 
                     let metadata = tableMetadata.init(value: metadata)
-                    metadata.uploadDate = date ?? NSDate()
+                    metadata.uploadDate = (date as? NSDate) ?? NSDate()
                     metadata.etag = etag ?? ""
                     metadata.ocId = ocId
                     metadata.chunk = 0
@@ -375,9 +342,7 @@ extension NCNetworking {
                                                         userInfo: userInfo)
                     }
                 } else {
-
                     if error.errorCode == NSURLErrorCancelled || error.errorCode == NCGlobal.shared.errorRequestExplicityCancelled {
-
                         self.removeTransferInError(ocId: ocIdTemp)
                         self.utilityFileSystem.removeFile(atPath: self.utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId))
                         NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
@@ -386,9 +351,7 @@ extension NCNetworking {
                                                         userInfo: ["ocId": metadata.ocId,
                                                                    "serverUrl": metadata.serverUrl,
                                                                    "account": metadata.account])
-
                     } else if error.errorCode == NCGlobal.shared.errorBadRequest || error.errorCode == NCGlobal.shared.errorUnsupportedMediaType {
-
                         self.removeTransferInError(ocId: ocIdTemp)
                         self.utilityFileSystem.removeFile(atPath: self.utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId))
                         NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
@@ -403,9 +366,7 @@ extension NCNetworking {
 
                         // Client Diagnostic
                         NCManageDatabase.shared.addDiagnostic(account: metadata.account, issue: NCGlobal.shared.diagnosticIssueVirusDetected)
-
                     } else if error.errorCode == NCGlobal.shared.errorForbidden && isApplicationStateActive {
-
                         self.removeTransferInError(ocId: ocIdTemp)
 #if !EXTENSION
                         DispatchQueue.main.async {
@@ -448,7 +409,6 @@ extension NCNetworking {
                         }
 #endif
                     } else {
-
                         self.transferInError(ocId: metadata.ocId)
                         NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId,
                                                                    sessionError: error.errorDescription,
@@ -482,8 +442,11 @@ extension NCNetworking {
                         serverUrl: String,
                         session: URLSession,
                         task: URLSessionTask) {
+        if let delegate {
+            return delegate.uploadProgress(progress, totalBytes: totalBytes, totalBytesExpected: totalBytesExpected, fileName: fileName, serverUrl: serverUrl, session: session, task: task)
+        }
 
-        DispatchQueue.global().async {
+        DispatchQueue.global(qos: .userInteractive).async {
             var metadata: tableMetadata?
 
             if let metadataTmp = self.uploadMetadataInBackground[FileNameServerUrl(fileName: fileName, serverUrl: serverUrl)] {
diff --git a/iOSClient/Networking/NCNetworking+WebDAV.swift b/iOSClient/Networking/NCNetworking+WebDAV.swift
index 29afb1d7f2..99d8a59f7e 100644
--- a/iOSClient/Networking/NCNetworking+WebDAV.swift
+++ b/iOSClient/Networking/NCNetworking+WebDAV.swift
@@ -37,7 +37,6 @@ extension NCNetworking {
                     forceReplaceMetadatas: Bool = false,
                     taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
                     completion: @escaping (_ account: String, _ metadataFolder: tableMetadata?, _ metadatas: [tableMetadata]?, _ metadatasDifferentCount: Int, _ metadatasModified: Int, _ error: NKError) -> Void) {
-
         NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrl,
                                              depth: "1",
                                              showHiddenFiles: NCKeychain().showHiddenFiles,
@@ -45,16 +44,13 @@ extension NCNetworking {
                                              options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { task in
             taskHandler(task)
         } completion: { account, files, _, error in
-
             guard error == .success else {
                 return completion(account, nil, nil, 0, 0, error)
             }
 
             NCManageDatabase.shared.convertFilesToMetadatas(files, useFirstAsMetadataFolder: true) { metadataFolder, metadatas in
-
                 NCManageDatabase.shared.addMetadata(metadataFolder)
                 NCManageDatabase.shared.addDirectory(e2eEncrypted: metadataFolder.e2eEncrypted, favorite: metadataFolder.favorite, ocId: metadataFolder.ocId, fileId: metadataFolder.fileId, etag: metadataFolder.etag, permissions: metadataFolder.permissions, richWorkspace: metadataFolder.richWorkspace, serverUrl: serverUrl, account: metadataFolder.account)
-
 #if !EXTENSION
                 // Convert Live Photo
                 for metadata in metadatas {
@@ -63,7 +59,6 @@ extension NCNetworking {
                     }
                 }
 #endif
-
                 let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND status == %d", account, serverUrl, NCGlobal.shared.metadataStatusNormal)
 
                 if forceReplaceMetadatas {
@@ -82,7 +77,6 @@ extension NCNetworking {
                   queue: DispatchQueue = NextcloudKit.shared.nkCommonInstance.backgroundQueue,
                   taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
                   completion: @escaping (_ account: String, _ metadata: tableMetadata?, _ error: NKError) -> Void) {
-
         let options = NKRequestOptions(queue: queue)
 
         NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName, depth: "0", showHiddenFiles: showHiddenFiles, options: options) { task in
@@ -92,7 +86,6 @@ extension NCNetworking {
                 completion(account, nil, error)
                 return
             }
-
             let isDirectoryE2EE = self.utilityFileSystem.isDirectoryE2EE(file: file)
             let metadata = NCManageDatabase.shared.convertFileToMetadata(file, isDirectoryE2EE: isDirectoryE2EE)
 
@@ -102,20 +95,11 @@ extension NCNetworking {
 
     func fileExists(serverUrlFileName: String,
                     completion: @escaping (_ account: String, _ exists: Bool?, _ file: NKFile?, _ error: NKError) -> Void) {
-
-        let requestBody =
-        """
-        <?xml version=\"1.0\" encoding=\"UTF-8\"?>
-        <d:propfind xmlns:d=\"DAV:\" xmlns:oc=\"http://owncloud.org/ns\" xmlns:nc=\"http://nextcloud.org/ns\">
-            <d:prop></d:prop>
-        </d:propfind>
-        """
+        let options = NKRequestOptions(timeout: 10, createProperties: [], queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)
 
         NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrlFileName,
                                              depth: "0",
-                                             requestBody: requestBody.data(using: .utf8),
-                                             options: NKRequestOptions(timeout: 10, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, files, _, error in
-
+                                             options: options) { account, files, _, error in
             if error == .success, let file = files.first {
                 completion(account, true, file, error)
             } else if error.errorCode == NCGlobal.shared.errorResourceNotFound {
@@ -127,7 +111,6 @@ extension NCNetworking {
     }
 
     func fileExists(serverUrlFileName: String) async -> (account: String, exists: Bool?, file: NKFile?, error: NKError) {
-
         await withUnsafeContinuation({ continuation in
             fileExists(serverUrlFileName: serverUrlFileName) { account, exists, file, error in
                 continuation.resume(returning: (account, exists, file, error))
@@ -136,7 +119,6 @@ extension NCNetworking {
     }
 
     func createFileName(fileNameBase: String, account: String, serverUrl: String) async -> String {
-
         var exitLoop = false
         var resultFileName = fileNameBase
 
@@ -198,7 +180,6 @@ extension NCNetworking {
                       withPush: Bool,
                       sceneIdentifier: String?,
                       completion: @escaping (_ error: NKError) -> Void) {
-
         let isDirectoryEncrypted = utilityFileSystem.isDirectoryE2EE(account: account, urlBase: urlBase, userId: userId, serverUrl: serverUrl)
         let fileName = fileName.trimmingCharacters(in: .whitespacesAndNewlines)
 
@@ -222,14 +203,13 @@ extension NCNetworking {
                                    withPush: Bool,
                                    sceneIdentifier: String?,
                                    completion: @escaping (_ error: NKError) -> Void) {
-
         var fileNameFolder = utility.removeForbiddenCharacters(fileName)
+
         if fileName != fileNameFolder {
             let errorDescription = String(format: NSLocalizedString("_forbidden_characters_", comment: ""), NCGlobal.shared.forbiddenCharacters.joined(separator: " "))
             let error = NKError(errorCode: NCGlobal.shared.errorConflict, errorDescription: errorDescription)
             return completion(error)
         }
-
         if !overwrite {
             fileNameFolder = utilityFileSystem.createFileName(fileNameFolder, serverUrl: serverUrl, account: account)
         }
@@ -249,7 +229,6 @@ extension NCNetworking {
             }
 
             self.readFile(serverUrlFileName: fileNameFolderUrl) { account, metadataFolder, error in
-
                 if error == .success {
                     if let metadata = metadataFolder {
                         NCManageDatabase.shared.addMetadata(metadata)
@@ -271,7 +250,6 @@ extension NCNetworking {
                       userId: String,
                       withPush: Bool,
                       sceneIdentifier: String? = nil) -> Bool {
-
         let autoUploadPath = NCManageDatabase.shared.getAccountAutoUploadPath(urlBase: urlBase, userId: userId, account: account)
         let serverUrlBase = NCManageDatabase.shared.getAccountAutoUploadDirectory(urlBase: urlBase, userId: userId, account: account)
         let fileNameBase = NCManageDatabase.shared.getAccountAutoUploadFileName()
@@ -329,13 +307,10 @@ extension NCNetworking {
     // MARK: - Delete
 
     func deleteMetadata(_ metadata: tableMetadata, onlyLocalCache: Bool) async -> (NKError) {
-
         if onlyLocalCache {
-
 #if !EXTENSION
             NCActivityIndicator.shared.start()
 #endif
-
             func delete(metadata: tableMetadata) {
                 if let metadataLive = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata) {
                     NCManageDatabase.shared.deleteLocalFile(predicate: NSPredicate(format: "account == %@ AND ocId == %@", metadataLive.account, metadataLive.ocId))
@@ -356,7 +331,6 @@ extension NCNetworking {
             } else {
                 delete(metadata: metadata)
             }
-
 #if !EXTENSION
             NCActivityIndicator.shared.stop()
 #endif
@@ -393,7 +367,6 @@ extension NCNetworking {
     }
 
     func deleteMetadataPlain(_ metadata: tableMetadata, customHeader: [String: String]? = nil) async -> NKError {
-
         // verify permission
         let permission = utility.permissionsContainsString(metadata.permissions, permissions: NCPermissions().permissionCanDelete)
         if !metadata.permissions.isEmpty && permission == false {
@@ -401,10 +374,9 @@ extension NCNetworking {
         }
         let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
         let options = NKRequestOptions(customHeader: customHeader)
+        let result = await NCNetworking.shared.deleteFileOrFolder(serverUrlFileName: serverUrlFileName, options: options)
 
-        let result = await NextcloudKit.shared.deleteFileOrFolder(serverUrlFileName: serverUrlFileName, options: options)
         if result.error == .success || result.error.errorCode == NCGlobal.shared.errorResourceNotFound {
-
             do {
                 try FileManager.default.removeItem(atPath: utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId))
             } catch { }
@@ -437,7 +409,6 @@ extension NCNetworking {
                         indexPath: IndexPath,
                         viewController: UIViewController?,
                         completion: @escaping (_ error: NKError) -> Void) {
-
         let metadataLive = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata)
         let fileNameNew = fileNameNew.trimmingCharacters(in: .whitespacesAndNewlines)
         let fileNameNewLive = (fileNameNew as NSString).deletingPathExtension + ".mov"
@@ -478,7 +449,6 @@ extension NCNetworking {
                                      fileNameNew: String,
                                      indexPath: IndexPath,
                                      completion: @escaping (_ error: NKError) -> Void) {
-
         let permission = utility.permissionsContainsString(metadata.permissions, permissions: NCPermissions().permissionCanRename)
         if !metadata.permissions.isEmpty && !permission {
             return completion(NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_no_permission_modify_file_"))
@@ -525,7 +495,6 @@ extension NCNetworking {
     // MARK: - Move
 
     func moveMetadata(_ metadata: tableMetadata, serverUrlTo: String, overwrite: Bool) async -> NKError {
-
         if let metadataLive = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata), metadata.isNotFlaggedAsLivePhotoByServer {
             let error = await moveMetadataPlain(metadataLive, serverUrlTo: serverUrlTo, overwrite: overwrite)
             if error == .success {
@@ -538,7 +507,6 @@ extension NCNetworking {
     }
 
     private func moveMetadataPlain(_ metadata: tableMetadata, serverUrlTo: String, overwrite: Bool) async -> NKError {
-
         let permission = utility.permissionsContainsString(metadata.permissions, permissions: NCPermissions().permissionCanRename)
         if !metadata.permissions.isEmpty && !permission {
             return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_no_permission_modify_file_")
@@ -546,7 +514,7 @@ extension NCNetworking {
         let serverUrlFileNameSource = metadata.serverUrl + "/" + metadata.fileName
         let serverUrlFileNameDestination = serverUrlTo + "/" + metadata.fileName
 
-        let result = await NextcloudKit.shared.moveFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite)
+        let result = await NCNetworking.shared.moveFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite)
         if result.error == .success {
             if metadata.directory {
                 NCManageDatabase.shared.deleteDirectoryAndSubDirectory(serverUrl: utilityFileSystem.stringAppendServerUrl(metadata.serverUrl, addFileName: metadata.fileName), account: result.account)
@@ -574,7 +542,6 @@ extension NCNetworking {
     // MARK: - Copy
 
     func copyMetadata(_ metadata: tableMetadata, serverUrlTo: String, overwrite: Bool) async -> NKError {
-
         if let metadataLive = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata), metadata.isNotFlaggedAsLivePhotoByServer {
             let error = await copyMetadataPlain(metadataLive, serverUrlTo: serverUrlTo, overwrite: overwrite)
             if error == .success {
@@ -587,7 +554,6 @@ extension NCNetworking {
     }
 
     private func copyMetadataPlain(_ metadata: tableMetadata, serverUrlTo: String, overwrite: Bool) async -> NKError {
-
         let permission = utility.permissionsContainsString(metadata.permissions, permissions: NCPermissions().permissionCanRename)
         if !metadata.permissions.isEmpty && !permission {
             return NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_no_permission_modify_file_")
@@ -595,7 +561,7 @@ extension NCNetworking {
         let serverUrlFileNameSource = metadata.serverUrl + "/" + metadata.fileName
         let serverUrlFileNameDestination = serverUrlTo + "/" + metadata.fileName
 
-        let result = await NextcloudKit.shared.copyFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite)
+        let result = await NCNetworking.shared.copyFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite)
         return result.error
     }
 
@@ -603,7 +569,6 @@ extension NCNetworking {
 
     func favoriteMetadata(_ metadata: tableMetadata,
                           completion: @escaping (_ error: NKError) -> Void) {
-
         if let metadataLive = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata) {
             favoriteMetadataPlain(metadataLive) { error in
                 if error == .success {
@@ -619,7 +584,6 @@ extension NCNetworking {
 
     private func favoriteMetadataPlain(_ metadata: tableMetadata,
                                        completion: @escaping (_ error: NKError) -> Void) {
-
         let fileName = utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId)
         let favorite = !metadata.favorite
         let ocId = metadata.ocId
@@ -637,7 +601,6 @@ extension NCNetworking {
     // MARK: - Lock Files
 
     func lockUnlockFile(_ metadata: tableMetadata, shoulLock: Bool) {
-
         NextcloudKit.shared.lockUnlockFile(serverUrlFileName: metadata.serverUrl + "/" + metadata.fileName, shouldLock: shoulLock) { _, error in
             // 0: lock was successful; 412: lock did not change, no error, refresh
             guard error == .success || error.errorCode == NCGlobal.shared.errorPreconditionFailed else {
@@ -657,7 +620,6 @@ extension NCNetworking {
 
     func getVideoUrl(metadata: tableMetadata,
                      completition: @escaping (_ url: URL?, _ autoplay: Bool, _ error: NKError) -> Void) {
-
         if !metadata.url.isEmpty {
             if metadata.url.hasPrefix("/") {
                 completition(URL(fileURLWithPath: metadata.url), true, .success)
@@ -681,18 +643,6 @@ extension NCNetworking {
         }
     }
 
-    // MARK: - Get Preview
-
-    func getPreview(url: URL,
-                    options: NKRequestOptions = NKRequestOptions()) async -> (account: String, data: Data?, error: NKError) {
-
-        await withUnsafeContinuation({ continuation in
-            NextcloudKit.shared.getPreview(url: url, options: options) { account, data, error in
-                continuation.resume(returning: (account: account, data: data, error: error))
-            }
-        })
-    }
-
     // MARK: - Search
 
     /// WebDAV search
@@ -700,7 +650,6 @@ extension NCNetworking {
                      literal: String,
                      taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
                      completion: @escaping (_ metadatas: [tableMetadata]?, _ error: NKError) -> Void) {
-
         NextcloudKit.shared.searchLiteral(serverUrl: urlBase.urlBase,
                                           depth: "infinity",
                                           literal: literal,
@@ -725,7 +674,6 @@ extension NCNetworking {
                             providers: @escaping (_ accout: String, _ searchProviders: [NKSearchProvider]?) -> Void,
                             update: @escaping (_ account: String, _ id: String, NKSearchResult?, [tableMetadata]?) -> Void,
                             completion: @escaping (_ account: String, _ error: NKError) -> Void) {
-
         let dispatchGroup = DispatchGroup()
         dispatchGroup.enter()
         dispatchGroup.notify(queue: .main) {
@@ -802,7 +750,6 @@ extension NCNetworking {
                                     limit: Int, cursor: Int,
                                     taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
                                     completion: @escaping (_ account: String, _ searchResult: NKSearchResult?, _ metadatas: [tableMetadata]?, _ error: NKError) -> Void) {
-
         var metadatas: [tableMetadata] = []
 
         let request = NextcloudKit.shared.searchProvider(id, account: userBaseUrl.account, term: term, limit: limit, cursor: cursor, timeout: 60) { task in
@@ -869,8 +816,8 @@ extension NCNetworking {
                               filePath: String,
                               dispatchGroup: DispatchGroup? = nil,
                               completion: @escaping (String, tableMetadata, NKError) -> Void) {
-
         let urlPath = userBaseUrl.urlBase + "/remote.php/dav/files/" + userBaseUrl.user + filePath
+
         dispatchGroup?.enter()
         self.readFile(serverUrlFileName: urlPath) { account, metadata, error in
             defer { dispatchGroup?.leave() }
@@ -883,6 +830,7 @@ extension NCNetworking {
 
     func cancelDataTask() {
         let sessionManager = NextcloudKit.shared.sessionManager
+
         sessionManager.session.getTasksWithCompletionHandler { dataTasks, _, _ in
             dataTasks.forEach {
                 $0.cancel()
@@ -892,7 +840,6 @@ extension NCNetworking {
 }
 
 class NCOperationDownloadAvatar: ConcurrentOperation {
-
     var user: String
     var fileName: String
     var etag: String?
@@ -910,7 +857,6 @@ class NCOperationDownloadAvatar: ConcurrentOperation {
     }
 
     override func start() {
-
         guard !isCancelled else { return self.finish() }
 
         NextcloudKit.shared.downloadAvatar(user: user,
@@ -919,7 +865,6 @@ class NCOperationDownloadAvatar: ConcurrentOperation {
                                            avatarSizeRounded: NCGlobal.shared.avatarSizeRounded,
                                            etag: self.etag,
                                            options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { _, imageAvatar, _, etag, error in
-
             if error == .success, let imageAvatar {
                 NCManageDatabase.shared.addAvatar(fileName: self.fileName, etag: etag ?? "")
                 DispatchQueue.main.async {
diff --git a/iOSClient/Networking/NCNetworking.swift b/iOSClient/Networking/NCNetworking.swift
index 3079f7c24a..b175e8055d 100644
--- a/iOSClient/Networking/NCNetworking.swift
+++ b/iOSClient/Networking/NCNetworking.swift
@@ -31,6 +31,13 @@ import Queuer
 @objc protocol uploadE2EEDelegate: AnyObject { }
 #endif
 
+@objc protocol NCNetworkingDelegate {
+    func downloadProgress(_ progress: Float, totalBytes: Int64, totalBytesExpected: Int64, fileName: String, serverUrl: String, session: URLSession, task: URLSessionTask)
+    func uploadProgress(_ progress: Float, totalBytes: Int64, totalBytesExpected: Int64, fileName: String, serverUrl: String, session: URLSession, task: URLSessionTask)
+    func downloadComplete(fileName: String, serverUrl: String, etag: String?, date: Date?, dateLastModified: Date?, length: Int64, task: URLSessionTask, error: NKError)
+    func uploadComplete(fileName: String, serverUrl: String, ocId: String?, etag: String?, date: Date?, size: Int64, task: URLSessionTask, error: NKError)
+}
+
 @objc protocol ClientCertificateDelegate {
     func onIncorrectPassword()
     func didAskForClientCertificate()
@@ -64,7 +71,8 @@ class NCNetworking: NSObject, NKCommonDelegate {
     let uploadMetadataInBackground = ThreadSafeDictionary<FileNameServerUrl, tableMetadata>()
     let downloadMetadataInBackground = ThreadSafeDictionary<FileNameServerUrl, tableMetadata>()
     var transferInForegorund: TransferInForegorund?
-    weak var delegate: ClientCertificateDelegate?
+    weak var delegate: NCNetworkingDelegate?
+    weak var certificateDelegate: ClientCertificateDelegate?
 
     var p12Data: Data?
     var p12Password: String?
@@ -101,7 +109,9 @@ class NCNetworking: NSObject, NKCommonDelegate {
         configuration.isDiscretionary = false
         configuration.httpMaximumConnectionsPerHost = sessionMaximumConnectionsPerHost
         configuration.requestCachePolicy = NSURLRequest.CachePolicy.reloadIgnoringLocalCacheData
+        configuration.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: NCBrandOptions.shared.capabilitiesGroup)
         let session = URLSession(configuration: configuration, delegate: nkBackground, delegateQueue: OperationQueue.main)
+
         return session
     }()
 
@@ -112,6 +122,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
         configuration.isDiscretionary = false
         configuration.httpMaximumConnectionsPerHost = sessionMaximumConnectionsPerHost
         configuration.requestCachePolicy = NSURLRequest.CachePolicy.reloadIgnoringLocalCacheData
+        configuration.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: NCBrandOptions.shared.capabilitiesGroup)
         let session = URLSession(configuration: configuration, delegate: nkBackground, delegateQueue: OperationQueue.main)
         return session
     }()
@@ -123,11 +134,11 @@ class NCNetworking: NSObject, NKCommonDelegate {
         configuration.isDiscretionary = false
         configuration.httpMaximumConnectionsPerHost = sessionMaximumConnectionsPerHost
         configuration.requestCachePolicy = NSURLRequest.CachePolicy.reloadIgnoringLocalCacheData
+        configuration.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: NCBrandOptions.shared.capabilitiesGroup)
         let session = URLSession(configuration: configuration, delegate: nkBackground, delegateQueue: OperationQueue.main)
         return session
     }()
 
-#if EXTENSION
     public lazy var sessionManagerUploadBackgroundExtension: URLSession = {
         let configuration = URLSessionConfiguration.background(withIdentifier: sessionUploadBackgroundExtension)
         configuration.allowsCellularAccess = true
@@ -135,11 +146,11 @@ class NCNetworking: NSObject, NKCommonDelegate {
         configuration.isDiscretionary = false
         configuration.httpMaximumConnectionsPerHost = sessionMaximumConnectionsPerHost
         configuration.requestCachePolicy = NSURLRequest.CachePolicy.reloadIgnoringLocalCacheData
-        configuration.sharedContainerIdentifier = NCBrandOptions.shared.capabilitiesGroups
+        configuration.sharedContainerIdentifier = NCBrandOptions.shared.capabilitiesGroup
+        configuration.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: NCBrandOptions.shared.capabilitiesGroup)
         let session = URLSession(configuration: configuration, delegate: nkBackground, delegateQueue: OperationQueue.main)
         return session
     }()
-#endif
 
     // REQUESTS
     var requestsUnifiedSearch: [DataRequest] = []
@@ -208,13 +219,13 @@ class NCNetworking: NSObject, NKCommonDelegate {
                 if let p12Data = self.p12Data,
                    let cert = (p12Data, self.p12Password) as? UserCertificate,
                    let pkcs12 = try? PKCS12(pkcs12Data: cert.data, password: cert.password, onIncorrectPassword: {
-                       self.delegate?.onIncorrectPassword()
+                       self.certificateDelegate?.onIncorrectPassword()
                    }) {
                     let creds = PKCS12.urlCredential(for: pkcs12)
 
                     completionHandler(URLSession.AuthChallengeDisposition.useCredential, creds)
                 } else {
-                    self.delegate?.didAskForClientCertificate()
+                    self.certificateDelegate?.didAskForClientCertificate()
                     completionHandler(URLSession.AuthChallengeDisposition.performDefaultHandling, nil)
                 }
             }
diff --git a/iOSClient/Networking/NCNetworkingCheckRemoteUser.swift b/iOSClient/Networking/NCNetworkingCheckRemoteUser.swift
index a104399b4e..53dd5ea75f 100644
--- a/iOSClient/Networking/NCNetworkingCheckRemoteUser.swift
+++ b/iOSClient/Networking/NCNetworkingCheckRemoteUser.swift
@@ -25,29 +25,30 @@ import UIKit
 import NextcloudKit
 
 class NCNetworkingCheckRemoteUser {
-
     func checkRemoteUser(account: String, error: NKError) {
-
         let token = NCKeychain().getPassword(account: account)
-        guard let tableAccount = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", account)),
-              !token.isEmpty,
-              let appDelegate = UIApplication.shared.delegate as? AppDelegate else { return }
+        guard let appDelegate = UIApplication.shared.delegate as? AppDelegate,
+              let tableAccount = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", account)),
+              !token.isEmpty else { return }
 
         NCNetworking.shared.cancelAllTask()
 
         if NCGlobal.shared.capabilityServerVersionMajor >= NCGlobal.shared.nextcloudVersion17 {
-
             NextcloudKit.shared.getRemoteWipeStatus(serverUrl: tableAccount.urlBase, token: token) { account, wipe, _, error in
-
                 if wipe {
-
-                    appDelegate.deleteAccount(account, wipe: true)
+                    appDelegate.deleteAccount(account)
                     let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_wipe_account_")
                     NCContentPresenter().messageNotification(tableAccount.user, error: error, delay: NCGlobal.shared.dismissAfterSecondLong, type: NCContentPresenter.messageType.error, priority: .max)
                     NextcloudKit.shared.setRemoteWipeCompletition(serverUrl: tableAccount.urlBase, token: token) { _, _ in print("wipe") }
-
+                    let accounts = NCManageDatabase.shared.getAccounts()
+                    if accounts?.count ?? 0 > 0 {
+                        if let newAccount = accounts?.first {
+                            appDelegate.changeAccount(newAccount, userProfile: nil) { }
+                        } else {
+                            appDelegate.openLogin(selector: NCGlobal.shared.introLogin, openLoginWeb: false)
+                        }
+                    }
                 } else {
-
                     if UIApplication.shared.applicationState == .active && NextcloudKit.shared.isNetworkReachable() {
                         let description = String.localizedStringWithFormat(NSLocalizedString("_error_check_remote_user_", comment: ""), tableAccount.user, tableAccount.urlBase)
                         let error = NKError(errorCode: error.errorCode, errorDescription: description)
@@ -57,9 +58,7 @@ class NCNetworkingCheckRemoteUser {
                     }
                 }
             }
-
         } else {
-
             if UIApplication.shared.applicationState == .active && NextcloudKit.shared.isNetworkReachable() {
                 let description = String.localizedStringWithFormat(NSLocalizedString("_error_check_remote_user_", comment: ""), tableAccount.user, tableAccount.urlBase)
                 let error = NKError(errorCode: error.errorCode, errorDescription: description)
diff --git a/iOSClient/Networking/NCService.swift b/iOSClient/Networking/NCService.swift
index f150210e7d..78ed00be54 100644
--- a/iOSClient/Networking/NCService.swift
+++ b/iOSClient/Networking/NCService.swift
@@ -27,7 +27,6 @@ import NextcloudKit
 import RealmSwift
 
 class NCService: NSObject {
-
     let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
     let utilityFileSystem = NCUtilityFileSystem()
 
@@ -49,7 +48,6 @@ class NCService: NSObject {
             if result {
                 requestServerCapabilities()
                 getAvatar()
-                requestDashboardWidget()
                 NCNetworkingE2EE().unlockAll(account: account)
                 sendClientDiagnosticsRemoteOperation(account: account)
                 synchronize()
@@ -60,7 +58,6 @@ class NCService: NSObject {
     // MARK: -
 
     func addInternalTypeIdentifier() {
-
         // txt
         NextcloudKit.shared.nkCommonInstance.addInternalTypeIdentifier(typeIdentifier: "text/plain", classFile: NKCommon.TypeClassFile.document.rawValue, editor: NCGlobal.shared.editorText, iconName: NKCommon.TypeIconFile.document.rawValue, name: "markdown")
 
@@ -93,8 +90,7 @@ class NCService: NSObject {
     // MARK: -
 
     private func requestServerStatus() async -> Bool {
-
-        switch await NextcloudKit.shared.getServerStatus(serverUrl: appDelegate.urlBase, options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) {
+        switch await NCNetworking.shared.getServerStatus(serverUrl: appDelegate.urlBase, options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) {
         case .success(let serverInfo):
             if serverInfo.maintenance {
                 let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_maintenance_mode_")
@@ -112,7 +108,7 @@ class NCService: NSObject {
             return false
         }
 
-        let resultUserProfile = await NextcloudKit.shared.getUserProfile(options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue))
+        let resultUserProfile = await NCNetworking.shared.getUserProfile(options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue))
         if resultUserProfile.error == .success, let userProfile = resultUserProfile.userProfile {
             NCManageDatabase.shared.setAccountUserProfile(account: resultUserProfile.account, userProfile: userProfile)
             return true
@@ -132,7 +128,6 @@ class NCService: NSObject {
     }
 
     func synchronize() {
-
         NextcloudKit.shared.listingFavorites(showHiddenFiles: NCKeychain().showHiddenFiles,
                                              options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, files, _, error in
 
@@ -146,7 +141,6 @@ class NCService: NSObject {
     }
 
     func getAvatar() {
-
         let fileName = appDelegate.userBaseUrl + "-" + self.appDelegate.user + ".png"
         let fileNameLocalPath = utilityFileSystem.directoryUserData + "/" + fileName
         let etag = NCManageDatabase.shared.getTableAvatar(fileName: fileName)?.etag
@@ -237,50 +231,7 @@ class NCService: NSObject {
 
     // MARK: -
 
-    private func requestDashboardWidget() {
-
-        @Sendable func convertDataToImage(data: Data?, size: CGSize, fileNameToWrite: String?) {
-
-            guard let data = data else { return }
-            var imageData: UIImage?
-
-            if let image = UIImage(data: data), let image = image.resizeImage(size: size) {
-                imageData = image
-            } else if let image = SVGKImage(data: data) {
-                image.size = size
-                imageData = image.uiImage
-            } else {
-                print("error")
-            }
-            if let fileName = fileNameToWrite, let image = imageData {
-                do {
-                    let fileNamePath = utilityFileSystem.directoryUserData + "/" + fileName + ".png"
-                    try image.pngData()?.write(to: URL(fileURLWithPath: fileNamePath), options: .atomic)
-                } catch { }
-            }
-        }
-
-        NextcloudKit.shared.getDashboardWidget(options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, dashboardWidgets, data, error in
-            Task {
-                if error == .success, let dashboardWidgets = dashboardWidgets {
-                    NCManageDatabase.shared.addDashboardWidget(account: account, dashboardWidgets: dashboardWidgets)
-                    for widget in dashboardWidgets {
-                        if let url = URL(string: widget.iconUrl), let fileName = widget.iconClass {
-                            let (_, data, error) = await NextcloudKit.shared.getPreview(url: url)
-                            if error == .success {
-                                convertDataToImage(data: data, size: CGSize(width: 256, height: 256), fileNameToWrite: fileName)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // MARK: -
-
     @objc func synchronizeOffline(account: String) {
-
         // Synchronize Directory
         Task {
             if let directories = NCManageDatabase.shared.getTablesDirectory(predicate: NSPredicate(format: "account == %@ AND offline == true", account), sorted: "serverUrl", ascending: true) {
@@ -305,12 +256,10 @@ class NCService: NSObject {
     // MARK: -
 
     func sendClientDiagnosticsRemoteOperation(account: String) {
-
         guard NCGlobal.shared.capabilitySecurityGuardDiagnostics,
               NCManageDatabase.shared.existsDiagnostics(account: account) else { return }
 
         struct Issues: Codable {
-
             struct SyncConflicts: Codable {
                 var count: Int?
                 var oldest: TimeInterval?
diff --git a/iOSClient/Notification/NCNotification.swift b/iOSClient/Notification/NCNotification.swift
index f5c9bf59d2..4ac1e47e16 100644
--- a/iOSClient/Notification/NCNotification.swift
+++ b/iOSClient/Notification/NCNotification.swift
@@ -294,18 +294,16 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate {
            self.dataSourceTask = task
            self.tableView.reloadData()
        } completion: { account, notifications, _, error in
-           if error == .success && account == self.appDelegate.account {
+           if error == .success, account == self.appDelegate.account, let notifications = notifications {
                self.notifications.removeAll()
-               let sortedListOfNotifications = (notifications! as NSArray).sortedArray(using: [NSSortDescriptor(key: "date", ascending: false)])
-               for notification in sortedListOfNotifications {
-                   if let icon = (notification as? NKNotifications)?.icon {
+               let sortedNotifications = notifications.sorted { $0.date > $1.date }
+               for notification in sortedNotifications {
+                   if let icon = notification.icon {
                        self.utility.convertSVGtoPNGWriteToUserData(svgUrlString: icon, width: 25, rewrite: false, account: self.appDelegate.account) { _, _ in
                            self.tableView.reloadData()
                        }
                    }
-                   if let notification = (notification as? NKNotifications) {
-                       self.notifications.append(notification)
-                   }
+                   self.notifications.append(notification)
                }
                self.refreshControl?.endRefreshing()
                self.tableView.reloadData()
diff --git a/iOSClient/Offline/NCOffline.swift b/iOSClient/Offline/NCOffline.swift
index c6d9b5b118..87a25c145e 100644
--- a/iOSClient/Offline/NCOffline.swift
+++ b/iOSClient/Offline/NCOffline.swift
@@ -70,16 +70,7 @@ class NCOffline: NCCollectionViewCommon {
             metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", self.appDelegate.account, self.serverUrl))
         }
 
-        self.dataSource = NCDataSource(
-            metadatas: metadatas,
-            account: self.appDelegate.account,
-            sort: self.layoutForView?.sort,
-            ascending: self.layoutForView?.ascending,
-            directoryOnTop: self.layoutForView?.directoryOnTop,
-            favoriteOnTop: true,
-            groupByField: self.groupByField,
-            providers: self.providers,
-            searchResults: self.searchResults)
+        self.dataSource = NCDataSource(metadatas: metadatas, account: self.appDelegate.account, layoutForView: layoutForView, providers: self.providers, searchResults: self.searchResults)
     }
 
     override func reloadDataSourceNetwork(withQueryDB: Bool = false) {
diff --git a/iOSClient/Recent/NCRecent.swift b/iOSClient/Recent/NCRecent.swift
index ce370c7bfb..f27011ffd4 100644
--- a/iOSClient/Recent/NCRecent.swift
+++ b/iOSClient/Recent/NCRecent.swift
@@ -51,13 +51,12 @@ class NCRecent: NCCollectionViewCommon {
         super.queryDB()
 
         let metadatas = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@", self.appDelegate.account), numItems: 200, sorted: "date", ascending: false)
-        self.dataSource = NCDataSource(metadatas: metadatas,
-                                       account: self.appDelegate.account,
-                                       directoryOnTop: false,
-                                       favoriteOnTop: false,
-                                       groupByField: self.groupByField,
-                                       providers: self.providers,
-                                       searchResults: self.searchResults)
+
+        layoutForView?.sort = "date"
+        layoutForView?.ascending = false
+        layoutForView?.directoryOnTop = false
+
+        self.dataSource = NCDataSource(metadatas: metadatas, account: self.appDelegate.account, layoutForView: layoutForView, favoriteOnTop: false, providers: self.providers, searchResults: self.searchResults)
     }
 
     override func reloadDataSourceNetwork(withQueryDB: Bool = false) {
diff --git a/iOSClient/SceneDelegate.swift b/iOSClient/SceneDelegate.swift
index 2309f13139..f0845918ce 100644
--- a/iOSClient/SceneDelegate.swift
+++ b/iOSClient/SceneDelegate.swift
@@ -36,10 +36,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         guard let windowScene = (scene as? UIWindowScene),
               let appDelegate else { return }
         self.window = UIWindow(windowScene: windowScene)
-#if os(visionOS)
-        // TEST
-        // window?.overrideUserInterfaceStyle = .dark
-#endif
 
         if NCManageDatabase.shared.getActiveAccount() != nil {
             if let controller = UIStoryboard(name: "Main", bundle: nil).instantiateInitialViewController() as? NCMainTabBarController {
@@ -191,7 +187,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
                     for account in accounts {
                         let urlBase = URL(string: account.urlBase)
                         if url.contains(urlBase?.host ?? "") && userId == account.userId {
-                            appDelegate.changeAccount(account.account, userProfile: nil)
+                            appDelegate.changeAccount(account.account, userProfile: nil) { }
                             return account
                         }
                     }
@@ -391,7 +387,7 @@ extension SceneDelegate: NCAccountRequestDelegate {
     func accountRequestAddAccount() { }
 
     func accountRequestChangeAccount(account: String) {
-        appDelegate?.changeAccount(account, userProfile: nil)
+        appDelegate?.changeAccount(account, userProfile: nil) { }
     }
 }
 
diff --git a/iOSClient/Select/NCSelect.swift b/iOSClient/Select/NCSelect.swift
index f5dd414d22..8cf009f636 100644
--- a/iOSClient/Select/NCSelect.swift
+++ b/iOSClient/Select/NCSelect.swift
@@ -29,7 +29,7 @@ import NextcloudKit
     @objc func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], overwrite: Bool, copy: Bool, move: Bool)
 }
 
-class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresentationControllerDelegate, NCListCellDelegate, NCGridCellDelegate, NCSectionHeaderMenuDelegate {
+class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresentationControllerDelegate, NCListCellDelegate, NCSectionFirstHeaderDelegate {
 
     @IBOutlet private var collectionView: UICollectionView!
     @IBOutlet private var buttonCancel: UIBarButtonItem!
@@ -67,7 +67,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
     private var overwrite = true
     private var dataSource = NCDataSource()
     internal var richWorkspaceText: String?
-    internal var headerMenu: NCSectionHeaderMenu?
+    internal var headerMenu: NCSectionFirstHeader?
     private var autoUploadFileName = ""
     private var autoUploadDirectory = ""
     private var backgroundImageView = UIImageView()
@@ -93,8 +93,8 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
         collectionView.collectionViewLayout = NCListLayout()
 
         // Header
-        collectionView.register(UINib(nibName: "NCSectionHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionHeaderEmptyData")
-        collectionView.register(UINib(nibName: "NCSectionHeaderMenu", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionHeaderMenu")
+        collectionView.register(UINib(nibName: "NCSectionFirstHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionFirstHeaderEmptyData")
+        collectionView.register(UINib(nibName: "NCSectionFirstHeader", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionFirstHeader")
 
         // Footer
         collectionView.register(UINib(nibName: "NCSectionFooter", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "sectionFooter")
@@ -217,6 +217,21 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
         overwrite = sender.isOn
     }
 
+    func tapShareListItem(with objectId: String, indexPath: IndexPath, sender: Any) {
+    }
+
+    func tapMoreListItem(with objectId: String, namedButtonMore: String, image: UIImage?, indexPath: IndexPath, sender: Any) {
+    }
+
+    func longPressListItem(with objectId: String, indexPath: IndexPath, gestureRecognizer: UILongPressGestureRecognizer) {
+    }
+
+    func tapButtonTransfer(_ sender: Any) {
+    }
+
+    func tapRichWorkspace(_ sender: Any) {
+    }
+
     // MARK: - Push metadata
 
     func pushMetadata(_ metadata: tableMetadata) {
@@ -369,7 +384,7 @@ extension NCSelect: UICollectionViewDataSource {
         cell.backgroundView = nil
         cell.hideButtonMore(true)
         cell.hideButtonShare(true)
-        cell.selectMode(false)
+        cell.selected(false, isEditMode: false)
 
         // Live Photo
         if metadata.isLivePhoto {
@@ -395,7 +410,7 @@ extension NCSelect: UICollectionViewDataSource {
 
             if dataSource.getMetadataSourceForAllSections().isEmpty {
 
-                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeaderEmptyData", for: indexPath) as? NCSectionHeaderEmptyData else { return NCSectionHeaderEmptyData() }
+                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFirstHeaderEmptyData", for: indexPath) as? NCSectionFirstHeaderEmptyData else { return NCSectionFirstHeaderEmptyData() }
                 if self.dataSourceTask?.state == .running {
                     header.emptyImage.image = utility.loadImage(named: "wifi", colors: [NCBrandColor.shared.brandElement])
                     header.emptyTitle.text = NSLocalizedString("_request_in_progress_", comment: "")
@@ -413,7 +428,7 @@ extension NCSelect: UICollectionViewDataSource {
 
             } else {
 
-                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeaderMenu", for: indexPath) as? NCSectionHeaderMenu else { return NCSectionHeaderMenu() }
+                guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFirstHeader", for: indexPath) as? NCSectionFirstHeader else { return NCSectionFirstHeader() }
                 let (_, heightHeaderRichWorkspace, _) = getHeaderHeight(section: indexPath.section)
 
                 self.headerMenu = header
@@ -515,14 +530,8 @@ extension NCSelect {
         }
 
         let metadatas = NCManageDatabase.shared.getMetadatas(predicate: predicate!)
-        self.dataSource = NCDataSource(metadatas: metadatas,
-                                       account: activeAccount.account,
-                                       sort: "fileName",
-                                       ascending: true,
-                                       directoryOnTop: true,
-                                       favoriteOnTop: true,
-                                       groupByField: "none")
-
+        self.dataSource = NCDataSource(metadatas: metadatas, account: activeAccount.account, layoutForView: nil)
+                                     
         if withLoadFolder {
             loadFolder()
         }
diff --git a/iOSClient/Settings/Advanced/NCSettingsAdvancedModel.swift b/iOSClient/Settings/Advanced/NCSettingsAdvancedModel.swift
index 6665545dbb..233cb1db94 100644
--- a/iOSClient/Settings/Advanced/NCSettingsAdvancedModel.swift
+++ b/iOSClient/Settings/Advanced/NCSettingsAdvancedModel.swift
@@ -102,6 +102,7 @@ class NCSettingsAdvancedModel: ObservableObject, ViewOnAppearHandling {
 
     /// Updates the value of `appIntegration` in the keychain.
     func updateAppIntegration() {
+        NSFileProviderManager.removeAllDomains { _ in }
         keychain.disableFilesApp = appIntegration
     }
 
@@ -161,10 +162,8 @@ class NCSettingsAdvancedModel: ObservableObject, ViewOnAppearHandling {
     ///
     /// - Parameter
     /// exit: Boolean indicating whether to reset the application.
-    func resetNextCloud(exit: Bool) {
-        if exit {
-            self.appDelegate.resetApplication()
-        } else { }
+    func resetNextCloud() {
+        self.appDelegate.resetApplication()
     }
 
     /// Exits the Nextcloud application if specified.
diff --git a/iOSClient/Settings/Advanced/NCSettingsAdvancedView.swift b/iOSClient/Settings/Advanced/NCSettingsAdvancedView.swift
index 1c60b3b92c..45fcf06880 100644
--- a/iOSClient/Settings/Advanced/NCSettingsAdvancedView.swift
+++ b/iOSClient/Settings/Advanced/NCSettingsAdvancedView.swift
@@ -263,7 +263,7 @@ struct NCSettingsAdvancedView: View {
                 .tint(Color(UIColor.label))
                 .alert(NSLocalizedString("_want_exit_", comment: ""), isPresented: $showExitAlert) {
                     Button(NSLocalizedString("_ok_", comment: ""), role: .destructive) {
-                        model.resetNextCloud(exit: showExitAlert)
+                        model.resetNextCloud()
                     }
                     Button(NSLocalizedString("_cancel_", comment: ""), role: .cancel) { }
                 }
diff --git a/iOSClient/Settings/AutoUpload/NCAutoUploadModel.swift b/iOSClient/Settings/AutoUpload/NCAutoUploadModel.swift
index 6202c41fe2..ed14ca4ade 100644
--- a/iOSClient/Settings/AutoUpload/NCAutoUploadModel.swift
+++ b/iOSClient/Settings/AutoUpload/NCAutoUploadModel.swift
@@ -82,18 +82,19 @@ class NCAutoUploadModel: ObservableObject, ViewOnAppearHandling {
             serverUrl = NCUtilityFileSystem().getHomeServer(urlBase: appDelegate.urlBase, userId: appDelegate.userId)
         }
         if autoUpload {
-            requestAuthorization()
+            requestAuthorization { value in
+                self.autoUpload = value
+                self.updateAccountProperty(\.autoUpload, value: value)
+            }
         }
     }
 
     // MARK: - All functions
 
-    func requestAuthorization() {
+    func requestAuthorization(completion: @escaping (Bool) -> Void = { _ in }) {
         PHPhotoLibrary.requestAuthorization { status in
             DispatchQueue.main.async {
                 let value = (status == .authorized)
-                self.autoUpload = value
-                self.updateAccountProperty(\.autoUpload, value: value)
                 if !value {
                     let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_access_photo_not_enabled_msg_", comment: ""), responseData: nil)
                     NCContentPresenter().messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: .error)
@@ -101,6 +102,7 @@ class NCAutoUploadModel: ObservableObject, ViewOnAppearHandling {
                     let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: NSLocalizedString("_access_background_app_refresh_denied_", comment: ""), responseData: nil)
                     NCContentPresenter().messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: .info)
                 }
+                completion(value)
             }
         }
     }
@@ -108,15 +110,26 @@ class NCAutoUploadModel: ObservableObject, ViewOnAppearHandling {
     /// Updates the auto-upload setting.
     func handleAutoUploadChange(newValue: Bool) {
         if newValue {
-            requestAuthorization()
+            requestAuthorization { value in
+                self.autoUpload = value
+                self.updateAccountProperty(\.autoUpload, value: value)
+                NCManageDatabase.shared.setAccountAutoUploadFileName("")
+                NCManageDatabase.shared.setAccountAutoUploadDirectory("", urlBase: self.appDelegate.urlBase, userId: self.appDelegate.userId, account: self.appDelegate.account)
+                NCAutoUpload.shared.alignPhotoLibrary(viewController: self.controller)
+            }
         } else {
             updateAccountProperty(\.autoUpload, value: newValue)
+            updateAccountProperty(\.autoUploadFull, value: newValue)
+            NCManageDatabase.shared.clearMetadatasUpload(account: appDelegate.account)
         }
     }
 
     /// Updates the auto-upload image setting.
     func handleAutoUploadImageChange(newValue: Bool) {
         updateAccountProperty(\.autoUploadImage, value: newValue)
+        if newValue {
+            NCAutoUpload.shared.alignPhotoLibrary(viewController: controller)
+        }
     }
 
     /// Updates the auto-upload image over WWAN setting.
@@ -127,6 +140,9 @@ class NCAutoUploadModel: ObservableObject, ViewOnAppearHandling {
     /// Updates the auto-upload video setting.
     func handleAutoUploadVideoChange(newValue: Bool) {
         updateAccountProperty(\.autoUploadVideo, value: newValue)
+        if newValue {
+            NCAutoUpload.shared.alignPhotoLibrary(viewController: controller)
+        }
     }
 
     /// Updates the auto-upload video over WWAN setting.
@@ -139,10 +155,8 @@ class NCAutoUploadModel: ObservableObject, ViewOnAppearHandling {
         updateAccountProperty(\.autoUploadFull, value: newValue)
         if newValue {
             NCAutoUpload.shared.autoUploadFullPhotos(viewController: self.controller, log: "Auto upload full")
-            NCManageDatabase.shared.setAccountAutoUploadProperty("autoUploadFull", state: true)
         } else {
             NCManageDatabase.shared.clearMetadatasUpload(account: appDelegate.account)
-            NCManageDatabase.shared.setAccountAutoUploadProperty("autoUploadFull", state: false)
         }
     }
 
diff --git a/iOSClient/Settings/NCKeychain.swift b/iOSClient/Settings/NCKeychain.swift
index 7d2e1d28d4..00167f9c13 100644
--- a/iOSClient/Settings/NCKeychain.swift
+++ b/iOSClient/Settings/NCKeychain.swift
@@ -284,30 +284,6 @@ import KeychainAccess
         }
     }
 
-    var mediaColumnCount: Int {
-        get {
-            if let value = try? keychain.get("mediaColumnCount"), let result = Int(value) {
-                return result
-            }
-            return 3
-        }
-        set {
-            keychain["mediaColumnCount"] = String(newValue)
-        }
-    }
-
-    var mediaTypeLayout: String {
-        get {
-            if let value = try? keychain.get("mediaTypeLayout") {
-                return value
-            }
-            return NCGlobal.shared.mediaLayoutRatio
-        }
-        set {
-            keychain["mediaTypeLayout"] = String(newValue)
-        }
-    }
-
     var textRecognitionStatus: Bool {
         get {
             migrate(key: "textRecognitionStatus")
@@ -420,7 +396,8 @@ import KeychainAccess
     @objc func getPassword(account: String) -> String {
         let key = "password" + account
         migrate(key: key)
-        return (try? keychain.get(key)) ?? ""
+        let password = (try? keychain.get(key)) ?? ""
+        return password
     }
 
     func setPassword(account: String, password: String?) {
diff --git a/iOSClient/Share/Advanced/NCShareAdvancePermission.swift b/iOSClient/Share/Advanced/NCShareAdvancePermission.swift
index 56430fa914..487f21ea34 100644
--- a/iOSClient/Share/Advanced/NCShareAdvancePermission.swift
+++ b/iOSClient/Share/Advanced/NCShareAdvancePermission.swift
@@ -109,7 +109,7 @@ class NCShareAdvancePermission: UITableViewController, NCShareAdvanceFotterDeleg
     }
 
     func setupHeaderView() {
-        guard let headerView = (Bundle.main.loadNibNamed("NCShareAdvancePermissionHeader", owner: self, options: nil)?.first as? NCShareAdvancePermissionHeader) else { return }
+        guard let headerView = (Bundle.main.loadNibNamed("NCShareHeader", owner: self, options: nil)?.first as? NCShareHeader) else { return }
         headerView.setupUI(with: metadata)
 
         let container = UIView(frame: CGRect(x: 0, y: 0, width: view.frame.width, height: 220))
diff --git a/iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.xib b/iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.xib
deleted file mode 100644
index beb60d8c5e..0000000000
--- a/iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.xib
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="wbW-yR-MZC" customClass="NCShareAdvancePermissionHeader" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="210"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cki-Ql-o1I">
-                    <rect key="frame" x="0.0" y="0.0" width="414" height="150"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="150" id="9GH-KF-f8P"/>
-                    </constraints>
-                </imageView>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Dkw-QP-be6">
-                    <rect key="frame" x="16" y="27" width="96" height="96"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="96" id="TW7-8v-NRJ"/>
-                        <constraint firstAttribute="width" constant="96" id="Vbz-xZ-L5k"/>
-                    </constraints>
-                </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pu4-Nd-M08">
-                    <rect key="frame" x="16" y="166" width="382" height="18"/>
-                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
-                    <nil key="textColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VaC-Fz-kHk">
-                    <rect key="frame" x="16" y="188" width="383" height="16"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                    <color key="textColor" red="0.76862745099999996" green="0.77647058820000003" blue="0.77647058820000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <viewLayoutGuide key="safeArea" id="KLE-vd-Dsn"/>
-            <constraints>
-                <constraint firstItem="pu4-Nd-M08" firstAttribute="leading" secondItem="KLE-vd-Dsn" secondAttribute="leading" constant="16" id="0Uy-ra-MtM"/>
-                <constraint firstItem="pu4-Nd-M08" firstAttribute="top" secondItem="cki-Ql-o1I" secondAttribute="bottom" constant="16" id="Cce-7Y-iw9"/>
-                <constraint firstAttribute="trailing" secondItem="VaC-Fz-kHk" secondAttribute="trailing" constant="15" id="Ebg-3T-03W"/>
-                <constraint firstItem="Dkw-QP-be6" firstAttribute="leading" secondItem="KLE-vd-Dsn" secondAttribute="leading" constant="16" id="KPc-al-RWN"/>
-                <constraint firstItem="KLE-vd-Dsn" firstAttribute="top" secondItem="cki-Ql-o1I" secondAttribute="top" id="KsC-jf-M6F"/>
-                <constraint firstAttribute="trailing" secondItem="cki-Ql-o1I" secondAttribute="trailing" id="Wdl-Rb-Pjy"/>
-                <constraint firstItem="VaC-Fz-kHk" firstAttribute="leading" secondItem="pu4-Nd-M08" secondAttribute="leading" id="Ycb-wy-uL6"/>
-                <constraint firstItem="cki-Ql-o1I" firstAttribute="leading" secondItem="KLE-vd-Dsn" secondAttribute="leading" id="ZlH-LU-x2x"/>
-                <constraint firstItem="KLE-vd-Dsn" firstAttribute="trailing" secondItem="pu4-Nd-M08" secondAttribute="trailing" constant="16" id="bO0-yQ-OWX"/>
-                <constraint firstItem="Dkw-QP-be6" firstAttribute="centerY" secondItem="cki-Ql-o1I" secondAttribute="centerY" id="dME-jJ-PwO"/>
-                <constraint firstItem="VaC-Fz-kHk" firstAttribute="top" secondItem="pu4-Nd-M08" secondAttribute="bottom" constant="4" id="zkb-Jm-sin"/>
-            </constraints>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="fileName" destination="pu4-Nd-M08" id="iLj-ya-6hM"/>
-                <outlet property="fullWidthImageView" destination="cki-Ql-o1I" id="KYn-3Y-SZH"/>
-                <outlet property="imageView" destination="Dkw-QP-be6" id="wzX-Sb-Ajt"/>
-                <outlet property="info" destination="VaC-Fz-kHk" id="n9O-6c-qsd"/>
-            </connections>
-            <point key="canvasLocation" x="35.625" y="27.5"/>
-        </view>
-    </objects>
-</document>
diff --git a/iOSClient/Share/Advanced/NCShareNewUserAddComment.swift b/iOSClient/Share/Advanced/NCShareNewUserAddComment.swift
index 19158e449e..a4bd06855f 100644
--- a/iOSClient/Share/Advanced/NCShareNewUserAddComment.swift
+++ b/iOSClient/Share/Advanced/NCShareNewUserAddComment.swift
@@ -58,7 +58,7 @@ class NCShareNewUserAddComment: UIViewController, NCShareDetail {
 
         noteTextField.inputAccessoryView = toolbar.wrappedSafeAreaContainer
 
-        guard let headerView = (Bundle.main.loadNibNamed("NCShareAdvancePermissionHeader", owner: self, options: nil)?.first as? NCShareAdvancePermissionHeader) else { return }
+        guard let headerView = (Bundle.main.loadNibNamed("NCShareHeader", owner: self, options: nil)?.first as? NCShareHeader) else { return }
         headerContainerView.addSubview(headerView)
         headerView.frame = headerContainerView.frame
         headerView.translatesAutoresizingMaskIntoConstraints = false
diff --git a/iOSClient/Share/NCSearchUserDropDownCell.xib b/iOSClient/Share/NCSearchUserDropDownCell.xib
index fa63960bcf..2ba38c8fa6 100755
--- a/iOSClient/Share/NCSearchUserDropDownCell.xib
+++ b/iOSClient/Share/NCSearchUserDropDownCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -34,7 +34,7 @@
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="PlH-LZ-AzK">
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="PlH-LZ-AzK">
                     <rect key="frame" x="457" y="15" width="20" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="20" id="Ej8-sj-gmZ"/>
diff --git a/iOSClient/Share/NCShare+Helper.swift b/iOSClient/Share/NCShare+Helper.swift
index ac5c6ff7b1..dd39d75955 100644
--- a/iOSClient/Share/NCShare+Helper.swift
+++ b/iOSClient/Share/NCShare+Helper.swift
@@ -30,17 +30,14 @@ extension NKShare: NCTableShareable { }
 protocol NCTableShareable: AnyObject {
     var shareType: Int { get set }
     var permissions: Int { get set }
-
     var idShare: Int { get set }
     var shareWith: String { get set }
-
     var hideDownload: Bool { get set }
     var password: String { get set }
     var label: String { get set }
     var note: String { get set }
     var expirationDate: NSDate? { get set }
     var shareWithDisplayname: String { get set }
-
     var attributes: String? { get set }
 }
 
diff --git a/iOSClient/Share/NCShare.storyboard b/iOSClient/Share/NCShare.storyboard
index a82cbfd1f8..d06257f31f 100644
--- a/iOSClient/Share/NCShare.storyboard
+++ b/iOSClient/Share/NCShare.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Ts3-RO-A9l">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Ts3-RO-A9l">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -53,72 +53,18 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X2m-IC-J1u" userLabel="View container">
-                                <rect key="frame" x="5" y="0.0" width="404" height="726"/>
+                                <rect key="frame" x="5" y="0.0" width="404" height="736"/>
                                 <subviews>
-                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="c94-b9-Sim">
-                                        <rect key="frame" x="0.0" y="133" width="404" height="593"/>
+                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="36" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="c94-b9-Sim">
+                                        <rect key="frame" x="0.0" y="101" width="404" height="655"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </tableView>
-                                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oBQ-TP-qof" userLabel="View Shared with you by">
-                                        <rect key="frame" x="-5" y="10" width="409" height="90"/>
-                                        <subviews>
-                                            <imageView clipsSubviews="YES" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fKv-xM-rVY">
-                                                <rect key="frame" x="10" y="0.0" width="40" height="40"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="40" id="DJa-7z-oGM"/>
-                                                    <constraint firstAttribute="width" constant="40" id="PwX-iy-H0o"/>
-                                                </constraints>
-                                            </imageView>
-                                            <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Shared with you by" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ngi-GT-jvv">
-                                                <rect key="frame" x="60" y="11" width="339" height="18"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                <nil key="textColor"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="note.text" translatesAutoresizingMaskIntoConstraints="NO" id="fhO-Tk-u8Z">
-                                                <rect key="frame" x="60" y="45" width="25" height="25"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="25" id="81R-aq-eMi"/>
-                                                    <constraint firstAttribute="width" constant="25" id="mCr-49-nFF"/>
-                                                </constraints>
-                                            </imageView>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KHG-xj-wfG" customClass="MarqueeLabel" customModule="MarqueeLabel">
-                                                <rect key="frame" x="95" y="48.666666666666664" width="294" height="17.999999999999993"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                <nil key="textColor"/>
-                                                <nil key="highlightedColor"/>
-                                                <userDefinedRuntimeAttributes>
-                                                    <userDefinedRuntimeAttribute type="boolean" keyPath="tapToScroll" value="YES"/>
-                                                </userDefinedRuntimeAttributes>
-                                            </label>
-                                        </subviews>
-                                        <constraints>
-                                            <constraint firstItem="fhO-Tk-u8Z" firstAttribute="leading" secondItem="oBQ-TP-qof" secondAttribute="leading" constant="60" id="6Go-2t-dND"/>
-                                            <constraint firstItem="KHG-xj-wfG" firstAttribute="centerY" secondItem="fhO-Tk-u8Z" secondAttribute="centerY" id="DEz-SB-eWP"/>
-                                            <constraint firstItem="fKv-xM-rVY" firstAttribute="top" secondItem="oBQ-TP-qof" secondAttribute="top" id="Gap-v5-Pkh"/>
-                                            <constraint firstAttribute="trailing" secondItem="ngi-GT-jvv" secondAttribute="trailing" constant="10" id="Gsg-bh-cgu"/>
-                                            <constraint firstItem="ngi-GT-jvv" firstAttribute="centerY" secondItem="fKv-xM-rVY" secondAttribute="centerY" id="MIg-bS-4Te"/>
-                                            <constraint firstItem="fKv-xM-rVY" firstAttribute="leading" secondItem="oBQ-TP-qof" secondAttribute="leading" constant="10" id="O2h-N9-cgt"/>
-                                            <constraint firstAttribute="trailing" secondItem="KHG-xj-wfG" secondAttribute="trailing" constant="20" id="kKc-BN-iLN"/>
-                                            <constraint firstAttribute="height" constant="90" id="reh-5m-KFy"/>
-                                            <constraint firstItem="ngi-GT-jvv" firstAttribute="leading" secondItem="fKv-xM-rVY" secondAttribute="trailing" constant="10" id="taI-rs-B3r"/>
-                                            <constraint firstItem="fhO-Tk-u8Z" firstAttribute="top" secondItem="fKv-xM-rVY" secondAttribute="bottom" constant="5" id="tpt-vT-Nto"/>
-                                            <constraint firstItem="KHG-xj-wfG" firstAttribute="leading" secondItem="fhO-Tk-u8Z" secondAttribute="trailing" constant="10" id="xk0-AH-pfR"/>
-                                        </constraints>
-                                    </view>
-                                    <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="iSO-mc-0TB">
-                                        <rect key="frame" x="5" y="95" width="356" height="30"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="30" id="0aG-z9-fcy"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                    <searchBar opaque="NO" contentMode="redraw" horizontalHuggingPriority="249" searchBarStyle="minimal" translatesAutoresizingMaskIntoConstraints="NO" id="iSO-mc-0TB">
+                                        <rect key="frame" x="0.0" y="45" width="366" height="56"/>
                                         <textInputTraits key="textInputTraits" returnKeyType="search"/>
-                                        <connections>
-                                            <action selector="searchFieldDidEndOnExitWithTextField:" destination="bgO-Rz-2M1" eventType="editingDidEndOnExit" id="xH6-YR-5W9"/>
-                                        </connections>
-                                    </textField>
+                                    </searchBar>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GsB-jy-SBk">
-                                        <rect key="frame" x="371" y="97.666666666666671" width="25" height="25"/>
+                                        <rect key="frame" x="371" y="60.666666666666657" width="25" height="25"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="25" id="1uS-RH-5n3"/>
                                             <constraint firstAttribute="width" constant="25" id="9wy-7u-IsC"/>
@@ -126,7 +72,7 @@
                                         <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                         <state key="normal">
-                                            <imageReference key="image" image="person.circle" catalog="system" renderingMode="hierarchical">
+                                            <imageReference key="image" image="person.circle" catalog="system" symbolScale="large" renderingMode="hierarchical">
                                                 <hierarchicalColors>
                                                     <color systemColor="labelColor"/>
                                                     <color systemColor="secondaryLabelColor"/>
@@ -138,18 +84,44 @@
                                             <action selector="selectContactClicked:" destination="bgO-Rz-2M1" eventType="touchUpInside" id="TEM-Pg-YgB"/>
                                         </connections>
                                     </button>
+                                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oBQ-TP-qof" userLabel="View Shared with you by">
+                                        <rect key="frame" x="5" y="5" width="391" height="40"/>
+                                        <subviews>
+                                            <imageView clipsSubviews="YES" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fKv-xM-rVY">
+                                                <rect key="frame" x="5" y="2" width="35" height="35"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="35" id="DJa-7z-oGM"/>
+                                                    <constraint firstAttribute="width" constant="35" id="PwX-iy-H0o"/>
+                                                </constraints>
+                                            </imageView>
+                                            <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Shared with you by" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ngi-GT-jvv">
+                                                <rect key="frame" x="55" y="11" width="344" height="18"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                <nil key="textColor"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstItem="fKv-xM-rVY" firstAttribute="top" secondItem="oBQ-TP-qof" secondAttribute="top" constant="2" id="Gap-v5-Pkh"/>
+                                            <constraint firstAttribute="trailing" secondItem="ngi-GT-jvv" secondAttribute="trailing" constant="-8" id="Gsg-bh-cgu"/>
+                                            <constraint firstItem="ngi-GT-jvv" firstAttribute="centerY" secondItem="fKv-xM-rVY" secondAttribute="centerY" constant="0.5" id="MIg-bS-4Te"/>
+                                            <constraint firstItem="fKv-xM-rVY" firstAttribute="leading" secondItem="oBQ-TP-qof" secondAttribute="leading" constant="5" id="O2h-N9-cgt"/>
+                                            <constraint firstAttribute="height" constant="40" id="reh-5m-KFy"/>
+                                            <constraint firstItem="ngi-GT-jvv" firstAttribute="leading" secondItem="fKv-xM-rVY" secondAttribute="trailing" constant="15" id="taI-rs-B3r"/>
+                                        </constraints>
+                                    </view>
                                 </subviews>
                                 <constraints>
-                                    <constraint firstItem="oBQ-TP-qof" firstAttribute="top" secondItem="X2m-IC-J1u" secondAttribute="top" constant="10" id="09Y-bm-RvQ"/>
+                                    <constraint firstItem="oBQ-TP-qof" firstAttribute="top" secondItem="X2m-IC-J1u" secondAttribute="top" constant="5" id="09Y-bm-RvQ"/>
                                     <constraint firstAttribute="trailing" secondItem="GsB-jy-SBk" secondAttribute="trailing" constant="8" id="32l-QA-7ue"/>
                                     <constraint firstAttribute="trailing" secondItem="c94-b9-Sim" secondAttribute="trailing" id="BtN-cJ-TTc"/>
-                                    <constraint firstItem="c94-b9-Sim" firstAttribute="top" secondItem="iSO-mc-0TB" secondAttribute="bottom" constant="8" id="Co6-l6-HiT"/>
+                                    <constraint firstItem="c94-b9-Sim" firstAttribute="top" secondItem="iSO-mc-0TB" secondAttribute="bottom" id="Co6-l6-HiT"/>
                                     <constraint firstItem="GsB-jy-SBk" firstAttribute="centerY" secondItem="iSO-mc-0TB" secondAttribute="centerY" id="Qe6-An-Hda"/>
-                                    <constraint firstAttribute="bottom" secondItem="c94-b9-Sim" secondAttribute="bottom" id="Svm-RV-vnl"/>
-                                    <constraint firstAttribute="trailing" secondItem="oBQ-TP-qof" secondAttribute="trailing" id="ZuM-2G-aoM"/>
-                                    <constraint firstItem="GsB-jy-SBk" firstAttribute="leading" secondItem="iSO-mc-0TB" secondAttribute="trailing" constant="10" id="cqh-P5-H1x"/>
-                                    <constraint firstItem="iSO-mc-0TB" firstAttribute="leading" secondItem="X2m-IC-J1u" secondAttribute="leading" constant="5" id="d8E-WM-YfC"/>
-                                    <constraint firstItem="iSO-mc-0TB" firstAttribute="top" secondItem="X2m-IC-J1u" secondAttribute="top" constant="95" id="jPM-Uo-0lS"/>
+                                    <constraint firstAttribute="bottom" secondItem="c94-b9-Sim" secondAttribute="bottom" constant="-20" id="Svm-RV-vnl"/>
+                                    <constraint firstAttribute="trailing" secondItem="oBQ-TP-qof" secondAttribute="trailing" constant="8" id="ZuM-2G-aoM"/>
+                                    <constraint firstItem="GsB-jy-SBk" firstAttribute="leading" secondItem="iSO-mc-0TB" secondAttribute="trailing" constant="5" id="cqh-P5-H1x"/>
+                                    <constraint firstItem="iSO-mc-0TB" firstAttribute="leading" secondItem="X2m-IC-J1u" secondAttribute="leading" id="d8E-WM-YfC"/>
+                                    <constraint firstItem="iSO-mc-0TB" firstAttribute="top" secondItem="X2m-IC-J1u" secondAttribute="top" constant="45" id="jPM-Uo-0lS"/>
                                     <constraint firstItem="c94-b9-Sim" firstAttribute="leading" secondItem="X2m-IC-J1u" secondAttribute="leading" id="rvD-u3-Dug"/>
                                 </constraints>
                             </view>
@@ -157,11 +129,11 @@
                         <viewLayoutGuide key="safeArea" id="eAi-wv-a4Y"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="eAi-wv-a4Y" firstAttribute="bottom" secondItem="X2m-IC-J1u" secondAttribute="bottom" constant="10" id="Gvn-eF-b0b"/>
+                            <constraint firstItem="eAi-wv-a4Y" firstAttribute="bottom" secondItem="X2m-IC-J1u" secondAttribute="bottom" id="Gvn-eF-b0b"/>
                             <constraint firstItem="X2m-IC-J1u" firstAttribute="leading" secondItem="eAi-wv-a4Y" secondAttribute="leading" constant="5" id="Ufw-7y-DMv"/>
                             <constraint firstItem="X2m-IC-J1u" firstAttribute="top" secondItem="aV2-U6-JTf" secondAttribute="top" id="aXO-v9-CBF"/>
                             <constraint firstItem="eAi-wv-a4Y" firstAttribute="trailing" secondItem="X2m-IC-J1u" secondAttribute="trailing" constant="5" id="hVX-vu-qJn"/>
-                            <constraint firstItem="oBQ-TP-qof" firstAttribute="leading" secondItem="eAi-wv-a4Y" secondAttribute="leading" id="r7R-MU-9cw"/>
+                            <constraint firstItem="oBQ-TP-qof" firstAttribute="leading" secondItem="eAi-wv-a4Y" secondAttribute="leading" constant="10" id="r7R-MU-9cw"/>
                         </constraints>
                     </view>
                     <connections>
@@ -170,8 +142,6 @@
                         <outlet property="searchFieldTopConstraint" destination="jPM-Uo-0lS" id="yfd-cG-1mu"/>
                         <outlet property="sharedWithYouByImage" destination="fKv-xM-rVY" id="EJ0-sV-By8"/>
                         <outlet property="sharedWithYouByLabel" destination="ngi-GT-jvv" id="Qay-IG-tZh"/>
-                        <outlet property="sharedWithYouByNote" destination="KHG-xj-wfG" id="4m5-u6-7RW"/>
-                        <outlet property="sharedWithYouByNoteImage" destination="fhO-Tk-u8Z" id="8Ly-gt-RXD"/>
                         <outlet property="sharedWithYouByView" destination="oBQ-TP-qof" id="nfN-yx-627"/>
                         <outlet property="tableView" destination="c94-b9-Sim" id="ZlE-Fh-kaR"/>
                         <outlet property="viewContainerConstraint" destination="aXO-v9-CBF" id="R19-WO-im5"/>
@@ -179,7 +149,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4Te-U6-4XT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2689.8550724637685" y="-167.41071428571428"/>
+            <point key="canvasLocation" x="2689.8550724637685" y="-167.93478260869566"/>
         </scene>
         <!--Share New User Add Comment-->
         <scene sceneID="JJ2-tz-qZ7">
@@ -306,28 +276,22 @@
             <point key="canvasLocation" x="3510" y="-169"/>
         </scene>
     </scenes>
-    <designables>
-        <designable name="KHG-xj-wfG">
-            <size key="intrinsicContentSize" width="37.333333333333336" height="18"/>
-        </designable>
-    </designables>
     <resources>
-        <image name="note.text" width="24" height="24"/>
         <image name="person.circle" catalog="system" width="128" height="123"/>
         <systemColor name="labelColor">
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="secondaryLabelColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="secondarySystemBackgroundColor">
-            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="tertiaryLabelColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.29803921568627451" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29803921570000003" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/iOSClient/Share/NCShare.swift b/iOSClient/Share/NCShare.swift
index 477a1ced20..921fe5b7ff 100644
--- a/iOSClient/Share/NCShare.swift
+++ b/iOSClient/Share/NCShare.swift
@@ -31,16 +31,13 @@ import MarqueeLabel
 import ContactsUI
 
 class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent {
-
     @IBOutlet weak var viewContainerConstraint: NSLayoutConstraint!
     @IBOutlet weak var sharedWithYouByView: UIView!
     @IBOutlet weak var sharedWithYouByImage: UIImageView!
     @IBOutlet weak var sharedWithYouByLabel: UILabel!
-    @IBOutlet weak var sharedWithYouByNoteImage: UIImageView!
-    @IBOutlet weak var sharedWithYouByNote: MarqueeLabel!
     @IBOutlet weak var searchFieldTopConstraint: NSLayoutConstraint!
-    @IBOutlet weak var searchField: UITextField!
-    var textField: UITextField? { searchField }
+    @IBOutlet weak var searchField: UISearchBar!
+    var textField: UIView? { searchField }
 
     @IBOutlet weak var tableView: UITableView!
     @IBOutlet weak var btnContact: UIButton!
@@ -72,7 +69,7 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
         view.backgroundColor = .systemBackground
 
         viewContainerConstraint.constant = height
-        searchFieldTopConstraint.constant = 10
+        searchFieldTopConstraint.constant = 0
 
         searchField.placeholder = NSLocalizedString("_shareLinksearch_placeholder_", comment: "")
         searchField.autocorrectionType = .no
@@ -81,6 +78,7 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
         tableView.delegate = self
         tableView.allowsSelection = false
         tableView.backgroundColor = .systemBackground
+        tableView.contentInset = UIEdgeInsets(top: 8, left: 0, bottom: 10, right: 0)
 
         tableView.register(UINib(nibName: "NCShareLinkCell", bundle: nil), forCellReuseIdentifier: "cellLink")
         tableView.register(UINib(nibName: "NCShareUserCell", bundle: nil), forCellReuseIdentifier: "cellUser")
@@ -93,9 +91,9 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
             let direcrory = NCManageDatabase.shared.getTableDirectory(account: metadata.account, serverUrl: metadata.serverUrl)
             if NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV12 ||
                 (NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV20 && direcrory?.e2eEncrypted ?? false) {
-                // searchField.isEnabled = false
                 searchFieldTopConstraint.constant = -50
-                searchField.isHidden = true
+                searchField.alpha = 0
+                btnContact.alpha = 0
             }
         } else {
             checkSharedWithYou()
@@ -108,6 +106,9 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
             let isVisible = (self.navigationController?.topViewController as? NCSharePaging)?.page == .sharing
             networking?.readShare(showLoadingIndicator: isVisible)
         }
+
+        searchField.searchTextField.font = .systemFont(ofSize: 14)
+        searchField.delegate = self
     }
 
     func makeNewLinkShare() {
@@ -128,11 +129,12 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
         guard let appDelegate = self.appDelegate, let metadata = metadata, !metadata.ownerId.isEmpty, metadata.ownerId != appDelegate.userId else { return }
 
         if !canReshare {
-            searchField.isEnabled = false
+            searchField.isUserInteractionEnabled = false
+            searchField.alpha = 0.5
             searchField.placeholder = NSLocalizedString("_share_reshare_disabled_", comment: "")
         }
 
-        searchFieldTopConstraint.constant = 65
+        searchFieldTopConstraint.constant = 45
         sharedWithYouByView.isHidden = false
         sharedWithYouByLabel.text = NSLocalizedString("_shared_with_you_by_", comment: "") + " " + metadata.ownerDisplayName
         sharedWithYouByImage.image = utility.loadUserImage(
@@ -146,19 +148,6 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
         let shareLabelAction = UITapGestureRecognizer(target: self, action: #selector(openShareProfile))
         sharedWithYouByLabel.addGestureRecognizer(shareLabelAction)
 
-        if !metadata.note.isEmpty {
-            searchFieldTopConstraint.constant = 95
-            sharedWithYouByNoteImage.isHidden = false
-            sharedWithYouByNoteImage.image = utility.loadImage(named: "note.text", colors: [NCBrandColor.shared.iconImageColor])
-            sharedWithYouByNote.isHidden = false
-            sharedWithYouByNote.text = metadata.note
-            sharedWithYouByNote.textColor = NCBrandColor.shared.textColor
-            sharedWithYouByNote.trailingBuffer = sharedWithYouByNote.frame.width
-        } else {
-            sharedWithYouByNoteImage.isHidden = true
-            sharedWithYouByNote.isHidden = true
-        }
-
         let fileName = appDelegate.userBaseUrl + "-" + metadata.ownerId + ".png"
 
         if NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) == nil {
@@ -253,14 +242,18 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
         dropDown = DropDown()
         let appearance = DropDown.appearance()
 
+        // Setting up the blur effect
+        let blurEffect = UIBlurEffect(style: .light) // You can choose .dark, .extraLight, or .light
+        let blurEffectView = UIVisualEffectView(effect: blurEffect)
+        blurEffectView.frame = CGRect(x: 0, y: 0, width: 500, height: 20)
+
         appearance.backgroundColor = .systemBackground
         appearance.cornerRadius = 10
-        appearance.shadowColor = UIColor(white: 0.5, alpha: 1)
-        appearance.shadowOpacity = 0.9
-        appearance.shadowRadius = 25
+        appearance.shadowColor = .black
+        appearance.shadowOpacity = 0.2
+        appearance.shadowRadius = 30
         appearance.animationduration = 0.25
         appearance.textColor = .darkGray
-        appearance.setupMaskedCorners([.layerMaxXMaxYCorner, .layerMinXMaxYCorner])
 
         for sharee in sharees {
             var label = sharee.label
@@ -271,8 +264,8 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
         }
 
         dropDown.anchorView = searchField
-        dropDown.bottomOffset = CGPoint(x: 0, y: searchField.bounds.height)
-        dropDown.width = searchField.bounds.width
+        dropDown.bottomOffset = CGPoint(x: 10, y: searchField.bounds.height)
+        dropDown.width = searchField.bounds.width - 20
         dropDown.direction = .bottom
 
         dropDown.cellNib = UINib(nibName: "NCSearchUserDropDownCell", bundle: nil)
@@ -308,9 +301,9 @@ extension NCShare: UITableViewDelegate {
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0, indexPath.row == 0 {
             // internal cell has description
-            return 90
+            return 40
         }
-        return 70
+        return 60
     }
 }
 
@@ -345,7 +338,7 @@ extension NCShare: UITableViewDataSource {
             if metadata.e2eEncrypted && NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV12 {
                 cell.tableShare = shares.firstShareLink
             } else {
-                if indexPath.row == 0 {
+                if indexPath.row == 1 {
                     cell.isInternalLink = true
                 } else if shares.firstShareLink?.isInvalidated != true {
                     cell.tableShare = shares.firstShareLink
@@ -390,7 +383,7 @@ extension NCShare: CNContactPickerDelegate {
         if  contact.emailAddresses.count > 1 {
             showEmailList(arrEmail: contact.emailAddresses.map({$0.value as String}))
         } else if let email = contact.emailAddresses.first?.value as? String {
-            textField?.text = email
+            searchField?.text = email
             networking?.getSharees(searchString: email)
         }
     }
@@ -405,7 +398,7 @@ extension NCShare: CNContactPickerDelegate {
                     selected: false,
                     on: false,
                     action: { _ in
-                        self.textField?.text = email
+                        self.searchField?.text = email
                         self.networking?.getSharees(searchString: email)
                     }
                 )
@@ -416,3 +409,28 @@ extension NCShare: CNContactPickerDelegate {
         }
     }
 }
+
+extension NCShare: UISearchBarDelegate {
+    func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
+        NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(searchSharees), object: nil)
+
+        if searchText.isEmpty {
+            dropDown.hide()
+        } else {
+            perform(#selector(searchSharees), with: nil, afterDelay: 0.5)
+        }
+    }
+
+    @objc private func searchSharees() {
+        // https://stackoverflow.com/questions/25471114/how-to-validate-an-e-mail-address-in-swift
+        func isValidEmail(_ email: String) -> Bool {
+
+            let emailRegEx = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
+            let emailPred = NSPredicate(format: "SELF MATCHES %@", emailRegEx)
+            return emailPred.evaluate(with: email)
+        }
+        guard let searchString = searchField.text, !searchString.isEmpty else { return }
+        if searchString.contains("@"), !isValidEmail(searchString) { return }
+        networking?.getSharees(searchString: searchString)
+    }
+}
diff --git a/iOSClient/Share/NCShareCommentsCell.xib b/iOSClient/Share/NCShareCommentsCell.xib
index 5ce95380a5..cceef5a118 100755
--- a/iOSClient/Share/NCShareCommentsCell.xib
+++ b/iOSClient/Share/NCShareCommentsCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,22 +11,22 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" rowHeight="122" id="qJF-Yc-gKE" customClass="NCShareCommentsCell" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="600" height="122"/>
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" rowHeight="68" id="qJF-Yc-gKE" customClass="NCShareCommentsCell" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="600" height="68"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qJF-Yc-gKE" id="3Oe-gU-3Nk">
-                <rect key="frame" x="0.0" y="0.0" width="600" height="122"/>
+                <rect key="frame" x="0.0" y="0.0" width="600" height="68"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView clipsSubviews="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="qDs-UG-Mn7" userLabel="ImageItem">
-                        <rect key="frame" x="5" y="15" width="40" height="40"/>
+                        <rect key="frame" x="20" y="15" width="35" height="35"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="40" id="8et-YH-T1D"/>
-                            <constraint firstAttribute="width" constant="40" id="GNY-Va-SIJ"/>
+                            <constraint firstAttribute="height" constant="35" id="8et-YH-T1D"/>
+                            <constraint firstAttribute="width" constant="35" id="GNY-Va-SIJ"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="user" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="otH-mT-7Z4" userLabel="labelTitle">
-                        <rect key="frame" x="55" y="26" width="28.5" height="18"/>
+                        <rect key="frame" x="70" y="8.5" width="28.5" height="18"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="18" id="iet-xr-SX6"/>
                         </constraints>
@@ -35,7 +35,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J1z-RG-U4A" userLabel="ButtonMenu">
-                        <rect key="frame" x="556" y="25" width="20" height="20"/>
+                        <rect key="frame" x="560" y="25" width="20" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="G48-LB-BsD"/>
                             <constraint firstAttribute="width" constant="20" id="vLI-cJ-Jqx"/>
@@ -53,39 +53,36 @@
                             <action selector="touchUpInsideMenu:" destination="qJF-Yc-gKE" eventType="touchUpInside" id="dx2-2Z-VfO"/>
                         </connections>
                     </button>
-                    <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="message" lineBreakMode="middleTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mNK-Zq-pFW" userLabel="labelTitle">
-                        <rect key="frame" x="55" y="71" width="540" height="36"/>
-                        <constraints>
-                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="15" id="tAu-Ct-G3J"/>
-                        </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                        <nil key="highlightedColor"/>
-                    </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QXZ-ax-nlQ">
-                        <rect key="frame" x="55" y="49" width="521" height="18"/>
+                        <rect key="frame" x="70" y="23" width="510" height="18"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="18" id="WZK-ND-Vl1"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <nil key="highlightedColor"/>
                     </label>
+                    <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="message" lineBreakMode="middleTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mNK-Zq-pFW" userLabel="labelTitle">
+                        <rect key="frame" x="70" y="45" width="525" height="13"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="mNK-Zq-pFW" firstAttribute="leading" secondItem="3Oe-gU-3Nk" secondAttribute="leading" constant="55" id="1mf-Ih-fHK"/>
-                    <constraint firstItem="QXZ-ax-nlQ" firstAttribute="leading" secondItem="qDs-UG-Mn7" secondAttribute="trailing" constant="10" id="3EJ-ah-pBt"/>
+                    <constraint firstItem="mNK-Zq-pFW" firstAttribute="leading" secondItem="qDs-UG-Mn7" secondAttribute="trailing" constant="15" id="1mf-Ih-fHK"/>
+                    <constraint firstItem="QXZ-ax-nlQ" firstAttribute="leading" secondItem="qDs-UG-Mn7" secondAttribute="trailing" constant="15" id="3EJ-ah-pBt"/>
                     <constraint firstItem="J1z-RG-U4A" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="otH-mT-7Z4" secondAttribute="trailing" constant="8" id="43r-67-Pxv"/>
-                    <constraint firstItem="otH-mT-7Z4" firstAttribute="leading" secondItem="qDs-UG-Mn7" secondAttribute="trailing" constant="10" id="7o5-Rj-6lV"/>
+                    <constraint firstItem="otH-mT-7Z4" firstAttribute="leading" secondItem="qDs-UG-Mn7" secondAttribute="trailing" constant="15" id="7o5-Rj-6lV"/>
                     <constraint firstAttribute="trailing" secondItem="mNK-Zq-pFW" secondAttribute="trailing" constant="5" id="A2t-sl-Uer"/>
                     <constraint firstItem="qDs-UG-Mn7" firstAttribute="top" secondItem="3Oe-gU-3Nk" secondAttribute="top" constant="15" id="FAO-D8-MXo"/>
-                    <constraint firstAttribute="bottom" secondItem="mNK-Zq-pFW" secondAttribute="bottom" constant="15" id="H9H-lE-Gg1"/>
+                    <constraint firstAttribute="bottom" secondItem="mNK-Zq-pFW" secondAttribute="bottom" constant="10" id="H9H-lE-Gg1"/>
                     <constraint firstItem="mNK-Zq-pFW" firstAttribute="top" secondItem="QXZ-ax-nlQ" secondAttribute="bottom" constant="4" id="KDw-qu-iO6"/>
-                    <constraint firstItem="otH-mT-7Z4" firstAttribute="centerY" secondItem="qDs-UG-Mn7" secondAttribute="centerY" id="KO4-0R-wdL" userLabel="labelTitle.centerY = ImageItem.centerY"/>
-                    <constraint firstItem="qDs-UG-Mn7" firstAttribute="leading" secondItem="3Oe-gU-3Nk" secondAttribute="leading" constant="5" id="KOm-wo-CBa"/>
-                    <constraint firstAttribute="trailingMargin" secondItem="QXZ-ax-nlQ" secondAttribute="trailing" constant="8" id="Pku-hg-qKn"/>
-                    <constraint firstAttribute="trailingMargin" secondItem="J1z-RG-U4A" secondAttribute="trailing" constant="8" id="SgR-6b-z2c"/>
-                    <constraint firstItem="QXZ-ax-nlQ" firstAttribute="top" secondItem="J1z-RG-U4A" secondAttribute="bottom" constant="4" id="qj4-34-HW3"/>
-                    <constraint firstItem="J1z-RG-U4A" firstAttribute="centerY" secondItem="qDs-UG-Mn7" secondAttribute="centerY" id="tIg-bm-Clb"/>
+                    <constraint firstItem="otH-mT-7Z4" firstAttribute="centerY" secondItem="qDs-UG-Mn7" secondAttribute="centerY" constant="-15" id="KO4-0R-wdL" userLabel="labelTitle.centerY = ImageItem.centerY"/>
+                    <constraint firstItem="qDs-UG-Mn7" firstAttribute="leading" secondItem="3Oe-gU-3Nk" secondAttribute="leading" constant="20" id="KOm-wo-CBa"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="QXZ-ax-nlQ" secondAttribute="trailing" constant="4" id="Pku-hg-qKn"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="J1z-RG-U4A" secondAttribute="trailing" constant="4" id="SgR-6b-z2c"/>
+                    <constraint firstItem="QXZ-ax-nlQ" firstAttribute="top" secondItem="J1z-RG-U4A" secondAttribute="bottom" constant="-22" id="qj4-34-HW3"/>
+                    <constraint firstItem="J1z-RG-U4A" firstAttribute="centerY" secondItem="qDs-UG-Mn7" secondAttribute="centerY" constant="2.5" id="tIg-bm-Clb"/>
                 </constraints>
             </tableViewCellContentView>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -96,7 +93,7 @@
                 <outlet property="labelMessage" destination="mNK-Zq-pFW" id="oRf-8F-Pwu"/>
                 <outlet property="labelUser" destination="otH-mT-7Z4" id="Wf0-PX-Vrq"/>
             </connections>
-            <point key="canvasLocation" x="97.599999999999994" y="290.55472263868069"/>
+            <point key="canvasLocation" x="97.599999999999994" y="266.26686656671666"/>
         </tableViewCell>
     </objects>
     <resources>
diff --git a/iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.swift b/iOSClient/Share/NCShareHeader.swift
similarity index 74%
rename from iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.swift
rename to iOSClient/Share/NCShareHeader.swift
index b64a776af1..152a818cf8 100644
--- a/iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.swift
+++ b/iOSClient/Share/NCShareHeader.swift
@@ -1,5 +1,5 @@
 //
-//  NCShareAdvancePermissionHeader.swift
+//  NCShareHeader.swift
 //  Nextcloud
 //
 //  Created by T-systems on 10/08/21.
@@ -22,18 +22,25 @@
 //
 
 import UIKit
+import TagListView
 
-class NCShareAdvancePermissionHeader: UIView {
+class NCShareHeader: UIView {
     @IBOutlet weak var imageView: UIImageView!
     @IBOutlet weak var fileName: UILabel!
     @IBOutlet weak var info: UILabel!
     @IBOutlet weak var fullWidthImageView: UIImageView!
+    @IBOutlet weak var fileNameTopConstraint: NSLayoutConstraint!
+    @IBOutlet weak var tagListView: TagListView!
+
+    private var heightConstraintWithImage: NSLayoutConstraint?
+    private var heightConstraintWithoutImage: NSLayoutConstraint?
 
     func setupUI(with metadata: tableMetadata) {
         let utilityFileSystem = NCUtilityFileSystem()
         if FileManager.default.fileExists(atPath: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
             fullWidthImageView.image = NCUtility().getImageMetadata(metadata, for: frame.height)
             fullWidthImageView.contentMode = .scaleAspectFill
+            imageView.image = fullWidthImageView.image
             imageView.isHidden = true
         } else {
             if metadata.directory {
@@ -43,10 +50,24 @@ class NCShareAdvancePermissionHeader: UIView {
             } else {
                 imageView.image = NCImageCache.images.file
             }
+
+            fileNameTopConstraint.constant -= 45
         }
+
         fileName.text = metadata.fileNameView
         fileName.textColor = NCBrandColor.shared.textColor
         info.textColor = NCBrandColor.shared.textColor2
         info.text = utilityFileSystem.transformedSize(metadata.size) + ", " + NCUtility().dateDiff(metadata.date as Date)
+
+        tagListView.addTags(Array(metadata.tags))
+
+        setNeedsLayout()
+        layoutIfNeeded()
+    }
+
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        if fullWidthImageView.image != nil {
+            imageView.isHidden = traitCollection.verticalSizeClass != .compact
+        }
     }
 }
diff --git a/iOSClient/Share/NCShareHeader.xib b/iOSClient/Share/NCShareHeader.xib
new file mode 100644
index 0000000000..55ffce6cab
--- /dev/null
+++ b/iOSClient/Share/NCShareHeader.xib
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wbW-yR-MZC" customClass="NCShareHeader" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="230"/>
+            <subviews>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cki-Ql-o1I">
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="140"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="140" id="xTr-ay-Wso"/>
+                    </constraints>
+                </imageView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pu4-Nd-M08">
+                    <rect key="frame" x="16" y="150" width="382" height="18"/>
+                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VaC-Fz-kHk">
+                    <rect key="frame" x="16" y="169" width="383" height="16"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                    <color key="textColor" red="0.76862745099999996" green="0.77647058820000003" blue="0.77647058820000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="directory" translatesAutoresizingMaskIntoConstraints="NO" id="Dkw-QP-be6">
+                    <rect key="frame" x="15" y="0.0" width="96" height="96"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="96" id="TW7-8v-NRJ">
+                            <variation key="heightClass=compact" constant="45"/>
+                        </constraint>
+                        <constraint firstAttribute="width" constant="96" id="Vbz-xZ-L5k">
+                            <variation key="heightClass=compact" constant="45"/>
+                        </constraint>
+                    </constraints>
+                </imageView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qpa-L5-mof" customClass="TagListView" customModule="TagListView">
+                    <rect key="frame" x="10" y="195" width="394" height="35"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <constraints>
+                        <constraint firstAttribute="height" relation="lessThanOrEqual" constant="35" id="QBZ-Si-8J9"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="8"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                            <real key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="tagBackgroundColor">
+                            <color key="value" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                            <color key="value" systemColor="systemGray5Color"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="textColor">
+                            <color key="value" systemColor="systemGrayColor"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+            </subviews>
+            <constraints>
+                <constraint firstItem="pu4-Nd-M08" firstAttribute="leading" secondItem="wbW-yR-MZC" secondAttribute="leading" constant="16" id="0Uy-ra-MtM"/>
+                <constraint firstItem="qpa-L5-mof" firstAttribute="top" secondItem="VaC-Fz-kHk" secondAttribute="bottom" constant="10" id="9P5-sA-LdV"/>
+                <constraint firstAttribute="trailing" secondItem="VaC-Fz-kHk" secondAttribute="trailing" constant="15" id="Ebg-3T-03W"/>
+                <constraint firstItem="Dkw-QP-be6" firstAttribute="leading" secondItem="wbW-yR-MZC" secondAttribute="leading" constant="15" id="KPc-al-RWN"/>
+                <constraint firstAttribute="top" secondItem="cki-Ql-o1I" secondAttribute="top" id="KsC-jf-M6F"/>
+                <constraint firstItem="pu4-Nd-M08" firstAttribute="top" secondItem="cki-Ql-o1I" secondAttribute="bottom" constant="10" id="LGa-dZ-YWB"/>
+                <constraint firstAttribute="trailing" secondItem="qpa-L5-mof" secondAttribute="trailing" constant="10" id="SMV-fn-U36"/>
+                <constraint firstAttribute="trailing" secondItem="cki-Ql-o1I" secondAttribute="trailing" id="Wdl-Rb-Pjy"/>
+                <constraint firstItem="Dkw-QP-be6" firstAttribute="top" secondItem="wbW-yR-MZC" secondAttribute="top" id="Wv8-wm-RAM"/>
+                <constraint firstItem="qpa-L5-mof" firstAttribute="leading" secondItem="wbW-yR-MZC" secondAttribute="leading" constant="10" id="YSd-5w-XAH"/>
+                <constraint firstItem="VaC-Fz-kHk" firstAttribute="leading" secondItem="pu4-Nd-M08" secondAttribute="leading" id="Ycb-wy-uL6"/>
+                <constraint firstItem="VaC-Fz-kHk" firstAttribute="top" secondItem="pu4-Nd-M08" secondAttribute="bottom" constant="1" id="Z5Q-L6-DMc"/>
+                <constraint firstItem="cki-Ql-o1I" firstAttribute="leading" secondItem="wbW-yR-MZC" secondAttribute="leading" id="ZlH-LU-x2x"/>
+                <constraint firstAttribute="height" constant="90" id="eIA-KE-jMG"/>
+                <constraint firstItem="pu4-Nd-M08" firstAttribute="top" secondItem="Dkw-QP-be6" secondAttribute="bottom" constant="10" id="knE-ki-nPr"/>
+                <constraint firstAttribute="trailing" secondItem="pu4-Nd-M08" secondAttribute="trailing" constant="16" id="pP5-G4-ey4"/>
+                <constraint firstItem="qpa-L5-mof" firstAttribute="bottom" secondItem="wbW-yR-MZC" secondAttribute="bottom" id="v3t-y8-sw0"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <variation key="default">
+                <mask key="constraints">
+                    <exclude reference="eIA-KE-jMG"/>
+                    <exclude reference="knE-ki-nPr"/>
+                </mask>
+            </variation>
+            <variation key="heightClass=compact">
+                <mask key="subviews">
+                    <exclude reference="cki-Ql-o1I"/>
+                    <exclude reference="qpa-L5-mof"/>
+                </mask>
+                <mask key="constraints">
+                    <include reference="eIA-KE-jMG"/>
+                    <include reference="knE-ki-nPr"/>
+                </mask>
+            </variation>
+            <connections>
+                <outlet property="fileName" destination="pu4-Nd-M08" id="iLj-ya-6hM"/>
+                <outlet property="fileNameTopConstraint" destination="LGa-dZ-YWB" id="coJ-JB-oVJ"/>
+                <outlet property="fullWidthImageView" destination="cki-Ql-o1I" id="KYn-3Y-SZH"/>
+                <outlet property="imageView" destination="Dkw-QP-be6" id="wzX-Sb-Ajt"/>
+                <outlet property="info" destination="VaC-Fz-kHk" id="n9O-6c-qsd"/>
+                <outlet property="tagListView" destination="qpa-L5-mof" id="XJL-YO-eAV"/>
+            </connections>
+            <point key="canvasLocation" x="33.644859813084111" y="75.485961123110158"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="directory" width="300" height="300"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemGray5Color">
+            <color red="0.8980392157" green="0.8980392157" blue="0.91764705879999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemGrayColor">
+            <color red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
+</document>
diff --git a/iOSClient/Share/NCShareHeaderView.xib b/iOSClient/Share/NCShareHeaderView.xib
index 3f7727099b..44b83d3fc7 100644
--- a/iOSClient/Share/NCShareHeaderView.xib
+++ b/iOSClient/Share/NCShareHeaderView.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_0" orientation="landscape" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/iOSClient/Share/NCShareLinkCell.xib b/iOSClient/Share/NCShareLinkCell.xib
index 32182dae50..a102ccf497 100755
--- a/iOSClient/Share/NCShareLinkCell.xib
+++ b/iOSClient/Share/NCShareLinkCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,22 +11,24 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cellLink" rowHeight="90" id="qJF-Yc-gKE" customClass="NCShareLinkCell" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="600" height="90"/>
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cellLink" rowHeight="73" id="qJF-Yc-gKE" customClass="NCShareLinkCell" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="322" height="60"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qJF-Yc-gKE" id="3Oe-gU-3Nk">
-                <rect key="frame" x="0.0" y="0.0" width="600" height="90"/>
+                <rect key="frame" x="0.0" y="0.0" width="322" height="60"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" image="circle" translatesAutoresizingMaskIntoConstraints="NO" id="qDs-UG-Mn7" userLabel="ImageItem">
-                        <rect key="frame" x="5" y="25" width="40" height="40"/>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="qDs-UG-Mn7" userLabel="ImageItem">
+                        <rect key="frame" x="6" y="10" width="40" height="40"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="40" id="8et-YH-T1D"/>
+                            <constraint firstAttribute="height" constant="34" id="8et-YH-T1D"/>
                             <constraint firstAttribute="width" constant="40" id="GNY-Va-SIJ"/>
                         </constraints>
+                        <imageReference key="image" image="link.circle.fill" catalog="system" symbolScale="large" variableValue="0.0"/>
+                        <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
                     </imageView>
                     <stackView opaque="NO" contentMode="scaleToFill" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="OQv-Vf-bvD">
-                        <rect key="frame" x="520" y="35" width="70" height="20"/>
+                        <rect key="frame" x="242" y="20" width="70" height="20"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xaz-vY-Jzu" userLabel="ButtonCopy">
                                 <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
@@ -68,22 +70,17 @@
                             </button>
                         </subviews>
                     </stackView>
-                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Wxr-1B-Czy">
-                        <rect key="frame" x="53" y="12" width="452" height="66"/>
+                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="8" baselineRelativeArrangement="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Wxr-1B-Czy">
+                        <rect key="frame" x="54" y="0.0" width="173" height="56"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Share link" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="otH-mT-7Z4" userLabel="labelTitle">
-                                <rect key="frame" x="0.0" y="0.0" width="452" height="22"/>
+                                <rect key="frame" x="0.0" y="0.0" width="173" height="32"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="245" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WJj-9P-3bn">
-                                <rect key="frame" x="0.0" y="26" width="452" height="40"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="Eo4-Rq-ETK"/>
-                                </constraints>
-                                <string key="text">Only works....
-.;...</string>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="center" verticalCompressionResistancePriority="245" text="Only works for users with access to this file/folder" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WJj-9P-3bn">
+                                <rect key="frame" x="0.0" y="24" width="173" height="32"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" systemColor="secondaryLabelColor"/>
                                 <nil key="highlightedColor"/>
@@ -93,13 +90,13 @@
                 </subviews>
                 <constraints>
                     <constraint firstItem="OQv-Vf-bvD" firstAttribute="leading" secondItem="Wxr-1B-Czy" secondAttribute="trailing" constant="15" id="8QW-n0-4lO"/>
-                    <constraint firstItem="qDs-UG-Mn7" firstAttribute="leading" secondItem="3Oe-gU-3Nk" secondAttribute="leading" constant="5" id="KOm-wo-CBa"/>
-                    <constraint firstAttribute="bottom" secondItem="Wxr-1B-Czy" secondAttribute="bottom" constant="12" id="MM0-9i-BpF"/>
+                    <constraint firstItem="qDs-UG-Mn7" firstAttribute="leading" secondItem="3Oe-gU-3Nk" secondAttribute="leading" constant="6" id="KOm-wo-CBa"/>
+                    <constraint firstAttribute="bottom" secondItem="Wxr-1B-Czy" secondAttribute="bottom" constant="4" id="MM0-9i-BpF"/>
                     <constraint firstAttribute="trailing" secondItem="OQv-Vf-bvD" secondAttribute="trailing" constant="10" id="W3b-ww-vbQ"/>
                     <constraint firstItem="qDs-UG-Mn7" firstAttribute="centerY" secondItem="3Oe-gU-3Nk" secondAttribute="centerY" id="ZrD-Aw-xkx"/>
                     <constraint firstItem="OQv-Vf-bvD" firstAttribute="centerY" secondItem="3Oe-gU-3Nk" secondAttribute="centerY" id="eLc-gk-xAr"/>
                     <constraint firstItem="Wxr-1B-Czy" firstAttribute="leading" secondItem="qDs-UG-Mn7" secondAttribute="trailing" constant="8" id="nXI-b3-EJM"/>
-                    <constraint firstItem="Wxr-1B-Czy" firstAttribute="top" secondItem="3Oe-gU-3Nk" secondAttribute="top" constant="12" id="vxe-9X-O1f"/>
+                    <constraint firstItem="Wxr-1B-Czy" firstAttribute="top" secondItem="3Oe-gU-3Nk" secondAttribute="top" id="vxe-9X-O1f"/>
                 </constraints>
             </tableViewCellContentView>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -110,21 +107,21 @@
                 <outlet property="labelTitle" destination="otH-mT-7Z4" id="f9z-Oa-OiR"/>
                 <outlet property="menuButton" destination="J1z-RG-U4A" id="VCC-y1-LRK"/>
             </connections>
-            <point key="canvasLocation" x="97.599999999999994" y="276.1619190404798"/>
+            <point key="canvasLocation" x="-124.8" y="268.51574212893553"/>
         </tableViewCell>
     </objects>
     <resources>
-        <image name="circle" width="300" height="300"/>
         <image name="doc.on.doc" catalog="system" width="116" height="128"/>
         <image name="ellipsis" catalog="system" width="128" height="37"/>
+        <image name="link.circle.fill" catalog="system" width="128" height="123"/>
         <systemColor name="labelColor">
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="secondaryLabelColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="tertiaryLabelColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.29803921568627451" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29803921570000003" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/iOSClient/Share/NCSharePaging.swift b/iOSClient/Share/NCSharePaging.swift
index 537fbaaacf..8e0f556f57 100644
--- a/iOSClient/Share/NCSharePaging.swift
+++ b/iOSClient/Share/NCSharePaging.swift
@@ -29,7 +29,7 @@ import MarqueeLabel
 import TagListView
 
 protocol NCSharePagingContent {
-    var textField: UITextField? { get }
+    var textField: UIView? { get }
 }
 
 class NCSharePaging: UIViewController {
@@ -63,8 +63,9 @@ class NCSharePaging: UIViewController {
         pagingViewController.backgroundColor = .systemBackground
         pagingViewController.menuBackgroundColor = .systemBackground
         pagingViewController.selectedBackgroundColor = .systemBackground
+        pagingViewController.indicatorColor = NCBrandColor.shared.brandElement
         pagingViewController.textColor = NCBrandColor.shared.textColor
-        pagingViewController.selectedTextColor = NCBrandColor.shared.textColor
+        pagingViewController.selectedTextColor = NCBrandColor.shared.brandElement
 
         // Pagination
         addChild(pagingViewController)
@@ -76,14 +77,16 @@ class NCSharePaging: UIViewController {
             height: 1,
             zIndex: Int.max,
             spacing: .zero,
-            insets: UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 5)
+            insets: .zero
         )
 
+        pagingViewController.borderOptions = .visible(height: 1, zIndex: Int.max, insets: .zero)
+
         // Contrain the paging view to all edges.
         pagingViewController.view.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
             pagingViewController.view.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
-            pagingViewController.view.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor),
+            pagingViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
             pagingViewController.view.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
             pagingViewController.view.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor)
         ])
@@ -97,7 +100,6 @@ class NCSharePaging: UIViewController {
             pagingViewController.select(index: 0)
         }
 
-        (pagingViewController.view as? NCSharePagingView)?.setupConstraints()
         pagingViewController.reloadMenu()
     }
 
@@ -112,9 +114,9 @@ class NCSharePaging: UIViewController {
             self.dismiss(animated: false, completion: nil)
         }
 
-        pagingViewController.menuItemSize = .fixed(
-            width: self.view.bounds.width / CGFloat(self.pages.count),
-            height: 40)
+//        pagingViewController.menuItemSize = .fixed(
+//            width: self.view.bounds.width / CGFloat(self.pages.count),
+//            height: 40)
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -130,13 +132,7 @@ class NCSharePaging: UIViewController {
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
-
-        coordinator.animate(alongsideTransition: nil) { _ in
-            self.pagingViewController.menuItemSize = .fixed(
-                width: self.view.bounds.width / CGFloat(self.pages.count),
-                height: 40)
-            self.currentVC?.textField?.resignFirstResponder()
-        }
+        self.currentVC?.textField?.resignFirstResponder()
     }
 
     // MARK: - NotificationCenter & Keyboard & TextField
@@ -186,7 +182,7 @@ extension NCSharePaging: PagingViewControllerDataSource {
 
     func pagingViewController(_: PagingViewController, viewControllerAt index: Int) -> UIViewController {
 
-        let height = pagingViewController.options.menuHeight + NCSharePagingView.headerHeight + NCSharePagingView.tagHeaderHeight
+        let height: CGFloat = 50
 
         if pages[index] == .activity {
             guard let viewController = UIStoryboard(name: "NCActivity", bundle: nil).instantiateInitialViewController() as? NCActivity else {
@@ -248,13 +244,11 @@ class NCShareHeaderViewController: PagingViewController {
 }
 
 class NCSharePagingView: PagingView {
-
-    static let headerHeight: CGFloat = 90
-    static var tagHeaderHeight: CGFloat = 0
     var metadata = tableMetadata()
     let utilityFileSystem = NCUtilityFileSystem()
     let utility = NCUtility()
     public var headerHeightConstraint: NSLayoutConstraint?
+    var header: NCShareHeader?
 
     // MARK: - View Life Cycle
 
@@ -270,61 +264,68 @@ class NCSharePagingView: PagingView {
 
     override func setupConstraints() {
 
-        guard let headerView = Bundle.main.loadNibNamed("NCShareHeaderView", owner: self, options: nil)?.first as? NCShareHeaderView else { return }
+//        guard let headerView = Bundle.main.loadNibNamed("NCShareHeaderView", owner: self, options: nil)?.first as? NCShareHeaderView else { return }
+
+        guard let headerView = Bundle.main.loadNibNamed("NCShareHeader", owner: self, options: nil)?.first as? NCShareHeader else { return }
+        header = headerView
         headerView.backgroundColor = .systemBackground
-        headerView.ocId = metadata.ocId
+//        headerView.ocId = metadata.ocId
 
         let dateFormatter = DateFormatter()
         dateFormatter.dateStyle = .short
         dateFormatter.timeStyle = .short
         dateFormatter.locale = Locale.current
 
-        if FileManager.default.fileExists(atPath: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
-            headerView.imageView.image = UIImage(contentsOfFile: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
-        } else {
-            if metadata.directory {
-                let image = metadata.e2eEncrypted ? UIImage(named: "folderEncrypted") : UIImage(named: "folder")
-                headerView.imageView.image = image?.image(color: NCBrandColor.shared.brandElement, size: image?.size.width ?? 0)
-                headerView.imageView.image = headerView.imageView.image?.colorizeFolder(metadata: metadata)
-            } else if !metadata.iconName.isEmpty {
-                headerView.imageView.image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true)
-            } else {
-                headerView.imageView.image = NCImageCache.images.file
-            }
-        }
-        headerView.path.text = utilityFileSystem.getPath(path: metadata.path, user: metadata.user, fileName: metadata.fileName)
-        headerView.path.textColor = NCBrandColor.shared.textColor
-        headerView.path.trailingBuffer = headerView.path.frame.width
-        if metadata.favorite {
-            headerView.favorite.setImage(utility.loadImage(named: "star.fill", colors: [NCBrandColor.shared.yellowFavorite], size: 20), for: .normal)
-        } else {
-            headerView.favorite.setImage(utility.loadImage(named: "star.fill", colors: [NCBrandColor.shared.iconImageColor2], size: 20), for: .normal)
-        }
-        headerView.info.text = utilityFileSystem.transformedSize(metadata.size) + ", " + NSLocalizedString("_modified_", comment: "") + " " + dateFormatter.string(from: metadata.date as Date)
-        headerView.info.textColor = NCBrandColor.shared.textColor2
-        headerView.creation.text = NSLocalizedString("_creation_", comment: "") + " " + dateFormatter.string(from: metadata.creationDate as Date)
-        headerView.creation.textColor = NCBrandColor.shared.textColor2
-        headerView.upload.text = NSLocalizedString("_upload_", comment: "") + " " + dateFormatter.string(from: metadata.uploadDate as Date)
-        headerView.upload.textColor = NCBrandColor.shared.textColor2
-
-        headerView.details.setTitleColor(NCBrandColor.shared.textColor, for: .normal)
-        headerView.details.setTitle(NSLocalizedString("_details_", comment: ""), for: .normal)
-        headerView.details.layer.cornerRadius = 9
-        headerView.details.layer.masksToBounds = true
-        headerView.details.layer.backgroundColor = UIColor(red: 152.0 / 255.0, green: 167.0 / 255.0, blue: 181.0 / 255.0, alpha: 0.8).cgColor
-
-        for tag in metadata.tags {
-            headerView.tagListView.addTag(tag)
-        }
+//        if FileManager.default.fileExists(atPath: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
+//            headerView.imageView.image = UIImage(contentsOfFile: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
+//        } else {
+//            print(metadata.iconName)
+//            if metadata.directory {
+//                let image = metadata.e2eEncrypted ? UIImage(named: "folderEncrypted") : UIImage(named: "folder")
+//                headerView.imageView.image = image?.image(color: NCBrandColor.shared.brandElement, size: image?.size.width ?? 0)
+//                headerView.imageView.image = headerView.imageView.image?.colorizeFolder(metadata: metadata)
+//            } else if !metadata.iconName.isEmpty {
+//                headerView.imageView.image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true)
+//            } else {
+//                headerView.imageView.image = NCImageCache.images.file
+//            }
+//        }
+//        headerView.path.text = utilityFileSystem.getPath(path: metadata.path, user: metadata.user, fileName: metadata.fileName)
+//        headerView.path.textColor = NCBrandColor.shared.textColor
+//        headerView.path.trailingBuffer = headerView.path.frame.width
+//        if metadata.favorite {
+//            headerView.favorite.setImage(utility.loadImage(named: "star.fill", colors: [NCBrandColor.shared.yellowFavorite], size: 20), for: .normal)
+//        } else {
+//            headerView.favorite.setImage(utility.loadImage(named: "star.fill", colors: [NCBrandColor.shared.iconImageColor2], size: 20), for: .normal)
+//        }
+//        headerView.info.text = utilityFileSystem.transformedSize(metadata.size) + ", " + NSLocalizedString("_modified_", comment: "") + " " + dateFormatter.string(from: metadata.date as Date)
+//        headerView.info.textColor = NCBrandColor.shared.textColor2
+//        headerView.creation.text = NSLocalizedString("_creation_", comment: "") + " " + dateFormatter.string(from: metadata.creationDate as Date)
+//        headerView.creation.textColor = NCBrandColor.shared.textColor2
+//        headerView.upload.text = NSLocalizedString("_upload_", comment: "") + " " + dateFormatter.string(from: metadata.uploadDate as Date)
+//        headerView.upload.textColor = NCBrandColor.shared.textColor2
+//
+//        headerView.details.setTitleColor(NCBrandColor.shared.textColor, for: .normal)
+//        headerView.details.setTitle(NSLocalizedString("_details_", comment: ""), for: .normal)
+//        headerView.details.layer.cornerRadius = 9
+//        headerView.details.layer.masksToBounds = true
+//        headerView.details.layer.backgroundColor = UIColor(red: 152.0 / 255.0, green: 167.0 / 255.0, blue: 181.0 / 255.0, alpha: 0.8).cgColor
 
-        if metadata.tags.isEmpty {
-            NCSharePagingView.tagHeaderHeight = 0
-        } else {
-            NCSharePagingView.tagHeaderHeight = headerView.tagListView.intrinsicContentSize.height + 10
-        }
+//        for tag in metadata.tags {
+////            headerView.tagListView.addTag(tag)
+//        }
+
+//        if headerView.fullWidthImageView?.image == nil {
+//            NCSharePagingView.tagHeaderHeight = 80
+//        } else {
+//            NCSharePagingView.tagHeaderHeight = 130
+//        }
+
+        headerView.setupUI(with: metadata)
 
         addSubview(headerView)
 
+//        recalculateHeaderHeight()
         collectionView.translatesAutoresizingMaskIntoConstraints = false
         headerView.translatesAutoresizingMaskIntoConstraints = false
         pageView.translatesAutoresizingMaskIntoConstraints = false
@@ -335,17 +336,36 @@ class NCSharePagingView: PagingView {
             collectionView.heightAnchor.constraint(equalToConstant: options.menuHeight),
             collectionView.topAnchor.constraint(equalTo: headerView.bottomAnchor),
 
-            headerView.topAnchor.constraint(equalTo: topAnchor),
-            headerView.leadingAnchor.constraint(equalTo: leadingAnchor),
-            headerView.trailingAnchor.constraint(equalTo: trailingAnchor),
-            headerView.heightAnchor.constraint(equalToConstant: NCSharePagingView.headerHeight + NCSharePagingView.tagHeaderHeight),
+            headerView.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor),
+            headerView.leadingAnchor.constraint(equalTo: safeAreaLayoutGuide.leadingAnchor),
+            headerView.trailingAnchor.constraint(equalTo: safeAreaLayoutGuide.trailingAnchor),
+//            headerView.heightAnchor.constraint(equalToConstant: 260),
 
             pageView.leadingAnchor.constraint(equalTo: leadingAnchor),
             pageView.trailingAnchor.constraint(equalTo: trailingAnchor),
             pageView.bottomAnchor.constraint(equalTo: bottomAnchor),
-            pageView.topAnchor.constraint(equalTo: topAnchor, constant: 10)
+            pageView.topAnchor.constraint(equalTo: headerView.bottomAnchor)
         ])
+
+
+//        setNeedsLayout()
+//        layoutIfNeeded()
     }
+
+//    func recalculateHeaderHeight() {
+//        guard let header else { return }
+//        // Deactivate existing height constraints
+//        for constraint in header.constraints {
+//                if constraint.firstAttribute == .height {
+//                    constraint.isActive = false
+//                }
+//            }
+//
+//        NSLayoutConstraint.activate([
+//            header.heightAnchor.constraint(equalToConstant: header.heightWithImage.constant)
+//        ])
+//
+//    }
 }
 
 class NCShareHeaderView: UIView {
@@ -383,7 +403,6 @@ class NCShareHeaderView: UIView {
     }
 
     @IBAction func touchUpInsideDetails(_ sender: UIButton) {
-
         creation.isHidden = !creation.isHidden
         upload.isHidden = !upload.isHidden
     }
diff --git a/iOSClient/Share/NCShareUserCell.swift b/iOSClient/Share/NCShareUserCell.swift
index afa5eba26a..ad92b7d699 100644
--- a/iOSClient/Share/NCShareUserCell.swift
+++ b/iOSClient/Share/NCShareUserCell.swift
@@ -105,7 +105,7 @@ class NCShareUserCell: UITableViewCell, NCCellProtocol {
         imageItem?.addGestureRecognizer(tapGesture)
 
         labelQuickStatus.textColor = NCBrandColor.shared.customer
-        imageDownArrow.image = utility.loadImage(named: "arrowtriangle.down.fill", colors: [NCBrandColor.shared.customer])
+        imageDownArrow.image = utility.loadImage(named: "arrowtriangle.down.circle", colors: [NCBrandColor.shared.customer])
     }
 
     @objc func tapAvatarImage(_ sender: UITapGestureRecognizer) {
@@ -157,7 +157,12 @@ class NCSearchUserDropDownCell: DropDownCell, NCCellProtocol {
         imageItem.image = NCShareCommon().getImageShareType(shareType: sharee.shareType)
         imageShareeType.image = NCShareCommon().getImageShareType(shareType: sharee.shareType)
         let status = utility.getUserStatus(userIcon: sharee.userIcon, userStatus: sharee.userStatus, userMessage: sharee.userMessage)
-        imageStatus.image = status.statusImage
+
+        if let statusImage = status.statusImage {
+            imageStatus.image = statusImage
+            imageStatus.makeCircularBackground(withColor: .systemBackground)
+        }
+
         self.status.text = status.statusMessage
         if self.status.text?.count ?? 0 > 0 {
             centerTitle.constant = -5
diff --git a/iOSClient/Share/NCShareUserCell.xib b/iOSClient/Share/NCShareUserCell.xib
index 613ee026d9..df97e61950 100755
--- a/iOSClient/Share/NCShareUserCell.xib
+++ b/iOSClient/Share/NCShareUserCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,18 +12,19 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cellUser" rowHeight="70" id="qJF-Yc-gKE" customClass="NCShareUserCell" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="600" height="90"/>
+            <rect key="frame" x="0.0" y="0.0" width="600" height="60"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qJF-Yc-gKE" id="3Oe-gU-3Nk">
-                <rect key="frame" x="0.0" y="0.0" width="600" height="90"/>
+                <rect key="frame" x="0.0" y="0.0" width="600" height="60"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="qDs-UG-Mn7" userLabel="ImageItem">
-                        <rect key="frame" x="5" y="25" width="40" height="40"/>
+                    <imageView clipsSubviews="YES" contentMode="scaleAspectFill" image="avatar2" translatesAutoresizingMaskIntoConstraints="NO" id="qDs-UG-Mn7" userLabel="ImageItem">
+                        <rect key="frame" x="5" y="11.5" width="37" height="37"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="40" id="8et-YH-T1D"/>
-                            <constraint firstAttribute="width" constant="40" id="GNY-Va-SIJ"/>
+                            <constraint firstAttribute="height" constant="37" id="8et-YH-T1D"/>
+                            <constraint firstAttribute="width" constant="37" id="GNY-Va-SIJ"/>
                         </constraints>
+                        <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="boolean" keyPath="disableAvatar" value="YES"/>
                             <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
@@ -35,16 +36,16 @@
                         </userDefinedRuntimeAttributes>
                     </imageView>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cEA-ts-Q8I">
-                        <rect key="frame" x="30" y="50" width="20" height="20"/>
+                        <rect key="frame" x="27" y="33.5" width="20" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="PGX-L0-VWR"/>
                             <constraint firstAttribute="width" constant="20" id="XBj-Mx-dCc"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="shareWith" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="otH-mT-7Z4" userLabel="labelTitle">
-                        <rect key="frame" x="55" y="5" width="150" height="18"/>
+                        <rect key="frame" x="52" y="10" width="400" height="18"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="150" id="4Oa-yZ-HZK"/>
+                            <constraint firstAttribute="width" constant="400" id="4Oa-yZ-HZK"/>
                             <constraint firstAttribute="height" constant="18" id="iet-xr-SX6"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -52,7 +53,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="label quick status" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wzb-Us-kQu">
-                        <rect key="frame" x="55" y="36" width="106" height="18"/>
+                        <rect key="frame" x="52" y="31" width="106" height="18"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="18" id="08l-QE-tCg"/>
                         </constraints>
@@ -60,27 +61,27 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrowtriangle.down.fill" translatesAutoresizingMaskIntoConstraints="NO" id="dY5-fF-IsK">
-                        <rect key="frame" x="162" y="37.5" width="15" height="15"/>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrowtriangle.down.circle" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="dY5-fF-IsK">
+                        <rect key="frame" x="159" y="33" width="15" height="14"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="15" id="VC5-7w-E0B"/>
                             <constraint firstAttribute="height" constant="15" id="Wa4-aR-Yq3"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="user status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cUC-wO-Mxm">
-                        <rect key="frame" x="56" y="69" width="494" height="16"/>
+                        <rect key="frame" x="46" y="61" width="504" height="16"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kaa-f4-d2t">
-                        <rect key="frame" x="55" y="0.0" width="500" height="90"/>
+                        <rect key="frame" x="52" y="0.0" width="503" height="60"/>
                         <connections>
                             <action selector="quickStatusClicked:" destination="qJF-Yc-gKE" eventType="touchUpInside" id="UpH-vO-bIh"/>
                         </connections>
                     </button>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J1z-RG-U4A" userLabel="ButtonMenu">
-                        <rect key="frame" x="570" y="35" width="20" height="20"/>
+                        <rect key="frame" x="570" y="20" width="20" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="G48-LB-BsD"/>
                             <constraint firstAttribute="width" constant="20" id="vLI-cJ-Jqx"/>
@@ -104,22 +105,27 @@
                     <constraint firstItem="kaa-f4-d2t" firstAttribute="leading" secondItem="otH-mT-7Z4" secondAttribute="leading" id="EjD-fg-ltt"/>
                     <constraint firstItem="qDs-UG-Mn7" firstAttribute="leading" secondItem="3Oe-gU-3Nk" secondAttribute="leading" constant="5" id="KOm-wo-CBa"/>
                     <constraint firstItem="kaa-f4-d2t" firstAttribute="top" secondItem="3Oe-gU-3Nk" secondAttribute="top" id="MFe-I4-uWi"/>
-                    <constraint firstItem="otH-mT-7Z4" firstAttribute="top" secondItem="3Oe-gU-3Nk" secondAttribute="top" constant="5" id="PXb-Eh-v5c"/>
+                    <constraint firstItem="otH-mT-7Z4" firstAttribute="top" secondItem="3Oe-gU-3Nk" secondAttribute="top" constant="10" id="PXb-Eh-v5c"/>
                     <constraint firstItem="cEA-ts-Q8I" firstAttribute="leading" secondItem="qDs-UG-Mn7" secondAttribute="trailing" constant="-15" id="Tah-P4-eci"/>
                     <constraint firstItem="J1z-RG-U4A" firstAttribute="centerY" secondItem="3Oe-gU-3Nk" secondAttribute="centerY" id="TvQ-yn-L5w"/>
-                    <constraint firstAttribute="bottom" secondItem="cUC-wO-Mxm" secondAttribute="bottom" constant="5" id="XY1-34-ft3"/>
+                    <constraint firstAttribute="bottom" secondItem="cUC-wO-Mxm" secondAttribute="bottom" constant="13" id="XY1-34-ft3"/>
                     <constraint firstItem="cUC-wO-Mxm" firstAttribute="leading" secondItem="qDs-UG-Mn7" secondAttribute="trailing" constant="11" id="Y5D-bW-8kc"/>
                     <constraint firstItem="dY5-fF-IsK" firstAttribute="centerY" secondItem="Wzb-Us-kQu" secondAttribute="centerY" id="ZQq-dk-l9c"/>
                     <constraint firstItem="qDs-UG-Mn7" firstAttribute="centerY" secondItem="3Oe-gU-3Nk" secondAttribute="centerY" id="ZrD-Aw-xkx"/>
                     <constraint firstItem="J1z-RG-U4A" firstAttribute="leading" secondItem="kaa-f4-d2t" secondAttribute="trailing" constant="15" id="eXU-Lu-MUg"/>
                     <constraint firstAttribute="bottom" secondItem="kaa-f4-d2t" secondAttribute="bottom" id="ecV-EG-AqZ"/>
                     <constraint firstItem="cEA-ts-Q8I" firstAttribute="top" secondItem="qDs-UG-Mn7" secondAttribute="bottom" constant="-15" id="j4V-Ji-PdK"/>
-                    <constraint firstItem="Wzb-Us-kQu" firstAttribute="centerY" secondItem="3Oe-gU-3Nk" secondAttribute="centerY" id="lrs-eT-Bjn"/>
+                    <constraint firstItem="Wzb-Us-kQu" firstAttribute="centerY" secondItem="3Oe-gU-3Nk" secondAttribute="centerY" constant="10" id="lrs-eT-Bjn"/>
                     <constraint firstAttribute="trailing" secondItem="J1z-RG-U4A" secondAttribute="trailing" constant="10" id="pQA-B9-MM5"/>
                     <constraint firstItem="dY5-fF-IsK" firstAttribute="leading" secondItem="Wzb-Us-kQu" secondAttribute="trailing" constant="1" id="vZw-cw-bBk"/>
                     <constraint firstItem="Wzb-Us-kQu" firstAttribute="leading" secondItem="otH-mT-7Z4" secondAttribute="leading" id="vbt-49-CMn"/>
                     <constraint firstAttribute="trailing" secondItem="cUC-wO-Mxm" secondAttribute="trailing" constant="50" id="zHr-FD-PMG"/>
                 </constraints>
+                <variation key="default">
+                    <mask key="subviews">
+                        <exclude reference="cUC-wO-Mxm"/>
+                    </mask>
+                </variation>
             </tableViewCellContentView>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
@@ -136,16 +142,17 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="arrowtriangle.down.fill" width="24" height="24"/>
+        <image name="arrowtriangle.down.circle" catalog="system" width="128" height="123"/>
+        <image name="avatar2" width="32" height="32"/>
         <image name="ellipsis" catalog="system" width="128" height="37"/>
         <systemColor name="labelColor">
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="secondaryLabelColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="tertiaryLabelColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.29803921568627451" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29803921570000003" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/iOSClient/Shares/NCShares.swift b/iOSClient/Shares/NCShares.swift
index c130c5f372..50302c2df1 100644
--- a/iOSClient/Shares/NCShares.swift
+++ b/iOSClient/Shares/NCShares.swift
@@ -56,15 +56,7 @@ class NCShares: NCCollectionViewCommon {
         var metadatas: [tableMetadata] = []
 
         func reload() {
-            self.dataSource = NCDataSource(metadatas: metadatas,
-                                           account: appDelegate.account,
-                                           sort: layoutForView?.sort,
-                                           ascending: layoutForView?.ascending,
-                                           directoryOnTop: layoutForView?.directoryOnTop,
-                                           favoriteOnTop: true,
-                                           groupByField: groupByField,
-                                           providers: providers,
-                                           searchResults: searchResults)
+            self.dataSource = NCDataSource(metadatas: metadatas, account: appDelegate.account, layoutForView: layoutForView, providers: providers, searchResults: searchResults)
             DispatchQueue.main.async {
                 self.refreshControl.endRefreshing()
                 self.collectionView.reloadData()
diff --git a/iOSClient/Supporting Files/af.lproj/Localizable.strings b/iOSClient/Supporting Files/af.lproj/Localizable.strings
index 186de5d33e..9c5e6b7fa3 100644
Binary files a/iOSClient/Supporting Files/af.lproj/Localizable.strings and b/iOSClient/Supporting Files/af.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/an.lproj/Localizable.strings b/iOSClient/Supporting Files/an.lproj/Localizable.strings
index cb7a612ca9..e2d0a94af5 100644
Binary files a/iOSClient/Supporting Files/an.lproj/Localizable.strings and b/iOSClient/Supporting Files/an.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ar.lproj/Localizable.strings b/iOSClient/Supporting Files/ar.lproj/Localizable.strings
index ec5162f585..8374358491 100644
Binary files a/iOSClient/Supporting Files/ar.lproj/Localizable.strings and b/iOSClient/Supporting Files/ar.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ast.lproj/Localizable.strings b/iOSClient/Supporting Files/ast.lproj/Localizable.strings
index e496478977..e67ee06d7c 100644
Binary files a/iOSClient/Supporting Files/ast.lproj/Localizable.strings and b/iOSClient/Supporting Files/ast.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/az.lproj/Localizable.strings b/iOSClient/Supporting Files/az.lproj/Localizable.strings
index ba63bc9125..31541df999 100644
Binary files a/iOSClient/Supporting Files/az.lproj/Localizable.strings and b/iOSClient/Supporting Files/az.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/be.lproj/Localizable.strings b/iOSClient/Supporting Files/be.lproj/Localizable.strings
index afef82c572..026c859e68 100644
Binary files a/iOSClient/Supporting Files/be.lproj/Localizable.strings and b/iOSClient/Supporting Files/be.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/bg_BG.lproj/Localizable.strings b/iOSClient/Supporting Files/bg_BG.lproj/Localizable.strings
index 0acaff576c..adba7d760b 100644
Binary files a/iOSClient/Supporting Files/bg_BG.lproj/Localizable.strings and b/iOSClient/Supporting Files/bg_BG.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/bn_BD.lproj/Localizable.strings b/iOSClient/Supporting Files/bn_BD.lproj/Localizable.strings
index 5d2901c2f7..92768b4484 100644
Binary files a/iOSClient/Supporting Files/bn_BD.lproj/Localizable.strings and b/iOSClient/Supporting Files/bn_BD.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/br.lproj/Localizable.strings b/iOSClient/Supporting Files/br.lproj/Localizable.strings
index 88e9c4ab2b..ced5579b21 100644
Binary files a/iOSClient/Supporting Files/br.lproj/Localizable.strings and b/iOSClient/Supporting Files/br.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/bs.lproj/Localizable.strings b/iOSClient/Supporting Files/bs.lproj/Localizable.strings
index 36ff8d8612..230eea3e7d 100644
Binary files a/iOSClient/Supporting Files/bs.lproj/Localizable.strings and b/iOSClient/Supporting Files/bs.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ca.lproj/Localizable.strings b/iOSClient/Supporting Files/ca.lproj/Localizable.strings
index 3e2f522f45..13dd2ecd8b 100644
Binary files a/iOSClient/Supporting Files/ca.lproj/Localizable.strings and b/iOSClient/Supporting Files/ca.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/cs-CZ.lproj/Localizable.strings b/iOSClient/Supporting Files/cs-CZ.lproj/Localizable.strings
index f6f6a26883..aa3a4c494a 100644
Binary files a/iOSClient/Supporting Files/cs-CZ.lproj/Localizable.strings and b/iOSClient/Supporting Files/cs-CZ.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/cy_GB.lproj/Localizable.strings b/iOSClient/Supporting Files/cy_GB.lproj/Localizable.strings
index 26a9a2a990..70a2863f95 100644
Binary files a/iOSClient/Supporting Files/cy_GB.lproj/Localizable.strings and b/iOSClient/Supporting Files/cy_GB.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/da.lproj/Localizable.strings b/iOSClient/Supporting Files/da.lproj/Localizable.strings
index d316c93c82..5db542aa90 100644
Binary files a/iOSClient/Supporting Files/da.lproj/Localizable.strings and b/iOSClient/Supporting Files/da.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/de.lproj/Localizable.strings b/iOSClient/Supporting Files/de.lproj/Localizable.strings
index b24e5820e0..2ad0084e28 100644
Binary files a/iOSClient/Supporting Files/de.lproj/Localizable.strings and b/iOSClient/Supporting Files/de.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/el.lproj/Localizable.strings b/iOSClient/Supporting Files/el.lproj/Localizable.strings
index d0872367ff..a9abab365a 100644
Binary files a/iOSClient/Supporting Files/el.lproj/Localizable.strings and b/iOSClient/Supporting Files/el.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/en-GB.lproj/Localizable.strings b/iOSClient/Supporting Files/en-GB.lproj/Localizable.strings
index 6c34ecaa12..25b8d8d1c3 100644
Binary files a/iOSClient/Supporting Files/en-GB.lproj/Localizable.strings and b/iOSClient/Supporting Files/en-GB.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/en.lproj/Localizable.strings b/iOSClient/Supporting Files/en.lproj/Localizable.strings
index 8cc3dc1e2b..a8813443af 100644
--- a/iOSClient/Supporting Files/en.lproj/Localizable.strings	
+++ b/iOSClient/Supporting Files/en.lproj/Localizable.strings	
@@ -652,14 +652,14 @@
 "_enforce_password_protection_" = "Enforce password protection";
 "_password_obligatory_"         = "Enforce password protection enabled, password obligatory";
 "_shared_with_you_by_"          = "Shared with you by";
-"_shareLinksearch_placeholder_" = "Type a name and press Search";
+"_shareLinksearch_placeholder_" = "Name, email, or Federated Cloud ID …";
 "_shareLinksearch_mail_placeholder_" = "Type a name or an email and press Search";
 "_new_comment_"                 = "New comment …";
 "_edit_comment_"                = "Edit comment";
 "_delete_comment_"              = "Delete comment";
 "_share_allow_editing_"         = "Allow editing";
 "_share_read_only_"             = "View only";
-"_share_editing_"               = "Editing";
+"_share_editing_"               = "Can edit";
 "_share_allow_upload_"          = "Allow upload and editing";
 "_share_file_drop_"             = "File drop (upload only)";
 "_share_secure_file_drop_"      = "Secure file drop (upload only)";
@@ -676,7 +676,7 @@
 "_share_can_download_"          = "Allow download";
 "_share_unshare_"               = "Unshare";
 "_share_internal_link_"         = "Internal link";
-"_share_internal_link_des_"     = "Only works for users with access to this folder";
+"_share_internal_link_des_"     = "Only works for users with access to this file/folder";
 "_share_reshare_disabled_"      = "You are not allowed to reshare this file/folder";
 "_share_reshare_restricted_"    = "Note: You only have limited permission to reshare this file/folder";
 
diff --git a/iOSClient/Supporting Files/eo.lproj/Localizable.strings b/iOSClient/Supporting Files/eo.lproj/Localizable.strings
index 7f4b4cc247..6d93c0e222 100644
Binary files a/iOSClient/Supporting Files/eo.lproj/Localizable.strings and b/iOSClient/Supporting Files/eo.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-419.lproj/Localizable.strings b/iOSClient/Supporting Files/es-419.lproj/Localizable.strings
index 3b0832a6ee..15536164e7 100644
Binary files a/iOSClient/Supporting Files/es-419.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-419.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-AR.lproj/Localizable.strings b/iOSClient/Supporting Files/es-AR.lproj/Localizable.strings
index cea37cec72..792668de97 100644
Binary files a/iOSClient/Supporting Files/es-AR.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-AR.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-CL.lproj/Localizable.strings b/iOSClient/Supporting Files/es-CL.lproj/Localizable.strings
index 00e4dba722..4ed25fa330 100644
Binary files a/iOSClient/Supporting Files/es-CL.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-CL.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-CO.lproj/Localizable.strings b/iOSClient/Supporting Files/es-CO.lproj/Localizable.strings
index 48249b2b0c..dcfc2fa3be 100644
Binary files a/iOSClient/Supporting Files/es-CO.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-CO.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-CR.lproj/Localizable.strings b/iOSClient/Supporting Files/es-CR.lproj/Localizable.strings
index 8d1536b75b..c080b3c3e3 100644
Binary files a/iOSClient/Supporting Files/es-CR.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-CR.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-DO.lproj/Localizable.strings b/iOSClient/Supporting Files/es-DO.lproj/Localizable.strings
index bd5fe18317..4d09ed97e6 100644
Binary files a/iOSClient/Supporting Files/es-DO.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-DO.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-EC.lproj/Localizable.strings b/iOSClient/Supporting Files/es-EC.lproj/Localizable.strings
index 6d6438b06e..e712310acd 100644
Binary files a/iOSClient/Supporting Files/es-EC.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-EC.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-GT.lproj/Localizable.strings b/iOSClient/Supporting Files/es-GT.lproj/Localizable.strings
index c6d843370e..ba6251eb29 100644
Binary files a/iOSClient/Supporting Files/es-GT.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-GT.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-HN.lproj/Localizable.strings b/iOSClient/Supporting Files/es-HN.lproj/Localizable.strings
index 5d889ae119..dbd80ce9cd 100644
Binary files a/iOSClient/Supporting Files/es-HN.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-HN.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-MX.lproj/Localizable.strings b/iOSClient/Supporting Files/es-MX.lproj/Localizable.strings
index 7fa732d762..1a5955b253 100644
Binary files a/iOSClient/Supporting Files/es-MX.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-MX.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-NI.lproj/Localizable.strings b/iOSClient/Supporting Files/es-NI.lproj/Localizable.strings
index 5a36053d21..cc004e7e99 100644
Binary files a/iOSClient/Supporting Files/es-NI.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-NI.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-PA.lproj/Localizable.strings b/iOSClient/Supporting Files/es-PA.lproj/Localizable.strings
index 867ecf7fc8..5614d96c7e 100644
Binary files a/iOSClient/Supporting Files/es-PA.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-PA.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-PE.lproj/Localizable.strings b/iOSClient/Supporting Files/es-PE.lproj/Localizable.strings
index 2b497968b4..ec21e6dbc7 100644
Binary files a/iOSClient/Supporting Files/es-PE.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-PE.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-PR.lproj/Localizable.strings b/iOSClient/Supporting Files/es-PR.lproj/Localizable.strings
index 2988e5e2bf..824841dede 100644
Binary files a/iOSClient/Supporting Files/es-PR.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-PR.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-PY.lproj/Localizable.strings b/iOSClient/Supporting Files/es-PY.lproj/Localizable.strings
index ecdb408035..e4f0e4a594 100644
Binary files a/iOSClient/Supporting Files/es-PY.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-PY.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-SV.lproj/Localizable.strings b/iOSClient/Supporting Files/es-SV.lproj/Localizable.strings
index b680e5dcea..62cbf125df 100644
Binary files a/iOSClient/Supporting Files/es-SV.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-SV.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es-UY.lproj/Localizable.strings b/iOSClient/Supporting Files/es-UY.lproj/Localizable.strings
index b5aa73978a..95ee048008 100644
Binary files a/iOSClient/Supporting Files/es-UY.lproj/Localizable.strings and b/iOSClient/Supporting Files/es-UY.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/es.lproj/Localizable.strings b/iOSClient/Supporting Files/es.lproj/Localizable.strings
index ccf4c8ce9b..5b4fb679ca 100644
Binary files a/iOSClient/Supporting Files/es.lproj/Localizable.strings and b/iOSClient/Supporting Files/es.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/et_EE.lproj/Localizable.strings b/iOSClient/Supporting Files/et_EE.lproj/Localizable.strings
index ca387565be..76b562bdbd 100644
Binary files a/iOSClient/Supporting Files/et_EE.lproj/Localizable.strings and b/iOSClient/Supporting Files/et_EE.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/eu.lproj/Localizable.strings b/iOSClient/Supporting Files/eu.lproj/Localizable.strings
index 40d16d9b5a..73428685a3 100644
Binary files a/iOSClient/Supporting Files/eu.lproj/Localizable.strings and b/iOSClient/Supporting Files/eu.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/fa.lproj/Localizable.strings b/iOSClient/Supporting Files/fa.lproj/Localizable.strings
index 2fac817eb8..14df1c9c1a 100644
Binary files a/iOSClient/Supporting Files/fa.lproj/Localizable.strings and b/iOSClient/Supporting Files/fa.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/fi-FI.lproj/Localizable.strings b/iOSClient/Supporting Files/fi-FI.lproj/Localizable.strings
index 8cae14e770..1d152f01a6 100644
Binary files a/iOSClient/Supporting Files/fi-FI.lproj/Localizable.strings and b/iOSClient/Supporting Files/fi-FI.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/fo.lproj/Localizable.strings b/iOSClient/Supporting Files/fo.lproj/Localizable.strings
index eb853e8123..ce7cae7437 100644
Binary files a/iOSClient/Supporting Files/fo.lproj/Localizable.strings and b/iOSClient/Supporting Files/fo.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/fr.lproj/Localizable.strings b/iOSClient/Supporting Files/fr.lproj/Localizable.strings
index 8a1f2ca30f..dd7cb11fcc 100644
Binary files a/iOSClient/Supporting Files/fr.lproj/Localizable.strings and b/iOSClient/Supporting Files/fr.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ga.lproj/Localizable.strings b/iOSClient/Supporting Files/ga.lproj/Localizable.strings
index be54874b2d..7ba2aa6048 100644
Binary files a/iOSClient/Supporting Files/ga.lproj/Localizable.strings and b/iOSClient/Supporting Files/ga.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/gd.lproj/Localizable.strings b/iOSClient/Supporting Files/gd.lproj/Localizable.strings
index d9af0f51f8..76398d153e 100644
Binary files a/iOSClient/Supporting Files/gd.lproj/Localizable.strings and b/iOSClient/Supporting Files/gd.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/gl.lproj/Localizable.strings b/iOSClient/Supporting Files/gl.lproj/Localizable.strings
index a5c3612d7f..d50648de05 100644
Binary files a/iOSClient/Supporting Files/gl.lproj/Localizable.strings and b/iOSClient/Supporting Files/gl.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/he.lproj/Localizable.strings b/iOSClient/Supporting Files/he.lproj/Localizable.strings
index b2b697e014..b2684403c9 100644
Binary files a/iOSClient/Supporting Files/he.lproj/Localizable.strings and b/iOSClient/Supporting Files/he.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/hi_IN.lproj/Localizable.strings b/iOSClient/Supporting Files/hi_IN.lproj/Localizable.strings
index 19ef9fa7f0..8bb965654a 100644
Binary files a/iOSClient/Supporting Files/hi_IN.lproj/Localizable.strings and b/iOSClient/Supporting Files/hi_IN.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/hr.lproj/Localizable.strings b/iOSClient/Supporting Files/hr.lproj/Localizable.strings
index 5927c66327..60a0c012e3 100644
Binary files a/iOSClient/Supporting Files/hr.lproj/Localizable.strings and b/iOSClient/Supporting Files/hr.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/hsb.lproj/Localizable.strings b/iOSClient/Supporting Files/hsb.lproj/Localizable.strings
index c8313ae8f5..801c4a38f0 100644
Binary files a/iOSClient/Supporting Files/hsb.lproj/Localizable.strings and b/iOSClient/Supporting Files/hsb.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/hu.lproj/Localizable.strings b/iOSClient/Supporting Files/hu.lproj/Localizable.strings
index e9ce4c9da7..ae156f1dde 100644
Binary files a/iOSClient/Supporting Files/hu.lproj/Localizable.strings and b/iOSClient/Supporting Files/hu.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/hy.lproj/Localizable.strings b/iOSClient/Supporting Files/hy.lproj/Localizable.strings
index 0a94c7aea5..9d3652383b 100644
Binary files a/iOSClient/Supporting Files/hy.lproj/Localizable.strings and b/iOSClient/Supporting Files/hy.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ia.lproj/Localizable.strings b/iOSClient/Supporting Files/ia.lproj/Localizable.strings
index cec1f9f207..2b48e189b0 100644
Binary files a/iOSClient/Supporting Files/ia.lproj/Localizable.strings and b/iOSClient/Supporting Files/ia.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/id.lproj/Localizable.strings b/iOSClient/Supporting Files/id.lproj/Localizable.strings
index 7e6bbb55c5..2ded0ef62e 100644
Binary files a/iOSClient/Supporting Files/id.lproj/Localizable.strings and b/iOSClient/Supporting Files/id.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ig.lproj/Localizable.strings b/iOSClient/Supporting Files/ig.lproj/Localizable.strings
index e1ed694865..aa214c7c67 100644
Binary files a/iOSClient/Supporting Files/ig.lproj/Localizable.strings and b/iOSClient/Supporting Files/ig.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/is.lproj/Localizable.strings b/iOSClient/Supporting Files/is.lproj/Localizable.strings
index 9765ab95a8..0eba97898c 100644
Binary files a/iOSClient/Supporting Files/is.lproj/Localizable.strings and b/iOSClient/Supporting Files/is.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/it.lproj/Localizable.strings b/iOSClient/Supporting Files/it.lproj/Localizable.strings
index 051fc1f2d1..f368335e20 100644
Binary files a/iOSClient/Supporting Files/it.lproj/Localizable.strings and b/iOSClient/Supporting Files/it.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ja-JP.lproj/Localizable.strings b/iOSClient/Supporting Files/ja-JP.lproj/Localizable.strings
index 9cc7a99ad2..39a7aa951e 100644
Binary files a/iOSClient/Supporting Files/ja-JP.lproj/Localizable.strings and b/iOSClient/Supporting Files/ja-JP.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ka-GE.lproj/Localizable.strings b/iOSClient/Supporting Files/ka-GE.lproj/Localizable.strings
index fe187790a9..038edbe5eb 100644
Binary files a/iOSClient/Supporting Files/ka-GE.lproj/Localizable.strings and b/iOSClient/Supporting Files/ka-GE.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ka.lproj/Localizable.strings b/iOSClient/Supporting Files/ka.lproj/Localizable.strings
index 08d608df19..3758704a81 100644
Binary files a/iOSClient/Supporting Files/ka.lproj/Localizable.strings and b/iOSClient/Supporting Files/ka.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/kab.lproj/Localizable.strings b/iOSClient/Supporting Files/kab.lproj/Localizable.strings
index 5fe131d4e6..41d8376e04 100644
Binary files a/iOSClient/Supporting Files/kab.lproj/Localizable.strings and b/iOSClient/Supporting Files/kab.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/km.lproj/Localizable.strings b/iOSClient/Supporting Files/km.lproj/Localizable.strings
index d4f4350ee3..453f6a2c56 100644
Binary files a/iOSClient/Supporting Files/km.lproj/Localizable.strings and b/iOSClient/Supporting Files/km.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/kn.lproj/Localizable.strings b/iOSClient/Supporting Files/kn.lproj/Localizable.strings
index 4213372bba..0987c9218d 100644
Binary files a/iOSClient/Supporting Files/kn.lproj/Localizable.strings and b/iOSClient/Supporting Files/kn.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ko.lproj/Localizable.strings b/iOSClient/Supporting Files/ko.lproj/Localizable.strings
index 7ee8dccc13..eb5f7099de 100644
Binary files a/iOSClient/Supporting Files/ko.lproj/Localizable.strings and b/iOSClient/Supporting Files/ko.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/la.lproj/Localizable.strings b/iOSClient/Supporting Files/la.lproj/Localizable.strings
index 3e4aa14ca4..8330177120 100644
Binary files a/iOSClient/Supporting Files/la.lproj/Localizable.strings and b/iOSClient/Supporting Files/la.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/lb.lproj/Localizable.strings b/iOSClient/Supporting Files/lb.lproj/Localizable.strings
index 8a04e3bea8..5dd347cdbf 100644
Binary files a/iOSClient/Supporting Files/lb.lproj/Localizable.strings and b/iOSClient/Supporting Files/lb.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/lo.lproj/Localizable.strings b/iOSClient/Supporting Files/lo.lproj/Localizable.strings
index e58d53d3da..6d8ffb3177 100644
Binary files a/iOSClient/Supporting Files/lo.lproj/Localizable.strings and b/iOSClient/Supporting Files/lo.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/lt_LT.lproj/Localizable.strings b/iOSClient/Supporting Files/lt_LT.lproj/Localizable.strings
index dca6418a23..757e0fb804 100644
Binary files a/iOSClient/Supporting Files/lt_LT.lproj/Localizable.strings and b/iOSClient/Supporting Files/lt_LT.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/lv.lproj/Localizable.strings b/iOSClient/Supporting Files/lv.lproj/Localizable.strings
index 8281868078..e90d30fe15 100644
Binary files a/iOSClient/Supporting Files/lv.lproj/Localizable.strings and b/iOSClient/Supporting Files/lv.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/mk.lproj/Localizable.strings b/iOSClient/Supporting Files/mk.lproj/Localizable.strings
index 5b84c514c3..0f03fef9a9 100644
Binary files a/iOSClient/Supporting Files/mk.lproj/Localizable.strings and b/iOSClient/Supporting Files/mk.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/mn.lproj/Localizable.strings b/iOSClient/Supporting Files/mn.lproj/Localizable.strings
index 65ad21af7b..6ac6e57415 100644
Binary files a/iOSClient/Supporting Files/mn.lproj/Localizable.strings and b/iOSClient/Supporting Files/mn.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/mr.lproj/Localizable.strings b/iOSClient/Supporting Files/mr.lproj/Localizable.strings
index 65cb6592b7..475702b940 100644
Binary files a/iOSClient/Supporting Files/mr.lproj/Localizable.strings and b/iOSClient/Supporting Files/mr.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ms_MY.lproj/Localizable.strings b/iOSClient/Supporting Files/ms_MY.lproj/Localizable.strings
index 674daf4bd5..1691e42a7c 100644
Binary files a/iOSClient/Supporting Files/ms_MY.lproj/Localizable.strings and b/iOSClient/Supporting Files/ms_MY.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/my.lproj/Localizable.strings b/iOSClient/Supporting Files/my.lproj/Localizable.strings
index 46e2733531..2b65bfe280 100644
Binary files a/iOSClient/Supporting Files/my.lproj/Localizable.strings and b/iOSClient/Supporting Files/my.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/nb-NO.lproj/Localizable.strings b/iOSClient/Supporting Files/nb-NO.lproj/Localizable.strings
index 2dc9137005..fca37a7f42 100644
Binary files a/iOSClient/Supporting Files/nb-NO.lproj/Localizable.strings and b/iOSClient/Supporting Files/nb-NO.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ne.lproj/Localizable.strings b/iOSClient/Supporting Files/ne.lproj/Localizable.strings
index 4141c355bd..f38ca8e84d 100644
Binary files a/iOSClient/Supporting Files/ne.lproj/Localizable.strings and b/iOSClient/Supporting Files/ne.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/nl.lproj/Localizable.strings b/iOSClient/Supporting Files/nl.lproj/Localizable.strings
index e1e8943ba1..984060738c 100644
Binary files a/iOSClient/Supporting Files/nl.lproj/Localizable.strings and b/iOSClient/Supporting Files/nl.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/nn_NO.lproj/Localizable.strings b/iOSClient/Supporting Files/nn_NO.lproj/Localizable.strings
index 3cedc418e8..0bb7d408f0 100644
Binary files a/iOSClient/Supporting Files/nn_NO.lproj/Localizable.strings and b/iOSClient/Supporting Files/nn_NO.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/oc.lproj/Localizable.strings b/iOSClient/Supporting Files/oc.lproj/Localizable.strings
index 74a89123a2..b0effb54ec 100644
Binary files a/iOSClient/Supporting Files/oc.lproj/Localizable.strings and b/iOSClient/Supporting Files/oc.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/pl.lproj/Localizable.strings b/iOSClient/Supporting Files/pl.lproj/Localizable.strings
index 71f497ee8a..e3afdde0a7 100644
Binary files a/iOSClient/Supporting Files/pl.lproj/Localizable.strings and b/iOSClient/Supporting Files/pl.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ps.lproj/Localizable.strings b/iOSClient/Supporting Files/ps.lproj/Localizable.strings
index f7954dc654..1df0a11172 100644
Binary files a/iOSClient/Supporting Files/ps.lproj/Localizable.strings and b/iOSClient/Supporting Files/ps.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/pt-BR.lproj/Localizable.strings b/iOSClient/Supporting Files/pt-BR.lproj/Localizable.strings
index bef5605f08..0aca7aff19 100644
Binary files a/iOSClient/Supporting Files/pt-BR.lproj/Localizable.strings and b/iOSClient/Supporting Files/pt-BR.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/pt-PT.lproj/Localizable.strings b/iOSClient/Supporting Files/pt-PT.lproj/Localizable.strings
index fb014b9c55..1c6c36ce1d 100644
Binary files a/iOSClient/Supporting Files/pt-PT.lproj/Localizable.strings and b/iOSClient/Supporting Files/pt-PT.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ro.lproj/Localizable.strings b/iOSClient/Supporting Files/ro.lproj/Localizable.strings
index f66e36371d..92d0b1fe54 100644
Binary files a/iOSClient/Supporting Files/ro.lproj/Localizable.strings and b/iOSClient/Supporting Files/ro.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ru.lproj/Localizable.strings b/iOSClient/Supporting Files/ru.lproj/Localizable.strings
index af04733cc5..a7f8c7a584 100644
Binary files a/iOSClient/Supporting Files/ru.lproj/Localizable.strings and b/iOSClient/Supporting Files/ru.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/sc.lproj/Localizable.strings b/iOSClient/Supporting Files/sc.lproj/Localizable.strings
index 0f357ab022..296773f6b5 100644
Binary files a/iOSClient/Supporting Files/sc.lproj/Localizable.strings and b/iOSClient/Supporting Files/sc.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/si.lproj/Localizable.strings b/iOSClient/Supporting Files/si.lproj/Localizable.strings
index dafe44f827..ac1df5fd8d 100644
Binary files a/iOSClient/Supporting Files/si.lproj/Localizable.strings and b/iOSClient/Supporting Files/si.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/sk-SK.lproj/Localizable.strings b/iOSClient/Supporting Files/sk-SK.lproj/Localizable.strings
index 71c74a2652..205c6f0ebf 100644
Binary files a/iOSClient/Supporting Files/sk-SK.lproj/Localizable.strings and b/iOSClient/Supporting Files/sk-SK.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/sl.lproj/Localizable.strings b/iOSClient/Supporting Files/sl.lproj/Localizable.strings
index 2a1fcee471..e36258ea4f 100644
Binary files a/iOSClient/Supporting Files/sl.lproj/Localizable.strings and b/iOSClient/Supporting Files/sl.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/sq.lproj/Localizable.strings b/iOSClient/Supporting Files/sq.lproj/Localizable.strings
index f724efa134..44a53ff5e4 100644
Binary files a/iOSClient/Supporting Files/sq.lproj/Localizable.strings and b/iOSClient/Supporting Files/sq.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/sr.lproj/Localizable.strings b/iOSClient/Supporting Files/sr.lproj/Localizable.strings
index 5b0e55d46c..11bd38c844 100644
Binary files a/iOSClient/Supporting Files/sr.lproj/Localizable.strings and b/iOSClient/Supporting Files/sr.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/sr@latin.lproj/Localizable.strings b/iOSClient/Supporting Files/sr@latin.lproj/Localizable.strings
index 8a9de5ac98..9fe3e004ba 100644
Binary files a/iOSClient/Supporting Files/sr@latin.lproj/Localizable.strings and b/iOSClient/Supporting Files/sr@latin.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/sv.lproj/Localizable.strings b/iOSClient/Supporting Files/sv.lproj/Localizable.strings
index 279e6dd160..b4ddf1fa16 100644
Binary files a/iOSClient/Supporting Files/sv.lproj/Localizable.strings and b/iOSClient/Supporting Files/sv.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/sw.lproj/Localizable.strings b/iOSClient/Supporting Files/sw.lproj/Localizable.strings
index 19ef9fa7f0..8bb965654a 100644
Binary files a/iOSClient/Supporting Files/sw.lproj/Localizable.strings and b/iOSClient/Supporting Files/sw.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ta.lproj/Localizable.strings b/iOSClient/Supporting Files/ta.lproj/Localizable.strings
index 8b13441ac9..2307f3e355 100644
Binary files a/iOSClient/Supporting Files/ta.lproj/Localizable.strings and b/iOSClient/Supporting Files/ta.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/th_TH.lproj/Localizable.strings b/iOSClient/Supporting Files/th_TH.lproj/Localizable.strings
index f1c8b011e6..9262edc076 100644
Binary files a/iOSClient/Supporting Files/th_TH.lproj/Localizable.strings and b/iOSClient/Supporting Files/th_TH.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/tk.lproj/Localizable.strings b/iOSClient/Supporting Files/tk.lproj/Localizable.strings
index 18b8ac1525..5d8050a57e 100644
Binary files a/iOSClient/Supporting Files/tk.lproj/Localizable.strings and b/iOSClient/Supporting Files/tk.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/tr.lproj/Localizable.strings b/iOSClient/Supporting Files/tr.lproj/Localizable.strings
index 67be375f2f..13b88d5c41 100644
Binary files a/iOSClient/Supporting Files/tr.lproj/Localizable.strings and b/iOSClient/Supporting Files/tr.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ug.lproj/Localizable.strings b/iOSClient/Supporting Files/ug.lproj/Localizable.strings
index 83dd37171c..cc2e9e2353 100644
Binary files a/iOSClient/Supporting Files/ug.lproj/Localizable.strings and b/iOSClient/Supporting Files/ug.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/uk.lproj/Localizable.strings b/iOSClient/Supporting Files/uk.lproj/Localizable.strings
index db0908d0f2..db26d0ed7a 100644
Binary files a/iOSClient/Supporting Files/uk.lproj/Localizable.strings and b/iOSClient/Supporting Files/uk.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/ur_PK.lproj/Localizable.strings b/iOSClient/Supporting Files/ur_PK.lproj/Localizable.strings
index 857565c4e1..cdb7b6385c 100644
Binary files a/iOSClient/Supporting Files/ur_PK.lproj/Localizable.strings and b/iOSClient/Supporting Files/ur_PK.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/uz.lproj/Localizable.strings b/iOSClient/Supporting Files/uz.lproj/Localizable.strings
index 19ef9fa7f0..8bb965654a 100644
Binary files a/iOSClient/Supporting Files/uz.lproj/Localizable.strings and b/iOSClient/Supporting Files/uz.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/vi.lproj/Localizable.strings b/iOSClient/Supporting Files/vi.lproj/Localizable.strings
index 1ee53fed97..c71dde6319 100644
Binary files a/iOSClient/Supporting Files/vi.lproj/Localizable.strings and b/iOSClient/Supporting Files/vi.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/zh-Hans.lproj/Localizable.strings b/iOSClient/Supporting Files/zh-Hans.lproj/Localizable.strings
index b26c8ea7e7..caf33730cc 100644
Binary files a/iOSClient/Supporting Files/zh-Hans.lproj/Localizable.strings and b/iOSClient/Supporting Files/zh-Hans.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/zh-Hant-TW.lproj/Localizable.strings b/iOSClient/Supporting Files/zh-Hant-TW.lproj/Localizable.strings
index 9aaa9cb110..debbfd8dda 100644
Binary files a/iOSClient/Supporting Files/zh-Hant-TW.lproj/Localizable.strings and b/iOSClient/Supporting Files/zh-Hant-TW.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/zh_HK.lproj/Localizable.strings b/iOSClient/Supporting Files/zh_HK.lproj/Localizable.strings
index e716604742..201fa421e7 100644
Binary files a/iOSClient/Supporting Files/zh_HK.lproj/Localizable.strings and b/iOSClient/Supporting Files/zh_HK.lproj/Localizable.strings differ
diff --git a/iOSClient/Supporting Files/zu_ZA.lproj/Localizable.strings b/iOSClient/Supporting Files/zu_ZA.lproj/Localizable.strings
index 19ef9fa7f0..8bb965654a 100644
Binary files a/iOSClient/Supporting Files/zu_ZA.lproj/Localizable.strings and b/iOSClient/Supporting Files/zu_ZA.lproj/Localizable.strings differ
diff --git a/iOSClient/Transfers/NCTransfers.swift b/iOSClient/Transfers/NCTransfers.swift
index 16ff380d78..1360afde59 100644
--- a/iOSClient/Transfers/NCTransfers.swift
+++ b/iOSClient/Transfers/NCTransfers.swift
@@ -207,7 +207,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         cell.labelPath.text = pathText
         cell.setButtonMore(named: NCGlobal.shared.buttonMoreStop, image: NCImageCache.images.buttonStop)
         cell.progressView.progress = 0.0
-        if let image = utility.createFilePreviewImage(ocId: metadata.ocId, etag: metadata.etag, fileNameView: metadata.fileNameView, classFile: metadata.classFile, status: metadata.status, createPreviewMedia: true) {
+        if let image = utility.getIcon(metadata: metadata) {
             cell.imageItem.image = image
         } else if !metadata.iconName.isEmpty {
             cell.imageItem.image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true)
@@ -265,7 +265,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         super.queryDB()
 
         let metadatas: [tableMetadata] = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "status != %i", NCGlobal.shared.metadataStatusNormal), sorted: "sessionDate", ascending: true) ?? []
-        self.dataSource = NCDataSource(metadatas: metadatas, account: self.appDelegate.account)
+        self.dataSource = NCDataSource(metadatas: metadatas, account: self.appDelegate.account, layoutForView: layoutForView)
     }
 
     override func reloadDataSource(withQueryDB: Bool = true) {
diff --git a/iOSClient/Trash/Cell/NCTrashCellProtocol.swift b/iOSClient/Trash/Cell/NCTrashCellProtocol.swift
index ae1eb4e917..c05a859e63 100644
--- a/iOSClient/Trash/Cell/NCTrashCellProtocol.swift
+++ b/iOSClient/Trash/Cell/NCTrashCellProtocol.swift
@@ -30,8 +30,7 @@ protocol NCTrashCellProtocol {
     var imageItem: UIImageView! { get set }
     var indexPath: IndexPath { get set }
 
-    func selectMode(_ status: Bool)
-    func selected(_ status: Bool)
+    func selected(_ status: Bool, isEditMode: Bool)
 }
 
 extension NCTrashCellProtocol where Self: UICollectionViewCell {
diff --git a/iOSClient/Trash/Cell/NCTrashGridCell.swift b/iOSClient/Trash/Cell/NCTrashGridCell.swift
index 77427743c0..44c53a1ae2 100644
--- a/iOSClient/Trash/Cell/NCTrashGridCell.swift
+++ b/iOSClient/Trash/Cell/NCTrashGridCell.swift
@@ -45,8 +45,15 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        initCell()
+    }
+
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        initCell()
+    }
 
-        // use entire cell as accessibility element
+    func initCell() {
         accessibilityHint = nil
         accessibilityLabel = nil
         accessibilityValue = nil
@@ -64,14 +71,6 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
         labelSubinfo.text = ""
     }
 
-    override func prepareForReuse() {
-        super.prepareForReuse()
-        imageItem.backgroundColor = nil
-        accessibilityHint = nil
-        accessibilityLabel = nil
-        accessibilityValue = nil
-    }
-
     override func snapshotView(afterScreenUpdates afterUpdates: Bool) -> UIView? {
         return nil
     }
@@ -101,29 +100,17 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
         buttonMore.isHidden = status
     }
 
-    func selectMode(_ status: Bool) {
-        if status {
-            imageSelect.isHidden = false
+    func selected(_ status: Bool, isEditMode: Bool) {
+        if isEditMode {
             buttonMore.isHidden = true
             accessibilityCustomActions = nil
         } else {
-            imageSelect.isHidden = true
-            imageVisualEffect.isHidden = true
             buttonMore.isHidden = false
             setA11yActions()
         }
-    }
-
-    func selected(_ status: Bool) {
         if status {
-            if traitCollection.userInterfaceStyle == .dark {
-                imageVisualEffect.effect = UIBlurEffect(style: .dark)
-                imageVisualEffect.backgroundColor = .black
-            } else {
-                imageVisualEffect.effect = UIBlurEffect(style: .extraLight)
-                imageVisualEffect.backgroundColor = .lightGray
-            }
             imageSelect.image = NCImageCache.images.checkedYes
+            imageSelect.isHidden = false
             imageVisualEffect.isHidden = false
         } else {
             imageSelect.isHidden = true
@@ -132,7 +119,6 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
     }
 
     func writeInfoDateSize(date: NSDate, size: Int64) {
-
         let dateFormatter = DateFormatter()
         dateFormatter.dateStyle = .short
         dateFormatter.timeStyle = .none
diff --git a/iOSClient/Trash/Cell/NCTrashGridCell.xib b/iOSClient/Trash/Cell/NCTrashGridCell.xib
index d95100298a..607f2744c6 100644
--- a/iOSClient/Trash/Cell/NCTrashGridCell.xib
+++ b/iOSClient/Trash/Cell/NCTrashGridCell.xib
@@ -21,6 +21,23 @@
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Ci-V1-hf5" userLabel="imageItem">
                         <rect key="frame" x="0.0" y="20" width="416" height="419"/>
                     </imageView>
+                    <visualEffectView hidden="YES" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="ic2-NZ-bo6" userLabel="VisualEffect">
+                        <rect key="frame" x="0.0" y="20" width="416" height="419"/>
+                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="FSs-In-pkZ">
+                            <rect key="frame" x="0.0" y="0.0" width="416" height="419"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        </view>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <blurEffect style="extraLight"/>
+                    </visualEffectView>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="star.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="cgB-lu-t0g">
+                        <rect key="frame" x="388" y="21" width="26" height="26"/>
+                        <color key="tintColor" systemColor="tertiarySystemFillColor"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="26" id="5aP-9X-SuS"/>
+                            <constraint firstAttribute="height" constant="26" id="dat-R5-5vy"/>
+                        </constraints>
+                    </imageView>
                     <stackView opaque="NO" contentMode="scaleToFill" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="VRH-IZ-lXO">
                         <rect key="frame" x="5" y="447" width="406" height="36"/>
                         <subviews>
@@ -47,22 +64,6 @@
                         <color key="textColor" systemColor="systemGrayColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="star.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="cgB-lu-t0g">
-                        <rect key="frame" x="388" y="21" width="26" height="26"/>
-                        <color key="tintColor" systemColor="tertiarySystemFillColor"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="26" id="5aP-9X-SuS"/>
-                            <constraint firstAttribute="height" constant="26" id="dat-R5-5vy"/>
-                        </constraints>
-                    </imageView>
-                    <visualEffectView hidden="YES" opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W0L-HY-al1">
-                        <rect key="frame" x="0.0" y="20" width="416" height="419"/>
-                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="0m6-A2-SwD">
-                            <rect key="frame" x="0.0" y="0.0" width="416" height="419"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        </view>
-                        <blurEffect style="extraLight"/>
-                    </visualEffectView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DHy-Up-3Bh" userLabel="imageSelect">
                         <rect key="frame" x="5" y="25" width="25" height="25"/>
                         <constraints>
@@ -87,50 +88,45 @@
             </view>
             <viewLayoutGuide key="safeArea" id="VXh-sQ-LeX"/>
             <constraints>
+                <constraint firstItem="ic2-NZ-bo6" firstAttribute="leading" secondItem="5Ci-V1-hf5" secondAttribute="leading" id="0Js-Fd-ekE"/>
                 <constraint firstItem="cgB-lu-t0g" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="top" constant="1.5" id="0mO-lw-JH1"/>
                 <constraint firstItem="DHy-Up-3Bh" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" constant="5" id="1T3-8p-uIW"/>
-                <constraint firstItem="W0L-HY-al1" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" id="6tC-PK-fYX"/>
+                <constraint firstItem="ic2-NZ-bo6" firstAttribute="trailing" secondItem="5Ci-V1-hf5" secondAttribute="trailing" id="7x2-2m-53X"/>
                 <constraint firstItem="2po-8g-XeS" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="25" id="9JI-KS-d7J"/>
                 <constraint firstItem="DHy-Up-3Bh" firstAttribute="top" secondItem="VXh-sQ-LeX" secondAttribute="top" constant="5" id="ESV-qE-tbO"/>
                 <constraint firstAttribute="trailing" secondItem="VRH-IZ-lXO" secondAttribute="trailing" constant="5" id="HAS-uF-AuS"/>
                 <constraint firstItem="2po-8g-XeS" firstAttribute="top" secondItem="VRH-IZ-lXO" secondAttribute="bottom" constant="7" id="OPl-xq-XOx"/>
                 <constraint firstItem="5Ci-V1-hf5" firstAttribute="top" secondItem="VXh-sQ-LeX" secondAttribute="top" id="Ouj-ZD-UFm"/>
-                <constraint firstItem="W0L-HY-al1" firstAttribute="top" secondItem="VXh-sQ-LeX" secondAttribute="top" id="Py6-0z-K3t"/>
                 <constraint firstItem="2po-8g-XeS" firstAttribute="centerX" secondItem="vf1-Kf-9uL" secondAttribute="centerX" id="TTW-HT-yEO"/>
-                <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="W0L-HY-al1" secondAttribute="trailing" id="VMW-0Y-aOH"/>
                 <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="5Ci-V1-hf5" secondAttribute="trailing" id="cHT-cP-NN6"/>
                 <constraint firstItem="VRH-IZ-lXO" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="8" id="cj5-Ez-3cy"/>
                 <constraint firstItem="VRH-IZ-lXO" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="5" id="dTF-dl-Awr"/>
                 <constraint firstItem="VXh-sQ-LeX" firstAttribute="bottom" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="90" id="eEC-eB-alE"/>
                 <constraint firstItem="12P-pO-DHO" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="25" id="fTQ-Ye-Xj2"/>
                 <constraint firstItem="12P-pO-DHO" firstAttribute="top" secondItem="2po-8g-XeS" secondAttribute="bottom" constant="3" id="hbc-KL-fRj"/>
-                <constraint firstItem="VXh-sQ-LeX" firstAttribute="bottom" secondItem="W0L-HY-al1" secondAttribute="bottom" constant="90" id="jI9-M1-Nl8"/>
                 <constraint firstItem="EJs-Ro-nbe" firstAttribute="trailing" secondItem="5Ci-V1-hf5" secondAttribute="trailing" id="l6Z-DK-OZi"/>
                 <constraint firstItem="EJs-Ro-nbe" firstAttribute="top" secondItem="VRH-IZ-lXO" secondAttribute="bottom" constant="9" id="o5n-Oi-Uh7"/>
                 <constraint firstItem="5Ci-V1-hf5" firstAttribute="trailing" secondItem="cgB-lu-t0g" secondAttribute="trailing" constant="2" id="q5r-Pz-Tnq"/>
                 <constraint firstItem="5Ci-V1-hf5" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" id="qT3-WD-iTV"/>
+                <constraint firstItem="ic2-NZ-bo6" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="top" id="r2R-Qj-7iM"/>
+                <constraint firstItem="ic2-NZ-bo6" firstAttribute="bottom" secondItem="5Ci-V1-hf5" secondAttribute="bottom" id="wle-L3-xRa"/>
                 <constraint firstItem="12P-pO-DHO" firstAttribute="centerX" secondItem="vf1-Kf-9uL" secondAttribute="centerX" id="xhm-Np-2Ua"/>
             </constraints>
             <size key="customSize" width="416" height="524"/>
             <variation key="default">
                 <mask key="subviews">
                     <exclude reference="cgB-lu-t0g"/>
-                    <exclude reference="W0L-HY-al1"/>
                 </mask>
                 <mask key="constraints">
-                    <exclude reference="6tC-PK-fYX"/>
-                    <exclude reference="Py6-0z-K3t"/>
-                    <exclude reference="VMW-0Y-aOH"/>
-                    <exclude reference="jI9-M1-Nl8"/>
-                    <exclude reference="q5r-Pz-Tnq"/>
                     <exclude reference="0mO-lw-JH1"/>
+                    <exclude reference="q5r-Pz-Tnq"/>
                 </mask>
             </variation>
             <connections>
                 <outlet property="buttonMore" destination="EJs-Ro-nbe" id="BdI-ay-LuX"/>
                 <outlet property="imageItem" destination="5Ci-V1-hf5" id="xky-Nw-NUb"/>
                 <outlet property="imageSelect" destination="DHy-Up-3Bh" id="mo9-rP-P4I"/>
-                <outlet property="imageVisualEffect" destination="W0L-HY-al1" id="WDW-2d-Npa"/>
+                <outlet property="imageVisualEffect" destination="ic2-NZ-bo6" id="UeL-nV-SPY"/>
                 <outlet property="labelInfo" destination="2po-8g-XeS" id="FJ4-wI-9cW"/>
                 <outlet property="labelSubinfo" destination="12P-pO-DHO" id="K6d-7r-FGh"/>
                 <outlet property="labelTitle" destination="eU3-lY-fKr" id="0P7-yM-Asb"/>
@@ -142,13 +138,13 @@
         <image name="ellipsis" catalog="system" width="128" height="37"/>
         <image name="star.fill" catalog="system" width="128" height="116"/>
         <systemColor name="systemGray2Color">
-            <color red="0.68235294117647061" green="0.68235294117647061" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.68235294120000001" green="0.68235294120000001" blue="0.69803921570000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemGrayColor">
-            <color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="tertiarySystemFillColor">
-            <color red="0.46274509803921571" green="0.46274509803921571" blue="0.50196078431372548" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.46274509800000002" green="0.46274509800000002" blue="0.50196078430000002" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/iOSClient/Trash/Cell/NCTrashListCell.swift b/iOSClient/Trash/Cell/NCTrashListCell.swift
index 87f394a3ff..5a10f3ac34 100644
--- a/iOSClient/Trash/Cell/NCTrashListCell.swift
+++ b/iOSClient/Trash/Cell/NCTrashListCell.swift
@@ -31,7 +31,6 @@ protocol NCTrashListCellDelegate: AnyObject {
 }
 
 class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
-
     @IBOutlet weak var imageItem: UIImageView!
     @IBOutlet weak var imageItemLeftConstraint: NSLayoutConstraint!
     @IBOutlet weak var imageSelect: UIImageView!
@@ -50,7 +49,15 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        initCell()
+    }
 
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        initCell()
+    }
+
+    func initCell() {
         isAccessibilityElement = true
 
         self.accessibilityCustomActions = [
@@ -82,8 +89,8 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
         delegate?.tapRestoreListItem(with: objectId, image: imageItem.image, sender: sender)
     }
 
-    func selectMode(_ status: Bool) {
-        if status {
+    func selected(_ status: Bool, isEditMode: Bool) {
+        if isEditMode {
             imageItemLeftConstraint.constant = 45
             imageSelect.isHidden = false
             imageRestore.isHidden = true
@@ -99,24 +106,13 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
             buttonMore.isHidden = false
             backgroundView = nil
         }
-    }
-
-    func selected(_ status: Bool) {
         if status {
-            var blurEffect: UIVisualEffect?
             var blurEffectView: UIView?
-            imageSelect.image = NCImageCache.images.checkedYes
-            if traitCollection.userInterfaceStyle == .dark {
-                blurEffect = UIBlurEffect(style: .dark)
-                blurEffectView = UIVisualEffectView(effect: blurEffect)
-                blurEffectView?.backgroundColor = .black
-            } else {
-                blurEffect = UIBlurEffect(style: .extraLight)
-                blurEffectView = UIVisualEffectView(effect: blurEffect)
-                blurEffectView?.backgroundColor = .lightGray
-            }
+            blurEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
+            blurEffectView?.backgroundColor = .lightGray
             blurEffectView?.frame = self.bounds
             blurEffectView?.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+            imageSelect.image = NCImageCache.images.checkedYes
             backgroundView = blurEffectView
             separator.isHidden = true
         } else {
@@ -124,5 +120,6 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
             backgroundView = nil
             separator.isHidden = false
         }
+
     }
 }
diff --git a/iOSClient/Trash/NCTrash+CollectionView.swift b/iOSClient/Trash/NCTrash+CollectionView.swift
index 4f0caa51fd..d16b841372 100644
--- a/iOSClient/Trash/NCTrash+CollectionView.swift
+++ b/iOSClient/Trash/NCTrash+CollectionView.swift
@@ -21,8 +21,8 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Realm
 import UIKit
+import RealmSwift
 
 // MARK: UICollectionViewDelegate
 extension NCTrash: UICollectionViewDelegate {
@@ -90,10 +90,7 @@ extension NCTrash: UICollectionViewDataSource {
         cell.indexPath = indexPath
         cell.objectId = tableTrash.fileId
         cell.setupCellUI(tableTrash: tableTrash, image: image)
-        cell.selectMode(isEditMode)
-        if isEditMode {
-            cell.selected(selectOcId.contains(tableTrash.fileId))
-        }
+        cell.selected(selectOcId.contains(tableTrash.fileId), isEditMode: isEditMode)
 
         return cell
     }
@@ -138,8 +135,8 @@ extension NCTrash: UICollectionViewDataSource {
 
     func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
         if kind == UICollectionView.elementKindSectionHeader {
-            guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeaderEmptyData", for: indexPath) as? NCSectionHeaderEmptyData
-            else { return NCSectionHeaderEmptyData() }
+            guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFirstHeaderEmptyData", for: indexPath) as? NCSectionFirstHeaderEmptyData
+            else { return NCSectionFirstHeaderEmptyData() }
             header.emptyImage.image = utility.loadImage(named: "trash", colors: [NCBrandColor.shared.brandElement])
             header.emptyTitle.text = NSLocalizedString("_trash_no_trash_", comment: "")
             header.emptyDescription.text = NSLocalizedString("_trash_no_trash_description_", comment: "")
diff --git a/iOSClient/Trash/NCTrash+Networking.swift b/iOSClient/Trash/NCTrash+Networking.swift
index b52a673e8a..6081d6b6a4 100644
--- a/iOSClient/Trash/NCTrash+Networking.swift
+++ b/iOSClient/Trash/NCTrash+Networking.swift
@@ -19,10 +19,10 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Realm
 import UIKit
 import NextcloudKit
 import Queuer
+import RealmSwift
 
 extension NCTrash {
     @objc func loadListingTrash() {
diff --git a/iOSClient/Trash/NCTrash+SelectTabBarDelegate.swift b/iOSClient/Trash/NCTrash+SelectTabBarDelegate.swift
index 557e707745..2a854f799a 100644
--- a/iOSClient/Trash/NCTrash+SelectTabBarDelegate.swift
+++ b/iOSClient/Trash/NCTrash+SelectTabBarDelegate.swift
@@ -24,7 +24,6 @@ import Foundation
 extension NCTrash: NCTrashSelectTabBarDelegate {
     func onListSelected() {
         if layoutForView?.layout == NCGlobal.shared.layoutGrid {
-            // list layout
             layoutForView?.layout = NCGlobal.shared.layoutList
             NCManageDatabase.shared.setLayoutForView(account: appDelegate.account, key: layoutKey, serverUrl: "", layout: layoutForView?.layout)
 
@@ -36,7 +35,6 @@ extension NCTrash: NCTrashSelectTabBarDelegate {
 
     func onGridSelected() {
         if layoutForView?.layout == NCGlobal.shared.layoutList {
-            // grid layout
             layoutForView?.layout = NCGlobal.shared.layoutGrid
             NCManageDatabase.shared.setLayoutForView(account: appDelegate.account, key: layoutKey, serverUrl: "", layout: layoutForView?.layout)
 
diff --git a/iOSClient/Trash/NCTrash.swift b/iOSClient/Trash/NCTrash.swift
index d918a1e278..8651d4a040 100644
--- a/iOSClient/Trash/NCTrash.swift
+++ b/iOSClient/Trash/NCTrash.swift
@@ -23,9 +23,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Realm
 import UIKit
 import NextcloudKit
+import RealmSwift
 
 class NCTrash: UIViewController, NCTrashListCellDelegate, NCTrashGridCellDelegate {
 
@@ -62,7 +62,7 @@ class NCTrash: UIViewController, NCTrashListCellDelegate, NCTrashGridCellDelegat
         collectionView.register(UINib(nibName: "NCTrashListCell", bundle: nil), forCellWithReuseIdentifier: "listCell")
         collectionView.register(UINib(nibName: "NCTrashGridCell", bundle: nil), forCellWithReuseIdentifier: "gridCell")
 
-        collectionView.register(UINib(nibName: "NCSectionHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionHeaderEmptyData")
+        collectionView.register(UINib(nibName: "NCSectionFirstHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "sectionFirstHeaderEmptyData")
         collectionView.register(UINib(nibName: "NCSectionFooter", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "sectionFooter")
 
         collectionView.alwaysBounceVertical = true
@@ -84,7 +84,6 @@ class NCTrash: UIViewController, NCTrashListCellDelegate, NCTrashGridCellDelegat
         navigationController?.setNavigationBarAppearance()
         navigationItem.title = titleCurrentFolder
         layoutForView = NCManageDatabase.shared.getLayoutForView(account: appDelegate.account, key: NCGlobal.shared.layoutViewTrash, serverUrl: "")
-        gridLayout.itemForLine = CGFloat(layoutForView?.itemForLine ?? 3)
 
         if layoutForView?.layout == NCGlobal.shared.layoutList {
             collectionView.collectionViewLayout = listLayout
diff --git a/iOSClient/UserStatus/NCUserStatus.swift b/iOSClient/UserStatus/NCUserStatus.swift
index 6746acc6a9..aeded3f4c1 100644
--- a/iOSClient/UserStatus/NCUserStatus.swift
+++ b/iOSClient/UserStatus/NCUserStatus.swift
@@ -196,7 +196,6 @@ class NCUserStatus: UIViewController {
     }
 
     @IBAction func actionOnline(_ sender: UIButton) {
-
         self.onlineButton.layer.borderWidth = self.borderWidthButton
         self.onlineButton.layer.borderColor = self.borderColorButton
         self.awayButton.layer.borderWidth = 0
@@ -212,7 +211,6 @@ class NCUserStatus: UIViewController {
     }
 
     @IBAction func actionAway(_ sender: UIButton) {
-
         self.onlineButton.layer.borderWidth = 0
         self.onlineButton.layer.borderColor = nil
         self.awayButton.layer.borderWidth = self.borderWidthButton
@@ -228,7 +226,6 @@ class NCUserStatus: UIViewController {
     }
 
     @IBAction func actionDnd(_ sender: UIButton) {
-
         self.onlineButton.layer.borderWidth = 0
         self.onlineButton.layer.borderColor = nil
         self.awayButton.layer.borderWidth = 0
@@ -244,7 +241,6 @@ class NCUserStatus: UIViewController {
     }
 
     @IBAction func actionInvisible(_ sender: UIButton) {
-
         self.onlineButton.layer.borderWidth = 0
         self.onlineButton.layer.borderColor = nil
         self.awayButton.layer.borderWidth = 0
@@ -260,7 +256,6 @@ class NCUserStatus: UIViewController {
     }
 
     @objc func actionClearStatusMessageAfterText(sender: UITapGestureRecognizer) {
-
         let dropDown = DropDown()
         let appearance = DropDown.appearance()
         let clearStatusMessageAfterTextBackup = clearStatusMessageAfterText.text
@@ -306,9 +301,7 @@ class NCUserStatus: UIViewController {
     }
 
     @IBAction func actionClearStatusMessage(_ sender: UIButton) {
-
         NextcloudKit.shared.clearMessage { _, error in
-
             if error != .success {
                 NCContentPresenter().showError(error: error)
             }
@@ -318,11 +311,9 @@ class NCUserStatus: UIViewController {
     }
 
     @IBAction func actionSetStatusMessage(_ sender: UIButton) {
-
         guard let message = statusMessageTextField.text else { return }
 
         NextcloudKit.shared.setCustomMessageUserDefined(statusIcon: statusMessageEmojiTextField.text, message: message, clearAt: clearAtTimestamp) { _, error in
-
             if error != .success {
                 NCContentPresenter().showError(error: error)
             }
@@ -334,19 +325,15 @@ class NCUserStatus: UIViewController {
     // MARK: - Networking
 
     func getStatus() {
-
         NextcloudKit.shared.getUserStatus { _, clearAt, icon, message, _, _, status, _, _, _, error in
-
             if error == .success || error.errorCode == NCGlobal.shared.errorResourceNotFound {
 
                 if icon != nil {
                     self.statusMessageEmojiTextField.text = icon
                 }
-
                 if message != nil {
                     self.statusMessageTextField.text = message
                 }
-
                 if clearAt != nil {
                     self.clearStatusMessageAfterText.text = "  " + self.getPredefinedClearStatusText(clearAt: clearAt, clearAtTime: nil, clearAtType: nil)
                 }
@@ -369,9 +356,7 @@ class NCUserStatus: UIViewController {
                 }
 
                 NextcloudKit.shared.getUserStatusPredefinedStatuses { _, userStatuses, _, error in
-
                     if error == .success {
-
                         if let userStatuses = userStatuses {
                             self.statusPredefinedStatuses = userStatuses
                         }
@@ -391,12 +376,10 @@ class NCUserStatus: UIViewController {
     // MARK: - Algorithms
 
     func getClearAt(_ clearAtString: String) -> Double {
-
         let now = Date()
         let calendar = Calendar.current
         let gregorian = Calendar(identifier: .gregorian)
         let midnight = calendar.startOfDay(for: now)
-
         guard let tomorrow = calendar.date(byAdding: .day, value: 1, to: midnight) else { return 0 }
         guard let startweek = gregorian.date(from: gregorian.dateComponents([.yearForWeekOfYear, .weekOfYear], from: now)) else { return 0 }
         guard let endweek = gregorian.date(byAdding: .day, value: 6, to: startweek) else { return 0 }
@@ -422,14 +405,11 @@ class NCUserStatus: UIViewController {
         }
     }
 
-    func getPredefinedClearStatusText(clearAt: NSDate?, clearAtTime: String?, clearAtType: String?) -> String {
-
+    func getPredefinedClearStatusText(clearAt: Date?, clearAtTime: String?, clearAtType: String?) -> String {
         // Date
-        if clearAt != nil {
-
+        if let clearAt {
             let from = Date()
-            let to = clearAt! as Date
-
+            let to = clearAt
             let day = Calendar.current.dateComponents([.day], from: from, to: to).day ?? 0
             let hour = Calendar.current.dateComponents([.hour], from: from, to: to).hour ?? 0
             let minute = Calendar.current.dateComponents([.minute], from: from, to: to).minute ?? 0
@@ -451,10 +431,8 @@ class NCUserStatus: UIViewController {
                 return "\(minute) " + NSLocalizedString("_minutes_", comment: "")
             }
         }
-
         // Period
-        if clearAtTime != nil && clearAtType == "period" {
-
+        if let clearAtTime, clearAtType == "period" {
             switch clearAtTime {
             case "3600":
                 return NSLocalizedString("_an_hour_", comment: "")
@@ -464,11 +442,9 @@ class NCUserStatus: UIViewController {
                 return NSLocalizedString("_dont_clear_", comment: "")
             }
         }
-
         // End of
-        if clearAtTime != nil && clearAtType == "end-of" {
-
-            return NSLocalizedString(clearAtTime!, comment: "")
+        if let clearAtTime, clearAtType == "end-of" {
+            return NSLocalizedString(clearAtTime, comment: "")
         }
 
         return NSLocalizedString("_dont_clear_", comment: "")
@@ -476,20 +452,15 @@ class NCUserStatus: UIViewController {
 }
 
 extension NCUserStatus: UITextFieldDelegate {
-
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
-
         if textField is emojiTextField {
-
             if string.isEmpty {
                 textField.text = "😀"
                 return false
             }
-
             textField.text = string
             textField.endEditing(true)
         }
-
         return true
     }
 
@@ -500,7 +471,6 @@ extension NCUserStatus: UITextFieldDelegate {
 }
 
 class emojiTextField: UITextField {
-
     override var textInputContextIdentifier: String? { "" } // return non-nil to show the Emoji keyboard ¯\_(ツ)_/¯
 
     override var textInputMode: UITextInputMode? {
@@ -514,13 +484,11 @@ class emojiTextField: UITextField {
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-
         commonInit()
     }
 
     required init?(coder: NSCoder) {
         super.init(coder: coder)
-
         commonInit()
     }
 
@@ -540,24 +508,19 @@ class emojiTextField: UITextField {
 }
 
 extension NCUserStatus: UITableViewDelegate {
-
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 45
     }
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-
         guard let cell = tableView.cellForRow(at: indexPath) else { return }
         let status = statusPredefinedStatuses[indexPath.row]
 
         if let messageId = status.id {
-
             NextcloudKit.shared.setCustomMessagePredefined(messageId: messageId, clearAt: 0) { _, error in
-
                 cell.isSelected = false
 
                 if error == .success {
-
                     let clearAtTimestampString = self.getPredefinedClearStatusText(clearAt: status.clearAt, clearAtTime: status.clearAtTime, clearAtType: status.clearAtType)
 
                     self.statusMessageEmojiTextField.text = status.icon
@@ -573,29 +536,23 @@ extension NCUserStatus: UITableViewDelegate {
 }
 
 extension NCUserStatus: UITableViewDataSource {
-
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return statusPredefinedStatuses.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-
         let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath)
-        cell.backgroundColor = tableView.backgroundColor
-
         let status = statusPredefinedStatuses[indexPath.row]
-
         let icon = cell.viewWithTag(10) as? UILabel
         let message = cell.viewWithTag(20) as? UILabel
+        var timeString = getPredefinedClearStatusText(clearAt: status.clearAt, clearAtTime: status.clearAtTime, clearAtType: status.clearAtType)
 
+        cell.backgroundColor = tableView.backgroundColor
         icon?.text = status.icon
-        var timeString = getPredefinedClearStatusText(clearAt: status.clearAt, clearAtTime: status.clearAtTime, clearAtType: status.clearAtType)
 
         if let messageText = status.message {
-
             message?.text = messageText
             timeString = " - " + timeString
-
             let attributedString: NSMutableAttributedString = NSMutableAttributedString(string: messageText + timeString)
             attributedString.setColor(color: .lightGray, font: UIFont.systemFont(ofSize: 15), forText: timeString)
             message?.attributedText = attributedString
diff --git a/iOSClient/Utility/NCLivePhoto.swift b/iOSClient/Utility/NCLivePhoto.swift
index 9695ff2e86..7798c53681 100644
--- a/iOSClient/Utility/NCLivePhoto.swift
+++ b/iOSClient/Utility/NCLivePhoto.swift
@@ -463,9 +463,17 @@ fileprivate extension AVAsset {
 }
 
 extension NCLivePhoto {
+    func setLivephoto(serverUrlfileNamePath: String,
+                      livePhotoFile: String,
+                      options: NKRequestOptions = NKRequestOptions()) async -> (account: String, error: NKError) {
+        await withUnsafeContinuation({ continuation in
+            NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: livePhotoFile, options: options) { account, error in
+                continuation.resume(returning: (account: account, error: error))
+            }
+        })
+    }
 
     func setLivephotoUpload(metadata: tableMetadata) {
-
         guard NCGlobal.shared.capabilityServerVersionMajor >= NCGlobal.shared.nextcloudVersion28 else { return }
 
         livePhotoFile = metadata.livePhotoFile
@@ -482,33 +490,31 @@ extension NCLivePhoto {
         guard metadata.isLivePhoto,
               !livePhotoFile.isEmpty,
               let metadata2 = NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "account == %@ AND urlBase == %@ AND path == %@ AND fileName == %@ AND status == %d", metadata.account, metadata.urlBase, metadata.path, livePhotoFile, NCGlobal.shared.metadataStatusNormal)) else { return }
-
         let serverUrlfileNamePath1 = metadata.urlBase + metadata.path + metadata.fileName
         let serverUrlfileNamePath2 = metadata2.urlBase + metadata2.path + livePhotoFile
 
         Task {
             if metadata.livePhotoFile.isEmpty {
-                _ = await NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath1, livePhotoFile: livePhotoFile)
+                _ = await setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath1, livePhotoFile: livePhotoFile)
             }
             if metadata2.livePhotoFile.isEmpty {
-                _ = await NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath2, livePhotoFile: livePhotoFile2)
+                _ = await setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath2, livePhotoFile: livePhotoFile2)
             }
         }
     }
 
     func setLivePhoto(metadata1: tableMetadata, metadata2: tableMetadata) {
-
         guard NCGlobal.shared.capabilityServerVersionMajor >= NCGlobal.shared.nextcloudVersion28,
               (!metadata1.livePhotoFile.isEmpty && !metadata2.livePhotoFile.isEmpty) else { return }
 
         Task {
             if metadata1.livePhotoFile.isEmpty {
                 let serverUrlfileNamePath = metadata1.urlBase + metadata1.path + metadata1.fileName
-                _ = await NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: metadata2.fileName)
+                _ = await setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: metadata2.fileName)
             }
             if metadata2.livePhotoFile.isEmpty {
                 let serverUrlfileNamePath = metadata2.urlBase + metadata2.path + metadata2.fileName
-                _ = await NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: metadata1.fileName)
+                _ = await setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: metadata1.fileName)
             }
         }
     }
diff --git a/iOSClient/Utility/NCUtility+Image.swift b/iOSClient/Utility/NCUtility+Image.swift
index a6c62128ca..c6e60dc8b6 100644
--- a/iOSClient/Utility/NCUtility+Image.swift
+++ b/iOSClient/Utility/NCUtility+Image.swift
@@ -132,22 +132,15 @@ extension NCUtility {
         if classFile != NKCommon.TypeClassFile.image.rawValue && classFile != NKCommon.TypeClassFile.video.rawValue { return }
 
         if classFile == NKCommon.TypeClassFile.image.rawValue {
-
             originalImage = UIImage(contentsOfFile: fileNamePath)
-
             scaleImagePreview = originalImage?.resizeImage(size: CGSize(width: NCGlobal.shared.sizePreview, height: NCGlobal.shared.sizePreview))
             scaleImageIcon = originalImage?.resizeImage(size: CGSize(width: NCGlobal.shared.sizeIcon, height: NCGlobal.shared.sizeIcon))
-
             try? scaleImagePreview?.jpegData(compressionQuality: 0.7)?.write(to: URL(fileURLWithPath: fileNamePathPreview))
             try? scaleImageIcon?.jpegData(compressionQuality: 0.7)?.write(to: URL(fileURLWithPath: fileNamePathIcon))
-
         } else if classFile == NKCommon.TypeClassFile.video.rawValue {
-
             let videoPath = NSTemporaryDirectory() + "tempvideo.mp4"
             utilityFileSystem.linkItem(atPath: fileNamePath, toPath: videoPath)
-
             originalImage = imageFromVideo(url: URL(fileURLWithPath: videoPath), at: 0)
-
             try? originalImage?.jpegData(compressionQuality: 0.7)?.write(to: URL(fileURLWithPath: fileNamePathPreview))
             try? originalImage?.jpegData(compressionQuality: 0.7)?.write(to: URL(fileURLWithPath: fileNamePathIcon))
         }
@@ -178,7 +171,6 @@ extension NCUtility {
         var image: UIImage?
 
         if utilityFileSystem.fileProviderStorageExists(metadata) && metadata.isImage {
-
             let previewPath = utilityFileSystem.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)
             let iconPath = utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)
             let imagePath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
@@ -236,41 +228,28 @@ extension NCUtility {
         }
     }
 
-    func createFilePreviewImage(ocId: String, etag: String, fileNameView: String, classFile: String, status: Int, createPreviewMedia: Bool) -> UIImage? {
-        var imagePreview: UIImage?
-        let filePath = utilityFileSystem.getDirectoryProviderStorageOcId(ocId, fileNameView: fileNameView)
-        let iconImagePath = utilityFileSystem.getDirectoryProviderStorageIconOcId(ocId, etag: etag)
+    func getIcon(metadata: tableMetadata) -> UIImage? {
+        let iconPath = self.utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)
+        guard let icon = UIImage(contentsOfFile: iconPath) else { return nil }
 
-        if FileManager.default.fileExists(atPath: iconImagePath) {
-            imagePreview = UIImage(contentsOfFile: iconImagePath)
-        } else if !createPreviewMedia {
-            return nil
-        } else if createPreviewMedia && status >= NCGlobal.shared.metadataStatusNormal && classFile == NKCommon.TypeClassFile.image.rawValue && FileManager().fileExists(atPath: filePath) {
-            if let image = UIImage(contentsOfFile: filePath), let image = image.resizeImage(size: CGSize(width: NCGlobal.shared.sizeIcon, height: NCGlobal.shared.sizeIcon)), let data = image.jpegData(compressionQuality: 0.5) {
-                do {
-                    try data.write(to: URL(fileURLWithPath: iconImagePath), options: .atomic)
-                    imagePreview = image
-                } catch { }
-            }
-        } else if createPreviewMedia && status >= NCGlobal.shared.metadataStatusNormal && classFile == NKCommon.TypeClassFile.video.rawValue && FileManager().fileExists(atPath: filePath) {
-            if let image = imageFromVideo(url: URL(fileURLWithPath: filePath), at: 0), let image = image.resizeImage(size: CGSize(width: NCGlobal.shared.sizeIcon, height: NCGlobal.shared.sizeIcon)), let data = image.jpegData(compressionQuality: 0.5) {
-                do {
-                    try data.write(to: URL(fileURLWithPath: iconImagePath), options: .atomic)
-                    imagePreview = image
-                } catch { }
-            }
+        if Int(icon.size.width) > NCGlobal.shared.sizeIcon, Int(icon.size.height) > NCGlobal.shared.sizeIcon,
+           let iconResize = icon.resizeImage(size: CGSize(width: NCGlobal.shared.sizeIcon, height: NCGlobal.shared.sizeIcon)) {
+            do {
+                if let data = iconResize.jpegData(compressionQuality: 0.5) {
+                    try data.write(to: URL(fileURLWithPath: iconPath), options: .atomic)
+                }
+            } catch { }
+            return iconResize
         }
-
-        return imagePreview
+        return icon
     }
 
-    @objc func pdfThumbnail(url: URL, width: CGFloat = 240) -> UIImage? {
+    func pdfThumbnail(url: URL, width: CGFloat = 240) -> UIImage? {
         guard let data = try? Data(contentsOf: url), let page = PDFDocument(data: data)?.page(at: 0) else {
             return nil
         }
         let pageSize = page.bounds(for: .mediaBox)
         let pdfScale = width / pageSize.width
-
         // Apply if you're displaying the thumbnail on screen
         let scale = UIScreen.main.scale * pdfScale
         let screenSize = CGSize(width: pageSize.width * scale, height: pageSize.height * scale)
@@ -318,13 +297,9 @@ extension NCUtility {
         let imageNamePath = utilityFileSystem.directoryUserData + "/" + fileNamePNG
 
         if !FileManager.default.fileExists(atPath: imageNamePath) || rewrite == true {
-
             NextcloudKit.shared.downloadContent(serverUrl: iconURL.absoluteString) { _, data, error in
-
                 if error == .success && data != nil {
-
                     if let image = UIImage(data: data!) {
-
                         var newImage: UIImage = image
 
                         if width != nil {
@@ -339,17 +314,13 @@ extension NCUtility {
                                 image.draw(in: CGRect(x: 0, y: 0, width: newSize.width, height: newSize.height))
                             }
                         }
-
                         guard let pngImageData = newImage.pngData() else {
                             return completion(nil, id)
                         }
-
                         try? pngImageData.write(to: URL(fileURLWithPath: imageNamePath))
 
                         return completion(imageNamePath, id)
-
                     } else {
-
                         guard let svgImage: SVGKImage = SVGKImage(data: data) else {
                             return completion(nil, id)
                         }
@@ -358,7 +329,6 @@ extension NCUtility {
                             let scale = svgImage.size.height / svgImage.size.width
                             svgImage.size = CGSize(width: width!, height: width! * scale)
                         }
-
                         guard let image: UIImage = svgImage.uiImage else {
                             return completion(nil, id)
                         }
@@ -397,7 +367,7 @@ extension NCUtility {
         return CGSize(width: widthPreview, height: heightPreview)
     }
 
-    func getUserStatus(userIcon: String?, userStatus: String?, userMessage: String?) -> (statusImage: UIImage, statusMessage: String, descriptionMessage: String) {
+    func getUserStatus(userIcon: String?, userStatus: String?, userMessage: String?) -> (statusImage: UIImage?, statusMessage: String, descriptionMessage: String) {
         var statusImage: UIImage?
         var statusMessage: String = ""
         var descriptionMessage: String = ""
@@ -433,10 +403,6 @@ extension NCUtility {
             statusMessage = messageUserDefined
         }
 
-        if let statusImage {
-            return(statusImage, statusMessage, descriptionMessage)
-        } else {
-            return(UIImage(), statusMessage, descriptionMessage)
-        }
+        return(statusImage, statusMessage, descriptionMessage)
     }
 }
diff --git a/iOSClient/Utility/NCUtility.swift b/iOSClient/Utility/NCUtility.swift
index c3d588b3a9..280b23d47f 100644
--- a/iOSClient/Utility/NCUtility.swift
+++ b/iOSClient/Utility/NCUtility.swift
@@ -46,7 +46,7 @@ class NCUtility: NSObject {
         return path.contains("CoreSimulator")
     }
 
-    func isRichDocument(_ metadata: tableMetadata) -> Bool {
+    func isTypeFileRichDocument(_ metadata: tableMetadata) -> Bool {
         guard metadata.fileNameView != "." else { return false }
         let fileExtension = (metadata.fileNameView as NSString).pathExtension
         guard !fileExtension.isEmpty else { return false }
@@ -66,7 +66,7 @@ class NCUtility: NSObject {
         return false
     }
 
-    func isDirectEditing(account: String, contentType: String) -> [String] {
+    func editorsDirectEditing(account: String, contentType: String) -> [String] {
         var editor: [String] = []
         guard let results = NCManageDatabase.shared.getDirectEditingEditors(account: account) else { return editor }
 
diff --git a/iOSClient/Utility/NCUtilityFileSystem.swift b/iOSClient/Utility/NCUtilityFileSystem.swift
index dd6baa28d6..f5dbc2c00c 100644
--- a/iOSClient/Utility/NCUtilityFileSystem.swift
+++ b/iOSClient/Utility/NCUtilityFileSystem.swift
@@ -28,13 +28,13 @@ import PhotosUI
 class NCUtilityFileSystem: NSObject {
     let fileManager = FileManager.default
     var directoryGroup: String {
-        return fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroups)?.path ?? ""
+        return fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroup)?.path ?? ""
     }
     var directoryDocuments: String {
         return NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first ?? ""
     }
     var directoryCertificates: String {
-        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroups) else { return "" }
+        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroup) else { return "" }
         let path = directoryGroup.appendingPathComponent(NCGlobal.shared.appCertificates).path
         if !fileManager.fileExists(atPath: path) {
             do {
@@ -44,7 +44,7 @@ class NCUtilityFileSystem: NSObject {
         return path
     }
     var directoryUserData: String {
-        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroups) else { return "" }
+        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroup) else { return "" }
         let path = directoryGroup.appendingPathComponent(NCGlobal.shared.appUserData).path
         if !fileManager.fileExists(atPath: path) {
             do {
@@ -54,7 +54,7 @@ class NCUtilityFileSystem: NSObject {
         return path
     }
     var directoryScan: String {
-        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroups) else { return "" }
+        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroup) else { return "" }
         let path = directoryGroup.appendingPathComponent(NCGlobal.shared.appScan).path
         if !fileManager.fileExists(atPath: path) {
             do {
@@ -64,7 +64,7 @@ class NCUtilityFileSystem: NSObject {
         return path
     }
     var directoryProviderStorage: String {
-        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroups) else { return "" }
+        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroup) else { return "" }
         let path = directoryGroup.appendingPathComponent(NCGlobal.shared.directoryProviderStorage).path
         if !fileManager.fileExists(atPath: path) {
             do {
@@ -151,7 +151,7 @@ class NCUtilityFileSystem: NSObject {
     }
 
     func createDirectoryStandard() {
-        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroups)?.path else { return }
+        guard let directoryGroup = fileManager.containerURL(forSecurityApplicationGroupIdentifier: NCBrandOptions.shared.capabilitiesGroup)?.path else { return }
         if !fileManager.fileExists(atPath: directoryDocuments) { try? fileManager.createDirectory(atPath: directoryDocuments, withIntermediateDirectories: true) }
         let appDatabaseNextcloud = directoryGroup + "/" + NCGlobal.shared.appDatabaseNextcloud
         if !fileManager.fileExists(atPath: appDatabaseNextcloud) { try? fileManager.createDirectory(atPath: appDatabaseNextcloud, withIntermediateDirectories: true) }
diff --git a/iOSClient/Viewer/NCViewer.swift b/iOSClient/Viewer/NCViewer.swift
index 957ae370f2..c6a9753029 100644
--- a/iOSClient/Viewer/NCViewer.swift
+++ b/iOSClient/Viewer/NCViewer.swift
@@ -26,7 +26,6 @@ import NextcloudKit
 import QuickLook
 
 class NCViewer: NSObject {
-
     let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
     let utilityFileSystem = NCUtilityFileSystem()
     let utility = NCUtility()
@@ -34,16 +33,12 @@ class NCViewer: NSObject {
     private var metadata = tableMetadata()
     private var metadatas: [tableMetadata] = []
 
-    func view(viewController: UIViewController, metadata: tableMetadata, metadatas: [tableMetadata], imageIcon: UIImage?, editor: String = "", isRichDocument: Bool = false) {
-
+    func view(viewController: UIViewController, metadata: tableMetadata, metadatas: [tableMetadata], imageIcon: UIImage?) {
         self.metadata = metadata
         self.metadatas = metadatas
 
-        var editor = editor
-
         // URL
         if metadata.classFile == NKCommon.TypeClassFile.url.rawValue {
-
             // nextcloudtalk://open-conversation?server={serverURL}&user={userId}&withRoomToken={roomToken}
             if metadata.name == NCGlobal.shared.talkName {
                 let pathComponents = metadata.url.components(separatedBy: "/")
@@ -58,7 +53,6 @@ class NCViewer: NSObject {
                     }
                 }
             }
-
             if let url = URL(string: metadata.url) {
                 UIApplication.shared.open(url)
             }
@@ -67,7 +61,6 @@ class NCViewer: NSObject {
 
         // IMAGE AUDIO VIDEO
         if metadata.isImage || metadata.isAudioOrVideo {
-
             if let navigationController = viewController.navigationController,
                let viewerMediaPageContainer: NCViewerMediaPage = UIStoryboard(name: "NCViewerMediaPage", bundle: nil).instantiateInitialViewController() as? NCViewerMediaPage {
                 var index = 0
@@ -82,146 +75,93 @@ class NCViewer: NSObject {
                 viewerMediaPageContainer.delegateViewController = viewController
                 navigationController.pushViewController(viewerMediaPageContainer, animated: true)
             }
-
             return
         }
 
         // DOCUMENTS
         if metadata.classFile == NKCommon.TypeClassFile.document.rawValue {
-
             // Set Last Opening Date
             NCManageDatabase.shared.setLastOpeningDate(metadata: metadata)
-
             // PDF
             if metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {
-
                 if let navigationController = viewController.navigationController,
                    let viewController: NCViewerPDF = UIStoryboard(name: "NCViewerPDF", bundle: nil).instantiateInitialViewController() as? NCViewerPDF {
-
                     viewController.metadata = metadata
                     viewController.titleView = metadata.fileNameView
                     viewController.imageIcon = imageIcon
-
                     navigationController.pushViewController(viewController, animated: true)
                 }
                 return
             }
-
-            // EDITORS
-            let editors = utility.isDirectEditing(account: metadata.account, contentType: metadata.contentType)
-            let availableRichDocument = utility.isRichDocument(metadata)
-
             // RichDocument: Collabora
-            if (isRichDocument || (availableRichDocument && editors.isEmpty)) && NCGlobal.shared.capabilityRichDocumentsEnabled && NextcloudKit.shared.isNetworkReachable() {
-
+            if metadata.isAvailableRichDocumentEditorView {
                 if metadata.url.isEmpty {
-
                     NCActivityIndicator.shared.start(backgroundView: viewController.view)
                     NextcloudKit.shared.createUrlRichdocuments(fileID: metadata.fileId) { account, url, _, error in
-
                         NCActivityIndicator.shared.stop()
-
                         if error == .success && account == self.appDelegate.account && url != nil {
-
                             if let navigationController = viewController.navigationController,
                                let viewController: NCViewerRichDocument = UIStoryboard(name: "NCViewerRichdocument", bundle: nil).instantiateInitialViewController() as? NCViewerRichDocument {
-
                                 viewController.metadata = metadata
                                 viewController.link = url!
                                 viewController.imageIcon = imageIcon
-
                                 navigationController.pushViewController(viewController, animated: true)
                             }
-
                         } else if error != .success {
-
                             NCContentPresenter().showError(error: error)
                         }
                     }
-
                 } else {
-
                     if let navigationController = viewController.navigationController,
                        let viewController: NCViewerRichDocument = UIStoryboard(name: "NCViewerRichdocument", bundle: nil).instantiateInitialViewController() as? NCViewerRichDocument {
-
                         viewController.metadata = metadata
                         viewController.link = metadata.url
                         viewController.imageIcon = imageIcon
-
                         navigationController.pushViewController(viewController, animated: true)
                     }
                 }
-
                 return
             }
-
             // DirectEditing: Nextcloud Text - OnlyOffice
-            if !editors.isEmpty, NextcloudKit.shared.isNetworkReachable() {
-
-                if editor.isEmpty {
-                    if editors.contains(NCGlobal.shared.editorText) {
-                        editor = NCGlobal.shared.editorText
-                    } else if editors.contains(NCGlobal.shared.editorOnlyoffice) {
-                        editor = NCGlobal.shared.editorOnlyoffice
-                    }
+            if metadata.isAvailableDirectEditingEditorView {
+                var options = NKRequestOptions()
+                var editor = ""
+                let editors = utility.editorsDirectEditing(account: metadata.account, contentType: metadata.contentType)
+                if editors.contains(NCGlobal.shared.editorText) {
+                    editor = NCGlobal.shared.editorText
+                    options = NKRequestOptions(customUserAgent: utility.getCustomUserAgentNCText())
+                } else if editors.contains(NCGlobal.shared.editorOnlyoffice) {
+                    editor = NCGlobal.shared.editorOnlyoffice
+                    options = NKRequestOptions(customUserAgent: utility.getCustomUserAgentOnlyOffice())
                 }
-
-                if editor == NCGlobal.shared.editorText || editor == NCGlobal.shared.editorOnlyoffice {
-
-                    if metadata.url.isEmpty {
-
-                        let fileNamePath = utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId)
-
-                        var options = NKRequestOptions()
-                        if editor == NCGlobal.shared.editorOnlyoffice {
-                            options = NKRequestOptions(customUserAgent: utility.getCustomUserAgentOnlyOffice())
-                        } else {
-                            options = NKRequestOptions(customUserAgent: utility.getCustomUserAgentNCText())
-                        }
-
-                        NCActivityIndicator.shared.start(backgroundView: viewController.view)
-                        NextcloudKit.shared.NCTextOpenFile(fileNamePath: fileNamePath, editor: editor, options: options) { account, url, _, error in
-
-                            NCActivityIndicator.shared.stop()
-
-                            if error == .success && account == self.appDelegate.account && url != nil {
-
-                                if let navigationController = viewController.navigationController,
-                                   let viewController: NCViewerNextcloudText = UIStoryboard(name: "NCViewerNextcloudText", bundle: nil).instantiateInitialViewController() as? NCViewerNextcloudText {
-
-                                    viewController.metadata = metadata
-                                    viewController.editor = editor
-                                    viewController.link = url!
-                                    viewController.imageIcon = imageIcon
-
-                                    navigationController.pushViewController(viewController, animated: true)
-                                }
-
-                            } else if error != .success {
-
-                                NCContentPresenter().showError(error: error)
+                if metadata.url.isEmpty {
+                    let fileNamePath = utilityFileSystem.getFileNamePath(metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, userId: metadata.userId)
+                    NCActivityIndicator.shared.start(backgroundView: viewController.view)
+                    NextcloudKit.shared.NCTextOpenFile(fileNamePath: fileNamePath, editor: editor, options: options) { account, url, _, error in
+                        NCActivityIndicator.shared.stop()
+                        if error == .success && account == self.appDelegate.account && url != nil {
+                            if let navigationController = viewController.navigationController,
+                               let viewController: NCViewerNextcloudText = UIStoryboard(name: "NCViewerNextcloudText", bundle: nil).instantiateInitialViewController() as? NCViewerNextcloudText {
+                                viewController.metadata = metadata
+                                viewController.editor = editor
+                                viewController.link = url!
+                                viewController.imageIcon = imageIcon
+                                navigationController.pushViewController(viewController, animated: true)
                             }
-                        }
-
-                    } else {
-
-                        if let navigationController = viewController.navigationController,
-                           let viewController: NCViewerNextcloudText = UIStoryboard(name: "NCViewerNextcloudText", bundle: nil).instantiateInitialViewController() as? NCViewerNextcloudText {
-
-                            viewController.metadata = metadata
-                            viewController.editor = editor
-                            viewController.link = metadata.url
-                            viewController.imageIcon = imageIcon
-
-                            navigationController.pushViewController(viewController, animated: true)
+                        } else if error != .success {
+                            NCContentPresenter().showError(error: error)
                         }
                     }
-
                 } else {
-                    let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_editor_unknown_")
-                    NCContentPresenter().showError(error: error)
+                    if let navigationController = viewController.navigationController,
+                       let viewController: NCViewerNextcloudText = UIStoryboard(name: "NCViewerNextcloudText", bundle: nil).instantiateInitialViewController() as? NCViewerNextcloudText {
+                        viewController.metadata = metadata
+                        viewController.editor = editor
+                        viewController.link = metadata.url
+                        viewController.imageIcon = imageIcon
+                        navigationController.pushViewController(viewController, animated: true)
+                    }
                 }
-
                 return
             }
         }
@@ -234,7 +174,7 @@ class NCViewer: NSObject {
             let viewerQuickLook = NCViewerQuickLook(with: URL(fileURLWithPath: fileNamePath), isEditingEnabled: false, metadata: metadata)
             viewController.present(viewerQuickLook, animated: true)
         } else {
-        // Document Interaction Controller
+            // Document Interaction Controller
             if let controller = viewController.tabBarController as? NCMainTabBarController {
                 NCActionCenter.shared.openDocumentController(metadata: metadata, controller: controller)
             }
diff --git a/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift b/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
index 721fa02d9b..0828e4a214 100644
--- a/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
+++ b/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
@@ -311,7 +311,6 @@ class NCViewerMedia: UIViewController {
                                                 heightPreview: Int(sizePreview.height),
                                                 sizeIcon: NCGlobal.shared.sizeIcon,
                                                 options: NKRequestOptions(queue: .main)) { _, imagePreview, _, _, etag, error in
-
                 if error == .success, let image = imagePreview {
                     NCManageDatabase.shared.setMetadataEtagResource(ocId: self.metadata.ocId, etagResource: etag)
                     return completion(image)
diff --git a/iOSClient/Viewer/NCViewerProviderContextMenu.swift b/iOSClient/Viewer/NCViewerProviderContextMenu.swift
index 818c1ffa02..98191740de 100644
--- a/iOSClient/Viewer/NCViewerProviderContextMenu.swift
+++ b/iOSClient/Viewer/NCViewerProviderContextMenu.swift
@@ -44,42 +44,33 @@ class NCViewerProviderContextMenu: UIViewController {
 
     init(metadata: tableMetadata, image: UIImage?) {
         super.init(nibName: nil, bundle: nil)
-
         self.metadata = tableMetadata(value: metadata)
         self.metadataLivePhoto = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata)
         self.image = image
 
         if metadata.directory {
-
             imageView.image = NCImageCache.images.folder.colorizeFolder(metadata: metadata)
             imageView.frame = resize(CGSize(width: sizeIcon, height: sizeIcon))
-
         } else {
-
             // ICON
             let image = NCUtility().loadImage(named: metadata.iconName, useTypeIconFile: true)
             imageView.image = image
             imageView.frame = resize(CGSize(width: sizeIcon, height: sizeIcon))
-
             // PREVIEW
             if utilityFileSystem.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag) {
-
                 if let image = UIImage(contentsOfFile: utilityFileSystem.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)) {
                     imageView.image = image
                     imageView.frame = resize(image.size)
                 }
             }
-
             // VIEW IMAGE
             if metadata.isImage && utilityFileSystem.fileProviderStorageExists(metadata) {
                 viewImage(metadata: metadata)
             }
-
             // VIEW LIVE PHOTO
             if let metadataLivePhoto = metadataLivePhoto, utilityFileSystem.fileProviderStorageExists(metadataLivePhoto) {
                 viewVideo(metadata: metadataLivePhoto)
             }
-
             // VIEW VIDEO
             if metadata.isVideo {
                 if !utilityFileSystem.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag) {
@@ -90,52 +81,41 @@ class NCViewerProviderContextMenu: UIViewController {
                 }
                 viewVideo(metadata: metadata)
             }
-
             // PLAY AUDIO
             if metadata.isAudio {
-
                 var maxDownload: UInt64 = 0
-
                 if utilityFileSystem.fileProviderStorageExists(metadata) {
-
                     viewVideo(metadata: metadata)
-
                 } else {
-
                     if NCNetworking.shared.networkReachability == NKCommon.TypeReachability.reachableCellular {
                         maxDownload = NCGlobal.shared.maxAutoDownloadCellular
                     } else {
                         maxDownload = NCGlobal.shared.maxAutoDownload
                     }
-
                     if metadata.size <= maxDownload,
                        NCNetworking.shared.downloadQueue.operations.filter({ ($0 as? NCOperationDownload)?.metadata.ocId == metadata.ocId }).isEmpty {
                         NCNetworking.shared.downloadQueue.addOperation(NCOperationDownload(metadata: metadata, selector: ""))
                     }
                 }
             }
-
             // AUTO DOWNLOAD IMAGE GIF
             if !utilityFileSystem.fileProviderStorageExists(metadata),
                metadata.contentType == "image/gif",
                NCNetworking.shared.downloadQueue.operations.filter({ ($0 as? NCOperationDownload)?.metadata.ocId == metadata.ocId }).isEmpty {
                 NCNetworking.shared.downloadQueue.addOperation(NCOperationDownload(metadata: metadata, selector: ""))
             }
-
             // AUTO DOWNLOAD IMAGE SVG
             if !utilityFileSystem.fileProviderStorageExists(metadata),
                metadata.contentType == "image/svg+xml",
                NCNetworking.shared.downloadQueue.operations.filter({ ($0 as? NCOperationDownload)?.metadata.ocId == metadata.ocId }).isEmpty {
                 NCNetworking.shared.downloadQueue.addOperation(NCOperationDownload(metadata: metadata, selector: ""))
             }
-
             // AUTO DOWNLOAD LIVE PHOTO
             if let metadataLivePhoto = self.metadataLivePhoto,
                !utilityFileSystem.fileProviderStorageExists(metadataLivePhoto),
                NCNetworking.shared.downloadQueue.operations.filter({ ($0 as? NCOperationDownload)?.metadata.ocId == metadata.ocId }).isEmpty {
                 NCNetworking.shared.downloadQueue.addOperation(NCOperationDownload(metadata: metadataLivePhoto, selector: ""))
             }
-
         }
     }
 
@@ -165,7 +145,6 @@ class NCViewerProviderContextMenu: UIViewController {
     // MARK: - NotificationCenter
 
     @objc func downloadStartFile(_ notification: NSNotification) {
-
         guard let userInfo = notification.userInfo as NSDictionary?,
               let ocId = userInfo["ocId"] as? String
         else { return }
@@ -176,7 +155,6 @@ class NCViewerProviderContextMenu: UIViewController {
     }
 
     @objc func downloadedFile(_ notification: NSNotification) {
-
         guard let userInfo = notification.userInfo as NSDictionary?,
               let ocId = userInfo["ocId"] as? String,
               let error = userInfo["error"] as? NKError,
@@ -203,7 +181,6 @@ class NCViewerProviderContextMenu: UIViewController {
     }
 
     @objc func downloadCancelFile(_ notification: NSNotification) {
-
         guard let userInfo = notification.userInfo as NSDictionary?,
               let ocId = userInfo["ocId"] as? String
         else { return }
@@ -216,9 +193,7 @@ class NCViewerProviderContextMenu: UIViewController {
     // MARK: - Viewer
 
     private func viewImage(metadata: tableMetadata) {
-
         var image: UIImage?
-
         let filePath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
 
         if metadata.contentType == "image/gif" {
@@ -238,7 +213,6 @@ class NCViewerProviderContextMenu: UIViewController {
     }
 
     private func viewVideo(metadata: tableMetadata) {
-
         NCNetworking.shared.getVideoUrl(metadata: metadata) { url, _, _ in
             if let url = url {
                 self.player.media = VLCMedia(url: url)
@@ -251,9 +225,7 @@ class NCViewerProviderContextMenu: UIViewController {
     }
 
     private func resize(_ size: CGSize?) -> CGRect {
-
         var frame = CGRect.zero
-
         guard let size = size else {
             preferredContentSize = frame.size
             return frame
@@ -284,9 +256,7 @@ class NCViewerProviderContextMenu: UIViewController {
 }
 
 extension NCViewerProviderContextMenu: VLCMediaPlayerDelegate {
-
     func mediaPlayerStateChanged(_ aNotification: Notification) {
-
         switch player.state {
         case .stopped:
             print("Played mode: STOPPED")