diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index feebc1d93..013f79775 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.view.View
 import androidx.annotation.CallSuper
 import androidx.annotation.IdRes
@@ -77,6 +78,7 @@ import org.mozilla.fenix.utils.RunWhenReadyQueue
 import mozilla.components.concept.tabstray.TabsTray
 import mozilla.components.browser.tabstray.TabsAdapter
 import mozilla.components.browser.tabstray.BrowserTabsTray
+import mozilla.components.browser.tabstray.DefaultTabViewHolder
 import org.mozilla.fenix.tabtray.TabTrayFragmentDirections
 
 /**
@@ -218,7 +220,15 @@ open class HomeActivity : LocaleAwareAppCompatActivity() {
         }.asView()
         TabsTray::class.java.name -> {
             val layout = LinearLayoutManager(context)
-            val adapter = TabsAdapter(layoutId = R.layout.tab_tray_item)
+            val adapter = TabsAdapter { parentView, tabsTray ->
+                DefaultTabViewHolder(
+                    LayoutInflater.from(parentView.context).inflate(
+                        R.layout.tab_tray_item,
+                        parentView,
+                        false),
+                    tabsTray
+                )
+            }
             BrowserTabsTray(context, attrs, tabsAdapter = adapter, layout = layout)
         }
         else -> super.onCreateView(parent, name, context, attrs)
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/BreadcrumbsRecorder.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/BreadcrumbsRecorder.kt
index 9f92a2005..14399697b 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/BreadcrumbsRecorder.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/BreadcrumbsRecorder.kt
@@ -10,8 +10,8 @@ import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
-import mozilla.components.lib.crash.Breadcrumb
 import mozilla.components.lib.crash.CrashReporter
+import mozilla.components.support.base.crash.Breadcrumb
 
 /**
  * Records breadcrumbs when the fragment changes.
diff --git a/app/src/main/java/org/mozilla/fenix/push/PushFxaIntegration.kt b/app/src/main/java/org/mozilla/fenix/push/PushFxaIntegration.kt
index aa3f2846f..061d06ac6 100644
--- a/app/src/main/java/org/mozilla/fenix/push/PushFxaIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/push/PushFxaIntegration.kt
@@ -122,7 +122,7 @@ internal class OneTimeMessageDeliveryObserver(
         authType: AuthType
     ) {
         lazyAccount.value.withConstellation {
-            it.processRawEventAsync(String(message))
+            processRawEventAsync(String(message))
         }
 
         MainScope().launch {
diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt
index dbb63ba38..05c518ff3 100644
--- a/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt
@@ -9,6 +9,7 @@ import androidx.navigation.NavDestination
 import mozilla.components.lib.crash.Crash
 import mozilla.components.lib.crash.CrashReporter
 import mozilla.components.lib.crash.service.CrashReporterService
+import mozilla.components.support.base.crash.Breadcrumb
 import mozilla.components.support.test.any
 import mozilla.components.support.test.mock
 import org.junit.Test
@@ -19,7 +20,7 @@ internal class BreadcrumbRecorderTest {
     @Test
     fun `ensure crash reporter recordCrashBreadcrumb is called`() {
         val service = object : CrashReporterService {
-            override fun report(throwable: Throwable): String? = ""
+            override fun report(throwable: Throwable, breadcrumbs: ArrayList<Breadcrumb>): String? = ""
             override fun report(crash: Crash.NativeCodeCrash): String? = ""
             override fun report(crash: Crash.UncaughtExceptionCrash): String? = ""
         }
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index 76282636d..c1f386948 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "40.0.20200504130127"
+    const val VERSION = "41.0.20200505190119"
 }