diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 60ea8c21a..136c95583 100644
Binary files a/netbox/project-static/dist/netbox.css and b/netbox/project-static/dist/netbox.css differ
diff --git a/netbox/project-static/styles/transitional/_tabs.scss b/netbox/project-static/styles/transitional/_tabs.scss
index 86c340805..d00086f80 100644
--- a/netbox/project-static/styles/transitional/_tabs.scss
+++ b/netbox/project-static/styles/transitional/_tabs.scss
@@ -1,7 +1,11 @@
 // In-page content tabs
 .page-tabs {
+  // Set the border on page-tabs to ensure it expands the full page width
+  border-bottom: 1px solid $card-border-color;
+
   .nav-tabs {
     position: relative;
+    border: none;
 
     .nav-link {
       &.active,
diff --git a/netbox/templates/account/base.html b/netbox/templates/account/base.html
index 1c0e458fc..51076f781 100644
--- a/netbox/templates/account/base.html
+++ b/netbox/templates/account/base.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li role="presentation" class="nav-item">
       <a class="nav-link{% if active_tab == 'profile' %} active{% endif %}" href="{% url 'account:profile' %}">{% trans "Profile" %}</a>
     </li>
diff --git a/netbox/templates/core/configrevision_restore.html b/netbox/templates/core/configrevision_restore.html
index c26f2fbf1..b1f00a385 100644
--- a/netbox/templates/core/configrevision_restore.html
+++ b/netbox/templates/core/configrevision_restore.html
@@ -24,7 +24,7 @@
 {% endblock controls %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3" role="tablist">
+  <ul class="nav nav-tabs" role="tablist">
     <li class="nav-item" role="presentation">
       <a href="#log" role="tab" data-bs-toggle="tab" class="nav-link active">{% trans "Restore" %}</a>
     </li>
diff --git a/netbox/templates/extras/report/base.html b/netbox/templates/extras/report/base.html
index ff1c6a10f..05b077ed6 100644
--- a/netbox/templates/extras/report/base.html
+++ b/netbox/templates/extras/report/base.html
@@ -25,7 +25,7 @@
 {% block controls %}{% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <a class="nav-link{% if not tab %} active{% endif %}" href="{% url 'extras:report' module=report.module name=report.class_name %}">{% trans "Report" %}</a>
     </li>
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index ff6e9a971..31ca87abb 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -7,7 +7,7 @@
 {% block title %}{% trans "Reports" %}{% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <a class="nav-link active" role="tab">{% trans "Reports" %}</a>
     </li>
diff --git a/netbox/templates/extras/script/base.html b/netbox/templates/extras/script/base.html
index 5aaa5016a..70f9a94e0 100644
--- a/netbox/templates/extras/script/base.html
+++ b/netbox/templates/extras/script/base.html
@@ -24,7 +24,7 @@
 {% block controls %}{% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <a class="nav-link{% if not tab %} active{% endif %}" href="{% url 'extras:script' module=script.module name=script.class_name %}">{% trans "Script" %}</a>
     </li>
diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index d2404af17..3bd32ffdc 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -15,7 +15,7 @@
 {% endblock controls %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <a class="nav-link active" role="tab">{% trans "Scripts" %}</a>
     </li>
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index 544146aa9..24dba95b6 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -37,7 +37,7 @@
 {% endblock controls %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3" role="tablist">
+  <ul class="nav nav-tabs" role="tablist">
     <li class="nav-item" role="presentation">
       <a href="#log" role="tab" data-bs-toggle="tab" class="nav-link active">{% trans "Log" %}</a>
     </li>
diff --git a/netbox/templates/generic/_base.html b/netbox/templates/generic/_base.html
index 7f2cac5a1..d835e729d 100644
--- a/netbox/templates/generic/_base.html
+++ b/netbox/templates/generic/_base.html
@@ -10,7 +10,7 @@
 
           {# Title #}
           <div class="col">
-            <h2 class="page-title mb-1">{% block title %}{% endblock title %}</h2>
+            <h2 class="page-title my-1">{% block title %}{% endblock title %}</h2>
             {% block subtitle %}{% endblock %}
           </div>
 
@@ -25,7 +25,9 @@
 
     {# Tabs #}
     <div class="page-tabs mt-3">
-      {% block tabs %}{% endblock %}
+      <div class="container-xl">
+        {% block tabs %}{% endblock %}
+      </div>
     </div>
 
   </div>
diff --git a/netbox/templates/generic/bulk_add_component.html b/netbox/templates/generic/bulk_add_component.html
index 799fd1606..bbb7fdb75 100644
--- a/netbox/templates/generic/bulk_add_component.html
+++ b/netbox/templates/generic/bulk_add_component.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <button class="nav-link active" id="component-form-tab" data-bs-toggle="tab" data-bs-target="#component-form" type="button" role="tab" aria-controls="component-form" aria-selected="true">
         {% trans "Bulk Creation" %}
diff --git a/netbox/templates/generic/bulk_delete.html b/netbox/templates/generic/bulk_delete.html
index 2cae404cb..03db2478f 100644
--- a/netbox/templates/generic/bulk_delete.html
+++ b/netbox/templates/generic/bulk_delete.html
@@ -19,7 +19,7 @@ Context:
 {% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <button class="nav-link active" id="delete-form-tab" data-bs-toggle="tab" data-bs-target="#delete-form" type="button" role="tab" aria-controls="delete-form" aria-selected="true">
         {% trans "Bulk Delete" %}
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html
index 6dd35617a..10788d62f 100644
--- a/netbox/templates/generic/bulk_edit.html
+++ b/netbox/templates/generic/bulk_edit.html
@@ -17,7 +17,7 @@ Context:
 {% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <button class="nav-link active" id="edit-form-tab" data-bs-toggle="tab" data-bs-target="#edit-form" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
         {% trans "Bulk Edit" %}
diff --git a/netbox/templates/generic/bulk_import.html b/netbox/templates/generic/bulk_import.html
index b23c2cebb..db91d22c2 100644
--- a/netbox/templates/generic/bulk_import.html
+++ b/netbox/templates/generic/bulk_import.html
@@ -14,7 +14,7 @@ Context:
 {% block title %}{{ model|meta:"verbose_name"|bettertitle }} {% trans "Bulk Import" %}{% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <button class="nav-link active" id="import-form-tab" data-bs-toggle="tab" data-bs-target="#import-form" data-href="#tab_import-form" type="button" role="tab" aria-controls="import-form" aria-selected="true">
         {% trans "Direct Import" %}
diff --git a/netbox/templates/generic/bulk_remove.html b/netbox/templates/generic/bulk_remove.html
index 65871a55a..f5eab0a37 100644
--- a/netbox/templates/generic/bulk_remove.html
+++ b/netbox/templates/generic/bulk_remove.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <button class="nav-link active" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
         {% trans "Bulk Remove" %}
diff --git a/netbox/templates/generic/bulk_rename.html b/netbox/templates/generic/bulk_rename.html
index 4ba39c254..e98075401 100644
--- a/netbox/templates/generic/bulk_rename.html
+++ b/netbox/templates/generic/bulk_rename.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <button class="nav-link active" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
         {% trans "Bulk Rename" %}
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index 828131ed9..17d2d8ae2 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -20,7 +20,7 @@ Context:
 
 {% block page-header %}
   <div class="container-xl">
-    <div class="d-flex justify-content-between align-items-center my-2">
+    <div class="d-flex justify-content-between align-items-center mt-2">
 
       {# Breadcrumbs #}
       <ol class="breadcrumb" aria-label="breadcrumbs">
@@ -82,7 +82,7 @@ Context:
 {% endblock controls %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     {# Primary tab #}
     <li class="nav-item" role="presentation">
       <a class="nav-link{% if not tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index d9071e015..8338a68d1 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -36,7 +36,7 @@ Context:
 {% endblock controls %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <button class="nav-link active" id="edit-form-tab" data-bs-toggle="tab" data-bs-target="#edit-form" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
         {% if object.pk %}{% trans "Edit" %}{% else %}{% trans "Create" %}{% endif %}
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 3a9443c8d..bf0777406 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -40,7 +40,7 @@ Context:
 {% endblock controls %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3" role="tablist">
+  <ul class="nav nav-tabs" role="tablist">
     <li class="nav-item" role="presentation">
       <a class="nav-link active" id="object-list-tab" data-bs-toggle="tab" data-bs-target="#object-list" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
         {% trans "Results" %} {% badge table.page.paginator.count %}
diff --git a/netbox/templates/ipam/inc/ipaddress_edit_header.html b/netbox/templates/ipam/inc/ipaddress_edit_header.html
index 6e65de113..a635fbd8b 100644
--- a/netbox/templates/ipam/inc/ipaddress_edit_header.html
+++ b/netbox/templates/ipam/inc/ipaddress_edit_header.html
@@ -1,7 +1,7 @@
 {% load helpers %}
 {% load i18n %}
 
-<ul class="nav nav-tabs px-3">
+<ul class="nav nav-tabs">
   <li class="nav-item">
       <a
           class="nav-link {% if active_tab == 'add' %}active{% endif %}"
diff --git a/netbox/templates/search.html b/netbox/templates/search.html
index a041c6bf7..e56b8f379 100644
--- a/netbox/templates/search.html
+++ b/netbox/templates/search.html
@@ -1,4 +1,4 @@
-{% extends 'base/layout.html' %}
+{% extends 'generic/_base.html' %}
 {% load helpers %}
 {% load form_helpers %}
 {% load render_table from django_tables2 %}
@@ -7,7 +7,7 @@
 {% block title %}{% trans "Search" %}{% endblock %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs">
     <li class="nav-item" role="presentation">
       <button class="nav-link active" type="button" role="tab">
         {% trans "Results" %}