diff --git a/.reuse/dep5 b/.reuse/dep5
index dd71f7078..2731ff7f9 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -3,10 +3,14 @@ Upstream-Name: Nextcloud Talk - Android Client
 Upstream-Contact: Nextcloud Android team <android@nextcloud.com>
 Source: https://github.com/nextcloud/talk-android
 
-Files: app/src/main/res/values-*/strings.xml */.gitignore .idea/* scripts/analysis/findbugs-results.txt scripts/analysis/lint-results.txt app/src/test/resources/robolectric.properties app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker fastlane/metadata/* app/src/main/res/mipmap-*dpi/ic_launcher.png app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/*.json app/src/generic/fastlane/metadata/android/*/full_description.txt
+Files: app/src/main/res/values-*/strings.xml */.gitignore .idea/* scripts/analysis/findbugs-results.txt scripts/analysis/lint-results.txt app/src/test/resources/robolectric.properties app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker fastlane/metadata/* app/src/*/res/mipmap-*dpi/ic_launcher.png app/src/*/ic_launcher-web.png app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/*.json app/src/generic/fastlane/metadata/android/*/full_description.txt
 Copyright: 2017-2024 Nextcloud GmbH and Nextcloud contributors
 License: GPL-3.0-or-later
 
 Files: app/src/main/res/raw/tr110_1_kap8_3_freiton1.ogg
 Copyright: 2007 arvedkrynil
 License: CC-BY-SA-3.0
+
+Files: app/src/main/res/raw/librem_by_feandesign_call.ogg app/src/main/res/raw/librem_by_feandesign_message.ogg
+Copyright: Feandesign
+License: CC0-1.0
diff --git a/README.md b/README.md
index b050b4003..4a3e362a9 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ If you have problems to receive talk notifications on your android phone, please
 
 ### Ringtones :bell:
 
-- [Ringtones by Librem](https://soundcloud.com/feandesign/sets/librem-5-sounds) 
+- [Ringtones by Librem](https://developer.puri.sm/licenses/Librem5/Birch/sound-theme-librem5.html) 
   author: [feandesign](https://soundcloud.com/feandesign)
 - [Telefon-Freiton in Deutschland nach DTAG 1 TR 110-1, Kap. 8.3](https://commons.wikimedia.org/wiki/File:1TR110-1_Kap8.3_Freiton1.ogg)
   author: arvedkrynil
diff --git a/app/src/main/assets/leafletMapMessagePreview.html.license b/app/src/main/assets/leafletMapMessagePreview.html.license
new file mode 100644
index 000000000..fb33390d1
--- /dev/null
+++ b/app/src/main/assets/leafletMapMessagePreview.html.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021 Marcel Hibbe <dev@mhibbe.de>
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantDisplayItem.java b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantDisplayItem.java
index 806b1d542..0eae25ac9 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantDisplayItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantDisplayItem.java
@@ -1,3 +1,11 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-FileCopyrightText: 2022 Daniel Calviño Sánchez <danxuliu@gmail.com>
+ * SPDX-FileCopyrightText: 2021 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.adapters;
 
 import android.os.Handler;
@@ -169,5 +177,3 @@ public class ParticipantDisplayItem {
                 '}';
     }
 }
-
-
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java
index cd1497cdc..38f334122 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/ParticipantsAdapter.java
@@ -1,3 +1,10 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2021-2023 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-FileCopyrightText: 2022 Daniel Calviño Sánchez <danxuliu@gmail.com>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.adapters;
 
 import android.content.Context;
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/CommonMessageInterface.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/CommonMessageInterface.kt
index 34116479b..bad6960d3 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/CommonMessageInterface.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/CommonMessageInterface.kt
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2022 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.adapters.messages
 
 import com.nextcloud.talk.models.json.chat.ChatMessage
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageInterface.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageInterface.kt
index a7cfafb04..4833a50b0 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageInterface.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageInterface.kt
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2022 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.adapters.messages
 
 import com.nextcloud.talk.models.json.chat.ChatMessage
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageInterface.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageInterface.kt
index 8b4ce5bc5..8258921d8 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageInterface.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageInterface.kt
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2023 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.adapters.messages
 
 import com.nextcloud.talk.models.json.chat.ChatMessage
diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt
index c5c5dcef0..1a99e2c1f 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt
@@ -1,3 +1,11 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2024 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-FileCopyrightText: 2023 Julius Linus <juliuslinus1@gmail.com>
+ * SPDX-FileCopyrightText: 2022 Tim Krüger <t@timkrueger.me>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.conversationinfo
 
 import android.content.Intent
diff --git a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt
index c239cd5af..410c6c7e2 100644
--- a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt
@@ -1,3 +1,10 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2023-2024 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.models.domain
 
 import com.nextcloud.talk.models.json.conversations.Conversation
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt
index d1dd87184..127243235 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt
@@ -1,3 +1,10 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2022 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-FileCopyrightText: 2022 Tim Krüger <t@timkrueger.me>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.models.json.status
 
 import android.os.Parcelable
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt
index 679c0c5a1..87b061c04 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2022 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.models.json.status.predefined
 
 import android.os.Parcelable
diff --git a/app/src/main/java/com/nextcloud/talk/repositories/unifiedsearch/UnifiedSearchRepository.kt b/app/src/main/java/com/nextcloud/talk/repositories/unifiedsearch/UnifiedSearchRepository.kt
index a24e86bdd..3f0d730e9 100644
--- a/app/src/main/java/com/nextcloud/talk/repositories/unifiedsearch/UnifiedSearchRepository.kt
+++ b/app/src/main/java/com/nextcloud/talk/repositories/unifiedsearch/UnifiedSearchRepository.kt
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.repositories.unifiedsearch
 
 import com.nextcloud.talk.models.domain.SearchMessageEntry
diff --git a/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItem.kt b/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItem.kt
index 7575ae2bb..2f22c9bab 100644
--- a/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItem.kt
+++ b/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItem.kt
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2022 Tim Krüger <t@timkrueger.me>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.shareditems.model
 
 interface SharedItem {
diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt
index d464e8984..4a23477a3 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2023-2024 Julius Linus <juliuslinus1@gmail.com>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.translate.repositories
 
 import com.nextcloud.talk.translate.repositories.model.Language
diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepositoryImpl.kt
index 8828f33ab..9c5904bae 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepositoryImpl.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepositoryImpl.kt
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2023 Julius Linus1 <juliuslinus1@gmail.com>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.translate.repositories
 
 import com.nextcloud.talk.api.NcApi
diff --git a/app/src/main/java/com/nextcloud/talk/translate/viewmodels/TranslateViewModel.kt b/app/src/main/java/com/nextcloud/talk/translate/viewmodels/TranslateViewModel.kt
index 323a9aad1..74bcdb910 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/viewmodels/TranslateViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/viewmodels/TranslateViewModel.kt
@@ -1,3 +1,11 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2024 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-FileCopyrightText: 2023 Julius Linus1 <juliuslinus1@gmail.com>
+ * SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.translate.viewmodels
 
 import android.util.Log
diff --git a/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt b/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt
index 066d7eb9f..2c796df63 100644
--- a/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt
+++ b/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt
@@ -1,3 +1,10 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2022-2024 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.upload.normal
 
 import android.content.Context
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ContactUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ContactUtils.kt
index 98e7e1d63..879ca078e 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ContactUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/ContactUtils.kt
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2021 Marcel Hibbe <dev@mhibbe.de>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.utils
 
 import android.content.Context
diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/Globals.java b/app/src/main/java/com/nextcloud/talk/webrtc/Globals.java
index 317e2939e..a658abc61 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/Globals.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/Globals.java
@@ -1,3 +1,10 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ * SPDX-FileCopyrightText: 2022 Tim Krüger <t@timkrueger.me>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package com.nextcloud.talk.webrtc;
 
 public class Globals {
diff --git a/app/src/main/res/animator/appbar_elevation_off.xml b/app/src/main/res/animator/appbar_elevation_off.xml
index cb24f4936..cafe2f275 100644
--- a/app/src/main/res/animator/appbar_elevation_off.xml
+++ b/app/src/main/res/animator/appbar_elevation_off.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="PrivateResource">
diff --git a/app/src/main/res/animator/appbar_elevation_on.xml b/app/src/main/res/animator/appbar_elevation_on.xml
index 6bd52cf3b..75ec616f6 100644
--- a/app/src/main/res/animator/appbar_elevation_on.xml
+++ b/app/src/main/res/animator/appbar_elevation_on.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="PrivateResource">
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index d7daba7d7..2434d1e03 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,6 +1,7 @@
 <!--
   ~ Nextcloud Talk - Android Client
   ~
+  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors~
   ~ SPDX-FileCopyrightText: 2017-2019 Mario Danic <mario@lovelyhq.com>
   ~ SPDX-License-Identifier: GPL-3.0-or-later
 -->
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 9bdffd59c..e8d9056b6 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,4 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2024 Parneet Guraya <gurayaparneet@gmail.com>~
+  ~ SPDX-FileCopyrightText: 2023 Marcel Hibbe <dev@mhibbe.de>
+  ~ SPDX-FileCopyrightText: 2023 Julius Linus <juliuslinus1@gmail.com>
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2017 Mario Danic <mario@lovelyhq.com>
+  ~ SPDX-License-Identifier: GPL-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_message_view.xml b/app/src/main/res/layout/edit_message_view.xml
index 297783813..263e3fe55 100644
--- a/app/src/main/res/layout/edit_message_view.xml
+++ b/app/src/main/res/layout/edit_message_view.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
+  ~ SPDX-License-Identifier: GPL-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/item_guest_access_settings.xml b/app/src/main/res/layout/item_guest_access_settings.xml
index ee60abfe0..c25c33e61 100644
--- a/app/src/main/res/layout/item_guest_access_settings.xml
+++ b/app/src/main/res/layout/item_guest_access_settings.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 Julius Linus <juliuslinus1@gmail.com>
+  ~ SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/guest_access_settings"
@@ -112,7 +119,6 @@
                     android:orientation="horizontal"
                     android:background="?android:attr/selectableItemBackground">
 
-
                     <ImageView
                         android:layout_width="24dp"
                         android:layout_height="40dp"
@@ -128,7 +134,6 @@
                         android:text="@string/nc_guest_access_share_link"
                         android:textSize="@dimen/headline_text_size" />
 
-
                 </LinearLayout>
 
                 <LinearLayout
@@ -142,7 +147,6 @@
                     android:orientation="horizontal"
                     android:background="?android:attr/selectableItemBackground">
 
-
                     <ImageView
                         android:layout_width="24dp"
                         android:layout_height="40dp"
@@ -158,6 +162,5 @@
                         android:text="@string/nc_guest_access_resend_invitations"
                         android:textSize="@dimen/headline_text_size" />
 
-
                 </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_notification_settings.xml b/app/src/main/res/layout/item_notification_settings.xml
index 872e4e439..6c8299912 100644
--- a/app/src/main/res/layout/item_notification_settings.xml
+++ b/app/src/main/res/layout/item_notification_settings.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 Julius Linus <juliuslinus1@gmail.com>
+  ~ SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/notification_settings"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -107,4 +113,4 @@
                         android:checked="true"
                         android:clickable="false" />
                 </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_webinar_info.xml b/app/src/main/res/layout/item_webinar_info.xml
index b72ec7a98..57af8f29d 100644
--- a/app/src/main/res/layout/item_webinar_info.xml
+++ b/app/src/main/res/layout/item_webinar_info.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 Julius Linus <juliuslinus1@gmail.com>
+  ~ SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/webinar_settings"
@@ -6,7 +13,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/webinar_settings_category"
                 android:layout_width="match_parent"
@@ -52,7 +58,6 @@
                             android:text="@string/nc_lobby"
                             android:textSize="@dimen/headline_text_size" />
 
-
                     </LinearLayout>
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -108,8 +113,7 @@
                             android:hint="@string/nc_manual"
                             android:textSize="@dimen/supporting_text_text_size" />
 
-
                     </LinearLayout>
 
                 </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index e62af63b4..9c91330d7 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 Marcel Hibbe <dev@mhibbe.de>
+  ~ SPDX-FileCopyrightText: 2023 Parneet Guraya <gurayaparneet@gmail.com>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <resources>
-
     <style name="FullScreenImageTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowBackground">@color/black</item>
         <item name="android:navigationBarColor">@color/transparent</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bd1570d13..7c9821c63 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,25 +1,10 @@
 <!--
-  ~ Nextcloud Talk application
+  ~ Nextcloud Talk - Android Client
   ~
-  ~ @author Mario Danic
-  ~ @author Andy Scherzinger
-  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
-  ~ Copyright (C) 2017-2020 Mario Danic <mario@lovelyhq.com>
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
+  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2017-2020 Mario Danic <mario@lovelyhq.com>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <resources>
 
     <!-- Base application theme. -->
diff --git a/app/src/qa/res/drawable/ic_launcher_background.xml b/app/src/qa/res/drawable/ic_launcher_background.xml
index 3f3d4b826..72e525962 100644
--- a/app/src/qa/res/drawable/ic_launcher_background.xml
+++ b/app/src/qa/res/drawable/ic_launcher_background.xml
@@ -1,3 +1,9 @@
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017-2020 Mario Danic <mario@lovelyhq.com>
+  ~ SPDX-License-Identifier: GPL-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/drawable/ic_launcher_foreground.xml b/app/src/qa/res/drawable/ic_launcher_foreground.xml
index 2b7fc86b2..eb5ef366d 100644
--- a/app/src/qa/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/qa/res/drawable/ic_launcher_foreground.xml
@@ -1,3 +1,10 @@
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors~
+  ~ SPDX-FileCopyrightText: 2017-2019 Mario Danic <mario@lovelyhq.com>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="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 50ec88623..94a096364 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,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+  ~ SPDX-License-Identifier: GPL-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/docs/TURN.md b/docs/TURN.md
index a2ae57a48..ba6677251 100644
--- a/docs/TURN.md
+++ b/docs/TURN.md
@@ -1,3 +1,7 @@
+<!--
+ ~ SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
+ ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 ### Background
 The configuration of Nextcloud Talk mainly depends on your desired usage:
 - As long as it shall be used only **within one local network**, nothing should be needed at all. Just verify that all browsers support the underlying [WebRTC](https://en.wikipedia.org/wiki/WebRTC) protocol (all famous ones do on current versions) and you should be good to go.
diff --git a/docs/branching.png.license b/docs/branching.png.license
new file mode 100644
index 000000000..7548bd1a5
--- /dev/null
+++ b/docs/branching.png.license
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/docs/branching.svg.license b/docs/branching.svg.license
new file mode 100644
index 000000000..7548bd1a5
--- /dev/null
+++ b/docs/branching.svg.license
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/docs/gplayDebugBuildVariant.png.license b/docs/gplayDebugBuildVariant.png.license
new file mode 100644
index 000000000..7548bd1a5
--- /dev/null
+++ b/docs/gplayDebugBuildVariant.png.license
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/docs/notifications.md b/docs/notifications.md
index c6836e16a..f0941cf97 100644
--- a/docs/notifications.md
+++ b/docs/notifications.md
@@ -1,3 +1,7 @@
+<!--
+ ~ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+ ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 # Debugging push notifications
 
 This list is intended to help users that have problems to receive talk notifications on their android phone. It may 
diff --git a/docs/semantic_versioning_code.png.license b/docs/semantic_versioning_code.png.license
new file mode 100644
index 000000000..7548bd1a5
--- /dev/null
+++ b/docs/semantic_versioning_code.png.license
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh
index 521b71123..ad47c78f0 100755
--- a/scripts/analysis/analysis-wrapper.sh
+++ b/scripts/analysis/analysis-wrapper.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 BRANCH=$1
 LOG_USERNAME=$2
 LOG_PASSWORD=$3
diff --git a/scripts/analysis/getBranchName.sh b/scripts/analysis/getBranchName.sh
index 226708e2a..63fb313be 100755
--- a/scripts/analysis/getBranchName.sh
+++ b/scripts/analysis/getBranchName.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
-# $1: username
-# $2: password/token
-# $3: pull request number
+# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# $1: username, $2: password/token, $3: pull request number
 
 if [ -z "$3" ] ; then
     git branch | grep '\*' | cut -d' ' -f2
diff --git a/scripts/analysis/lint-results.txt.license b/scripts/analysis/lint-results.txt.license
new file mode 100644
index 000000000..eb754075d
--- /dev/null
+++ b/scripts/analysis/lint-results.txt.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/scripts/analysis/lint-up.rb b/scripts/analysis/lint-up.rb
index c9d486413..c52b60f13 100644
--- a/scripts/analysis/lint-up.rb
+++ b/scripts/analysis/lint-up.rb
@@ -3,6 +3,11 @@
 
 # TODO cleanup this script, it has a lot of unused stuff
 
+# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2017 Jason Atwood 
+# SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
diff --git a/scripts/analysis/spotbugs-up.rb b/scripts/analysis/spotbugs-up.rb
index abb053f9c..d7582d2b0 100755
--- a/scripts/analysis/spotbugs-up.rb
+++ b/scripts/analysis/spotbugs-up.rb
@@ -1,6 +1,11 @@
 ## Script originally from https://github.com/tir38/android-lint-entropy-reducer at 07.05.2017
 # heavily modified since then
 
+# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2017 Jason Atwood 
+# SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
diff --git a/scripts/analysis/spotbugsComparison.py b/scripts/analysis/spotbugsComparison.py
index cc85d868c..4e32f1f6a 100755
--- a/scripts/analysis/spotbugsComparison.py
+++ b/scripts/analysis/spotbugsComparison.py
@@ -1,6 +1,10 @@
 #!/usr/bin/env python3
+# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+# SPDX-License-Identifier: GPL-3.0-or-later
 import argparse
 import defusedxml.ElementTree as ET
+
 import spotbugsSummary
 
 
diff --git a/scripts/analysis/spotbugsSummary.py b/scripts/analysis/spotbugsSummary.py
index 4fc886fa7..3ee9b99d0 100755
--- a/scripts/analysis/spotbugsSummary.py
+++ b/scripts/analysis/spotbugsSummary.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python3
+# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+# SPDX-License-Identifier: GPL-3.0-or-later
 import argparse
 import defusedxml.ElementTree as ET
 
diff --git a/scripts/metadata/generate_metadata.py b/scripts/metadata/generate_metadata.py
index c65669c48..3c6b5d6e0 100644
--- a/scripts/metadata/generate_metadata.py
+++ b/scripts/metadata/generate_metadata.py
@@ -5,6 +5,11 @@
 # copied on 2017/11/06 from https://github.com/grote/Transportr/blob/master/fastlane/generate_metadata.py
 # adapted by Tobias Kaminsky and then again by Mario Danic
 
+# SPDX-FileCopyrightText: 2017 Torsten Grote
+# SPDX-FileCopyrightText: 2017-2018 Tobias Kaminsky <tobias@kaminsky.me>
+# SPDX-FileCopyrightText: 2017-2018 Mario Danic  <mario@lovelyhq.com>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import codecs
 import os
 import shutil
diff --git a/scripts/tools/OxygenConversion.MD b/scripts/tools/OxygenConversion.MD
index 29046ce3b..78f36e99d 100644
--- a/scripts/tools/OxygenConversion.MD
+++ b/scripts/tools/OxygenConversion.MD
@@ -1,3 +1,7 @@
+<!--
+ ~ SPDX-FileCopyrightText: 2019 Mario Danic <mario@lovelyhq.com>
+ ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
 brew install coreutils
 find * -type l -exec bash -c 'ln -f "$(greadlink -m "$0")" "$0"' {} \;
 rename 's/-/_/g' *