diff --git a/app/src/debug/res/layout/activity_injection_test.xml b/app/src/debug/res/layout/activity_injection_test.xml
index ff3dcf3af8..522b666830 100644
--- a/app/src/debug/res/layout/activity_injection_test.xml
+++ b/app/src/debug/res/layout/activity_injection_test.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Android client application
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~  @author Álvaro Brey
-  ~  Copyright (C) 2023 Álvaro Brey
-  ~  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
-  ~ 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/>.
-  ~
-  -->
-
+  ~ SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
+  ~ SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/drawable-night/favorite.xml b/app/src/main/res/drawable-night/favorite.xml
index 2f3ffc870e..c94682f2ed 100644
--- a/app/src/main/res/drawable-night/favorite.xml
+++ b/app/src/main/res/drawable-night/favorite.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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="16"
+    android:viewportHeight="16">
 
     <path
         android:fillColor="#ffcc00"
-        android:strokeColor="#121212"
+        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"
         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"/>
+        android:strokeColor="#121212" />
 </vector>
diff --git a/app/src/main/res/drawable-night/preview_markdown_gradient_shape.xml b/app/src/main/res/drawable-night/preview_markdown_gradient_shape.xml
index 53e9a358a8..76c4448ba6 100644
--- a/app/src/main/res/drawable-night/preview_markdown_gradient_shape.xml
+++ b/app/src/main/res/drawable-night/preview_markdown_gradient_shape.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
diff --git a/app/src/main/res/drawable/account_circle_white.xml b/app/src/main/res/drawable/account_circle_white.xml
index 02bfc28ce4..df19a17f7d 100644
--- a/app/src/main/res/drawable/account_circle_white.xml
+++ b/app/src/main/res/drawable/account_circle_white.xml
@@ -1,22 +1,8 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
diff --git a/app/src/main/res/drawable/add_to_home_screen.xml b/app/src/main/res/drawable/add_to_home_screen.xml
index 82cebeabfe..5218972652 100644
--- a/app/src/main/res/drawable/add_to_home_screen.xml
+++ b/app/src/main/res/drawable/add_to_home_screen.xml
@@ -1,25 +1,17 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2022 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#000000" 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="M18,1.01L8,1c-1.1,0 -2,0.9 -2,2v3c0,0.55 0.45,1 1,1s1,-0.45 1,-1V5h10v14H8v-1c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v3c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM11,15c0.55,0 1,-0.45 1,-1V9c0,-0.55 -0.45,-1 -1,-1H6c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h2.59L3.7,14.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L10,11.41V14c0,0.55 0.45,1 1,1z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M320,920Q287,920 263.5,896.5Q240,873 240,840L240,680L320,680L320,720L720,720L720,240L320,240L320,280L240,280L240,120Q240,87 263.5,63.5Q287,40 320,40L720,40Q753,40 776.5,63.5Q800,87 800,120L800,840Q800,873 776.5,896.5Q753,920 720,920L320,920ZM176,680L120,624L344,400L200,400L200,320L480,320L480,600L400,600L400,456L176,680Z" />
 </vector>
diff --git a/app/src/main/res/drawable/all_files.xml b/app/src/main/res/drawable/all_files.xml
index d000f691d7..b3b269aee0 100644
--- a/app/src/main/res/drawable/all_files.xml
+++ b/app/src/main/res/drawable/all_files.xml
@@ -1,22 +1,8 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector android:height="24dp" android:tint="#333333"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
diff --git a/app/src/main/res/drawable/arrow_right.xml b/app/src/main/res/drawable/arrow_right.xml
index 50820ed520..50e928c8d2 100644
--- a/app/src/main/res/drawable/arrow_right.xml
+++ b/app/src/main/res/drawable/arrow_right.xml
@@ -1,22 +1,8 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
diff --git a/app/src/main/res/drawable/backrepeat.xml b/app/src/main/res/drawable/backrepeat.xml
index 37105c7b6b..105e64c3c3 100644
--- a/app/src/main/res/drawable/backrepeat.xml
+++ b/app/src/main/res/drawable/backrepeat.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2015 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/checker_16_16"
     android:tileMode="repeat" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/favorite.xml b/app/src/main/res/drawable/favorite.xml
index 7e27b15ab0..c2b7ddaacc 100644
--- a/app/src/main/res/drawable/favorite.xml
+++ b/app/src/main/res/drawable/favorite.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector android:height="24dp" android:tint="#F7CD46"
-    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:tint="#F7CD46"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <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>
diff --git a/app/src/main/res/drawable/file.xml b/app/src/main/res/drawable/file.xml
index 6a281c9924..280162853c 100644
--- a/app/src/main/res/drawable/file.xml
+++ b/app/src/main/res/drawable/file.xml
@@ -1,11 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2024 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16"
-        android:viewportHeight="16">
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
     <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"/>
+        android:fillColor="#FF969696"
+        android:fillType="nonZero"
+        android:pathData="M6,22C5.45,22 4.979,21.804 4.588,21.413C4.196,21.021 4,20.55 4,20L4,4C4,3.45 4.196,2.979 4.588,2.587C4.979,2.196 5.45,2 6,2L14,2L20,8L20,20C20,20.55 19.804,21.021 19.413,21.413C19.021,21.804 18.55,22 18,22L6,22Z" />
+
 </vector>
diff --git a/app/src/main/res/drawable/file_calendar.xml b/app/src/main/res/drawable/file_calendar.xml
index b77b45594c..4bf03a29d2 100644
--- a/app/src/main/res/drawable/file_calendar.xml
+++ b/app/src/main/res/drawable/file_calendar.xml
@@ -1,22 +1,8 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector android:height="24dp" android:tint="#969696"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
diff --git a/app/src/main/res/drawable/file_link.xml b/app/src/main/res/drawable/file_link.xml
index 820cfa097f..6c7ed3bb7d 100644
--- a/app/src/main/res/drawable/file_link.xml
+++ b/app/src/main/res/drawable/file_link.xml
@@ -1,4 +1,16 @@
-<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"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#969696"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,680L280,680Q197,680 138.5,621.5Q80,563 80,480Q80,397 138.5,338.5Q197,280 280,280L440,280L440,360L280,360Q230,360 195,395Q160,430 160,480Q160,530 195,565Q230,600 280,600L440,600L440,680ZM320,520L320,440L640,440L640,520L320,520ZM520,680L520,600L680,600Q730,600 765,565Q800,530 800,480Q800,430 765,395Q730,360 680,360L520,360L520,280L680,280Q763,280 821.5,338.5Q880,397 880,480Q880,563 821.5,621.5Q763,680 680,680L520,680Z" />
 </vector>
diff --git a/app/src/main/res/drawable/file_location.xml b/app/src/main/res/drawable/file_location.xml
index c3cff1f51f..f6a53427ed 100644
--- a/app/src/main/res/drawable/file_location.xml
+++ b/app/src/main/res/drawable/file_location.xml
@@ -1,7 +1,16 @@
-<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="#00000000"
-        android:pathData="M8,6m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
-        android:strokeColor="#969696" android:strokeWidth="2"/>
-    <path android:fillColor="#969696" android:pathData="m4,9h8l-4,6z"/>
-</vector>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#969696"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,480Q513,480 536.5,456.5Q560,433 560,400Q560,367 536.5,343.5Q513,320 480,320Q447,320 423.5,343.5Q400,367 400,400Q400,433 423.5,456.5Q447,480 480,480ZM480,880Q319,743 239.5,625.5Q160,508 160,408Q160,258 256.5,169Q353,80 480,80Q607,80 703.5,169Q800,258 800,408Q800,508 720.5,625.5Q641,743 480,880Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/file_multiple.xml b/app/src/main/res/drawable/file_multiple.xml
index eed897441a..3ccefc73ae 100644
--- a/app/src/main/res/drawable/file_multiple.xml
+++ b/app/src/main/res/drawable/file_multiple.xml
@@ -1,8 +1,16 @@
-<!-- drawable/file_multiple.xml -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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="#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" />
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M160,920Q127,920 103.5,896.5Q80,873 80,840L80,280L160,280L160,840Q160,840 160,840Q160,840 160,840L600,840L600,920L160,920ZM320,760Q287,760 263.5,736.5Q240,713 240,680L240,120Q240,87 263.5,63.5Q287,40 320,40L600,40L840,280L840,680Q840,713 816.5,736.5Q793,760 760,760L320,760ZM560,320L760,320L560,120L560,320Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/file_sound.xml b/app/src/main/res/drawable/file_sound.xml
index 0d295f144c..e9a9aa00df 100644
--- a/app/src/main/res/drawable/file_sound.xml
+++ b/app/src/main/res/drawable/file_sound.xml
@@ -1,4 +1,16 @@
-<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"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <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>
diff --git a/app/src/main/res/drawable/file_vcard.xml b/app/src/main/res/drawable/file_vcard.xml
index b73be72da6..fbc34c4598 100644
--- a/app/src/main/res/drawable/file_vcard.xml
+++ b/app/src/main/res/drawable/file_vcard.xml
@@ -1,4 +1,16 @@
-<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="m10,1c-1.75,0 -3,1.43 -3,2.8 0,1.4 0.1,2.4 0.8,3.5 0.2,0.29 0.5,0.35 0.7,0.6 0.135,0.5 0.24,1 0.1,1.5 -0.28,0.1 -0.525,0.22 -0.8,0.33 -0.085,-0.15 -0.23,-0.2 -0.47,-0.4 -0.73,-0.44 -1.56,-0.75 -2.33,-1.04 -0.1,-0.37 -0.1,-0.65 0,-1 0.156,-0.166 0.37,-0.27 0.5,-0.43 0.46,-0.6 0.5,-1.654 0.5,-2.37 0,-1.06 -0.954,-1.9 -2,-1.9 -1.17,0 -2,1 -2,1.9 0,0.93 0.034,1.64 0.5,2.37 0.13,0.2 0.367,0.26 0.5,0.43 0.1,0.33 0.1,0.654 0,1 -0.85,0.3 -1.6,0.64 -2.34,1.04 -0.57,0.4 -0.52,0.205 -0.66,1.53 -0.11,1.06 2.335,1.13 4,1.13 0.06,0 0.11,0 0.17,0 -0.054,0.274 -0.1,0.63 -0.17,1.3 -0.16,1.59 3.5,1.7 6,1.7s6.16,-0.1 6,-1.7c-0.215,-2 -0.23,-1.71 -1,-2.3 -1.1,-0.654 -2.45,-1.17 -3.6,-1.6 -0.15,-0.56 -0.04,-0.97 0.1,-1.5 0.235,-0.25 0.5,-0.36 0.7,-0.6 0.7,-0.885 0.8,-2.425 0.8,-3.5 0,-1.6 -1.43,-2.8 -3,-2.8z"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#969696"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M40,800L40,688Q40,654 57.5,625.5Q75,597 104,582Q166,551 230,535.5Q294,520 360,520Q426,520 490,535.5Q554,551 616,582Q645,597 662.5,625.5Q680,654 680,688L680,800L40,800ZM760,800L760,680Q760,636 735.5,595.5Q711,555 666,526Q717,532 762,546.5Q807,561 846,582Q882,602 901,626.5Q920,651 920,680L920,800L760,800ZM360,480Q294,480 247,433Q200,386 200,320Q200,254 247,207Q294,160 360,160Q426,160 473,207Q520,254 520,320Q520,386 473,433Q426,480 360,480ZM760,320Q760,386 713,433Q666,480 600,480Q589,480 572,477.5Q555,475 544,472Q571,440 585.5,401Q600,362 600,320Q600,278 585.5,239Q571,200 544,168Q558,163 572,161.5Q586,160 600,160Q666,160 713,207Q760,254 760,320Z" />
 </vector>
diff --git a/app/src/main/res/drawable/file_zip.xml b/app/src/main/res/drawable/file_zip.xml
index 5e425a3535..24d4c747f4 100644
--- a/app/src/main/res/drawable/file_zip.xml
+++ b/app/src/main/res/drawable/file_zip.xml
@@ -1,4 +1,16 @@
-<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"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <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>
diff --git a/app/src/main/res/drawable/first_run_files.xml b/app/src/main/res/drawable/first_run_files.xml
index d22a1d2637..85f4be9725 100644
--- a/app/src/main/res/drawable/first_run_files.xml
+++ b/app/src/main/res/drawable/first_run_files.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="128dp"
-        android:height="128dp"
-        android:viewportWidth="128"
-        android:viewportHeight="128">
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
 
     <path
         android:fillColor="#ffffff"
-        android:strokeWidth="9"
-        android:pathData="M 5.5,10 C 3.25,10 1,12.25 1,14.5 v 99 c 0,2.34 2.16,4.5 4.5,4.5 h 117 c 2.34,0 4.5,-2.169 4.5,-4.5 v -81 C 127,30.25 124.75,28 122.5,28 H 64 L 46,10 Z M 84.25,41.5 A 11.25,11.25 0 0 1 95.5,52.75 11.25,11.25 0 0 1 84.25,64 11.25,11.25 0 0 1 77.0428,61.381 L 54.982,72.4195 A 11.25,11.25 0 0 1 55,73 11.25,11.25 0 0 1 54.9649,73.5805 L 77.0428,84.619 A 11.25,11.25 0 0 1 84.25,82 11.25,11.25 0 0 1 95.5,93.25 11.25,11.25 0 0 1 84.25,104.5 11.25,11.25 0 0 1 73,93.25 11.25,11.25 0 0 1 73.0351,92.674 L 50.9572,81.631 A 11.25,11.25 0 0 1 43.75,84.25 11.25,11.25 0 0 1 32.5,73 11.25,11.25 0 0 1 43.75,61.75 11.25,11.25 0 0 1 50.9572,64.369 L 73.018,53.3305 A 11.25,11.25 0 0 1 73,52.75 11.25,11.25 0 0 1 84.25,41.5 Z"/>
+        android:pathData="M 5.5,10 C 3.25,10 1,12.25 1,14.5 v 99 c 0,2.34 2.16,4.5 4.5,4.5 h 117 c 2.34,0 4.5,-2.169 4.5,-4.5 v -81 C 127,30.25 124.75,28 122.5,28 H 64 L 46,10 Z M 84.25,41.5 A 11.25,11.25 0 0 1 95.5,52.75 11.25,11.25 0 0 1 84.25,64 11.25,11.25 0 0 1 77.0428,61.381 L 54.982,72.4195 A 11.25,11.25 0 0 1 55,73 11.25,11.25 0 0 1 54.9649,73.5805 L 77.0428,84.619 A 11.25,11.25 0 0 1 84.25,82 11.25,11.25 0 0 1 95.5,93.25 11.25,11.25 0 0 1 84.25,104.5 11.25,11.25 0 0 1 73,93.25 11.25,11.25 0 0 1 73.0351,92.674 L 50.9572,81.631 A 11.25,11.25 0 0 1 43.75,84.25 11.25,11.25 0 0 1 32.5,73 11.25,11.25 0 0 1 43.75,61.75 11.25,11.25 0 0 1 50.9572,64.369 L 73.018,53.3305 A 11.25,11.25 0 0 1 73,52.75 11.25,11.25 0 0 1 84.25,41.5 Z"
+        android:strokeWidth="9" />
 </vector>
diff --git a/app/src/main/res/drawable/first_run_groupware.xml b/app/src/main/res/drawable/first_run_groupware.xml
index 9a8f178409..6093e71bf4 100644
--- a/app/src/main/res/drawable/first_run_groupware.xml
+++ b/app/src/main/res/drawable/first_run_groupware.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="128dp"
         android:height="128dp"
diff --git a/app/src/main/res/drawable/first_run_talk.xml b/app/src/main/res/drawable/first_run_talk.xml
index e2f689ef85..6a5c6f46d3 100644
--- a/app/src/main/res/drawable/first_run_talk.xml
+++ b/app/src/main/res/drawable/first_run_talk.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="128dp"
     android:height="128dp"
diff --git a/app/src/main/res/drawable/ic_account_plus.xml b/app/src/main/res/drawable/ic_account_plus.xml
index 101291a7f1..078a9e3bcc 100644
--- a/app/src/main/res/drawable/ic_account_plus.xml
+++ b/app/src/main/res/drawable/ic_account_plus.xml
@@ -1,22 +1,8 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/ic_action_cancel_grey.xml b/app/src/main/res/drawable/ic_action_cancel_grey.xml
index 0a193064b4..99397d0c3e 100644
--- a/app/src/main/res/drawable/ic_action_cancel_grey.xml
+++ b/app/src/main/res/drawable/ic_action_cancel_grey.xml
@@ -1,23 +1,16 @@
 <!--
-    @author Austin Andrews
-    Copyright (C) 2018 Austin Andrews
-
-    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.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <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="#757575" android:pathData="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z" />
-</vector>
+    android:height="24dp"
+    android:tint="#757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M336,680L480,536L624,680L680,624L536,480L680,336L624,280L480,424L336,280L280,336L424,480L280,624L336,680ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z" />
+</vector>
\ No newline at end of file
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 8586242fb2..3ab2e86692 100644
--- a/app/src/main/res/drawable/ic_action_create_dir.xml
+++ b/app/src/main/res/drawable/ic_action_create_dir.xml
@@ -1,23 +1,16 @@
 <!--
-    @author Austin Andrews
-    Copyright (C) 2018 Austin Andrews
-
-    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.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <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="#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" />
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M560,640L640,640L640,560L720,560L720,480L640,480L640,400L560,400L560,480L480,480L480,560L560,560L560,640ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Z" />
 </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 477423538a..bd17decdc7 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,17 @@
 <?xml version="1.0" encoding="utf-8"?>
+ <!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16"
-        android:viewportHeight="16">
-
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#757575"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <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: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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_activity.xml b/app/src/main/res/drawable/ic_activity.xml
index 7d4443619f..60b8ce0ce2 100644
--- a/app/src/main/res/drawable/ic_activity.xml
+++ b/app/src/main/res/drawable/ic_activity.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
         android:height="32dp"
diff --git a/app/src/main/res/drawable/ic_alphabetical_asc.xml b/app/src/main/res/drawable/ic_alphabetical_asc.xml
index e7b83f2c97..b0561369f4 100644
--- a/app/src/main/res/drawable/ic_alphabetical_asc.xml
+++ b/app/src/main/res/drawable/ic_alphabetical_asc.xml
@@ -1,20 +1,9 @@
 <!--
-    @author Google LLC
-    @author Andy Scherzinger
-    Copyright (C) 2018 Google LLC
-    Copyright (C) 2018 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.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_alphabetical_desc.xml b/app/src/main/res/drawable/ic_alphabetical_desc.xml
index fd3706809b..623267afa1 100644
--- a/app/src/main/res/drawable/ic_alphabetical_desc.xml
+++ b/app/src/main/res/drawable/ic_alphabetical_desc.xml
@@ -1,20 +1,9 @@
 <!--
-    @author Google LLC
-    @author Andy Scherzinger
-    Copyright (C) 2018 Google LLC
-    Copyright (C) 2018 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.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_check_circle_outline.xml b/app/src/main/res/drawable/ic_check_circle_outline.xml
index e68a9d2fc0..2da99099a3 100644
--- a/app/src/main/res/drawable/ic_check_circle_outline.xml
+++ b/app/src/main/res/drawable/ic_check_circle_outline.xml
@@ -1,9 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:tint="#FF000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.59,7.58L10,14.17l-3.59,-3.58L5,12l5,5 8,-8zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
-</vector>
+        android:fillColor="@android:color/white"
+        android:pathData="M424,664L706,382L650,326L424,552L310,438L254,494L424,664ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_circles.xml b/app/src/main/res/drawable/ic_circles.xml
index 80040cf489..af9ffa8617 100644
--- a/app/src/main/res/drawable/ic_circles.xml
+++ b/app/src/main/res/drawable/ic_circles.xml
@@ -1,20 +1,27 @@
-<vector xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="64dp"
-    android:viewportHeight="57"
-    android:viewportWidth="57"
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2020-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="64dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="64dp"
+    android:autoMirrored="true"
+    android:viewportWidth="57"
+    android:viewportHeight="57"
     tools:ignore="VectorRaster">
     <path
         android:fillAlpha="1"
         android:fillColor="#00000000"
         android:pathData="M7.1,28.5A21.4,21.4 0,0 1,28.5 7.1m10.7,40A21.4,21.4 0,0 1,10 39M39.2,10A21.4,21.4 0,0 1,47 39.2"
+        android:strokeWidth="3.99979687"
         android:strokeAlpha="1"
         android:strokeColor="#000000"
         android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:strokeWidth="3.99979687" />
+        android:strokeLineJoin="round" />
     <path
         android:fillColor="#000000"
         android:pathData="M28.5,7.1m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0" />
diff --git a/app/src/main/res/drawable/ic_cloud_download.xml b/app/src/main/res/drawable/ic_cloud_download.xml
index f87732434c..d550699b22 100644
--- a/app/src/main/res/drawable/ic_cloud_download.xml
+++ b/app/src/main/res/drawable/ic_cloud_download.xml
@@ -1,5 +1,16 @@
-<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>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q233,285 295.5,230Q358,175 440,163L440,486L376,424L320,480L480,640L640,480L584,424L520,486L520,163Q623,177 691.5,255.5Q760,334 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L260,800Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cloud_upload.xml b/app/src/main/res/drawable/ic_cloud_upload.xml
index df288bb615..2e2dc4b261 100644
--- a/app/src/main/res/drawable/ic_cloud_upload.xml
+++ b/app/src/main/res/drawable/ic_cloud_upload.xml
@@ -1,5 +1,16 @@
-<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.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z"/>
-</vector>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,800L260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q235,274 310,217Q385,160 480,160Q597,160 678.5,241.5Q760,323 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L520,800L520,514L584,576L640,520L480,360L320,520L376,576L440,514L440,800Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml
index f7cfddd966..dcc5711bee 100644
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -1,9 +1,16 @@
-<vector android:height="24dp"
-        android:viewportHeight="16"
-        android:viewportWidth="16"
-        android:width="24dp"
-        xmlns:android="http://schemas.android.com/apk/res/android">
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#ff757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
-        android:fillColor="#ff757575"
-        android:pathData="M8,1.5C3.582,1.5 0,3.962 0,7s3.582,5.5 8,5.5c0.25,0 0.49,-0.016 0.734,-0.03L13,16v-4.703c1.83,-1.008 3,-2.56 3,-4.297 0,-3.038 -3.582,-5.5 -8,-5.5z"/>
-</vector>
+        android:fillColor="@android:color/white"
+        android:pathData="M160,720Q127,720 103.5,696.5Q80,673 80,640L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,880L720,720L160,720Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_comment_grid.xml b/app/src/main/res/drawable/ic_comment_grid.xml
index 0b95112332..66a3b2b61b 100644
--- a/app/src/main/res/drawable/ic_comment_grid.xml
+++ b/app/src/main/res/drawable/ic_comment_grid.xml
@@ -1,12 +1,17 @@
-<vector android:height="20dp"
-    android:viewportHeight="16"
-    android:viewportWidth="16"
-    android:width="20dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="1"
-        android:strokeMiterLimit="4"
         android:fillColor="#ff757575"
-        android:pathData="M8,1.5C3.582,1.5 0,3.962 0,7s3.582,5.5 8,5.5c0.25,0 0.49,-0.016 0.734,-0.03L13,16v-4.703c1.83,-1.008 3,-2.56 3,-4.297 0,-3.038 -3.582,-5.5 -8,-5.5z" />
-</vector>
+        android:pathData="M160,720Q127,720 103.5,696.5Q80,673 80,640L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,880L720,720L160,720Z"
+        android:strokeWidth="36"
+        android:strokeColor="#FFFFFFFF" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_deck.xml b/app/src/main/res/drawable/ic_deck.xml
index 402396cc82..eba07ba077 100644
--- a/app/src/main/res/drawable/ic_deck.xml
+++ b/app/src/main/res/drawable/ic_deck.xml
@@ -1,18 +1,25 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
     android:height="16dp"
     android:viewportWidth="16"
     android:viewportHeight="16">
-  <path
-      android:pathData="M2,7L14,7A1,1 0,0 1,15 8L15,14A1,1 0,0 1,14 15L2,15A1,1 0,0 1,1 14L1,8A1,1 0,0 1,2 7z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="M2.5,5L13.5,5A0.5,0.5 0,0 1,14 5.5L14,5.5A0.5,0.5 0,0 1,13.5 6L2.5,6A0.5,0.5 0,0 1,2 5.5L2,5.5A0.5,0.5 0,0 1,2.5 5z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="M3.5,3L12.5,3A0.5,0.5 0,0 1,13 3.5L13,3.5A0.5,0.5 0,0 1,12.5 4L3.5,4A0.5,0.5 0,0 1,3 3.5L3,3.5A0.5,0.5 0,0 1,3.5 3z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="M4.5,1L11.5,1A0.5,0.5 0,0 1,12 1.5L12,1.5A0.5,0.5 0,0 1,11.5 2L4.5,2A0.5,0.5 0,0 1,4 1.5L4,1.5A0.5,0.5 0,0 1,4.5 1z"
-      android:fillColor="#fff"/>
+    <path
+        android:fillColor="#fff"
+        android:pathData="M2,7L14,7A1,1 0,0 1,15 8L15,14A1,1 0,0 1,14 15L2,15A1,1 0,0 1,1 14L1,8A1,1 0,0 1,2 7z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M2.5,5L13.5,5A0.5,0.5 0,0 1,14 5.5L14,5.5A0.5,0.5 0,0 1,13.5 6L2.5,6A0.5,0.5 0,0 1,2 5.5L2,5.5A0.5,0.5 0,0 1,2.5 5z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M3.5,3L12.5,3A0.5,0.5 0,0 1,13 3.5L13,3.5A0.5,0.5 0,0 1,12.5 4L3.5,4A0.5,0.5 0,0 1,3 3.5L3,3.5A0.5,0.5 0,0 1,3.5 3z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M4.5,1L11.5,1A0.5,0.5 0,0 1,12 1.5L12,1.5A0.5,0.5 0,0 1,11.5 2L4.5,2A0.5,0.5 0,0 1,4 1.5L4,1.5A0.5,0.5 0,0 1,4.5 1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_decrypt.xml b/app/src/main/res/drawable/ic_decrypt.xml
index 5d6fe71ca3..d69274ba65 100644
--- a/app/src/main/res/drawable/ic_decrypt.xml
+++ b/app/src/main/res/drawable/ic_decrypt.xml
@@ -1,4 +1,9 @@
-<!-- drawable/key_minus.xml -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020-2024 Austin Andrews
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 38577d823d..0f6e822c9d 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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:tint="#C4C4C4"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <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>
diff --git a/app/src/main/res/drawable/ic_encrypt.xml b/app/src/main/res/drawable/ic_encrypt.xml
index d5df418f25..a4875510df 100644
--- a/app/src/main/res/drawable/ic_encrypt.xml
+++ b/app/src/main/res/drawable/ic_encrypt.xml
@@ -1,8 +1,15 @@
-<!-- drawable/key_plus.xml -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020-2024 Austin Andrews
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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: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" />
 </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 f85277e4f7..c89020ba6d 100644
--- a/app/src/main/res/drawable/ic_export.xml
+++ b/app/src/main/res/drawable/ic_export.xml
@@ -1,8 +1,15 @@
-<!-- drawable/file_export_outline.xml -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2022-2024 Terren
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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: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" />
 </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 15e30be7c1..1b7112ac82 100644
--- a/app/src/main/res/drawable/ic_external.xml
+++ b/app/src/main/res/drawable/ic_external.xml
@@ -1,8 +1,15 @@
-<vector android:height="24dp"
-    android:viewportHeight="16"
-    android:viewportWidth="16"
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2019-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:height="24dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
     <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" />
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index d982aa0271..4f5f88cbcf 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -1,6 +1,19 @@
-<vector android:height="24dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#757575"
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#757575"
         android:fillType="evenOdd"
-        android:pathData="M8,1.4368 L0.4659,8.9426H3.2912V14.5932H12.7088V8.9426h2.8253L12.7088,6.0891V2.3503H9.8835v1.0171z" android:strokeWidth="0.94176388"/>
+        android:pathData="M8,1.4368 L0.4659,8.9426H3.2912V14.5932H12.7088V8.9426h2.8253L12.7088,6.0891V2.3503H9.8835v1.0171z"
+        android:strokeWidth="0.94176388" />
 </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 ad33063c80..91c193fce1 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,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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="24dp"
+    android:height="24dp"
+    android:tint="#FF000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
-</vector>
+        android:fillColor="@android:color/white"
+        android:pathData="M480,616L240,376L296,320L480,504L664,320L720,376L480,616Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index c1ee647893..fc4b2df3b7 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,3 +1,10 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2020-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
@@ -5,22 +12,22 @@
     android:viewportWidth="1344"
     android:viewportHeight="1344">
     <path
+        android:fillType="evenOdd"
         android:pathData="M0,0h1344v1344h-1344z"
-        android:strokeLineJoin="round"
-        android:fillType="evenOdd">
+        android:strokeLineJoin="round">
         <aapt:attr name="android:fillColor">
             <gradient
-                android:startY="1344.0002"
-                android:startX="163.34073"
-                android:endY="1.2959057E-4"
                 android:endX="1343.9999"
+                android:endY="1.2959057E-4"
+                android:startX="163.34073"
+                android:startY="1344.0002"
                 android:type="linear">
                 <item
-                    android:offset="0"
-                    android:color="#FF0082C9" />
+                    android:color="#FF0082C9"
+                    android:offset="0" />
                 <item
-                    android:offset="1"
-                    android:color="#FF1CAFFF" />
+                    android:color="#FF1CAFFF"
+                    android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 4e76502f50..b15a7699c3 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,22 +1,10 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2023 Andy Scherzinger
-  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/>.
-  -->
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2023-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
@@ -26,8 +14,8 @@
         android:translateX="265.39328"
         android:translateY="280.15982">
         <path
-            android:pathData="M532.68,320.01C439.33,320.02 360.95,383.94 336.99,469.92 316.09,423.93 270.08,391.34 216.62,391.33 143.84,391.34 84.01,451.18 84,523.96c-0.01,72.79 59.83,132.65 132.62,132.65 53.47,-0.01 99.45,-32.62 120.35,-78.62 23.94,86 102.35,149.94 195.72,149.95 92.84,0.01 170.84,-63.23 195.28,-148.5 21.24,45.15 66.55,77.17 119.39,77.17 72.8,0.01 132.65,-59.85 132.64,-132.65 -0.01,-72.79 -59.86,-132.64 -132.64,-132.63 -52.85,0.01 -98.18,32.02 -119.42,77.17 -24.44,-85.27 -102.41,-148.51 -195.25,-148.5zM532.68,397.86c70.11,0 126.11,55.99 126.11,126.1 0,70.12 -56,126.13 -126.11,126.13 -70.11,-0.01 -126.09,-56.01 -126.09,-126.13 0.01,-70.1 55.99,-126.09 126.09,-126.1zM216.6,469.19c30.71,0 54.76,24.06 54.77,54.77 0,30.72 -24.05,54.79 -54.77,54.8 -30.72,0 -54.77,-24.08 -54.77,-54.8 0,-30.71 24.06,-54.77 54.77,-54.77zM847.36,469.19c30.71,-0.01 54.79,24.05 54.79,54.77 0.01,30.73 -24.07,54.8 -54.79,54.8 -30.72,0 -54.77,-24.08 -54.77,-54.8 0,-30.71 24.06,-54.77 54.77,-54.77z"
             android:fillColor="#ffffff"
-            android:fillType="nonZero" />
+            android:fillType="nonZero"
+            android:pathData="M532.68,320.01C439.33,320.02 360.95,383.94 336.99,469.92 316.09,423.93 270.08,391.34 216.62,391.33 143.84,391.34 84.01,451.18 84,523.96c-0.01,72.79 59.83,132.65 132.62,132.65 53.47,-0.01 99.45,-32.62 120.35,-78.62 23.94,86 102.35,149.94 195.72,149.95 92.84,0.01 170.84,-63.23 195.28,-148.5 21.24,45.15 66.55,77.17 119.39,77.17 72.8,0.01 132.65,-59.85 132.64,-132.65 -0.01,-72.79 -59.86,-132.64 -132.64,-132.63 -52.85,0.01 -98.18,32.02 -119.42,77.17 -24.44,-85.27 -102.41,-148.51 -195.25,-148.5zM532.68,397.86c70.11,0 126.11,55.99 126.11,126.1 0,70.12 -56,126.13 -126.11,126.13 -70.11,-0.01 -126.09,-56.01 -126.09,-126.13 0.01,-70.1 55.99,-126.09 126.09,-126.1zM216.6,469.19c30.71,0 54.76,24.06 54.77,54.77 0,30.72 -24.05,54.79 -54.77,54.8 -30.72,0 -54.77,-24.08 -54.77,-54.8 0,-30.71 24.06,-54.77 54.77,-54.77zM847.36,469.19c30.71,-0.01 54.79,24.05 54.79,54.77 0.01,30.73 -24.07,54.8 -54.79,54.8 -30.72,0 -54.77,-24.08 -54.77,-54.8 0,-30.71 24.06,-54.77 54.77,-54.77z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_list_empty_create_folder.xml b/app/src/main/res/drawable/ic_list_empty_create_folder.xml
index 064f6b9a47..6893ab43e5 100644
--- a/app/src/main/res/drawable/ic_list_empty_create_folder.xml
+++ b/app/src/main/res/drawable/ic_list_empty_create_folder.xml
@@ -1,6 +1,16 @@
-<vector android:height="72dp" android:viewportHeight="17.066668"
-    android:viewportWidth="17.066668" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.5" android:fillColor="#0082c9"
-        android:pathData="m1.5542,2.1292c-0.2667,0 -0.4917,0.225 -0.4917,0.4917L1.0625,14.4396c0,0.2773 0.2165,0.4896 0.4917,0.4896L15.5063,14.9292c0.2752,0 0.4896,-0.2123 0.4896,-0.4896L15.9958,4.7583c0,-0.2667 -0.2229,-0.4958 -0.4896,-0.4958L8.5292,4.2625L6.3958,2.1292ZM10.6354,6.6521h1.425L12.0604,8.8h2.1417v1.425h-2.1417v2.1375h-1.425L10.6354,10.225L8.4896,10.225L8.4896,8.8h2.1458z"
-        android:strokeAlpha="0.5" android:strokeWidth="1.06666672"/>
-</vector>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#0082c9"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M560,640L640,640L640,560L720,560L720,480L640,480L640,400L560,400L560,480L480,480L480,560L560,560L560,640ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_list_empty_error.xml b/app/src/main/res/drawable/ic_list_empty_error.xml
index e606dd38b7..e68fc6c777 100644
--- a/app/src/main/res/drawable/ic_list_empty_error.xml
+++ b/app/src/main/res/drawable/ic_list_empty_error.xml
@@ -1,5 +1,16 @@
-<vector android:alpha="0.5" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF969696" android:pathData="M13,13H11V7H13M12,17.3A1.3,1.3 0,0 1,10.7 16A1.3,1.3 0,0 1,12 14.7A1.3,1.3 0,0 1,13.3 16A1.3,1.3 0,0 1,12 17.3M15.73,3H8.27L3,8.27V15.73L8.27,21H15.73L21,15.73V8.27L15.73,3Z"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FF969696"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680ZM440,520L520,520L520,280L440,280L440,520ZM330,840L120,630L120,330L330,120L630,120L840,330L840,630L630,840L330,840Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_live_photo.xml b/app/src/main/res/drawable/ic_live_photo.xml
index a2f93292d2..a3af252f72 100644
--- a/app/src/main/res/drawable/ic_live_photo.xml
+++ b/app/src/main/res/drawable/ic_live_photo.xml
@@ -1,9 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z"
-      android:fillColor="#000000"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M380,660L660,480L380,300L380,660ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
index 6d9343b31c..d6e42754d1 100644
--- a/app/src/main/res/drawable/ic_menu.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -1,9 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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="24dp"
+    android:height="24dp"
+    android:tint="#FF000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
-</vector>
+        android:fillColor="@android:color/white"
+        android:pathData="M120,720L120,640L840,640L840,720L120,720ZM120,520L120,440L840,440L840,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_modification_asc.xml b/app/src/main/res/drawable/ic_modification_asc.xml
index bfb874ec49..9a5643cbae 100644
--- a/app/src/main/res/drawable/ic_modification_asc.xml
+++ b/app/src/main/res/drawable/ic_modification_asc.xml
@@ -1,20 +1,9 @@
 <!--
-    @author Google LLC
-    @author Andy Scherzinger
-    Copyright (C) 2018 Google LLC
-    Copyright (C) 2018 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.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_modification_desc.xml b/app/src/main/res/drawable/ic_modification_desc.xml
index 59d79f97a5..61d1171baa 100644
--- a/app/src/main/res/drawable/ic_modification_desc.xml
+++ b/app/src/main/res/drawable/ic_modification_desc.xml
@@ -1,20 +1,9 @@
 <!--
-    @author Google LLC
-    @author Andy Scherzinger
-    Copyright (C) 2018 Google LLC
-    Copyright (C) 2018 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.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
index 502529ce0f..9e18e108c0 100644
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -1,5 +1,16 @@
-<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="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"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#333333"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M160,760L160,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L800,680L800,760L160,760ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
index 3ee93a2b33..d207dafaa9 100644
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -1,9 +1,15 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960">
-  <path
-      android:fillColor="@color/foreground_highlight"
-      android:pathData="M560,760v-560h160v560L560,760ZM240,760v-560h160v560L240,760Z"/>
+    <path
+        android:fillColor="@color/foreground_highlight"
+        android:pathData="M560,760L560,200L720,200L720,760L560,760ZM240,760L240,200L400,200L400,760L240,760Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_rename.xml b/app/src/main/res/drawable/ic_rename.xml
index 6d040a767d..0b3cc4dce0 100644
--- a/app/src/main/res/drawable/ic_rename.xml
+++ b/app/src/main/res/drawable/ic_rename.xml
@@ -1,10 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
+    android:tint="?attr/colorControlNormal"
     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:viewportHeight="48">
+    <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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml
index cfe46c4643..ee739a0edd 100644
--- a/app/src/main/res/drawable/ic_save.xml
+++ b/app/src/main/res/drawable/ic_save.xml
@@ -1,8 +1,15 @@
-<!-- drawable/content_save.xml -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
+    <path
+        android:fillColor="#000"
+        android:pathData="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_scan_document.xml b/app/src/main/res/drawable/ic_scan_document.xml
index 780fa2153f..ce8cd2e8b0 100644
--- a/app/src/main/res/drawable/ic_scan_document.xml
+++ b/app/src/main/res/drawable/ic_scan_document.xml
@@ -1,13 +1,25 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2024 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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">
+
     <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="M23,21.166C23,22.173 22.173,23 21.166,23L17.5,23L17.5,21.166L21.166,21.166L21.166,17.5L23,17.5L23,21.166ZM2.834,23C1.827,23 1,22.173 1,21.166L1,17.5L2.834,17.5L2.834,21.166L6.5,21.166L6.5,23L2.834,23ZM1,2.834C1,1.827 1.827,1 2.834,1L6.5,1L6.5,2.834L2.834,2.834L2.834,6.5L1,6.5L1,2.834ZM21.166,1C22.173,1 23,1.827 23,2.834L23,6.5L21.166,6.5L21.166,2.834L17.5,2.834L17.5,1L21.166,1Z" />
+
+    <path
+        android:fillColor="#FF000000"
+        android:fillType="nonZero"
+        android:pathData="M6.449,19.137C6.013,19.137 5.64,18.981 5.33,18.671C5.019,18.36 4.863,17.987 4.863,17.551L4.863,6.449C4.863,6.013 5.019,5.64 5.33,5.329C5.64,5.019 6.013,4.863 6.449,4.863L17.551,4.863C17.987,4.863 18.36,5.019 18.671,5.329C18.981,5.64 19.137,6.013 19.137,6.449L19.137,17.551C19.137,17.987 18.981,18.36 18.671,18.671C18.36,18.981 17.987,19.137 17.551,19.137L6.449,19.137ZM8.035,15.965L13.586,15.965L13.586,14.379L8.035,14.379L8.035,15.965ZM8.035,12.793L15.965,12.793L15.965,11.207L8.035,11.207L8.035,12.793ZM8.035,9.621L15.965,9.621L15.965,8.035L8.035,8.035L8.035,9.621Z" />
+
 </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 e37bd21b8b..f68e1672b4 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,16 @@
-<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>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FF969696"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M784,840L532,588Q502,612 463,626Q424,640 380,640Q271,640 195.5,564.5Q120,489 120,380Q120,271 195.5,195.5Q271,120 380,120Q489,120 564.5,195.5Q640,271 640,380Q640,424 626,463Q612,502 588,532L840,784L784,840ZM380,560Q455,560 507.5,507.5Q560,455 560,380Q560,305 507.5,252.5Q455,200 380,200Q305,200 252.5,252.5Q200,305 200,380Q200,455 252.5,507.5Q305,560 380,560Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
index 9141ea52ad..6e38e64e38 100644
--- a/app/src/main/res/drawable/ic_send.xml
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -1,25 +1,17 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#666666"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M120,800L120,560L440,480L120,400L120,160L880,480L120,800Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 4588fea2e3..b3f369521c 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector android:height="24dp" android:tint="#666666"
-    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:tint="#666666"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 1e55d1232b..f979a2f48c 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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 xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <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>
diff --git a/app/src/main/res/drawable/ic_size_asc.xml b/app/src/main/res/drawable/ic_size_asc.xml
index 688d6a880f..fd68e1b0da 100644
--- a/app/src/main/res/drawable/ic_size_asc.xml
+++ b/app/src/main/res/drawable/ic_size_asc.xml
@@ -1,20 +1,9 @@
 <!--
-    @author Google LLC
-    @author Andy Scherzinger
-    Copyright (C) 2018 Google LLC
-    Copyright (C) 2018 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.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_size_desc.xml b/app/src/main/res/drawable/ic_size_desc.xml
index 824e033974..dc34a03371 100644
--- a/app/src/main/res/drawable/ic_size_desc.xml
+++ b/app/src/main/res/drawable/ic_size_desc.xml
@@ -1,20 +1,9 @@
 <!--
-    @author Google LLC
-    @author Andy Scherzinger
-    Copyright (C) 2018 Google LLC
-    Copyright (C) 2018 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.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
index e01fd4f9fc..06e220c4d3 100644
--- a/app/src/main/res/drawable/ic_star.xml
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -5,9 +5,11 @@
   ~ SPDX-License-Identifier: Apache-2.0
 -->
 <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: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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_light_yellow.xml b/app/src/main/res/drawable/ic_star_light_yellow.xml
index 45b45f4ccd..e051e51a7e 100644
--- a/app/src/main/res/drawable/ic_star_light_yellow.xml
+++ b/app/src/main/res/drawable/ic_star_light_yellow.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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="#ffcc00"
         android:fillAlpha="0.5"
-        android:strokeAlpha="0.5"
+        android:fillColor="#ffcc00"
+        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"
         android:strokeWidth="1"
-        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"/>
+        android:strokeAlpha="0.5" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sync.xml b/app/src/main/res/drawable/ic_sync.xml
index bd90c1d323..3dc4b93a1d 100644
--- a/app/src/main/res/drawable/ic_sync.xml
+++ b/app/src/main/res/drawable/ic_sync.xml
@@ -1,8 +1,15 @@
-<!-- drawable/sync.xml -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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,18A6,6 0 0,1 6,12C6,11 6.25,10.03 6.7,9.2L5.24,7.74C4.46,8.97 4,10.43 4,12A8,8 0 0,0 12,20V23L16,19L12,15M12,4V1L8,5L12,9V6A6,6 0 0,1 18,12C18,13 17.75,13.97 17.3,14.8L18.76,16.26C19.54,15.03 20,13.57 20,12A8,8 0 0,0 12,4Z" />
+    <path
+        android:fillColor="#757575"
+        android:pathData="M12,18A6,6 0 0,1 6,12C6,11 6.25,10.03 6.7,9.2L5.24,7.74C4.46,8.97 4,10.43 4,12A8,8 0 0,0 12,20V23L16,19L12,15M12,4V1L8,5L12,9V6A6,6 0 0,1 18,12C18,13 17.75,13.97 17.3,14.8L18.76,16.26C19.54,15.03 20,13.57 20,12A8,8 0 0,0 12,4Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_synced.xml b/app/src/main/res/drawable/ic_synced.xml
index 0e543a3323..9f37fb896a 100644
--- a/app/src/main/res/drawable/ic_synced.xml
+++ b/app/src/main/res/drawable/ic_synced.xml
@@ -1,3 +1,10 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
     android:height="16dp"
diff --git a/app/src/main/res/drawable/ic_synchronizing.xml b/app/src/main/res/drawable/ic_synchronizing.xml
index 236bc29d72..13f666e178 100644
--- a/app/src/main/res/drawable/ic_synchronizing.xml
+++ b/app/src/main/res/drawable/ic_synchronizing.xml
@@ -1,38 +1,45 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <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"/>
+    <path
+        android:fillColor="#2268ab"
+        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" />
+    <path
+        android:fillColor="#00000000"
+        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:strokeWidth=".44097"
+        android:strokeColor="#fff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        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:strokeWidth=".44097"
+        android:strokeColor="#fff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m1.4349,2.38 l-0.52538,-0.00004 0.00011,0.52563"
+        android:strokeWidth=".52916"
+        android:strokeColor="#faffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m2.815,1.85001 l0.52538,0.00004 -0.00011,-0.52563"
+        android:strokeWidth=".52916"
+        android:strokeColor="#faffff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_synchronizing_error.xml b/app/src/main/res/drawable/ic_synchronizing_error.xml
index b65fa2ea98..9d09335716 100644
--- a/app/src/main/res/drawable/ic_synchronizing_error.xml
+++ b/app/src/main/res/drawable/ic_synchronizing_error.xml
@@ -1,24 +1,31 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <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"/>
+    <path
+        android:fillColor="#d40000"
+        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" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m1.1839,1.18002 l1.8656,1.8656"
+        android:strokeWidth=".52917"
+        android:strokeColor="#fff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m3.0495,1.18002 l-1.8656,1.8656"
+        android:strokeWidth=".52917"
+        android:strokeColor="#fff"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_tag.xml b/app/src/main/res/drawable/ic_tag.xml
index 8b2aa436ba..03732de5b2 100644
--- a/app/src/main/res/drawable/ic_tag.xml
+++ b/app/src/main/res/drawable/ic_tag.xml
@@ -5,9 +5,11 @@
   ~ SPDX-License-Identifier: Apache-2.0
 -->
 <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.5,7A1.5,1.5 0 0,1 4,5.5A1.5,1.5 0 0,1 5.5,4A1.5,1.5 0 0,1 7,5.5A1.5,1.5 0 0,1 5.5,7M21.41,11.58L12.41,2.58C12.05,2.22 11.55,2 11,2H4C2.89,2 2,2.89 2,4V11C2,11.55 2.22,12.05 2.59,12.41L11.58,21.41C11.95,21.77 12.45,22 13,22C13.55,22 14.05,21.77 14.41,21.41L21.41,14.41C21.78,14.05 22,13.55 22,13C22,12.44 21.77,11.94 21.41,11.58Z" />
+    <path
+        android:fillColor="#757575"
+        android:pathData="M5.5,7A1.5,1.5 0 0,1 4,5.5A1.5,1.5 0 0,1 5.5,4A1.5,1.5 0 0,1 7,5.5A1.5,1.5 0 0,1 5.5,7M21.41,11.58L12.41,2.58C12.05,2.22 11.55,2 11,2H4C2.89,2 2,2.89 2,4V11C2,11.55 2.22,12.05 2.59,12.41L11.58,21.41C11.95,21.77 12.45,22 13,22C13.55,22 14.05,21.77 14.41,21.41L21.41,14.41C21.78,14.05 22,13.55 22,13C22,12.44 21.77,11.94 21.41,11.58Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_talk.xml b/app/src/main/res/drawable/ic_talk.xml
index 631965fe78..91c0d0f523 100644
--- a/app/src/main/res/drawable/ic_talk.xml
+++ b/app/src/main/res/drawable/ic_talk.xml
@@ -1,28 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2021 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
-  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/>.
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-<vector android:autoMirrored="true"
-    android:height="16dp"
-    android:viewportHeight="16"
-    android:viewportWidth="16"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:height="16dp"
+    android:autoMirrored="true"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
     <path
         android:fillColor="#FF000000"
         android:pathData="m7.9992,0.999a6.9993,6.9994 0,0 0,-6.9992 6.9996,6.9993 6.9994,0 0,0 6.9992,6.9994 6.9993,6.9994 0,0 0,3.6308 -1.024c0.8602,0.3418 2.7871,1.356 3.2457,0.9179 0.4792,-0.4577 -0.5626,-2.6116 -0.8124,-3.412a6.9993,6.9994 0,0 0,0.935 -3.4814,6.9993 6.9994,0 0,0 -6.9991,-6.9993zM8,3.6601a4.34,4.3401 0,0 1,4.34 4.3401,4.34 4.3401,0 0,1 -4.34,4.3398 4.34,4.3401 0,0 1,-4.34 -4.3398,4.34 4.3401,0 0,1 4.34,-4.3401z"
diff --git a/app/src/main/res/drawable/ic_tick.xml b/app/src/main/res/drawable/ic_tick.xml
index eebf792f3b..57e872be57 100644
--- a/app/src/main/res/drawable/ic_tick.xml
+++ b/app/src/main/res/drawable/ic_tick.xml
@@ -1,32 +1,16 @@
 <!--
- Nextcloud Android client application
-
- @author TSI-mc
- Copyright (C) 2022 TSI-mc
- Copyright (C) 2022 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/>.
- -->
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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="M9,20.215L1.695,12.91C1.2205,12.4202 1.2262,11.6405 1.7077,11.1577C2.1892,10.6748 2.9689,10.6669 3.46,11.14L9,16.68L21,4.68C21.4944,4.238 22.248,4.2591 22.7169,4.7281C23.1859,5.197 23.207,5.9506 22.765,6.445L9,20.215Z"
-      android:strokeWidth="1"
-      android:fillColor="#262626"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
+    android:tint="#262626"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M382,720L154,492L211,435L382,606L749,239L806,296L382,720Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml
index bcb1dbea70..c6ed499af3 100644
--- a/app/src/main/res/drawable/ic_twitter.xml
+++ b/app/src/main/res/drawable/ic_twitter.xml
@@ -5,9 +5,11 @@
   ~ SPDX-License-Identifier: Apache-2.0
 -->
 <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="M22.46,6C21.69,6.35 20.86,6.58 20,6.69C20.88,6.16 21.56,5.32 21.88,4.31C21.05,4.81 20.13,5.16 19.16,5.36C18.37,4.5 17.26,4 16,4C13.65,4 11.73,5.92 11.73,8.29C11.73,8.63 11.77,8.96 11.84,9.27C8.28,9.09 5.11,7.38 3,4.79C2.63,5.42 2.42,6.16 2.42,6.94C2.42,8.43 3.17,9.75 4.33,10.5C3.62,10.5 2.96,10.3 2.38,10C2.38,10 2.38,10 2.38,10.03C2.38,12.11 3.86,13.85 5.82,14.24C5.46,14.34 5.08,14.39 4.69,14.39C4.42,14.39 4.15,14.36 3.89,14.31C4.43,16 6,17.26 7.89,17.29C6.43,18.45 4.58,19.13 2.56,19.13C2.22,19.13 1.88,19.11 1.54,19.07C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79C20.33,8.6 20.33,8.42 20.32,8.23C21.16,7.63 21.88,6.87 22.46,6Z" />
+    <path
+        android:fillColor="#757575"
+        android:pathData="M22.46,6C21.69,6.35 20.86,6.58 20,6.69C20.88,6.16 21.56,5.32 21.88,4.31C21.05,4.81 20.13,5.16 19.16,5.36C18.37,4.5 17.26,4 16,4C13.65,4 11.73,5.92 11.73,8.29C11.73,8.63 11.77,8.96 11.84,9.27C8.28,9.09 5.11,7.38 3,4.79C2.63,5.42 2.42,6.16 2.42,6.94C2.42,8.43 3.17,9.75 4.33,10.5C3.62,10.5 2.96,10.3 2.38,10C2.38,10 2.38,10 2.38,10.03C2.38,12.11 3.86,13.85 5.82,14.24C5.46,14.34 5.08,14.39 4.69,14.39C4.42,14.39 4.15,14.36 3.89,14.31C4.43,16 6,17.26 7.89,17.29C6.43,18.45 4.58,19.13 2.56,19.13C2.22,19.13 1.88,19.11 1.54,19.07C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79C20.33,8.6 20.33,8.42 20.32,8.23C21.16,7.63 21.88,6.87 22.46,6Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_unshared.xml b/app/src/main/res/drawable/ic_unshared.xml
index af4ce3d155..0bbc893a24 100644
--- a/app/src/main/res/drawable/ic_unshared.xml
+++ b/app/src/main/res/drawable/ic_unshared.xml
@@ -1,29 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector
-    android:height="20dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="20dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
+    android:height="20dp"
     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"/>
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <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>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
index 0587b58fa4..5edf2a7148 100644
--- a/app/src/main/res/drawable/ic_user.xml
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#666666"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_wallpaper.xml b/app/src/main/res/drawable/ic_wallpaper.xml
index b19133194a..3f6618188b 100644
--- a/app/src/main/res/drawable/ic_wallpaper.xml
+++ b/app/src/main/res/drawable/ic_wallpaper.xml
@@ -1,8 +1,16 @@
-<!-- drawable/wallpaper.xml -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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="#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" />
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,520L200,520L200,760Q200,760 200,760Q200,760 200,760L440,760L440,840L200,840ZM520,840L520,760L760,760Q760,760 760,760Q760,760 760,760L760,520L840,520L840,760Q840,793 816.5,816.5Q793,840 760,840L520,840ZM240,680L360,520L450,640L570,480L720,680L240,680ZM120,440L120,200Q120,167 143.5,143.5Q167,120 200,120L440,120L440,200L200,200Q200,200 200,200Q200,200 200,200L200,440L120,440ZM760,440L760,200Q760,200 760,200Q760,200 760,200L520,200L520,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,440L760,440ZM620,400Q594,400 577,383Q560,366 560,340Q560,314 577,297Q594,280 620,280Q646,280 663,297Q680,314 680,340Q680,366 663,383Q646,400 620,400Z" />
 </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 1b3f5c0ab4..729edee5b5 100644
--- a/app/src/main/res/drawable/ic_warning.xml
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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:tint="#666666"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M40,840L480,80L920,840L40,840ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720ZM440,600L520,600L520,400L440,400L440,600Z" />
 </vector>
diff --git a/app/src/main/res/drawable/image_32dp.xml b/app/src/main/res/drawable/image_32dp.xml
index 647ff2f097..92bb7e6878 100644
--- a/app/src/main/res/drawable/image_32dp.xml
+++ b/app/src/main/res/drawable/image_32dp.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector android:height="32dp" android:tint="#666666"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="32dp" 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="32dp"
+    android:height="32dp"
+    android:tint="#666666"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <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>
diff --git a/app/src/main/res/drawable/image_fail.xml b/app/src/main/res/drawable/image_fail.xml
index fe18168137..1af1c4f2eb 100644
--- a/app/src/main/res/drawable/image_fail.xml
+++ b/app/src/main/res/drawable/image_fail.xml
@@ -1,4 +1,16 @@
-<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>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#767676"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M40,840L480,80L920,840L40,840ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720ZM440,600L520,600L520,400L440,400L440,600Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/logo.xml b/app/src/main/res/drawable/logo.xml
index 179164850e..a5dcde2f30 100644
--- a/app/src/main/res/drawable/logo.xml
+++ b/app/src/main/res/drawable/logo.xml
@@ -1,22 +1,10 @@
 <!--
+  ~ Nextcloud - Android Client
   ~
-  ~ Nextcloud Android client application
-  ~
-  ~ 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/>.
-  -->
+  ~ SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="200dp"
     android:height="100dp"
diff --git a/app/src/main/res/drawable/nav_favorites.xml b/app/src/main/res/drawable/nav_favorites.xml
index 141285e11a..63b78fd3f9 100644
--- a/app/src/main/res/drawable/nav_favorites.xml
+++ b/app/src/main/res/drawable/nav_favorites.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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:tint="#757575"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <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>
diff --git a/app/src/main/res/drawable/nav_logout.xml b/app/src/main/res/drawable/nav_logout.xml
index c3b465a902..e2c04d0e43 100644
--- a/app/src/main/res/drawable/nav_logout.xml
+++ b/app/src/main/res/drawable/nav_logout.xml
@@ -1,25 +1,17 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L480,120L480,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L480,760L480,840L200,840ZM640,680L585,622L687,520L360,520L360,440L687,440L585,338L640,280L840,480L640,680Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/nav_notifications.xml b/app/src/main/res/drawable/nav_notifications.xml
index c48420e6b8..e609ad52b7 100644
--- a/app/src/main/res/drawable/nav_notifications.xml
+++ b/app/src/main/res/drawable/nav_notifications.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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:tint="#757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M160,760L160,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L800,680L800,760L160,760ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880Z" />
 </vector>
diff --git a/app/src/main/res/drawable/nav_photos.xml b/app/src/main/res/drawable/nav_photos.xml
index cfdceae625..bbc7fda709 100644
--- a/app/src/main/res/drawable/nav_photos.xml
+++ b/app/src/main/res/drawable/nav_photos.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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:tint="#757575"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <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>
diff --git a/app/src/main/res/drawable/nav_recently.xml b/app/src/main/res/drawable/nav_recently.xml
index f63870b3ec..c0550999d0 100644
--- a/app/src/main/res/drawable/nav_recently.xml
+++ b/app/src/main/res/drawable/nav_recently.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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:tint="#757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M612,668L668,612L520,464L520,280L440,280L440,496L612,668ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q613,800 706.5,706.5Q800,613 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,613 253.5,706.5Q347,800 480,800Z" />
+</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 1a7fbc33d3..326b942013 100644
--- a/app/src/main/res/drawable/nav_settings.xml
+++ b/app/src/main/res/drawable/nav_settings.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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:tint="#757575"
+android:viewportWidth="960"
+android:viewportHeight="960">
+<path
+    android:fillColor="@android:color/white"
+    android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620Z" />
 </vector>
diff --git a/app/src/main/res/drawable/nav_shared.xml b/app/src/main/res/drawable/nav_shared.xml
index 467f288f99..47dc804b1e 100644
--- a/app/src/main/res/drawable/nav_shared.xml
+++ b/app/src/main/res/drawable/nav_shared.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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:tint="#757575"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <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>
diff --git a/app/src/main/res/drawable/nav_synced_folders.xml b/app/src/main/res/drawable/nav_synced_folders.xml
index fc17df1ac6..2e2dc4b261 100644
--- a/app/src/main/res/drawable/nav_synced_folders.xml
+++ b/app/src/main/res/drawable/nav_synced_folders.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M440,800L260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q235,274 310,217Q385,160 480,160Q597,160 678.5,241.5Q760,323 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L520,800L520,514L584,576L640,520L480,360L320,520L376,576L440,514L440,800Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/nav_trashbin.xml b/app/src/main/res/drawable/nav_trashbin.xml
index 8f932af6ac..d28e8587ad 100644
--- a/app/src/main/res/drawable/nav_trashbin.xml
+++ b/app/src/main/res/drawable/nav_trashbin.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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:tint="#757575"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <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>
diff --git a/app/src/main/res/drawable/nextcloud_logo.xml b/app/src/main/res/drawable/nextcloud_logo.xml
index e7ff2a1736..e92759595f 100644
--- a/app/src/main/res/drawable/nextcloud_logo.xml
+++ b/app/src/main/res/drawable/nextcloud_logo.xml
@@ -1,25 +1,10 @@
 <!--
+  ~ Nextcloud - Android Client
   ~
-  ~ Nextcloud Android client application
-  ~
-  ~ @author Tobias Kaminsky
-  ~ Copyright (C) 2021 Tobias Kaminsky
-  ~ Copyright (C) 2021 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/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:tools="http://schemas.android.com/tools"
     android:autoMirrored="false" android:height="47.11639dp"
     android:viewportHeight="44.17161" android:viewportWidth="215.62502"
diff --git a/app/src/main/res/drawable/nextcloud_splash_logo.xml b/app/src/main/res/drawable/nextcloud_splash_logo.xml
index 3a76072fa5..05fa669741 100644
--- a/app/src/main/res/drawable/nextcloud_splash_logo.xml
+++ b/app/src/main/res/drawable/nextcloud_splash_logo.xml
@@ -1,24 +1,10 @@
 <!--
+  ~ Nextcloud - Android Client
   ~
-  ~ Nextcloud Android client application
-  ~
-  ~ @author Andy Scherzinger
-  ~ Copyright (C) 2023 Andy Scherzinger
-  ~ 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/>.
-  -->
+  ~ SPDX-FileCopyrightText: 2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="160dp"
     android:height="160dp"
diff --git a/app/src/main/res/drawable/no_network.xml b/app/src/main/res/drawable/no_network.xml
index 2cbb4d8cf6..765738d9ac 100644
--- a/app/src/main/res/drawable/no_network.xml
+++ b/app/src/main/res/drawable/no_network.xml
@@ -1,25 +1,16 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 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/>.
-
-  Icon provided by Android Material Library in Apache License 2.0
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-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="M20,18h2v-8h-2v8zM20,22h2v-2h-2v2zM2,22h16L18,8h4L22,2L2,22z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M80,880L880,80L880,320L720,320L720,880L80,880ZM840,880Q823,880 811.5,868.5Q800,857 800,840Q800,823 811.5,811.5Q823,800 840,800Q857,800 868.5,811.5Q880,823 880,840Q880,857 868.5,868.5Q857,880 840,880ZM800,720L800,400L880,400L880,720L800,720Z" />
 </vector>
diff --git a/app/src/main/res/drawable/notification_icon.xml b/app/src/main/res/drawable/notification_icon.xml
index 45e84df440..5f95bd1039 100644
--- a/app/src/main/res/drawable/notification_icon.xml
+++ b/app/src/main/res/drawable/notification_icon.xml
@@ -1,4 +1,17 @@
-<vector android:height="24dp" android:viewportHeight="1064"
-    android:viewportWidth="1064" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff" android:fillType="nonZero" android:pathData="M532.68,320.01C439.33,320.02 360.95,383.94 336.99,469.92 316.09,423.93 270.08,391.34 216.62,391.33 143.84,391.34 84.01,451.18 84,523.96c-0.01,72.79 59.83,132.65 132.62,132.65 53.47,-0.01 99.45,-32.62 120.35,-78.62 23.94,86 102.35,149.94 195.72,149.95 92.84,0.01 170.84,-63.23 195.28,-148.5 21.24,45.15 66.55,77.17 119.39,77.17 72.8,0.01 132.65,-59.85 132.64,-132.65 -0.01,-72.79 -59.86,-132.64 -132.64,-132.63 -52.85,0.01 -98.18,32.02 -119.42,77.17 -24.44,-85.27 -102.41,-148.51 -195.25,-148.5zM532.68,397.86c70.11,0 126.11,55.99 126.11,126.1 0,70.12 -56,126.13 -126.11,126.13 -70.11,-0.01 -126.09,-56.01 -126.09,-126.13 0.01,-70.1 55.99,-126.09 126.09,-126.1zM216.6,469.19c30.71,0 54.76,24.06 54.77,54.77 0,30.72 -24.05,54.79 -54.77,54.8 -30.72,0 -54.77,-24.08 -54.77,-54.8 0,-30.71 24.06,-54.77 54.77,-54.77zM847.36,469.19c30.71,-0.01 54.79,24.05 54.79,54.77 0.01,30.73 -24.07,54.8 -54.79,54.8 -30.72,0 -54.77,-24.08 -54.77,-54.8 0,-30.71 24.06,-54.77 54.77,-54.77z"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1064"
+    android:viewportHeight="1064">
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
+        android:pathData="M532.68,320.01C439.33,320.02 360.95,383.94 336.99,469.92 316.09,423.93 270.08,391.34 216.62,391.33 143.84,391.34 84.01,451.18 84,523.96c-0.01,72.79 59.83,132.65 132.62,132.65 53.47,-0.01 99.45,-32.62 120.35,-78.62 23.94,86 102.35,149.94 195.72,149.95 92.84,0.01 170.84,-63.23 195.28,-148.5 21.24,45.15 66.55,77.17 119.39,77.17 72.8,0.01 132.65,-59.85 132.64,-132.65 -0.01,-72.79 -59.86,-132.64 -132.64,-132.63 -52.85,0.01 -98.18,32.02 -119.42,77.17 -24.44,-85.27 -102.41,-148.51 -195.25,-148.5zM532.68,397.86c70.11,0 126.11,55.99 126.11,126.1 0,70.12 -56,126.13 -126.11,126.13 -70.11,-0.01 -126.09,-56.01 -126.09,-126.13 0.01,-70.1 55.99,-126.09 126.09,-126.1zM216.6,469.19c30.71,0 54.76,24.06 54.77,54.77 0,30.72 -24.05,54.79 -54.77,54.8 -30.72,0 -54.77,-24.08 -54.77,-54.8 0,-30.71 24.06,-54.77 54.77,-54.77zM847.36,469.19c30.71,-0.01 54.79,24.05 54.79,54.77 0.01,30.73 -24.07,54.8 -54.79,54.8 -30.72,0 -54.77,-24.08 -54.77,-54.8 0,-30.71 24.06,-54.77 54.77,-54.77z" />
 </vector>
diff --git a/app/src/main/res/drawable/outline_camera_24.xml b/app/src/main/res/drawable/outline_camera_24.xml
index 9a683c89e3..442103e6e7 100644
--- a/app/src/main/res/drawable/outline_camera_24.xml
+++ b/app/src/main/res/drawable/outline_camera_24.xml
@@ -1,5 +1,16 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#000000" 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="M14.25,2.26l-0.08,-0.04 -0.01,0.02C13.46,2.09 12.74,2 12,2 6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10c0,-4.75 -3.31,-8.72 -7.75,-9.74zM19.41,9h-7.99l2.71,-4.7c2.4,0.66 4.35,2.42 5.28,4.7zM13.1,4.08L10.27,9l-1.15,2L6.4,6.3C7.84,4.88 9.82,4 12,4c0.37,0 0.74,0.03 1.1,0.08zM5.7,7.09L8.54,12l1.15,2L4.26,14C4.1,13.36 4,12.69 4,12c0,-1.85 0.64,-3.55 1.7,-4.91zM4.59,15h7.98l-2.71,4.7c-2.4,-0.67 -4.34,-2.42 -5.27,-4.7zM10.9,19.91L14.89,13l2.72,4.7C16.16,19.12 14.18,20 12,20c-0.38,0 -0.74,-0.04 -1.1,-0.09zM18.3,16.91l-4,-6.91h5.43c0.17,0.64 0.27,1.31 0.27,2 0,1.85 -0.64,3.55 -1.7,4.91z"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M456,360L776,360Q749,291 693.5,241.5Q638,192 566,172L456,360ZM364,440L524,164Q513,162 502,161Q491,160 480,160Q414,160 357,185Q300,210 256,252L364,440ZM170,560L388,560L228,284Q196,325 178,374.5Q160,424 160,480Q160,501 162.5,520.5Q165,540 170,560ZM394,788L502,600L184,600Q211,669 266.5,718.5Q322,768 394,788ZM480,800Q546,800 603,775Q660,750 704,708L596,520L436,796Q447,798 457.5,799Q468,800 480,800ZM732,676Q764,635 782,585.5Q800,536 800,480Q800,459 797.5,439.5Q795,420 790,400L572,400L732,676ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 111.5,324.5Q143,252 197.5,197.5Q252,143 325,111.5Q398,80 480,80Q563,80 635.5,111.5Q708,143 762.5,197.5Q817,252 848.5,324.5Q880,397 880,480Q880,562 848.5,635Q817,708 762.5,762.5Q708,817 635.5,848.5Q563,880 480,880Z" />
 </vector>
diff --git a/app/src/main/res/drawable/outline_flip_24.xml b/app/src/main/res/drawable/outline_flip_24.xml
index 6c5b2b8d16..b2b61346ec 100644
--- a/app/src/main/res/drawable/outline_flip_24.xml
+++ b/app/src/main/res/drawable/outline_flip_24.xml
@@ -1,5 +1,16 @@
-<vector android:height="24dp" android:tint="#000000"
-    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="M15,21h2v-2h-2v2zM19,9h2L21,7h-2v2zM3,5v14c0,1.1 0.9,2 2,2h4v-2L5,19L5,5h4L9,3L5,3c-1.1,0 -2,0.9 -2,2zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM11,23h2L13,1h-2v22zM19,17h2v-2h-2v2zM15,5h2L17,3h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2z"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15,21h2v-2h-2v2zM19,9h2L21,7h-2v2zM3,5v14c0,1.1 0.9,2 2,2h4v-2L5,19L5,5h4L9,3L5,3c-1.1,0 -2,0.9 -2,2zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM11,23h2L13,1h-2v22zM19,17h2v-2h-2v2zM15,5h2L17,3h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/outline_image_24.xml b/app/src/main/res/drawable/outline_image_24.xml
index 1e585957f4..73c80e6b04 100644
--- a/app/src/main/res/drawable/outline_image_24.xml
+++ b/app/src/main/res/drawable/outline_image_24.xml
@@ -1,5 +1,17 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#000000" 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,5v14L5,19L5,5h14m0,-2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14.14,11.86l-3,3.87L9,13.14 6,17h12l-3.86,-5.14z"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,5v14L5,19L5,5h14m0,-2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14.14,11.86l-3,3.87L9,13.14 6,17h12l-3.86,-5.14z" />
 </vector>
diff --git a/app/src/main/res/drawable/outline_rotate_90_degrees_ccw_24.xml b/app/src/main/res/drawable/outline_rotate_90_degrees_ccw_24.xml
index 255da67ab7..f10b3c858b 100644
--- a/app/src/main/res/drawable/outline_rotate_90_degrees_ccw_24.xml
+++ b/app/src/main/res/drawable/outline_rotate_90_degrees_ccw_24.xml
@@ -1,5 +1,16 @@
-<vector android:height="24dp" android:tint="#000000"
-    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="M7.34,6.41L0.86,12.9l6.49,6.48 6.49,-6.48 -6.5,-6.49zM3.69,12.9l3.66,-3.66L11,12.9l-3.66,3.66 -3.65,-3.66zM19.36,6.64C17.61,4.88 15.3,4 13,4L13,0.76L8.76,5 13,9.24L13,6c1.79,0 3.58,0.68 4.95,2.05 2.73,2.73 2.73,7.17 0,9.9C16.58,19.32 14.79,20 13,20c-0.97,0 -1.94,-0.21 -2.84,-0.61l-1.49,1.49C10.02,21.62 11.51,22 13,22c2.3,0 4.61,-0.88 6.36,-2.64 3.52,-3.51 3.52,-9.21 0,-12.72z"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.34,6.41L0.86,12.9l6.49,6.48 6.49,-6.48 -6.5,-6.49zM3.69,12.9l3.66,-3.66L11,12.9l-3.66,3.66 -3.65,-3.66zM19.36,6.64C17.61,4.88 15.3,4 13,4L13,0.76L8.76,5 13,9.24L13,6c1.79,0 3.58,0.68 4.95,2.05 2.73,2.73 2.73,7.17 0,9.9C16.58,19.32 14.79,20 13,20c-0.97,0 -1.94,-0.21 -2.84,-0.61l-1.49,1.49C10.02,21.62 11.51,22 13,22c2.3,0 4.61,-0.88 6.36,-2.64 3.52,-3.51 3.52,-9.21 0,-12.72z" />
 </vector>
diff --git a/app/src/main/res/drawable/preview_image_gradient_shape.xml b/app/src/main/res/drawable/preview_image_gradient_shape.xml
index f15d034d7c..150abf468f 100644
--- a/app/src/main/res/drawable/preview_image_gradient_shape.xml
+++ b/app/src/main/res/drawable/preview_image_gradient_shape.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
diff --git a/app/src/main/res/drawable/preview_markdown_gradient_shape.xml b/app/src/main/res/drawable/preview_markdown_gradient_shape.xml
index 1002802752..d147de8c3c 100644
--- a/app/src/main/res/drawable/preview_markdown_gradient_shape.xml
+++ b/app/src/main/res/drawable/preview_markdown_gradient_shape.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
diff --git a/app/src/main/res/drawable/process_dialog_background.xml b/app/src/main/res/drawable/process_dialog_background.xml
index d20aa2f26b..6023273bd2 100644
--- a/app/src/main/res/drawable/process_dialog_background.xml
+++ b/app/src/main/res/drawable/process_dialog_background.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2015-2024 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/process_dialog_background"/>
     <padding
diff --git a/app/src/main/res/drawable/spinner_inner.xml b/app/src/main/res/drawable/spinner_inner.xml
index 6ab4b4ac08..8dffe528a7 100644
--- a/app/src/main/res/drawable/spinner_inner.xml
+++ b/app/src/main/res/drawable/spinner_inner.xml
@@ -1,6 +1,23 @@
-<vector android:height="20dp" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.6" android:fillColor="#D0D0D0" android:pathData="M18.425,16.743L20.164,17.746C18.346,20.312 15.354,22 12,22C8.682,22 5.72,20.349 3.897,17.831L5.637,16.826C7.104,18.75 9.418,20 12,20C14.62,20 16.962,18.713 18.425,16.743Z"/>
-    <path android:fillAlpha="0.3" android:fillColor="#D0D0D0" android:pathData="M2.891,16.103C2.319,14.848 2,13.458 2,12C2,6.836 6,2.533 11.046,2.046L11.046,4.057C7.1,4.535 4,7.934 4,12C4,13.096 4.225,14.143 4.631,15.098L2.891,16.103Z"/>
-    <path android:fillColor="#D0D0D0" android:pathData="M19.409,15.001C19.79,14.073 20,13.059 20,12C20,7.965 16.948,4.588 13.046,4.069L13.046,2.055C18.048,2.585 22,6.867 22,12C22,13.422 21.697,14.778 21.152,16.008L19.409,15.001Z"/>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.6"
+        android:fillColor="#D0D0D0"
+        android:pathData="M18.425,16.743L20.164,17.746C18.346,20.312 15.354,22 12,22C8.682,22 5.72,20.349 3.897,17.831L5.637,16.826C7.104,18.75 9.418,20 12,20C14.62,20 16.962,18.713 18.425,16.743Z" />
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="#D0D0D0"
+        android:pathData="M2.891,16.103C2.319,14.848 2,13.458 2,12C2,6.836 6,2.533 11.046,2.046L11.046,4.057C7.1,4.535 4,7.934 4,12C4,13.096 4.225,14.143 4.631,15.098L2.891,16.103Z" />
+    <path
+        android:fillColor="#D0D0D0"
+        android:pathData="M19.409,15.001C19.79,14.073 20,13.059 20,12C20,7.965 16.948,4.588 13.046,4.069L13.046,2.055C18.048,2.585 22,6.867 22,12C22,13.422 21.697,14.778 21.152,16.008L19.409,15.001Z" />
 </vector>
diff --git a/app/src/main/res/drawable/uploads.xml b/app/src/main/res/drawable/uploads.xml
index eff81759fa..ebbc04d82e 100644
--- a/app/src/main/res/drawable/uploads.xml
+++ b/app/src/main/res/drawable/uploads.xml
@@ -1,12 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <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:tint="#757575"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
-        android:fillColor="#757575"
-        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="@android:color/white"
+        android:pathData="M440,640L440,314L336,418L280,360L480,160L680,360L624,418L520,314L520,640L440,640ZM240,800Q207,800 183.5,776.5Q160,753 160,720L160,600L240,600L240,720Q240,720 240,720Q240,720 240,720L720,720Q720,720 720,720Q720,720 720,720L720,600L800,600L800,720Q800,753 776.5,776.5Q753,800 720,800L240,800Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/video_32dp.xml b/app/src/main/res/drawable/video_32dp.xml
index e627d4dfd2..c2d858adb9 100644
--- a/app/src/main/res/drawable/video_32dp.xml
+++ b/app/src/main/res/drawable/video_32dp.xml
@@ -1,8 +1,16 @@
-<!-- drawable/video.xml -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32dp"
-    android:width="32dp"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#757575"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#757575" 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" />
+    <path
+        android:fillColor="#969696"
+        android:pathData="M18,4l2,4h-3l-2,-4h-2l2,4h-3l-2,-4H8l2,4H7L5,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,-2V4h-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/video_white.xml b/app/src/main/res/drawable/video_white.xml
index 04fb9bf20c..a88755c324 100644
--- a/app/src/main/res/drawable/video_white.xml
+++ b/app/src/main/res/drawable/video_white.xml
@@ -1,10 +1,16 @@
-<!-- drawable/video.xml -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32dp"
-    android:width="32dp"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
     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" />
-</vector>
+        android:fillColor="#969696"
+        android:pathData="M18,4l2,4h-3l-2,-4h-2l2,4h-3l-2,-4H8l2,4H7L5,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,-2V4h-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/account_setup.xml b/app/src/main/res/layout-land/account_setup.xml
index c43877c123..2849a38104 100644
--- a/app/src/main/res/layout-land/account_setup.xml
+++ b/app/src/main/res/layout-land/account_setup.xml
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2012 Bartek Przybylski
-  Copyright (C) 2015-2016 ownCloud Inc.
-  Copyright (C) 2016 Nextcloud
-  Copyright (C) 2019 Tobias Kaminsky
-
-  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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2016 Nextcloud
+  ~ SPDX-FileCopyrightText: 2015-2016 ownCloud Inc.
+  ~ SPDX-FileCopyrightText: 2012 Bartosz Przybylski <bart.p.pl@gmail.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -48,9 +36,9 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
             android:maxWidth="@dimen/default_login_width"
             android:minWidth="@dimen/default_login_width"
-            android:gravity="center"
             android:orientation="vertical"
             android:padding="@dimen/standard_half_padding">
 
diff --git a/app/src/main/res/layout/account_action.xml b/app/src/main/res/layout/account_action.xml
index 1a20019327..faebb5136f 100644
--- a/app/src/main/res/layout/account_action.xml
+++ b/app/src/main/res/layout/account_action.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2016 Andy Scherzinger
-  Copyright (C) 2016 Nextcloud
-  Copyright (C) 2016 ownCloud
-
-  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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Thore Goebel <goebel.thore@gmail.com>
+  ~ SPDX-FileCopyrightText: 2016 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Nextcloud.Material.TextButton"
diff --git a/app/src/main/res/layout/account_item.xml b/app/src/main/res/layout/account_item.xml
index f942d11740..c6e5037bd1 100644
--- a/app/src/main/res/layout/account_item.xml
+++ b/app/src/main/res/layout/account_item.xml
@@ -1,23 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  Copyright (C) 2016 Andy Scherzinger
-  Copyright (C) 2016 Nextcloud
-  Copyright (C) 2016 ownCloud
-  Copyright (C) 2020 Infomaniak Network SA
-
-  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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Kilian Périsset <kilian.perisset@infomaniak.com>
+  ~ SPDX-FileCopyrightText: 2020 Boris Bodin <joris.bodin@infomaniak.com>
+  ~ SPDX-FileCopyrightText: 2020 Infomaniak Network SA
+  ~ SPDX-FileCopyrightText: 2016 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2016 Nextcloud
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/account_removal_dialog.xml b/app/src/main/res/layout/account_removal_dialog.xml
index 913d19cbdf..ddadcf352c 100644
--- a/app/src/main/res/layout/account_removal_dialog.xml
+++ b/app/src/main/res/layout/account_removal_dialog.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- Nextcloud Android client application
-
- @author ZetaTom
- Copyright (C) 2023 ZetaTom
- 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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 ZetaTom
+  ~ SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/account_setup.xml b/app/src/main/res/layout/account_setup.xml
index eeefe68346..41336b1b3a 100644
--- a/app/src/main/res/layout/account_setup.xml
+++ b/app/src/main/res/layout/account_setup.xml
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2012 Bartek Przybylski
-  Copyright (C) 2015-2016 ownCloud Inc.
-  Copyright (C) 2016 Nextcloud
-  Copyright (C) 2019 Tobias Kaminsky
-
-  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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2016 Nextcloud
+  ~ SPDX-FileCopyrightText: 2015-2016 ownCloud Inc.
+  ~ SPDX-FileCopyrightText: 2012 Bartosz Przybylski <bart.p.pl@gmail.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -47,9 +35,9 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
             android:maxWidth="@dimen/default_login_width"
             android:minWidth="@dimen/default_login_width"
-            android:gravity="center"
             android:orientation="vertical"
             android:padding="@dimen/standard_half_padding">
 
diff --git a/app/src/main/res/layout/account_setup_webview.xml b/app/src/main/res/layout/account_setup_webview.xml
index 9e8ff038be..e0b843650a 100644
--- a/app/src/main/res/layout/account_setup_webview.xml
+++ b/app/src/main/res/layout/account_setup_webview.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2017 Mario Danic <mario@lovelyhq.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="vertical"
              android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/accounts_layout.xml b/app/src/main/res/layout/accounts_layout.xml
index 0550a05780..6d7d3ba1ae 100644
--- a/app/src/main/res/layout/accounts_layout.xml
+++ b/app/src/main/res/layout/accounts_layout.xml
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2016 Andy Scherzinger
-  Copyright (C) 2016 Nextcloud
-  Copyright (C) 2016 ownCloud
-
-  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/>.
- -->
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Joris Bodin <joris.bodin@infomaniak.com>
+  ~ SPDX-FileCopyrightText: 2019 Nick Antoniou <nikolasea@windowslive.com>
+  ~ SPDX-FileCopyrightText: 2016 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <LinearLayout
 	android:id="@+id/account_list_layout"
 	xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index 828596d59a..74d84c2557 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -1,30 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Nextcloud Android client application
+  ~ Nextcloud - Android Client
   ~
-  ~ @author Alper Ozturk
-  ~ Copyright (C) 2024 Alper Ozturk
-  ~ Copyright (C) 2024 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/>.
-  -->
-
-
+  ~ SPDX-FileCopyrightText: 2024 Alper Ozturk <alper_ozturk@proton.me>
+  ~ SPDX-FileCopyrightText: 2024 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <androidx.drawerlayout.widget.DrawerLayout
     android:id="@+id/drawer_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="true"
diff --git a/app/src/main/res/layout/activity_document_scan.xml b/app/src/main/res/layout/activity_document_scan.xml
index 9a95e43950..7cf6f094a8 100644
--- a/app/src/main/res/layout/activity_document_scan.xml
+++ b/app/src/main/res/layout/activity_document_scan.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Android client application
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~  @author Álvaro Brey
-  ~  Copyright (C) 2022 Álvaro Brey
-  ~  Copyright (C) 2022 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
-  ~ 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/>.
-  ~
-  -->
-
+  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/activity_edit_image.xml b/app/src/main/res/layout/activity_edit_image.xml
index 931bb15d19..26143935a3 100644
--- a/app/src/main/res/layout/activity_edit_image.xml
+++ b/app/src/main/res/layout/activity_edit_image.xml
@@ -1,22 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- Nextcloud Android client application
-
- @author ZetaTom
- Copyright (C) 2023 ZetaTom
- 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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 ZetaTom
+  ~ SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/activity_etm.xml b/app/src/main/res/layout/activity_etm.xml
index f0c5a33b3d..5e7a0a8bfa 100644
--- a/app/src/main/res/layout/activity_etm.xml
+++ b/app/src/main/res/layout/activity_etm.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Nextcloud Android client application
-
-    @author Chris Narkiewicz
-    Copyright (C) 2019 Chris Narkiewicz <hello@ezaquarii.com>
-
-    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 <http://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_list_item_header.xml b/app/src/main/res/layout/activity_list_item_header.xml
index e9048be851..fd6ea11f4f 100644
--- a/app/src/main/res/layout/activity_list_item_header.xml
+++ b/app/src/main/res/layout/activity_list_item_header.xml
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2019 Sevastyan Savanyuk
-
-  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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2019 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2017 Alejandro Morales <aleister09@gmail.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_list_item_header_shimmer.xml b/app/src/main/res/layout/activity_list_item_header_shimmer.xml
index be5e6f0161..ab69661335 100644
--- a/app/src/main/res/layout/activity_list_item_header_shimmer.xml
+++ b/app/src/main/res/layout/activity_list_item_header_shimmer.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 Andy Scherzinger
-
-  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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <com.elyeproj.loaderviewlibrary.LoaderTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/shimmer_header"
diff --git a/app/src/main/res/layout/activity_list_item_shimmer.xml b/app/src/main/res/layout/activity_list_item_shimmer.xml
index 0239ba4a47..1031fa6560 100644
--- a/app/src/main/res/layout/activity_list_item_shimmer.xml
+++ b/app/src/main/res/layout/activity_list_item_shimmer.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 Andy Scherzinger
-
-  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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 200 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/activity_manage_space.xml b/app/src/main/res/layout/activity_manage_space.xml
index 3d52418d4b..f5b45d800a 100644
--- a/app/src/main/res/layout/activity_manage_space.xml
+++ b/app/src/main/res/layout/activity_manage_space.xml
@@ -16,32 +16,39 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2016 Maria Asensio <masensio@solidgear.es>
+  ~ SPDX-FileCopyrightText: 2016 ownCloud Inc.
+  ~ SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/general_description"
-        android:layout_height="wrap_content"
+        style="?android:attr/editTextPreferenceStyle"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_margin="@dimen/standard_margin"
-        style="?android:attr/editTextPreferenceStyle"
-        android:text="@string/manage_space_description"
-        />
+        android:text="@string/manage_space_description" />
 
     <com.google.android.material.button.MaterialButton
+        android:id="@+id/clearDataButton"
+        style="@style/Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/manage_space_clear_data"
-        android:id="@+id/clearDataButton"
         android:layout_gravity="center_horizontal"
         android:layout_margin="@dimen/standard_margin"
-        android:theme="@style/Button.Primary"
-        style="@style/Button.Primary"
         android:contentDescription="@string/manage_space_clear_data"
+        android:text="@string/manage_space_clear_data"
+        android:theme="@style/Button.Primary"
         app:cornerRadius="@dimen/button_corner_radius" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_preview_bitmap.xml b/app/src/main/res/layout/activity_preview_bitmap.xml
index 7f16326ccf..c7bd333c3b 100644
--- a/app/src/main/res/layout/activity_preview_bitmap.xml
+++ b/app/src/main/res/layout/activity_preview_bitmap.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Android client application
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~ @author Álvaro Brey Vilas
-  ~ Copyright (C) 2022 Álvaro Brey Vilas
-  ~ Copyright (C) 2022 Nextcloud GmbH
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_media.xml b/app/src/main/res/layout/activity_preview_media.xml
index 37a2483820..361ae1e565 100644
--- a/app/src/main/res/layout/activity_preview_media.xml
+++ b/app/src/main/res/layout/activity_preview_media.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ownCloud Android client application
-
-  Copyright (C) 2020 Andy Scherzinger
-  Copyright (C) 2015 ownCloud Inc.
-  Copyright (C) 2023 Parneet Singh
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 Parneet Singh <gurayaparneet@gmail.com>
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/activity_row.xml b/app/src/main/res/layout/activity_row.xml
index 61b8294515..9e5ec76bf3 100644
--- a/app/src/main/res/layout/activity_row.xml
+++ b/app/src/main/res/layout/activity_row.xml
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ownCloud Android client application
-
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/list_item"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 4b54d43435..3d4be115d7 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2023 TSI-mc
-
-  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/>.
-  -->
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 TSI-mc
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/backup_fragment.xml b/app/src/main/res/layout/backup_fragment.xml
index a8467ef4c1..286991b2bd 100644
--- a/app/src/main/res/layout/backup_fragment.xml
+++ b/app/src/main/res/layout/backup_fragment.xml
@@ -1,21 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Tobias Kaminsky
-  Copyright (C) 2017 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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/backup_list_item.xml b/app/src/main/res/layout/backup_list_item.xml
index ed1d14425f..ab5c32c46a 100644
--- a/app/src/main/res/layout/backup_list_item.xml
+++ b/app/src/main/res/layout/backup_list_item.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~ Nextcloud Android client application
-  ~
-  ~ @author Tobias Kaminsky
-  ~ Copyright (C) 2021 Tobias Kaminsky
-  ~ Copyright (C) 2021 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/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/backup_list_item_header.xml b/app/src/main/res/layout/backup_list_item_header.xml
index e81878105a..d0c220b608 100644
--- a/app/src/main/res/layout/backup_list_item_header.xml
+++ b/app/src/main/res/layout/backup_list_item_header.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~ Nextcloud Android client application
-  ~
-  ~ @author Tobias Kaminsky
-  ~ Copyright (C) 2021 Tobias Kaminsky
-  ~ Copyright (C) 2021 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/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/backuplist_fragment.xml b/app/src/main/res/layout/backuplist_fragment.xml
index d1b312f74f..ec2b392466 100644
--- a/app/src/main/res/layout/backuplist_fragment.xml
+++ b/app/src/main/res/layout/backuplist_fragment.xml
@@ -1,21 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Tobias Kaminsky
-  Copyright (C) 2017 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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/calendarlist_list_item.xml b/app/src/main/res/layout/calendarlist_list_item.xml
index 1835d03b3b..3a7f7248e7 100644
--- a/app/src/main/res/layout/calendarlist_list_item.xml
+++ b/app/src/main/res/layout/calendarlist_list_item.xml
@@ -1,21 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  Copyright (C) 2021 Tobias Kaminsky
-  Copyright (C) 2021 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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/choose_template.xml b/app/src/main/res/layout/choose_template.xml
index b8599fb389..70808a08f9 100644
--- a/app/src/main/res/layout/choose_template.xml
+++ b/app/src/main/res/layout/choose_template.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  @author Tobias Kaminsky
-  @author Andy Scherzinger
-  Copyright (C) 2020 Andy Scherzinger
-  Copyright (C) 2018 Tobias Kaminsky
-  Copyright (C) 2018 Nextcloud GmbH.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <https://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2018 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/community_layout.xml b/app/src/main/res/layout/community_layout.xml
index 9e1ab9bcda..88c2069668 100755
--- a/app/src/main/res/layout/community_layout.xml
+++ b/app/src/main/res/layout/community_layout.xml
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2016 Tobias Kaminsky
-  Copyright (C) 2016 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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2016 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2016 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/conflict_resolve_dialog.xml b/app/src/main/res/layout/conflict_resolve_dialog.xml
index 52335d0f0d..edbd9a2969 100644
--- a/app/src/main/res/layout/conflict_resolve_dialog.xml
+++ b/app/src/main/res/layout/conflict_resolve_dialog.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~ Nextcloud Android client application
-  ~
-  ~ @author Tobias Kaminsky
-  ~ Copyright (C) 2020 Tobias Kaminsky
-  ~ Copyright (C) 2020 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/>.
-  -->
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/contactlist_list_item.xml b/app/src/main/res/layout/contactlist_list_item.xml
index d2a32426ef..9e294f0038 100644
--- a/app/src/main/res/layout/contactlist_list_item.xml
+++ b/app/src/main/res/layout/contactlist_list_item.xml
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Tobias Kaminsky
-  Copyright (C) 2017 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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/contactlist_list_item_shimmer.xml b/app/src/main/res/layout/contactlist_list_item_shimmer.xml
index 502673efda..96c178816f 100644
--- a/app/src/main/res/layout/contactlist_list_item_shimmer.xml
+++ b/app/src/main/res/layout/contactlist_list_item_shimmer.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 Andy Scherzinger
-
-  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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/contacts_preference.xml b/app/src/main/res/layout/contacts_preference.xml
index 632c1bc2bb..c7dc5b5ec9 100644
--- a/app/src/main/res/layout/contacts_preference.xml
+++ b/app/src/main/res/layout/contacts_preference.xml
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Tobias Kaminsky
-  Copyright (C) 2017 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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
diff --git a/app/src/main/res/layout/dashboard_widget.xml b/app/src/main/res/layout/dashboard_widget.xml
index 435a42e206..63baf9c2e7 100644
--- a/app/src/main/res/layout/dashboard_widget.xml
+++ b/app/src/main/res/layout/dashboard_widget.xml
@@ -1,25 +1,10 @@
 <!--
+  ~ Nextcloud - Android Client
   ~
-  ~ Nextcloud Android client application
-  ~
-  ~ @author Tobias Kaminsky
-  ~ Copyright (C) 2022 Tobias Kaminsky
-  ~ Copyright (C) 2022 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/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2022 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/background"
diff --git a/app/src/main/res/layout/dashboard_widget_configuration_layout.xml b/app/src/main/res/layout/dashboard_widget_configuration_layout.xml
index 47ffc07000..e0e90dc4c5 100644
--- a/app/src/main/res/layout/dashboard_widget_configuration_layout.xml
+++ b/app/src/main/res/layout/dashboard_widget_configuration_layout.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~ Nextcloud Android client application
-  ~
-  ~ @author Tobias Kaminsky
-  ~ Copyright (C) 2022 Tobias Kaminsky
-  ~ Copyright (C) 2022 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/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2022 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/deep_link_login.xml b/app/src/main/res/layout/deep_link_login.xml
index a1bfd27e5a..3e84ee5a62 100644
--- a/app/src/main/res/layout/deep_link_login.xml
+++ b/app/src/main/res/layout/deep_link_login.xml
@@ -1,22 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  @author Tobias Kaminsky
-  Copyright (C) 2018 Tobias Kaminsky
-  Copyright (C) 2018 Nextcloud GmbH.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <https://www.gnu.org/licenses/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2018 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/scroll"
diff --git a/app/src/main/res/layout/dialog_choose_account.xml b/app/src/main/res/layout/dialog_choose_account.xml
index d99f9dec73..e49585339f 100644
--- a/app/src/main/res/layout/dialog_choose_account.xml
+++ b/app/src/main/res/layout/dialog_choose_account.xml
@@ -1,19 +1,8 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 Infomaniak Network SA
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Infomaniak Network SA
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/dialog_preview_video.xml b/app/src/main/res/layout/dialog_preview_video.xml
index cbae3164dc..5d2362c472 100644
--- a/app/src/main/res/layout/dialog_preview_video.xml
+++ b/app/src/main/res/layout/dialog_preview_video.xml
@@ -1,22 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  @author Tobias Kaminsky
-  Copyright (C) 2021 Tobias Kaminsky
-  Copyright (C) 2021 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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <androidx.media3.ui.PlayerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/dialog_scan_export_type.xml b/app/src/main/res/layout/dialog_scan_export_type.xml
index 1cd2952b56..0d6ecc33f1 100644
--- a/app/src/main/res/layout/dialog_scan_export_type.xml
+++ b/app/src/main/res/layout/dialog_scan_export_type.xml
@@ -1,23 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Android client application
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~ @author Álvaro Brey Vilas
-  ~ Copyright (C) 2022 Álvaro Brey Vilas
-  ~ Copyright (C) 2022 Nextcloud GmbH
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_set_status.xml b/app/src/main/res/layout/dialog_set_status.xml
index 26968bf626..68594a40b6 100644
--- a/app/src/main/res/layout/dialog_set_status.xml
+++ b/app/src/main/res/layout/dialog_set_status.xml
@@ -1,21 +1,10 @@
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2020 Andy Scherzinger
-  Copyright (C) 2020 Tobias Kaminsky
-  Copyright (C) 2020 Nextcloud GmbH
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/dialog_sso_grant_permission.xml b/app/src/main/res/layout/dialog_sso_grant_permission.xml
index b0523954f3..96cbfa6496 100644
--- a/app/src/main/res/layout/dialog_sso_grant_permission.xml
+++ b/app/src/main/res/layout/dialog_sso_grant_permission.xml
@@ -1,20 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  Copyright (C) 2018 Andy Scherzinger
-
-  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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/document_page_item.xml b/app/src/main/res/layout/document_page_item.xml
index 204b85443d..40e619f1ab 100644
--- a/app/src/main/res/layout/document_page_item.xml
+++ b/app/src/main/res/layout/document_page_item.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Android client application
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~  @author Álvaro Brey
-  ~  Copyright (C) 2022 Álvaro Brey
-  ~  Copyright (C) 2022 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
-  ~ 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/>.
-  ~
-  -->
-
+  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <androidx.appcompat.widget.AppCompatImageView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml
index 306021a2f8..3669fd87b6 100644
--- a/app/src/main/res/layout/drawer.xml
+++ b/app/src/main/res/layout/drawer.xml
@@ -1,22 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  Copyright (C) 2016 Andy Scherzinger
-  Copyright (C) 2016 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/>.
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-FileCopyrightText: 2016 Nextcloud
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 0113835777..506e9fa73a 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -1,23 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  Copyright (C) 2016 Andy Scherzinger
-  Copyright (C) 2016 Nextcloud.
-  Copyright (C) 2020 Infomaniak Network SA
-
-  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/>.
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2016 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/edit_box_dialog.xml b/app/src/main/res/layout/edit_box_dialog.xml
index b1f3a3231d..ce0a0d53f7 100644
--- a/app/src/main/res/layout/edit_box_dialog.xml
+++ b/app/src/main/res/layout/edit_box_dialog.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Nextcloud Android client application
-
-    @author Andy Scherzinger
-    Copyright (C) 2021 Andy Scherzinger
-
-    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 <http://www.gnu.org/licenses/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/externalsite_webview.xml b/app/src/main/res/layout/externalsite_webview.xml
index 30742e40e0..408586394c 100644
--- a/app/src/main/res/layout/externalsite_webview.xml
+++ b/app/src/main/res/layout/externalsite_webview.xml
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2016 Tobias Kaminsky
-  Copyright (C) 2016 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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2016 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2016 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                         android:id="@+id/drawer_layout"
diff --git a/app/src/main/res/layout/file_actions_bottom_sheet.xml b/app/src/main/res/layout/file_actions_bottom_sheet.xml
index 9275cf5a51..ac648b265d 100644
--- a/app/src/main/res/layout/file_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout/file_actions_bottom_sheet.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Android client application
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~  @author Álvaro Brey
-  ~  Copyright (C) 2022 Álvaro Brey
-  ~  Copyright (C) 2022 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
-  ~ 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/>.
-  ~
-  -->
+  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/file_actions_bottom_sheet_item.xml b/app/src/main/res/layout/file_actions_bottom_sheet_item.xml
index 8a0186f598..a2cef43fd4 100644
--- a/app/src/main/res/layout/file_actions_bottom_sheet_item.xml
+++ b/app/src/main/res/layout/file_actions_bottom_sheet_item.xml
@@ -1,26 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Android client application
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~  @author Álvaro Brey
-  ~  Copyright (C) 2022 Álvaro Brey
-  ~  Copyright (C) 2022 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
-  ~ 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/>.
-  ~
-  -->
-
-
+  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/file_details_activities_fragment.xml b/app/src/main/res/layout/file_details_activities_fragment.xml
index ece3621c69..b17ac44f92 100644
--- a/app/src/main/res/layout/file_details_activities_fragment.xml
+++ b/app/src/main/res/layout/file_details_activities_fragment.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  Copyright (C) 2018 Andy Scherzinger
-
-  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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/file_details_share_group.xml b/app/src/main/res/layout/file_details_share_group.xml
index 845093cb64..c2e71f00fe 100644
--- a/app/src/main/res/layout/file_details_share_group.xml
+++ b/app/src/main/res/layout/file_details_share_group.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- Nextcloud Android client application
-
-  @author Tobias Kaminsky
-  Copyright (C) 2020 Tobias Kaminsky
-  Copyright (C) 2020 Nextcloud GmbH.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <https://www.gnu.org/licenses/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-
 <LinearLayout android:id="@+id/copy_internal_container"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/file_details_share_internal_share_link.xml b/app/src/main/res/layout/file_details_share_internal_share_link.xml
index 1b6cfa19fd..c2e71f00fe 100644
--- a/app/src/main/res/layout/file_details_share_internal_share_link.xml
+++ b/app/src/main/res/layout/file_details_share_internal_share_link.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~ Nextcloud Android client application
-  ~
-  ~ @author Tobias Kaminsky
-  ~ Copyright (C) 2020 Tobias Kaminsky
-  ~ Copyright (C) 2020 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/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <LinearLayout android:id="@+id/copy_internal_container"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/file_details_share_link_share_item.xml b/app/src/main/res/layout/file_details_share_link_share_item.xml
index 901c2b0a9d..082b0eb18e 100644
--- a/app/src/main/res/layout/file_details_share_link_share_item.xml
+++ b/app/src/main/res/layout/file_details_share_link_share_item.xml
@@ -1,29 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  @author Tobias Kaminsky
-  @author Andy Scherzinger
-  @author TSI-mc
-
-  Copyright (C) 2020 Andy Scherzinger
-  Copyright (C) 2020 Tobias Kaminsky
-  Copyright (C) 2020 Nextcloud GmbH
-  Copyright (C) 2021 TSI-mc
-
-  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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/file_details_share_public_link_add_new_item.xml b/app/src/main/res/layout/file_details_share_public_link_add_new_item.xml
index 31ff3b7862..dc26ae6d66 100644
--- a/app/src/main/res/layout/file_details_share_public_link_add_new_item.xml
+++ b/app/src/main/res/layout/file_details_share_public_link_add_new_item.xml
@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Nextcloud Android client application
-
-  @author Tobias Kaminsky
-  @author Andy Scherzinger
-  Copyright (C) 2020 Andy Scherzinger
-  Copyright (C) 2020 Tobias Kaminsky
-  Copyright (C) 2020 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
-  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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/add_public_share"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/file_details_share_secure_file_drop_add_new_item.xml b/app/src/main/res/layout/file_details_share_secure_file_drop_add_new_item.xml
index 2d856eb83a..b864c15b5b 100644
--- a/app/src/main/res/layout/file_details_share_secure_file_drop_add_new_item.xml
+++ b/app/src/main/res/layout/file_details_share_secure_file_drop_add_new_item.xml
@@ -1,26 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  @author Tobias Kaminsky
-  @author Andy Scherzinger
-  Copyright (C) 2020 Andy Scherzinger
-  Copyright (C) 2020 Tobias Kaminsky
-  Copyright (C) 2020 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
-  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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/add_public_share"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/file_details_share_share_item.xml b/app/src/main/res/layout/file_details_share_share_item.xml
index eefda803a4..807b66f03f 100644
--- a/app/src/main/res/layout/file_details_share_share_item.xml
+++ b/app/src/main/res/layout/file_details_share_share_item.xml
@@ -1,23 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ownCloud Android client application
-
-  @author TSI-mc
-
-  Copyright (C) 2015 ownCloud Inc.
-  Copyright (C) 2018 Andy Scherzinger
-  Copyright (C) 2021 TSI-mc
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/file_details_sharing_fragment.xml b/app/src/main/res/layout/file_details_sharing_fragment.xml
index f9122e926f..9518bbc8c6 100644
--- a/app/src/main/res/layout/file_details_sharing_fragment.xml
+++ b/app/src/main/res/layout/file_details_sharing_fragment.xml
@@ -1,23 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Nextcloud Android client application
-
-  @author TSI-mc
-
-  Copyright (C) 2018 Andy Scherzinger
-  Copyright (C) 2023 TSI-mc
-
-  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/>.
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml b/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
index b0313fba36..23bce10792 100644
--- a/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
+++ b/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
@@ -1,23 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Nextcloud Android client application
-
- @author TSI-mc
- Copyright (C) 2021 TSI-mc
- Copyright (C) 2021 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/>.
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2022 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2021 TSI-mc
+  ~ SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+  ~ SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/file_thumbnail.xml b/app/src/main/res/layout/file_thumbnail.xml
index aa09fac933..c64210a78f 100644
--- a/app/src/main/res/layout/file_thumbnail.xml
+++ b/app/src/main/res/layout/file_thumbnail.xml
@@ -1,28 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <!--
-  ~ Nextcloud Android client application
+  ~ Nextcloud - Android Client
   ~
-  ~  @author Álvaro Brey
-  ~  Copyright (C) 2022 Álvaro Brey
-  ~  Copyright (C) 2022 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
-  ~ 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/>.
-  ~
-  -->
-
+  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <FrameLayout xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 50ec886232..f9a790c7ce 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2017 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 113e681bbd..21aa1d3398 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Android client application
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
   ~
-  ~  @author Álvaro Brey
-  ~  Copyright (C) 2022 Álvaro Brey
-  ~  Copyright (C) 2022 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
-  ~ 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/>.
-  ~
-  -->
-
+  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <resources>
     <item name="action_locked_by" type="id"/>
     <item name="action_locked_until" type="id"/>
diff --git a/app/src/qa/res/drawable/ic_launcher_background.xml b/app/src/qa/res/drawable/ic_launcher_background.xml
index c1ee647893..76d228e270 100644
--- a/app/src/qa/res/drawable/ic_launcher_background.xml
+++ b/app/src/qa/res/drawable/ic_launcher_background.xml
@@ -1,3 +1,10 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2020-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
diff --git a/app/src/qa/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/qa/res/mipmap-anydpi-v26/ic_launcher.xml
index b3e26b4c60..91142a7fce 100644
--- a/app/src/qa/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/qa/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
diff --git a/app/src/versionDev/res/drawable-v26/ic_launcher_background.xml b/app/src/versionDev/res/drawable-v26/ic_launcher_background.xml
index c1ee647893..76d228e270 100644
--- a/app/src/versionDev/res/drawable-v26/ic_launcher_background.xml
+++ b/app/src/versionDev/res/drawable-v26/ic_launcher_background.xml
@@ -1,3 +1,10 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2020-2024 Tobias Kaminsky <tobias@kaminsky.me>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
diff --git a/app/src/versionDev/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/versionDev/res/mipmap-anydpi-v26/ic_launcher.xml
index 50ec886232..8cbad4b127 100644
--- a/app/src/versionDev/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/versionDev/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH, all rights reserved
+  ~ SPDX-FileCopyrightText: 2017 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/drawable_resources/account_circle_white.svg b/drawable_resources/account_circle_white.svg
deleted file mode 100644
index 002db963ea..0000000000
--- a/drawable_resources/account_circle_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z" /></svg>
diff --git a/drawable_resources/alert-octagon.svg b/drawable_resources/alert-octagon.svg
deleted file mode 100644
index 47476ee279..0000000000
--- a/drawable_resources/alert-octagon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M13,13H11V7H13M12,17.3A1.3,1.3 0 0,1 10.7,16A1.3,1.3 0 0,1 12,14.7A1.3,1.3 0 0,1 13.3,16A1.3,1.3 0 0,1 12,17.3M15.73,3H8.27L3,8.27V15.73L8.27,21H15.73L21,15.73V8.27L15.73,3Z" /></svg>
diff --git a/drawable_resources/all_files.svg b/drawable_resources/all_files.svg
deleted file mode 100644
index a89656eeda..0000000000
--- a/drawable_resources/all_files.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16">
-    <path
-        d="M1.46 2c-.25 0-.46.21-.46.46v11.08c0 .258.202.46.46.46h13.08c.258 0 .46-.202.46-.46V4.462c0-.25-.21-.463-.46-.463H8L6 2H1.46zM2 5h12v8H2V5z"
-        fill="#0082c9"/>
-</svg>
diff --git a/drawable_resources/alphabetical_asc.svg.license b/drawable_resources/alphabetical_asc.svg.license
new file mode 100644
index 0000000000..5ac2f93f33
--- /dev/null
+++ b/drawable_resources/alphabetical_asc.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+SPDX-FileCopyrightText: 2018-2024 Google LLC
+SPDX-License-Identifier: Apache-2.0
diff --git a/drawable_resources/alphabetical_desc.svg.license b/drawable_resources/alphabetical_desc.svg.license
new file mode 100644
index 0000000000..5ac2f93f33
--- /dev/null
+++ b/drawable_resources/alphabetical_desc.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+SPDX-FileCopyrightText: 2018-2024 Google LLC
+SPDX-License-Identifier: Apache-2.0
diff --git a/drawable_resources/application-pdf.svg b/drawable_resources/application-pdf.svg
deleted file mode 100644
index cd5bad4b70..0000000000
--- a/drawable_resources/application-pdf.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-    <path d="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"
-        fill="#dc5047" />
-    <g fill="#fff" aria-label="PDF">
-        <path
-            d="m4.9093 8.443v1.057h-0.61813v-3h1.1703q0.33791 0 0.59341 0.12363 0.25755 0.12363 0.3956 0.35234 0.13805 0.22665 0.13805 0.51717 0 0.44093-0.30288 0.69643-0.30082 0.25343-0.83448 0.25343zm0-0.50069h0.5522q0.24519 0 0.37294-0.11538 0.12981-0.11538 0.12981-0.32967 0-0.22047-0.12981-0.35646t-0.35852-0.14011h-0.56662z" />
-        <path
-            d="m7.011 9.5v-3h0.92308q0.3956 0 0.70673 0.17926 0.31319 0.1772 0.48832 0.50687 0.17514 0.32761 0.17514 0.74588v0.13805q0 0.41827-0.17308 0.74382-0.17102 0.32555-0.4842 0.50481-0.31319 0.17926-0.70673 0.18132zm0.61813-2.4993v2.0027h0.29876q0.36264 0 0.55426-0.23695 0.19162-0.23695 0.19574-0.67788v-0.15865q0-0.45742-0.18956-0.69231-0.18956-0.23695-0.55426-0.23695z" />
-        <path d="m11.56 8.274h-1.1868v1.226h-0.61813v-3h1.9533v0.50069h-1.3352v0.77473h1.1868z" />
-    </g>
-</svg>
diff --git a/drawable_resources/application.svg b/drawable_resources/application.svg
deleted file mode 100644
index e3b6f25e00..0000000000
--- a/drawable_resources/application.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" width="16" version="1.1"><path fill="#969696" d="m6.94 0.5c-0.24 0-0.44 0.2-0.44 0.44v1.26c-0.5 0.14-1.05 0.35-1.53 0.65l-0.91-0.91c-0.16-0.18-0.46-0.19-0.62 0l-1.5 1.5c-0.18 0.17-0.18 0.46 0 0.62l0.91 0.91c-0.284 0.48-0.5 1-0.65 1.53h-1.26c-0.24 0-0.44 0.2-0.44 0.44v2.12c0 0.25 0.19 0.44 0.44 0.44h1.26c0.14 0.54 0.36 1.05 0.65 1.53l-0.91 0.91c-0.18 0.17-0.18 0.45 0 0.62l1.5 1.5c0.18 0.18 0.46 0.18 0.62 0l0.91-0.91c0.48 0.285 1 0.5 1.53 0.65v1.26c0 0.25 0.2 0.44 0.44 0.44h2.12c0.24 0 0.45-0.2 0.44-0.44v-1.26c0.54-0.14 1.05-0.36 1.53-0.65l0.91 0.91c0.17 0.18 0.45 0.18 0.62 0l1.5-1.5c0.18-0.17 0.18-0.45 0-0.62l-0.91-0.91c0.29-0.48 0.5-1 0.65-1.53h1.26c0.24 0 0.45-0.2 0.44-0.44v-2.12c0-0.24-0.2-0.44-0.44-0.44h-1.26c-0.14-0.54-0.36-1.05-0.65-1.53l0.91-0.91c0.18-0.17 0.18-0.45 0-0.62l-1.5-1.5c-0.17-0.18-0.45-0.18-0.62 0l-0.91 0.91c-0.48-0.29-1-0.5-1.53-0.65v-1.26c0-0.24-0.2-0.44-0.44-0.44h-2.12zm1.06 4a3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1 -3.5 3.5 3.5 3.5 0 0 1 -3.5 -3.5 3.5 3.5 0 0 1 3.5 -3.5z"/></svg>
diff --git a/drawable_resources/arrow-right.svg b/drawable_resources/arrow-right.svg
deleted file mode 100644
index 75114440c9..0000000000
--- a/drawable_resources/arrow-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" /></svg>
diff --git a/drawable_resources/battery_alert.svg b/drawable_resources/battery_alert.svg
deleted file mode 100644
index a5aa45e4b6..0000000000
--- a/drawable_resources/battery_alert.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M0 0h24v24H0z" fill="none" />
-    <path
-        d="M15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33v15.33C7 21.4 7.6 22 8.33 22h7.33c.74 0 1.34-.6 1.34-1.33V5.33C17 4.6 16.4 4 15.67 4zM13 18h-2v-2h2v2zm0-4h-2V9h2v5z" />
-</svg>
diff --git a/drawable_resources/calendar.svg b/drawable_resources/calendar.svg
deleted file mode 100644
index 52ee9d3e1a..0000000000
--- a/drawable_resources/calendar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,19H5V8H19M16,1V3H8V1H6V3H5C3.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,3H18V1M17,12H12V17H17V12Z" /></svg>
diff --git a/drawable_resources/chat_bubble.svg b/drawable_resources/chat_bubble.svg
deleted file mode 100644
index 442152eaca..0000000000
--- a/drawable_resources/chat_bubble.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M20 2H4c-1.1 0-2 .9-2 2v18l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
diff --git a/drawable_resources/check_circle.svg b/drawable_resources/check_circle.svg
deleted file mode 100644
index ea9cb2cc89..0000000000
--- a/drawable_resources/check_circle.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M0 0h24v24H0z" fill="none" />
-    <path
-        d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z" />
-</svg>
diff --git a/drawable_resources/check_circle_outline.svg b/drawable_resources/check_circle_outline.svg
deleted file mode 100644
index a176ae3a24..0000000000
--- a/drawable_resources/check_circle_outline.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path fill="none" d="M0 0h24v24H0V0zm0 0h24v24H0V0z" />
-    <path
-        d="M16.59 7.58L10 14.17l-3.59-3.58L5 12l5 5 8-8zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />
-</svg>
diff --git a/drawable_resources/checker_16_16.svg b/drawable_resources/checker_16_16.svg
deleted file mode 100644
index 45fd0c482f..0000000000
--- a/drawable_resources/checker_16_16.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
-    <g transform="matrix(1,0,0,1.00899,0,-0.000341971)">
-        <rect x="-0.024" y="0.038" width="8.005" height="7.929" style="fill:rgb(235,235,235);"/>
-    </g>
-    <g transform="matrix(1,0,0,1.00899,8.02377,7.96163)">
-        <rect x="-0.024" y="0.038" width="8.005" height="7.929" style="fill:rgb(235,235,235);"/>
-    </g>
-    <g transform="matrix(1,0,0,1.00899,7.98574,-0.0241086)">
-        <rect x="-0.024" y="0.038" width="8.005" height="7.929" style="fill:white;"/>
-    </g>
-    <g transform="matrix(1,0,0,1.00899,1.30556e-06,7.96163)">
-        <rect x="-0.024" y="0.038" width="8.005" height="7.929" style="fill:white;"/>
-    </g>
-</svg>
diff --git a/drawable_resources/circles.svg.license b/drawable_resources/circles.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/circles.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/comment.svg b/drawable_resources/comment.svg
deleted file mode 100644
index 47d2b77b0c..0000000000
--- a/drawable_resources/comment.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16">
-    <path
-        d="M8 1.5C3.582 1.5 0 3.962 0 7s3.582 5.5 8 5.5c.25 0 .49-.016.734-.03L13 16v-4.703c1.83-1.008 3-2.56 3-4.297 0-3.038-3.582-5.5-8-5.5z" />
-</svg>
diff --git a/drawable_resources/dashboard.svg.license b/drawable_resources/dashboard.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/dashboard.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/decrypt.svg b/drawable_resources/decrypt.svg
deleted file mode 100644
index c66a9a9bcd..0000000000
--- a/drawable_resources/decrypt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 71 100"><path stroke-width=".16" d="m8 0c-2.2091 0-4 1.7909-4 4v3h-1v7h10v-7h-1-2-2-2v-3c0-1.1046 0.8954-2 2-2s2 0.8954 2 2v1h2v-1c0-2.2091-1.791-4-4-4z" transform="matrix(6.25,0,0,6.25,-14.5,0)"/></svg>
diff --git a/drawable_resources/download.svg b/drawable_resources/download.svg
deleted file mode 100644
index 7fe43a19fc..0000000000
--- a/drawable_resources/download.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
-    <path d="M19,18L19,20L5,20L5,18L19,18ZM15,3L15,9L19,9L12,16L5,9L9,9L9,3L15,3Z" style="fill:rgb(254,209,48);stroke:white;stroke-width:1px;"/>
-</svg>
diff --git a/drawable_resources/encrypt.svg b/drawable_resources/encrypt.svg
deleted file mode 100644
index ba866e5103..0000000000
--- a/drawable_resources/encrypt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 71 100"><path d="M35.5 6.25c-13.807 0-25 11.193-25 25v12.5H4.25V87.5h62.5V43.75H60.5v-12.5c0-13.807-11.194-25-25-25zm0 12.5c6.904 0 12.5 5.596 12.5 12.5v12.5H23v-12.5c0-6.904 5.596-12.5 12.5-12.5z"/></svg>
diff --git a/drawable_resources/external.svg b/drawable_resources/external.svg
deleted file mode 100644
index 59d4f4d1cf..0000000000
--- a/drawable_resources/external.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16">
-    <path
-        d="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-.66 0-1.19.504-1.19 1.13v9.028c0 .625.53 1.128 1.19 1.128h9.522c.66 0 1.19-.503 1.19-1.128V9.52l-1.19-1.13v4.515h-9.52v-9.03h4.76l-1.19-1.128H2.69z" />
-</svg>
diff --git a/drawable_resources/favorite.svg b/drawable_resources/favorite.svg
deleted file mode 100644
index 739f1d9ddc..0000000000
--- a/drawable_resources/favorite.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:cc="http://creativecommons.org/ns#"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-    version="1.1"
-    viewBox="0 0 16 16"
-    width="16"
-    height="16"
-    id="svg4"
-    sodipodi:docname="starred.svg"
-    inkscape:version="0.92.2 2405546, 2018-03-11">
-    <metadata
-        id="metadata10">
-        <rdf:RDF>
-            <cc:Work
-                rdf:about="">
-                <dc:format>image/svg+xml</dc:format>
-                <dc:type
-                    rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-                <dc:title></dc:title>
-            </cc:Work>
-        </rdf:RDF>
-    </metadata>
-    <defs
-        id="defs8"/>
-    <sodipodi:namedview
-        pagecolor="#ffffff"
-        bordercolor="#666666"
-        borderopacity="1"
-        objecttolerance="10"
-        gridtolerance="10"
-        guidetolerance="10"
-        inkscape:pageopacity="0"
-        inkscape:pageshadow="2"
-        inkscape:window-width="1600"
-        inkscape:window-height="835"
-        id="namedview6"
-        showgrid="false"
-        inkscape:pagecheckerboard="true"
-        inkscape:zoom="29.5"
-        inkscape:cx="8.5728202"
-        inkscape:cy="8.1590701"
-        inkscape:window-x="0"
-        inkscape:window-y="0"
-        inkscape:window-maximized="1"
-        inkscape:current-layer="svg4"/>
-    <path
-        d="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"
-        id="path2"
-        style="fill:#ffcc00;stroke:#ffffff;stroke-width:0.46367699;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-        inkscape:connector-curvature="0"/>
-</svg>
diff --git a/drawable_resources/file.svg b/drawable_resources/file.svg
deleted file mode 100644
index aa4170dd7d..0000000000
--- a/drawable_resources/file.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" width="16" version="1.1"><path fill="#969696" d="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"/></svg>
diff --git a/drawable_resources/first_run_files.svg - Kopie.license b/drawable_resources/first_run_files.svg - Kopie.license
new file mode 100644
index 0000000000..22c89b4e41
--- /dev/null
+++ b/drawable_resources/first_run_files.svg - Kopie.license	
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Google LLC
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: Apache-2.0
diff --git a/drawable_resources/first_run_groupware.svg - Kopie.license b/drawable_resources/first_run_groupware.svg - Kopie.license
new file mode 100644
index 0000000000..c1a8ebf378
--- /dev/null
+++ b/drawable_resources/first_run_groupware.svg - Kopie.license	
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/first_run_talk.svg.license b/drawable_resources/first_run_talk.svg.license
new file mode 100644
index 0000000000..15a5bdd4b6
--- /dev/null
+++ b/drawable_resources/first_run_talk.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/folder.svg b/drawable_resources/folder.svg
deleted file mode 100644
index 250600da07..0000000000
--- a/drawable_resources/folder.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/folder_starred.svg b/drawable_resources/folder_starred.svg
deleted file mode 100644
index 29c1b97b55..0000000000
--- a/drawable_resources/folder_starred.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <path d="M10,4L4,4C2.89,4 2,4.89 2,6L2,18C2,19.097 2.903,20 4,20L20,20C21.097,20 22,19.097 22,18L22,8C22,6.89 21.1,6 20,6L12,6L10,4ZM11.988,8.52L13.26,11.583L16.611,11.843L14.011,14.01L14.878,17.188L11.988,15.395L9.099,17.188L9.966,14.01L7.365,11.843L10.717,11.583L11.988,8.52Z" style="fill-rule:nonzero;"/>
-</svg>
diff --git a/drawable_resources/history.svg b/drawable_resources/history.svg
deleted file mode 100644
index 69be858cf7..0000000000
--- a/drawable_resources/history.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16">
-    <path
-        d="m9.025 1.08c-3.95 0-6.535 3.447-6.364 6.72h-2.161l3.904 3.92 4.08-3.874h-2.147c-0.237-1.7 1.163-3.114 2.689-3.092 1.595 0.024 2.8 1.23 2.8 2.734 0.09 1.594-1.63 3.428-3.966 2.53 0 1.23 0.003 2.545 0 3.765 4.19 0.83 7.64-2.51 7.64-6.25 0-3.563-2.92-6.453-6.475-6.453z"/>
-</svg>
diff --git a/drawable_resources/ic_account_plus.svg b/drawable_resources/ic_account_plus.svg
deleted file mode 100644
index 2185cf6a90..0000000000
--- a/drawable_resources/ic_account_plus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M15,14C12.33,14 7,15.33 7,18V20H23V18C23,15.33 17.67,14 15,14M6,10V7H4V10H1V12H4V15H6V12H9V10M15,12A4,4 0 0,0 19,8A4,4 0 0,0 15,4A4,4 0 0,0 11,8A4,4 0 0,0 15,12Z" /></svg>
diff --git a/drawable_resources/ic_action_cancel.svg b/drawable_resources/ic_action_cancel.svg
deleted file mode 100644
index 8ab8feef17..0000000000
--- a/drawable_resources/ic_action_cancel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z" /></svg>
diff --git a/drawable_resources/ic_action_create_dir.svg b/drawable_resources/ic_action_create_dir.svg
deleted file mode 100644
index 78798b68a4..0000000000
--- a/drawable_resources/ic_action_create_dir.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
diff --git a/drawable_resources/ic_action_refresh.svg b/drawable_resources/ic_action_refresh.svg
deleted file mode 100644
index cf5e2be952..0000000000
--- a/drawable_resources/ic_action_refresh.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,18A6,6 0 0,1 6,12C6,11 6.25,10.03 6.7,9.2L5.24,7.74C4.46,8.97 4,10.43 4,12A8,8 0 0,0 12,20V23L16,19L12,15M12,4V1L8,5L12,9V6A6,6 0 0,1 18,12C18,13 17.75,13.97 17.3,14.8L18.76,16.26C19.54,15.03 20,13.57 20,12A8,8 0 0,0 12,4Z" /></svg>
diff --git a/drawable_resources/ic_action_upload.svg b/drawable_resources/ic_action_upload.svg
deleted file mode 100644
index 396bfec702..0000000000
--- a/drawable_resources/ic_action_upload.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M9,16V10H5L12,3L19,10H15V16H9M5,20V18H19V20H5Z" /></svg>
diff --git a/drawable_resources/ic_arrow_back.svg b/drawable_resources/ic_arrow_back.svg
deleted file mode 100644
index fe721b6688..0000000000
--- a/drawable_resources/ic_arrow_back.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" /></svg>
diff --git a/drawable_resources/ic_camera.svg b/drawable_resources/ic_camera.svg
deleted file mode 100644
index 5222ea30b7..0000000000
--- a/drawable_resources/ic_camera.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_checkbox_blank_outline.svg b/drawable_resources/ic_checkbox_blank_outline.svg
deleted file mode 100644
index 6403ab6a5a..0000000000
--- a/drawable_resources/ic_checkbox_blank_outline.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_checkbox_marked.svg b/drawable_resources/ic_checkbox_marked.svg
deleted file mode 100644
index 6d22afb997..0000000000
--- a/drawable_resources/ic_checkbox_marked.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_close.svg b/drawable_resources/ic_close.svg
deleted file mode 100644
index 18691d7e94..0000000000
--- a/drawable_resources/ic_close.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_cloud_sync_off.svg b/drawable_resources/ic_cloud_sync_off.svg
deleted file mode 100644
index 205d0b9a36..0000000000
--- a/drawable_resources/ic_cloud_sync_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M7.73,10L15.73,18H6A4,4 0 0,1 2,14A4,4 0 0,1 6,10M3,5.27L5.75,8C2.56,8.15 0,10.77 0,14A6,6 0 0,0 6,20H17.73L19.73,22L21,20.73L4.27,4M19.35,10.03C18.67,6.59 15.64,4 12,4C10.5,4 9.15,4.43 8,5.17L9.45,6.63C10.21,6.23 11.08,6 12,6A5.5,5.5 0 0,1 17.5,11.5V12H19A3,3 0 0,1 22,15C22,16.13 21.36,17.11 20.44,17.62L21.89,19.07C23.16,18.16 24,16.68 24,15C24,12.36 21.95,10.22 19.35,10.03Z" /></svg>
diff --git a/drawable_resources/ic_cloud_sync_on.svg b/drawable_resources/ic_cloud_sync_on.svg
deleted file mode 100644
index 77d72251c8..0000000000
--- a/drawable_resources/ic_cloud_sync_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.03Z" /></svg>
diff --git a/drawable_resources/ic_content-copy.svg b/drawable_resources/ic_content-copy.svg
deleted file mode 100644
index bce7028fc2..0000000000
--- a/drawable_resources/ic_content-copy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
diff --git a/drawable_resources/ic_delete.svg b/drawable_resources/ic_delete.svg
deleted file mode 100644
index eaef1db238..0000000000
--- a/drawable_resources/ic_delete.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:cc="http://creativecommons.org/ns#"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-    version="1.1"
-    viewbox="0 0 16 16"
-    width="16"
-    height="16"
-    id="svg4"
-    sodipodi:docname="ic_delete.svg"
-    inkscape:version="0.92.2 2405546, 2018-03-11">
-    <metadata
-        id="metadata10">
-        <rdf:RDF>
-            <cc:Work
-                rdf:about="">
-                <dc:format>image/svg+xml</dc:format>
-                <dc:type
-                    rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-            </cc:Work>
-        </rdf:RDF>
-    </metadata>
-    <defs
-        id="defs8"/>
-    <sodipodi:namedview
-        pagecolor="#ffffff"
-        bordercolor="#666666"
-        borderopacity="1"
-        objecttolerance="10"
-        gridtolerance="10"
-        guidetolerance="10"
-        inkscape:pageopacity="0"
-        inkscape:pageshadow="2"
-        inkscape:window-width="1600"
-        inkscape:window-height="835"
-        id="namedview6"
-        showgrid="false"
-        inkscape:zoom="14.75"
-        inkscape:cx="-3.8305085"
-        inkscape:cy="8"
-        inkscape:window-x="0"
-        inkscape:window-y="0"
-        inkscape:window-maximized="1"
-        inkscape:current-layer="svg4"/>
-    <path
-        d="M6.5 1L6 2H3c-.554 0-1 .446-1 1v1h12V3c0-.554-.446-1-1-1h-3l-.5-1zM3 5l.875 9c.06.55.573 1 1.125 1h6c.552 0 1.064-.45 1.125-1L13 5z"
-        id="path2"
-        style="fill:#c4c4c4;fill-opacity:1"/>
-</svg>
diff --git a/drawable_resources/ic_document.svg b/drawable_resources/ic_document.svg
deleted file mode 100644
index 4a23bd3153..0000000000
--- a/drawable_resources/ic_document.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_done_white.svg b/drawable_resources/ic_done_white.svg
deleted file mode 100644
index 25a5208750..0000000000
--- a/drawable_resources/ic_done_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" /></svg>
diff --git a/drawable_resources/ic_dots_vertical.svg b/drawable_resources/ic_dots_vertical.svg
deleted file mode 100644
index fc2dfdfa72..0000000000
--- a/drawable_resources/ic_dots_vertical.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" /></svg>
diff --git a/drawable_resources/ic_down.svg b/drawable_resources/ic_down.svg
deleted file mode 100644
index 03e2de066e..0000000000
--- a/drawable_resources/ic_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M7,10L12,15L17,10H7Z" /></svg>
diff --git a/drawable_resources/ic_download.svg b/drawable_resources/ic_download.svg
deleted file mode 100644
index 67c94404a7..0000000000
--- a/drawable_resources/ic_download.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M5,20H19V18H5M19,9H15V3H9V9H5L12,16L19,9Z" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_email.svg b/drawable_resources/ic_email.svg
deleted file mode 100644
index 49884c88be..0000000000
--- a/drawable_resources/ic_email.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
diff --git a/drawable_resources/ic_file-document-outline.svg b/drawable_resources/ic_file-document-outline.svg
deleted file mode 100644
index 90831cba83..0000000000
--- a/drawable_resources/ic_file-document-outline.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M6,2A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2H6M6,4H13V9H18V20H6V4M8,12V14H16V12H8M8,16V18H13V16H8Z" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_folder_open.svg b/drawable_resources/ic_folder_open.svg
deleted file mode 100644
index bf467e8aa6..0000000000
--- a/drawable_resources/ic_folder_open.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z" /></svg>
diff --git a/drawable_resources/ic_folder_star.svg b/drawable_resources/ic_folder_star.svg
deleted file mode 100644
index 5385b80520..0000000000
--- a/drawable_resources/ic_folder_star.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20,6H12L10,4H4A2,2 0 0,0 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8A2,2 0 0,0 20,6M17.94,17L15,15.28L12.06,17L12.84,13.67L10.25,11.43L13.66,11.14L15,8L16.34,11.14L19.75,11.43L17.16,13.67L17.94,17Z" /></svg>
diff --git a/drawable_resources/ic_group.svg b/drawable_resources/ic_group.svg
deleted file mode 100644
index 453618af0e..0000000000
--- a/drawable_resources/ic_group.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,13C15.71,13 15.38,13 15.03,13.05C16.19,13.89 17,15 17,16.5V19H23V16.5C23,14.17 18.33,13 16,13M8,13C5.67,13 1,14.17 1,16.5V19H15V16.5C15,14.17 10.33,13 8,13M8,11A3,3 0 0,0 11,8A3,3 0 0,0 8,5A3,3 0 0,0 5,8A3,3 0 0,0 8,11M16,11A3,3 0 0,0 19,8A3,3 0 0,0 16,5A3,3 0 0,0 13,8A3,3 0 0,0 16,11Z" /></svg>
diff --git a/drawable_resources/ic_hide.svg b/drawable_resources/ic_hide.svg
deleted file mode 100644
index adfade2c52..0000000000
--- a/drawable_resources/ic_hide.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M11.83,9L15,12.16C15,12.11 15,12.05 15,12A3,3 0 0,0 12,9C11.94,9 11.89,9 11.83,9M7.53,9.8L9.08,11.35C9.03,11.56 9,11.77 9,12A3,3 0 0,0 12,15C12.22,15 12.44,14.97 12.65,14.92L14.2,16.47C13.53,16.8 12.79,17 12,17A5,5 0 0,1 7,12C7,11.21 7.2,10.47 7.53,9.8M2,4.27L4.28,6.55L4.73,7C3.08,8.3 1.78,10 1,12C2.73,16.39 7,19.5 12,19.5C13.55,19.5 15.03,19.2 16.38,18.66L16.81,19.08L19.73,22L21,20.73L3.27,3M12,7A5,5 0 0,1 17,12C17,12.64 16.87,13.26 16.64,13.82L19.57,16.75C21.07,15.5 22.27,13.86 23,12C21.27,7.61 17,4.5 12,4.5C10.6,4.5 9.26,4.75 8,5.2L10.17,7.35C10.74,7.13 11.35,7 12,7Z" /></svg>
diff --git a/drawable_resources/ic_history.svg b/drawable_resources/ic_history.svg
deleted file mode 100644
index d79390eb60..0000000000
--- a/drawable_resources/ic_history.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16">
-    <path style="fill:#757575"
-          d="m9.025 1.08c-3.95 0-6.535 3.447-6.364 6.72h-2.161l3.904 3.92 4.08-3.874h-2.147c-0.237-1.7 1.163-3.114 2.689-3.092 1.595 0.024 2.8 1.23 2.8 2.734 0.09 1.594-1.63 3.428-3.966 2.53 0 1.23 0.003 2.545 0 3.765 4.19 0.83 7.64-2.51 7.64-6.25 0-3.563-2.92-6.453-6.475-6.453z"/>
-</svg>
diff --git a/drawable_resources/ic_image-outline.svg b/drawable_resources/ic_image-outline.svg
deleted file mode 100644
index c976834357..0000000000
--- a/drawable_resources/ic_image-outline.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,19H5V5H19M19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M13.96,12.29L11.21,15.83L9.25,13.47L6.5,17H17.5L13.96,12.29Z" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_image.svg b/drawable_resources/ic_image.svg
deleted file mode 100644
index 5c61724ff1..0000000000
--- a/drawable_resources/ic_image.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_import.svg b/drawable_resources/ic_import.svg
deleted file mode 100644
index e675bed577..0000000000
--- a/drawable_resources/ic_import.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z" /></svg>
diff --git a/drawable_resources/ic_link.svg b/drawable_resources/ic_link.svg
deleted file mode 100644
index 82c95d588f..0000000000
--- a/drawable_resources/ic_link.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,6H13V7.9H16C18.26,7.9 20.1,9.73 20.1,12A4.1,4.1 0 0,1 16,16.1H13V18H16A6,6 0 0,0 22,12C22,8.68 19.31,6 16,6M3.9,12C3.9,9.73 5.74,7.9 8,7.9H11V6H8A6,6 0 0,0 2,12A6,6 0 0,0 8,18H11V16.1H8C5.74,16.1 3.9,14.26 3.9,12M8,13H16V11H8V13Z" /></svg>
diff --git a/drawable_resources/ic_list_empty_create_folder.svg b/drawable_resources/ic_list_empty_create_folder.svg
deleted file mode 100644
index 45bb2cb107..0000000000
--- a/drawable_resources/ic_list_empty_create_folder.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="17.066668"
-   width="17.066668"
-   version="1"
-   id="svg2"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="ic_list_empty_create_folder.svg"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\colorFolderNew\src\main\res\drawable-xxxhdpi\ic_list_empty_create_folder.png"
-   inkscape:export-xdpi="1620"
-   inkscape:export-ydpi="1620">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="29.5"
-     inkscape:cx="4.4894139"
-     inkscape:cy="8.4762522"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     style="fill:#0082c9;fill-opacity:1;stroke-width:1.06666672;opacity:0.5"
-     d="m 1.5541666,2.1291667 c -0.2666667,0 -0.4916666,0.225 -0.4916666,0.4916666 V 14.439583 c 0,0.277333 0.2164666,0.489584 0.4916666,0.489584 H 15.50625 c 0.2752,0 0.489584,-0.212251 0.489584,-0.489584 V 4.7583333 c 0,-0.2666666 -0.222918,-0.4958334 -0.489584,-0.4958332 H 8.5291667 L 6.3958334,2.1291667 Z m 9.0812504,4.5229166 h 1.425 V 8.8 h 2.141666 v 1.425 h -2.141666 v 2.1375 h -1.425 V 10.225 H 8.4895834 V 8.8 h 2.1458336 z"
-     id="path4"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/drawable_resources/ic_list_empty_error.svg b/drawable_resources/ic_list_empty_error.svg
deleted file mode 100644
index 0f2a0360be..0000000000
--- a/drawable_resources/ic_list_empty_error.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="ic_list_empty_error.svg"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_error.png"
-   inkscape:export-xdpi="432"
-   inkscape:export-ydpi="432"
-   inkscape:version="0.92.1 r15371">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M5.516 2L2 5.516v4.968L5.516 14h4.968L14 10.484V5.516L10.484 2H5.516zM7 4h2v5H7V4zm0 6h2v2H7v-2z"
-     id="path2"
-     style="fill:#000000;fill-opacity:1;opacity:0.5" />
-</svg>
diff --git a/drawable_resources/ic_list_empty_folder.svg b/drawable_resources/ic_list_empty_folder.svg
deleted file mode 100644
index 804e1d051c..0000000000
--- a/drawable_resources/ic_list_empty_folder.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="17.066668"
-   width="17.066668"
-   version="1"
-   id="svg2"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="ic_list_empty_folder.svg"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\colorFolderNew\src\main\res\drawable-xxxhdpi\ic_list_empty_folder.png"
-   inkscape:export-xdpi="1620"
-   inkscape:export-ydpi="1620">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="1.4237286"
-     inkscape:cy="8"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="m 1.5541333,2.1301333 c -0.2666666,0 -0.4906666,0.224 -0.4906666,0.4906667 v 11.818667 c 0,0.277333 0.2154666,0.490666 0.4906666,0.490666 H 15.506133 c 0.2752,0 0.490667,-0.213333 0.490667,-0.490666 V 4.7573333 c 0,-0.2666666 -0.224,-0.4938666 -0.490667,-0.4938666 H 8.5301333 L 6.3968,2.1301333 Z"
-     id="path4"
-     style="fill:#0082c9;fill-opacity:1;fill-rule:evenodd;stroke-width:1.06666672;opacity:0.5"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/drawable_resources/ic_list_empty_image.svg b/drawable_resources/ic_list_empty_image.svg
deleted file mode 100644
index d885015618..0000000000
--- a/drawable_resources/ic_list_empty_image.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:cc="http://creativecommons.org/ns#"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-    height="16"
-    width="16"
-    version="1"
-    id="svg4"
-    sodipodi:docname="ic_list_empty_image.svg"
-    inkscape:version="0.91 r13725"
-    inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_image.png"
-    inkscape:export-xdpi="432"
-    inkscape:export-ydpi="432">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="835"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="17.694915"
-     inkscape:cy="8"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     style="block-progression:tb;text-transform:none;text-indent:0;fill:#757575;fill-opacity:1;opacity:1"
-     d="M1.344 2A.445.445 0 0 0 1 2.438v11.124c0 .23.212.44.438.44h13.125a.457.457 0 0 0 .437-.44V2.61c0-.337-.264-.61-.515-.61zM2 3h12v5l-1-1-3 4-3-3-4 4H2zm2.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z"
-     fill="#969696"
-     color="#000"
-     id="path2" />
-</svg>
diff --git a/drawable_resources/ic_list_empty_shared.svg b/drawable_resources/ic_list_empty_shared.svg
deleted file mode 100644
index e64e6ab64c..0000000000
--- a/drawable_resources/ic_list_empty_shared.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="ic_list_empty_shared.svg"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_shared.png"
-   inkscape:export-xdpi="144"
-   inkscape:export-ydpi="144"
-   inkscape:version="0.92.1 r15371">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-10.20339"
-     inkscape:cy="8"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M12.228 1a2.457 2.457 0 0 0-2.46 2.454c0 .075.01.15.016.224L5.05 6.092a2.445 2.445 0 0 0-1.596-.586A2.453 2.453 0 0 0 1 7.96a2.453 2.453 0 0 0 2.454 2.455 2.45 2.45 0 0 0 1.46-.477l4.865 2.474c-.004.044-.01.09-.01.134a2.457 2.457 0 1 0 .804-1.818l-4.696-2.4c.02-.123.035-.25.035-.378 0-.072-.01-.144-.015-.214l4.74-2.414A2.457 2.457 0 1 0 12.228.99z"
-     id="path2"
-     style="fill:#757575;fill-opacity:1;opacity:1" />
-</svg>
diff --git a/drawable_resources/ic_list_empty_video.svg b/drawable_resources/ic_list_empty_video.svg
deleted file mode 100644
index 3af0fbe4e0..0000000000
--- a/drawable_resources/ic_list_empty_video.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:cc="http://creativecommons.org/ns#"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-    height="16"
-    width="16"
-    version="1"
-    id="svg4"
-    sodipodi:docname="ic_list_empty_video.svg"
-    inkscape:version="0.91 r13725"
-    inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_video.png"
-    inkscape:export-xdpi="432"
-    inkscape:export-ydpi="432">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="835"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="20.85965"
-     inkscape:cx="-15.290906"
-     inkscape:cy="9.1100694"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     style="block-progression:tb;text-transform:none;text-indent:0;fill:#757575;fill-opacity:1;opacity:1"
-     d="M1.344 2A.445.445 0 0 0 1 2.438v11.124c0 .23.212.44.438.44h13.124a.457.457 0 0 0 .438-.44V2.61c0-.336-.265-.61-.516-.61zM2 3h12v10H2zm3 2v6l6-3z"
-     id="path2"
-     fill="#969696"
-     color="#000" />
-</svg>
diff --git a/drawable_resources/ic_lock_open_white.svg b/drawable_resources/ic_lock_open_white.svg
deleted file mode 100644
index 6b1f1622bc..0000000000
--- a/drawable_resources/ic_lock_open_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
diff --git a/drawable_resources/ic_lock_white.svg b/drawable_resources/ic_lock_white.svg
deleted file mode 100644
index c39c621f87..0000000000
--- a/drawable_resources/ic_lock_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
diff --git a/drawable_resources/ic_map_marker.svg b/drawable_resources/ic_map_marker.svg
deleted file mode 100644
index 415351cab2..0000000000
--- a/drawable_resources/ic_map_marker.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,11.5A2.5,2.5 0 0,1 9.5,9A2.5,2.5 0 0,1 12,6.5A2.5,2.5 0 0,1 14.5,9A2.5,2.5 0 0,1 12,11.5M12,2A7,7 0 0,0 5,9C5,14.25 12,22 12,22C12,22 19,14.25 19,9A7,7 0 0,0 12,2Z" /></svg>
diff --git a/drawable_resources/ic_movie.svg b/drawable_resources/ic_movie.svg
deleted file mode 100644
index 11700796f3..0000000000
--- a/drawable_resources/ic_movie.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_music.svg b/drawable_resources/ic_music.svg
deleted file mode 100644
index 36d700fa7d..0000000000
--- a/drawable_resources/ic_music.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_notification.svg b/drawable_resources/ic_notification.svg
deleted file mode 100644
index bfcd35b2d4..0000000000
--- a/drawable_resources/ic_notification.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   viewBox="0 0 16 16"
-   id="svg4"
-   sodipodi:docname="ic_notification.svg"
-   inkscape:version="0.92.1 r15371"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\notifications\src\main\res\drawable-mdpi\ic_notification.png"
-   inkscape:export-xdpi="144"
-   inkscape:export-ydpi="144">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="m8 2c-0.5523 0-1 0.4477-1 1 0 0.0472 0.021 0.0873 0.0273 0.1328-1.7366 0.4362-3.0273 1.9953-3.0273 3.8672v2l-1 1v1h10v-1l-1-1v-2c0-1.8719-1.291-3.431-3.0273-3.8672 0.0063-0.0455 0.0273-0.0856 0.0273-0.1328 0-0.5523-0.4477-1-1-1zm-2 10c0 1.1046 0.8954 2 2 2s2-0.8954 2-2z"
-     fill="#fff"
-     id="path2"
-     style="fill:#757575;fill-opacity:1" />
-</svg>
diff --git a/drawable_resources/ic_notification_light_grey.svg b/drawable_resources/ic_notification_light_grey.svg
deleted file mode 100644
index 762dbee58a..0000000000
--- a/drawable_resources/ic_notification_light_grey.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   viewBox="0 0 16 16"
-   id="svg4"
-   sodipodi:docname="ic_notification_light_grey.svg"
-   inkscape:version="0.92.1 r15371"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\notifications\src\main\res\drawable-mdpi\ic_notification_light_grey.png"
-   inkscape:export-xdpi="432"
-   inkscape:export-ydpi="432">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-10.20339"
-     inkscape:cy="8"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="m8 2c-0.5523 0-1 0.4477-1 1 0 0.0472 0.021 0.0873 0.0273 0.1328-1.7366 0.4362-3.0273 1.9953-3.0273 3.8672v2l-1 1v1h10v-1l-1-1v-2c0-1.8719-1.291-3.431-3.0273-3.8672 0.0063-0.0455 0.0273-0.0856 0.0273-0.1328 0-0.5523-0.4477-1-1-1zm-2 10c0 1.1046 0.8954 2 2 2s2-0.8954 2-2z"
-     fill="#fff"
-     id="path2"
-     style="fill:#000000;fill-opacity:1;opacity:0.5" />
-</svg>
diff --git a/drawable_resources/ic_people.svg b/drawable_resources/ic_people.svg
deleted file mode 100644
index a03024bde6..0000000000
--- a/drawable_resources/ic_people.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path
-        d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/>
-</svg>
diff --git a/drawable_resources/ic_phone.svg b/drawable_resources/ic_phone.svg
deleted file mode 100644
index 9d8a322b2f..0000000000
--- a/drawable_resources/ic_phone.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M6.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0 0,1 21,16.5V20A1,1 0 0,1 20,21A17,17 0 0,1 3,4A1,1 0 0,1 4,3H7.5A1,1 0 0,1 8.5,4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z" /></svg>
diff --git a/drawable_resources/ic_play_arrow.svg b/drawable_resources/ic_play_arrow.svg
deleted file mode 100644
index 7c88be8266..0000000000
--- a/drawable_resources/ic_play_arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M8,5.14V19.14L19,12.14L8,5.14Z" /></svg>
diff --git a/drawable_resources/ic_scan_document.svg b/drawable_resources/ic_scan_document.svg
index 5d8d876202..bf174f92a7 100644
--- a/drawable_resources/ic_scan_document.svg
+++ b/drawable_resources/ic_scan_document.svg
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" height="100%" version="1.1"
-    viewBox="0 0 24 24" width="100%" xmlns="http://www.w3.org/2000/svg" xml:space="preserve">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
     <g transform="matrix(1.1,0,0,1.1,-1.2,-1.2)">
-        <path style="fill-rule:nonzero;"
-            d="M22,20.333C22,21.248 21.248,22 20.333,22L17,22L17,20.333L20.333,20.333L20.333,17L22,17L22,20.333ZM3.667,22C2.752,22 2,21.248 2,20.333L2,17L3.667,17L3.667,20.333L7,20.333L7,22L3.667,22ZM6.953,5.5C6.695,5.5 6.493,5.704 6.493,5.964L6.493,18.036C6.493,18.296 6.695,18.5 6.953,18.5L17.056,18.5C17.313,18.5 17.515,18.296 17.515,18.036L17.515,8.286L14.76,5.5L6.953,5.5ZM8.33,15.714L12.004,15.714L12.004,16.643L8.33,16.643L8.33,15.714ZM8.33,12.929L15.678,12.929L15.678,13.857L8.33,13.857L8.33,12.929ZM8.33,10.143L12.923,10.143L12.923,11.071L8.33,11.071L8.33,10.143ZM8.33,7.357L13.841,7.357L13.841,8.286L8.33,8.286L8.33,7.357ZM2,3.667C2,2.752 2.752,2 3.667,2L7,2L7,3.667L3.667,3.667L3.667,7L2,7L2,3.667ZM20.333,2C21.248,2 22,2.752 22,3.667L22,7L20.333,7L20.333,3.667L17,3.667L17,2L20.333,2Z" />
+        <path d="M22,20.333C22,21.248 21.248,22 20.333,22L17,22L17,20.333L20.333,20.333L20.333,17L22,17L22,20.333ZM3.667,22C2.752,22 2,21.248 2,20.333L2,17L3.667,17L3.667,20.333L7,20.333L7,22L3.667,22ZM2,3.667C2,2.752 2.752,2 3.667,2L7,2L7,3.667L3.667,3.667L3.667,7L2,7L2,3.667ZM20.333,2C21.248,2 22,2.752 22,3.667L22,7L20.333,7L20.333,3.667L17,3.667L17,2L20.333,2Z" style="fill-rule:nonzero;"/>
+        <g transform="matrix(0.720878,0,0,0.720878,3.34947,3.34947)">
+            <path d="M5,21C4.45,21 3.979,20.804 3.588,20.413C3.196,20.021 3,19.55 3,19L3,5C3,4.45 3.196,3.979 3.588,3.587C3.979,3.196 4.45,3 5,3L19,3C19.55,3 20.021,3.196 20.413,3.587C20.804,3.979 21,4.45 21,5L21,19C21,19.55 20.804,20.021 20.413,20.413C20.021,20.804 19.55,21 19,21L5,21ZM7,17L14,17L14,15L7,15L7,17ZM7,13L17,13L17,11L7,11L7,13ZM7,9L17,9L17,7L7,7L7,9Z" style="fill-rule:nonzero;"/>
+        </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/drawable_resources/ic_sd.svg b/drawable_resources/ic_sd.svg
deleted file mode 100644
index 1d5b97781f..0000000000
--- a/drawable_resources/ic_sd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M18,8H16V4H18M15,8H13V4H15M12,8H10V4H12M18,2H10L4,8V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V4A2,2 0 0,0 18,2Z" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_search.svg b/drawable_resources/ic_search.svg
deleted file mode 100644
index eb425711fd..0000000000
--- a/drawable_resources/ic_search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_search_light_blue.svg b/drawable_resources/ic_search_light_blue.svg
deleted file mode 100644
index 119764ee6a..0000000000
--- a/drawable_resources/ic_search_light_blue.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg4"
-   sodipodi:docname="ic_search_light_blue.svg"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\filtering-improvements\res\drawable-xxxhdpi\ic_search_light_blue.png"
-   inkscape:export-xdpi="1152"
-   inkscape:export-ydpi="1152"
-   inkscape:version="0.92.0 r15299">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="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"
-     id="path2"
-     style="fill:#99cde9;fill-opacity:1" />
-</svg>
diff --git a/drawable_resources/ic_search_light_grey.svg b/drawable_resources/ic_search_light_grey.svg
deleted file mode 100644
index c50cf8bf64..0000000000
--- a/drawable_resources/ic_search_light_grey.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg4"
-   sodipodi:docname="ic_search_light_grey.svg"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\new-filtering-magic\res\drawable-xxxhdpi\ic_search_light_grey.png"
-   inkscape:export-xdpi="1152"
-   inkscape:export-ydpi="1152"
-   inkscape:version="0.92.0 r15299">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="-15.305085"
-     inkscape:cy="12"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="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"
-     id="path2"
-     style="fill:#000000;fill-opacity:1;opacity:0.5" />
-</svg>
diff --git a/drawable_resources/ic_select_all.svg b/drawable_resources/ic_select_all.svg
deleted file mode 100644
index 0287ec2a2d..0000000000
--- a/drawable_resources/ic_select_all.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M9,9H15V15H9M7,17H17V7H7M15,5H17V3H15M15,21H17V19H15M19,17H21V15H19M19,9H21V7H19M19,21A2,2 0 0,0 21,19H19M19,13H21V11H19M11,21H13V19H11M9,3H7V5H9M3,17H5V15H3M5,21V19H3A2,2 0 0,0 5,21M19,3V5H21A2,2 0 0,0 19,3M13,3H11V5H13M3,9H5V7H3M7,21H9V19H7M3,13H5V11H3M3,5H5V3A2,2 0 0,0 3,5Z" /></svg>
diff --git a/drawable_resources/ic_select_none.svg b/drawable_resources/ic_select_none.svg
deleted file mode 100644
index 853524ecf2..0000000000
--- a/drawable_resources/ic_select_none.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M4,3H5V5H3V4A1,1 0 0,1 4,3M20,3A1,1 0 0,1 21,4V5H19V3H20M15,5V3H17V5H15M11,5V3H13V5H11M7,5V3H9V5H7M21,20A1,1 0 0,1 20,21H19V19H21V20M15,21V19H17V21H15M11,21V19H13V21H11M7,21V19H9V21H7M4,21A1,1 0 0,1 3,20V19H5V21H4M3,15H5V17H3V15M21,15V17H19V15H21M3,11H5V13H3V11M21,11V13H19V11H21M3,7H5V9H3V7M21,7V9H19V7H21Z" /></svg>
diff --git a/drawable_resources/ic_star.svg b/drawable_resources/ic_star.svg
deleted file mode 100644
index 40c0577e59..0000000000
--- a/drawable_resources/ic_star.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
diff --git a/drawable_resources/ic_star_light_yellow.svg b/drawable_resources/ic_star_light_yellow.svg
deleted file mode 100644
index fd7532bd8b..0000000000
--- a/drawable_resources/ic_star_light_yellow.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg4"
-   sodipodi:docname="ic_star_light_yellow.svg"
-   inkscape:version="0.92.1 r15371"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\showSearchViewHeaders\src\main\res\drawable-mdpi\ic_star_light_yellow.png"
-   inkscape:export-xdpi="288"
-   inkscape:export-ydpi="288">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="-42.61017"
-     inkscape:cy="12"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="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"
-     id="path2"
-     style="fill:#ffcc00;fill-opacity:1;opacity:0.5" />
-</svg>
diff --git a/drawable_resources/ic_star_outline.svg b/drawable_resources/ic_star_outline.svg
deleted file mode 100644
index 638248c7c1..0000000000
--- a/drawable_resources/ic_star_outline.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
diff --git a/drawable_resources/ic_star_yellow.svg b/drawable_resources/ic_star_yellow.svg
deleted file mode 100644
index 40c0577e59..0000000000
--- a/drawable_resources/ic_star_yellow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
diff --git a/drawable_resources/ic_sync.svg b/drawable_resources/ic_sync.svg
deleted file mode 100644
index e0ed6c2248..0000000000
--- a/drawable_resources/ic_sync.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,18A6,6 0 0,1 6,12C6,11 6.25,10.03 6.7,9.2L5.24,7.74C4.46,8.97 4,10.43 4,12A8,8 0 0,0 12,20V23L16,19L12,15M12,4V1L8,5L12,9V6A6,6 0 0,1 18,12C18,13 17.75,13.97 17.3,14.8L18.76,16.26C19.54,15.03 20,13.57 20,12A8,8 0 0,0 12,4Z" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_tag.svg b/drawable_resources/ic_tag.svg
deleted file mode 100644
index fd1d1bf731..0000000000
--- a/drawable_resources/ic_tag.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M5.5,7A1.5,1.5 0 0,1 4,5.5A1.5,1.5 0 0,1 5.5,4A1.5,1.5 0 0,1 7,5.5A1.5,1.5 0 0,1 5.5,7M21.41,11.58L12.41,2.58C12.05,2.22 11.55,2 11,2H4C2.89,2 2,2.89 2,4V11C2,11.55 2.22,12.05 2.59,12.41L11.58,21.41C11.95,21.77 12.45,22 13,22C13.55,22 14.05,21.77 14.41,21.41L21.41,14.41C21.78,14.05 22,13.55 22,13C22,12.44 21.77,11.94 21.41,11.58Z" /></svg>
diff --git a/drawable_resources/ic_twitter.svg b/drawable_resources/ic_twitter.svg
deleted file mode 100644
index 046e359a19..0000000000
--- a/drawable_resources/ic_twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M22.46,6C21.69,6.35 20.86,6.58 20,6.69C20.88,6.16 21.56,5.32 21.88,4.31C21.05,4.81 20.13,5.16 19.16,5.36C18.37,4.5 17.26,4 16,4C13.65,4 11.73,5.92 11.73,8.29C11.73,8.63 11.77,8.96 11.84,9.27C8.28,9.09 5.11,7.38 3,4.79C2.63,5.42 2.42,6.16 2.42,6.94C2.42,8.43 3.17,9.75 4.33,10.5C3.62,10.5 2.96,10.3 2.38,10C2.38,10 2.38,10 2.38,10.03C2.38,12.11 3.86,13.85 5.82,14.24C5.46,14.34 5.08,14.39 4.69,14.39C4.42,14.39 4.15,14.36 3.89,14.31C4.43,16 6,17.26 7.89,17.29C6.43,18.45 4.58,19.13 2.56,19.13C2.22,19.13 1.88,19.11 1.54,19.07C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79C20.33,8.6 20.33,8.42 20.32,8.23C21.16,7.63 21.88,6.87 22.46,6Z" /></svg>
diff --git a/drawable_resources/ic_up.svg b/drawable_resources/ic_up.svg
deleted file mode 100644
index 7763331223..0000000000
--- a/drawable_resources/ic_up.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M7,15L12,10L17,15H7Z" /></svg>
diff --git a/drawable_resources/ic_user.svg b/drawable_resources/ic_user.svg
deleted file mode 100644
index cc0418fc5f..0000000000
--- a/drawable_resources/ic_user.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" height="16" width="16" version="1.1">
-    <path
-        d="m5 3.8c0 1.4 0.1 2.4 0.8 3.5 0.2 0.286 0.5 0.35 0.7 0.6 0.135 0.5 0.24 0.98 0.1 1.5-1.275 0.45-2.49 1-3.6 1.6-0.85 0.6-0.785 0.31-1 2.3-0.16 1.59 3.5 1.7 6 1.7s6.163-0.1 6-1.7c-0.215-2-0.23-1.71-1-2.3-1.1-0.654-2.45-1.167-3.6-1.6-0.15-0.56-0.04-0.973 0.1-1.5 0.235-0.25 0.5-0.363 0.7-0.6 0.69-0.885 0.8-2.425 0.8-3.5 0-1.59-1.43-2.8-3-2.8-1.75 0-3 1.43-3 2.8z"/>
-</svg>
diff --git a/drawable_resources/ic_view.svg b/drawable_resources/ic_view.svg
deleted file mode 100644
index 182bcc9460..0000000000
--- a/drawable_resources/ic_view.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z" /></svg>
diff --git a/drawable_resources/ic_view_list.svg b/drawable_resources/ic_view_list.svg
deleted file mode 100644
index 876e181e1d..0000000000
--- a/drawable_resources/ic_view_list.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M9,5V9H21V5M9,19H21V15H9M9,14H21V10H9M4,9H8V5H4M4,19H8V15H4M4,14H8V10H4V14Z" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_view_module.svg b/drawable_resources/ic_view_module.svg
deleted file mode 100644
index e777a11b2f..0000000000
--- a/drawable_resources/ic_view_module.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,5V11H21V5M10,11H15V5H10M16,18H21V12H16M10,18H15V12H10M4,18H9V12H4M4,11H9V5H4V11Z" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_warning.svg b/drawable_resources/ic_warning.svg
deleted file mode 100644
index f339fad81b..0000000000
--- a/drawable_resources/ic_warning.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z" /></svg>
\ No newline at end of file
diff --git a/drawable_resources/ic_web.svg b/drawable_resources/ic_web.svg
deleted file mode 100644
index b778b605e7..0000000000
--- a/drawable_resources/ic_web.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16.36,14C16.44,13.34 16.5,12.68 16.5,12C16.5,11.32 16.44,10.66 16.36,10H19.74C19.9,10.64 20,11.31 20,12C20,12.69 19.9,13.36 19.74,14M14.59,19.56C15.19,18.45 15.65,17.25 15.97,16H18.92C17.96,17.65 16.43,18.93 14.59,19.56M14.34,14H9.66C9.56,13.34 9.5,12.68 9.5,12C9.5,11.32 9.56,10.65 9.66,10H14.34C14.43,10.65 14.5,11.32 14.5,12C14.5,12.68 14.43,13.34 14.34,14M12,19.96C11.17,18.76 10.5,17.43 10.09,16H13.91C13.5,17.43 12.83,18.76 12,19.96M8,8H5.08C6.03,6.34 7.57,5.06 9.4,4.44C8.8,5.55 8.35,6.75 8,8M5.08,16H8C8.35,17.25 8.8,18.45 9.4,19.56C7.57,18.93 6.03,17.65 5.08,16M4.26,14C4.1,13.36 4,12.69 4,12C4,11.31 4.1,10.64 4.26,10H7.64C7.56,10.66 7.5,11.32 7.5,12C7.5,12.68 7.56,13.34 7.64,14M12,4.03C12.83,5.23 13.5,6.57 13.91,8H10.09C10.5,6.57 11.17,5.23 12,4.03M18.92,8H15.97C15.65,6.75 15.19,5.55 14.59,4.44C16.43,5.07 17.96,6.34 18.92,8M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" /></svg>
diff --git a/drawable_resources/icon-background.svg - Kopie.license b/drawable_resources/icon-background.svg - Kopie.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/icon-background.svg - Kopie.license	
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/image.svg b/drawable_resources/image.svg
deleted file mode 100644
index 922b72a546..0000000000
--- a/drawable_resources/image.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#969696" d="m1.5 2c-0.2 0-0.5 0.3-0.5 0.5v11c0 0.2 0.3 0.5 0.5 0.5h13c0.2 0 0.5-0.3 0.5-0.5v-11c0-0.2-0.3-0.5-0.5-0.5zm0.5 1h12v5l-1-1-3 4-3-3-4 4h-1zm2.5 1c-0.83 0-1.5 0.67-1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5z"/></svg>
diff --git a/drawable_resources/launcher.svg b/drawable_resources/launcher.svg
deleted file mode 100644
index bdcf0ea707..0000000000
--- a/drawable_resources/launcher.svg
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-  SVG template from the Android system icon style guide reference square icon
-  http://www.google.com/design/spec/style/icons.html#icons-product-icons
-
-  This file contains additional metadata for use with Inkscape, such as layers
-  and grids. This means that you can use the file directly with Inkscape, with
-  all elements should be visible and controllable in the UI. Additioanl
-  elements and attributes will anyways  be generated by Inkscape on the first
-  save. -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="launcher.svg"
-   inkscape:export-filename="C:\DEV\src\Android\nextcloud_android\res\mipmap-xxxhdpi\ic_launcher.png"
-   inkscape:export-xdpi="454.73999"
-   inkscape:export-ydpi="454.73999">
-  <metadata
-     id="metadata64">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <!--
-    We use a 48x48 grid to match the 48x48dp measure in the style guide.
-    The visible part of the icon will be smaller. -->
-  <defs
-     id="defs">
-    <linearGradient
-       id="linearGradient6098"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#82c9ff;stop-opacity:1;"
-         offset="0"
-         id="stop6100" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5678">
-      <!--
-        Linear gradient that defines colors stops for the 33% midpoint.
-        Edit the stop-color attributes to change the color of the gradient.
-        Used for the radial gradient in the finish. -->
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5680" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop5684" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5650"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#82c9ff;stop-opacity:1;"
-         offset="0"
-         id="stop5652" />
-    </linearGradient>
-    <clipPath
-       id="clipSilhouette">
-      <!--
-        This clip path is used to cut out any shadows and finishes outside
-        of the 152x152px (38x38dp) square keyline shape. -->
-      <rect
-         width="38"
-         height="38"
-         x="5"
-         y="5"
-         rx="3"
-         ry="3"
-         id="clipSilhouetteBounds" />
-    </clipPath>
-    <linearGradient
-       id="linearGradientWhiteMidpoint33">
-      <!--
-        Linear gradient that defines colors stops for the 33% midpoint.
-        Edit the stop-color attributes to change the color of the gradient.
-        Used for the radial gradient in the finish. -->
-      <stop
-         id="stopStart"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stopMidpoint"
-         style="stop-color:#ffffff;stop-opacity:0.5"
-         offset="0.33333" />
-      <stop
-         id="stopEnd"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       id="radialGradientFinish"
-       xlink:href="#linearGradientWhiteMidpoint33"
-       cx="0"
-       cy="0"
-       r="48"
-       gradientUnits="userSpaceOnUse">
-      <!--
-        The gradient used to fill the finishing layer of the icon with a
-        45º angle light. The color of the light is defined in
-        #linearGradientWhiteMidpoint33 -->
-    </radialGradient>
-    <filter
-       id="filterTint"
-       inkscape:label="Tint"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <!--
-        Filter used to produce the lighter edge at the top of material
-        elements.
-
-        Edit the flood-color attribute in the feFlood element below to
-        change the tint color.-->
-      <feFlood
-         flood-opacity="0.2"
-         flood-color="#ffffff"
-         result="floodTintColor"
-         id="feFlood13" />
-      <feOffset
-         in="SourceAlpha"
-         dx="0"
-         dy="1"
-         result="offsetAlpha"
-         id="feOffset15">
-        <!--
-          The style guideline metrics specify the y offset to be 1dp, but
-          looking at the example images, they seem to use 0.5dp or lower.
-          -->
-      </feOffset>
-      <feComposite
-         in="SourceAlpha"
-         in2="offsetAlpha"
-         operator="out"
-         result="edgeAlpha"
-         id="feComposite17" />
-      <feComposite
-         in="floodTintColor"
-         in2="edgeAlpha"
-         operator="in"
-         result="edgeColor"
-         id="feComposite19" />
-      <feBlend
-         in="edgeColor"
-         in2="SourceGraphic"
-         mode="normal"
-         result="tint"
-         id="feBlend21" />
-    </filter>
-    <filter
-       id="filterShade"
-       inkscape:label="Shade"
-       height="1"
-       width="1"
-       y="0"
-       x="0">
-      <!--
-        Filter used to produce the darker edge at the bottom of material
-        elements.
-
-        Edit the flood-color attribute in the feFlood element below to
-        change the shade color. -->
-      <feFlood
-         flood-color="#212121"
-         flood-opacity="0.2"
-         result="floodShadeColor"
-         id="feFlood24" />
-      <feOffset
-         in="SourceAlpha"
-         dy="-1"
-         dx="0"
-         result="offsetAlpha"
-         id="feOffset26" />
-      <feComposite
-         in="SourceAlpha"
-         in2="offsetAlpha"
-         operator="out"
-         result="edgeAlpha"
-         id="feComposite28" />
-      <feComposite
-         in="floodShadeColor"
-         in2="edgeAlpha"
-         operator="in"
-         result="edgeColor"
-         id="feComposite30" />
-      <feBlend
-         in="edgeColor"
-         in2="SourceGraphic"
-         mode="normal"
-         result="shade"
-         id="feBlend32" />
-    </filter>
-    <filter
-       id="filterShadow"
-       inkscape:label="Drop Shadow"
-       width="2"
-       height="2"
-       x="-0.5"
-       y="-0.5">
-      <!--
-        Filter used to produce the blurred shadow below material elements.
-
-        Edit the flood-color attribute in the feFlood element below to
-        change the shadow color. To edit the shadow size and offset, change
-        the attributes in the feGaussianBlur and feOffset elements. -->
-      <feFlood
-         flood-opacity="0.2"
-         flood-color="#212121"
-         result="floodShadowColor"
-         id="feFlood35" />
-      <feComposite
-         in="floodShadowColor"
-         in2="SourceAlpha"
-         operator="in"
-         result="shadow"
-         id="feComposite37" />
-      <feGaussianBlur
-         in="shadow"
-         stdDeviation="1.5"
-         result="bluredShadow"
-         id="feGaussianBlur39" />
-      <feOffset
-         in="bluredShadow"
-         dx="0"
-         dy="1.5"
-         result="offsetShadow"
-         id="feOffset41" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offsetShadow"
-         operator="over"
-         result="dropShadow"
-         id="feComposite43" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     showgrid="true"
-     id="namedview45"
-     inkscape:zoom="13.906433"
-     inkscape:cx="4.0439432"
-     inkscape:cy="29.818644"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="materialBackground">
-    <!--
-      This defines the grids shown in Inkscape.
-      These won't affect the result of the render. -->
-    <inkscape:grid
-       type="xygrid"
-       id="gridMain"
-       originx="3"
-       originy="3"
-       empspacing="7"
-       dotted="false"
-       enabled="true" />
-    <inkscape:grid
-       type="axonomgrid"
-       id="gridDiagonal"
-       units="px"
-       empspacing="1"
-       gridanglex="45"
-       gridanglez="45"
-       spacingy="48"
-       enabled="true" />
-  </sodipodi:namedview>
-  <!--
-    The following groups contain the actual visible parts of the image.
-    The groups should be clipped with the silhouette path so that any shadows
-    and finishes won't bleed over the edges.
-
-    The order of the elements in this group defines how the elements overlap
-    visually, with the first ones being rendered at the bottom. -->
-  <g
-     id="materialBackground"
-     inkscape:groupmode="layer"
-     inkscape:label="Material background"
-     clip-path="url(#clipSilhouette)">
-    <!--
-      We need to use nested groups to apply multiple filters on a
-      single element. -->
-    <g
-       style="filter:url(#filterShade);fill-opacity:0.94117647;fill:#0082cf;stroke:none;stroke-opacity:1"
-       id="g50">
-      <rect
-         style="fill:#0082cf;filter:url(#filterTint);fill-opacity:0.94117647;stroke:none;stroke-opacity:1"
-         width="38"
-         height="38"
-         x="5"
-         y="5"
-         rx="3"
-         ry="3"
-         id="rect52" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;block-progression:tb;white-space:normal;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#ffffff;fill-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;enable-background:accumulate"
-       d="m 24.069078,16.547649 c -3.53383,3.31e-4 -6.501209,2.357911 -7.407987,5.529718 -0.791338,-1.6964 -2.533238,-2.898709 -4.557066,-2.898709 -2.7549289,3.04e-4 -5.0200633,2.207427 -5.0203459,4.891865 -5.371e-4,2.684935 2.26488,4.892417 5.0203459,4.892966 2.024082,-2.38e-4 3.764767,-1.203218 4.556219,-2.899811 0.906325,3.172195 3.87472,5.530271 7.409118,5.530547 3.51461,2.64e-4 6.467573,-2.332215 7.392439,-5.477116 0.804172,1.665249 2.519305,2.846106 4.520038,2.84638 2.756004,4.7e-4 5.021761,-2.207369 5.021478,-4.892966 -2.66e-4,-2.684934 -2.265899,-4.892415 -5.021478,-4.891865 -2.000705,2.26e-4 -3.716713,1.180966 -4.520885,2.846382 -0.925433,-3.145204 -3.877265,-5.477667 -7.391876,-5.477391 z m 0,2.871719 c 2.653993,-1.72e-4 4.773868,2.064984 4.77415,4.651155 1.32e-4,2.586339 -2.119959,4.652257 -4.77415,4.651982 -2.653991,-2.51e-4 -4.7733,-2.066003 -4.7733,-4.651982 2.78e-4,-2.58573 2.119564,-4.650879 4.7733,-4.651155 z m -11.965053,2.630733 c 1.162587,1.31e-4 2.073152,0.887378 2.073294,2.020202 2.05e-4,1.133073 -0.910453,2.021082 -2.073294,2.02122 -1.162839,-1.31e-4 -2.073489,-0.888147 -2.073291,-2.02122 1.33e-4,-1.132824 0.910679,-2.020091 2.073291,-2.020202 z m 23.877531,0 c 1.162812,-1.97e-4 2.074168,0.887131 2.07431,2.020202 2.77e-4,1.13332 -0.911187,2.021414 -2.07431,2.02122 -1.162868,-1.31e-4 -2.073518,-0.888147 -2.07332,-2.02122 1.32e-4,-1.132824 0.910736,-2.020091 2.07332,-2.020202 z"
-       id="path6" />
-  </g>
-  <g
-     id="materialForeground"
-     inkscape:groupmode="layer"
-     inkscape:label="Material foreground"
-     clip-path="url(#clipSilhouette)" />
-  <g
-     id="finish"
-     inkscape:groupmode="layer"
-     inkscape:label="Finish"
-     clip-path="url(#clipSilhouette)" />
-</svg>
diff --git a/drawable_resources/link.svg b/drawable_resources/link.svg
deleted file mode 100644
index 7bfbe1eb2d..0000000000
--- a/drawable_resources/link.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#969696" d="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.4zm0.8 0.9c1.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.1zm-2.6 0.1s0.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.6zm-1.2 8.2c0.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"/></svg>
diff --git a/drawable_resources/location.svg b/drawable_resources/location.svg
deleted file mode 100644
index 5e63f7563c..0000000000
--- a/drawable_resources/location.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><circle stroke-width="2" stroke="#969696" cy="6" cx="8" r="4" fill="none"/><path fill="#969696" d="m4 9h8l-4 6z"/></svg>
diff --git a/drawable_resources/logo.svg.license b/drawable_resources/logo.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/logo.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/logo_dev.svg.license b/drawable_resources/logo_dev.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/logo_dev.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/logo_qa.svg.license b/drawable_resources/logo_qa.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/logo_qa.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/logout.svg b/drawable_resources/logout.svg
deleted file mode 100644
index 2e15912ff6..0000000000
--- a/drawable_resources/logout.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="25.6"
-   viewBox="0 0 24 24"
-   width="25.6"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="logout.svg"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   style="fill:#000000"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\logoutButton\src\main\res\drawable-mdpi\logout.png">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="13.906433"
-     inkscape:cx="-2.7503911"
-     inkscape:cy="14.502003"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M 0,0 H 24 V 24 H 0 Z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:none" />
-  <path
-     d="m 10.09,15.59 1.41,1.41 5,-5 -5,-5 -1.41,1.41 2.58,2.59 H 3 v 2 h 9.67 z M 19,3 H 5 C 3.89,3 3,3.9 3,5 V 9 H 5 V 5 H 19 V 19 H 5 V 15 H 3 v 4 c 0,1.1 0.89,2 2,2 h 14 c 1.1,0 2,-0.9 2,-2 V 5 C 21,3.9 20.1,3 19,3 Z"
-     id="path6"
-     style="fill:#757575;fill-opacity:1"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/drawable_resources/nav_community.svg b/drawable_resources/nav_community.svg
deleted file mode 100644
index 96911a3c6b..0000000000
--- a/drawable_resources/nav_community.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" viewBox="0 0 24 24">
-    <path
-        d="M1.5,4V5.5C1.5,9.65 3.71,13.28 7,15.3V20H22V18C22,15.34 16.67,14 14,14C14,14 13.83,14 13.75,14C9,14 5,10 5,5.5V4M14,4A4,4 0 0,0 10,8A4,4 0 0,0 14,12A4,4 0 0,0 18,8A4,4 0 0,0 14,4Z" />
-</svg>
diff --git a/drawable_resources/nav_logout.svg b/drawable_resources/nav_logout.svg
deleted file mode 100644
index 4fb59a8f83..0000000000
--- a/drawable_resources/nav_logout.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,3H5C3.89,3 3,3.89 3,5V9H5V5H19V19H5V15H3V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3M10.08,15.58L11.5,17L16.5,12L11.5,7L10.08,8.41L12.67,11H3V13H12.67L10.08,15.58Z" /></svg>
diff --git a/drawable_resources/nav_notifications.svg b/drawable_resources/nav_notifications.svg
deleted file mode 100644
index fa2498af34..0000000000
--- a/drawable_resources/nav_notifications.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
-    <path d="M8,2C7.448,2 7,2.448 7,3C7,3.047 7.021,3.087 7.027,3.133C5.291,3.569 4,5.128 4,7L4,9L3,10L3,11L13,11L13,10L12,9L12,7C12,5.128 10.709,3.569 8.973,3.133C8.979,3.087 9,3.047 9,3C9,2.448 8.552,2 8,2ZM6,12C6,13.105 6.895,14 8,14C9.105,14 10,13.105 10,12L6,12Z" style="fill:rgb(117,117,117);fill-rule:nonzero;"/>
-</svg>
diff --git a/drawable_resources/nav_on_device.svg b/drawable_resources/nav_on_device.svg
deleted file mode 100644
index d9e3e51bf7..0000000000
--- a/drawable_resources/nav_on_device.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="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" /></svg>
diff --git a/drawable_resources/nav_settings.svg b/drawable_resources/nav_settings.svg
deleted file mode 100644
index 8ccde63e6b..0000000000
--- a/drawable_resources/nav_settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" /></svg>
diff --git a/drawable_resources/nav_synced_folders.svg b/drawable_resources/nav_synced_folders.svg
deleted file mode 100644
index 1f539c2b51..0000000000
--- a/drawable_resources/nav_synced_folders.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M14,13V17H10V13H7L12,8L17,13M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.03Z" /></svg>
diff --git a/drawable_resources/nextcloud-logo.svg.license b/drawable_resources/nextcloud-logo.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/nextcloud-logo.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/nextcloud-splash-logo.svg.license b/drawable_resources/nextcloud-splash-logo.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/nextcloud-splash-logo.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/no_network.svg b/drawable_resources/no_network.svg
deleted file mode 100644
index 0a571d3f12..0000000000
--- a/drawable_resources/no_network.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,17H21V9H19M19,21H21V19H19M1,21H17V7H21V1" /></svg>
diff --git a/drawable_resources/notification-icon.svg.license b/drawable_resources/notification-icon.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/notification-icon.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/post_add.svg b/drawable_resources/post_add.svg
deleted file mode 100644
index 95439563aa..0000000000
--- a/drawable_resources/post_add.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24"
-    enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="Bounding_Box">
-	<rect fill="none" width="24" height="24" />
-</g>
-    <g id="Flat">
-	<g id="ui_x5F_spec_x5F_header_copy_2">
-	</g>
-        <g>
-		<path d="M17,19.22H5V7h7V5H5C3.9,5,3,5.9,3,7v12c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2v-7h-2V19.22z" />
-            <path d="M19,2h-2v3h-3c0.01,0.01,0,2,0,2h3v2.99c0.01,0.01,2,0,2,0V7h3V5h-3V2z" />
-            <rect x="7" y="9" width="8" height="2" />
-            <polygon points="7,12 7,14 15,14 15,12 12,12 		" />
-            <rect x="7" y="15" width="8" height="2" />
-	</g>
-</g>
-</svg>
diff --git a/drawable_resources/settings.svg b/drawable_resources/settings.svg
deleted file mode 100644
index e2032b87f8..0000000000
--- a/drawable_resources/settings.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" width="16" version="1.1">
-    <path opacity=".5"
-          d="m6.94 0.5c-0.24 0-0.44 0.2-0.44 0.44v1.26c-0.5 0.14-1.05 0.35-1.53 0.65l-0.91-0.91c-0.16-0.18-0.46-0.19-0.62 0l-1.5 1.5c-0.18 0.17-0.18 0.46 0 0.62l0.91 0.91c-0.284 0.48-0.5 1-0.65 1.53h-1.26c-0.24 0-0.44 0.2-0.44 0.44v2.12c0 0.25 0.19 0.44 0.44 0.44h1.26c0.14 0.54 0.36 1.05 0.65 1.53l-0.91 0.91c-0.18 0.17-0.18 0.45 0 0.62l1.5 1.5c0.18 0.18 0.46 0.18 0.62 0l0.91-0.91c0.48 0.285 1 0.5 1.53 0.65v1.26c0 0.25 0.2 0.44 0.44 0.44h2.12c0.24 0 0.45-0.2 0.44-0.44v-1.26c0.54-0.14 1.05-0.36 1.53-0.65l0.91 0.91c0.17 0.18 0.45 0.18 0.62 0l1.5-1.5c0.18-0.17 0.18-0.45 0-0.62l-0.91-0.91c0.29-0.48 0.5-1 0.65-1.53h1.26c0.24 0 0.45-0.2 0.44-0.44v-2.12c0-0.24-0.2-0.44-0.44-0.44h-1.26c-0.14-0.54-0.36-1.05-0.65-1.53l0.91-0.91c0.18-0.17 0.18-0.45 0-0.62l-1.5-1.5c-0.17-0.18-0.45-0.18-0.62 0l-0.91 0.91c-0.48-0.29-1-0.5-1.53-0.65v-1.26c0-0.24-0.2-0.44-0.44-0.44h-2.12zm1.06 4a3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1 -3.5 3.5 3.5 3.5 0 0 1 -3.5 -3.5 3.5 3.5 0 0 1 3.5 -3.5z"/>
-</svg>
diff --git a/drawable_resources/shared_via_users.svg b/drawable_resources/shared_via_users.svg
deleted file mode 100644
index 51017f6ed9..0000000000
--- a/drawable_resources/shared_via_users.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="shared_via_users.svg"
-   inkscape:version="0.92.0 r15299"
-   inkscape:export-filename="C:\DEV\src\Android\Nextcloud\greySharedIndicator\res\drawable-xxxhdpi\shared_via_users.png"
-   inkscape:export-xdpi="384"
-   inkscape:export-ydpi="384">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-10.20339"
-     inkscape:cy="8"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M12.228 1a2.457 2.457 0 0 0-2.46 2.454c0 .075.01.15.016.224L5.05 6.092a2.445 2.445 0 0 0-1.596-.586A2.453 2.453 0 0 0 1 7.96a2.453 2.453 0 0 0 2.454 2.455 2.45 2.45 0 0 0 1.46-.477l4.865 2.474c-.004.044-.01.09-.01.134a2.457 2.457 0 1 0 .804-1.818l-4.696-2.4c.02-.123.035-.25.035-.378 0-.072-.01-.144-.015-.214l4.74-2.414A2.457 2.457 0 1 0 12.228.99z"
-     id="path2"
-     style="fill:#757575;fill-opacity:1;stroke:#ffffff;stroke-opacity:1;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.8" />
-</svg>
diff --git a/drawable_resources/size_asc.svg.license b/drawable_resources/size_asc.svg.license
new file mode 100644
index 0000000000..5ac2f93f33
--- /dev/null
+++ b/drawable_resources/size_asc.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+SPDX-FileCopyrightText: 2018-2024 Google LLC
+SPDX-License-Identifier: Apache-2.0
diff --git a/drawable_resources/size_desc.svg.license b/drawable_resources/size_desc.svg.license
new file mode 100644
index 0000000000..5ac2f93f33
--- /dev/null
+++ b/drawable_resources/size_desc.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger>
+SPDX-FileCopyrightText: 2018-2024 Google LLC
+SPDX-License-Identifier: Apache-2.0
diff --git a/drawable_resources/state-error.svg.license b/drawable_resources/state-error.svg.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/state-error.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/state-offline.svg.license b/drawable_resources/state-offline.svg.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/state-offline.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/state-ok.svg.license b/drawable_resources/state-ok.svg.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/state-ok.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/state-pause.svg.license b/drawable_resources/state-pause.svg.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/state-pause.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/state-sync.svg.license b/drawable_resources/state-sync.svg.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/state-sync.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/state-warning.svg.license b/drawable_resources/state-warning.svg.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/state-warning.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/text-calendar.svg b/drawable_resources/text-calendar.svg
deleted file mode 100644
index 2fdfde6796..0000000000
--- a/drawable_resources/text-calendar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16"><path fill="#969696" d="m4 1c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm8 0c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm-6.5 2v1c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-0.9375c-0.8841 0.227-1.5 1.0247-1.5 1.9375v8c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-8c0-0.9128-0.61588-1.7105-1.5-1.9375v0.9375c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-1zm7.5 5v5h-10v-5z"/></svg>
diff --git a/drawable_resources/text-code.svg b/drawable_resources/text-code.svg
deleted file mode 100644
index 21bf29576a..0000000000
--- a/drawable_resources/text-code.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16" version="1.1"><g stroke="#969696" stroke-width="2" fill="none"><path d="m6.3 3.714-4.3716 4.286 4.3716 4.286"/><path d="m9.7 12.286 4.372-4.286-4.372-4.286"/></g></svg>
diff --git a/drawable_resources/text-vcard.svg b/drawable_resources/text-vcard.svg
deleted file mode 100644
index 86c3d4a413..0000000000
--- a/drawable_resources/text-vcard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 16 16" height="16" width="16" version="1.1"><path fill="#969696" d="m10 1c-1.75 0-3 1.43-3 2.8 0 1.4 0.1 2.4 0.8 3.5 0.2 0.29 0.5 0.35 0.7 0.6 0.135 0.5 0.24 1 0.1 1.5-0.28 0.1-0.525 0.22-0.8 0.33-0.085-0.15-0.23-0.2-0.47-0.4-0.73-0.44-1.56-0.75-2.33-1.04-0.1-0.37-0.1-0.65 0-1 0.156-0.166 0.37-0.27 0.5-0.43 0.46-0.6 0.5-1.654 0.5-2.37 0-1.06-0.954-1.9-2-1.9-1.17 0-2 1-2 1.9 0 0.93 0.034 1.64 0.5 2.37 0.13 0.2 0.367 0.26 0.5 0.43 0.1 0.33 0.1 0.654 0 1-0.85 0.3-1.6 0.64-2.34 1.04-0.57 0.4-0.52 0.205-0.66 1.53-0.11 1.06 2.335 1.13 4 1.13 0.06 0 0.11 0 0.17 0-0.054 0.274-0.1 0.63-0.17 1.3-0.16 1.59 3.5 1.7 6 1.7s6.16-0.1 6-1.7c-0.215-2-0.23-1.71-1-2.3-1.1-0.654-2.45-1.17-3.6-1.6-0.15-0.56-0.04-0.97 0.1-1.5 0.235-0.25 0.5-0.36 0.7-0.6 0.7-0.885 0.8-2.425 0.8-3.5 0-1.6-1.43-2.8-3-2.8z"/></svg>
diff --git a/drawable_resources/text.svg b/drawable_resources/text.svg
deleted file mode 100644
index 57c2b1f572..0000000000
--- a/drawable_resources/text.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#969696" d="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.5zm1.5 2h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/></svg>
diff --git a/drawable_resources/uploads.svg b/drawable_resources/uploads.svg
deleted file mode 100644
index f3a93f1eb8..0000000000
--- a/drawable_resources/uploads.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:cc="http://creativecommons.org/ns#"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-    version="1.1"
-    width="25.6"
-    height="25.6"
-    viewBox="0 0 24 24"
-    id="svg2"
-    inkscape:version="0.92.1 r15371"
-    sodipodi:docname="ic_list_empty_upload.svg"
-    inkscape:export-filename="C:\DEV\src\Android\Nextcloud\colorFolderNew\src\main\res\drawable-mdpi\ic_list_empty_upload.png"
-    inkscape:export-xdpi="270"
-    inkscape:export-ydpi="270">
-    <metadata
-        id="metadata10">
-        <rdf:RDF>
-            <cc:Work
-                rdf:about="">
-                <dc:format>image/svg+xml</dc:format>
-                <dc:type
-                    rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-            </cc:Work>
-        </rdf:RDF>
-    </metadata>
-    <defs
-        id="defs8"/>
-    <sodipodi:namedview
-        pagecolor="#ffffff"
-        bordercolor="#666666"
-        borderopacity="1"
-        objecttolerance="10"
-        gridtolerance="10"
-        guidetolerance="10"
-        inkscape:pageopacity="0"
-        inkscape:pageshadow="2"
-        inkscape:window-width="1920"
-        inkscape:window-height="1005"
-        id="namedview6"
-        showgrid="false"
-        inkscape:zoom="9.8333333"
-        inkscape:cx="14.338983"
-        inkscape:cy="16.067797"
-        inkscape:window-x="-9"
-        inkscape:window-y="-9"
-        inkscape:window-maximized="1"
-        inkscape:current-layer="svg2"/>
-    <path
-        d="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"
-        id="path4"
-        style="fill:#888888;fill-opacity:1;opacity:0.5"
-        inkscape:connector-curvature="0"/>
-</svg>
diff --git a/drawable_resources/user-status-away.svg.license b/drawable_resources/user-status-away.svg.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/user-status-away.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/user-status-dnd.svg.license b/drawable_resources/user-status-dnd.svg.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/user-status-dnd.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/user-status-invisible.svg.license b/drawable_resources/user-status-invisible.svg.license
new file mode 100644
index 0000000000..d33ae28ba0
--- /dev/null
+++ b/drawable_resources/user-status-invisible.svg.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH
+SPDX-FileCopyrightText: 2018-2024 Tobias Kaminsky <tobias@kaminsky.me>
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/video.svg b/drawable_resources/video.svg
deleted file mode 100644
index f7230cc5f3..0000000000
--- a/drawable_resources/video.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#969696" d="m1.5 2c-0.2 0.05-0.5 0.29-0.5 0.5v11c0 0.23 0.274 0.5 0.5 0.5h13c0.34 0 0.5-0.26 0.5-0.5v-11c0-0.34-0.249-0.5-0.5-0.5zm0.5 1h12v10h-12zm3 2v6l6-3z"/></svg>
diff --git a/drawable_resources/whats_new_accounts.svg.license b/drawable_resources/whats_new_accounts.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_accounts.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_auto_upload.svg.license b/drawable_resources/whats_new_auto_upload.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_auto_upload.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_device_credentials.svg.license b/drawable_resources/whats_new_device_credentials.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_device_credentials.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_end_to_end_encryption.svg.license b/drawable_resources/whats_new_end_to_end_encryption.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_end_to_end_encryption.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_files.svg.license b/drawable_resources/whats_new_files.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_files.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_fingerprint.svg.license b/drawable_resources/whats_new_fingerprint.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_fingerprint.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_ipv6.svg.license b/drawable_resources/whats_new_ipv6.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_ipv6.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_notifications.svg.license b/drawable_resources/whats_new_notifications.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_notifications.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_resized_images.svg.license b/drawable_resources/whats_new_resized_images.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_resized_images.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_search.svg.license b/drawable_resources/whats_new_search.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_search.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/whats_new_theming.svg.license b/drawable_resources/whats_new_theming.svg.license
new file mode 100644
index 0000000000..44627ac066
--- /dev/null
+++ b/drawable_resources/whats_new_theming.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/drawable_resources/x-office-analytics.svg b/drawable_resources/x-office-analytics.svg
deleted file mode 100644
index fc61029c4b..0000000000
--- a/drawable_resources/x-office-analytics.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <path d="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" style="fill:rgb(73,171,234);fill-rule:nonzero;"/>
-</svg>
diff --git a/drawable_resources/x-office-document.svg b/drawable_resources/x-office-document.svg
deleted file mode 100644
index d19fa659a6..0000000000
--- a/drawable_resources/x-office-document.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#49abea" d="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.5zm1.5 2h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/></svg>
diff --git a/drawable_resources/x-office-presentation.svg b/drawable_resources/x-office-presentation.svg
deleted file mode 100644
index 523aa38ec2..0000000000
--- a/drawable_resources/x-office-presentation.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16" version="1.1"><path fill="#f0965f" d="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.5zm0.5 3h12v6h-12z"/></svg>
diff --git a/drawable_resources/x-office-spreadsheet.svg b/drawable_resources/x-office-spreadsheet.svg
deleted file mode 100644
index b7006a98ea..0000000000
--- a/drawable_resources/x-office-spreadsheet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#9abd4e" d="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.5zm1.5 3h2v2h-2v-2zm3 0h5v2h-5v-2zm-3 3h2v2h-2v-2zm3 0h5v2h-5v-2zm-3 3h2v2h-2v-2zm3 0h5v2h-5v-2z"/></svg>