diff --git a/app/src/androidTest/java/com/owncloud/android/datamodel/OCFileIconTests.kt b/app/src/androidTest/java/com/owncloud/android/datamodel/OCFileIconTests.kt
index 45e2e2ef93fb..b0a99a418a61 100644
--- a/app/src/androidTest/java/com/owncloud/android/datamodel/OCFileIconTests.kt
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/OCFileIconTests.kt
@@ -40,7 +40,7 @@ class OCFileIconTests {
     @Test
     fun testGetFileOverlayIconWhenFileIsAutoUploadFolderShouldReturnFolderOverlayUploadIcon() {
         val fileOverlayIcon = sut?.getFileOverlayIconId(true)
-        val expectedDrawable = R.drawable.ic_folder_overlay_upload
+        val expectedDrawable = R.drawable.folder_auto_upload
         assert(fileOverlayIcon == expectedDrawable)
     }
 
@@ -48,7 +48,7 @@ class OCFileIconTests {
     fun testGetFileOverlayIconWhenFileIsEncryptedShouldReturnFolderOverlayKeyIcon() {
         sut?.isEncrypted = true
         val fileOverlayIcon = sut?.getFileOverlayIconId(false)
-        val expectedDrawable = R.drawable.ic_folder_overlay_key
+        val expectedDrawable = R.drawable.folder_encrypted
         assert(fileOverlayIcon == expectedDrawable)
     }
 
@@ -56,7 +56,7 @@ class OCFileIconTests {
     fun testGetFileOverlayIconWhenFileIsGroupFolderShouldReturnFolderOverlayAccountGroupIcon() {
         sut?.mountType = MountType.GROUP
         val fileOverlayIcon = sut?.getFileOverlayIconId(false)
-        val expectedDrawable = R.drawable.ic_folder_overlay_account_group
+        val expectedDrawable = R.drawable.folder_shared_users
         assert(fileOverlayIcon == expectedDrawable)
     }
 
@@ -64,7 +64,7 @@ class OCFileIconTests {
     fun testGetFileOverlayIconWhenFileIsSharedViaLinkShouldReturnFolderOverlayLinkIcon() {
         sut?.isSharedViaLink = true
         val fileOverlayIcon = sut?.getFileOverlayIconId(false)
-        val expectedDrawable = R.drawable.ic_folder_overlay_link
+        val expectedDrawable = R.drawable.folder_shared_users
         assert(fileOverlayIcon == expectedDrawable)
     }
 
@@ -72,7 +72,7 @@ class OCFileIconTests {
     fun testGetFileOverlayIconWhenFileIsSharedShouldReturnFolderOverlayShareIcon() {
         sut?.isSharedWithSharee = true
         val fileOverlayIcon = sut?.getFileOverlayIconId(false)
-        val expectedDrawable = R.drawable.ic_folder_overlay_share
+        val expectedDrawable = R.drawable.folder_shared_users
         assert(fileOverlayIcon == expectedDrawable)
     }
 
@@ -80,7 +80,7 @@ class OCFileIconTests {
     fun testGetFileOverlayIconWhenFileIsExternalShouldReturnFolderOverlayExternalIcon() {
         sut?.mountType = MountType.EXTERNAL
         val fileOverlayIcon = sut?.getFileOverlayIconId(false)
-        val expectedDrawable = R.drawable.ic_folder_overlay_external
+        val expectedDrawable = R.drawable.folder
         assert(fileOverlayIcon == expectedDrawable)
     }
 
@@ -88,14 +88,15 @@ class OCFileIconTests {
     fun testGetFileOverlayIconWhenFileIsLockedShouldReturnFolderOverlayLockIcon() {
         sut?.isLocked = true
         val fileOverlayIcon = sut?.getFileOverlayIconId(false)
-        val expectedDrawable = R.drawable.ic_folder_overlay_lock
+        val expectedDrawable = R.drawable.folder_encrypted
         assert(fileOverlayIcon == expectedDrawable)
     }
 
     @Test
     fun testGetFileOverlayIconWhenFileIsFolderShouldReturnNull() {
         val fileOverlayIcon = sut?.getFileOverlayIconId(false)
-        assert(fileOverlayIcon == null)
+        val expectedDrawable = R.drawable.folder
+        assert(fileOverlayIcon == expectedDrawable)
     }
 
     @After
diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
index 408245678289..9cacd5ad36df 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
+++ b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
@@ -675,23 +675,25 @@ public boolean isGroupFolder() {
         return permissions != null && permissions.contains(PERMISSION_GROUPFOLDER);
     }
 
+    // NMC Customization: We are not using any overlay icons for normal folders
+    // we have different folder icons with inbuilt overlay
     public Integer getFileOverlayIconId(boolean isAutoUploadFolder) {
         if (WebdavEntry.MountType.GROUP == mountType || isGroupFolder()) {
-            return R.drawable.ic_folder_overlay_account_group;
+            return R.drawable.folder_shared_users;
         } else if (sharedViaLink && !encrypted) {
-            return R.drawable.ic_folder_overlay_link;
+            return R.drawable.folder_shared_users;
         } else if (isSharedWithMe() || sharedWithSharee) {
-            return R.drawable.ic_folder_overlay_share;
+            return R.drawable.folder_shared_users;
         } else if (encrypted) {
-            return R.drawable.ic_folder_overlay_key;
+            return R.drawable.folder_encrypted;
         } else if (WebdavEntry.MountType.EXTERNAL == mountType) {
-            return R.drawable.ic_folder_overlay_external;
+            return R.drawable.folder;
         } else if (locked) {
-            return R.drawable.ic_folder_overlay_lock;
+            return R.drawable.folder_encrypted;
         } else if (isAutoUploadFolder) {
-            return R.drawable.ic_folder_overlay_upload;
+            return R.drawable.folder_auto_upload;
         } else {
-            return null;
+            return R.drawable.folder;
         }
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/GroupfolderListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/GroupfolderListAdapter.kt
index 3848f3aac6c8..5d670f3737b4 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/GroupfolderListAdapter.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/GroupfolderListAdapter.kt
@@ -23,16 +23,16 @@
 package com.owncloud.android.ui.adapter
 
 import android.content.Context
-import android.graphics.drawable.LayerDrawable
+import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.nextcloud.android.lib.resources.groupfolders.Groupfolder
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ListItemBinding
 import com.owncloud.android.ui.interfaces.GroupfolderListInterface
-import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import java.io.File
 
@@ -48,9 +48,10 @@ class GroupfolderListAdapter(
         list = result.values.sortedBy { it.mountPoint }
     }
 
-    private fun getFolderIcon(): LayerDrawable? {
-        val overlayDrawableId = R.drawable.ic_folder_overlay_account_group
-        return MimeTypeUtil.getFileIcon(false, overlayDrawableId, context, viewThemeUtils)
+    private fun getFolderIcon(): Drawable? {
+        val overlayDrawableId = R.drawable.folder_shared_users
+        // NMC Customization: No overlay icon will be used. Directly using folder icons
+        return ContextCompat.getDrawable(context, overlayDrawableId)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
diff --git a/app/src/main/res/drawable-night/favorite.xml b/app/src/main/res/drawable-night/favorite.xml
index 2f3ffc870ef6..a8aca85ee4db 100644
--- a/app/src/main/res/drawable-night/favorite.xml
+++ b/app/src/main/res/drawable-night/favorite.xml
@@ -6,7 +6,7 @@
         android:viewportHeight="16">
 
     <path
-        android:fillColor="#ffcc00"
+        android:fillColor="#FFD329"
         android:strokeColor="#121212"
         android:strokeWidth="0.46367699"
         android:pathData="M 7.9999993,1.0934068 10.040178,6.0083827 15.418832,6.4256921 11.245738,9.9032694 12.636769,15.003716 7.9999993,12.128919 3.3632295,15.003716 4.7542604,9.9032694 0.5811676,6.4256921 5.9598206,6.0083827 Z"/>
diff --git a/app/src/main/res/drawable-night/ic_checkbox_marked.xml b/app/src/main/res/drawable-night/ic_checkbox_marked.xml
new file mode 100644
index 000000000000..f188d0b98d9f
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_checkbox_marked.xml
@@ -0,0 +1,34 @@
+<!--
+    @author Google LLC
+    Copyright (C) 2018 Google LLC
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+        android:strokeWidth="1"
+        android:fillColor="#191919"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M12,1C18.0751,1 23,5.9249 23,12C23,18.0751 18.0751,23 12,23C5.9249,23 1,18.0751 1,12C1,5.9249 5.9249,1 12,1ZM18.6661,8.279C18.3761,7.955 17.8791,7.927 17.5551,8.217L17.5551,8.217L9.9971,15.773L6.5081,12.285C6.2031,11.99 5.7191,11.991 5.4141,12.286C5.1021,12.589 5.0941,13.087 5.3971,13.399L5.3971,13.399L9.9971,18L18.6661,9.328C18.9331,9.029 18.9331,8.578 18.6661,8.279Z"
+        android:strokeWidth="1"
+        android:fillColor="#73C354"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_email.xml b/app/src/main/res/drawable-night/ic_email.xml
new file mode 100644
index 000000000000..150395c4ad9c
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_email.xml
@@ -0,0 +1,28 @@
+<!--
+    @author Google LLC
+    Copyright (C) 2018 Google LLC
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M0.5,3.5L0.5,17.5C0.5,19.15 1.85,20.5 3.5,20.5L20.5,20.5C22.15,20.5 23.5,19.15 23.5,17.5L23.5,3.5L0.5,3.5ZM22,5L22,5.95L13.55,13.2C12.65,13.95 11.35,13.95 10.45,13.2L2,5.95L2,5L22,5ZM20.5,19L3.5,19C2.65,19 2,18.35 2,17.5L2,7.95L9.45,14.35C10.2,15 11.1,15.3 12,15.3C12.9,15.3 13.8,15 14.55,14.35L22,7.95L22,17.5C22,18.35 21.35,19 20.5,19Z"
+        android:strokeWidth="1"
+        android:fillColor="#E3E3E3"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/shared_via_link.xml b/app/src/main/res/drawable-night/shared_via_link.xml
index 7414129bea59..41d0f5193641 100644
--- a/app/src/main/res/drawable-night/shared_via_link.xml
+++ b/app/src/main/res/drawable-night/shared_via_link.xml
@@ -17,20 +17,14 @@
 
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16.0"
-        android:viewportHeight="16.0">
-	<path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="0.0"
-        android:strokeMiterLimit="4"
-        android:pathData="M5.99 5.318a3.332 3.332 0 0 0 0 4.693c 0.116 0.118 0.226 0.22 0.355 0.315l1.383-1.383A1.4 1.4 0 0 1 7.33 6.66l3.352-3.352c 0.568-0.57 1.442-0.57 2.01 0s 0.57 1.442 0 2.01l-1.13 1.132c 0.34 0.725 0.464 1.518 0.377 2.304l2.094-2.095c1.288-1.29 1.288-3.406 0-4.694s-3.405-1.288-4.693 0L5.99 5.318z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="0.0"
-        android:strokeMiterLimit="4"
-        android:pathData="M10.01 10.68a3.332 3.332 0 0 0 0-4.692 3.126 3.126 0 0 0-0.355-0.314L8.272 7.057A1.4 1.4 0 0 1 8.67 9.34l-3.35 3.35c-0.57 0.57-1.444 0.57-2.013 0.002s-0.568-1.442 0-2.01L4.44 9.55a4.288 4.288 0 0 1-0.38-2.305L1.967 9.34c-1.288 1.29-1.288 3.405 0 4.693s3.405 1.29 4.693 0l3.35-3.352z"/>
+        android:pathData="M12.225,8.37C14.008,9.097 15.309,10.669 15.69,12.557C16.071,14.445 15.482,16.398 14.12,17.76L14.12,17.76L10.409,21.471C8.972,22.844 6.921,23.382 4.986,22.878C2.971,22.353 1.397,20.779 0.872,18.764C0.347,16.749 0.952,14.607 2.455,13.165L2.455,13.165L5.99,9.65C6.376,9.255 6.817,8.918 7.3,8.65C7.232,9.031 7.197,9.418 7.195,9.805C7.196,10.443 7.287,11.078 7.465,11.69L7.465,11.69L4.22,14.93C3.03,16.213 3.068,18.208 4.305,19.445C5.542,20.682 7.537,20.72 8.82,19.53L8.82,19.53L12.355,15.995C13.621,14.723 13.621,12.667 12.355,11.395L12.355,11.395L12.231,11.262C11.525,10.438 11.512,9.211 12.225,8.37ZM13.415,2.205C15.66,-0.039 19.3,-0.039 21.545,2.205C23.753,4.444 23.753,8.041 21.545,10.28L21.545,10.28L18.01,13.815C17.626,14.21 17.186,14.547 16.705,14.815C16.735,14.665 16.775,14.49 16.775,14.315C16.851,13.474 16.768,12.626 16.53,11.815L16.53,11.815L19.78,8.57C20.654,7.759 21.015,6.536 20.721,5.38C20.427,4.225 19.525,3.323 18.37,3.029C17.214,2.735 15.991,3.096 15.18,3.97L15.18,3.97L11.645,7.505C10.379,8.777 10.379,10.833 11.645,12.105L11.645,12.105L11.769,12.239C12.472,13.064 12.489,14.288 11.785,15.135C11.07,14.848 10.422,14.417 9.88,13.87C8.801,12.792 8.195,11.33 8.195,9.805C8.195,8.28 8.801,6.818 9.88,5.74L9.88,5.74Z"
+        android:strokeWidth="1"
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/all_files.xml b/app/src/main/res/drawable/all_files.xml
index d000f691d792..87efa2d10ba2 100644
--- a/app/src/main/res/drawable/all_files.xml
+++ b/app/src/main/res/drawable/all_files.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#333333"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M7.5,2.5C8.55,2.5 9.5,2.95 10.2,3.7L10.2,3.7L10.65,4.15C10.9,4.35 11.2,4.5 11.5,4.5L11.5,4.5L23,4.5L23,19C23,20.65 21.65,22 20,22L20,22L4,22C2.35,22 1,20.65 1,19L1,19L1,2.5ZM7.5,4L2.5,4L2.5,19C2.5,19.85 3.15,20.5 4,20.5L4,20.5L20,20.5C20.85,20.5 21.5,19.85 21.5,19L21.5,19L21.5,6L11.5,6C10.8,6 10.1,5.7 9.6,5.15L9.6,5.15L9.15,4.7C8.7,4.25 8.1,4 7.5,4L7.5,4Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/favorite.xml b/app/src/main/res/drawable/favorite.xml
index 7e27b15ab056..6d31bb8bb3b8 100644
--- a/app/src/main/res/drawable/favorite.xml
+++ b/app/src/main/res/drawable/favorite.xml
@@ -18,7 +18,7 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#F7CD46"
+<vector android:height="24dp" android:tint="#FFD329"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
diff --git a/app/src/main/res/drawable/file.xml b/app/src/main/res/drawable/file.xml
index 6a281c9924fe..4dc95ac88c00 100644
--- a/app/src/main/res/drawable/file.xml
+++ b/app/src/main/res/drawable/file.xml
@@ -1,11 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16"
-        android:viewportHeight="16">
-
-    <path
-        android:fillColor="#969696"
-        android:pathData="M2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3z"/>
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="64"
+          android:endX="32"
+          android:endY="0"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDDD6D3"/>
+        <item android:offset="0.39" android:color="#FFE9E4E2"/>
+        <item android:offset="1" android:color="#FFE9E4E2"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#b9ada7"
+      android:fillAlpha="0.7"/>
 </vector>
diff --git a/app/src/main/res/drawable/file_analytics.xml b/app/src/main/res/drawable/file_analytics.xml
index 80bdea45fe7c..5e62b462894e 100644
--- a/app/src/main/res/drawable/file_analytics.xml
+++ b/app/src/main/res/drawable/file_analytics.xml
@@ -1,28 +1,42 @@
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2023 Nextcloud.
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-    <path
-        android:fillColor="#49ABEA"
-        android:fillType="nonZero"
-        android:pathData="M2.5,1L11,1L14,4L14,14.5C14,14.78 13.78,15 13.5,15L2.5,15C2.22,15 2,14.78 2,14.5L2,1.5C2,1.22 2.22,1 2.5,1ZM5.126,8.72L6.698,6.972C6.751,6.987 6.808,6.996 6.866,6.996C6.966,6.996 7.06,6.971 7.143,6.927L8.562,7.992C8.554,8.03 8.55,8.07 8.55,8.11C8.55,8.439 8.821,8.71 9.15,8.71C9.479,8.71 9.75,8.439 9.75,8.11C9.75,8.071 9.746,8.032 9.738,7.995L11.166,6.932C11.246,6.973 11.338,6.996 11.434,6.996C11.763,6.996 12.034,6.725 12.034,6.396C12.032,6.068 11.762,5.798 11.434,5.796C11.105,5.796 10.834,6.067 10.834,6.396C10.834,6.417 10.835,6.438 10.837,6.458L9.391,7.562C9.317,7.529 9.235,7.511 9.15,7.511C9.063,7.511 8.981,7.529 8.906,7.563L7.459,6.483C7.464,6.454 7.466,6.426 7.466,6.396C7.464,6.068 7.194,5.798 6.866,5.796C6.537,5.796 6.266,6.067 6.266,6.396C6.266,6.459 6.276,6.52 6.294,6.577L4.696,8.38C4.659,8.372 4.621,8.368 4.582,8.368C4.253,8.368 3.982,8.639 3.982,8.968C3.982,9.296 4.253,9.567 4.582,9.567C4.911,9.567 5.182,9.296 5.182,8.968C5.181,8.879 5.161,8.796 5.126,8.72ZM8.58,9.852L8.58,12.993L9.722,12.993L9.722,9.852L8.58,9.852ZM6.294,8.71L6.294,12.993L7.436,12.993L7.436,8.71L6.294,8.71ZM4.01,10.709L4.01,12.993L5.152,12.993L5.152,10.709L4.01,10.709ZM10.864,8.71L10.864,12.993L12.006,12.993L12.006,8.71L10.864,8.71Z" />
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="64"
+          android:endX="32"
+          android:endY="0"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDDD6D3"/>
+        <item android:offset="0.39" android:color="#FFE9E4E2"/>
+        <item android:offset="1" android:color="#FFE9E4E2"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#b9ada7"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M34.29,40h4.57L38.86,52.57L34.29,52.57ZM25.14,35.43h4.57L29.71,52.57L25.14,52.57ZM43.43,35.43L48,35.43L48,52.57L43.43,52.57ZM16,43.43h4.57v9.14L16,52.57Z"
+      android:fillColor="#529ad6"/>
+  <path
+      android:pathData="M18.29,37.6a1.2,1.2 0,0 1,-0.8 -0.34,1.23 1.23,0 0,1 -0.12,-1.6L27.2,24.57l9.37,7L45,25.14A1.14,1.14 0,0 1,46.4 27l-9.83,7.32 -9,-6.75L19.09,37A0.91,0.91 0,0 1,18.29 37.6Z"
+      android:fillColor="#a4a4a4"/>
+  <path
+      android:pathData="M29.83,26.17a2.4,2.4 0,1 1,-2.4 -2.4A2.41,2.41 0,0 1,29.83 26.17ZM48.11,26.17a2.4,2.4 0,1 1,-2.4 -2.4A2.41,2.41 0,0 1,48.11 26.17Z"
+      android:fillColor="#6c6c6c"/>
+  <path
+      android:pathData="M36.57,33.03m-2.4,0a2.4,2.4 0,1 1,4.8 0a2.4,2.4 0,1 1,-4.8 0"
+      android:fillColor="#6c6c6c"/>
+  <path
+      android:pathData="M20.69,36.46a2.4,2.4 0,1 1,-2.4 -2.4A2.42,2.42 0,0 1,20.69 36.46Z"
+      android:fillColor="#6c6c6c"/>
 </vector>
diff --git a/app/src/main/res/drawable/file_application.xml b/app/src/main/res/drawable/file_application.xml
index eb7e18f9a8c6..22d2bc5decb6 100644
--- a/app/src/main/res/drawable/file_application.xml
+++ b/app/src/main/res/drawable/file_application.xml
@@ -18,8 +18,44 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#969696"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="32"
+                android:startY="64"
+                android:endX="32"
+                android:endY="0"
+                android:type="linear">
+                <item android:offset="0" android:color="#FFDDD6D3"/>
+                <item android:offset="0.39" android:color="#FFE9E4E2"/>
+                <item android:offset="1" android:color="#FFE9E4E2"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0"
+        android:strokeAlpha="0.7"
+        android:fillColor="#b9ada7"
+        android:fillAlpha="0.7"/>
+    <path
+        android:pathData="M42.4,36.23a8.47,8.47 0,0 0,-0.23 -1.83l3.54,-3A12.88,12.88 0,0 0,43 26.74l-4.23,1.6a11,11 0,0 0,-3.2 -1.83l-0.8,-4.45A21.1,21.1 0,0 0,32 21.83a21.1,21.1 0,0 0,-2.74 0.23l-0.8,4.45a11,11 0,0 0,-3.2 1.83l-4.35,-1.6a14.83,14.83 0,0 0,-2.74 4.69l3.54,3a10.39,10.39 0,0 0,-0.22 1.83,9.27 9.27,0 0,0 0.22,1.83l-3.54,3a14.9,14.9 0,0 0,2.74 4.68l4.35,-1.6a10.79,10.79 0,0 0,3.2 1.83l0.8,4.46a23,23 0,0 0,2.74 0.23,23 23,0 0,0 2.74,-0.23l0.8,-4.46a10.79,10.79 0,0 0,3.2 -1.83L43,45.71A14.9,14.9 0,0 0,45.71 41l-3.54,-3A9.55,9.55 0,0 0,42.4 36.23ZM32,42.4a6.17,6.17 0,1 1,6.17 -6.17A6.14,6.14 0,0 1,32 42.4Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="31.95"
+                android:startY="50.86"
+                android:endX="31.95"
+                android:endY="20.09"
+                android:type="linear">
+                <item android:offset="0" android:color="#FF595959"/>
+                <item android:offset="1" android:color="#FF7A7A7A"/>
+            </gradient>
+        </aapt:attr>
+    </path>
 </vector>
diff --git a/app/src/main/res/drawable/file_code.xml b/app/src/main/res/drawable/file_code.xml
index 7e9eb1efc2e8..8c69b6fbdf84 100644
--- a/app/src/main/res/drawable/file_code.xml
+++ b/app/src/main/res/drawable/file_code.xml
@@ -18,8 +18,44 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#969696"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="32"
+                android:startY="64"
+                android:endX="32"
+                android:endY="0"
+                android:type="linear">
+                <item android:offset="0" android:color="#FFDDD6D3"/>
+                <item android:offset="0.39" android:color="#FFE9E4E2"/>
+                <item android:offset="1" android:color="#FFE9E4E2"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0"
+        android:strokeAlpha="0.7"
+        android:fillColor="#b9ada7"
+        android:fillAlpha="0.7"/>
+    <path
+        android:pathData="M15.31,34.17l10.86,5.37L26.17,36.91l-8,-3.88 8,-3.89L26.17,26.51L15.31,31.89ZM27.31,44.11h2.06L36.11,23h-2ZM37.49,26.51v2.63l8,3.89 -8,3.88v2.63l10.85,-5.37L48.34,31.89Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="31.83"
+                android:startY="54.56"
+                android:endX="31.83"
+                android:endY="15.7"
+                android:type="linear">
+                <item android:offset="0" android:color="#FF2C7ABE"/>
+                <item android:offset="1" android:color="#FF5099D5"/>
+            </gradient>
+        </aapt:attr>
+    </path>
 </vector>
diff --git a/app/src/main/res/drawable/file_doc.xml b/app/src/main/res/drawable/file_doc.xml
index 57c62604e048..fad47728a687 100644
--- a/app/src/main/res/drawable/file_doc.xml
+++ b/app/src/main/res/drawable/file_doc.xml
@@ -18,7 +18,33 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="72dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#49abea" android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3h-8.5zM4,3h6v1h-6v-1zM4,6h5v1h-5v-1zM4,9h8v1h-8v-1zM4,12h4v1h-4v-1z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="32"
+                android:startY="64"
+                android:endX="32"
+                android:endY="0"
+                android:type="linear">
+                <item android:offset="0" android:color="#FFDDD6D3"/>
+                <item android:offset="0.39" android:color="#FFE9E4E2"/>
+                <item android:offset="1" android:color="#FFE9E4E2"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0Z"
+        android:strokeAlpha="0.7"
+        android:fillColor="#b9ada7"
+        android:fillAlpha="0.7"/>
+    <path
+        android:pathData="M44,22.86L20,22.86a1.76,1.76 0,0 0,-1.71 1.71v1.72L45.71,26.29L45.71,24.57A1.76,1.76 0,0 0,44 22.86ZM18.29,48.57A1.76,1.76 0,0 0,20 50.29L44,50.29a1.76,1.76 0,0 0,1.71 -1.72v-20L18.29,28.57v20ZM22.86,32L41.14,32v2.29L22.86,34.29ZM22.86,37.71L41.14,37.71L41.14,40L22.86,40ZM22.86,43.43L34.29,43.43v2.28L22.86,45.71Z"
+        android:fillColor="#529ad6"/>
 </vector>
diff --git a/app/src/main/res/drawable/file_image.xml b/app/src/main/res/drawable/file_image.xml
index 84e6f5f838d8..61cbca0b5319 100644
--- a/app/src/main/res/drawable/file_image.xml
+++ b/app/src/main/res/drawable/file_image.xml
@@ -1,5 +1,41 @@
-<vector android:height="24dp" android:tint="#969696"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="64"
+          android:endX="32"
+          android:endY="0"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDDD6D3"/>
+        <item android:offset="0.39" android:color="#FFE9E4E2"/>
+        <item android:offset="1" android:color="#FFE9E4E2"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#b9ada7"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M48.34,35.31a0.44,0.44 0,0 0,0 -0.8,15.93 15.93,0 0,0 -8.8,-2.74h-0.68c0.11,-0.11 0.34,-0.23 0.45,-0.46a16.15,16.15 0,0 0,4.35 -8.11,0.46 0.46,0 0,0 -0.57,-0.57A16.48,16.48 0,0 0,35 26.86l-0.46,0.45v-0.57a16.44,16.44 0,0 0,-2.62 -8.8,0.44 0.44,0 0,0 -0.8,0 15.93,15.93 0,0 0,-2.75 8.8v0.69a1.76,1.76 0,0 0,-0.45 -0.46,16.13 16.13,0 0,0 -8.12,-4.34 0.46,0.46 0,0 0,-0.57 0.57,15.94 15.94,0 0,0 4.23,8.23l0.46,0.46h-0.58a16.44,16.44 0,0 0,-8.8 2.62,0.44 0.44,0 0,0 0,0.8 15.93,15.93 0,0 0,8.8 2.75L24,38.06a1.92,1.92 0,0 0,-0.46 0.45,16.23 16.23,0 0,0 -4.34,8.12 0.46,0.46 0,0 0,0.57 0.57A15.43,15.43 0,0 0,27.89 43l0.45,-0.46v0.58A16.4,16.4 0,0 0,31 51.89a0.44,0.44 0,0 0,0.8 0,16 16,0 0,0 2.74,-8.8L34.54,42.4c0.12,0.11 0.23,0.34 0.46,0.46a16.23,16.23 0,0 0,8.12 4.34c0.34,0 0.68,-0.23 0.57,-0.57a15.94,15.94 0,0 0,-4.23 -8.23L39,37.94h0.57A15.27,15.27 0,0 0,48.34 35.31ZM33.34,36a2.16,2.16 0,0 1,-3.08 0.8,2.27 2.27,0 0,1 -0.8,-3.2 2.16,2.16 0,0 1,3.08 -0.8A2.32,2.32 0,0 1,33.37 36Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="31.43"
+          android:startY="52.08"
+          android:endX="31.43"
+          android:endY="17.69"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF992C99"/>
+        <item android:offset="1" android:color="#FFB35CB3"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/app/src/main/res/drawable/file_link.xml b/app/src/main/res/drawable/file_link.xml
index 820cfa097fcb..190a352119a0 100644
--- a/app/src/main/res/drawable/file_link.xml
+++ b/app/src/main/res/drawable/file_link.xml
@@ -1,4 +1,32 @@
-<vector android:height="72dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#969696" android:pathData="m7.95,0.65c-4.1,0 -7.4,3.3 -7.4,7.4s3.3,7.4 7.4,7.4 7.4,-3.3 7.4,-7.4 -3.3,-7.4 -7.4,-7.4zM8.75,1.55c1.3,0 2.4,0.8 3.5,1.3l1.8,2.5 -0.3,1.1 0.6,0.3v2.4c-0.2,0.7 -0.6,1.3 -0.9,2 -0.2,0.1 0,-0.8 -0.1,-1 0,-0.6 -0.5,-0.6 -0.9,-0.2 -0.4,0.3 -1.4,0.3 -1.5,-0.4 -0.3,-0.8 0,-1.7 0.3,-2.5l-0.6,-0.7 0.2,-1.8 -0.8,-0.9 0.2,-1 -1,-0.6c-0.2,-0.2 -0.6,-0.2 -0.7,-0.4 0.1,0 0.2,-0.1 0.2,-0.1zM6.15,1.65s0.1,0 0.1,0.1c0.4,0.2 -0.1,0.4 -0.2,0.6 -0.5,0.3 0.3,0.7 0.5,1 0.4,-0.1 0.8,-0.7 1.4,-0.5 0.7,-0.2 0.6,0.6 1.1,1 0.1,0.2 0.9,0.8 0.4,0.6 -0.5,-0.4 -1,-0.4 -1.3,0.1 -0.8,0.5 -0.3,-0.9 -0.7,-1.2 -0.6,-0.7 -0.4,0.5 -0.4,0.9 -0.4,0 -1.1,-0.3 -1.5,0.2l0.4,0.6 0.5,-0.7c0,-0.3 0.1,0.2 0.3,0.3 0.1,0.2 0.8,0.7 0.3,0.9 -0.8,0.4 -1.4,1.1 -2.1,1.7 -0.2,0.5 -0.7,0.4 -1,0 -0.7,-0.4 -0.7,0.7 -0.6,1.1l0.6,-0.4v1.1c-0.4,0.4 -0.9,-0.7 -1.3,-0.9v-1.6c0,-0.4 -0.1,-0.9 0,-1.3 0.8,-0.9 1.7,-1.9 2.2,-3h0.8c0.6,0.2 0.3,-0.7 0.5,-0.6zM4.95,9.85c0.1,0 0.2,0 0.3,0.1 0.8,0.1 1.4,0.7 2,1.1 0.5,0.5 1.6,0.3 1.7,1.2 -0.2,0.9 -1.1,1.4 -1.8,1.7 -0.2,0.1 -0.4,0.2 -0.6,0.2 -0.7,0.2 -1,-0.6 -1.2,-1.1 -0.3,-0.7 -1.1,-1.2 -1,-2.1 0,-0.4 0.2,-1 0.6,-1.1z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="64"
+          android:endX="32"
+          android:endY="0"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDDD6D3"/>
+        <item android:offset="0.39" android:color="#FFE9E4E2"/>
+        <item android:offset="1" android:color="#FFE9E4E2"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#b9ada7"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M32,21.71A14.86,14.86 0,1 0,46.86 36.57,14.83 14.83,0 0,0 32,21.71ZM32.57,29L32.57,24a11.48,11.48 0,0 1,2.86 0.46A23.69,23.69 0,0 1,38.29 29ZM38.74,30.14a16.21,16.21 0,0 1,1 5.72h-7.2L32.54,30.17ZM31.43,29L25.71,29a16.12,16.12 0,0 1,2.86 -4.57A11.48,11.48 0,0 1,31.43 24v5ZM31.43,30.14v5.72h-7.2a23.84,23.84 0,0 1,1 -5.72ZM23.09,36L19.43,36a12.25,12.25 0,0 1,1.71 -5.71h3A21.87,21.87 0,0 0,23.09 36ZM19.43,37.14h3.66a16.43,16.43 0,0 0,1 5.72h-3A12.32,12.32 0,0 1,19.43 37.14ZM24.23,37.14h7.2v5.72L25.26,42.86A23.84,23.84 0,0 1,24.23 37.14ZM31.43,44v5a11.48,11.48 0,0 1,-2.86 -0.46A18.55,18.55 0,0 1,25.83 44ZM32.57,44h5.72a18.59,18.59 0,0 1,-2.75 4.57,12.28 12.28,0 0,1 -2.85,0.46L32.69,44ZM32.57,42.86L32.57,37.14h7.2a19.45,19.45 0,0 1,-1 5.72ZM40.91,37.14h3.66a12.32,12.32 0,0 1,-1.71 5.72h-3A16.43,16.43 0,0 0,40.91 37.14ZM40.91,36a23.75,23.75 0,0 0,-1 -5.71h3A12.25,12.25 0,0 1,44.57 36ZM42.06,29L39.43,29a19.76,19.76 0,0 0,-2.06 -3.77A11.87,11.87 0,0 1,42.06 29ZM26.63,25.26A29.8,29.8 0,0 0,24.57 29L21.94,29A13.65,13.65 0,0 1,26.63 25.26ZM21.94,44h2.63a25.4,25.4 0,0 0,2.06 3.89A12.23,12.23 0,0 1,21.94 44ZM37.49,47.89a25.35,25.35 0,0 0,2 -3.89h2.63A14.18,14.18 0,0 1,37.49 47.89Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#529ad6"
+      android:fillAlpha="0.8"/>
 </vector>
diff --git a/app/src/main/res/drawable/file_movie.xml b/app/src/main/res/drawable/file_movie.xml
index ef4867bc8882..098b9b92b33b 100644
--- a/app/src/main/res/drawable/file_movie.xml
+++ b/app/src/main/res/drawable/file_movie.xml
@@ -20,14 +20,33 @@
   ~ along with this program. If not, see <https://www.gnu.org/licenses/>.
   -->
 <!-- downloaded from https://fonts.google.com/icons?selected=Material+Icons:videocam: -->
-<vector android:autoMirrored="true"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:tint="#969696"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
     <path
-        android:fillColor="#000000"
-        android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z" />
+        android:pathData="M58.22,17.18V61.64a2.29,2.29 0,0 1,-2.28 2.28H8.06a2.29,2.29 0,0 1,-2.28 -2.28V2.36A2.29,2.29 0,0 1,8.06 0.08H41.12Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="32"
+                android:startY="63.92"
+                android:endX="32"
+                android:endY="0.09"
+                android:type="linear">
+                <item android:offset="0" android:color="#FFDDD6D3"/>
+                <item android:offset="0.39" android:color="#FFE9E4E2"/>
+                <item android:offset="1" android:color="#FFE9E4E2"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M58.22,17.18H43.4a2.28,2.28 0,0 1,-2.28 -2.28V0.08Z"
+        android:strokeAlpha="0.7"
+        android:fillColor="#b9ada7"
+        android:fillAlpha="0.7"/>
+    <path
+        android:pathData="M44.42,22.88L19.58,22.88a1.27,1.27 0,0 0,-1.26 1.26L18.32,49a1.27,1.27 0,0 0,1.26 1.26L44.42,50.26A1.27,1.27 0,0 0,45.68 49L45.68,24.14A1.27,1.27 0,0 0,44.42 22.88ZM22.88,48L20.6,48L20.6,45.68h2.28ZM22.88,42.87L20.6,42.87L20.6,40.55h2.28ZM22.88,37.74L20.6,37.74L20.6,35.42h2.28ZM22.88,32.61L20.6,32.61L20.6,30.29h2.28ZM22.88,27.48L20.6,27.48L20.6,25.16h2.28ZM38.84,48L25.16,48L25.16,37.7L38.84,37.7ZM38.84,35.46L25.16,35.46L25.16,25.16L38.84,25.16ZM43.4,48L41.12,48L41.12,45.68L43.4,45.68ZM43.4,42.87L41.12,42.87L41.12,40.55L43.4,40.55ZM43.4,37.74L41.12,37.74L41.12,35.42L43.4,35.42ZM43.4,32.61L41.12,32.61L41.12,30.29L43.4,30.29ZM43.4,27.48L41.12,27.48L41.12,25.16L43.4,25.16Z"
+        android:fillColor="#77787b"/>
 </vector>
diff --git a/app/src/main/res/drawable/file_multiple.xml b/app/src/main/res/drawable/file_multiple.xml
index eed897441ac4..53507259c2a7 100644
--- a/app/src/main/res/drawable/file_multiple.xml
+++ b/app/src/main/res/drawable/file_multiple.xml
@@ -1,8 +1,12 @@
-<!-- drawable/file_multiple.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M15,7H20.5L15,1.5V7M8,0H16L22,6V18A2,2 0 0,1 20,20H8C6.89,20 6,19.1 6,18V2A2,2 0 0,1 8,0M4,4V22H20V24H4A2,2 0 0,1 2,22V4H4Z" />
+  <path
+      android:pathData="M22.5,3.5L22.5,20.5C22.5,22.155 21.155,23.5 19.5,23.5L19.5,23.5L9.5,23.5C8.39,23.5 7.425,22.895 6.905,22L6.905,22L19.5,22C20.325,22 21,21.325 21,20.5L21,20.5L21,5L19,5L19,3.5L22.5,3.5ZM17.5,0.5L17.5,17.5C17.5,19.155 16.155,20.5 14.5,20.5L14.5,20.5L4.5,20.5C2.845,20.5 1.5,19.155 1.5,17.5L1.5,17.5L1.5,5.5L6.5,0.5L17.5,0.5ZM16,2L7.5,2L7.5,5C7.5,5.83 6.83,6.5 6,6.5L6,6.5L3,6.5L3,17.5C3,18.325 3.675,19 4.5,19L4.5,19L14.5,19C15.325,19 16,18.325 16,17.5L16,17.5L16,2Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/file_pdf.xml b/app/src/main/res/drawable/file_pdf.xml
index 7ee633ead66c..74da130760c7 100644
--- a/app/src/main/res/drawable/file_pdf.xml
+++ b/app/src/main/res/drawable/file_pdf.xml
@@ -19,23 +19,33 @@
   ~ You should have received a copy of the GNU Affero General Public License
   ~ along with this program. If not, see <https://www.gnu.org/licenses/>.
   -->
-
-<vector
-    android:height="16dp"
-    android:viewportHeight="16"
-    android:viewportWidth="16"
-    android:width="16dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
     <path
-        android:fillColor="#dc5047"
-        android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3z" />
+        android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="32"
+                android:startY="64"
+                android:endX="32"
+                android:endY="0"
+                android:type="linear">
+                <item android:offset="0" android:color="#FFDDD6D3"/>
+                <item android:offset="0.39" android:color="#FFE9E4E2"/>
+                <item android:offset="1" android:color="#FFE9E4E2"/>
+            </gradient>
+        </aapt:attr>
+    </path>
     <path
-        android:fillColor="#fff"
-        android:pathData="m4.9093,8.443v1.057h-0.6181v-3h1.1703q0.3379,0 0.5934,0.1236 0.2576,0.1236 0.3956,0.3523 0.1381,0.2266 0.1381,0.5172 0,0.4409 -0.3029,0.6964 -0.3008,0.2534 -0.8345,0.2534zM4.9093,7.9423h0.5522q0.2452,0 0.3729,-0.1154 0.1298,-0.1154 0.1298,-0.3297 0,-0.2205 -0.1298,-0.3565t-0.3585,-0.1401h-0.5666z" />
+        android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0Z"
+        android:strokeAlpha="0.7"
+        android:fillColor="#b9ada7"
+        android:fillAlpha="0.7"/>
     <path
-        android:fillColor="#fff"
-        android:pathData="m7.011,9.5v-3h0.9231q0.3956,0 0.7067,0.1793 0.3132,0.1772 0.4883,0.5069 0.1751,0.3276 0.1751,0.7459v0.1381q0,0.4183 -0.1731,0.7438 -0.171,0.3255 -0.4842,0.5048 -0.3132,0.1793 -0.7067,0.1813zM7.6291,7.0007v2.0027h0.2988q0.3626,0 0.5543,-0.2369 0.1916,-0.2369 0.1957,-0.6779v-0.1586q0,-0.4574 -0.1896,-0.6923 -0.1896,-0.2369 -0.5543,-0.2369z" />
-    <path
-        android:fillColor="#fff"
-        android:pathData="m11.56,8.274h-1.1868v1.226h-0.6181v-3h1.9533v0.5007h-1.3352v0.7747h1.1868z" />
+        android:pathData="M23.43,28.8a6.93,6.93 0,0 0,-2.52 -0.34L16.57,28.46L16.57,42.17h3L19.57,37.26L21,37.26a5.7,5.7 0,0 0,3.31 -0.92,4.18 4.18,0 0,0 1.72,-3.65 5.31,5.31 0,0 0,-0.57 -2.4A5.62,5.62 0,0 0,23.43 28.8ZM22.63,34.4A2.08,2.08 0,0 1,21 35L19.66,35L19.66,31.09h1.25a2.24,2.24 0,0 1,1.6 0.45A1.64,1.64 0,0 1,23.09 33,1.83 1.83,0 0,1 22.63,34.4ZM31.77,28.57L27.54,28.57L27.54,42.29h4.23a11.84,11.84 0,0 0,2.17 -0.23,4.8 4.8,0 0,0 2.29,-1.37 7,7 0,0 0,1.83 -5.26,7.15 7.15,0 0,0 -2,-5.37A5.88,5.88 0,0 0,31.77 28.57ZM34.06,39a3.23,3.23 0,0 1,-2.29 0.8L30.4,39.8L30.4,31.09h1.26a3,3 0,0 1,2.51 1,5.33 5.33,0 0,1 0.92,3.2A4.88,4.88 0,0 1,34.06 39ZM48,31.09L48,28.57L39.66,28.57L39.66,42.29h2.85v-5.6L47.2,36.69v-2.4L42.51,34.29v-3.2Z"
+        android:fillColor="#f05c51"/>
 </vector>
diff --git a/app/src/main/res/drawable/file_ppt.xml b/app/src/main/res/drawable/file_ppt.xml
index c3ae85b187d4..9ad8b6c750ec 100644
--- a/app/src/main/res/drawable/file_ppt.xml
+++ b/app/src/main/res/drawable/file_ppt.xml
@@ -1,4 +1,30 @@
-<vector android:height="72dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#f0965f" android:pathData="m1.5,2c-0.25,0 -0.5,0.25 -0.5,0.5v11c0,0.25 0.25,0.5 0.5,0.5h13c0.25,0 0.5,-0.25 0.5,-0.5v-11c0,-0.25 -0.25,-0.5 -0.5,-0.5zM2,5h12v6h-12z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="64"
+          android:endX="32"
+          android:endY="0"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDDD6D3"/>
+        <item android:offset="0.39" android:color="#FFE9E4E2"/>
+        <item android:offset="1" android:color="#FFE9E4E2"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#b9ada7"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M44,22.86L20,22.86a1.76,1.76 0,0 0,-1.71 1.71v1.72L45.71,26.29L45.71,24.57A1.68,1.68 0,0 0,44 22.86ZM18.29,48.57A1.76,1.76 0,0 0,20 50.29L44,50.29a1.76,1.76 0,0 0,1.71 -1.72v-20L18.29,28.57v20ZM37.71,30.86h4.58L42.29,48L37.71,48ZM29.71,35.43h4.58L34.29,48L29.71,48ZM21.71,40h4.58v8L21.71,48Z"
+      android:fillColor="#ff9a1e"/>
 </vector>
diff --git a/app/src/main/res/drawable/file_sound.xml b/app/src/main/res/drawable/file_sound.xml
index 0d295f144cc1..9faa02c3b6b4 100644
--- a/app/src/main/res/drawable/file_sound.xml
+++ b/app/src/main/res/drawable/file_sound.xml
@@ -1,4 +1,41 @@
-<vector android:height="72dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#969696" android:pathData="m12.97,0.5c-0.26,0 -4.795,1 -7.17,1.5 -0.47,0.1 -0.8,0.53 -0.8,1v8c-0.56,-0.06 -1.144,0.0625 -1.65,0.34 -1.226,0.67 -1.7,2.06 -1.066,3.11 0.64,1.05 2.15,1.35 3.37,0.68 0.846,-0.45 1.346,-1.28 1.346,-2.13v-8l5,-1v6.016c-0.56,-0.058 -1.144,0.0625 -1.65,0.34 -1.226,0.67 -1.7,2.06 -1.066,3.11 0.64,1.046 2.15,1.35 3.37,0.68 0.846,-0.466 1.346,-1.296 1.346,-2.146v-10.525c0,-0.565 -0.466,-0.975 -1.03,-0.975z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M8,0A2.3,2.3 0,0 0,5.71 2.29V61.71A2.3,2.3 0,0 0,8 64H56a2.3,2.3 0,0 0,2.29 -2.29V17.14L41.14,0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="34.29"
+          android:startY="61.189"
+          android:endX="34.29"
+          android:endY="-2.651"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDDD6D3"/>
+        <item android:offset="0.39" android:color="#FFE9E4E2"/>
+        <item android:offset="1" android:color="#FFE9E4E2"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M41.14,0V14.86a2.29,2.29 0,0 0,2.29 2.28H58.29Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#b9ada7"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M32,22.74v16.8a5.91,5.91 0,0 0,-3.66 -1.25,6.06 6.06,0 1,0 6.06,6.05V27.77L42.74,32V26.4s-8.91,-4.8 -9,-4.8a0.69,0.69 0,0 0,-0.45 -0.11A1.2,1.2 0,0 0,32 22.74">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32.52"
+          android:startY="53.04"
+          android:endX="32.52"
+          android:endY="7.05"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFF9B600"/>
+        <item android:offset="1" android:color="#FFFFD329"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/app/src/main/res/drawable/file_text.xml b/app/src/main/res/drawable/file_text.xml
index db905293f8fa..a3dfe6c7c310 100644
--- a/app/src/main/res/drawable/file_text.xml
+++ b/app/src/main/res/drawable/file_text.xml
@@ -1,4 +1,30 @@
-<vector android:height="72dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#969696" android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3h-8.5zM4,3h6v1h-6v-1zM4,6h5v1h-5v-1zM4,9h8v1h-8v-1zM4,12h4v1h-4v-1z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="64"
+          android:endX="32"
+          android:endY="-0"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDDD6D3"/>
+        <item android:offset="0.39" android:color="#FFE9E4E2"/>
+        <item android:offset="1" android:color="#FFE9E4E2"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#b9ada7"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M17.14,26.29L46.86,26.29v3.42L17.14,29.71ZM17.14,38.86L46.86,38.86L46.86,35.43L17.14,35.43ZM17.14,48L46.86,48L46.86,44.57L17.14,44.57Z"
+      android:fillColor="#948983"/>
 </vector>
diff --git a/app/src/main/res/drawable/file_xls.xml b/app/src/main/res/drawable/file_xls.xml
index 69d77a59b520..6371f3f4985c 100644
--- a/app/src/main/res/drawable/file_xls.xml
+++ b/app/src/main/res/drawable/file_xls.xml
@@ -1,4 +1,30 @@
-<vector android:height="72dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#9abd4e" android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3h-8.5zM4,4h2v2h-2v-2zM7,4h5v2h-5v-2zM4,7h2v2h-2v-2zM7,7h5v2h-5v-2zM4,10h2v2h-2v-2zM7,10h5v2h-5v-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M58.29,17.14V61.71A2.3,2.3 0,0 1,56 64H8a2.3,2.3 0,0 1,-2.29 -2.29V2.29A2.3,2.3 0,0 1,8 0H41.14Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="64"
+          android:endX="32"
+          android:endY="0"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDDD6D3"/>
+        <item android:offset="0.39" android:color="#FFE9E4E2"/>
+        <item android:offset="1" android:color="#FFE9E4E2"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M58.29,17.14H43.43a2.29,2.29 0,0 1,-2.29 -2.28V0Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#b9ada7"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M44,22.86L20,22.86a1.76,1.76 0,0 0,-1.71 1.71v1.72L45.71,26.29L45.71,24.57A1.76,1.76 0,0 0,44 22.86ZM28.57,50.29h6.86L35.43,28.57L28.57,28.57ZM18.29,48.57A1.76,1.76 0,0 0,20 50.29h6.29L26.29,28.57h-8ZM37.71,50.29L44,50.29a1.76,1.76 0,0 0,1.71 -1.72v-20h-8Z"
+      android:fillColor="#bfcb44"/>
 </vector>
diff --git a/app/src/main/res/drawable/file_zip.xml b/app/src/main/res/drawable/file_zip.xml
index 5e425a3535a5..984c7cfeef36 100644
--- a/app/src/main/res/drawable/file_zip.xml
+++ b/app/src/main/res/drawable/file_zip.xml
@@ -1,4 +1,45 @@
-<vector android:height="72dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#0082c9" android:pathData="m4,3 l-2,2v7.5c0,0.26 0.24,0.5 0.5,0.5h11c0.26,0 0.5,-0.24 0.5,-0.5v-7.5l-2,-2zM5,4h6l1,1h-8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M57.38,61.79A2.21,2.21 0,0 1,55.17 64H8.83a2.21,2.21 0,0 1,-2.21 -2.21V4.41a2.21,2.21 0,0 1,2.21 -2.2H55.17a2.21,2.21 0,0 1,2.21 2.2Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="63.14"
+          android:endX="32"
+          android:endY="2.17"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDDD6D3"/>
+        <item android:offset="0.39" android:color="#FFE9E4E2"/>
+        <item android:offset="1" android:color="#FFE9E4E2"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M32,50.76V48.55h5.52V41.93H32V39.72h5.52V33.1H32V30.9h5.52V26.48h-11v8.83H32v2.21H26.48v6.62H32v2.2H26.48V53H32v2.2H26.48v3.31h11V50.76Z"
+      android:fillColor="#b4b4b4"/>
+  <path
+      android:pathData="M26.48,26.48h11v2.21h-11Z"
+      android:fillColor="#66676a"/>
+  <path
+      android:pathData="M32,0a5.47,5.47 0,0 0,-5.52 5.52v21h11v-21A5.47,5.47 0,0 0,32 0ZM34.21,23.17L29.79,23.17L29.79,17.66h4.42Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="26.49"
+          android:endX="32"
+          android:endY="0"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF808083"/>
+        <item android:offset="1" android:color="#FFA6A6AE"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M29.79,15.45h4.42v2.21H29.79Z"
+      android:fillColor="#66676a"/>
 </vector>
diff --git a/app/src/main/res/drawable/folder.xml b/app/src/main/res/drawable/folder.xml
index 0c3996eb34e9..297efb40efd0 100644
--- a/app/src/main/res/drawable/folder.xml
+++ b/app/src/main/res/drawable/folder.xml
@@ -15,12 +15,31 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#0082c9"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
+        android:pathData="M20.57,5.71H2.29A2.3,2.3 0,0 0,0 8v5.71H28.57Z"
+        android:fillColor="#53baf2"/>
+    <path
+        android:pathData="M20.57,5.71H2.29A2.3,2.3 0,0 0,0 8v5.71H28.57Z"
+        android:strokeAlpha="0.25"
+        android:fillColor="#317cb3"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M61.71,13.71H0V56a2.3,2.3 0,0 0,2.29 2.29H61.71A2.3,2.3 0,0 0,64 56V16A2.3,2.3 0,0 0,61.71 13.71Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="32"
+                android:startY="58.11"
+                android:endX="32"
+                android:endY="13.64"
+                android:type="linear">
+                <item android:offset="0" android:color="#FF53BAF2"/>
+                <item android:offset="1" android:color="#FF7ECBF5"/>
+            </gradient>
+        </aapt:attr>
+    </path>
 </vector>
diff --git a/app/src/main/res/drawable/folder_auto_upload.xml b/app/src/main/res/drawable/folder_auto_upload.xml
new file mode 100644
index 000000000000..be44dfd6067a
--- /dev/null
+++ b/app/src/main/res/drawable/folder_auto_upload.xml
@@ -0,0 +1,37 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M22.86,45.83a3.43,3.43 0,0 1,-3.43 -3.43L19.43,32.69a3.42,3.42 0,0 1,3.43 -3.43L25,29.26l1.72,-2.86L37.37,26.4l1.72,2.86h2a3.42,3.42 0,0 1,3.43 3.43L44.52,42.4a3.43,3.43 0,0 1,-3.43 3.43ZM21.14,32.69L21.14,42.4a1.67,1.67 0,0 0,1.64 1.71L41.14,44.11a1.67,1.67 0,0 0,1.72 -1.63L42.86,32.69A1.68,1.68 0,0 0,41.22 31L38.06,31l-1.72,-2.86L27.6,28.14L25.89,31h-3a1.68,1.68 0,0 0,-1.72 1.64ZM26.29,36.69A5.71,5.71 0,1 1,32 42.4,5.71 5.71,0 0,1 26.29,36.69ZM28,36.69a4,4 0,1 0,4 -4,3.94 3.94,0 0,0 -4,3.91ZM38.86,33.83A1.14,1.14 0,1 1,40 35,1.14 1.14,0 0,1 38.86,33.83Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M20.57,5.71H2.29A2.3,2.3 0,0 0,0 8v5.71H28.57Z"
+      android:fillColor="#53baf2"/>
+  <path
+      android:pathData="M20.57,5.71H2.29A2.3,2.3 0,0 0,0 8v5.71H28.57Z"
+      android:strokeAlpha="0.25"
+      android:fillColor="#317cb3"
+      android:fillAlpha="0.25"/>
+  <path
+      android:pathData="M61.71,13.71H0V56a2.3,2.3 0,0 0,2.29 2.29H61.71A2.3,2.3 0,0 0,64 56V16A2.3,2.3 0,0 0,61.71 13.71Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="32"
+          android:startY="58.11"
+          android:endX="32"
+          android:endY="13.64"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF53BAF2"/>
+        <item android:offset="1" android:color="#FF7ECBF5"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M44.43,46.67H19.57a3.48,3.48 0,0 1,-3.48 -3.49V30a3.48,3.48 0,0 1,3.48 -3.5h3.51l2.32,-3.88H38.6l2.32,3.88h3.51A3.5,3.5 0,0 1,47.91 30h0V43.18a3.5,3.5 0,0 1,-3.48 3.49ZM32,29.72a5.7,5.7 0,1 0,5.7 5.7A5.7,5.7 0,0 0,32 29.72ZM42.86,30a1.55,1.55 0,1 0,1.55 1.55A1.55,1.55 0,0 0,42.86 30Z"
+      android:strokeAlpha="0.9"
+      android:fillColor="#fff"
+      android:fillAlpha="0.9"/>
+</vector>
diff --git a/app/src/main/res/drawable/folder_encrypted.xml b/app/src/main/res/drawable/folder_encrypted.xml
new file mode 100644
index 000000000000..fd6861b3d989
--- /dev/null
+++ b/app/src/main/res/drawable/folder_encrypted.xml
@@ -0,0 +1,52 @@
+<!--
+    @author Google LLC
+    @author Andy Scherzinger
+    Copyright (C) 2018 Google LLC
+    Copyright (C) 2020 Andy Scherzinger
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:pathData="M20.57,5.71H2.29A2.3,2.3 0,0 0,0 8v5.71H28.57Z"
+        android:fillColor="#53baf2"/>
+    <path
+        android:pathData="M20.57,5.71H2.29A2.3,2.3 0,0 0,0 8v5.71H28.57Z"
+        android:strokeAlpha="0.25"
+        android:fillColor="#317cb3"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M61.71,13.71H0V56a2.3,2.3 0,0 0,2.29 2.29H61.71A2.3,2.3 0,0 0,64 56V16A2.3,2.3 0,0 0,61.71 13.71Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="32"
+                android:startY="58.11"
+                android:endX="32"
+                android:endY="13.64"
+                android:type="linear">
+                <item android:offset="0" android:color="#FF53BAF2"/>
+                <item android:offset="1" android:color="#FF7ECBF5"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M42.46,32.43L39,32.43v-4a7,7 0,1 0,-13.94 0v4L21.54,32.43a1,1 0,0 0,-1 1L20.54,48.36a1,1 0,0 0,1 1L42.46,49.36a1,1 0,0 0,1 -1L43.46,33.42A1,1 0,0 0,42.46 32.43ZM33,40.64v4.24a0.51,0.51 0,0 1,-0.5 0.5h-1a0.51,0.51 0,0 1,-0.5 -0.5L31,40.64a2.24,2.24 0,1 1,2 0ZM37,32.43L27,32.43v-4a5,5 0,1 1,10 0Z"
+        android:strokeAlpha="0.9"
+        android:fillColor="#fff"
+        android:fillAlpha="0.9"/>
+</vector>
diff --git a/app/src/main/res/drawable/folder_shared_users.xml b/app/src/main/res/drawable/folder_shared_users.xml
new file mode 100644
index 000000000000..ec4aec399144
--- /dev/null
+++ b/app/src/main/res/drawable/folder_shared_users.xml
@@ -0,0 +1,52 @@
+<!--
+    @author Google LLC
+    @author Andy Scherzinger
+    Copyright (C) 2018 Google LLC
+    Copyright (C) 2020 Andy Scherzinger
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:pathData="M20.57,5.71H2.29A2.3,2.3 0,0 0,0 8v5.71H28.57Z"
+        android:fillColor="#53baf2"/>
+    <path
+        android:pathData="M20.57,5.71H2.29A2.3,2.3 0,0 0,0 8v5.71H28.57Z"
+        android:strokeAlpha="0.25"
+        android:fillColor="#317cb3"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M61.71,13.71H0V56a2.3,2.3 0,0 0,2.29 2.29H61.71A2.3,2.3 0,0 0,64 56V16A2.3,2.3 0,0 0,61.71 13.71Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="32"
+                android:startY="58.11"
+                android:endX="32"
+                android:endY="13.64"
+                android:type="linear">
+                <item android:offset="0" android:color="#FF53BAF2"/>
+                <item android:offset="1" android:color="#FF7ECBF5"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M50.07,48.11L23,48.11l0.14,-0.87a6.4,6.4 0,0 1,6.34 -5.38h2.77l4.27,4.28 4.28,-4.28h2.77a6.38,6.38 0,0 1,6.33 5.38l0.15,0.87ZM16.33,48.11h-2.4l0.34,-1.85a5.44,5.44 0,0 1,5.37 -4.56h3.95a8.67,8.67 0,0 0,-1.84 2.41L19.58,44.11a3,3 0,0 0,-3 2.58ZM25.33,39.7c-4.16,0 -6.95,-4.16 -6.95,-8.05a6.83,6.83 0,0 1,2 -4.94,6.71 6.71,0 0,1 4.79,-2h0.17a7.22,7.22 0,0 1,2.39 0.4,10.38 10.38,0 0,0 -1.06,2.2 5.13,5.13 0,0 0,-1.35 -0.2h-0.2a4.35,4.35 0,0 0,-4.34 4.36v0.18c0,2.71 1.83,5.61 4.55,5.61a3.69,3.69 0,0 0,2.06 -0.64,12.18 12.18,0 0,0 1.28,2 6,6 0,0 1,-3.35 1ZM36.56,39.13a6.34,6.34 0,0 1,-4.94 -2.54,9.22 9.22,0 0,1 -1.93,-5.65 6.65,6.65 0,0 1,6.42 -6.88h0.68a6.66,6.66 0,0 1,6.67 6.64,1.93 1.93,0 0,1 0,0.24A9.18,9.18 0,0 1,41.5 36.6a6.28,6.28 0,0 1,-5 2.53Z"
+        android:strokeAlpha="0.9"
+        android:fillColor="#fff"
+        android:fillAlpha="0.9"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_create_dir.xml b/app/src/main/res/drawable/ic_action_create_dir.xml
index 8586242fb213..7a0f8c9b1ecb 100644
--- a/app/src/main/res/drawable/ic_action_create_dir.xml
+++ b/app/src/main/res/drawable/ic_action_create_dir.xml
@@ -15,9 +15,24 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFF" android:pathData="M10,4L12,6H20A2,2 0 0,1 22,8V18A2,2 0 0,1 20,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10M15,9V12H12V14H15V17H17V14H20V12H17V9H15Z" />
+    <group>
+        <clip-path
+            android:pathData="M1,2l21.9995,0l0,19.5l-21.9995,0z"/>
+        <path
+            android:pathData="M2.4995,18.5C2.4815,19.31 3.1235,19.981 3.9335,20C3.9555,20.001 3.9785,20.001 3.9995,20L19.9995,20C20.8115,20.018 21.4815,19.375 21.4995,18.564C21.5005,18.543 21.5005,18.521 21.4995,18.5L21.4995,5.5L11.4995,5.5C10.7745,5.497 10.0855,5.188 9.6005,4.65L9.1495,4.2C8.7135,3.759 8.1205,3.507 7.4995,3.5L2.4995,3.5L2.4995,18.5ZM3.9995,21.5C2.3435,21.5 0.9995,20.157 0.9995,18.5L0.9995,2L7.4995,2C8.5285,2.004 9.5075,2.439 10.1995,3.2L10.6495,3.65C10.8875,3.857 11.1865,3.98 11.4995,4L22.9995,4L22.9995,18.5C22.9995,20.157 21.6565,21.5 19.9995,21.5L3.9995,21.5Z"
+            android:strokeWidth="1"
+            android:fillColor="#262626"
+            android:fillType="evenOdd"
+            android:strokeColor="#00000000"/>
+    </group>
+    <path
+        android:pathData="M11.2505,15.5547L11.2505,13.3047L9.0005,13.3047C8.5855,13.3047 8.2505,12.9697 8.2505,12.5547C8.2505,12.1407 8.5855,11.8047 9.0005,11.8047L11.2505,11.8047L11.2505,9.5547C11.2505,9.1407 11.5855,8.8047 12.0005,8.8047C12.4145,8.8047 12.7505,9.1407 12.7505,9.5547L12.7505,11.8047L15.0005,11.8047C15.4145,11.8047 15.7505,12.1407 15.7505,12.5547C15.7505,12.9697 15.4145,13.3047 15.0005,13.3047L12.7505,13.3047L12.7505,15.5547C12.7505,15.9697 12.4145,16.3047 12.0005,16.3047C11.5855,16.3047 11.2505,15.9697 11.2505,15.5547"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_action_delete_grey.xml b/app/src/main/res/drawable/ic_action_delete_grey.xml
index 477423538aa1..891d1f3674cb 100644
--- a/app/src/main/res/drawable/ic_action_delete_grey.xml
+++ b/app/src/main/res/drawable/ic_action_delete_grey.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16"
-        android:viewportHeight="16">
-
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#757575"
-        android:pathData="M6.5,1 L6,2 L3,2 C2.446,2,2,2.446,2,3 L2,4 L14,4 L14,3 C14,2.446,13.554,2,13,2 L10,2 L9.5,1 Z M3,5 L3.875,14 C3.935,14.55,4.448,15,5,15 L11,15 C11.552,15,12.064,14.55,12.125,14 L13,5 Z"/>
-</vector>
+        android:fillType="evenOdd"
+        android:pathData="M16,0.5L16,3.5L21.5,3.5C21.9,3.5 22.25,3.85 22.25,4.25C22.25,4.65 21.9,5 21.5,5L21.5,5L20.45,5L19.65,20.65C19.55,22.25 18.25,23.5 16.65,23.5L16.65,23.5L7.4,23.5C5.8,23.5 4.5,22.25 4.4,20.65L4.4,20.65L3.55,5L2.5,5C2.1,5 1.75,4.65 1.75,4.25C1.75,3.85 2.1,3.5 2.5,3.5L2.5,3.5L8,3.5L8,0.5L16,0.5ZM18.95,5L5.05,5L5.9,20.6C5.95,21.4 6.6,22 7.4,22L7.4,22L16.6,22C17.4,22 18.05,21.4 18.1,20.6L18.1,20.6L18.95,5ZM12,7.75C12.4,7.75 12.75,8.1 12.75,8.5L12.75,8.5L12.75,18.5C12.75,18.9 12.4,19.25 12,19.25C11.6,19.25 11.25,18.9 11.25,18.5L11.25,18.5L11.25,8.5C11.25,8.1 11.6,7.75 12,7.75ZM15.5,7.75C15.9,7.75 16.25,8.1 16.25,8.5L16.25,8.5L16.25,18.5C16.25,18.9 15.9,19.25 15.5,19.25C15.1,19.25 14.75,18.9 14.75,18.5L14.75,18.5L14.75,8.5C14.75,8.1 15.1,7.75 15.5,7.75ZM8.5,7.75C8.9,7.75 9.25,8.1 9.25,8.5L9.25,8.5L9.25,18.5C9.25,18.9 8.9,19.25 8.5,19.25C8.1,19.25 7.75,18.9 7.75,18.5L7.75,18.5L7.75,8.5C7.75,8.1 8.1,7.75 8.5,7.75ZM14.5,2L9.5,2L9.5,3.5L14.5,3.5L14.5,2Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
index 6b0ae05eb530..46a473440de2 100644
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" />
+    <path
+        android:pathData="M16,20.75C15.7211,20.7547 15.4485,20.6668 15.225,20.5L4.5,12L15.225,3.5C15.5823,3.2231 16.0601,3.1579 16.4785,3.3288C16.8969,3.4998 17.1924,3.881 17.2535,4.3288C17.3147,4.7767 17.1323,5.2231 16.775,5.5L8.5,12L16.775,18.5C17.2093,18.8255 17.384,19.3941 17.2072,19.9073C17.0304,20.4205 16.5427,20.761 16,20.75Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
index 92429e324ca6..548e9a6798fe 100644
--- a/app/src/main/res/drawable/ic_camera.xml
+++ b/app/src/main/res/drawable/ic_camera.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M4,4H7L9,2H15L17,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4M12,7A5,5 0 0,0 7,12A5,5 0 0,0 12,17A5,5 0 0,0 17,12A5,5 0 0,0 12,7M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9Z" />
+    <path
+        android:pathData="M16.7,3L18.2,5.5L20,5.5C21.65,5.5 23,6.85 23,8.5L23,8.5L23,17C23,18.65 21.65,20 20,20L20,20L4,20C2.35,20 1,18.65 1,17L1,17L1,8.5C1,6.85 2.35,5.5 4,5.5L4,5.5L5.85,5.5L7.35,3L16.7,3ZM15.8,4.5L8.15,4.5L6.65,7L4,7C3.15,7 2.5,7.65 2.5,8.5L2.5,8.5L2.5,17C2.5,17.85 3.15,18.5 4,18.5L4,18.5L20,18.5C20.85,18.5 21.5,17.85 21.5,17L21.5,17L21.5,8.5C21.5,7.65 20.85,7 20,7L20,7L17.3,7L15.8,4.5ZM12,7C14.75,7 17,9.25 17,12C17,14.75 14.75,17 12,17C9.25,17 7,14.75 7,12C7,9.25 9.25,7 12,7ZM12,8.5C10.05,8.5 8.5,10.05 8.5,12C8.5,13.95 10.05,15.5 12,15.5C13.95,15.5 15.5,13.95 15.5,12C15.5,10.05 13.95,8.5 12,8.5ZM19,8.5C19.5523,8.5 20,8.9477 20,9.5C20,10.0523 19.5523,10.5 19,10.5C18.4477,10.5 18,10.0523 18,9.5C18,8.9477 18.4477,8.5 19,8.5Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_checkbox_blank_outline.xml b/app/src/main/res/drawable/ic_checkbox_blank_outline.xml
index 39c515770f1b..0b9cf638c754 100644
--- a/app/src/main/res/drawable/ic_checkbox_blank_outline.xml
+++ b/app/src/main/res/drawable/ic_checkbox_blank_outline.xml
@@ -14,10 +14,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#767676" android:pathData="M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3M19,5V19H5V5H19Z" />
-</vector>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size
+        android:width="24dp"
+        android:height="24dp" />
+    <solid android:color="@color/white" />
+    <stroke
+        android:width="2dp"
+        android:color="@color/list_icon_color" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_checkbox_marked.xml b/app/src/main/res/drawable/ic_checkbox_marked.xml
index 40dda8c0411f..45ec9bbf1ce2 100644
--- a/app/src/main/res/drawable/ic_checkbox_marked.xml
+++ b/app/src/main/res/drawable/ic_checkbox_marked.xml
@@ -15,9 +15,20 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#0082c9" android:pathData="M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
+    <path
+        android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+        android:strokeWidth="1"
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M12,1C18.0751,1 23,5.9249 23,12C23,18.0751 18.0751,23 12,23C5.9249,23 1,18.0751 1,12C1,5.9249 5.9249,1 12,1ZM18.6661,8.279C18.3761,7.955 17.8791,7.927 17.5551,8.217L17.5551,8.217L9.9971,15.773L6.5081,12.285C6.2031,11.99 5.7191,11.991 5.4141,12.286C5.1021,12.589 5.0941,13.087 5.3971,13.399L5.3971,13.399L9.9971,18L18.6661,9.328C18.9331,9.029 18.9331,8.578 18.6661,8.279Z"
+        android:strokeWidth="1"
+        android:fillColor="#73C354"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 6909fa1a68fc..5ca16a6fa173 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
-</vector>
+    <path
+        android:pathData="M13.05,12L17.8,7.25C18.1,6.95 18.1,6.5 17.8,6.2C17.5,5.9 17.05,5.9 16.75,6.2L12,10.95L7.25,6.2C6.95,5.9 6.5,5.9 6.2,6.2C5.9,6.5 5.9,6.95 6.2,7.25L10.95,12L6.2,16.75C5.9,17.05 5.9,17.5 6.2,17.8C6.5,18.1 6.95,18.1 7.25,17.8L12,13.05L16.75,17.8C17.05,18.1 17.5,18.1 17.8,17.8C18.1,17.5 18.1,17.05 17.8,16.75L13.05,12Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cloud_download.xml b/app/src/main/res/drawable/ic_cloud_download.xml
index f87732434c54..8dba401d04ed 100644
--- a/app/src/main/res/drawable/ic_cloud_download.xml
+++ b/app/src/main/res/drawable/ic_cloud_download.xml
@@ -1,5 +1,18 @@
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.66,8.656C19.558,5.663 16.726,3.674 13.512,3.674C11.764,3.674 10.08,4.276 8.722,5.377C8.359,5.289 7.991,5.244 7.622,5.244C5.115,5.244 3.059,7.211 2.917,9.682C1.282,10.608 0.25,12.35 0.25,14.25C0.25,17.145 2.605,19.5 5.5,19.5L8.08,19.5L7.098,18L5.5,18C3.432,18 1.75,16.318 1.75,14.25C1.75,11.451 4.353,10.689 4.443,10.618C4.464,10.444 4.122,9.023 5.253,7.788C5.84,7.147 6.685,6.744 7.622,6.744C8.342,6.744 8.821,6.989 9.079,7.063C9.305,6.87 9.66,6.486 10.312,6.084C11.271,5.492 12.375,5.174 13.512,5.174C15.361,5.174 17.052,5.993 18.188,7.343C19.142,8.474 19.364,9.559 19.439,9.74C19.489,9.781 22.25,10.717 22.25,13.75C22.25,16.093 20.343,18 18,18L16.902,18L15.92,19.5L18,19.5C21.17,19.5 23.75,16.92 23.75,13.75C23.75,11.607 22.548,9.642 20.66,8.656Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M12,10C11.586,10 11.25,10.335 11.25,10.75L11.25,16L7.582,16L12,22.75L16.419,16L12.75,16L12.75,10.75C12.75,10.335 12.414,10 12,10Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml
index 0c0f622bc4c1..fac95d4776ba 100644
--- a/app/src/main/res/drawable/ic_content_copy.xml
+++ b/app/src/main/res/drawable/ic_content_copy.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
+  <path
+      android:pathData="M17,7L17,19.5C17,21.155 15.655,22.5 14,22.5L14,22.5L4.5,22.5C2.845,22.5 1.5,21.155 1.5,19.5L1.5,19.5L1.5,7L17,7ZM15.5,8.5L3,8.5L3,19.5C3,20.325 3.675,21 4.5,21L4.5,21L14,21C14.825,21 15.5,20.325 15.5,19.5L15.5,19.5L15.5,8.5ZM22.5,1.5L22.5,14C22.5,15.655 21.155,17 19.5,17L19.5,17L18.5,17L18.5,15.5L19.5,15.5C20.325,15.5 21,14.825 21,14L21,14L21,3L8.5,3L8.5,5.5L7,5.5L7,1.5L22.5,1.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_decrypt.xml b/app/src/main/res/drawable/ic_decrypt.xml
index 5d6fe71ca3f1..6c432b4de8a5 100644
--- a/app/src/main/res/drawable/ic_decrypt.xml
+++ b/app/src/main/res/drawable/ic_decrypt.xml
@@ -1,8 +1,12 @@
-<!-- drawable/key_minus.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M7.5 3C9.5 3 11.1 4.2 11.7 6H21V9H18V12H15V9H11.7C11.1 10.8 9.4 12 7.5 12C5 12 3 10 3 7.5S5 3 7.5 3M7.5 6C6.7 6 6 6.7 6 7.5S6.7 9 7.5 9 9 8.3 9 7.5 8.3 6 7.5 6M8 17H16V19H8V17Z" />
+  <path
+      android:pathData="M12,0.5C14.3,0.5 16.45,1.75 17.6,3.7C18.2,4.7 18.5,5.85 18.5,7L18.5,7L17,7C17,6.1 16.75,5.2 16.3,4.45C15.4,2.95 13.75,2 12,2C9.25,2 7,4.25 7,7L7,7L7,11L21,11L21,20.5C21,22.15 19.65,23.5 18,23.5L18,23.5L6,23.5C4.35,23.5 3,22.15 3,20.5L3,20.5L3,11L5.5,11L5.5,7C5.5,3.4 8.4,0.5 12,0.5ZM19.5,12.5L4.5,12.5L4.5,20.5C4.5,21.35 5.15,22 6,22L6,22L18,22C18.85,22 19.5,21.35 19.5,20.5L19.5,20.5L19.5,12.5ZM12,15C12.85,15 13.5,15.65 13.5,16.5C13.5,16.95 13.3,17.35 13,17.6L13,17.6L13,19.5L11,19.5L11,17.6C10.7,17.35 10.5,16.95 10.5,16.5C10.5,15.65 11.15,15 12,15Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 38577d823de5..adaa17940dae 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#C4C4C4"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,0.5L16,3.5L21.5,3.5C21.9,3.5 22.25,3.85 22.25,4.25C22.25,4.65 21.9,5 21.5,5L21.5,5L20.45,5L19.65,20.65C19.55,22.25 18.25,23.5 16.65,23.5L16.65,23.5L7.4,23.5C5.8,23.5 4.5,22.25 4.4,20.65L4.4,20.65L3.55,5L2.5,5C2.1,5 1.75,4.65 1.75,4.25C1.75,3.85 2.1,3.5 2.5,3.5L2.5,3.5L8,3.5L8,0.5L16,0.5ZM18.95,5L5.05,5L5.9,20.6C5.95,21.4 6.6,22 7.4,22L7.4,22L16.6,22C17.4,22 18.05,21.4 18.1,20.6L18.1,20.6L18.95,5ZM12,7.75C12.4,7.75 12.75,8.1 12.75,8.5L12.75,8.5L12.75,18.5C12.75,18.9 12.4,19.25 12,19.25C11.6,19.25 11.25,18.9 11.25,18.5L11.25,18.5L11.25,8.5C11.25,8.1 11.6,7.75 12,7.75ZM15.5,7.75C15.9,7.75 16.25,8.1 16.25,8.5L16.25,8.5L16.25,18.5C16.25,18.9 15.9,19.25 15.5,19.25C15.1,19.25 14.75,18.9 14.75,18.5L14.75,18.5L14.75,8.5C14.75,8.1 15.1,7.75 15.5,7.75ZM8.5,7.75C8.9,7.75 9.25,8.1 9.25,8.5L9.25,8.5L9.25,18.5C9.25,18.9 8.9,19.25 8.5,19.25C8.1,19.25 7.75,18.9 7.75,18.5L7.75,18.5L7.75,8.5C7.75,8.1 8.1,7.75 8.5,7.75ZM14.5,2L9.5,2L9.5,3.5L14.5,3.5L14.5,2Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_document_grey600.xml b/app/src/main/res/drawable/ic_document_grey600.xml
index 850b7058bb78..310ca479131a 100644
--- a/app/src/main/res/drawable/ic_document_grey600.xml
+++ b/app/src/main/res/drawable/ic_document_grey600.xml
@@ -18,9 +18,14 @@
     OTHER DEALINGS IN THE FONT SOFTWARE.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M15,18V16H6V18H15M18,14V12H6V14H18Z" />
+    <path
+        android:pathData="M2.5,1L2.5,20C2.5,21.65 3.85,23 5.5,23L15.5,23L20.5,18L20.5,1L2.5,1ZM4,20L4,2.5L19,2.5L19,17L16,17C15.15,17 14.5,17.65 14.5,18.5L14.5,21.5L5.5,21.5C4.65,21.5 4,20.85 4,20Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_grey600.xml b/app/src/main/res/drawable/ic_download_grey600.xml
index 9f59ad902948..cb6fc3b338c2 100644
--- a/app/src/main/res/drawable/ic_download_grey600.xml
+++ b/app/src/main/res/drawable/ic_download_grey600.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M5,20H19V18H5M19,9H15V3H9V9H5L12,16L19,9Z" />
+    <path
+        android:pathData="M21.25,20.5C21.65,20.5 22,20.85 22,21.25C22,21.65 21.65,22 21.25,22L21.25,22L2.75,22C2.35,22 2,21.65 2,21.25C2,20.85 2.35,20.5 2.75,20.5L2.75,20.5ZM12,2C12.4,2 12.75,2.35 12.75,2.75L12.75,2.75L12.75,9.5L16.6,9.5L12,16.5L7.4,9.5L11.25,9.5L11.25,2.75C11.25,2.35 11.6,2 12,2Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index 406f0b5f6f70..c41fa98a2a7a 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -19,16 +19,15 @@
   ~ You should have received a copy of the GNU Affero General Public License
   ~ along with this program. If not, see <https://www.gnu.org/licenses/>.
   -->
-
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
     android:viewportWidth="24"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:ignore="VectorRaster">
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+        android:pathData="M21.25,19.5C21.65,19.5 22,19.85 22,20.25C22,20.65 21.65,21 21.25,21L21.25,21L8.05,21L9.1,19.5ZM3.35,17.15L6.5,19.35L3,21L3.35,17.15ZM13.9,2.1C14.45,1.3 15.7,1.05 16.55,1.65L16.55,1.65L16.686,1.75C17.469,2.375 17.618,3.495 17.05,4.3L17.05,4.3L7.35,18.1L4.2,15.9Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
index 0ed3268c2e4f..8cca61a5963a 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
+    <path
+        android:pathData="M0.5,3.5L0.5,17.5C0.5,19.15 1.85,20.5 3.5,20.5L20.5,20.5C22.15,20.5 23.5,19.15 23.5,17.5L23.5,3.5L0.5,3.5ZM22,5L22,5.95L13.55,13.2C12.65,13.95 11.35,13.95 10.45,13.2L2,5.95L2,5L22,5ZM20.5,19L3.5,19C2.65,19 2,18.35 2,17.5L2,7.95L9.45,14.35C10.2,15 11.1,15.3 12,15.3C12.9,15.3 13.8,15 14.55,14.35L22,7.95L22,17.5C22,18.35 21.35,19 20.5,19Z"
+        android:strokeWidth="1"
+        android:fillColor="#191919"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_encrypt.xml b/app/src/main/res/drawable/ic_encrypt.xml
index d5df418f2512..2ce9cf9b6a25 100644
--- a/app/src/main/res/drawable/ic_encrypt.xml
+++ b/app/src/main/res/drawable/ic_encrypt.xml
@@ -1,8 +1,12 @@
-<!-- drawable/key_plus.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M7.5 3C9.5 3 11.1 4.2 11.7 6H21V9H18V12H15V9H11.7C11.1 10.8 9.4 12 7.5 12C5 12 3 10 3 7.5S5 3 7.5 3M7.5 6C6.7 6 6 6.7 6 7.5S6.7 9 7.5 9 9 8.3 9 7.5 8.3 6 7.5 6M8 17H11V14H13V17H16V19H13V22H11V19H8V17Z" />
+  <path
+      android:pathData="M12,1C15.6,1 18.5,3.9 18.5,7.5L18.5,7.5L18.5,9.5L21,9.5L21,19C21,20.65 19.65,22 18,22L18,22L6,22C4.35,22 3,20.65 3,19L3,19L3,9.5L5.5,9.5L5.5,7.5C5.5,3.9 8.4,1 12,1ZM19.5,11L4.5,11L4.5,19C4.5,19.85 5.15,20.5 6,20.5L6,20.5L18,20.5C18.85,20.5 19.5,19.85 19.5,19L19.5,19L19.5,11ZM12,13.5C12.85,13.5 13.5,14.15 13.5,15C13.5,15.45 13.3,15.85 13,16.1L13,16.1L13,18L11,18L11,16.1C10.7,15.85 10.5,15.45 10.5,15C10.5,14.15 11.15,13.5 12,13.5ZM12,2.5C9.25,2.5 7,4.75 7,7.5L7,7.5L7,9.5L17,9.5L17,7.5C17,4.75 14.75,2.5 12,2.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_export.xml b/app/src/main/res/drawable/ic_export.xml
index f85277e4f725..e30cca02a1dd 100644
--- a/app/src/main/res/drawable/ic_export.xml
+++ b/app/src/main/res/drawable/ic_export.xml
@@ -1,8 +1,12 @@
-<!-- drawable/file_export_outline.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M14 2H6C4.9 2 4 2.9 4 4V20C4 21.1 4.9 22 6 22H18C19.1 22 20 21.1 20 20V8L14 2M18 20H6V4H13V9H18V20M16 11V18.1L13.9 16L11.1 18.8L8.3 16L11.1 13.2L8.9 11H16Z" />
+  <path
+      android:pathData="M8.5,10L8.5,11.5L5,11.5L5,20.5C5,21.327 5.673,22 6.5,22L6.5,22L17.5,22C18.327,22 19,21.327 19,20.5L19,20.5L19,11.5L15.5,11.5L15.5,10L20.5,10L20.5,20.5C20.5,22.157 19.157,23.5 17.5,23.5L17.5,23.5L6.5,23.5C4.843,23.5 3.5,22.157 3.5,20.5L3.5,20.5L3.5,10L8.5,10ZM12,1L16.582,8L12.75,8L12.75,16.75C12.75,17.164 12.414,17.5 12,17.5C11.586,17.5 11.25,17.164 11.25,16.75L11.25,16.75L11.25,8L7.418,8L12,1Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_external.xml b/app/src/main/res/drawable/ic_external.xml
index 15e30be7c181..acc43d2cbabf 100644
--- a/app/src/main/res/drawable/ic_external.xml
+++ b/app/src/main/res/drawable/ic_external.xml
@@ -1,9 +1,12 @@
-<vector android:height="24dp"
-    android:viewportHeight="16"
-    android:viewportWidth="16"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7.452,1.62l2.38,2.256 -3.57,3.386L8.64,9.52l3.57,-3.387 2.38,2.257V1.618h-7.14zM2.69,2.746c-0.66,0 -1.19,0.504 -1.19,1.13v9.028c0,0.625 0.53,1.128 1.19,1.128h9.522c0.66,0 1.19,-0.503 1.19,-1.128V9.52l-1.19,-1.13v4.515h-9.52v-9.03h4.76l-1.19,-1.128H2.69z" />
-</vector>
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.65,3L14.15,4.5L4.5,4.5L4.5,18C4.5,18.85 5.15,19.5 6,19.5L6,19.5L18,19.5C18.85,19.5 19.5,18.85 19.5,18L19.5,18L19.5,9.85L21,11.35L21,18C21,19.65 19.65,21 18,21L18,21L6,21C4.35,21 3,19.65 3,18L3,18L3,3L12.65,3ZM22.7,1.35L21.05,9.25L18.45,6.65L10.9,14.2C10.75,14.35 10.55,14.4 10.35,14.4C10.15,14.4 9.95,14.35 9.8,14.2C9.5,13.9 9.5,13.45 9.8,13.15L9.8,13.15L17.35,5.6L14.75,3L22.7,1.35Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_folder_overlay_account_group.xml b/app/src/main/res/drawable/ic_folder_overlay_account_group.xml
deleted file mode 100644
index 53a18cc4c7cb..000000000000
--- a/app/src/main/res/drawable/ic_folder_overlay_account_group.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12,5.5A3.5,3.5 0,0 1,15.5 9A3.5,3.5 0,0 1,12 12.5A3.5,3.5 0,0 1,8.5 9A3.5,3.5 0,0 1,12 5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0,0 1,2 11A3,3 0,0 1,5 8M19,8A3,3 0,0 1,22 11A3,3 0,0 1,19 14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_overlay_external.xml b/app/src/main/res/drawable/ic_folder_overlay_external.xml
deleted file mode 100644
index d4ddea4ea0ef..000000000000
--- a/app/src/main/res/drawable/ic_folder_overlay_external.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0,0 0,5 21H19A2,2 0,0 0,21 19V12H19V19Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_overlay_key.xml b/app/src/main/res/drawable/ic_folder_overlay_key.xml
deleted file mode 100644
index 381992f9e1e2..000000000000
--- a/app/src/main/res/drawable/ic_folder_overlay_key.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M7,14C5.9,14 5,13.1 5,12S5.9,10 7,10 9,10.9 9,12 8.1,14 7,14M12.6,10C11.8,7.7 9.6,6 7,6C3.7,6 1,8.7 1,12S3.7,18 7,18C9.6,18 11.8,16.3 12.6,14H16V18H20V14H23V10H12.6Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_overlay_link.xml b/app/src/main/res/drawable/ic_folder_overlay_link.xml
deleted file mode 100644
index c8aea32fa283..000000000000
--- a/app/src/main/res/drawable/ic_folder_overlay_link.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M10.59,13.41C11,13.8 11,14.44 10.59,14.83C10.2,15.22 9.56,15.22 9.17,14.83C7.22,12.88 7.22,9.71 9.17,7.76V7.76L12.71,4.22C14.66,2.27 17.83,2.27 19.78,4.22C21.73,6.17 21.73,9.34 19.78,11.29L18.29,12.78C18.3,11.96 18.17,11.14 17.89,10.36L18.36,9.88C19.54,8.71 19.54,6.81 18.36,5.64C17.19,4.46 15.29,4.46 14.12,5.64L10.59,9.17C9.41,10.34 9.41,12.24 10.59,13.41M13.41,9.17C13.8,8.78 14.44,8.78 14.83,9.17C16.78,11.12 16.78,14.29 14.83,16.24V16.24L11.29,19.78C9.34,21.73 6.17,21.73 4.22,19.78C2.27,17.83 2.27,14.66 4.22,12.71L5.71,11.22C5.7,12.04 5.83,12.86 6.11,13.65L5.64,14.12C4.46,15.29 4.46,17.19 5.64,18.36C6.81,19.54 8.71,19.54 9.88,18.36L13.41,14.83C14.59,13.66 14.59,11.76 13.41,10.59C13,10.2 13,9.56 13.41,9.17Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_overlay_lock.xml b/app/src/main/res/drawable/ic_folder_overlay_lock.xml
deleted file mode 100644
index 761e502767bd..000000000000
--- a/app/src/main/res/drawable/ic_folder_overlay_lock.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M12,17A2,2 0,0 0,14 15C14,13.89 13.1,13 12,13A2,2 0,0 0,10 15A2,2 0,0 0,12 17M18,8A2,2 0,0 1,20 10V20A2,2 0,0 1,18 22H6A2,2 0,0 1,4 20V10C4,8.89 4.9,8 6,8H7V6A5,5 0,0 1,12 1A5,5 0,0 1,17 6V8H18M12,3A3,3 0,0 0,9 6V8H15V6A3,3 0,0 0,12 3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_overlay_share.xml b/app/src/main/res/drawable/ic_folder_overlay_share.xml
deleted file mode 100644
index 15d238ea662a..000000000000
--- a/app/src/main/res/drawable/ic_folder_overlay_share.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8A3,3 0,0 0,21 5A3,3 0,0 0,18 2A3,3 0,0 0,15 5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9A3,3 0,0 0,3 12A3,3 0,0 0,6 15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19A2.92,2.92 0,0 0,18 16.08Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_overlay_upload.xml b/app/src/main/res/drawable/ic_folder_overlay_upload.xml
deleted file mode 100644
index cccfb3308519..000000000000
--- a/app/src/main/res/drawable/ic_folder_overlay_upload.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Nextcloud Android client application
-
- @author Alper Öztürk
- Copyright (C) 2023 Alper Öztürk
- Copyright (C) 2023 Nextcloud GmbH
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FFFFFF"
-      android:pathData="M9,16V10H5L12,3L19,10H15V16H9M5,20V18H19V20H5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_image_grey600.xml b/app/src/main/res/drawable/ic_image_grey600.xml
index 161ec0ee9ea1..6359567b982a 100644
--- a/app/src/main/res/drawable/ic_image_grey600.xml
+++ b/app/src/main/res/drawable/ic_image_grey600.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M8.5,13.5L11,16.5L14.5,12L19,18H5M21,19V5C21,3.89 20.1,3 19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19Z" />
+    <path
+        android:pathData="M21,1L21,18L16,23L6,23C4.345,23 3,21.655 3,20L3,20L3,1L21,1ZM19.5,2.5L4.5,2.5L4.5,20C4.5,20.825 5.175,21.5 6,21.5L6,21.5L15,21.5L15,18.5C15,17.67 15.67,17 16.5,17L16.5,17L19.5,17L19.5,2.5ZM13.5,9L17.77,14.5L6.23,14.5L9.36,10.465L10.86,12.4L13.5,9ZM7.75,7C8.4404,7 9,7.5596 9,8.25C9,8.9404 8.4404,9.5 7.75,9.5C7.0596,9.5 6.5,8.9404 6.5,8.25C6.5,7.5596 7.0596,7 7.75,7Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_information_outline.xml b/app/src/main/res/drawable/ic_information_outline.xml
index 4aee33e733d3..f281b96d754b 100644
--- a/app/src/main/res/drawable/ic_information_outline.xml
+++ b/app/src/main/res/drawable/ic_information_outline.xml
@@ -20,5 +20,10 @@
     android:width="18dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z" />
+  <path
+      android:pathData="M12,1C18.1,1 23,5.9 23,12C23,18.1 18.1,23 12,23C5.9,23 1,18.1 1,12C1,5.9 5.9,1 12,1ZM12,2.5C6.75,2.5 2.5,6.75 2.5,12C2.5,17.25 6.75,21.5 12,21.5C17.25,21.5 21.5,17.25 21.5,12C21.5,6.75 17.25,2.5 12,2.5ZM13,10.5L13,17L11,17L11,10.5L13,10.5ZM12,6.5C12.69,6.5 13.25,7.06 13.25,7.75C13.25,8.44 12.69,9 12,9C11.31,9 10.75,8.44 10.75,7.75C10.75,7.06 11.31,6.5 12,6.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
index ad33063c8028..c40d4c7646e2 100644
--- a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
@@ -1,9 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
-</vector>
+        android:pathData="M12,17.83L3,8.83C2.5112,8.3412 2.5112,7.5488 3,7.06C3.4888,6.5712 4.2812,6.5712 4.77,7.06L12,14.29L19.235,7.055C19.7261,6.5819 20.5058,6.5898 20.9873,7.0727C21.4688,7.5555 21.4745,8.3352 21,8.825L12,17.83Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index 5f7c29ff94db..deb21cbe2e3d 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -1,8 +1,12 @@
-<!-- drawable/lock_outline.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M12,17C10.89,17 10,16.1 10,15C10,13.89 10.89,13 12,13A2,2 0 0,1 14,15A2,2 0 0,1 12,17M18,20V10H6V20H18M18,8A2,2 0 0,1 20,10V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V10C4,8.89 4.89,8 6,8H7V6A5,5 0 0,1 12,1A5,5 0 0,1 17,6V8H18M12,3A3,3 0 0,0 9,6V8H15V6A3,3 0 0,0 12,3Z" />
+    <path
+        android:pathData="M12,1C15.6,1 18.5,3.9 18.5,7.5L18.5,7.5L18.5,9.5L21,9.5L21,19C21,20.65 19.65,22 18,22L18,22L6,22C4.35,22 3,20.65 3,19L3,19L3,9.5L5.5,9.5L5.5,7.5C5.5,3.9 8.4,1 12,1ZM19.5,11L4.5,11L4.5,19C4.5,19.85 5.15,20.5 6,20.5L6,20.5L18,20.5C18.85,20.5 19.5,19.85 19.5,19L19.5,19L19.5,11ZM12,13.5C12.85,13.5 13.5,14.15 13.5,15C13.5,15.45 13.3,15.85 13,16.1L13,16.1L13,18L11,18L11,16.1C10.7,15.85 10.5,15.45 10.5,15C10.5,14.15 11.15,13.5 12,13.5ZM12,2.5C9.25,2.5 7,4.75 7,7.5L7,7.5L7,9.5L17,9.5L17,7.5C17,4.75 14.75,2.5 12,2.5Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock_open_white.xml b/app/src/main/res/drawable/ic_lock_open_white.xml
index 912b81bca976..084f957b8b43 100644
--- a/app/src/main/res/drawable/ic_lock_open_white.xml
+++ b/app/src/main/res/drawable/ic_lock_open_white.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M18,20V10H6V20H18M18,8A2,2 0 0,1 20,10V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V10A2,2 0 0,1 6,8H15V6A3,3 0 0,0 12,3A3,3 0 0,0 9,6H7A5,5 0 0,1 12,1A5,5 0 0,1 17,6V8H18M12,17A2,2 0 0,1 10,15A2,2 0 0,1 12,13A2,2 0 0,1 14,15A2,2 0 0,1 12,17Z" />
-</vector>
+    <path
+        android:pathData="M12,0.5C14.3,0.5 16.45,1.75 17.6,3.7C18.2,4.7 18.5,5.85 18.5,7L18.5,7L17,7C17,6.1 16.75,5.2 16.3,4.45C15.4,2.95 13.75,2 12,2C9.25,2 7,4.25 7,7L7,7L7,11L21,11L21,20.5C21,22.15 19.65,23.5 18,23.5L18,23.5L6,23.5C4.35,23.5 3,22.15 3,20.5L3,20.5L3,11L5.5,11L5.5,7C5.5,3.4 8.4,0.5 12,0.5ZM19.5,12.5L4.5,12.5L4.5,20.5C4.5,21.35 5.15,22 6,22L6,22L18,22C18.85,22 19.5,21.35 19.5,20.5L19.5,20.5L19.5,12.5ZM12,15C12.85,15 13.5,15.65 13.5,16.5C13.5,16.95 13.3,17.35 13,17.6L13,17.6L13,19.5L11,19.5L11,17.6C10.7,17.35 10.5,16.95 10.5,16.5C10.5,15.65 11.15,15 12,15Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_movie_grey600.xml b/app/src/main/res/drawable/ic_movie_grey600.xml
index b57b6be1637f..5a75902ad13b 100644
--- a/app/src/main/res/drawable/ic_movie_grey600.xml
+++ b/app/src/main/res/drawable/ic_movie_grey600.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M18,4L20,8H17L15,4H13L15,8H12L10,4H8L10,8H7L5,4H4A2,2 0 0,0 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V4H18Z" />
+    <path
+        android:pathData="M20,5L20,8.8L21.8,7L23.5,7L23.5,17L21.8,17L20,15.2L20,17C20,18.65 18.65,20 17,20L17,20L5,20C3.35,20 2,18.65 2,17L2,17L2,10.5L0.5,10.5L0.5,6.5L2,6.5L2,5L20,5ZM18.5,6.5L3.5,6.5L3.5,17C3.5,17.85 4.15,18.5 5,18.5L5,18.5L17,18.5C17.85,18.5 18.5,17.85 18.5,17L18.5,17L18.5,6.5ZM9,9.25L14,12.5L9,15.75L9,9.25ZM22,8.9L20,10.9L20,13.1L22,15.1L22,8.9Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_music_grey600.xml b/app/src/main/res/drawable/ic_music_grey600.xml
index 947c54f72a04..807b96aa2050 100644
--- a/app/src/main/res/drawable/ic_music_grey600.xml
+++ b/app/src/main/res/drawable/ic_music_grey600.xml
@@ -18,9 +18,14 @@
     OTHER DEALINGS IN THE FONT SOFTWARE.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M21,3V15.5A3.5,3.5 0 0,1 17.5,19A3.5,3.5 0 0,1 14,15.5A3.5,3.5 0 0,1 17.5,12C18.04,12 18.55,12.12 19,12.34V6.47L9,8.6V17.5A3.5,3.5 0 0,1 5.5,21A3.5,3.5 0 0,1 2,17.5A3.5,3.5 0 0,1 5.5,14C6.04,14 6.55,14.12 7,14.34V6L21,3Z" />
+    <path
+        android:pathData="M7.5,4.89L7.5,16.95C6.965,16.585 6.315,16.335 5.615,16.255C3.725,16.04 2.175,17.14 2.15,18.715C2.13,20.29 3.645,21.745 5.535,21.96C7.43,22.175 9,21.075 9,19.5L9,8.11L19.5,5.92L19.5,14.45C18.965,14.085 18.315,13.835 17.615,13.755C15.725,13.54 14.175,14.64 14.15,16.215C14.13,17.79 15.645,19.245 17.535,19.46C19.43,19.675 21,18.575 21,17L21,2.08L7.5,4.89Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow.xml b/app/src/main/res/drawable/ic_play_arrow.xml
index 462823ddf1ed..7217797d6168 100644
--- a/app/src/main/res/drawable/ic_play_arrow.xml
+++ b/app/src/main/res/drawable/ic_play_arrow.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M8,5.14V19.14L19,12.14L8,5.14Z" />
+  <path
+      android:pathData="M6,20l14,-8l-14,-8z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_plus.xml b/app/src/main/res/drawable/ic_plus.xml
index 13794d9cae34..a65f3452bb4a 100644
--- a/app/src/main/res/drawable/ic_plus.xml
+++ b/app/src/main/res/drawable/ic_plus.xml
@@ -16,9 +16,14 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+    <path
+        android:pathData="M19.5,10.75L13.25,10.75L13.25,4.5C13.25,3.8096 12.6904,3.25 12,3.25C11.3096,3.25 10.75,3.8096 10.75,4.5L10.75,10.75L4.5,10.75C3.8096,10.75 3.25,11.3096 3.25,12C3.25,12.6904 3.8096,13.25 4.5,13.25L10.75,13.25L10.75,19.5C10.75,20.1904 11.3096,20.75 12,20.75C12.6904,20.75 13.25,20.1904 13.25,19.5L13.25,13.25L19.5,13.25C20.1904,13.25 20.75,12.6904 20.75,12C20.75,11.3096 20.1904,10.75 19.5,10.75Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_rename.xml b/app/src/main/res/drawable/ic_rename.xml
index 6d040a767d3a..c41fa98a2a7a 100644
--- a/app/src/main/res/drawable/ic_rename.xml
+++ b/app/src/main/res/drawable/ic_rename.xml
@@ -1,10 +1,33 @@
+<!--
+  ~
+  ~ Nextcloud Android client application
+  ~
+  ~ @author Tobias Kaminsky
+  ~ Copyright (C) 2019 Tobias Kaminsky
+  ~ Copyright (C) 2019 Nextcloud GmbH
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program. If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M21.2,42 L28.2,35H43.5V42ZM38.2,14.7 L31.8,8.3 33.9,6.2Q34.75,5.35 36.025,5.375Q37.3,5.4 38.15,6.25L40.3,8.4Q41.15,9.25 41.15,10.5Q41.15,11.75 40.3,12.6ZM36.1,16.8 L10.9,42H4.5V35.6L29.7,10.4Z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M21.25,19.5C21.65,19.5 22,19.85 22,20.25C22,20.65 21.65,21 21.25,21L21.25,21L8.05,21L9.1,19.5ZM3.35,17.15L6.5,19.35L3,21L3.35,17.15ZM13.9,2.1C14.45,1.3 15.7,1.05 16.55,1.65L16.55,1.65L16.686,1.75C17.469,2.375 17.618,3.495 17.05,4.3L17.05,4.3L7.35,18.1L4.2,15.9Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_scan_document.xml b/app/src/main/res/drawable/ic_scan_document.xml
index 780fa2153f18..baf5086fdf92 100644
--- a/app/src/main/res/drawable/ic_scan_document.xml
+++ b/app/src/main/res/drawable/ic_scan_document.xml
@@ -1,13 +1,48 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
-    android:autoMirrored="true"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    tools:ignore="VectorRaster">
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M1,16.9634l6.0529,0l0,6.0366l-6.0529,0z"/>
     <path
-        android:fillColor="#FF000000"
-        android:fillType="nonZero"
-        android:pathData="M23,21.1663C23,22.1728 22.1728,23 21.1663,23L17.5,23L17.5,21.1663L21.1663,21.1663L21.1663,17.5L23,17.5L23,21.1663ZM2.8337,23C1.8272,23 1,22.1728 1,21.1663L1,17.5L2.8337,17.5L2.8337,21.1663L6.5,21.1663L6.5,23L2.8337,23ZM6.4483,4.85C6.1645,4.85 5.9423,5.0744 5.9423,5.3604L5.9423,18.6396C5.9423,18.9256 6.1645,19.15 6.4483,19.15L17.5616,19.15C17.8443,19.15 18.0665,18.9256 18.0665,18.6396L18.0665,7.9146L15.036,4.85L6.4483,4.85ZM7.963,16.0854L12.0044,16.0854L12.0044,17.1073L7.963,17.1073L7.963,16.0854ZM7.963,13.0219L16.0458,13.0219L16.0458,14.0427L7.963,14.0427L7.963,13.0219ZM7.963,9.9573L13.0153,9.9573L13.0153,10.9781L7.963,10.9781L7.963,9.9573ZM7.963,6.8927L14.0251,6.8927L14.0251,7.9146L7.963,7.9146L7.963,6.8927ZM1,2.8337C1,1.8272 1.8272,1 2.8337,1L6.5,1L6.5,2.8337L2.8337,2.8337L2.8337,6.5L1,6.5L1,2.8337ZM21.1663,1C22.1728,1 23,1.8272 23,2.8337L23,6.5L21.1663,6.5L21.1663,2.8337L17.5,2.8337L17.5,1L21.1663,1Z" />
+        android:pathData="M2.4999,20.0004L2.4999,17.7134C2.4999,17.2994 2.1649,16.9634 1.7499,16.9634C1.3359,16.9634 0.9999,17.2994 0.9999,17.7134L0.9999,20.0004C0.9999,21.6564 2.3429,23.0004 3.9999,23.0004L6.3029,23.0004C6.7169,23.0004 7.0529,22.6644 7.0529,22.2504C7.0529,21.8354 6.7169,21.5004 6.3029,21.5004L3.9999,21.5004C3.1719,21.5004 2.4999,20.8284 2.4999,20.0004"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+  </group>
+  <group>
+    <clip-path
+        android:pathData="M1,1.0006l6.0529,0l0,6.036l-6.0529,0z"/>
+    <path
+        android:pathData="M2.4999,6.2866L2.4999,4.0006C2.4999,3.1716 3.1719,2.5006 3.9999,2.5006L6.3029,2.5006C6.7169,2.5006 7.0529,2.1646 7.0529,1.7506C7.0529,1.3356 6.7169,1.0006 6.3029,1.0006L3.9999,1.0006C2.3429,1.0006 0.9999,2.3436 0.9999,4.0006L0.9999,6.2866C0.9999,6.7006 1.3359,7.0366 1.7499,7.0366C2.1649,7.0366 2.4999,6.7006 2.4999,6.2866"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+  </group>
+  <path
+      android:pathData="M21.4999,4.0004L21.4999,6.2864C21.4999,6.7004 21.8359,7.0364 22.2499,7.0364C22.6639,7.0364 22.9999,6.7004 22.9999,6.2864L22.9999,4.0004C22.9999,2.3434 21.6569,1.0004 19.9999,1.0004L17.7289,1.0004C17.3149,1.0004 16.9789,1.3354 16.9789,1.7504C16.9789,2.1644 17.3149,2.5004 17.7289,2.5004L19.9999,2.5004C20.8279,2.5004 21.4999,3.1714 21.4999,4.0004"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <group>
+    <clip-path
+        android:pathData="M16.9789,16.9633l6.021,0l0,6.0367l-6.021,0z"/>
+    <path
+        android:pathData="M21.4999,17.7133L21.4999,20.0003C21.4999,20.8283 20.8279,21.5003 19.9999,21.5003L17.7289,21.5003C17.3149,21.5003 16.9789,21.8353 16.9789,22.2503C16.9789,22.6643 17.3149,23.0003 17.7289,23.0003L19.9999,23.0003C21.6569,23.0003 22.9999,21.6563 22.9999,20.0003L22.9999,17.7133C22.9999,17.2993 22.6639,16.9633 22.2499,16.9633C21.8359,16.9633 21.4999,17.2993 21.4999,17.7133"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+  </group>
+  <path
+      android:pathData="M9.7499,11.0004C9.3359,11.0004 8.9999,10.6644 8.9999,10.2504C8.9999,9.8354 9.3359,9.5004 9.7499,9.5004L14.7499,9.5004C15.1639,9.5004 15.4999,9.8354 15.4999,10.2504C15.4999,10.6644 15.1639,11.0004 14.7499,11.0004L9.7499,11.0004ZM9.7499,14.0004C9.3359,14.0004 8.9999,13.6644 8.9999,13.2504C8.9999,12.8354 9.3359,12.5004 9.7499,12.5004L14.7499,12.5004C15.1639,12.5004 15.4999,12.8354 15.4999,13.2504C15.4999,13.6644 15.1639,14.0004 14.7499,14.0004L9.7499,14.0004ZM6.4999,16.5004C6.4809,17.3094 7.1219,17.9804 7.9309,18.0004L7.9999,18.0004L15.9999,18.0004C16.8109,18.0184 17.4809,17.3764 17.4999,16.5664C17.5009,16.5444 17.5009,16.5214 17.4999,16.5004L17.4999,6.0004L6.4999,6.0004L6.4999,16.5004ZM7.9999,19.5004C6.3429,19.5004 4.9999,18.1564 4.9999,16.5004L4.9999,4.5004L18.9999,4.5004L18.9999,16.5004C18.9999,18.1564 17.6569,19.5004 15.9999,19.5004L7.9999,19.5004Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_sd.xml b/app/src/main/res/drawable/ic_sd.xml
index daa92fd8a3cd..3c4e7c2e5127 100644
--- a/app/src/main/res/drawable/ic_sd.xml
+++ b/app/src/main/res/drawable/ic_sd.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M18,8H16V4H18M15,8H13V4H15M12,8H10V4H12M18,2H10L4,8V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V4A2,2 0 0,0 18,2Z" />
+    <path
+        android:pathData="M21,1L21,20C21,21.65 19.65,23 18,23L18,23L6,23C4.35,23 3,21.65 3,20L3,20L3,7.5L9.5,1L21,1ZM19.5,2.5L10.1,2.5L4.5,8.1L4.5,20C4.5,20.85 5.15,21.5 6,21.5L6,21.5L18,21.5C18.85,21.5 19.5,20.85 19.5,20L19.5,20L19.5,2.5ZM14.5,9C15.9,9 17,10.1 17,11.5L17,11.5L17,16.5C17,17.9 15.9,19 14.5,19L14.5,19L9.5,19C8.1,19 7,17.9 7,16.5L7,16.5L7,11.5C7,10.1 8.1,9 9.5,9L9.5,9ZM14.5,10.5L9.5,10.5C8.95,10.5 8.5,10.95 8.5,11.5L8.5,11.5L8.5,16.5C8.5,17.05 8.95,17.5 9.5,17.5L9.5,17.5L14.5,17.5C15.05,17.5 15.5,17.05 15.5,16.5L15.5,16.5L15.5,11.5C15.5,10.95 15.05,10.5 14.5,10.5L14.5,10.5Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_sd_grey600.xml b/app/src/main/res/drawable/ic_sd_grey600.xml
index bec04f8f1fb1..a839b4e568cf 100644
--- a/app/src/main/res/drawable/ic_sd_grey600.xml
+++ b/app/src/main/res/drawable/ic_sd_grey600.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M18,8H16V4H18M15,8H13V4H15M12,8H10V4H12M18,2H10L4,8V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V4A2,2 0 0,0 18,2Z" />
+    <path
+        android:pathData="M16,0.5C17.65,0.5 19,1.85 19,3.5L19,3.5L19,20.5C19,22.15 17.65,23.5 16,23.5L16,23.5L8,23.5C6.35,23.5 5,22.15 5,20.5L5,20.5L5,3.5C5,1.85 6.35,0.5 8,0.5L8,0.5ZM10,2L8,2C7.15,2 6.5,2.65 6.5,3.5L6.5,3.5L6.5,20.5C6.5,21.35 7.15,22 8,22L8,22L16,22C16.85,22 17.5,21.35 17.5,20.5L17.5,20.5L17.5,3.5C17.5,2.65 16.85,2 16,2L16,2L14,2L14,3.5L10,3.5L10,2ZM12,18.5C12.6904,18.5 13.25,19.0596 13.25,19.75C13.25,20.4404 12.6904,21 12,21C11.3096,21 10.75,20.4404 10.75,19.75C10.75,19.0596 11.3096,18.5 12,18.5Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 306d9790a348..6451fc6fd51c 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
+    <path
+        android:pathData="M21.4,19.6L16.5,14.7C17.45,13.4 18.05,11.75 18.05,10C18.05,5.6 14.45,2 10.05,2C5.65,2 2,5.6 2,10C2,14.4 5.6,18 10,18C11.75,18 13.4,17.45 14.7,16.45L19.6,21.35C20.1,21.85 20.9,21.85 21.35,21.35C21.85,20.9 21.85,20.1 21.4,19.6ZM3.5,10C3.5,6.4 6.4,3.5 10,3.5C13.6,3.5 16.5,6.4 16.5,10C16.5,13.6 13.6,16.5 10,16.5C6.4,16.5 3.5,13.6 3.5,10Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search_grey.xml b/app/src/main/res/drawable/ic_search_grey.xml
index 2302badec865..1e53d792b815 100644
--- a/app/src/main/res/drawable/ic_search_grey.xml
+++ b/app/src/main/res/drawable/ic_search_grey.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
+    <path
+        android:fillColor="#757575"
+        android:fillType="evenOdd"
+        android:pathData="M21.4,19.6L16.5,14.7C17.45,13.4 18.05,11.75 18.05,10C18.05,5.6 14.45,2 10.05,2C5.65,2 2,5.6 2,10C2,14.4 5.6,18 10,18C11.75,18 13.4,17.45 14.7,16.45L19.6,21.35C20.1,21.85 20.9,21.85 21.35,21.35C21.85,20.9 21.85,20.1 21.4,19.6ZM3.5,10C3.5,6.4 6.4,3.5 10,3.5C13.6,3.5 16.5,6.4 16.5,10C16.5,13.6 13.6,16.5 10,16.5C6.4,16.5 3.5,13.6 3.5,10Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search_light_grey.xml b/app/src/main/res/drawable/ic_search_light_grey.xml
index e37bd21b8bfc..366732bf5554 100644
--- a/app/src/main/res/drawable/ic_search_light_grey.xml
+++ b/app/src/main/res/drawable/ic_search_light_grey.xml
@@ -1,5 +1,12 @@
-<vector android:alpha="0.5" android:height="72dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF969696" android:pathData="M9.5,3A6.5,6.5 0,0 1,16 9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0,0 1,3 9.5A6.5,6.5 0,0 1,9.5 3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF969696"
+        android:fillType="evenOdd"
+        android:pathData="M21.4,19.6L16.5,14.7C17.45,13.4 18.05,11.75 18.05,10C18.05,5.6 14.45,2 10.05,2C5.65,2 2,5.6 2,10C2,14.4 5.6,18 10,18C11.75,18 13.4,17.45 14.7,16.45L19.6,21.35C20.1,21.85 20.9,21.85 21.35,21.35C21.85,20.9 21.85,20.1 21.4,19.6ZM3.5,10C3.5,6.4 6.4,3.5 10,3.5C13.6,3.5 16.5,6.4 16.5,10C16.5,13.6 13.6,16.5 10,16.5C6.4,16.5 3.5,13.6 3.5,10Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 1e55d1232b8b..f3e8f5834590 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.966,5C10.328,5.426 9.748,5.929 9.241,6.5L9.241,6.5L4,6.5L4,18C4,18.827 4.673,19.5 5.5,19.5L5.5,19.5L17.5,19.5C18.327,19.5 19,18.827 19,18L19,18L19,10.325L20.5,9.342L20.5,18C20.5,19.657 19.157,21 17.5,21L17.5,21L5.5,21C3.843,21 2.5,19.657 2.5,18L2.5,18L2.5,5ZM16.5,1.332L23.25,5.75L16.5,10.168L16.5,6.5L15.887,6.5C12.641,6.5 10,9.141 10,12.387L10,12.387L10,14.708C10,15.123 9.664,15.458 9.25,15.458C8.836,15.458 8.5,15.123 8.5,14.708L8.5,14.708L8.5,12.387C8.5,8.314 11.814,5 15.887,5L15.887,5L16.5,5L16.5,1.332Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
index 62098dfa298b..290f4d2b8a74 100644
--- a/app/src/main/res/drawable/ic_star.xml
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M12,17.27L18.18,21L16.54,13.97L22,9.24L14.81,8.62L12,2L9.19,8.62L2,9.24L7.45,13.97L5.82,21L12,17.27Z" />
+  <path
+      android:pathData="M13,2.41L15.45,8.41L21.95,8.885C22.376,8.931 22.733,9.23 22.853,9.641C22.974,10.053 22.834,10.496 22.5,10.765L17.54,14.955L19.09,21.265C19.189,21.683 19.027,22.119 18.68,22.372C18.332,22.624 17.867,22.643 17.5,22.42L12,19L6.5,22.42C6.133,22.643 5.668,22.624 5.32,22.372C4.973,22.119 4.811,21.683 4.91,21.265L6.46,14.955L1.5,10.765C1.168,10.487 1.039,10.035 1.173,9.624C1.307,9.212 1.678,8.924 2.11,8.895L8.61,8.42L11.06,2.42C11.231,2.038 11.609,1.792 12.027,1.79C12.445,1.788 12.825,2.03 13,2.41Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_outline.xml b/app/src/main/res/drawable/ic_star_outline.xml
index 4920bfe44120..8e5f5e86d602 100644
--- a/app/src/main/res/drawable/ic_star_outline.xml
+++ b/app/src/main/res/drawable/ic_star_outline.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M12,15.39L8.24,17.66L9.23,13.38L5.91,10.5L10.29,10.13L12,6.09L13.71,10.13L18.09,10.5L14.77,13.38L15.76,17.66M22,9.24L14.81,8.63L12,2L9.19,8.63L2,9.24L7.45,13.97L5.82,21L12,17.27L18.18,21L16.54,13.97L22,9.24Z" />
+  <path
+      android:pathData="M23.55,9.4C23.3,8.7 22.7,8.2 21.95,8.15L15.95,7.7L13.7,2.15C13.4,1.45 12.75,1 12,1C11.25,1 10.6,1.45 10.3,2.15L8,7.75L2,8.2C1.25,8.25 0.65,8.75 0.4,9.45C0.15,10.15 0.4,10.9 0.95,11.4L5.55,15.3L4.15,21.1C4,21.8 4.25,22.55 4.85,23C5.15,23.25 5.55,23.35 5.9,23.35C6.25,23.35 6.55,23.25 6.85,23.1L12,19.9L17.1,23.1C17.75,23.5 18.5,23.45 19.1,23.05C19.7,22.6 19.95,21.85 19.8,21.15L18.35,15.3L22.95,11.4C23.55,10.85 23.8,10.1 23.55,9.4ZM22.05,10.2L16.75,14.7L18.4,21.45C18.45,21.65 18.35,21.75 18.3,21.8C18.25,21.85 18.1,21.9 17.95,21.8L12,18.1L6.1,21.75C5.95,21.85 5.8,21.8 5.75,21.75C5.7,21.7 5.6,21.6 5.65,21.4L7.3,14.65L2,10.15C1.85,10.05 1.9,9.9 1.9,9.8C1.9,9.75 2,9.6 2.15,9.6L9.1,9.1L11.75,2.65C11.8,2.5 11.9,2.5 12,2.5C12.1,2.5 12.2,2.55 12.3,2.7L14.95,9.15L21.9,9.65C22.1,9.65 22.15,9.8 22.15,9.85C22.15,9.95 22.15,10.1 22.05,10.2Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_synced.xml b/app/src/main/res/drawable/ic_synced.xml
index 0e543a3323f2..37ca29342781 100644
--- a/app/src/main/res/drawable/ic_synced.xml
+++ b/app/src/main/res/drawable/ic_synced.xml
@@ -1,17 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="4.233333"
-    android:viewportHeight="4.2333336">
-  <path
-      android:pathData="M2.1167,2.11002m-2.1167,0a2.1167,2.1167 0,1 1,4.2334 0a2.1167,2.1167 0,1 1,-4.2334 0"
-      android:strokeWidth=".25066"
-      android:fillColor="#5eb220"/>
-  <path
-      android:pathData="m0.79642,2.24002 l0.93278,0.93284 1.7265,-1.7267"
-      android:strokeLineJoin="round"
-      android:strokeWidth=".52916"
-      android:fillColor="#00000000"
-      android:strokeColor="#faffff"
-      android:strokeLineCap="round"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#73c354"
+        android:fillType="evenOdd"
+        android:pathData="M19.8,4.1a11.14,11.14 0,0 0,-15.6 0.1A11,11 0,0 0,12 23a11.4,11.4 0,0 0,7.8 -3.2l0.1,-0.1A11.14,11.14 0,0 0,19.8 4.1ZM18.7,9.3 L10,18 5.4,13.4a0.78,0.78 0,0 1,1.1 -1.1L10,15.8l7.6,-7.6a0.71,0.71 0,0 1,1.1 0.1A0.91,0.91 0,0 1,18.7 9.3Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_synchronizing.xml b/app/src/main/res/drawable/ic_synchronizing.xml
index 236bc29d72f3..eead88461221 100644
--- a/app/src/main/res/drawable/ic_synchronizing.xml
+++ b/app/src/main/res/drawable/ic_synchronizing.xml
@@ -1,38 +1,32 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="4.233333"
-    android:viewportHeight="4.2333336">
-  <path
-      android:pathData="M2.1167,2.11002m-2.1167,0a2.1167,2.1167 0,1 1,4.2334 0a2.1167,2.1167 0,1 1,-4.2334 0"
-      android:strokeWidth=".25066"
-      android:fillColor="#2268ab"/>
-  <path
-      android:pathData="m3.0714,2.66a1.1024,1.1024 0,0 1,-0.95473 0.55121,1.1024 1.1024,0 0,1 -0.95473,-0.55121"
-      android:strokeLineJoin="round"
-      android:strokeWidth=".44097"
-      android:fillColor="#00000000"
-      android:strokeColor="#fff"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="m1.1619,1.56a1.1024,1.1024 0,0 1,0.95473 -0.55122,1.1024 1.1024,0 0,1 0.95473,0.55122"
-      android:strokeLineJoin="round"
-      android:strokeWidth=".44097"
-      android:fillColor="#00000000"
-      android:strokeColor="#fff"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="m1.4349,2.38 l-0.52538,-0.00004 0.00011,0.52563"
-      android:strokeLineJoin="round"
-      android:strokeWidth=".52916"
-      android:fillColor="#00000000"
-      android:strokeColor="#faffff"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="m2.815,1.85001 l0.52538,0.00004 -0.00011,-0.52563"
-      android:strokeLineJoin="round"
-      android:strokeWidth=".52916"
-      android:fillColor="#00000000"
-      android:strokeColor="#faffff"
-      android:strokeLineCap="round"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <clip-path
+            android:pathData="M1,1.0004l22,0l0,21.9996l-22,0z"/>
+        <path
+            android:pathData="M23,12.0004C23,18.0744 18.075,23.0004 12,23.0004C5.925,23.0004 1,18.0744 1,12.0004C1,5.9254 5.925,1.0004 12,1.0004C18.075,1.0004 23,5.9254 23,12.0004"
+            android:strokeWidth="1"
+            android:fillColor="#2268ab"
+            android:fillType="evenOdd"
+            android:strokeColor="#00000000"/>
+    </group>
+    <path
+        android:pathData="M6.0171,12.6928L9.4961,14.2178L8.3571,14.9688C9.0221,15.7848 9.9411,16.3528 10.9671,16.5838L10.9671,16.5888C11.2151,16.6438 11.4141,16.8278 11.4911,17.0708C11.5671,17.3128 11.5081,17.5778 11.3351,17.7648C11.1631,17.9528 10.9051,18.0338 10.6571,17.9778C9.2661,17.6648 8.0281,16.8768 7.1561,15.7498L6.0171,16.4928L6.0171,12.6928ZM17.0581,12.4628C17.3091,12.3778 17.5881,12.4398 17.7791,12.6238C17.9721,12.8068 18.0461,13.0838 17.9721,13.3388C17.6581,14.7288 16.8701,15.9668 15.7431,16.8388L16.4861,17.9778L12.6861,17.9778L14.2151,14.4998L14.9661,15.6378C15.7811,14.9738 16.3501,14.0538 16.5801,13.0278C16.6211,12.7648 16.8051,12.5468 17.0581,12.4628L17.0581,12.4628ZM11.3031,6.0238L9.7771,9.5018L9.0261,8.3628C8.2101,9.0278 7.6421,9.9468 7.4121,10.9728C7.3381,11.2968 7.0501,11.5278 6.7171,11.5278C6.6641,11.5278 6.6121,11.5228 6.5611,11.5108C6.3761,11.4718 6.2141,11.3598 6.1121,11.2008C6.0101,11.0418 5.9751,10.8478 6.0171,10.6628C6.3291,9.2718 7.1181,8.0338 8.2461,7.1618L7.5031,6.0238L11.3031,6.0238ZM12.6451,6.2348C12.8201,6.0468 13.0821,5.9648 13.3321,6.0238C14.7231,6.3378 15.9601,7.1258 16.8331,8.2528L17.9721,7.5088L17.9721,11.3088L14.4931,9.7838L15.6321,9.0318C14.9681,8.2158 14.0481,7.6478 13.0211,7.4188C12.7701,7.3648 12.5671,7.1808 12.4891,6.9358C12.4121,6.6908 12.4721,6.4228 12.6451,6.2348L12.6451,6.2348Z"
+        android:strokeWidth="1"
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <group>
+        <clip-path
+            android:pathData="M12.645,6.235C12.471,6.423 12.412,6.691 12.489,6.936L12.489,6.936C12.568,7.181 12.77,7.364 13.021,7.418L13.021,7.418C14.048,7.648 14.968,8.217 15.632,9.032L15.632,9.032L14.493,9.783L17.971,11.309L17.971,7.509L16.833,8.253C15.96,7.126 14.722,6.337 13.332,6.024L13.332,6.024C13.278,6.012 13.224,6.005 13.17,6.005L13.17,6.005C12.973,6.006 12.783,6.087 12.645,6.235L12.645,6.235ZM7.503,6.024L8.246,7.162C7.117,8.034 6.33,9.272 6.018,10.663L6.018,10.663C5.975,10.848 6.009,11.042 6.112,11.201L6.112,11.201C6.215,11.359 6.376,11.472 6.561,11.512L6.561,11.512C6.612,11.523 6.665,11.528 6.718,11.528L6.718,11.528C7.05,11.528 7.338,11.297 7.413,10.973L7.413,10.973C7.642,9.946 8.211,9.027 9.026,8.362L9.026,8.362L9.778,9.502L11.302,6.024L7.503,6.024ZM17.058,12.463C16.805,12.547 16.621,12.765 16.58,13.028L16.58,13.028C16.35,14.054 15.782,14.974 14.966,15.638L14.966,15.638L14.215,14.499L12.686,17.978L16.486,17.978L15.743,16.839C16.87,15.967 17.658,14.729 17.971,13.339L17.971,13.339C18.046,13.084 17.971,12.807 17.78,12.624L17.78,12.624C17.645,12.495 17.467,12.425 17.286,12.425L17.286,12.425C17.209,12.425 17.132,12.437 17.058,12.463L17.058,12.463ZM6.018,16.493L7.156,15.75C8.028,16.876 9.266,17.665 10.657,17.978L10.657,17.978C10.904,18.034 11.164,17.953 11.336,17.765L11.336,17.765C11.508,17.577 11.567,17.313 11.49,17.071L11.49,17.071C11.415,16.828 11.215,16.644 10.967,16.589L10.967,16.589L10.967,16.583C9.941,16.353 9.022,15.785 8.357,14.969L8.357,14.969L9.496,14.218L6.018,12.693L6.018,16.493Z"/>
+        <path
+            android:pathData="M3.154,20.842l17.693,0l0,-17.683l-17.693,0z"
+            android:strokeWidth="1"
+            android:fillColor="#FFFFFF"
+            android:fillType="evenOdd"
+            android:strokeColor="#00000000"/>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_synchronizing_error.xml b/app/src/main/res/drawable/ic_synchronizing_error.xml
index b65fa2ea9891..a35fbbf3c9ac 100644
--- a/app/src/main/res/drawable/ic_synchronizing_error.xml
+++ b/app/src/main/res/drawable/ic_synchronizing_error.xml
@@ -1,24 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="4.233333"
-    android:viewportHeight="4.2333336">
-  <path
-      android:pathData="M2.1167,2.11002m-2.1167,0a2.1167,2.1167 0,1 1,4.2334 0a2.1167,2.1167 0,1 1,-4.2334 0"
-      android:strokeWidth=".25066"
-      android:fillColor="#d40000"/>
-  <path
-      android:pathData="m1.1839,1.18002 l1.8656,1.8656"
-      android:strokeLineJoin="round"
-      android:strokeWidth=".52917"
-      android:fillColor="#00000000"
-      android:strokeColor="#fff"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="m3.0495,1.18002 l-1.8656,1.8656"
-      android:strokeLineJoin="round"
-      android:strokeWidth=".52917"
-      android:fillColor="#00000000"
-      android:strokeColor="#fff"
-      android:strokeLineCap="round"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23C18.0751,23 23,18.0751 23,12C23,9.0826 21.8411,6.2847 19.7782,4.2218C17.7153,2.1589 14.9174,1 12,1ZM16.065,15C16.2067,15.14 16.2864,15.3308 16.2864,15.53C16.2864,15.7292 16.2067,15.92 16.065,16.06C15.7722,16.3525 15.2978,16.3525 15.005,16.06L12.005,13.06L9.005,16.06C8.8642,16.2002 8.6737,16.2793 8.475,16.2801C8.17,16.2838 7.8931,16.1026 7.7746,15.8216C7.656,15.5406 7.7195,15.2158 7.935,15L10.935,12L7.935,9C7.6409,8.7059 7.6409,8.2291 7.935,7.935C8.2291,7.6409 8.7059,7.6409 9,7.935L12,10.935L15,7.935C15.2941,7.6409 15.7709,7.6409 16.065,7.935C16.3591,8.2291 16.3591,8.7059 16.065,9L13.065,12L16.065,15Z"
+        android:strokeWidth="1"
+        android:fillColor="#d40000"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_unshared.xml b/app/src/main/res/drawable/ic_unshared.xml
index af4ce3d155ce..96b4b8758d77 100644
--- a/app/src/main/res/drawable/ic_unshared.xml
+++ b/app/src/main/res/drawable/ic_unshared.xml
@@ -18,12 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector
-    android:height="20dp"
-    android:width="20dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:tint="#666666"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.25,16.5L15.1,19.25L17.85,16.5L19.45,16.5C21.4,16.5 23.1,17.9 23.4,19.85L23.4,19.85L23.5,20.5L6.6,20.5L6.7,19.85C7,17.9 8.7,16.5 10.65,16.5L10.65,16.5L12.25,16.5ZM6.85,16.5C6.4,16.95 6.05,17.45 5.75,18L5.75,18L4.5,18C3.55,18 2.75,18.65 2.6,19.6L2.6,19.6L2.45,20.5L0.95,20.5L1.15,19.35C1.4,17.7 2.85,16.5 4.5,16.5L4.5,16.5ZM15.05,4.75C18,4.75 20.1,6.9 20.1,9.8C20.1,12.6 18.05,15.65 15.05,15.65C12,15.65 10,12.6 10,9.8C10,6.85 12.1,4.75 15.05,4.75ZM8.05,5.9C8.6,5.9 9.1,6 9.55,6.15C9.3,6.55 9.05,7 8.9,7.5C8.65,7.45 8.35,7.4 8.05,7.4C6.35,7.4 5.2,8.6 5.2,10.25C5.2,11.95 6.35,13.75 8.05,13.75C8.55,13.75 8.95,13.6 9.35,13.35C9.6,13.8 9.85,14.2 10.15,14.6C9.55,15 8.85,15.25 8.05,15.25C5.45,15.25 3.7,12.65 3.7,10.25C3.7,7.75 5.6,5.9 8.05,5.9ZM15.05,6.25C12.95,6.25 11.5,7.7 11.5,9.8C11.5,11.9 12.95,14.15 15.05,14.15C17.2,14.15 18.6,11.9 18.6,9.8C18.6,7.7 17.15,6.25 15.05,6.25Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_view_list.xml b/app/src/main/res/drawable/ic_view_list.xml
index 00ac5cdfb301..c752c7cbd988 100644
--- a/app/src/main/res/drawable/ic_view_list.xml
+++ b/app/src/main/res/drawable/ic_view_list.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M9,5V9H21V5M9,19H21V15H9M9,14H21V10H9M4,9H8V5H4M4,19H8V15H4M4,14H8V10H4V14Z" />
+    <path
+        android:pathData="M2,15.5L5.45,17.75L2,20L2,15.5ZM21.25,17C21.65,17 22,17.35 22,17.75C22,18.15 21.65,18.5 21.25,18.5L21.25,18.5L7.5,18.5L7.5,17ZM2,9.5L5.45,11.75L2,14L2,9.5ZM21.25,11C21.65,11 22,11.35 22,11.75C22,12.15 21.65,12.5 21.25,12.5L21.25,12.5L7.5,12.5L7.5,11ZM2,3.5L5.45,5.75L2,8L2,3.5ZM21.25,5C21.65,5 22,5.35 22,5.75C22,6.15 21.65,6.5 21.25,6.5L21.25,6.5L7.5,6.5L7.5,5Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_view_module.xml b/app/src/main/res/drawable/ic_view_module.xml
index abdd777f2d88..cfafe45c71f5 100644
--- a/app/src/main/res/drawable/ic_view_module.xml
+++ b/app/src/main/res/drawable/ic_view_module.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M16,5V11H21V5M10,11H15V5H10M16,18H21V12H16M10,18H15V12H10M4,18H9V12H4M4,11H9V5H4V11Z" />
+    <path
+        android:pathData="M8,13C9.4,13 10.5,14.1 10.5,15.5L10.5,15.5L10.5,19.5C10.5,20.9 9.4,22 8,22L8,22L4,22C2.6,22 1.5,20.9 1.5,19.5L1.5,19.5L1.5,15.5C1.5,14.1 2.6,13 4,13L4,13ZM19,13C20.4,13 21.5,14.1 21.5,15.5L21.5,15.5L21.5,19.5C21.5,20.9 20.4,22 19,22L19,22L15,22C13.6,22 12.5,20.9 12.5,19.5L12.5,19.5L12.5,15.5C12.5,14.1 13.6,13 15,13L15,13ZM8,14.5L4,14.5C3.45,14.5 3,14.95 3,15.5L3,15.5L3,19.5C3,20.05 3.45,20.5 4,20.5L4,20.5L8,20.5C8.55,20.5 9,20.05 9,19.5L9,19.5L9,15.5C9,14.95 8.55,14.5 8,14.5L8,14.5ZM19,14.5L15,14.5C14.45,14.5 14,14.95 14,15.5L14,15.5L14,19.5C14,20.05 14.45,20.5 15,20.5L15,20.5L19,20.5C19.55,20.5 20,20.05 20,19.5L20,19.5L20,15.5C20,14.95 19.55,14.5 19,14.5L19,14.5ZM8,2C9.4,2 10.5,3.1 10.5,4.5L10.5,4.5L10.5,8.5C10.5,9.9 9.4,11 8,11L8,11L4,11C2.6,11 1.5,9.9 1.5,8.5L1.5,8.5L1.5,4.5C1.5,3.1 2.6,2 4,2L4,2ZM19,2C20.4,2 21.5,3.1 21.5,4.5L21.5,4.5L21.5,8.5C21.5,9.9 20.4,11 19,11L19,11L15,11C13.6,11 12.5,9.9 12.5,8.5L12.5,8.5L12.5,4.5C12.5,3.1 13.6,2 15,2L15,2ZM8,3.5L4,3.5C3.45,3.5 3,3.95 3,4.5L3,4.5L3,8.5C3,9.05 3.45,9.5 4,9.5L4,9.5L8,9.5C8.55,9.5 9,9.05 9,8.5L9,8.5L9,4.5C9,3.95 8.55,3.5 8,3.5L8,3.5ZM19,3.5L15,3.5C14.45,3.5 14,3.95 14,4.5L14,4.5L14,8.5C14,9.05 14.45,9.5 15,9.5L15,9.5L19,9.5C19.55,9.5 20,9.05 20,8.5L20,8.5L20,4.5C20,3.95 19.55,3.5 19,3.5L19,3.5Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_wallpaper.xml b/app/src/main/res/drawable/ic_wallpaper.xml
index b19133194aea..519948c35251 100644
--- a/app/src/main/res/drawable/ic_wallpaper.xml
+++ b/app/src/main/res/drawable/ic_wallpaper.xml
@@ -1,8 +1,12 @@
-<!-- drawable/wallpaper.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M4,4H11V2H4A2,2 0 0,0 2,4V11H4V4M10,13L6,18H18L15,14L12.97,16.71L10,13M17,8.5A1.5,1.5 0 0,0 15.5,7A1.5,1.5 0 0,0 14,8.5A1.5,1.5 0 0,0 15.5,10A1.5,1.5 0 0,0 17,8.5M20,2H13V4H20V11H22V4A2,2 0 0,0 20,2M20,20H13V22H20A2,2 0 0,0 22,20V13H20V20M4,13H2V20A2,2 0 0,0 4,22H11V20H4V13Z" />
+  <path
+      android:pathData="M21,1L21,18L16,23L6,23C4.345,23 3,21.655 3,20L3,20L3,1L21,1ZM19.5,2.5L4.5,2.5L4.5,20C4.5,20.825 5.175,21.5 6,21.5L6,21.5L15,21.5L15,18.5C15,17.67 15.67,17 16.5,17L16.5,17L19.5,17L19.5,2.5ZM13.5,9L17.77,14.5L6.23,14.5L9.36,10.465L10.86,12.4L13.5,9ZM7.75,7C8.44,7 9,7.56 9,8.25C9,8.94 8.44,9.5 7.75,9.5C7.06,9.5 6.5,8.94 6.5,8.25C6.5,7.56 7.06,7 7.75,7Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
index 1b3f5c0ab4e3..cc87758b4b59 100644
--- a/app/src/main/res/drawable/ic_warning.xml
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -18,8 +18,16 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#666666"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/warning_icon_color">
+    <path
+        android:pathData="M23.075,18L14.6,3.32C14.0646,2.3899 13.0732,1.8167 12,1.8167C10.9268,1.8167 9.9354,2.3899 9.4,3.32L0.925,18C0.3889,18.9285 0.3891,20.0725 0.9255,21.0008C1.4618,21.9292 2.4529,22.5007 3.525,22.5L20.5,22.5C21.5677,22.4918 22.5505,21.9168 23.0808,20.9901C23.6111,20.0634 23.6089,18.9246 23.075,18ZM11,8.25L13,8.25L13,14.75L11,14.75L11,8.25ZM12,18.75C11.3096,18.75 10.75,18.1904 10.75,17.5C10.75,16.8096 11.3096,16.25 12,16.25C12.6904,16.25 13.25,16.8096 13.25,17.5C13.25,18.1904 12.6904,18.75 12,18.75L12,18.75Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/image_fail.xml b/app/src/main/res/drawable/image_fail.xml
index fe18168137b1..0cc78f77e108 100644
--- a/app/src/main/res/drawable/image_fail.xml
+++ b/app/src/main/res/drawable/image_fail.xml
@@ -1,4 +1,13 @@
-<vector android:height="160dp" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="160dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#767676" android:pathData="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/warning_icon_color">
+    <path
+        android:pathData="M23.075,18L14.6,3.32C14.0646,2.3899 13.0732,1.8167 12,1.8167C10.9268,1.8167 9.9354,2.3899 9.4,3.32L0.925,18C0.3889,18.9285 0.3891,20.0725 0.9255,21.0008C1.4618,21.9292 2.4529,22.5007 3.525,22.5L20.5,22.5C21.5677,22.4918 22.5505,21.9168 23.0808,20.9901C23.6111,20.0634 23.6089,18.9246 23.075,18ZM11,8.25L13,8.25L13,14.75L11,14.75L11,8.25ZM12,18.75C11.3096,18.75 10.75,18.1904 10.75,17.5C10.75,16.8096 11.3096,16.25 12,16.25C12.6904,16.25 13.25,16.8096 13.25,17.5C13.25,18.1904 12.6904,18.75 12,18.75L12,18.75Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_favorites.xml b/app/src/main/res/drawable/nav_favorites.xml
index 141285e11adb..d98be66b6f67 100644
--- a/app/src/main/res/drawable/nav_favorites.xml
+++ b/app/src/main/res/drawable/nav_favorites.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M23.55,9.4C23.3,8.7 22.7,8.2 21.95,8.15L15.95,7.7L13.7,2.15C13.4,1.45 12.75,1 12,1C11.25,1 10.6,1.45 10.3,2.15L8,7.75L2,8.2C1.25,8.25 0.65,8.75 0.4,9.45C0.15,10.15 0.4,10.9 0.95,11.4L5.55,15.3L4.15,21.1C4,21.8 4.25,22.55 4.85,23C5.15,23.25 5.55,23.35 5.9,23.35C6.25,23.35 6.55,23.25 6.85,23.1L12,19.9L17.1,23.1C17.75,23.5 18.5,23.45 19.1,23.05C19.7,22.6 19.95,21.85 19.8,21.15L18.35,15.3L22.95,11.4C23.55,10.85 23.8,10.1 23.55,9.4ZM22.05,10.2L16.75,14.7L18.4,21.45C18.45,21.65 18.35,21.75 18.3,21.8C18.25,21.85 18.1,21.9 17.95,21.8L12,18.1L6.1,21.75C5.95,21.85 5.8,21.8 5.75,21.75C5.7,21.7 5.6,21.6 5.65,21.4L7.3,14.65L2,10.15C1.85,10.05 1.9,9.9 1.9,9.8C1.9,9.75 2,9.6 2.15,9.6L9.1,9.1L11.75,2.65C11.8,2.5 11.9,2.5 12,2.5C12.1,2.5 12.2,2.55 12.3,2.7L14.95,9.15L21.9,9.65C22.1,9.65 22.15,9.8 22.15,9.85C22.15,9.95 22.15,10.1 22.05,10.2Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_logout.xml b/app/src/main/res/drawable/nav_logout.xml
index c3b465a90285..7af403ac40f1 100644
--- a/app/src/main/res/drawable/nav_logout.xml
+++ b/app/src/main/res/drawable/nav_logout.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M14,2L14,7L12.5,7L12.5,3.5L5.75,3.5C4.5,3.5 3.5,4.5 3.5,5.75L3.5,5.75L3.5,17.75C3.5,19 4.5,20 5.75,20L5.75,20L12.5,20L12.5,16.5L14,16.5L14,21.5L5.75,21.5C3.7,21.5 2,19.8 2,17.75L2,17.75L2,5.75C2,3.7 3.7,2 5.75,2L5.75,2L14,2ZM16.5,7.35L23.25,11.75L16.5,16.15L16.5,12.5L7.25,12.5C6.85,12.5 6.5,12.15 6.5,11.75C6.5,11.35 6.85,11 7.25,11L7.25,11L16.5,11L16.5,7.35Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_notifications.xml b/app/src/main/res/drawable/nav_notifications.xml
index c48420e6b8bd..16ad2d8a5fe4 100644
--- a/app/src/main/res/drawable/nav_notifications.xml
+++ b/app/src/main/res/drawable/nav_notifications.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M22,16.95C19.65,14.6 19.3,12.3 19.2,11.15L19,9.4C18.75,6.25 16.45,3.8 13.5,3.15C13.5,3.1 13.5,3.05 13.5,3C13.5,2.15 12.85,1.5 12,1.5C11.15,1.5 10.5,2.15 10.5,3C10.5,3.05 10.5,3.1 10.5,3.15C7.55,3.8 5.25,6.25 5,9.4L4.85,11.15C4.7,12.25 4.35,14.55 2,16.95L2,20.5L9.05,20.5C9.3,21.9 10.5,23 12,23C13.5,23 14.7,21.9 14.95,20.5L22,20.5L22,16.95ZM20.5,19L3.5,19L3.5,17.55C5.1,15.85 6.1,13.65 6.3,11.3L6.45,9.55C6.75,6.65 9.1,4.5 12,4.5C14.9,4.5 17.25,6.65 17.5,9.55L17.65,11.3C17.85,13.65 18.85,15.85 20.45,17.55L20.45,19L20.5,19Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_on_device.xml b/app/src/main/res/drawable/nav_on_device.xml
index d99dad06abed..6c6303569570 100644
--- a/app/src/main/res/drawable/nav_on_device.xml
+++ b/app/src/main/res/drawable/nav_on_device.xml
@@ -15,9 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" android:pathData="M17,1H7A2,2 0 0,0 5,3V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3A2,2 0 0,0 17,1M17,19H7V5H17V19M16,13H13V8H11V13H8L12,17L16,13Z" />
+    <path
+        android:pathData="M21.25,20.5C21.65,20.5 22,20.85 22,21.25C22,21.65 21.65,22 21.25,22L21.25,22L2.75,22C2.35,22 2,21.65 2,21.25C2,20.85 2.35,20.5 2.75,20.5L2.75,20.5ZM12,2C12.4,2 12.75,2.35 12.75,2.75L12.75,2.75L12.75,9.5L16.6,9.5L12,16.5L7.4,9.5L11.25,9.5L11.25,2.75C11.25,2.35 11.6,2 12,2Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_photos.xml b/app/src/main/res/drawable/nav_photos.xml
index cfdceae62533..531f3ea6d5f5 100644
--- a/app/src/main/res/drawable/nav_photos.xml
+++ b/app/src/main/res/drawable/nav_photos.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M5.355,11.5C5.61,12.03 5.915,12.535 6.265,13L6.265,13L2,13L2,19.145C2,19.34 2.16,19.5 2.355,19.5L2.355,19.5L10.17,19.5L12,21.33L12,16.4C12.41,16.46 12.825,16.5 13.255,16.505C13.34,16.505 13.42,16.49 13.505,16.49L13.505,16.49L13.505,22.34C13.505,22.995 12.97,23.425 12.415,23.425C12.145,23.425 11.875,23.325 11.655,23.105L11.655,23.105L9.55,21L2.355,21C1.33,21 0.5,20.17 0.5,19.145L0.5,19.145L0.5,11.5ZM19.5,10.06L23.5,12.405L23.5,14.235L20.99,13.6L20.99,13.6L20.99,19.855C20.99,21.955 19.4,22.275 18.53,22.205C17.185,22.095 16.105,21.15 16.12,20.05C16.14,18.95 17.24,18.13 18.59,18.22C18.91,18.245 19.22,18.32 19.5,18.43L19.5,18.43L19.5,10.06ZM13.25,0.5C17.255,0.5 20.5,3.745 20.5,7.75C20.5,8.125 20.46,8.495 20.405,8.855L20.405,8.855L18.985,8.02C18.99,7.93 19,7.84 19,7.75C19,4.58 16.42,2 13.25,2C10.08,2 7.5,4.58 7.5,7.75C7.5,10.92 10.08,13.5 13.25,13.5C15.22,13.5 16.965,12.5 18,10.985L18,10.985L18,13.22C16.725,14.325 15.07,15 13.25,15C9.245,15 6,11.755 6,7.75C6,3.745 9.245,0.5 13.25,0.5ZM11.5,5.17L16.115,7.835L11.5,10.5L11.5,5.17Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_recently.xml b/app/src/main/res/drawable/nav_recently.xml
index f63870b3ece3..93ed8f1daff7 100644
--- a/app/src/main/res/drawable/nav_recently.xml
+++ b/app/src/main/res/drawable/nav_recently.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,1C18.1,1 23,5.9 23,12C23,18.1 18.1,23 12,23C5.9,23 1,18.1 1,12C1,5.9 5.95,1 12,1ZM12,2.5C6.75,2.5 2.5,6.75 2.5,12C2.5,17.25 6.75,21.5 12,21.5C17.25,21.5 21.5,17.25 21.5,12C21.5,6.75 17.25,2.5 12,2.5ZM12,4C12.4,4 12.75,4.3 12.75,4.75L12.75,4.75L12.75,11.55L17.15,13.95C17.55,14.15 17.65,14.65 17.45,15C17.3,15.25 17.05,15.4 16.8,15.4C16.7,15.4 16.55,15.35 16.45,15.3L16.45,15.3L11.25,12.45L11.25,4.75C11.25,4.35 11.6,4 12,4Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/nav_settings.xml b/app/src/main/res/drawable/nav_settings.xml
index 1a7fbc33d387..540a3e0315c2 100644
--- a/app/src/main/res/drawable/nav_settings.xml
+++ b/app/src/main/res/drawable/nav_settings.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M14,1L14.5,3.75C14.65,4.5 15.45,4.8 16.05,4.4L16.05,4.4L18.35,2.8L21.2,5.65L19.6,7.95C19.2,8.55 19.55,9.35 20.25,9.5L20.25,9.5L23,10L23,14L20.25,14.5C19.5,14.65 19.2,15.45 19.6,16.05L19.6,16.05L21.2,18.35L18.35,21.2L16.05,19.6C15.45,19.2 14.65,19.55 14.5,20.25L14.5,20.25L14,23L10,23L9.5,20.25C9.35,19.55 8.55,19.2 7.95,19.6L7.95,19.6L5.65,21.2L2.8,18.35L4.4,16.05C4.8,15.45 4.45,14.65 3.75,14.5L3.75,14.5L1,14L1,10L3.75,9.5C4.5,9.35 4.8,8.55 4.4,7.95L4.4,7.95L2.8,5.65L5.65,2.8L7.95,4.4C8.55,4.8 9.35,4.45 9.5,3.75L9.5,3.75L10,1L14,1ZM12.75,2.5L11.25,2.5L10.95,4C10.75,5.2 9.7,6.05 8.5,6.05C8,6.05 7.5,5.9 7.1,5.6L7.1,5.6L5.8,4.7L4.75,5.75L5.65,7.05C6.15,7.75 6.25,8.65 5.9,9.45C5.6,10.25 4.9,10.8 4.05,10.95L4.05,10.95L2.5,11.25L2.5,12.75L4.05,13C4.9,13.15 5.55,13.7 5.9,14.5C6.25,15.3 6.15,16.2 5.65,16.9L5.65,16.9L4.75,18.2L5.8,19.25L7.1,18.35C7.5,18.05 8,17.9 8.5,17.9C9.7,17.9 10.75,18.75 10.95,19.95L10.95,19.95L11.25,21.5L12.75,21.5L13.05,19.95C13.25,18.75 14.3,17.9 15.5,17.9C16,17.9 16.5,18.05 16.9,18.35L16.9,18.35L18.2,19.25L19.25,18.2L18.35,16.9C17.85,16.2 17.8,15.3 18.1,14.6C18.4,13.8 19.1,13.25 19.95,13.1L19.95,13.1L21.5,12.8L21.5,11.3L19.95,11C19.1,10.85 18.45,10.3 18.1,9.5C17.75,8.7 17.85,7.8 18.35,7.1L18.35,7.1L19.25,5.8L18.2,4.75L16.9,5.65C16.5,5.95 16,6.1 15.5,6.1C14.3,6.1 13.25,5.25 13.05,4.05L13.05,4.05L12.75,2.5ZM12,9C13.6569,9 15,10.3431 15,12C15,13.6569 13.6569,15 12,15C10.3431,15 9,13.6569 9,12C9,10.3431 10.3431,9 12,9Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_shared.xml b/app/src/main/res/drawable/nav_shared.xml
index 467f288f99c6..4f29d053e58c 100644
--- a/app/src/main/res/drawable/nav_shared.xml
+++ b/app/src/main/res/drawable/nav_shared.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12.25,16.5L15.1,19.25L17.85,16.5L19.45,16.5C21.4,16.5 23.1,17.9 23.4,19.85L23.4,19.85L23.5,20.5L6.6,20.5L6.7,19.85C7,17.9 8.7,16.5 10.65,16.5L10.65,16.5L12.25,16.5ZM6.85,16.5C6.4,16.95 6.05,17.45 5.75,18L5.75,18L4.5,18C3.55,18 2.75,18.65 2.6,19.6L2.6,19.6L2.45,20.5L0.95,20.5L1.15,19.35C1.4,17.7 2.85,16.5 4.5,16.5L4.5,16.5ZM15.05,4.75C18,4.75 20.1,6.9 20.1,9.8C20.1,12.6 18.05,15.65 15.05,15.65C12,15.65 10,12.6 10,9.8C10,6.85 12.1,4.75 15.05,4.75ZM8.05,5.9C8.6,5.9 9.1,6 9.55,6.15C9.3,6.55 9.05,7 8.9,7.5C8.65,7.45 8.35,7.4 8.05,7.4C6.35,7.4 5.2,8.6 5.2,10.25C5.2,11.95 6.35,13.75 8.05,13.75C8.55,13.75 8.95,13.6 9.35,13.35C9.6,13.8 9.85,14.2 10.15,14.6C9.55,15 8.85,15.25 8.05,15.25C5.45,15.25 3.7,12.65 3.7,10.25C3.7,7.75 5.6,5.9 8.05,5.9ZM15.05,6.25C12.95,6.25 11.5,7.7 11.5,9.8C11.5,11.9 12.95,14.15 15.05,14.15C17.2,14.15 18.6,11.9 18.6,9.8C18.6,7.7 17.15,6.25 15.05,6.25Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_synced_folders.xml b/app/src/main/res/drawable/nav_synced_folders.xml
index fc17df1ac643..5185ab570f55 100644
--- a/app/src/main/res/drawable/nav_synced_folders.xml
+++ b/app/src/main/res/drawable/nav_synced_folders.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M20.7,8.75C20.25,7.45 19.45,6.35 18.45,5.5C17.1,4.35 15.4,3.7 13.5,3.7C11.75,3.7 10.05,4.3 8.7,5.4C8.35,5.3 7.95,5.25 7.6,5.25C5.2,5.25 3.2,7.05 2.95,9.4C1.3,10.3 0.25,12 0.25,13.9C0.25,15.6 1.05,17.05 2.3,18C3.3,18.75 4.5,19.1 5.65,19C7.25,20.3 9.25,21 11.3,21C13.2,21 14.95,20.45 16.5,19.35C17,19.5 17.5,19.55 18,19.55C21.15,19.55 23.75,16.95 23.75,13.8C23.75,11.7 22.55,9.7 20.7,8.75ZM18,18.05C17.1,18.05 16.45,17.75 16.2,17.65C15.9,17.85 14.9,18.9 12.75,19.35L12.75,15L16.05,15L12,10L7.95,15L11.25,15L11.25,19.5C10.4,19.5 9.6,19.35 8.8,19.05C7.25,18.5 6.25,17.5 6.15,17.4C5.55,17.45 4.2,17.7 2.9,16.5C2.2,15.85 1.7,14.9 1.7,13.85C1.7,11.1 4.3,10.35 4.35,10.3C4.4,10.1 4.15,8.65 5.45,7.5C6.4,6.7 7.7,6.45 9,7C10.55,5.45 12.35,5.1 13.45,5.1C14.95,5.1 16.3,5.6 17.4,6.5C18.9,7.75 19.3,9.35 19.4,9.7C19.4,9.7 22.2,10.7 22.2,13.7C22.25,16.15 20.35,18.05 18,18.05Z"
+        android:strokeWidth="1"
+        android:fillColor="#191919"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/nav_trashbin.xml b/app/src/main/res/drawable/nav_trashbin.xml
index 8f932af6ac26..e42a3792607c 100644
--- a/app/src/main/res/drawable/nav_trashbin.xml
+++ b/app/src/main/res/drawable/nav_trashbin.xml
@@ -18,8 +18,15 @@
 
   Icon provided by Android Material Library in Apache License 2.0
 -->
-<vector android:height="24dp" android:tint="#757575"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M16,0.5L16,3.5L21.5,3.5C21.9,3.5 22.25,3.85 22.25,4.25C22.25,4.65 21.9,5 21.5,5L21.5,5L20.45,5L19.65,20.65C19.55,22.25 18.25,23.5 16.65,23.5L16.65,23.5L7.4,23.5C5.8,23.5 4.5,22.25 4.4,20.65L4.4,20.65L3.55,5L2.5,5C2.1,5 1.75,4.65 1.75,4.25C1.75,3.85 2.1,3.5 2.5,3.5L2.5,3.5L8,3.5L8,0.5L16,0.5ZM18.95,5L5.05,5L5.9,20.6C5.95,21.4 6.6,22 7.4,22L7.4,22L16.6,22C17.4,22 18.05,21.4 18.1,20.6L18.1,20.6L18.95,5ZM12,7.75C12.4,7.75 12.75,8.1 12.75,8.5L12.75,8.5L12.75,18.5C12.75,18.9 12.4,19.25 12,19.25C11.6,19.25 11.25,18.9 11.25,18.5L11.25,18.5L11.25,8.5C11.25,8.1 11.6,7.75 12,7.75ZM15.5,7.75C15.9,7.75 16.25,8.1 16.25,8.5L16.25,8.5L16.25,18.5C16.25,18.9 15.9,19.25 15.5,19.25C15.1,19.25 14.75,18.9 14.75,18.5L14.75,18.5L14.75,8.5C14.75,8.1 15.1,7.75 15.5,7.75ZM8.5,7.75C8.9,7.75 9.25,8.1 9.25,8.5L9.25,8.5L9.25,18.5C9.25,18.9 8.9,19.25 8.5,19.25C8.1,19.25 7.75,18.9 7.75,18.5L7.75,18.5L7.75,8.5C7.75,8.1 8.1,7.75 8.5,7.75ZM14.5,2L9.5,2L9.5,3.5L14.5,3.5L14.5,2Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/shared_via_link.xml b/app/src/main/res/drawable/shared_via_link.xml
index 10cea077c6de..d2ddae0c29a8 100644
--- a/app/src/main/res/drawable/shared_via_link.xml
+++ b/app/src/main/res/drawable/shared_via_link.xml
@@ -17,20 +17,14 @@
 
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16.0"
-        android:viewportHeight="16.0">
-	<path
-        android:fillColor="#FF000000"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="0.0"
-        android:strokeMiterLimit="4"
-        android:pathData="M5.99 5.318a3.332 3.332 0 0 0 0 4.693c 0.116 0.118 0.226 0.22 0.355 0.315l1.383-1.383A1.4 1.4 0 0 1 7.33 6.66l3.352-3.352c 0.568-0.57 1.442-0.57 2.01 0s 0.57 1.442 0 2.01l-1.13 1.132c 0.34 0.725 0.464 1.518 0.377 2.304l2.094-2.095c1.288-1.29 1.288-3.406 0-4.694s-3.405-1.288-4.693 0L5.99 5.318z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="0.0"
-        android:strokeMiterLimit="4"
-        android:pathData="M10.01 10.68a3.332 3.332 0 0 0 0-4.692 3.126 3.126 0 0 0-0.355-0.314L8.272 7.057A1.4 1.4 0 0 1 8.67 9.34l-3.35 3.35c-0.57 0.57-1.444 0.57-2.013 0.002s-0.568-1.442 0-2.01L4.44 9.55a4.288 4.288 0 0 1-0.38-2.305L1.967 9.34c-1.288 1.29-1.288 3.405 0 4.693s3.405 1.29 4.693 0l3.35-3.352z"/>
+        android:pathData="M11.94,8.8C12.605,9.055 13.23,9.445 13.76,9.98C14.87,11.09 15.42,12.625 15.275,14.185C15.16,15.395 14.625,16.54 13.76,17.405L13.76,17.405L10.225,20.94C9.205,21.965 7.86,22.475 6.515,22.475C5.175,22.475 3.83,21.965 2.805,20.94C0.76,18.895 0.76,15.56 2.805,13.515L2.805,13.515L6.34,9.98C6.61,9.705 6.905,9.475 7.215,9.275C7.2,9.45 7.19,9.625 7.19,9.8C7.19,10.25 7.235,10.69 7.32,11.12L7.32,11.12L3.865,14.575C2.405,16.04 2.405,18.42 3.865,19.88C5.33,21.34 7.705,21.34 9.17,19.88L9.17,19.88L12.705,16.345C13.32,15.73 13.705,14.91 13.785,14.045C13.89,12.925 13.495,11.83 12.705,11.04C12.425,10.765 12.11,10.535 11.77,10.36C11.72,10.18 11.69,9.995 11.69,9.805C11.69,9.45 11.785,9.11 11.94,8.8ZM13.765,2.56C15.815,0.515 19.145,0.515 21.19,2.56C23.24,4.605 23.24,7.935 21.18,9.985L21.18,9.985L17.645,13.52C17.375,13.795 17.08,14.025 16.77,14.225C16.82,13.605 16.78,12.99 16.66,12.39L16.66,12.39L20.125,8.925C21.585,7.46 21.585,5.08 20.125,3.62C19.395,2.89 18.435,2.525 17.475,2.525C16.515,2.525 15.555,2.89 14.825,3.62L14.825,3.62L11.29,7.155C10.58,7.86 10.19,8.805 10.19,9.805C10.19,10.805 10.58,11.745 11.29,12.455C11.57,12.735 11.885,12.96 12.22,13.135C12.285,13.385 12.32,13.64 12.295,13.905C12.275,14.125 12.21,14.405 12.065,14.7C11.395,14.445 10.77,14.055 10.23,13.515C9.235,12.525 8.69,11.205 8.69,9.805C8.69,8.405 9.24,7.085 10.23,6.095L10.23,6.095Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/uploads.xml b/app/src/main/res/drawable/uploads.xml
index eff81759fa08..20230af4e281 100644
--- a/app/src/main/res/drawable/uploads.xml
+++ b/app/src/main/res/drawable/uploads.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#757575"
+        android:pathData="M21.25,20.5C21.65,20.5 22,20.85 22,21.25C22,21.65 21.65,22 21.25,22L21.25,22L2.75,22C2.35,22 2,21.65 2,21.25C2,20.85 2.35,20.5 2.75,20.5L2.75,20.5ZM12,2L16.6,9L12.75,9L12.75,15.75C12.75,16.15 12.4,16.5 12,16.5C11.6,16.5 11.25,16.15 11.25,15.75L11.25,15.75L11.25,9L7.4,9L12,2Z"
         android:strokeWidth="1"
-        android:pathData="M 9,16 V 10 H 5 l 7,-7 7,7 h -4 v 6 H 9 m -4,4 v -2 h 14 v 2 z"/>
-</vector>
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/video_white.xml b/app/src/main/res/drawable/video_white.xml
index 04fb9bf20c26..f954b6d6cfba 100644
--- a/app/src/main/res/drawable/video_white.xml
+++ b/app/src/main/res/drawable/video_white.xml
@@ -1,10 +1,12 @@
-<!-- drawable/video.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32dp"
     android:width="32dp"
+    android:height="32dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M17,10.5V7A1,1 0 0,0 16,6H4A1,1 0 0,0 3,7V17A1,1 0 0,0 4,18H16A1,1 0 0,0 17,17V13.5L21,17.5V6.5L17,10.5Z" />
+        android:fillType="evenOdd"
+        android:pathData="M20,5L20,8.8L21.8,7L23.5,7L23.5,17L21.8,17L20,15.2L20,17C20,18.65 18.65,20 17,20L17,20L5,20C3.35,20 2,18.65 2,17L2,17L2,10.5L0.5,10.5L0.5,6.5L2,6.5L2,5L20,5ZM18.5,6.5L3.5,6.5L3.5,17C3.5,17.85 4.15,18.5 5,18.5L5,18.5L17,18.5C17.85,18.5 18.5,17.85 18.5,17L18.5,17L18.5,6.5ZM9,9.25L14,12.5L9,15.75L9,9.25ZM22,8.9L20,10.9L20,13.1L22,15.1L22,8.9Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
 </vector>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 08bf64d552ad..e926fdcc432f 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -48,4 +48,68 @@
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
     <color name="fontAppbar">@android:color/white</color>
+
+    <!-- NMC Colors -->
+    <color name="icon_color">#FFFFFF</color>
+    <color name="sort_text_color">@color/grey_30</color>
+    <color name="list_icon_color">@color/grey_30</color>
+    <color name="warning_icon_color">#CCCCCC</color>
+    <color name="divider_color">@color/grey_70</color>
+    <color name="spinner_bg_color">@color/grey_80</color>
+    <color name="refresh_layout_bg_color">#2D2D2D</color>
+    <color name="primary_button_disabled_color">@color/grey_70</color>
+    <color name="toolbar_divider_color">@color/grey_70</color>
+
+    <!-- Snackbar Colors -->
+    <color name="snackbar_bg_color">@color/grey_80</color>
+    <color name="snackbar_txt_color">@color/grey_0</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">@color/grey_80</color>
+    <color name="alert_txt_color">@color/grey_0</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_60</color>
+    <color name="nav_txt_unselected_color">@color/grey_0</color>
+    <color name="nav_txt_selected_color">@color/grey_0</color>
+    <color name="nav_icon_unselected_color">@color/grey_30</color>
+    <color name="nav_icon_selected_color">#FFFFFF</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/grey_80</color>
+    <color name="drawer_quota_txt_color">#FFFFFF</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">@color/grey_80</color>
+    <color name="bottom_sheet_icon_color">@color/grey_30</color>
+    <color name="bottom_sheet_txt_color">@color/grey_0</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">@color/grey_80</color>
+    <color name="popup_menu_txt_color">@color/grey_0</color>
+    <color name="overflow_bg_color">@color/grey_80</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_disabled">@color/grey_70</color>
+    <color name="switch_track_disabled">@color/grey_60</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_disabled">@color/grey_70</color>
+    <color name="checkbox_unchecked_disabled">@color/grey_70</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#FFFFFF</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">@color/grey_0</color>
+    <color name="share_search_border_color">@color/grey_0</color>
+    <color name="share_btn_txt_color">@color/grey_0</color>
+    <color name="share_list_item_txt_color">@color/grey_0</color>
+    <color name="share_disabled_txt_color">@color/grey_60</color>
+    <color name="share_txt_color">@color/grey_0</color>
+    <color name="share_et_divider">#FFFFFF</color>
+
+    <!-- Scan Colors -->
+    <color name="scan_doc_bg_color">#121212</color>
+    <color name="scan_text_color">@color/grey_0</color>
+    <color name="scan_edit_bottom_color">@color/grey_80</color>
+    <color name="scan_count_bg_color">@color/grey_80</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 58fcdecf1fc2..b05b582157a7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -82,4 +82,93 @@
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
     <color name="fontSecondaryAppbar">#A5A5A5</color>
+
+    <!--  NMC Colors  -->
+    <color name="icon_color">#191919</color>
+    <color name="sort_text_color">@color/primary</color>
+    <color name="list_icon_color">#191919</color>
+    <color name="warning_icon_color">#191919</color>
+    <color name="divider_color">@color/grey_30</color>
+    <color name="spinner_bg_color">@android:color/white</color>
+    <color name="refresh_layout_bg_color">#FFFFFF</color>
+    <color name="primary_button_disabled_color">@color/grey_0</color>
+    <color name="toolbar_divider_color">#CCCCCC</color>
+    <color name="et_highlight_color">#77c4ff</color>
+    <color name="white_trans_70">#B3FFFFFF</color>
+    <color name="progress_bar_background">@color/grey_10</color>
+
+    <!-- Grey Colors -->
+    <color name="dark_grey">#101010</color>
+    <color name="grey_0">#F2F2F2</color>
+    <color name="grey_10">#E5E5E5</color>
+    <color name="grey_30">#B2B2B2</color>
+    <color name="grey_60">#666666</color>
+    <color name="grey_70">#4C4C4C</color>
+    <color name="grey_80">#333333</color>
+
+    <!-- Snackbar Colors  -->
+    <color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
+    <color name="snackbar_txt_color">@color/white</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">#FFFFFF</color>
+    <color name="alert_txt_color">#191919</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_0</color>
+    <color name="nav_txt_unselected_color">#191919</color>
+    <color name="nav_txt_selected_color">@color/primary</color>
+    <color name="nav_icon_unselected_color">#191919</color>
+    <color name="nav_icon_selected_color">@color/primary</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/white</color>
+    <color name="drawer_quota_txt_color">#191919</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">#FFFFFF</color>
+    <color name="bottom_sheet_icon_color">#191919</color>
+    <color name="bottom_sheet_txt_color">#191919</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">#FFFFFF</color>
+    <color name="popup_menu_txt_color">#191919</color>
+    <color name="overflow_bg_color">#FFFFFF</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_checked_enabled">@color/primary</color>
+    <color name="switch_track_checked_enabled">#F399C7</color>
+    <color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
+    <color name="switch_track_unchecked_enabled">@color/grey_30</color>
+    <color name="switch_thumb_disabled">@color/grey_10</color>
+    <color name="switch_track_disabled">@color/grey_0</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_enabled">@color/primary</color>
+    <color name="checkbox_unchecked_enabled">@color/grey_30</color>
+    <color name="checkbox_checked_disabled">@color/grey_30</color>
+    <color name="checkbox_unchecked_disabled">#CCCCCC</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#191919</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">#191919</color>
+    <color name="share_search_border_color">#191919</color>
+    <color name="share_btn_txt_color">#191919</color>
+    <color name="share_list_item_txt_color">#191919</color>
+    <color name="share_disabled_txt_color">@color/grey_30</color>
+    <color name="share_txt_color">#191919</color>
+    <color name="share_et_divider">#000000</color>
+    <color name="share_warning_txt_color">#191919</color>
+    <color name="sharing_warning_bg_color">#F6E5EB</color>
+    <color name="sharing_warning_border_color">#C16F81</color>
+    <color name="share_color">#0D39DF</color>
+    <color name="shared_with_me_color">#0099ff</color>
+
+    <!--  Scan Colors  -->
+    <color name="scan_doc_bg_color">@color/grey_0</color>
+    <color name="scan_text_color">#191919</color>
+    <color name="scan_edit_bottom_color">@color/grey_0</color>
+    <color name="scan_count_bg_color">@color/grey_30</color>
+    <color name="neptune">#77b6bb</color>
+    <color name="neptune_50">#5077b6bb</color>
 </resources>