diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java
index 247a3e31d..f7f48b14c 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/BookDaoTest.java
@@ -17,22 +17,6 @@
  */
 
 package org.kiwix.kiwixmobile.data.local.dao;/*
- * Kiwix Android
- * Copyright (C) 2018  Kiwix <android.kiwix.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
 
 import android.content.Context;
 import androidx.test.InstrumentationRegistry;
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/RecentSearchDaoTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/RecentSearchDaoTest.java
index 2a7a579b0..f15ab78a9 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/RecentSearchDaoTest.java
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/data/local/dao/RecentSearchDaoTest.java
@@ -17,22 +17,6 @@
  */
 
 package org.kiwix.kiwixmobile.data.local.dao;/*
- * Kiwix Android
- * Copyright (C) 2018  Kiwix <android.kiwix.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.yahoo.squidb.data.AbstractModel;
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/base/adapter/AbsDelegateAdapter.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/base/adapter/AbsDelegateAdapter.kt
index 8be105938..dab0128fe 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/base/adapter/AbsDelegateAdapter.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/base/adapter/AbsDelegateAdapter.kt
@@ -21,23 +21,6 @@ package org.kiwix.kiwixmobile.core.base.adapter
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 
-/*
- * Kiwix Android
- * Copyright (C) 2018  Kiwix <android.kiwix.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
 interface AbsDelegateAdapter<INSTANCE : SUPERTYPE,
   SUPERTYPE : Any,
   out VIEWHOLDER : BaseViewHolder<INSTANCE>> :
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/AbstractContentProvider.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/data/AbstractContentProvider.kt
index 2ff812222..c7ea63549 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/AbstractContentProvider.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/AbstractContentProvider.kt
@@ -23,23 +23,6 @@ import android.content.ContentValues
 import android.database.Cursor
 import android.net.Uri
 
-/*
- * Kiwix Android
- * Copyright (C) 2018  Kiwix <android.kiwix.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
 internal abstract class AbstractContentProvider : ContentProvider() {
   override fun query(
     url: Uri,
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/settings/StorageCalculator.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/settings/StorageCalculator.kt
index 61d8c182e..4f9e441fc 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/settings/StorageCalculator.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/settings/StorageCalculator.kt
@@ -22,23 +22,6 @@ import eu.mhutti1.utils.storage.Bytes
 import java.io.File
 import javax.inject.Inject
 
-/*
- * Kiwix Android
- * Copyright (C) 2018  Kiwix <android.kiwix.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
 class StorageCalculator @Inject constructor() {
 
   fun calculateAvailableSpace(file: File): String =
diff --git a/core/src/main/res/drawable/ic_round_add_white_36dp.xml b/core/src/main/res/drawable/ic_round_add_white_36dp.xml
index d36eb954a..68d71568b 100644
--- a/core/src/main/res/drawable/ic_round_add_white_36dp.xml
+++ b/core/src/main/res/drawable/ic_round_add_white_36dp.xml
@@ -1,28 +1,9 @@
-<!--
-  ~ Copyright (c) 2018 Kiwix <android.kiwix.org>
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU  General Public License as published by
-  ~ the Free Software Foundation; either version 3 of the License, or
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  ~ MA 02110-1301, USA.
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="36dp"
   android:height="36dp"
   android:tint="#FFFFFF"
-  android:viewportHeight="24.0"
   android:viewportWidth="24.0"
-  android:width="36dp">
+  android:viewportHeight="24.0">
   <path
     android:fillColor="#FF000000"
     android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1h0c-0.55,0 -1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1h0c0.55,0 1,0.45 1,1v5h5c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z" />
diff --git a/core/src/test/java/eu/mhutti1/utils/storage/BytesTest.kt b/core/src/test/java/eu/mhutti1/utils/storage/BytesTest.kt
index d6238df7e..7619196a2 100644
--- a/core/src/test/java/eu/mhutti1/utils/storage/BytesTest.kt
+++ b/core/src/test/java/eu/mhutti1/utils/storage/BytesTest.kt
@@ -18,24 +18,6 @@
 
 package eu.mhutti1.utils.storage
 
-/*
- * Kiwix Android
- * Copyright (C) 2018  Kiwix <android.kiwix.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/settings/StorageCalculatorTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/settings/StorageCalculatorTest.kt
index debc82c2e..245ad967a 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/settings/StorageCalculatorTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/settings/StorageCalculatorTest.kt
@@ -18,24 +18,6 @@
 
 package org.kiwix.kiwixmobile.core.settings
 
-/*
- * Kiwix Android
- * Copyright (C) 2018  Kiwix <android.kiwix.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
 import io.mockk.every
 import io.mockk.mockk
 import org.assertj.core.api.Assertions.assertThat
diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt
index b3b0fd747..9328cef45 100644
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt
@@ -18,24 +18,6 @@
 
 package org.kiwix.kiwixmobile.core.zim_manager
 
-/*
- * Kiwix Android
- * Copyright (C) 2018  Kiwix <android.kiwix.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Nested