diff --git a/app/build.gradle b/app/build.gradle
index d901042..9d0330b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,10 +77,10 @@ dependencies {
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
-    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.5'
     implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/BookmarksListFragment.kt b/app/src/main/java/be/digitalia/fosdem/fragments/BookmarksListFragment.kt
index c6d7d56..79e34aa 100644
--- a/app/src/main/java/be/digitalia/fosdem/fragments/BookmarksListFragment.kt
+++ b/app/src/main/java/be/digitalia/fosdem/fragments/BookmarksListFragment.kt
@@ -151,7 +151,7 @@ class BookmarksListFragment : Fragment(R.layout.recyclerview), CreateNfcAppDataC
             true
         }
         R.id.export_bookmarks -> {
-            val exportIntent = BookmarksExportProvider.getIntent(activity)
+            val exportIntent = BookmarksExportProvider.getIntent(requireActivity())
             startActivity(Intent.createChooser(exportIntent, getString(R.string.export_bookmarks)))
             true
         }
diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.kt b/app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.kt
index fff5ea9..1c27e6b 100644
--- a/app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.kt
+++ b/app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.kt
@@ -189,7 +189,7 @@ class EventDetailsFragment : Fragment(R.layout.fragment_event_details) {
     private fun createShareChooserIntent(): Intent {
         val title = event.title ?: ""
         val url = event.url ?: ""
-        return ShareCompat.IntentBuilder.from(requireActivity())
+        return ShareCompat.IntentBuilder(requireActivity())
                 .setSubject("$title ($CONFERENCE_NAME)")
                 .setType("text/plain")
                 .setText("$title $url $CONFERENCE_HASHTAG")
diff --git a/app/src/main/java/be/digitalia/fosdem/providers/BookmarksExportProvider.kt b/app/src/main/java/be/digitalia/fosdem/providers/BookmarksExportProvider.kt
index 43fa172..e498615 100644
--- a/app/src/main/java/be/digitalia/fosdem/providers/BookmarksExportProvider.kt
+++ b/app/src/main/java/be/digitalia/fosdem/providers/BookmarksExportProvider.kt
@@ -175,9 +175,9 @@ class BookmarksExportProvider : ContentProvider() {
                 .build()
         private val COLUMNS = arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE)
 
-        fun getIntent(activity: Activity?): Intent {
+        fun getIntent(activity: Activity): Intent {
             // Supports granting read permission for the attached shared file
-            return ShareCompat.IntentBuilder.from(activity!!)
+            return ShareCompat.IntentBuilder(activity)
                     .setStream(URI)
                     .setType(TYPE)
                     .intent
diff --git a/app/src/main/res-override/layout/mtrl_navigation_rail_item.xml b/app/src/main/res-override/layout/mtrl_navigation_rail_item.xml
new file mode 100644
index 0000000..d2ebc4c
--- /dev/null
+++ b/app/src/main/res-override/layout/mtrl_navigation_rail_item.xml
@@ -0,0 +1 @@
+<merge />
\ No newline at end of file
diff --git a/app/src/main/res-override/layout/test_navigation_bar_item_layout.xml b/app/src/main/res-override/layout/test_navigation_bar_item_layout.xml
new file mode 100644
index 0000000..d2ebc4c
--- /dev/null
+++ b/app/src/main/res-override/layout/test_navigation_bar_item_layout.xml
@@ -0,0 +1 @@
+<merge />
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b96c8fa..4c7e4be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
     }