diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 55fc1d047..bf6aae94a 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -10,7 +10,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.transition.TransitionInflater
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.fragment_browser.*
 import kotlinx.android.synthetic.main.fragment_browser.view.*
@@ -48,16 +47,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
     private val windowFeature = ViewBoundFeatureWrapper<WindowFeature>()
     private val searchFeature = ViewBoundFeatureWrapper<SearchFeature>()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        postponeEnterTransition()
-        sharedElementEnterTransition =
-            TransitionInflater.from(context).inflateTransition(android.R.transition.move)
-                .setDuration(
-                    SHARED_TRANSITION_MS
-                )
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index c10082a79..c4e069545 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -33,7 +33,6 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.FragmentNavigator
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -544,11 +543,7 @@ class HomeFragment : Fragment() {
             sessionId = null
         )
 
-        val extras = FragmentNavigator.Extras.Builder()
-                .addSharedElement(toolbar_wrapper, "toolbar_wrapper_transition")
-                .build()
-
-        nav(R.id.homeFragment, directions, extras)
+        nav(R.id.homeFragment, directions)
     }
 
     private fun openSettingsScreen() {
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
index 1d415cf5b..60af3cc2c 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -21,7 +21,6 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import androidx.transition.TransitionInflater
 import kotlinx.android.synthetic.main.fragment_search.*
 import kotlinx.android.synthetic.main.fragment_search.view.*
 import kotlinx.android.synthetic.main.search_suggestions_onboarding.view.*
@@ -57,17 +56,6 @@ class SearchFragment : Fragment(), UserInteractionHandler {
     private lateinit var searchStore: SearchFragmentStore
     private lateinit var searchInteractor: SearchInteractor
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        postponeEnterTransition()
-
-        sharedElementEnterTransition =
-            TransitionInflater.from(context).inflateTransition(android.R.transition.move)
-                .setDuration(SHARED_TRANSITION_MS)
-
-        requireComponents.analytics.metrics.track(Event.InteractWithSearchURLArea)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -87,6 +75,8 @@ class SearchFragment : Fragment(), UserInteractionHandler {
 
         val isPrivate = (activity as HomeActivity).browsingModeManager.mode.isPrivate
 
+        requireComponents.analytics.metrics.track(Event.InteractWithSearchURLArea)
+
         val showSearchSuggestions =
             if (isPrivate) {
                 requireContext().settings().shouldShowSearchSuggestions &&
diff --git a/app/src/main/res/anim/fade_in_up.xml b/app/src/main/res/anim/fade_in_up.xml
index d0d6b10b8..ff0d3f163 100644
--- a/app/src/main/res/anim/fade_in_up.xml
+++ b/app/src/main/res/anim/fade_in_up.xml
@@ -6,9 +6,9 @@
     <alpha
         android:interpolator="@android:interpolator/decelerate_quad"
         android:fromAlpha="0" android:toAlpha="1"
-        android:duration="125" />
+        android:duration="150" />
     <translate
         android:interpolator="@android:interpolator/decelerate_quad"
         android:fromYDelta="7%" android:toYDelta="0%"
-        android:duration="125"/>
+        android:duration="150"/>
 </set>
diff --git a/app/src/main/res/layout/component_browser_top_toolbar.xml b/app/src/main/res/layout/component_browser_top_toolbar.xml
index 0b904a14d..ea19bfc1a 100644
--- a/app/src/main/res/layout/component_browser_top_toolbar.xml
+++ b/app/src/main/res/layout/component_browser_top_toolbar.xml
@@ -15,7 +15,6 @@
     android:background="@drawable/toolbar_background_top"
     android:clickable="true"
     android:focusable="true"
-    android:transitionName="toolbar_wrapper_transition"
     android:focusableInTouchMode="true"
     app:layout_scrollFlags="scroll|enterAlways|snap|exitUntilCollapsed"
     app:browserToolbarClearColor="?primaryText"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 5a592e99c..58a8a3a89 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -120,7 +120,6 @@
             android:clickable="true"
             android:contentDescription="@string/search_hint"
             android:focusable="true"
-            android:transitionName="toolbar_wrapper_transition"
             app:layout_constraintBottom_toBottomOf="@id/bottom_bar"
             app:layout_constraintEnd_toStartOf="@+id/add_tab_button"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index fcb47030a..985c0fa81 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -38,7 +38,6 @@
         android:layout_height="@dimen/browser_toolbar_height"
         android:layout_margin="0dp"
         android:outlineProvider="paddedBounds"
-        android:transitionName="toolbar_wrapper_transition"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 087c1d389..71774d434 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -69,10 +69,8 @@
         <action
             android:id="@+id/action_homeFragment_to_searchFragment"
             app:destination="@id/searchFragment"
-            app:enterAnim="@anim/fade_in"
-            app:exitAnim="@anim/fade_out"
-            app:popEnterAnim="@anim/fade_in"
-            app:popExitAnim="@anim/fade_out" />
+            app:enterAnim="@anim/fade_in_up"
+            app:popExitAnim="@anim/fade_out_down" />
         <action
             android:id="@+id/action_homeFragment_to_browserFragment"
             app:destination="@id/browserFragment"