diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 30dfa000ec..6f32ca068b 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -790,7 +790,6 @@ abstract class BaseBrowserFragment :
 
         webchannelIntegration.set(
             feature = FxaWebChannelFeature(
-                requireContext(),
                 customTabSessionId,
                 requireComponents.core.engine,
                 requireComponents.core.store,
diff --git a/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt b/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt
index 564514b214..642ee2d420 100644
--- a/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt
@@ -44,14 +44,14 @@ class IntentProcessors(
      * Provides intent processing functionality for ACTION_VIEW and ACTION_SEND intents.
      */
     val intentProcessor by lazyMonitored {
-        TabIntentProcessor(tabsUseCases, sessionUseCases.loadUrl, searchUseCases.newTabSearch, isPrivate = false)
+        TabIntentProcessor(tabsUseCases, searchUseCases.newTabSearch, isPrivate = false)
     }
 
     /**
      * Provides intent processing functionality for ACTION_VIEW and ACTION_SEND intents in private tabs.
      */
     val privateIntentProcessor by lazyMonitored {
-        TabIntentProcessor(tabsUseCases, sessionUseCases.loadUrl, searchUseCases.newTabSearch, isPrivate = true)
+        TabIntentProcessor(tabsUseCases, searchUseCases.newTabSearch, isPrivate = true)
     }
 
     val customTabIntentProcessor by lazyMonitored {
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkSearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkSearchDialogFragment.kt
index 69c0b15025..896f4232fb 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkSearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkSearchDialogFragment.kt
@@ -283,7 +283,7 @@ class BookmarkSearchDialogFragment : AppCompatDialogFragment(), UserInteractionH
 
         if (voiceSearchButtonAlreadyAdded || !shouldShowVoiceSearch) return
 
-        toolbarView.view.addEditAction(
+        toolbarView.view.addEditActionEnd(
             BrowserToolbar.Button(
                 imageDrawable = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_microphone)!!,
                 contentDescription = requireContext().getString(R.string.voice_search_content_description),
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistorySearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistorySearchDialogFragment.kt
index 38240df533..ace1a291b3 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistorySearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistorySearchDialogFragment.kt
@@ -285,7 +285,7 @@ class HistorySearchDialogFragment : AppCompatDialogFragment(), UserInteractionHa
 
         if (voiceSearchButtonAlreadyAdded || !shouldShowVoiceSearch) return
 
-        toolbarView.view.addEditAction(
+        toolbarView.view.addEditActionEnd(
             BrowserToolbar.Button(
                 imageDrawable = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_microphone)!!,
                 contentDescription = requireContext().getString(R.string.voice_search_content_description),
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
index 9bad1cc011..b67554ea19 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
@@ -636,7 +636,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
                 requireContext().settings().shouldShowVoiceSearch
 
         if (isVisible) {
-            toolbarView.view.addEditAction(
+            toolbarView.view.addEditActionEnd(
                 BrowserToolbar.Button(
                     AppCompatResources.getDrawable(requireContext(), R.drawable.ic_microphone)!!,
                     requireContext().getString(R.string.voice_search_content_description),