diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
index 2f6719da0..0eccb3271 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@@ -141,10 +141,10 @@ class BrowserToolbarView(
                     false
                 }
 
-                display.progressGravity = if (isCustomTabSession) {
-                    DisplayToolbar.Gravity.BOTTOM
-                } else {
+                display.progressGravity = if (shouldUseBottomToolbar) {
                     DisplayToolbar.Gravity.TOP
+                } else {
+                    DisplayToolbar.Gravity.BOTTOM
                 }
 
                 val primaryTextColor = ContextCompat.getColor(
diff --git a/app/src/main/res/drawable/toolbar_background_top.xml b/app/src/main/res/drawable/toolbar_background_top.xml
new file mode 100644
index 000000000..ac972c52d
--- /dev/null
+++ b/app/src/main/res/drawable/toolbar_background_top.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="45"
+                android:startColor="?toolbarStartGradient"
+                android:centerColor="?toolbarCenterGradient"
+                android:endColor="?toolbarEndGradient"
+                android:type="linear" />
+        </shape>
+    </item>
+    <item android:gravity="bottom">
+        <shape android:shape="rectangle">
+            <size android:height="1dp" />
+            <solid android:color="?neutralFaded" />
+        </shape>
+    </item>
+</layer-list>
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 b10864861..ea19bfc1a 100644
--- a/app/src/main/res/layout/component_browser_top_toolbar.xml
+++ b/app/src/main/res/layout/component_browser_top_toolbar.xml
@@ -12,7 +12,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/browser_toolbar_height"
     android:layout_gravity="top"
-    android:background="@drawable/toolbar_background"
+    android:background="@drawable/toolbar_background_top"
     android:clickable="true"
     android:focusable="true"
     android:focusableInTouchMode="true"
@@ -20,7 +20,7 @@
     app:browserToolbarClearColor="?primaryText"
     app:browserToolbarInsecureColor="?primaryText"
     app:browserToolbarMenuColor="?primaryText"
-    app:browserToolbarProgressBarGravity="top"
+    app:browserToolbarProgressBarGravity="bottom"
     app:browserToolbarSecureColor="?primaryText"
     app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider" />
 </com.google.android.material.appbar.AppBarLayout>