diff --git a/mobile/android/base/resources/layout/remote_tabs_setup_panel.xml b/mobile/android/base/resources/layout/remote_tabs_setup_panel.xml
index 29a29d5a8d41..52a85cbd0513 100644
--- a/mobile/android/base/resources/layout/remote_tabs_setup_panel.xml
+++ b/mobile/android/base/resources/layout/remote_tabs_setup_panel.xml
@@ -6,7 +6,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout android:id="@+id/remote_tabs_setup_containing_layout"
-                  style="@style/TabsPanelFrame"
+                  style="@style/TabsPanelFrame.RemoteTabs"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent">
 
diff --git a/mobile/android/base/resources/layout/remote_tabs_verification_panel.xml b/mobile/android/base/resources/layout/remote_tabs_verification_panel.xml
index 5697a114bd86..c947fcf0825d 100644
--- a/mobile/android/base/resources/layout/remote_tabs_verification_panel.xml
+++ b/mobile/android/base/resources/layout/remote_tabs_verification_panel.xml
@@ -6,7 +6,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout android:id="@+id/remote_tabs_verification_containing_layout"
-                  style="@style/TabsPanelFrame"
+                  style="@style/TabsPanelFrame.RemoteTabs"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent">
 
diff --git a/mobile/android/base/resources/values-large-land-v11/styles.xml b/mobile/android/base/resources/values-large-land-v11/styles.xml
index 95e621b2ea18..89cd9248d841 100644
--- a/mobile/android/base/resources/values-large-land-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-land-v11/styles.xml
@@ -64,8 +64,14 @@
         <!-- We set values in tablet portrait. -->
     </style>
 
+    <style name="TabsPanelFrame.RemoteTabs">
+        <item name="android:paddingLeft">0dp</item>
+        <item name="android:paddingRight">0dp</item>
+    </style>
+
     <style name="TabsPanelSection" parent="TabsPanelSectionBase">
-        <!-- To override the values-land style. -->
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginRight">20dp</item>
     </style>
 
     <style name="TabsPanelSection.PrivateTabs">
@@ -86,8 +92,6 @@
         <item name="android:paddingBottom">12dp</item>
         <item name="android:paddingLeft">6dp</item>
         <item name="android:paddingRight">6dp</item>
-        <item name="android:layout_marginLeft">12dp</item>
-        <item name="android:layout_marginRight">12dp</item>
         <item name="android:textSize">16sp</item>
     </style>
 
diff --git a/mobile/android/base/resources/values-large-v11/styles.xml b/mobile/android/base/resources/values-large-v11/styles.xml
index a6a622148d82..98dec043c067 100644
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -95,6 +95,11 @@
     </style>
 
     <!-- Tabs panel -->
+    <style name="TabsPanelFrame.RemoteTabs" parent="TabsPanelFrameBase">
+        <item name="android:paddingLeft">112dp</item>
+        <item name="android:paddingRight">112dp</item>
+    </style>
+
     <style name="TabsPanelFrame.PrivateTabs">
         <item name="android:orientation">horizontal</item>
         <item name="android:paddingTop">0dp</item>
@@ -118,19 +123,4 @@
         <item name="android:layout_gravity">center</item>
     </style>
 
-    <!-- Tabs panel -->
-    <style name="TabsPanelFrame" parent="TabsPanelFrameBase">
-        <item name="android:paddingLeft">84dp</item>
-        <item name="android:paddingRight">84dp</item>
-    </style>
-
-    <style name="TabsPanelItem.Button" parent="TabsPanelItem.ButtonBase">
-        <item name="android:paddingTop">18dp</item>
-        <item name="android:paddingBottom">18dp</item>
-        <item name="android:paddingLeft">9dp</item>
-        <item name="android:paddingRight">9dp</item>
-        <item name="android:layout_marginLeft">90dp</item>
-        <item name="android:layout_marginRight">90dp</item>
-    </style>
-
 </resources>
diff --git a/mobile/android/base/resources/values-xlarge-land-v11/styles.xml b/mobile/android/base/resources/values-xlarge-land-v11/styles.xml
index 278e131a2a40..18a8f23b8ad2 100644
--- a/mobile/android/base/resources/values-xlarge-land-v11/styles.xml
+++ b/mobile/android/base/resources/values-xlarge-land-v11/styles.xml
@@ -29,13 +29,16 @@
     </style>
 
     <!-- Tabs panel -->
+    <style name="TabsPanelFrame.RemoteTabs" parent="TabsPanelFrameBase">
+        <item name="android:paddingLeft">0dp</item>
+        <item name="android:paddingRight">0dp</item>
+    </style>
+
     <style name="TabsPanelItem.Button" parent="TabsPanelItem.ButtonBase">
         <item name="android:paddingTop">12dp</item>
         <item name="android:paddingBottom">12dp</item>
         <item name="android:paddingLeft">6dp</item>
         <item name="android:paddingRight">6dp</item>
-        <item name="android:layout_marginLeft">12dp</item>
-        <item name="android:layout_marginRight">12dp</item>
         <item name="android:textSize">16dp</item>
     </style>
 
diff --git a/mobile/android/base/resources/values-xlarge-v11/styles.xml b/mobile/android/base/resources/values-xlarge-v11/styles.xml
index 7b9a78fc241e..1f58f9957291 100644
--- a/mobile/android/base/resources/values-xlarge-v11/styles.xml
+++ b/mobile/android/base/resources/values-xlarge-v11/styles.xml
@@ -31,13 +31,9 @@
     </style>
 
     <!-- Tabs panel -->
-    <style name="TabsPanelItem.Button" parent="TabsPanelItem.ButtonBase">
-        <item name="android:paddingTop">18dp</item>
-        <item name="android:paddingBottom">18dp</item>
-        <item name="android:paddingLeft">9dp</item>
-        <item name="android:paddingRight">9dp</item>
-        <item name="android:layout_marginLeft">180dp</item>
-        <item name="android:layout_marginRight">180dp</item>
+    <style name="TabsPanelFrame.RemoteTabs" parent="TabsPanelFrameBase">
+        <item name="android:paddingLeft">212dp</item>
+        <item name="android:paddingRight">212dp</item>
     </style>
 
 </resources>