diff --git a/app/src/androidTest/java/ch/protonmail/android/data/local/MessageDaoTest.kt b/app/src/androidTest/java/ch/protonmail/android/data/local/MessageDaoTest.kt
index 5d2e02061..5a103bc65 100644
--- a/app/src/androidTest/java/ch/protonmail/android/data/local/MessageDaoTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/data/local/MessageDaoTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.data.local
diff --git a/app/src/androidTest/java/ch/protonmail/android/views/PmWebViewClientTest.kt b/app/src/androidTest/java/ch/protonmail/android/views/PmWebViewClientTest.kt
index e1e26b58b..1bb335184 100644
--- a/app/src/androidTest/java/ch/protonmail/android/views/PmWebViewClientTest.kt
+++ b/app/src/androidTest/java/ch/protonmail/android/views/PmWebViewClientTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
  * This file is part of Proton Mail.
  *
diff --git a/app/src/beta/res/drawable-v24/ic_launcher_foreground.xml b/app/src/beta/res/drawable-v24/ic_launcher_foreground.xml
index 8fbbc6358..e4b10b46d 100644
--- a/app/src/beta/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/beta/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,20 +1,20 @@
 <!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/beta/res/drawable-v24/ic_logo_mail_no_bg_scaled.xml b/app/src/beta/res/drawable-v24/ic_logo_mail_no_bg_scaled.xml
index 72b0981fb..84ae0710e 100644
--- a/app/src/beta/res/drawable-v24/ic_logo_mail_no_bg_scaled.xml
+++ b/app/src/beta/res/drawable-v24/ic_logo_mail_no_bg_scaled.xml
@@ -1,20 +1,20 @@
 <!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1f..6864408f2 100644
--- a/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1f..6864408f2 100644
--- a/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/beta/res/values/ic_launcher_background.xml b/app/src/beta/res/values/ic_launcher_background.xml
index c5d5899fd..5c51266a9 100644
--- a/app/src/beta/res/values/ic_launcher_background.xml
+++ b/app/src/beta/res/values/ic_launcher_background.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <resources>
     <color name="ic_launcher_background">#FFFFFF</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/java/ch/protonmail/android/api/models/enumerations/MessageFlag.kt b/app/src/main/java/ch/protonmail/android/api/models/enumerations/MessageFlag.kt
index 325062176..df02b7940 100644
--- a/app/src/main/java/ch/protonmail/android/api/models/enumerations/MessageFlag.kt
+++ b/app/src/main/java/ch/protonmail/android/api/models/enumerations/MessageFlag.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 package ch.protonmail.android.api.models.enumerations
 
diff --git a/app/src/main/java/ch/protonmail/android/api/models/messages/receive/ServerMessage.kt b/app/src/main/java/ch/protonmail/android/api/models/messages/receive/ServerMessage.kt
index db740fd13..4f1671588 100644
--- a/app/src/main/java/ch/protonmail/android/api/models/messages/receive/ServerMessage.kt
+++ b/app/src/main/java/ch/protonmail/android/api/models/messages/receive/ServerMessage.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
  * This file is part of Proton Mail.
  *
diff --git a/app/src/main/java/ch/protonmail/android/api/utils/ProtonHeaders.kt b/app/src/main/java/ch/protonmail/android/api/utils/ProtonHeaders.kt
index 47e9a5ce1..0d4b0ebd9 100644
--- a/app/src/main/java/ch/protonmail/android/api/utils/ProtonHeaders.kt
+++ b/app/src/main/java/ch/protonmail/android/api/utils/ProtonHeaders.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.api.utils
diff --git a/app/src/main/java/ch/protonmail/android/attachments/ExtractAttachmentByteArray.kt b/app/src/main/java/ch/protonmail/android/attachments/ExtractAttachmentByteArray.kt
index b19b73134..4278f78da 100644
--- a/app/src/main/java/ch/protonmail/android/attachments/ExtractAttachmentByteArray.kt
+++ b/app/src/main/java/ch/protonmail/android/attachments/ExtractAttachmentByteArray.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.attachments
diff --git a/app/src/main/java/ch/protonmail/android/contacts/details/presentation/ContactDetailsActivity.kt b/app/src/main/java/ch/protonmail/android/contacts/details/presentation/ContactDetailsActivity.kt
index f5332179a..18972b041 100644
--- a/app/src/main/java/ch/protonmail/android/contacts/details/presentation/ContactDetailsActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/contacts/details/presentation/ContactDetailsActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
  * This file is part of Proton Mail.
  *
diff --git a/app/src/main/java/ch/protonmail/android/data/local/MessageDatabase.kt b/app/src/main/java/ch/protonmail/android/data/local/MessageDatabase.kt
index b30f0f1db..38bb420e7 100644
--- a/app/src/main/java/ch/protonmail/android/data/local/MessageDatabase.kt
+++ b/app/src/main/java/ch/protonmail/android/data/local/MessageDatabase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
  * This file is part of Proton Mail.
  *
diff --git a/app/src/main/java/ch/protonmail/android/details/data/MessageFlagsToEncryptionMapper.kt b/app/src/main/java/ch/protonmail/android/details/data/MessageFlagsToEncryptionMapper.kt
index 520ede297..1c1ca455d 100644
--- a/app/src/main/java/ch/protonmail/android/details/data/MessageFlagsToEncryptionMapper.kt
+++ b/app/src/main/java/ch/protonmail/android/details/data/MessageFlagsToEncryptionMapper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
  * This file is part of Proton Mail.
  *
diff --git a/app/src/main/java/ch/protonmail/android/details/presentation/ui/SwitchUserAndOpenMessageDetailsActivity.kt b/app/src/main/java/ch/protonmail/android/details/presentation/ui/SwitchUserAndOpenMessageDetailsActivity.kt
index e0a695297..7dd2aa9c8 100644
--- a/app/src/main/java/ch/protonmail/android/details/presentation/ui/SwitchUserAndOpenMessageDetailsActivity.kt
+++ b/app/src/main/java/ch/protonmail/android/details/presentation/ui/SwitchUserAndOpenMessageDetailsActivity.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.details.presentation.ui
diff --git a/app/src/main/java/ch/protonmail/android/di/CoreHelpOptionModule.kt b/app/src/main/java/ch/protonmail/android/di/CoreHelpOptionModule.kt
index a1cac78eb..f53587536 100644
--- a/app/src/main/java/ch/protonmail/android/di/CoreHelpOptionModule.kt
+++ b/app/src/main/java/ch/protonmail/android/di/CoreHelpOptionModule.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.di
diff --git a/app/src/main/java/ch/protonmail/android/mailbox/presentation/model/EmptyMailboxUiModel.kt b/app/src/main/java/ch/protonmail/android/mailbox/presentation/model/EmptyMailboxUiModel.kt
index c90b30d74..2e77786f0 100644
--- a/app/src/main/java/ch/protonmail/android/mailbox/presentation/model/EmptyMailboxUiModel.kt
+++ b/app/src/main/java/ch/protonmail/android/mailbox/presentation/model/EmptyMailboxUiModel.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.mailbox.presentation.model
diff --git a/app/src/main/java/ch/protonmail/android/mailbox/presentation/ui/EmptyMailboxView.kt b/app/src/main/java/ch/protonmail/android/mailbox/presentation/ui/EmptyMailboxView.kt
index 8cde63e54..377660497 100644
--- a/app/src/main/java/ch/protonmail/android/mailbox/presentation/ui/EmptyMailboxView.kt
+++ b/app/src/main/java/ch/protonmail/android/mailbox/presentation/ui/EmptyMailboxView.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.mailbox.presentation.ui
diff --git a/app/src/main/java/ch/protonmail/android/mailbox/presentation/ui/UnreadChip.kt b/app/src/main/java/ch/protonmail/android/mailbox/presentation/ui/UnreadChip.kt
index 1079892bf..36e3c0052 100644
--- a/app/src/main/java/ch/protonmail/android/mailbox/presentation/ui/UnreadChip.kt
+++ b/app/src/main/java/ch/protonmail/android/mailbox/presentation/ui/UnreadChip.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.mailbox.presentation.ui
diff --git a/app/src/main/java/ch/protonmail/android/metrics/domain/SendMetricsForViewInDarkModePreference.kt b/app/src/main/java/ch/protonmail/android/metrics/domain/SendMetricsForViewInDarkModePreference.kt
index 92cc50879..3c405ee88 100644
--- a/app/src/main/java/ch/protonmail/android/metrics/domain/SendMetricsForViewInDarkModePreference.kt
+++ b/app/src/main/java/ch/protonmail/android/metrics/domain/SendMetricsForViewInDarkModePreference.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.metrics.domain
diff --git a/app/src/main/java/ch/protonmail/android/navigation/presentation/model/NavigationViewAction.kt b/app/src/main/java/ch/protonmail/android/navigation/presentation/model/NavigationViewAction.kt
index a783da866..0a1e1d2ad 100644
--- a/app/src/main/java/ch/protonmail/android/navigation/presentation/model/NavigationViewAction.kt
+++ b/app/src/main/java/ch/protonmail/android/navigation/presentation/model/NavigationViewAction.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.navigation.presentation.model
diff --git a/app/src/main/java/ch/protonmail/android/navigation/presentation/model/NavigationViewState.kt b/app/src/main/java/ch/protonmail/android/navigation/presentation/model/NavigationViewState.kt
index eb3ee0e3f..7c7d5bd3a 100644
--- a/app/src/main/java/ch/protonmail/android/navigation/presentation/model/NavigationViewState.kt
+++ b/app/src/main/java/ch/protonmail/android/navigation/presentation/model/NavigationViewState.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.navigation.presentation.model
diff --git a/app/src/main/java/ch/protonmail/android/navigation/presentation/model/TemporaryMessage.kt b/app/src/main/java/ch/protonmail/android/navigation/presentation/model/TemporaryMessage.kt
index ea8d66de1..09fd4d4ff 100644
--- a/app/src/main/java/ch/protonmail/android/navigation/presentation/model/TemporaryMessage.kt
+++ b/app/src/main/java/ch/protonmail/android/navigation/presentation/model/TemporaryMessage.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.navigation.presentation.model
diff --git a/app/src/main/java/ch/protonmail/android/notifications/data/NotificationRepositoryImpl.kt b/app/src/main/java/ch/protonmail/android/notifications/data/NotificationRepositoryImpl.kt
index 25176ccb0..4e997d112 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/data/NotificationRepositoryImpl.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/data/NotificationRepositoryImpl.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.data
diff --git a/app/src/main/java/ch/protonmail/android/notifications/data/local/NotificationDao.kt b/app/src/main/java/ch/protonmail/android/notifications/data/local/NotificationDao.kt
index b187f4a1d..1371923e3 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/data/local/NotificationDao.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/data/local/NotificationDao.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 package ch.protonmail.android.notifications.data.local
 
diff --git a/app/src/main/java/ch/protonmail/android/notifications/data/local/NotificationDatabase.kt b/app/src/main/java/ch/protonmail/android/notifications/data/local/NotificationDatabase.kt
index 2f7524428..f22ee1dcf 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/data/local/NotificationDatabase.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/data/local/NotificationDatabase.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.data.local
diff --git a/app/src/main/java/ch/protonmail/android/notifications/data/local/model/NotificationEntity.kt b/app/src/main/java/ch/protonmail/android/notifications/data/local/model/NotificationEntity.kt
index 73dd2ff8f..e7c5a177a 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/data/local/model/NotificationEntity.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/data/local/model/NotificationEntity.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 package ch.protonmail.android.notifications.data.local.model
 
diff --git a/app/src/main/java/ch/protonmail/android/notifications/data/mapper/NotificationApiEntityMapper.kt b/app/src/main/java/ch/protonmail/android/notifications/data/mapper/NotificationApiEntityMapper.kt
index 4967f2def..c96c45828 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/data/mapper/NotificationApiEntityMapper.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/data/mapper/NotificationApiEntityMapper.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.data.mapper
diff --git a/app/src/main/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityDomainMapper.kt b/app/src/main/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityDomainMapper.kt
index 8fc4fabd0..c20cd8cc9 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityDomainMapper.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityDomainMapper.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.data.mapper
diff --git a/app/src/main/java/ch/protonmail/android/notifications/data/remote/model/NotificationAction.kt b/app/src/main/java/ch/protonmail/android/notifications/data/remote/model/NotificationAction.kt
index e33d426c9..44798eb52 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/data/remote/model/NotificationAction.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/data/remote/model/NotificationAction.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.data.remote.model
diff --git a/app/src/main/java/ch/protonmail/android/notifications/domain/NotificationRepository.kt b/app/src/main/java/ch/protonmail/android/notifications/domain/NotificationRepository.kt
index 03b9f6b82..b2d01e137 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/domain/NotificationRepository.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/domain/NotificationRepository.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.domain
diff --git a/app/src/main/java/ch/protonmail/android/notifications/domain/model/NotificationType.kt b/app/src/main/java/ch/protonmail/android/notifications/domain/model/NotificationType.kt
index 6b54aae9d..79b01b9ae 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/domain/model/NotificationType.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/domain/model/NotificationType.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.domain.model
diff --git a/app/src/main/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotification.kt b/app/src/main/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotification.kt
index 56d1c6608..6eee5def3 100644
--- a/app/src/main/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotification.kt
+++ b/app/src/main/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotification.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.presentation.usecase
diff --git a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/AddStartOnboardingObserverIfNeeded.kt b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/AddStartOnboardingObserverIfNeeded.kt
index da79c54a0..9b6f9b46a 100644
--- a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/AddStartOnboardingObserverIfNeeded.kt
+++ b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/AddStartOnboardingObserverIfNeeded.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.onboarding.base.presentation
diff --git a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingAdapter.kt b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingAdapter.kt
index 01389a554..2a7664a4a 100644
--- a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingAdapter.kt
+++ b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingAdapter.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.onboarding.base.presentation
diff --git a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingIndicatorsView.kt b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingIndicatorsView.kt
index 5179e4352..04b38ff5d 100644
--- a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingIndicatorsView.kt
+++ b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingIndicatorsView.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.onboarding.base.presentation
diff --git a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingItemUiModelDiffCallback.kt b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingItemUiModelDiffCallback.kt
index 245cc6138..b760dac51 100644
--- a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingItemUiModelDiffCallback.kt
+++ b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/OnboardingItemUiModelDiffCallback.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.onboarding.base.presentation
diff --git a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/StartOnboardingObserver.kt b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/StartOnboardingObserver.kt
index 03091df32..501de31db 100644
--- a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/StartOnboardingObserver.kt
+++ b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/StartOnboardingObserver.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.onboarding.base.presentation
diff --git a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/StartOnboardingObserverInitializer.kt b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/StartOnboardingObserverInitializer.kt
index c244e8e96..055403b98 100644
--- a/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/StartOnboardingObserverInitializer.kt
+++ b/app/src/main/java/ch/protonmail/android/onboarding/base/presentation/StartOnboardingObserverInitializer.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.onboarding.base.presentation
diff --git a/app/src/main/java/ch/protonmail/android/pendingaction/data/repository/PendingSendRepositoryImpl.kt b/app/src/main/java/ch/protonmail/android/pendingaction/data/repository/PendingSendRepositoryImpl.kt
index 977846434..e56656b0a 100644
--- a/app/src/main/java/ch/protonmail/android/pendingaction/data/repository/PendingSendRepositoryImpl.kt
+++ b/app/src/main/java/ch/protonmail/android/pendingaction/data/repository/PendingSendRepositoryImpl.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.pendingaction.data.repository
diff --git a/app/src/main/java/ch/protonmail/android/pendingaction/data/worker/CleanUpPendingSendsWorker.kt b/app/src/main/java/ch/protonmail/android/pendingaction/data/worker/CleanUpPendingSendsWorker.kt
index 8e1f7f73c..77cf40cbd 100644
--- a/app/src/main/java/ch/protonmail/android/pendingaction/data/worker/CleanUpPendingSendsWorker.kt
+++ b/app/src/main/java/ch/protonmail/android/pendingaction/data/worker/CleanUpPendingSendsWorker.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.pendingaction.data.worker
diff --git a/app/src/main/java/ch/protonmail/android/pendingaction/di/PendingSendModule.kt b/app/src/main/java/ch/protonmail/android/pendingaction/di/PendingSendModule.kt
index 3fdfb9aa0..a1a65a472 100644
--- a/app/src/main/java/ch/protonmail/android/pendingaction/di/PendingSendModule.kt
+++ b/app/src/main/java/ch/protonmail/android/pendingaction/di/PendingSendModule.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.pendingaction.di
diff --git a/app/src/main/java/ch/protonmail/android/security/domain/usecase/GetIsPreventTakingScreenshots.kt b/app/src/main/java/ch/protonmail/android/security/domain/usecase/GetIsPreventTakingScreenshots.kt
index cd1e8c6e9..865a7807b 100644
--- a/app/src/main/java/ch/protonmail/android/security/domain/usecase/GetIsPreventTakingScreenshots.kt
+++ b/app/src/main/java/ch/protonmail/android/security/domain/usecase/GetIsPreventTakingScreenshots.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.security.domain.usecase
diff --git a/app/src/main/java/ch/protonmail/android/security/domain/usecase/SavePreventTakingScreenshots.kt b/app/src/main/java/ch/protonmail/android/security/domain/usecase/SavePreventTakingScreenshots.kt
index 15d292635..34b1e2ba9 100644
--- a/app/src/main/java/ch/protonmail/android/security/domain/usecase/SavePreventTakingScreenshots.kt
+++ b/app/src/main/java/ch/protonmail/android/security/domain/usecase/SavePreventTakingScreenshots.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.security.domain.usecase
diff --git a/app/src/main/java/ch/protonmail/android/settings/data/AccountSettingsRepository.kt b/app/src/main/java/ch/protonmail/android/settings/data/AccountSettingsRepository.kt
index 405654f10..2ff1c666e 100644
--- a/app/src/main/java/ch/protonmail/android/settings/data/AccountSettingsRepository.kt
+++ b/app/src/main/java/ch/protonmail/android/settings/data/AccountSettingsRepository.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.settings.data
diff --git a/app/src/main/java/ch/protonmail/android/settings/data/SharedPreferencesAccountSettingsRepository.kt b/app/src/main/java/ch/protonmail/android/settings/data/SharedPreferencesAccountSettingsRepository.kt
index 0b8899577..9ddbb7721 100644
--- a/app/src/main/java/ch/protonmail/android/settings/data/SharedPreferencesAccountSettingsRepository.kt
+++ b/app/src/main/java/ch/protonmail/android/settings/data/SharedPreferencesAccountSettingsRepository.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.settings.data
diff --git a/app/src/main/java/ch/protonmail/android/utils/TryWithRetry.kt b/app/src/main/java/ch/protonmail/android/utils/TryWithRetry.kt
index 434f271d4..c5595aa55 100644
--- a/app/src/main/java/ch/protonmail/android/utils/TryWithRetry.kt
+++ b/app/src/main/java/ch/protonmail/android/utils/TryWithRetry.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.utils
diff --git a/app/src/main/java/ch/protonmail/android/utils/UuidProvider.kt b/app/src/main/java/ch/protonmail/android/utils/UuidProvider.kt
index dee9c8e89..1b8fe7d2f 100644
--- a/app/src/main/java/ch/protonmail/android/utils/UuidProvider.kt
+++ b/app/src/main/java/ch/protonmail/android/utils/UuidProvider.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.utils
diff --git a/app/src/main/java/ch/protonmail/android/views/PmWebViewClient.kt b/app/src/main/java/ch/protonmail/android/views/PmWebViewClient.kt
index 069b87335..45dc0899a 100644
--- a/app/src/main/java/ch/protonmail/android/views/PmWebViewClient.kt
+++ b/app/src/main/java/ch/protonmail/android/views/PmWebViewClient.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 package ch.protonmail.android.views
 
diff --git a/app/src/main/java/ch/protonmail/android/worker/repository/WorkerRepository.kt b/app/src/main/java/ch/protonmail/android/worker/repository/WorkerRepository.kt
index b5367cb7c..6734c6b3c 100644
--- a/app/src/main/java/ch/protonmail/android/worker/repository/WorkerRepository.kt
+++ b/app/src/main/java/ch/protonmail/android/worker/repository/WorkerRepository.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.worker.repository
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 2edc3199b..a696e04d1 100644
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,20 +1,20 @@
 <!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/circle_onboarding_indicator_active.xml b/app/src/main/res/drawable/circle_onboarding_indicator_active.xml
index a0f1fc3c2..924793292 100644
--- a/app/src/main/res/drawable/circle_onboarding_indicator_active.xml
+++ b/app/src/main/res/drawable/circle_onboarding_indicator_active.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,4 +24,4 @@
 
     <solid android:color="?proton_interaction_norm" />
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/circle_onboarding_indicator_inactive.xml b/app/src/main/res/drawable/circle_onboarding_indicator_inactive.xml
index 6b7fcbdd9..edea5cd45 100644
--- a/app/src/main/res/drawable/circle_onboarding_indicator_inactive.xml
+++ b/app/src/main/res/drawable/circle_onboarding_indicator_inactive.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,4 +24,4 @@
 
     <solid android:color="?proton_interaction_weak" />
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/ic_brand_mail.xml b/app/src/main/res/drawable/ic_brand_mail.xml
index edb4d5217..53a1b5a44 100644
--- a/app/src/main/res/drawable/ic_brand_mail.xml
+++ b/app/src/main/res/drawable/ic_brand_mail.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <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_file_image.xml b/app/src/main/res/drawable/ic_file_image.xml
index ceff3e5e1..ed8e2cf7d 100644
--- a/app/src/main/res/drawable/ic_file_image.xml
+++ b/app/src/main/res/drawable/ic_file_image.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/img_empty_folder.xml b/app/src/main/res/drawable/img_empty_folder.xml
index 195567a34..430a92961 100644
--- a/app/src/main/res/drawable/img_empty_folder.xml
+++ b/app/src/main/res/drawable/img_empty_folder.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="375dp"
diff --git a/app/src/main/res/drawable/img_empty_mailbox.xml b/app/src/main/res/drawable/img_empty_mailbox.xml
index 4c3766e24..2dcea941c 100644
--- a/app/src/main/res/drawable/img_empty_mailbox.xml
+++ b/app/src/main/res/drawable/img_empty_mailbox.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="375dp"
diff --git a/app/src/main/res/drawable/img_empty_search.xml b/app/src/main/res/drawable/img_empty_search.xml
index 34a066628..624148926 100644
--- a/app/src/main/res/drawable/img_empty_search.xml
+++ b/app/src/main/res/drawable/img_empty_search.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="375dp"
diff --git a/app/src/main/res/drawable/img_empty_trash.xml b/app/src/main/res/drawable/img_empty_trash.xml
index 7ed5ea8cb..abfcde9f8 100644
--- a/app/src/main/res/drawable/img_empty_trash.xml
+++ b/app/src/main/res/drawable/img_empty_trash.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="375dp"
diff --git a/app/src/main/res/drawable/img_no_contacts.xml b/app/src/main/res/drawable/img_no_contacts.xml
index 231713a44..7cf1c7d4c 100644
--- a/app/src/main/res/drawable/img_no_contacts.xml
+++ b/app/src/main/res/drawable/img_no_contacts.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="375dp"
diff --git a/app/src/main/res/drawable/img_no_groups.xml b/app/src/main/res/drawable/img_no_groups.xml
index 34f9f702c..851618dd3 100644
--- a/app/src/main/res/drawable/img_no_groups.xml
+++ b/app/src/main/res/drawable/img_no_groups.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="375dp"
diff --git a/app/src/main/res/drawable/img_no_messages_in_spam.xml b/app/src/main/res/drawable/img_no_messages_in_spam.xml
index 001723f84..79f45fe3c 100644
--- a/app/src/main/res/drawable/img_no_messages_in_spam.xml
+++ b/app/src/main/res/drawable/img_no_messages_in_spam.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="375dp"
diff --git a/app/src/main/res/drawable/img_onboarding_new_features.xml b/app/src/main/res/drawable/img_onboarding_new_features.xml
index df49d8763..1552fe128 100644
--- a/app/src/main/res/drawable/img_onboarding_new_features.xml
+++ b/app/src/main/res/drawable/img_onboarding_new_features.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="360dp"
diff --git a/app/src/main/res/layout/layout_onboarding_item.xml b/app/src/main/res/layout/layout_onboarding_item.xml
index 9a51e78ae..47ddaaf6f 100644
--- a/app/src/main/res/layout/layout_onboarding_item.xml
+++ b/app/src/main/res/layout/layout_onboarding_item.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/layout_onboarding_to_new_brand_item.xml b/app/src/main/res/layout/layout_onboarding_to_new_brand_item.xml
index 22e0cfb3e..942cd9613 100644
--- a/app/src/main/res/layout/layout_onboarding_to_new_brand_item.xml
+++ b/app/src/main/res/layout/layout_onboarding_to_new_brand_item.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/menu_skip_button.xml b/app/src/main/res/layout/menu_skip_button.xml
index 653c5c907..5d9d818d0 100644
--- a/app/src/main/res/layout/menu_skip_button.xml
+++ b/app/src/main/res/layout/menu_skip_button.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <TextView style="@style/Proton.Text.DefaultSmall.Interaction"
diff --git a/app/src/main/res/menu/menu_onboarding.xml b/app/src/main/res/menu/menu_onboarding.xml
index d2866c721..94df1c4a0 100644
--- a/app/src/main/res/menu/menu_onboarding.xml
+++ b/app/src/main/res/menu/menu_onboarding.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
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 7353dbd1f..6864408f2 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1f..6864408f2 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index c5d5899fd..5c51266a9 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2022 Proton AG
+  ~
+  ~ This file is part of Proton Mail.
+  ~
+  ~ Proton Mail 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.
+  ~
+  ~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
+  -->
+
 <resources>
     <color name="ic_launcher_background">#FFFFFF</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0fd56a77b..1fadc979f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2022 Proton Technologies AG
+  ~ Copyright (c) 2022 Proton AG
   ~
-  ~ This file is part of ProtonMail.
+  ~ This file is part of Proton Mail.
   ~
-  ~ ProtonMail is free software: you can redistribute it and/or modify
+  ~ Proton Mail 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.
   ~
-  ~ ProtonMail is distributed in the hope that it will be useful,
+  ~ Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+  ~ along with Proton Mail. If not, see https://www.gnu.org/licenses/.
   -->
 
 <resources>
diff --git a/app/src/test/java/ch/protonmail/android/attachments/ExtractAttachmentByteArrayTest.kt b/app/src/test/java/ch/protonmail/android/attachments/ExtractAttachmentByteArrayTest.kt
index 60fc26223..33034a899 100644
--- a/app/src/test/java/ch/protonmail/android/attachments/ExtractAttachmentByteArrayTest.kt
+++ b/app/src/test/java/ch/protonmail/android/attachments/ExtractAttachmentByteArrayTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.attachments
diff --git a/app/src/test/java/ch/protonmail/android/metrics/domain/SendMetricsForViewInDarkModePreferenceTest.kt b/app/src/test/java/ch/protonmail/android/metrics/domain/SendMetricsForViewInDarkModePreferenceTest.kt
index afbf438a5..13b03b386 100644
--- a/app/src/test/java/ch/protonmail/android/metrics/domain/SendMetricsForViewInDarkModePreferenceTest.kt
+++ b/app/src/test/java/ch/protonmail/android/metrics/domain/SendMetricsForViewInDarkModePreferenceTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.metrics.domain
diff --git a/app/src/test/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityApiMapperTest.kt b/app/src/test/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityApiMapperTest.kt
index fca40235e..05e037eb0 100644
--- a/app/src/test/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityApiMapperTest.kt
+++ b/app/src/test/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityApiMapperTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.data.mapper
diff --git a/app/src/test/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityDomainMapperTest.kt b/app/src/test/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityDomainMapperTest.kt
index a358118eb..d2a871de6 100644
--- a/app/src/test/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityDomainMapperTest.kt
+++ b/app/src/test/java/ch/protonmail/android/notifications/data/mapper/NotificationEntityDomainMapperTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.data.mapper
diff --git a/app/src/test/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotificationTest.kt b/app/src/test/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotificationTest.kt
index 1979d1733..31a01859a 100644
--- a/app/src/test/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotificationTest.kt
+++ b/app/src/test/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotificationTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.presentation.usecase
diff --git a/app/src/test/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotificationsForUserTest.kt b/app/src/test/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotificationsForUserTest.kt
index a4a95af6c..6169dfc65 100644
--- a/app/src/test/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotificationsForUserTest.kt
+++ b/app/src/test/java/ch/protonmail/android/notifications/presentation/usecase/ClearNotificationsForUserTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.notifications.presentation.usecase
diff --git a/app/src/test/java/ch/protonmail/android/onboarding/base/presentation/AddStartOnboardingObserverIfNeededTest.kt b/app/src/test/java/ch/protonmail/android/onboarding/base/presentation/AddStartOnboardingObserverIfNeededTest.kt
index 4306737b4..91507c4c8 100644
--- a/app/src/test/java/ch/protonmail/android/onboarding/base/presentation/AddStartOnboardingObserverIfNeededTest.kt
+++ b/app/src/test/java/ch/protonmail/android/onboarding/base/presentation/AddStartOnboardingObserverIfNeededTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.onboarding.base.presentation
diff --git a/app/src/test/java/ch/protonmail/android/pendingaction/data/repository/PendingSendRepositoryImplTest.kt b/app/src/test/java/ch/protonmail/android/pendingaction/data/repository/PendingSendRepositoryImplTest.kt
index 8e3f1c742..e62f3bd83 100644
--- a/app/src/test/java/ch/protonmail/android/pendingaction/data/repository/PendingSendRepositoryImplTest.kt
+++ b/app/src/test/java/ch/protonmail/android/pendingaction/data/repository/PendingSendRepositoryImplTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.pendingaction.data.repository
diff --git a/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/CleanUpPendingSendWorkerTest.kt b/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/CleanUpPendingSendWorkerTest.kt
index 76bf22226..157505188 100644
--- a/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/CleanUpPendingSendWorkerTest.kt
+++ b/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/CleanUpPendingSendWorkerTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.pendingaction.data.worker
diff --git a/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/SchedulePendingSendCleanUpWhenOnlineTest.kt b/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/SchedulePendingSendCleanUpWhenOnlineTest.kt
index 438a56ecd..cfdf575a8 100644
--- a/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/SchedulePendingSendCleanUpWhenOnlineTest.kt
+++ b/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/SchedulePendingSendCleanUpWhenOnlineTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.pendingaction.data.worker
diff --git a/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/SchedulePendingSendsCleanUpWorkerTest.kt b/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/SchedulePendingSendsCleanUpWorkerTest.kt
index b7f1f6f8e..e5e4131eb 100644
--- a/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/SchedulePendingSendsCleanUpWorkerTest.kt
+++ b/app/src/test/java/ch/protonmail/android/pendingaction/data/worker/SchedulePendingSendsCleanUpWorkerTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.pendingaction.data.worker
diff --git a/app/src/test/java/ch/protonmail/android/settings/data/SharedPreferencesAccountSettingsRepositoryTest.kt b/app/src/test/java/ch/protonmail/android/settings/data/SharedPreferencesAccountSettingsRepositoryTest.kt
index 353c4a5a4..03f103e31 100644
--- a/app/src/test/java/ch/protonmail/android/settings/data/SharedPreferencesAccountSettingsRepositoryTest.kt
+++ b/app/src/test/java/ch/protonmail/android/settings/data/SharedPreferencesAccountSettingsRepositoryTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.settings.data
diff --git a/app/src/test/java/ch/protonmail/android/testdata/AttachmentTestData.kt b/app/src/test/java/ch/protonmail/android/testdata/AttachmentTestData.kt
index 7af0885d0..a623985ec 100644
--- a/app/src/test/java/ch/protonmail/android/testdata/AttachmentTestData.kt
+++ b/app/src/test/java/ch/protonmail/android/testdata/AttachmentTestData.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.testdata
diff --git a/app/src/test/java/ch/protonmail/android/utils/TryWithRetryTest.kt b/app/src/test/java/ch/protonmail/android/utils/TryWithRetryTest.kt
index 5db23f6e0..e70803592 100644
--- a/app/src/test/java/ch/protonmail/android/utils/TryWithRetryTest.kt
+++ b/app/src/test/java/ch/protonmail/android/utils/TryWithRetryTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.utils
diff --git a/app/src/test/java/ch/protonmail/android/worker/repository/WorkerRepositoryTest.kt b/app/src/test/java/ch/protonmail/android/worker/repository/WorkerRepositoryTest.kt
index 5941fc0e8..dc2ee4349 100644
--- a/app/src/test/java/ch/protonmail/android/worker/repository/WorkerRepositoryTest.kt
+++ b/app/src/test/java/ch/protonmail/android/worker/repository/WorkerRepositoryTest.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.worker.repository
diff --git a/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/mailbox/composer/ComposerRobot.kt b/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/mailbox/composer/ComposerRobot.kt
index 56c4e3107..52767508f 100644
--- a/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/mailbox/composer/ComposerRobot.kt
+++ b/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/mailbox/composer/ComposerRobot.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
  * This file is part of Proton Mail.
  *
diff --git a/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/onboarding/OnboardingRobot.kt b/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/onboarding/OnboardingRobot.kt
index 4e19a4d3e..cfd8a57bf 100644
--- a/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/onboarding/OnboardingRobot.kt
+++ b/app/src/uiTest/kotlin/ch/protonmail/android/uitests/robots/onboarding/OnboardingRobot.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2022 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 package ch.protonmail.android.uitests.robots.onboarding
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d81ab90a2..152cc34c1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 
 rootProject.name = "ProtonMail"
diff --git a/sharedTest/testAndroid/build.gradle.kts b/sharedTest/testAndroid/build.gradle.kts
index 17d2092c0..41b4aafd5 100644
--- a/sharedTest/testAndroid/build.gradle.kts
+++ b/sharedTest/testAndroid/build.gradle.kts
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 import studio.forface.easygradle.dsl.*
 import studio.forface.easygradle.dsl.android.*
diff --git a/sharedTest/testAndroidInstrumented/build.gradle.kts b/sharedTest/testAndroidInstrumented/build.gradle.kts
index 566c82072..296888d0c 100644
--- a/sharedTest/testAndroidInstrumented/build.gradle.kts
+++ b/sharedTest/testAndroidInstrumented/build.gradle.kts
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020 Proton Technologies AG
+ * Copyright (c) 2022 Proton AG
  *
- * This file is part of ProtonMail.
+ * This file is part of Proton Mail.
  *
- * ProtonMail is free software: you can redistribute it and/or modify
+ * Proton Mail 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.
  *
- * ProtonMail is distributed in the hope that it will be useful,
+ * Proton Mail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
+ * along with Proton Mail. If not, see https://www.gnu.org/licenses/.
  */
 import studio.forface.easygradle.dsl.*
 import studio.forface.easygradle.dsl.android.*