diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9d8739a8b..ac0464ff2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,13 @@
   package="org.kiwix.kiwixmobile">
 
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission
+    android:name="android.permission.ACCESS_FINE_LOCATION"
+    android:maxSdkVersion="32" />
+  <uses-permission
+    android:name="android.permission.NEARBY_WIFI_DEVICES"
+    android:usesPermissionFlags="neverForLocation"
+    tools:targetApi="s" />
   <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
   <uses-permission android:name="${permission}" />
 
@@ -28,11 +34,11 @@
     <activity
       android:name=".main.KiwixMainActivity"
       android:configChanges="orientation|keyboardHidden|screenSize"
+      android:exported="true"
       android:label="@string/app_name"
       android:launchMode="singleTop"
       android:theme="@style/KiwixTheme.Launcher"
-      android:windowSoftInputMode="adjustPan"
-      android:exported="true">
+      android:windowSoftInputMode="adjustPan">
       <meta-data
         android:name="android.app.shortcuts"
         android:resource="@xml/shortcuts" />
@@ -145,7 +151,8 @@
 
     <service android:name=".webserver.wifi_hotspot.HotspotService" />
 
-    <receiver android:name=".main.KiwixSearchWidget"
+    <receiver
+      android:name=".main.KiwixSearchWidget"
       android:exported="true">
       <meta-data
         android:name="android.appwidget.provider"
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index cd3bd622f..573c8237f 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -19,8 +19,8 @@
 import org.gradle.api.JavaVersion
 
 object Config {
-  const val compileSdk = 30
+  const val compileSdk = 33
   const val minSdk = 21
-  const val targetSdk = 30
+  const val targetSdk = 33
   val javaVersion = JavaVersion.VERSION_1_8
 }
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 9d82bc382..0a25fba68 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -37,6 +37,7 @@
       android:value="true" />
 
     <activity
+      android:exported="false"
       android:name=".error.ErrorActivity"
       android:process=":error_activity" />
 
@@ -50,7 +51,9 @@
         android:resource="@xml/provider_paths" />
     </provider>
 
-    <activity android:name=".error.DiagnosticReportActivity" />
+    <activity
+      android:exported="false"
+      android:name=".error.DiagnosticReportActivity" />
 
   </application>
 </manifest>
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
index a47b294ee..3b48b661b 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
@@ -199,9 +199,9 @@ class AddNoteDialog : DialogFragment() {
       saveItem.isEnabled = false
       shareItem.isEnabled = false
       deleteItem.isEnabled = false
-      saveItem.icon.alpha = DISABLE_ICON_ITEM_ALPHA
-      shareItem.icon.alpha = DISABLE_ICON_ITEM_ALPHA
-      deleteItem.icon.alpha = DISABLE_ICON_ITEM_ALPHA
+      saveItem.icon?.alpha = DISABLE_ICON_ITEM_ALPHA
+      shareItem.icon?.alpha = DISABLE_ICON_ITEM_ALPHA
+      deleteItem.icon?.alpha = DISABLE_ICON_ITEM_ALPHA
     } else {
       Log.d(TAG, "Toolbar without inflated menu")
     }
@@ -210,7 +210,7 @@ class AddNoteDialog : DialogFragment() {
   private fun enableSaveNoteMenuItem() {
     if (toolbar.menu != null) {
       saveItem.isEnabled = true
-      saveItem.icon.alpha = ENABLE_ICON_ITEM_ALPHA
+      saveItem.icon?.alpha = ENABLE_ICON_ITEM_ALPHA
     } else {
       Log.d(TAG, "Toolbar without inflated menu")
     }
@@ -219,7 +219,7 @@ class AddNoteDialog : DialogFragment() {
   private fun enableDeleteNoteMenuItem() {
     if (toolbar.menu != null) {
       deleteItem.isEnabled = true
-      deleteItem.icon.alpha = ENABLE_ICON_ITEM_ALPHA
+      deleteItem.icon?.alpha = ENABLE_ICON_ITEM_ALPHA
     } else {
       Log.d(TAG, "Toolbar without inflated menu")
     }
@@ -228,7 +228,7 @@ class AddNoteDialog : DialogFragment() {
   private fun enableShareNoteMenuItem() {
     if (toolbar.menu != null) {
       shareItem.isEnabled = true
-      shareItem.icon.alpha = ENABLE_ICON_ITEM_ALPHA
+      shareItem.icon?.alpha = ENABLE_ICON_ITEM_ALPHA
     } else {
       Log.d(TAG, "Toolbar without inflated menu")
     }