diff --git a/Brand/NCBrand.swift b/Brand/NCBrand.swift
index 6ddb4e18f3..b1e8efdc4e 100755
--- a/Brand/NCBrand.swift
+++ b/Brand/NCBrand.swift
@@ -24,9 +24,8 @@
 import UIKit
 
 let userAgent: String = {
-    let appVersion: String = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
     // Original Nextcloud useragent "Mozilla/5.0 (iOS) Nextcloud-iOS/\(appVersion)"
-    return "Mozilla/5.0 (iOS) Nextcloud-iOS/\(appVersion)"
+    return "MagentaCLOUD iOS"
 }()
 
 @objc class NCBrandOptions: NSObject {
@@ -46,13 +45,14 @@ let userAgent: String = {
     @objc public var privacy: String = "https://nextcloud.com/privacy"
     @objc public var sourceCode: String = "https://github.com/nextcloud/ios"
     @objc public var mobileconfig: String = "/remote.php/dav/provisioning/apple-provisioning.mobileconfig"
+    @objc public var appStoreUrl: String = "https://apps.apple.com/de/app/magentacloud-cloud-speicher/id312838242"
 
     // Personalized
     @objc public var webCloseViewProtocolPersonalized: String = ""                                                  // example "abc://change/plan"      Don't touch me !!
     @objc public var folderBrandAutoUpload: String = ""                                                             // example "_auto_upload_folder_"   Don't touch me !!
 
     // Auto Upload default folder
-    @objc public var folderDefaultAutoUpload: String = "Photos"
+    @objc public var folderDefaultAutoUpload: String = Locale.current.languageCode == "de" ? "Kamera-Medien" : "Camera-Media"
 
     // Capabilities Group
     @objc public var capabilitiesGroups: String = "group.it.twsweb.Crypto-Cloud"
@@ -289,4 +289,62 @@ class NCBrandColor: NSObject {
         let palette3 = mixPalette(steps: steps, color1: blue, color2: red)
         return palette1 + palette2 + palette3
     }
+    
+    @objc public var iconColor: UIColor{
+        if #available(iOS 13.0, *) {
+            if UITraitCollection.current.userInterfaceStyle == .dark {
+                return  UIColor(displayP3Red: 204.0/255.0, green: 204.0/255.0, blue: 204.0/255.0, alpha: 1.0)
+            }else {
+                return  UIColor(red: 38.0/255.0, green: 38.0/255.0, blue: 38.0/255.0, alpha: 1.0)
+            }
+        } else {
+            return  UIColor(red: 38.0/255.0, green: 38.0/255.0, blue: 38.0/255.0, alpha: 1.0)
+        }
+    }
+    
+    @objc public var notificationAction: UIColor {
+        return UIColor(red: 0/255.0, green: 153/255.0, blue: 255/255.0, alpha: 1.0)
+    }
+
+    @objc public var secondarySystemGroupedBackground: UIColor = UIColor.secondarySystemGroupedBackground
+    @objc public var label: UIColor = UIColor.label
+    @objc public var backgroundForm: UIColor = UIColor(red: 244.0/255.0, green: 244.0/255.0, blue: 244.0/255.0, alpha: 1.0)
+    @objc public let graySoft: UIColor = UIColor(red: 162.0/255.0, green: 162.0/255.0, blue: 162.0/255.0, alpha: 0.5)
+    @objc public let systemGray4: UIColor = UIColor.systemGray4
+    @objc public let systemBackground: UIColor = UIColor.systemBackground
+    @objc public let textInfo: UIColor = UIColor(red: 153.0/255.0, green: 153.0/255.0, blue: 153.0/255.0, alpha: 1.0)
+    @objc public let systemGray: UIColor = UIColor.systemGray
+    @objc public let customerDarkGrey: UIColor = UIColor(red: 38.0/255.0, green: 38.0/255.0, blue: 38.0/255.0, alpha: 1.0)
+    @objc public var fileFolderName: UIColor = UIColor(displayP3Red: 102.0/255.0, green: 102.0/255.0, blue: 102.0/255.0, alpha: 1.0)
+    @objc public let optionItem: UIColor = UIColor(red: 178.0/255.0, green: 178.0/255.0, blue: 178.0/255.0, alpha: 1.0)
+    @objc public var singleTitleColorButton: UIColor = UIColor(red: 25.0/255.0, green: 25.0/255.0, blue: 25.0/255.0, alpha: 1.0)
+    @objc public var shareCellTitleColor: UIColor = UIColor(displayP3Red: 242.0/255.0, green: 242.0/255.0, blue: 242.0/255.0, alpha: 1.0)
+    @objc public var gray60: UIColor {
+        if UITraitCollection.current.userInterfaceStyle == .dark {
+            return  UIColor(red: 178.0/255.0, green: 178.0/255.0, blue: 178.0/255.0, alpha: 1.0)
+        } else {
+            return  UIColor(red: 102.0/255.0, green: 102.0/255.0, blue: 102.0/255.0, alpha: 1.0)
+        }
+    }
+    @objc public var systemGray2: UIColor = UIColor.systemGray2
+    @objc public var shareByEmailTextColor: UIColor = UIColor(displayP3Red: 13.0/255.0, green: 57.0/255.0, blue: 223.0/255.0, alpha: 1.0)
+    @objc public var memoryConsuptionBackground: UIColor {
+        if UITraitCollection.current.userInterfaceStyle == .dark {
+            return  UIColor(red: 25.0/255.0, green: 25.0/255.0, blue: 25.0/255.0, alpha: 1.0)
+        } else {
+            return  UIColor(red: 244.0/255.0, green: 244.0/255.0, blue: 244.0/255.0, alpha: 1.0)
+        }
+    }
+    @objc public var nmcGray0: UIColor{
+        if UITraitCollection.current.userInterfaceStyle == .dark {
+            return  UIColor(displayP3Red: 242.0/255.0, green: 242.0/255.0, blue: 242.0/255.0, alpha: 1.0)
+        }else {
+            return  UIColor(red: 19.0/255.0, green: 19.0/255.0, blue: 19.0/255.0, alpha: 1.0)
+        }
+    }
+    @objc public var commonViewInfoText: UIColor =  UIColor(displayP3Red: 102.0/255.0, green: 102.0/255.0, blue: 102.0/255.0, alpha: 1.0)
+    @objc public let progressColorGreen60: UIColor = UIColor(red: 115.0/255.0, green: 195.0/255.0, blue: 84.0/255.0, alpha: 1.0)
+    @objc public var seperatorRename: UIColor = UIColor(red: 235.0/255.0, green: 235.0/255.0, blue: 235.0/255.0, alpha: 1.0)
+    @objc public let gray: UIColor = UIColor(red: 104.0/255.0, green: 104.0/255.0, blue: 104.0/255.0, alpha: 1.0)
+    @objc public var nmcIconSharedWithMe: UIColor = UIColor(displayP3Red: 0.0/255.0, green: 153.0/255.0, blue: 255.0/255.0, alpha: 1.0)
 }
diff --git a/iOSClient/Extensions/UIImage+Extension.swift b/iOSClient/Extensions/UIImage+Extension.swift
index 80ca865c3c..f7dcdd730e 100644
--- a/iOSClient/Extensions/UIImage+Extension.swift
+++ b/iOSClient/Extensions/UIImage+Extension.swift
@@ -246,6 +246,17 @@ extension UIImage {
         guard CGImageDestinationFinalize(destination) else { return nil }
         return mutableData as Data
     }
+    
+    func imageColor(_ color: UIColor) -> UIImage {
+        if #available(iOS 13.0, *) {
+            return self.withTintColor(color, renderingMode: .alwaysOriginal)
+        } else {
+            return UIGraphicsImageRenderer(size: size, format: imageRendererFormat).image { _ in
+                color.set()
+                withRenderingMode(.alwaysTemplate).draw(at: .zero)
+            }
+        }
+    }
 }
 
 extension CGImagePropertyOrientation {
diff --git a/iOSClient/Images.xcassets/addFolder.imageset/Contents.json b/iOSClient/Images.xcassets/addFolder.imageset/Contents.json
new file mode 100644
index 0000000000..c3efac3643
--- /dev/null
+++ b/iOSClient/Images.xcassets/addFolder.imageset/Contents.json
@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "filename" : "addFolder.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "addFolderDark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "addFolder@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "addFolderDark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "addFolder@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "addFolderDark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolder.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolder.png
new file mode 100644
index 0000000000..01b4edc846
Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolder.png differ
diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolder@2x.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolder@2x.png
new file mode 100644
index 0000000000..36b5f67ed9
Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolder@2x.png differ
diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolder@3x.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolder@3x.png
new file mode 100644
index 0000000000..63f36fef80
Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolder@3x.png differ
diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark.png
new file mode 100644
index 0000000000..021899fc7c
Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark.png differ
diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@2x.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@2x.png
new file mode 100644
index 0000000000..a4eede1fd9
Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@2x.png differ
diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@3x.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@3x.png
new file mode 100644
index 0000000000..bc59610706
Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@3x.png differ
diff --git a/iOSClient/Images.xcassets/addFolderInfo.imageset/Contents.json b/iOSClient/Images.xcassets/addFolderInfo.imageset/Contents.json
index 5e57ccc831..bfc9b6a226 100644
--- a/iOSClient/Images.xcassets/addFolderInfo.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/addFolderInfo.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "addFolderInfo.pdf"
+      "filename" : "addFolderInfo.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/addFolderInfo.imageset/addFolderInfo.pdf b/iOSClient/Images.xcassets/addFolderInfo.imageset/addFolderInfo.pdf
index e735795099..874d974e1b 100644
Binary files a/iOSClient/Images.xcassets/addFolderInfo.imageset/addFolderInfo.pdf and b/iOSClient/Images.xcassets/addFolderInfo.imageset/addFolderInfo.pdf differ
diff --git a/iOSClient/Images.xcassets/checkedYes.imageset/Contents.json b/iOSClient/Images.xcassets/checkedYes.imageset/Contents.json
new file mode 100644
index 0000000000..0b5d3dafc8
--- /dev/null
+++ b/iOSClient/Images.xcassets/checkedYes.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "green-white-filled@500w.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "green-Gray90-filled copy@500w.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/checkedYes.imageset/green-Gray90-filled copy@500w.pdf b/iOSClient/Images.xcassets/checkedYes.imageset/green-Gray90-filled copy@500w.pdf
new file mode 100644
index 0000000000..a689619ff2
Binary files /dev/null and b/iOSClient/Images.xcassets/checkedYes.imageset/green-Gray90-filled copy@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/checkedYes.imageset/green-white-filled@500w.pdf b/iOSClient/Images.xcassets/checkedYes.imageset/green-white-filled@500w.pdf
new file mode 100644
index 0000000000..f47e13070e
Binary files /dev/null and b/iOSClient/Images.xcassets/checkedYes.imageset/green-white-filled@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/cloudUpload.imageset/cloudUpload.pdf b/iOSClient/Images.xcassets/cloudUpload.imageset/cloudUpload.pdf
index a2db324c08..6985e202b0 100644
Binary files a/iOSClient/Images.xcassets/cloudUpload.imageset/cloudUpload.pdf and b/iOSClient/Images.xcassets/cloudUpload.imageset/cloudUpload.pdf differ
diff --git a/iOSClient/Images.xcassets/copy.imageset/Contents.json b/iOSClient/Images.xcassets/copy.imageset/Contents.json
new file mode 100644
index 0000000000..f711ad67af
--- /dev/null
+++ b/iOSClient/Images.xcassets/copy.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "copy.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/copy.imageset/copy.pdf b/iOSClient/Images.xcassets/copy.imageset/copy.pdf
new file mode 100644
index 0000000000..fb90c89c8e
Binary files /dev/null and b/iOSClient/Images.xcassets/copy.imageset/copy.pdf differ
diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json b/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json
index 6126b598e0..356e75ee11 100644
--- a/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json
@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "document_menu.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "create_file_document@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "document_menu@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "file_text 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/create_file_document@2x.png b/iOSClient/Images.xcassets/create_file_document.imageset/create_file_document@2x.png
deleted file mode 100644
index d4b0623eb0..0000000000
Binary files a/iOSClient/Images.xcassets/create_file_document.imageset/create_file_document@2x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/document_menu.png b/iOSClient/Images.xcassets/create_file_document.imageset/document_menu.png
deleted file mode 100644
index de680454d4..0000000000
Binary files a/iOSClient/Images.xcassets/create_file_document.imageset/document_menu.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/document_menu@3x.png b/iOSClient/Images.xcassets/create_file_document.imageset/document_menu@3x.png
deleted file mode 100644
index f300a8b58e..0000000000
Binary files a/iOSClient/Images.xcassets/create_file_document.imageset/document_menu@3x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/file_text 1.pdf b/iOSClient/Images.xcassets/create_file_document.imageset/file_text 1.pdf
new file mode 100644
index 0000000000..95241831e1
Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_document.imageset/file_text 1.pdf differ
diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json b/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json
index 72118b7429..b976e2da22 100644
--- a/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json
@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "file_ppt_menu.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "create_file_ppt@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "file_ppt_menu@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "file_ppt.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/create_file_ppt@2x.png b/iOSClient/Images.xcassets/create_file_ppt.imageset/create_file_ppt@2x.png
deleted file mode 100644
index 80aac7f831..0000000000
Binary files a/iOSClient/Images.xcassets/create_file_ppt.imageset/create_file_ppt@2x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt.pdf b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt.pdf
new file mode 100644
index 0000000000..c127187374
Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt.pdf differ
diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu.png b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu.png
deleted file mode 100644
index 5287c637e7..0000000000
Binary files a/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu@3x.png b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu@3x.png
deleted file mode 100644
index 8407a73cb7..0000000000
Binary files a/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu@3x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json b/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json
index 32339f608f..72c7b90297 100644
--- a/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json
@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "file_xls_menu.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "create_file_xls@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "file_xls_menu@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "file-calculation.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/create_file_xls@2x.png b/iOSClient/Images.xcassets/create_file_xls.imageset/create_file_xls@2x.png
deleted file mode 100644
index 73458d7755..0000000000
Binary files a/iOSClient/Images.xcassets/create_file_xls.imageset/create_file_xls@2x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/file-calculation.pdf b/iOSClient/Images.xcassets/create_file_xls.imageset/file-calculation.pdf
new file mode 100644
index 0000000000..1c9642dbab
Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_xls.imageset/file-calculation.pdf differ
diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu.png b/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu.png
deleted file mode 100644
index 474a66c601..0000000000
Binary files a/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu@3x.png b/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu@3x.png
deleted file mode 100644
index b959d7c9a8..0000000000
Binary files a/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu@3x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/diagram.imageset/Contents.json b/iOSClient/Images.xcassets/diagram.imageset/Contents.json
new file mode 100644
index 0000000000..6cbdad9726
--- /dev/null
+++ b/iOSClient/Images.xcassets/diagram.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "diagram.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/diagram.imageset/diagram.svg b/iOSClient/Images.xcassets/diagram.imageset/diagram.svg
new file mode 100644
index 0000000000..ae5b35d9ef
--- /dev/null
+++ b/iOSClient/Images.xcassets/diagram.imageset/diagram.svg
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 72 72"><defs><style>.cls-1{fill:url(#Unbenannter_Verlauf);}.cls-2{fill:#b9ada7;isolation:isolate;opacity:0.7;}.cls-3{fill:#529ad6;}.cls-4{fill:#a4a4a4;}.cls-5{fill:#6c6c6c;}</style><linearGradient id="Unbenannter_Verlauf" x1="36" y1="405.21" x2="36" y2="333.21" gradientTransform="translate(0 -333.21)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ddd6d3"/><stop offset="0.39" stop-color="#e9e4e2"/><stop offset="1" stop-color="#e9e4e2"/></linearGradient></defs><path class="cls-1" d="M65.57,19.29V69.43A2.58,2.58,0,0,1,63,72H9a2.58,2.58,0,0,1-2.57-2.57V2.57A2.58,2.58,0,0,1,9,0H46.29Z"/><path class="cls-2" d="M65.57,19.29H48.86a2.58,2.58,0,0,1-2.57-2.58V0Z"/><path class="cls-3" d="M38.57,45h5.14V59.14H38.57ZM28.29,39.86h5.14V59.14H28.29Zm20.57,0H54V59.14H48.86ZM18,48.86h5.14V59.14H18Z"/><path class="cls-4" d="M20.57,42.3a1.36,1.36,0,0,1-1-2.19L30.6,27.64l10.54,7.85,9.52-7.2a1.28,1.28,0,1,1,1.54,2.05L41.14,38.57,31,31,21.47,41.66A1,1,0,0,1,20.57,42.3Z"/><path class="cls-5" d="M33.56,29.44a2.7,2.7,0,1,1-2.7-2.7A2.72,2.72,0,0,1,33.56,29.44Zm20.57,0a2.7,2.7,0,1,1-2.7-2.7A2.72,2.72,0,0,1,54.13,29.44Z"/><circle class="cls-5" cx="41.14" cy="37.16" r="2.7"/><path class="cls-5" d="M23.27,41a2.7,2.7,0,1,1-2.7-2.7A2.71,2.71,0,0,1,23.27,41Z"/></svg>
\ No newline at end of file
diff --git a/iOSClient/Images.xcassets/document.imageset/Contents.json b/iOSClient/Images.xcassets/document.imageset/Contents.json
index 847026cf24..63f2a7bb2a 100644
--- a/iOSClient/Images.xcassets/document.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/document.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "document.pdf"
+      "filename" : "file_text.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/document.imageset/document.pdf b/iOSClient/Images.xcassets/document.imageset/document.pdf
deleted file mode 100644
index eed811dc9a..0000000000
Binary files a/iOSClient/Images.xcassets/document.imageset/document.pdf and /dev/null differ
diff --git a/iOSClient/Images.xcassets/document.imageset/file_text.pdf b/iOSClient/Images.xcassets/document.imageset/file_text.pdf
new file mode 100644
index 0000000000..95241831e1
Binary files /dev/null and b/iOSClient/Images.xcassets/document.imageset/file_text.pdf differ
diff --git a/iOSClient/Images.xcassets/downArrow.imageset/Contents.json b/iOSClient/Images.xcassets/downArrow.imageset/Contents.json
new file mode 100644
index 0000000000..81ef9bbb37
--- /dev/null
+++ b/iOSClient/Images.xcassets/downArrow.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "downArrow@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/downArrow.imageset/downArrow@2x.png b/iOSClient/Images.xcassets/downArrow.imageset/downArrow@2x.png
new file mode 100644
index 0000000000..6da8c3c9c5
Binary files /dev/null and b/iOSClient/Images.xcassets/downArrow.imageset/downArrow@2x.png differ
diff --git a/iOSClient/Images.xcassets/encryptedfolder.imageset/Contents.json b/iOSClient/Images.xcassets/encryptedfolder.imageset/Contents.json
new file mode 100644
index 0000000000..37e424164b
--- /dev/null
+++ b/iOSClient/Images.xcassets/encryptedfolder.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "encrypted folder.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/encryptedfolder.imageset/encrypted folder.svg b/iOSClient/Images.xcassets/encryptedfolder.imageset/encrypted folder.svg
new file mode 100644
index 0000000000..454ea06f3b
--- /dev/null
+++ b/iOSClient/Images.xcassets/encryptedfolder.imageset/encrypted folder.svg	
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#262626;}</style></defs><g id="Gruppe_32" data-name="Gruppe 32"><path id="Combined_Shape-2" data-name="Combined Shape-2" class="cls-1" d="M4,21.75a3,3,0,0,1-3-3V2.25H7.5a3.65,3.65,0,0,1,2.7,1.2l.45.45a1.43,1.43,0,0,0,.85.35H23v14.5a3,3,0,0,1-3,3Zm-1.5-3a1.46,1.46,0,0,0,1.43,1.5H20a1.47,1.47,0,0,0,1.5-1.44V5.75h-10A2.57,2.57,0,0,1,9.6,4.9l-.45-.45a2.38,2.38,0,0,0-1.65-.7h-5Z"/></g><path id="Shape" class="cls-1" d="M14.14,16.56H9.86a1.07,1.07,0,0,1-1.07-1.08V12.09h.89v-.71a2.32,2.32,0,0,1,4.64,0v.71h.89v3.39A1.07,1.07,0,0,1,14.14,16.56Zm-2.14-3a.54.54,0,0,0-.54.53.55.55,0,0,0,.18.4v.68h.72v-.68a.53.53,0,0,0,0-.75A.52.52,0,0,0,12,13.52Zm0-3.93a1.79,1.79,0,0,0-1.79,1.79v.71h3.58v-.71A1.79,1.79,0,0,0,12,9.59Z"/></svg>
\ No newline at end of file
diff --git a/iOSClient/Images.xcassets/file.imageset/Contents.json b/iOSClient/Images.xcassets/file.imageset/Contents.json
index 48ca8dd53d..34568170ce 100644
--- a/iOSClient/Images.xcassets/file.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/file.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "file.pdf"
+      "filename" : "file.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/file.imageset/file.pdf b/iOSClient/Images.xcassets/file.imageset/file.pdf
index e629726c98..bdbe2682c2 100644
Binary files a/iOSClient/Images.xcassets/file.imageset/file.pdf and b/iOSClient/Images.xcassets/file.imageset/file.pdf differ
diff --git a/iOSClient/Images.xcassets/file_audio.imageset/Contents.json b/iOSClient/Images.xcassets/file_audio.imageset/Contents.json
index e7d502e834..165f3569e0 100644
--- a/iOSClient/Images.xcassets/file_audio.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/file_audio.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "file_audio.pdf"
+      "filename" : "file-audio.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/file_audio.imageset/file-audio.pdf b/iOSClient/Images.xcassets/file_audio.imageset/file-audio.pdf
new file mode 100644
index 0000000000..ac39ce823a
Binary files /dev/null and b/iOSClient/Images.xcassets/file_audio.imageset/file-audio.pdf differ
diff --git a/iOSClient/Images.xcassets/file_audio.imageset/file_audio.pdf b/iOSClient/Images.xcassets/file_audio.imageset/file_audio.pdf
deleted file mode 100644
index f892f149f9..0000000000
Binary files a/iOSClient/Images.xcassets/file_audio.imageset/file_audio.pdf and /dev/null differ
diff --git a/iOSClient/Images.xcassets/file_compress.imageset/Contents.json b/iOSClient/Images.xcassets/file_compress.imageset/Contents.json
index 028f3ee0fe..4a32eb8305 100644
--- a/iOSClient/Images.xcassets/file_compress.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/file_compress.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "file_compress.pdf"
+      "filename" : "file_compress.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/file_compress.imageset/file_compress.pdf b/iOSClient/Images.xcassets/file_compress.imageset/file_compress.pdf
index 3b01f096bc..491b479d9d 100644
Binary files a/iOSClient/Images.xcassets/file_compress.imageset/file_compress.pdf and b/iOSClient/Images.xcassets/file_compress.imageset/file_compress.pdf differ
diff --git a/iOSClient/Images.xcassets/file_movie.imageset/Contents.json b/iOSClient/Images.xcassets/file_movie.imageset/Contents.json
index fcb1da8f07..7993c40c5b 100644
--- a/iOSClient/Images.xcassets/file_movie.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/file_movie.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "file_movie.pdf"
+      "filename" : "file-video.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/file_movie.imageset/file-video.pdf b/iOSClient/Images.xcassets/file_movie.imageset/file-video.pdf
new file mode 100644
index 0000000000..6b6a451b42
Binary files /dev/null and b/iOSClient/Images.xcassets/file_movie.imageset/file-video.pdf differ
diff --git a/iOSClient/Images.xcassets/file_movie.imageset/file_movie.pdf b/iOSClient/Images.xcassets/file_movie.imageset/file_movie.pdf
deleted file mode 100644
index 700d307684..0000000000
Binary files a/iOSClient/Images.xcassets/file_movie.imageset/file_movie.pdf and /dev/null differ
diff --git a/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json b/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json
index a3f76c948d..2f97942cc1 100644
--- a/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "Untitled.pdf"
+      "filename" : "file-pdf.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/file_pdf.imageset/Untitled.pdf b/iOSClient/Images.xcassets/file_pdf.imageset/Untitled.pdf
deleted file mode 100644
index 1b754ff9af..0000000000
Binary files a/iOSClient/Images.xcassets/file_pdf.imageset/Untitled.pdf and /dev/null differ
diff --git a/iOSClient/Images.xcassets/file_pdf.imageset/file-pdf.pdf b/iOSClient/Images.xcassets/file_pdf.imageset/file-pdf.pdf
new file mode 100644
index 0000000000..aea9e1e55e
Binary files /dev/null and b/iOSClient/Images.xcassets/file_pdf.imageset/file-pdf.pdf differ
diff --git a/iOSClient/Images.xcassets/file_photo.imageset/Contents.json b/iOSClient/Images.xcassets/file_photo.imageset/Contents.json
index ca8f401824..b854b32ca4 100644
--- a/iOSClient/Images.xcassets/file_photo.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/file_photo.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "file_photo.pdf"
+      "filename" : "file_photo.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/file_photo.imageset/file_photo.pdf b/iOSClient/Images.xcassets/file_photo.imageset/file_photo.pdf
index a95c3f5577..a47ec6136f 100644
Binary files a/iOSClient/Images.xcassets/file_photo.imageset/file_photo.pdf and b/iOSClient/Images.xcassets/file_photo.imageset/file_photo.pdf differ
diff --git a/iOSClient/Images.xcassets/file_photo_menu.imageset/Contents.json b/iOSClient/Images.xcassets/file_photo_menu.imageset/Contents.json
new file mode 100644
index 0000000000..94f24bec38
--- /dev/null
+++ b/iOSClient/Images.xcassets/file_photo_menu.imageset/Contents.json
@@ -0,0 +1,52 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "file_photo_menu.pdf",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "default copy@500w.pdf",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/file_photo_menu.imageset/default copy@500w.pdf b/iOSClient/Images.xcassets/file_photo_menu.imageset/default copy@500w.pdf
new file mode 100644
index 0000000000..47f3245514
Binary files /dev/null and b/iOSClient/Images.xcassets/file_photo_menu.imageset/default copy@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/file_photo_menu.imageset/file_photo_menu.pdf b/iOSClient/Images.xcassets/file_photo_menu.imageset/file_photo_menu.pdf
new file mode 100644
index 0000000000..2439cdd6b2
Binary files /dev/null and b/iOSClient/Images.xcassets/file_photo_menu.imageset/file_photo_menu.pdf differ
diff --git a/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json b/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json
index 312d432284..b976e2da22 100644
--- a/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "file_ppt.pdf"
+      "filename" : "file_ppt.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/file_ppt.imageset/file_ppt.pdf b/iOSClient/Images.xcassets/file_ppt.imageset/file_ppt.pdf
index ace5d3adfd..c127187374 100644
Binary files a/iOSClient/Images.xcassets/file_ppt.imageset/file_ppt.pdf and b/iOSClient/Images.xcassets/file_ppt.imageset/file_ppt.pdf differ
diff --git a/iOSClient/Images.xcassets/file_txt.imageset/Contents.json b/iOSClient/Images.xcassets/file_txt.imageset/Contents.json
index 00fadd1b1f..5bdfa81f6a 100644
--- a/iOSClient/Images.xcassets/file_txt.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/file_txt.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "file_txt.pdf"
+      "filename" : "file_txt.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/file_txt.imageset/file_txt.pdf b/iOSClient/Images.xcassets/file_txt.imageset/file_txt.pdf
index 04dabb7faa..bdbe2682c2 100644
Binary files a/iOSClient/Images.xcassets/file_txt.imageset/file_txt.pdf and b/iOSClient/Images.xcassets/file_txt.imageset/file_txt.pdf differ
diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/Contents.json b/iOSClient/Images.xcassets/file_txt_menu.imageset/Contents.json
new file mode 100644
index 0000000000..6f4aef470f
--- /dev/null
+++ b/iOSClient/Images.xcassets/file_txt_menu.imageset/Contents.json
@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "filename" : "fileText.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "fileTextDark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "fileText@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "fileTextDark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "fileText@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "fileTextDark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText.png
new file mode 100644
index 0000000000..2d13982ecd
Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText.png differ
diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@2x.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@2x.png
new file mode 100644
index 0000000000..be32ea9f60
Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@2x.png differ
diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@3x.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@3x.png
new file mode 100644
index 0000000000..73f455751b
Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@3x.png differ
diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark.png
new file mode 100644
index 0000000000..03c4b10325
Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark.png differ
diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@2x.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@2x.png
new file mode 100644
index 0000000000..3d25bf1702
Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@2x.png differ
diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@3x.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@3x.png
new file mode 100644
index 0000000000..32ac4b3355
Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@3x.png differ
diff --git a/iOSClient/Images.xcassets/file_xls.imageset/Contents.json b/iOSClient/Images.xcassets/file_xls.imageset/Contents.json
index 8c9182f8f7..72c7b90297 100644
--- a/iOSClient/Images.xcassets/file_xls.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/file_xls.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "file_xls.pdf"
+      "filename" : "file-calculation.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/file_xls.imageset/file-calculation.pdf b/iOSClient/Images.xcassets/file_xls.imageset/file-calculation.pdf
new file mode 100644
index 0000000000..1c9642dbab
Binary files /dev/null and b/iOSClient/Images.xcassets/file_xls.imageset/file-calculation.pdf differ
diff --git a/iOSClient/Images.xcassets/file_xls.imageset/file_xls.pdf b/iOSClient/Images.xcassets/file_xls.imageset/file_xls.pdf
deleted file mode 100644
index ec7222b8fc..0000000000
Binary files a/iOSClient/Images.xcassets/file_xls.imageset/file_xls.pdf and /dev/null differ
diff --git a/iOSClient/Images.xcassets/folder.imageset/folder.png b/iOSClient/Images.xcassets/folder.imageset/folder.png
new file mode 100644
index 0000000000..005b163e55
Binary files /dev/null and b/iOSClient/Images.xcassets/folder.imageset/folder.png differ
diff --git a/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folder-photo.pdf b/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folder-photo.pdf
new file mode 100644
index 0000000000..f646199438
Binary files /dev/null and b/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folder-photo.pdf differ
diff --git a/iOSClient/Images.xcassets/folderEncrypted.imageset/Contents.json b/iOSClient/Images.xcassets/folderEncrypted.imageset/Contents.json
index d5a0abaa2c..d3a66aded2 100644
--- a/iOSClient/Images.xcassets/folderEncrypted.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/folderEncrypted.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "folder_encrypted.svg",
+      "filename" : "folder-encrypted.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,7 +10,6 @@
     "version" : 1
   },
   "properties" : {
-    "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "preserves-vector-representation" : true
   }
 }
diff --git a/iOSClient/Images.xcassets/folderEncrypted.imageset/folder-encrypted.pdf b/iOSClient/Images.xcassets/folderEncrypted.imageset/folder-encrypted.pdf
new file mode 100644
index 0000000000..f2754a18a9
Binary files /dev/null and b/iOSClient/Images.xcassets/folderEncrypted.imageset/folder-encrypted.pdf differ
diff --git a/iOSClient/Images.xcassets/folder_external.imageset/folder-share.pdf b/iOSClient/Images.xcassets/folder_external.imageset/folder-share.pdf
new file mode 100644
index 0000000000..4a5832ff32
Binary files /dev/null and b/iOSClient/Images.xcassets/folder_external.imageset/folder-share.pdf differ
diff --git a/iOSClient/Images.xcassets/folder_group.imageset/folder-share.pdf b/iOSClient/Images.xcassets/folder_group.imageset/folder-share.pdf
new file mode 100644
index 0000000000..4a5832ff32
Binary files /dev/null and b/iOSClient/Images.xcassets/folder_group.imageset/folder-share.pdf differ
diff --git a/iOSClient/Images.xcassets/folder_nmcloud.imageset/Contents.json b/iOSClient/Images.xcassets/folder_nmcloud.imageset/Contents.json
new file mode 100644
index 0000000000..54635c2f38
--- /dev/null
+++ b/iOSClient/Images.xcassets/folder_nmcloud.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "folder_nmcloud.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/folder_nmcloud.imageset/folder_nmcloud.pdf b/iOSClient/Images.xcassets/folder_nmcloud.imageset/folder_nmcloud.pdf
new file mode 100644
index 0000000000..b828c52c05
Binary files /dev/null and b/iOSClient/Images.xcassets/folder_nmcloud.imageset/folder_nmcloud.pdf differ
diff --git a/iOSClient/Images.xcassets/folder_public.imageset/folder-share.pdf b/iOSClient/Images.xcassets/folder_public.imageset/folder-share.pdf
new file mode 100644
index 0000000000..4a5832ff32
Binary files /dev/null and b/iOSClient/Images.xcassets/folder_public.imageset/folder-share.pdf differ
diff --git a/iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder-share.pdf b/iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder-share.pdf
new file mode 100644
index 0000000000..4a5832ff32
Binary files /dev/null and b/iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder-share.pdf differ
diff --git a/iOSClient/Images.xcassets/go-to-page.imageset/Contents.json b/iOSClient/Images.xcassets/go-to-page.imageset/Contents.json
new file mode 100644
index 0000000000..684d965e60
--- /dev/null
+++ b/iOSClient/Images.xcassets/go-to-page.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "go-to-page.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/go-to-page.imageset/go-to-page.pdf b/iOSClient/Images.xcassets/go-to-page.imageset/go-to-page.pdf
new file mode 100644
index 0000000000..d9c8811dca
Binary files /dev/null and b/iOSClient/Images.xcassets/go-to-page.imageset/go-to-page.pdf differ
diff --git a/iOSClient/Images.xcassets/logoPng.imageset/Contents.json b/iOSClient/Images.xcassets/logoPng.imageset/Contents.json
new file mode 100644
index 0000000000..43967f1e4a
--- /dev/null
+++ b/iOSClient/Images.xcassets/logoPng.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "logoPng 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/logoPng.imageset/logoPng 1.png b/iOSClient/Images.xcassets/logoPng.imageset/logoPng 1.png
new file mode 100644
index 0000000000..a0402be0f4
Binary files /dev/null and b/iOSClient/Images.xcassets/logoPng.imageset/logoPng 1.png differ
diff --git a/iOSClient/Images.xcassets/media.imageset/tabBarMedia.pdf b/iOSClient/Images.xcassets/media.imageset/tabBarMedia.pdf
index 515ca27a10..57ab2633a8 100644
Binary files a/iOSClient/Images.xcassets/media.imageset/tabBarMedia.pdf and b/iOSClient/Images.xcassets/media.imageset/tabBarMedia.pdf differ
diff --git a/iOSClient/Images.xcassets/mediaSelected.imageset/Contents.json b/iOSClient/Images.xcassets/mediaSelected.imageset/Contents.json
new file mode 100644
index 0000000000..63e74b9485
--- /dev/null
+++ b/iOSClient/Images.xcassets/mediaSelected.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mediaSelected.pdf",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/mediaSelected.imageset/mediaSelected.pdf b/iOSClient/Images.xcassets/mediaSelected.imageset/mediaSelected.pdf
new file mode 100644
index 0000000000..f75f63eb82
Binary files /dev/null and b/iOSClient/Images.xcassets/mediaSelected.imageset/mediaSelected.pdf differ
diff --git a/iOSClient/Images.xcassets/microphoneMenu.imageset/Contents.json b/iOSClient/Images.xcassets/microphoneMenu.imageset/Contents.json
new file mode 100644
index 0000000000..36303602eb
--- /dev/null
+++ b/iOSClient/Images.xcassets/microphoneMenu.imageset/Contents.json
@@ -0,0 +1,52 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "microphoneMenu.pdf",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "default copy@500w.pdf",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/microphoneMenu.imageset/default copy@500w.pdf b/iOSClient/Images.xcassets/microphoneMenu.imageset/default copy@500w.pdf
new file mode 100644
index 0000000000..2be53f66ca
Binary files /dev/null and b/iOSClient/Images.xcassets/microphoneMenu.imageset/default copy@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/microphoneMenu.imageset/microphoneMenu.pdf b/iOSClient/Images.xcassets/microphoneMenu.imageset/microphoneMenu.pdf
new file mode 100644
index 0000000000..9bfed5ddc2
Binary files /dev/null and b/iOSClient/Images.xcassets/microphoneMenu.imageset/microphoneMenu.pdf differ
diff --git a/iOSClient/Images.xcassets/more.imageset/Contents.json b/iOSClient/Images.xcassets/more.imageset/Contents.json
index f4e3900169..0fead39b1f 100644
--- a/iOSClient/Images.xcassets/more.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/more.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "more.pdf",
+      "filename" : "default@500w.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/iOSClient/Images.xcassets/more.imageset/default@500w.pdf b/iOSClient/Images.xcassets/more.imageset/default@500w.pdf
new file mode 100644
index 0000000000..414e585364
Binary files /dev/null and b/iOSClient/Images.xcassets/more.imageset/default@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/more.imageset/more.pdf b/iOSClient/Images.xcassets/more.imageset/more.pdf
deleted file mode 100644
index 322d3c6594..0000000000
Binary files a/iOSClient/Images.xcassets/more.imageset/more.pdf and /dev/null differ
diff --git a/iOSClient/Images.xcassets/move.imageset/Contents.json b/iOSClient/Images.xcassets/move.imageset/Contents.json
new file mode 100644
index 0000000000..e31439f23a
--- /dev/null
+++ b/iOSClient/Images.xcassets/move.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "actionSheetMove.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "actionSheetMove@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "actionSheetMove@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/move.imageset/actionSheetMove.png b/iOSClient/Images.xcassets/move.imageset/actionSheetMove.png
new file mode 100644
index 0000000000..1bd5ec35e9
Binary files /dev/null and b/iOSClient/Images.xcassets/move.imageset/actionSheetMove.png differ
diff --git a/iOSClient/Images.xcassets/move.imageset/actionSheetMove@2x.png b/iOSClient/Images.xcassets/move.imageset/actionSheetMove@2x.png
new file mode 100644
index 0000000000..d25c3fd724
Binary files /dev/null and b/iOSClient/Images.xcassets/move.imageset/actionSheetMove@2x.png differ
diff --git a/iOSClient/Images.xcassets/move.imageset/actionSheetMove@3x.png b/iOSClient/Images.xcassets/move.imageset/actionSheetMove@3x.png
new file mode 100644
index 0000000000..afcc5b64fa
Binary files /dev/null and b/iOSClient/Images.xcassets/move.imageset/actionSheetMove@3x.png differ
diff --git a/iOSClient/Images.xcassets/nocamera.imageset/Contents.json b/iOSClient/Images.xcassets/nocamera.imageset/Contents.json
new file mode 100644
index 0000000000..78fb1072de
--- /dev/null
+++ b/iOSClient/Images.xcassets/nocamera.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "default@500w.pdf",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/nocamera.imageset/default@500w.pdf b/iOSClient/Images.xcassets/nocamera.imageset/default@500w.pdf
new file mode 100644
index 0000000000..429fd3fa2c
Binary files /dev/null and b/iOSClient/Images.xcassets/nocamera.imageset/default@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/notification.imageset/Contents.json b/iOSClient/Images.xcassets/notification.imageset/Contents.json
new file mode 100644
index 0000000000..da621b2a42
--- /dev/null
+++ b/iOSClient/Images.xcassets/notification.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "bell.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/notification.imageset/bell.pdf b/iOSClient/Images.xcassets/notification.imageset/bell.pdf
new file mode 100644
index 0000000000..a98f3182ab
Binary files /dev/null and b/iOSClient/Images.xcassets/notification.imageset/bell.pdf differ
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/Contents.json b/iOSClient/Images.xcassets/offlineFlag.imageset/Contents.json
index 1db27463e3..a66d8bacff 100644
--- a/iOSClient/Images.xcassets/offlineFlag.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/offlineFlag.imageset/Contents.json
@@ -1,17 +1,50 @@
 {
   "images" : [
     {
-      "filename" : "offlineFlag.png",
+      "filename" : "offlineFlagD.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "offlineFlag@2x.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "offlineFlag 1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "offlineFlagD@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "offlineFlag@2x 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "offlineFlag@3x.png",
+      "filename" : "offlineFlagD@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "offlineFlag@3x 1.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag 1.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag 1.png
new file mode 100644
index 0000000000..92508fbf3f
Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag 1.png differ
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag.png
deleted file mode 100644
index f0fd1fdd99..0000000000
Binary files a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@2x 1.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@2x 1.png
new file mode 100644
index 0000000000..3bc47bb8f2
Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@2x 1.png differ
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@2x.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@2x.png
deleted file mode 100644
index 4f2236baf6..0000000000
Binary files a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@2x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@3x 1.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@3x 1.png
new file mode 100644
index 0000000000..306d0499ec
Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@3x 1.png differ
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@3x.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@3x.png
deleted file mode 100644
index 12b1aee641..0000000000
Binary files a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@3x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD.png
new file mode 100644
index 0000000000..760a94c27f
Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD.png differ
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@2x.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@2x.png
new file mode 100644
index 0000000000..ea83af70d5
Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@2x.png differ
diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@3x.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@3x.png
new file mode 100644
index 0000000000..1adf1bebdd
Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@3x.png differ
diff --git a/iOSClient/Images.xcassets/offlineMenu.imageset/Contents.json b/iOSClient/Images.xcassets/offlineMenu.imageset/Contents.json
new file mode 100644
index 0000000000..8f3e754211
--- /dev/null
+++ b/iOSClient/Images.xcassets/offlineMenu.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "default@500w.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/offlineMenu.imageset/default@500w.pdf b/iOSClient/Images.xcassets/offlineMenu.imageset/default@500w.pdf
new file mode 100644
index 0000000000..8655164ae6
Binary files /dev/null and b/iOSClient/Images.xcassets/offlineMenu.imageset/default@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/open_file.imageset/Contents.json b/iOSClient/Images.xcassets/open_file.imageset/Contents.json
new file mode 100644
index 0000000000..1712417fdc
--- /dev/null
+++ b/iOSClient/Images.xcassets/open_file.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "openFile.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "openFile@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "openFile@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/open_file.imageset/openFile.png b/iOSClient/Images.xcassets/open_file.imageset/openFile.png
new file mode 100644
index 0000000000..0f76ce12bc
Binary files /dev/null and b/iOSClient/Images.xcassets/open_file.imageset/openFile.png differ
diff --git a/iOSClient/Images.xcassets/open_file.imageset/openFile@2x.png b/iOSClient/Images.xcassets/open_file.imageset/openFile@2x.png
new file mode 100644
index 0000000000..2f4e286f6f
Binary files /dev/null and b/iOSClient/Images.xcassets/open_file.imageset/openFile@2x.png differ
diff --git a/iOSClient/Images.xcassets/open_file.imageset/openFile@3x.png b/iOSClient/Images.xcassets/open_file.imageset/openFile@3x.png
new file mode 100644
index 0000000000..5a0f7be299
Binary files /dev/null and b/iOSClient/Images.xcassets/open_file.imageset/openFile@3x.png differ
diff --git a/iOSClient/Images.xcassets/recent.imageset/Contents.json b/iOSClient/Images.xcassets/recent.imageset/Contents.json
new file mode 100644
index 0000000000..59b0186b06
--- /dev/null
+++ b/iOSClient/Images.xcassets/recent.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "recent.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/recent.imageset/recent.pdf b/iOSClient/Images.xcassets/recent.imageset/recent.pdf
new file mode 100644
index 0000000000..496833c975
Binary files /dev/null and b/iOSClient/Images.xcassets/recent.imageset/recent.pdf differ
diff --git a/iOSClient/Images.xcassets/rename.imageset/Contents.json b/iOSClient/Images.xcassets/rename.imageset/Contents.json
new file mode 100644
index 0000000000..f361ec03e2
--- /dev/null
+++ b/iOSClient/Images.xcassets/rename.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "actionSheetRename.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "actionSheetRename@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "actionSheetRename@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/rename.imageset/actionSheetRename.png b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename.png
new file mode 100644
index 0000000000..ff3bf49a82
Binary files /dev/null and b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename.png differ
diff --git a/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@2x.png b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@2x.png
new file mode 100644
index 0000000000..46415573f0
Binary files /dev/null and b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@2x.png differ
diff --git a/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@3x.png b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@3x.png
new file mode 100644
index 0000000000..27f7dff1cf
Binary files /dev/null and b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@3x.png differ
diff --git a/iOSClient/Images.xcassets/save_files.imageset/Contents.json b/iOSClient/Images.xcassets/save_files.imageset/Contents.json
new file mode 100644
index 0000000000..5d67bf067b
--- /dev/null
+++ b/iOSClient/Images.xcassets/save_files.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "saveSelectedFiles.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "saveSelectedFiles@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "saveSelectedFiles@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles.png b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles.png
new file mode 100644
index 0000000000..590c922f4e
Binary files /dev/null and b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles.png differ
diff --git a/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@2x.png b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@2x.png
new file mode 100644
index 0000000000..589eeb56c2
Binary files /dev/null and b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@2x.png differ
diff --git a/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@3x.png b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@3x.png
new file mode 100644
index 0000000000..4d1f750642
Binary files /dev/null and b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@3x.png differ
diff --git a/iOSClient/Images.xcassets/scan.imageset/Contents.json b/iOSClient/Images.xcassets/scan.imageset/Contents.json
new file mode 100644
index 0000000000..8776a75678
--- /dev/null
+++ b/iOSClient/Images.xcassets/scan.imageset/Contents.json
@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "default@500w.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "default copy@500w.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/scan.imageset/default copy@500w.pdf b/iOSClient/Images.xcassets/scan.imageset/default copy@500w.pdf
new file mode 100644
index 0000000000..9731102ea6
Binary files /dev/null and b/iOSClient/Images.xcassets/scan.imageset/default copy@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/scan.imageset/default@500w.pdf b/iOSClient/Images.xcassets/scan.imageset/default@500w.pdf
new file mode 100644
index 0000000000..118d570d99
Binary files /dev/null and b/iOSClient/Images.xcassets/scan.imageset/default@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/search.imageset/Contents.json b/iOSClient/Images.xcassets/search.imageset/Contents.json
index 860d5f83b6..8a79382902 100644
--- a/iOSClient/Images.xcassets/search.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/search.imageset/Contents.json
@@ -1,15 +1,25 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "search.pdf"
+      "filename" : "search.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "searchDark.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
-    "preserves-vector-representation" : true
+    "template-rendering-intent" : "original"
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/search.imageset/search.pdf b/iOSClient/Images.xcassets/search.imageset/search.pdf
index cf4b343bee..b96af4459e 100644
Binary files a/iOSClient/Images.xcassets/search.imageset/search.pdf and b/iOSClient/Images.xcassets/search.imageset/search.pdf differ
diff --git a/iOSClient/Images.xcassets/search.imageset/searchDark.pdf b/iOSClient/Images.xcassets/search.imageset/searchDark.pdf
new file mode 100644
index 0000000000..313042ee07
Binary files /dev/null and b/iOSClient/Images.xcassets/search.imageset/searchDark.pdf differ
diff --git a/iOSClient/Images.xcassets/selectFull.imageset/Contents.json b/iOSClient/Images.xcassets/selectFull.imageset/Contents.json
new file mode 100644
index 0000000000..0fead39b1f
--- /dev/null
+++ b/iOSClient/Images.xcassets/selectFull.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "default@500w.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/selectFull.imageset/default@500w.pdf b/iOSClient/Images.xcassets/selectFull.imageset/default@500w.pdf
new file mode 100644
index 0000000000..45d5146a5e
Binary files /dev/null and b/iOSClient/Images.xcassets/selectFull.imageset/default@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/settings.imageset/Contents.json b/iOSClient/Images.xcassets/settings.imageset/Contents.json
new file mode 100644
index 0000000000..8dfa77c79d
--- /dev/null
+++ b/iOSClient/Images.xcassets/settings.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "gear.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/settings.imageset/gear.pdf b/iOSClient/Images.xcassets/settings.imageset/gear.pdf
new file mode 100644
index 0000000000..bc8c694124
Binary files /dev/null and b/iOSClient/Images.xcassets/settings.imageset/gear.pdf differ
diff --git a/iOSClient/Images.xcassets/share.imageset/share.pdf b/iOSClient/Images.xcassets/share.imageset/share.pdf
index 037bb6d632..a1a4c9c1a2 100644
Binary files a/iOSClient/Images.xcassets/share.imageset/share.pdf and b/iOSClient/Images.xcassets/share.imageset/share.pdf differ
diff --git a/iOSClient/Images.xcassets/shareFill.imageset/share.pdf b/iOSClient/Images.xcassets/shareFill.imageset/share.pdf
index 8d7d8346e7..a1a4c9c1a2 100644
Binary files a/iOSClient/Images.xcassets/shareFill.imageset/share.pdf and b/iOSClient/Images.xcassets/shareFill.imageset/share.pdf differ
diff --git a/iOSClient/Images.xcassets/shareTypeEmail.imageset/Contents.json b/iOSClient/Images.xcassets/shareTypeEmail.imageset/Contents.json
index 00298ac4b4..ffff08a617 100644
--- a/iOSClient/Images.xcassets/shareTypeEmail.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/shareTypeEmail.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "shareTypeEmail.pdf"
+      "filename" : "user.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/shareTypeEmail.imageset/shareTypeEmail.pdf b/iOSClient/Images.xcassets/shareTypeEmail.imageset/shareTypeEmail.pdf
deleted file mode 100644
index 48b0f832f5..0000000000
Binary files a/iOSClient/Images.xcassets/shareTypeEmail.imageset/shareTypeEmail.pdf and /dev/null differ
diff --git a/iOSClient/Images.xcassets/shareTypeEmail.imageset/user.pdf b/iOSClient/Images.xcassets/shareTypeEmail.imageset/user.pdf
new file mode 100644
index 0000000000..6985e202b0
Binary files /dev/null and b/iOSClient/Images.xcassets/shareTypeEmail.imageset/user.pdf differ
diff --git a/iOSClient/Images.xcassets/shareTypeUser.imageset/Contents.json b/iOSClient/Images.xcassets/shareTypeUser.imageset/Contents.json
index 874a5b2007..11ca2fc9dd 100644
--- a/iOSClient/Images.xcassets/shareTypeUser.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/shareTypeUser.imageset/Contents.json
@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "shareTypeUser.pdf"
+      "filename" : "shareTypeUser.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
\ No newline at end of file
+}
diff --git a/iOSClient/Images.xcassets/shareTypeUser.imageset/shareTypeUser.pdf b/iOSClient/Images.xcassets/shareTypeUser.imageset/shareTypeUser.pdf
index 03d855dcc4..62d278bb89 100644
Binary files a/iOSClient/Images.xcassets/shareTypeUser.imageset/shareTypeUser.pdf and b/iOSClient/Images.xcassets/shareTypeUser.imageset/shareTypeUser.pdf differ
diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/Contents.json b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/Contents.json
index f7f765b8ec..16f652eaab 100644
--- a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "sortDateLessRecent.png",
+      "filename" : "sortDateLess.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "sortDateLessRecent@2x.png",
+      "filename" : "sortDateLess@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "sortDateLessRecent@3x.png",
+      "filename" : "sortDateLess@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess.png b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess.png
new file mode 100644
index 0000000000..7679833bfe
Binary files /dev/null and b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess.png differ
diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@2x.png b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@2x.png
new file mode 100644
index 0000000000..3c31183268
Binary files /dev/null and b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@2x.png differ
diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@3x.png b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@3x.png
new file mode 100644
index 0000000000..d607e5c1a4
Binary files /dev/null and b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@3x.png differ
diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLessRecent.png b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLessRecent.png
deleted file mode 100644
index 0cfcc22aaa..0000000000
Binary files a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLessRecent.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLessRecent@2x.png b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLessRecent@2x.png
deleted file mode 100644
index fa7a1b3066..0000000000
Binary files a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLessRecent@2x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLessRecent@3x.png b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLessRecent@3x.png
deleted file mode 100644
index 114b84422a..0000000000
Binary files a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLessRecent@3x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess.png b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess.png
index 8ab41141fc..7679833bfe 100644
Binary files a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess.png and b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess.png differ
diff --git a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@2x.png b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@2x.png
index 6159e5e7b8..3c31183268 100644
Binary files a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@2x.png and b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@2x.png differ
diff --git a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@3x.png b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@3x.png
index b3312e3dbf..d607e5c1a4 100644
Binary files a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@3x.png and b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@3x.png differ
diff --git a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ.png b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ.png
index 5e22268850..41c8ae8e25 100644
Binary files a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ.png and b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ.png differ
diff --git a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@2x.png b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@2x.png
index 30f013aac8..0532a1bf38 100644
Binary files a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@2x.png and b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@2x.png differ
diff --git a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@3x.png b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@3x.png
index df08fb5823..5cb93d7c25 100644
Binary files a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@3x.png and b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@3x.png differ
diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/Contents.json b/iOSClient/Images.xcassets/sortFileNameZA.imageset/Contents.json
index bd7d648b08..33faa99868 100644
--- a/iOSClient/Images.xcassets/sortFileNameZA.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/sortFileNameZA.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "sortFileNameZA.png",
+      "filename" : "sortFileNameAZ.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "sortFileNameZA@2x.png",
+      "filename" : "sortFileNameAZ@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "sortFileNameZA@3x.png",
+      "filename" : "sortFileNameAZ@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -19,8 +19,5 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
   }
 }
diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ.png b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ.png
new file mode 100644
index 0000000000..41c8ae8e25
Binary files /dev/null and b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ.png differ
diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@2x.png b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@2x.png
new file mode 100644
index 0000000000..0532a1bf38
Binary files /dev/null and b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@2x.png differ
diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@3x.png b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@3x.png
new file mode 100644
index 0000000000..5cb93d7c25
Binary files /dev/null and b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@3x.png differ
diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameZA.png b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameZA.png
deleted file mode 100644
index e1824bb123..0000000000
Binary files a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameZA.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameZA@2x.png b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameZA@2x.png
deleted file mode 100644
index f12f246d88..0000000000
Binary files a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameZA@2x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameZA@3x.png b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameZA@3x.png
deleted file mode 100644
index d6fdf0031f..0000000000
Binary files a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameZA@3x.png and /dev/null differ
diff --git a/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest.png b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest.png
index f1bc9f749f..47a510c37b 100644
Binary files a/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest.png and b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest.png differ
diff --git a/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@2x.png b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@2x.png
index 261ec9c26c..e77c5e3960 100644
Binary files a/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@2x.png and b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@2x.png differ
diff --git a/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@3x.png b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@3x.png
index c48a7077d1..8938830b7e 100644
Binary files a/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@3x.png and b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@3x.png differ
diff --git a/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest.png b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest.png
index cee841c113..24dda815e8 100644
Binary files a/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest.png and b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest.png differ
diff --git a/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@2x.png b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@2x.png
index c37faf3d0c..2977b318dd 100644
Binary files a/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@2x.png and b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@2x.png differ
diff --git a/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@3x.png b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@3x.png
index ff8333664a..834e834132 100644
Binary files a/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@3x.png and b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@3x.png differ
diff --git a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Contents.json b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Contents.json
index 30b4db5316..052394eece 100644
--- a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Contents.json
@@ -1,8 +1,19 @@
 {
   "images" : [
     {
-      "filename" : "Unknown-1.svg",
-      "idiom" : "universal"
+      "filename" : "saveSelectedFiles.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "saveSelectedFiles@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "saveSelectedFiles@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Unknown-1.svg b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Unknown-1.svg
deleted file mode 100644
index 5764f2fa6c..0000000000
--- a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Unknown-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M6 1h4v7h5l-7 7-7-7h5z" fill="#000"/></svg>
diff --git a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles.png b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles.png
new file mode 100644
index 0000000000..590c922f4e
Binary files /dev/null and b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles.png differ
diff --git a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@2x.png b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@2x.png
new file mode 100644
index 0000000000..589eeb56c2
Binary files /dev/null and b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@2x.png differ
diff --git a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@3x.png b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@3x.png
new file mode 100644
index 0000000000..4d1f750642
Binary files /dev/null and b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@3x.png differ
diff --git a/iOSClient/Images.xcassets/success.imageset/Contents.json b/iOSClient/Images.xcassets/success.imageset/Contents.json
new file mode 100644
index 0000000000..858785f7a8
--- /dev/null
+++ b/iOSClient/Images.xcassets/success.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "success.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "success@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "success@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/success.imageset/success.png b/iOSClient/Images.xcassets/success.imageset/success.png
new file mode 100644
index 0000000000..b1d2459a4b
Binary files /dev/null and b/iOSClient/Images.xcassets/success.imageset/success.png differ
diff --git a/iOSClient/Images.xcassets/success.imageset/success@2x.png b/iOSClient/Images.xcassets/success.imageset/success@2x.png
new file mode 100644
index 0000000000..9832eda028
Binary files /dev/null and b/iOSClient/Images.xcassets/success.imageset/success@2x.png differ
diff --git a/iOSClient/Images.xcassets/success.imageset/success@3x.png b/iOSClient/Images.xcassets/success.imageset/success@3x.png
new file mode 100644
index 0000000000..d89d2e4719
Binary files /dev/null and b/iOSClient/Images.xcassets/success.imageset/success@3x.png differ
diff --git a/iOSClient/Images.xcassets/switchGrid.imageset/Contents.json b/iOSClient/Images.xcassets/switchGrid.imageset/Contents.json
new file mode 100644
index 0000000000..b1304ea08b
--- /dev/null
+++ b/iOSClient/Images.xcassets/switchGrid.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "switchGrid.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "switchGrid@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "switchGrid@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid.png b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid.png
new file mode 100644
index 0000000000..ed000d793f
Binary files /dev/null and b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid.png differ
diff --git a/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@2x.png b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@2x.png
new file mode 100644
index 0000000000..860729706b
Binary files /dev/null and b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@2x.png differ
diff --git a/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@3x.png b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@3x.png
new file mode 100644
index 0000000000..582b458a0a
Binary files /dev/null and b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@3x.png differ
diff --git a/iOSClient/Images.xcassets/switchList.imageset/Contents.json b/iOSClient/Images.xcassets/switchList.imageset/Contents.json
new file mode 100644
index 0000000000..d0a70e20e3
--- /dev/null
+++ b/iOSClient/Images.xcassets/switchList.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "switchList.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "switchList@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "switchList@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/switchList.imageset/switchList.png b/iOSClient/Images.xcassets/switchList.imageset/switchList.png
new file mode 100644
index 0000000000..e68e96d87e
Binary files /dev/null and b/iOSClient/Images.xcassets/switchList.imageset/switchList.png differ
diff --git a/iOSClient/Images.xcassets/switchList.imageset/switchList@2x.png b/iOSClient/Images.xcassets/switchList.imageset/switchList@2x.png
new file mode 100644
index 0000000000..1f387ae4e9
Binary files /dev/null and b/iOSClient/Images.xcassets/switchList.imageset/switchList@2x.png differ
diff --git a/iOSClient/Images.xcassets/switchList.imageset/switchList@3x.png b/iOSClient/Images.xcassets/switchList.imageset/switchList@3x.png
new file mode 100644
index 0000000000..5671a05ded
Binary files /dev/null and b/iOSClient/Images.xcassets/switchList.imageset/switchList@3x.png differ
diff --git a/iOSClient/Images.xcassets/trash.imageset/Contents.json b/iOSClient/Images.xcassets/trash.imageset/Contents.json
index e98514534c..0fead39b1f 100644
--- a/iOSClient/Images.xcassets/trash.imageset/Contents.json
+++ b/iOSClient/Images.xcassets/trash.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "trash.pdf",
+      "filename" : "default@500w.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/iOSClient/Images.xcassets/trash.imageset/default@500w.pdf b/iOSClient/Images.xcassets/trash.imageset/default@500w.pdf
new file mode 100644
index 0000000000..225c983dec
Binary files /dev/null and b/iOSClient/Images.xcassets/trash.imageset/default@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/trash.imageset/trash.pdf b/iOSClient/Images.xcassets/trash.imageset/trash.pdf
deleted file mode 100644
index 9233b74c6f..0000000000
Binary files a/iOSClient/Images.xcassets/trash.imageset/trash.pdf and /dev/null differ
diff --git a/iOSClient/Images.xcassets/uploadFile.imageset/Contents.json b/iOSClient/Images.xcassets/uploadFile.imageset/Contents.json
new file mode 100644
index 0000000000..5866e33b62
--- /dev/null
+++ b/iOSClient/Images.xcassets/uploadFile.imageset/Contents.json
@@ -0,0 +1,52 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "default@500w.pdf",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "default copy@500w.pdf",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/uploadFile.imageset/default copy@500w.pdf b/iOSClient/Images.xcassets/uploadFile.imageset/default copy@500w.pdf
new file mode 100644
index 0000000000..568fb350d6
Binary files /dev/null and b/iOSClient/Images.xcassets/uploadFile.imageset/default copy@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/uploadFile.imageset/default@500w.pdf b/iOSClient/Images.xcassets/uploadFile.imageset/default@500w.pdf
new file mode 100644
index 0000000000..49bbe6f285
Binary files /dev/null and b/iOSClient/Images.xcassets/uploadFile.imageset/default@500w.pdf differ
diff --git a/iOSClient/Images.xcassets/user_settings.imageset/Contents.json b/iOSClient/Images.xcassets/user_settings.imageset/Contents.json
new file mode 100644
index 0000000000..7e6128a816
--- /dev/null
+++ b/iOSClient/Images.xcassets/user_settings.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "default@1,5x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "default@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "default@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/user_settings.imageset/default@1,5x.png b/iOSClient/Images.xcassets/user_settings.imageset/default@1,5x.png
new file mode 100644
index 0000000000..a556ff9868
Binary files /dev/null and b/iOSClient/Images.xcassets/user_settings.imageset/default@1,5x.png differ
diff --git a/iOSClient/Images.xcassets/user_settings.imageset/default@2x.png b/iOSClient/Images.xcassets/user_settings.imageset/default@2x.png
new file mode 100644
index 0000000000..c812343a8c
Binary files /dev/null and b/iOSClient/Images.xcassets/user_settings.imageset/default@2x.png differ
diff --git a/iOSClient/Images.xcassets/user_settings.imageset/default@3x.png b/iOSClient/Images.xcassets/user_settings.imageset/default@3x.png
new file mode 100644
index 0000000000..eed7389198
Binary files /dev/null and b/iOSClient/Images.xcassets/user_settings.imageset/default@3x.png differ
diff --git a/iOSClient/Images.xcassets/videono.imageset/Contents.json b/iOSClient/Images.xcassets/videono.imageset/Contents.json
new file mode 100644
index 0000000000..5c7961ea2a
--- /dev/null
+++ b/iOSClient/Images.xcassets/videono.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "deviceNocamera.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/videono.imageset/deviceNocamera.pdf b/iOSClient/Images.xcassets/videono.imageset/deviceNocamera.pdf
new file mode 100644
index 0000000000..09ff9e66eb
Binary files /dev/null and b/iOSClient/Images.xcassets/videono.imageset/deviceNocamera.pdf differ
diff --git a/iOSClient/Images.xcassets/videoyes.imageset/Contents.json b/iOSClient/Images.xcassets/videoyes.imageset/Contents.json
new file mode 100644
index 0000000000..bfc956fce2
--- /dev/null
+++ b/iOSClient/Images.xcassets/videoyes.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "deviceCamera.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/iOSClient/Images.xcassets/videoyes.imageset/deviceCamera.pdf b/iOSClient/Images.xcassets/videoyes.imageset/deviceCamera.pdf
new file mode 100644
index 0000000000..807d6a30a8
Binary files /dev/null and b/iOSClient/Images.xcassets/videoyes.imageset/deviceCamera.pdf differ
diff --git a/iOSClient/Images.xcassets/viewInFolder.imageset/Contents.json b/iOSClient/Images.xcassets/viewInFolder.imageset/Contents.json
new file mode 100644
index 0000000000..2ea287530d
--- /dev/null
+++ b/iOSClient/Images.xcassets/viewInFolder.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "viewInFolder-1.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "viewInFolderDark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolder-1.pdf b/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolder-1.pdf
new file mode 100644
index 0000000000..bb8489ccd9
Binary files /dev/null and b/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolder-1.pdf differ
diff --git a/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolderDark.pdf b/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolderDark.pdf
new file mode 100644
index 0000000000..1f59694303
Binary files /dev/null and b/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolderDark.pdf differ
diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift
index 0742d95c31..d861ae1bfb 100644
--- a/iOSClient/NCGlobal.swift
+++ b/iOSClient/NCGlobal.swift
@@ -171,6 +171,7 @@ class NCGlobal: NSObject {
     let layoutViewShares                            = "LayoutShares"
     let layoutViewShareExtension                    = "LayoutShareExtension"
     let layoutViewGroupfolders                      = "LayoutGroupfolders"
+    let layoutViewMove                              = "LayoutMove"
 
     // Button Type in Cell list/grid
     //
@@ -352,6 +353,7 @@ class NCGlobal: NSObject {
     @objc let notificationCenterApplicationWillResignActive     = "applicationWillResignActive"
     @objc let notificationCenterApplicationWillEnterForeground  = "applicationWillEnterForeground"
 
+    @objc let notificationCenterInitialize                      = "initialize"
     @objc let notificationCenterChangeUser                      = "changeUser"
     @objc let notificationCenterChangeTheming                   = "changeTheming"
     let notificationCenterRichdocumentGrabFocus                 = "richdocumentGrabFocus"
diff --git a/iOSClient/NCImageCache.swift b/iOSClient/NCImageCache.swift
index 117a15a936..abce44920c 100644
--- a/iOSClient/NCImageCache.swift
+++ b/iOSClient/NCImageCache.swift
@@ -208,6 +208,7 @@ import RealmSwift
         static var shared = UIImage()
         static var canShare = UIImage()
         static var shareByLink = UIImage()
+        static var sharedWithMe = UIImage()
 
         static var favorite = UIImage()
         static var comment = UIImage()
@@ -251,15 +252,16 @@ import RealmSwift
         images.shared = UIImage(named: "share")!.image(color: .systemGray, size: 50)
         images.canShare = UIImage(named: "share")!.image(color: .systemGray, size: 50)
         images.shareByLink = UIImage(named: "sharebylink")!.image(color: .systemGray, size: 50)
-
+        images.sharedWithMe = UIImage.init(named: "cloudUpload")!.image(color: NCBrandColor.shared.nmcIconSharedWithMe, size: 50)
+        
         images.favorite = utility.loadImage(named: "star.fill", color: yellowFavorite)
         images.comment = UIImage(named: "comment")!.image(color: .systemGray, size: 50)
         images.livePhoto = utility.loadImage(named: "livephoto", color: .label)
         images.offlineFlag = UIImage(named: "offlineFlag")!
         images.local = UIImage(named: "local")!
 
-        images.checkedYes = utility.loadImage(named: "checkmark.circle.fill", color: .systemBlue)
-        images.checkedNo = utility.loadImage(named: "circle", color: .systemGray)
+        images.checkedYes = UIImage(named: "checkedYes")!
+        images.checkedNo = utility.loadImage(named: "circle")
 
         images.buttonMore = UIImage(named: "more")!.image(color: .systemGray, size: 50)
         images.buttonStop = UIImage(named: "stop")!.image(color: .systemGray, size: 50)
@@ -277,13 +279,13 @@ import RealmSwift
         self.brandElementColor = brandElement
 
         let folderWidth: CGFloat = UIScreen.main.bounds.width / 3
-        images.folderEncrypted = UIImage(named: "folderEncrypted")!.image(color: brandElement, size: folderWidth)
-        images.folderSharedWithMe = UIImage(named: "folder_shared_with_me")!.image(color: brandElement, size: folderWidth)
-        images.folderPublic = UIImage(named: "folder_public")!.image(color: brandElement, size: folderWidth)
-        images.folderGroup = UIImage(named: "folder_group")!.image(color: brandElement, size: folderWidth)
-        images.folderExternal = UIImage(named: "folder_external")!.image(color: brandElement, size: folderWidth)
-        images.folderAutomaticUpload = UIImage(named: "folderAutomaticUpload")!.image(color: brandElement, size: folderWidth)
-        images.folder = UIImage(named: "folder")!.image(color: brandElement, size: folderWidth)
+        images.folderEncrypted = UIImage(named: "folderEncrypted")!
+        images.folderSharedWithMe = UIImage(named: "folder_shared_with_me")!
+        images.folderPublic = UIImage(named: "folder_public")!
+        images.folderGroup = UIImage(named: "folder_group")!
+        images.folderExternal = UIImage(named: "folder_external")!
+        images.folderAutomaticUpload = UIImage(named: "folderAutomaticUpload")!
+        images.folder = UIImage(named: "folder")!
 
         images.iconContacts = UIImage(named: "icon-contacts")!.image(color: brandElement, size: folderWidth)
         images.iconTalk = UIImage(named: "icon-talk")!.image(color: brandElement, size: folderWidth)