diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py
index 2576f70e5..67b11ae2d 100644
--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -275,7 +275,7 @@ class ActionsColumn(tables.Column):
                 if len(self.actions) == 1 or (self.split_actions and idx == 0):
                     dropdown_class = attrs.css_class
                     button = (
-                        f'<a class="btn btn-sm btn-{attrs.css_class}" href="{url}{url_appendix}" type="button">'
+                        f'<a class="btn btn-sm btn-{attrs.css_class}" href="{url}{url_appendix}" type="button" aria-label="{attrs.title}">'
                         f'<i class="mdi mdi-{attrs.icon}"></i></a>'
                     )
 
diff --git a/netbox/project-static/dist/netbox-external.css b/netbox/project-static/dist/netbox-external.css
index 05e350aa8..ead382177 100644
Binary files a/netbox/project-static/dist/netbox-external.css and b/netbox/project-static/dist/netbox-external.css differ
diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 98d1ea325..c9fb7c49b 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/dist/plus-jakarta-sans-cyrillic-ext-wght-normal-3FNWYSHQ.woff2 b/netbox/project-static/dist/plus-jakarta-sans-cyrillic-ext-wght-normal-3FNWYSHQ.woff2
new file mode 100644
index 000000000..c456409f0
Binary files /dev/null and b/netbox/project-static/dist/plus-jakarta-sans-cyrillic-ext-wght-normal-3FNWYSHQ.woff2 differ
diff --git a/netbox/project-static/dist/plus-jakarta-sans-latin-ext-wght-normal-WWG75Y4U.woff2 b/netbox/project-static/dist/plus-jakarta-sans-latin-ext-wght-normal-WWG75Y4U.woff2
new file mode 100644
index 000000000..bdb7edfd4
Binary files /dev/null and b/netbox/project-static/dist/plus-jakarta-sans-latin-ext-wght-normal-WWG75Y4U.woff2 differ
diff --git a/netbox/project-static/dist/plus-jakarta-sans-latin-wght-normal-S6EFCQOU.woff2 b/netbox/project-static/dist/plus-jakarta-sans-latin-wght-normal-S6EFCQOU.woff2
new file mode 100644
index 000000000..8c4a84afe
Binary files /dev/null and b/netbox/project-static/dist/plus-jakarta-sans-latin-wght-normal-S6EFCQOU.woff2 differ
diff --git a/netbox/project-static/dist/plus-jakarta-sans-vietnamese-wght-normal-NNXUV3SN.woff2 b/netbox/project-static/dist/plus-jakarta-sans-vietnamese-wght-normal-NNXUV3SN.woff2
new file mode 100644
index 000000000..57866b15f
Binary files /dev/null and b/netbox/project-static/dist/plus-jakarta-sans-vietnamese-wght-normal-NNXUV3SN.woff2 differ
diff --git a/netbox/project-static/package.json b/netbox/project-static/package.json
index c0ee79754..482e78598 100644
--- a/netbox/project-static/package.json
+++ b/netbox/project-static/package.json
@@ -22,6 +22,7 @@
     "validate:formatting:scripts": "prettier -c src/**/*.ts"
   },
   "dependencies": {
+    "@fontsource-variable/plus-jakarta-sans": "^5.0.21",
     "@mdi/font": "7.4.47",
     "@tabler/core": "1.0.0-beta20",
     "bootstrap": "5.3.3",
@@ -32,7 +33,6 @@
     "query-string": "9.0.0",
     "sass": "1.77.6",
     "tom-select": "2.3.1",
-    "typeface-inter": "3.18.1",
     "typeface-roboto-mono": "1.1.13"
   },
   "devDependencies": {
diff --git a/netbox/project-static/styles/_variables.scss b/netbox/project-static/styles/_variables.scss
index 0a1febaff..23ae3d544 100644
--- a/netbox/project-static/styles/_variables.scss
+++ b/netbox/project-static/styles/_variables.scss
@@ -1,7 +1,7 @@
 // Global variables
 
 // Set base fonts
-$font-family-sans-serif: 'Inter';
+$font-family-sans-serif: 'Plus Jakarta Sans Variable', system-ui, sans-serif;
 // See https://github.com/tabler/tabler/issues/1812
 $font-family-monospace: 'Roboto Mono';
 
diff --git a/netbox/project-static/styles/external.scss b/netbox/project-static/styles/external.scss
index b3c83aa87..d89a2f140 100644
--- a/netbox/project-static/styles/external.scss
+++ b/netbox/project-static/styles/external.scss
@@ -6,3 +6,4 @@
 // Fonts
 @import url("../node_modules/typeface-inter/inter.css");
 @import url("../node_modules/typeface-roboto-mono/index.css");
+@import url("../node_modules/@fontsource-variable/plus-jakarta-sans/index.css");
diff --git a/netbox/project-static/styles/transitional/_cards.scss b/netbox/project-static/styles/transitional/_cards.scss
index 6a7666524..1b619ab9b 100644
--- a/netbox/project-static/styles/transitional/_cards.scss
+++ b/netbox/project-static/styles/transitional/_cards.scss
@@ -16,6 +16,12 @@
       background: var(--#{$prefix}bg-surface-tertiary);
     }
 
+    // Use <h5> font size for card headers
+    h2.card-header {
+      @extend h5;
+      margin-bottom: 0;
+    }
+
     // Reduce padding
     .list-group-item {
       padding: 0.5rem 0.75rem;
diff --git a/netbox/project-static/styles/transitional/_forms.scss b/netbox/project-static/styles/transitional/_forms.scss
index a489d87de..187b4bbcc 100644
--- a/netbox/project-static/styles/transitional/_forms.scss
+++ b/netbox/project-static/styles/transitional/_forms.scss
@@ -4,6 +4,13 @@ form.object-edit {
   max-width: 800px;
 }
 
+// Use <h4> style for field group headings
+.field-group {
+  h2 {
+    @extend h4;
+  }
+}
+
 // Set bond font & append an asterisk to labels for required fields
 .col-form-label.required {
   font-weight: bold;
diff --git a/netbox/project-static/yarn.lock b/netbox/project-static/yarn.lock
index 6e5517d59..4f126692b 100644
--- a/netbox/project-static/yarn.lock
+++ b/netbox/project-static/yarn.lock
@@ -80,6 +80,11 @@
   resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5"
   integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==
 
+"@fontsource-variable/plus-jakarta-sans@^5.0.21":
+  version "5.0.21"
+  resolved "https://registry.yarnpkg.com/@fontsource-variable/plus-jakarta-sans/-/plus-jakarta-sans-5.0.21.tgz#3bb6e0d16add99f0b93981443d4d763ea85ad13b"
+  integrity sha512-VTQB+MnaYbjLNmfxQJ/Fc2rayLGlqTiZa6nZTpplS0lJF3XKcWPPItilGFMZW4lfwIiroo+FIfBewBOF3MrMPQ==
+
 "@graphiql/plugin-explorer@2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@graphiql/plugin-explorer/-/plugin-explorer-2.0.0.tgz#d6869cba019ae6fac006ce61ae3470d8c8a83938"
@@ -2774,11 +2779,6 @@ typed-array-length@^1.0.6:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
-typeface-inter@3.18.1:
-  version "3.18.1"
-  resolved "https://registry.yarnpkg.com/typeface-inter/-/typeface-inter-3.18.1.tgz#24cccdf29923f318589783997be20a662cd3ab9c"
-  integrity sha512-c+TBanYFCvmg3j5vPk+zxK4ocMZbPxMEmjnwG7rPQoV87xvQ6b07VbAOC0Va0XBbbZCGw6cWNeFuLeg1YQru3Q==
-
 typeface-roboto-mono@1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz#2af8662db8f9119c00efd55d6ed8877d2a69ec94"
diff --git a/netbox/templates/500.html b/netbox/templates/500.html
index b26b61973..4805e9240 100644
--- a/netbox/templates/500.html
+++ b/netbox/templates/500.html
@@ -14,9 +14,9 @@
         <div class="row">
             <div class="col col-md-6 offset-md-3">
                 <div class="card border-danger mt-5">
-                    <h5 class="card-header">
+                    <h2 class="card-header">
                         <i class="mdi mdi-alert"></i> {% trans "Server Error" %}
-                    </h5>
+                    </h2>
                     <div class="card-body">
                         {% block message %}
                             <p>
diff --git a/netbox/templates/account/base.html b/netbox/templates/account/base.html
index 51076f781..b0e4e702a 100644
--- a/netbox/templates/account/base.html
+++ b/netbox/templates/account/base.html
@@ -2,24 +2,23 @@
 {% load i18n %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs">
-    <li role="presentation" class="nav-item">
+  <ul class="nav nav-tabs" role="presentation">
+    <li class="nav-item">
       <a class="nav-link{% if active_tab == 'profile' %} active{% endif %}" href="{% url 'account:profile' %}">{% trans "Profile" %}</a>
     </li>
-    <li role="presentation" class="nav-item">
+    <li class="nav-item">
       <a class="nav-link{% if active_tab == 'bookmarks' %} active{% endif %}" href="{% url 'account:bookmarks' %}">{% trans "Bookmarks" %}</a>
     </li>
-    <li role="presentation" class="nav-item">
+    <li class="nav-item">
       <a class="nav-link{% if active_tab == 'preferences' %} active{% endif %}" href="{% url 'account:preferences' %}">{% trans "Preferences" %}</a>
     </li>
     {% if not request.user.ldap_username %}
-      <li role="presentation" class="nav-item">
+      <li class="nav-item">
         <a class="nav-link{% if active_tab == 'password' %} active{% endif %}" href="{% url 'account:change_password' %}">{% trans "Password" %}</a>
       </li>
     {% endif %}
-    <li role="presentation" class="nav-item">
+    <li class="nav-item">
       <a class="nav-link{% if active_tab == 'api-tokens' %} active{% endif %}" href="{% url 'account:usertoken_list' %}">{% trans "API Tokens" %}</a>
     </li>
   </ul>
 {% endblock %}
-
diff --git a/netbox/templates/account/password.html b/netbox/templates/account/password.html
index 002ecadc7..b2988ddcc 100644
--- a/netbox/templates/account/password.html
+++ b/netbox/templates/account/password.html
@@ -8,7 +8,9 @@
   <form action="." method="post" class="object-edit">
     {% csrf_token %}
     <div class="field-group mb-5">
-      <h5 class="col-9 offset-3">{% trans "Password" %}</h5>
+      <div class="row">
+        <h2 class="col-9 offset-3">{% trans "Password" %}</h2>
+      </div>
       {% render_field form.old_password %}
       {% render_field form.new_password1 %}
       {% render_field form.new_password2 %}
diff --git a/netbox/templates/account/preferences.html b/netbox/templates/account/preferences.html
index 0276b9adb..da266ace1 100644
--- a/netbox/templates/account/preferences.html
+++ b/netbox/templates/account/preferences.html
@@ -19,7 +19,7 @@
       {% if plugin_fields %}
         <div class="field-group my-5">
           <div class="row">
-            <h5 class="col-9 offset-3">{% trans "Plugins" %}</h5>
+            <h2 class="col-9 offset-3">{% trans "Plugins" %}</h2>
           </div>
           {% for name in plugin_fields %}
             {% render_field form|getfield:name %}
@@ -31,7 +31,7 @@
     {# Table configurations #}
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Table Configurations" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Table Configurations" %}</h2>
       </div>
       <div class="row">
         {% if request.user.config.data.tables %}
diff --git a/netbox/templates/account/profile.html b/netbox/templates/account/profile.html
index 6a58450e0..d8be72e08 100644
--- a/netbox/templates/account/profile.html
+++ b/netbox/templates/account/profile.html
@@ -9,7 +9,7 @@
   <div class="row mb-3">
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Account Details" %}</h5>
+        <h2 class="card-header">{% trans "Account Details" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Username" %}</th>
@@ -50,7 +50,7 @@
     </div>
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Assigned Groups" %}</h5>
+        <h2 class="card-header">{% trans "Assigned Groups" %}</h2>
         <ul class="list-group list-group-flush">
           {% for group in request.user.groups.all %}
             <li class="list-group-item">{{ group }}</li>
@@ -65,7 +65,7 @@
     <div class="row">
       <div class="col-md-12">
         <div class="card">
-          <h5 class="card-header text-center">{% trans "Recent Activity" %}</h5>
+          <h2 class="card-header text-center">{% trans "Recent Activity" %}</h2>
           <div class="table-responsive">
             {% render_table changelog_table 'inc/table.html' %}
           </div>
diff --git a/netbox/templates/account/token.html b/netbox/templates/account/token.html
index 7001d6a14..f8ce7badd 100644
--- a/netbox/templates/account/token.html
+++ b/netbox/templates/account/token.html
@@ -16,7 +16,7 @@
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Token" %}</h5>
+        <h2 class="card-header">{% trans "Token" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Key" %}</th>
diff --git a/netbox/templates/base/40x.html b/netbox/templates/base/40x.html
index d14882964..003da1a75 100644
--- a/netbox/templates/base/40x.html
+++ b/netbox/templates/base/40x.html
@@ -7,9 +7,9 @@
 <div class="row my-5">
     <div class="col-6 offset-3">
         <div class="card">
-            <h5 class="card-header text-danger">
+            <h2 class="card-header text-danger">
                 {{ request_path }}
-            </h5>
+            </h2>
             <div class="card-body">
                 {% block message %}{% endblock %}
             </div>
diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html
index 1030c469b..291bebad9 100644
--- a/netbox/templates/base/base.html
+++ b/netbox/templates/base/base.html
@@ -11,7 +11,7 @@
   >
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width, viewport-fit=cover" />
+    <meta name="viewport" content="initial-scale=1, maximum-scale=5, width=device-width, viewport-fit=cover" />
     <meta name="htmx-config" content='{"scrollBehavior": "auto"}'>
 
     {# Page title #}
diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index fb3d8185a..36450e4dc 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -12,7 +12,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Circuit" %}</h5>
+        <h2 class="card-header">{% trans "Circuit" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Provider" %}</th>
diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html
index 2f63eaf8a..df34c4dea 100644
--- a/netbox/templates/circuits/circuittype.html
+++ b/netbox/templates/circuits/circuittype.html
@@ -16,7 +16,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Circuit Type" %}</h5>
+      <h2 class="card-header">{% trans "Circuit Type" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index acec208c0..49c23e885 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div class="card">
-    <h5 class="card-header d-flex justify-content-between">
+    <h2 class="card-header d-flex justify-content-between">
       {% blocktrans %}Termination{% endblocktrans %} {{ side }}
       <div>
         {% if not termination and perms.circuits.add_circuittermination %}
@@ -24,7 +24,7 @@
             </a>
         {% endif %}
       </div>
-    </h5>
+    </h2>
       {% if termination %}
         <table class="table table-hover attr-table">
           {% include 'circuits/inc/circuit_termination_fields.html' with termination=termination %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index 44ec1e4af..cc6672694 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -17,7 +17,7 @@
 <div class="row mb-3">
 	  <div class="col col-md-6">
         <div class="card">
-          <h5 class="card-header">{% trans "Provider" %}</h5>
+          <h2 class="card-header">{% trans "Provider" %}</h2>
           <table class="table table-hover attr-table">
             <tr>
               <th scope="row">{% trans "ASNs" %}</th>
@@ -48,13 +48,13 @@
 <div class="row mb-3">
   <div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">{% trans "Provider Accounts" %}</h5>
+      <h2 class="card-header">{% trans "Provider Accounts" %}</h2>
       {% htmx_table 'circuits:provideraccount_list' provider_id=object.pk %}
     </div>
   </div>
   <div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">{% trans "Circuits" %}</h5>
+      <h2 class="card-header">{% trans "Circuits" %}</h2>
       {% htmx_table 'circuits:circuit_list' provider_id=object.pk %}
     </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/circuits/provideraccount.html b/netbox/templates/circuits/provideraccount.html
index 9042bd98a..9bb2bef20 100644
--- a/netbox/templates/circuits/provideraccount.html
+++ b/netbox/templates/circuits/provideraccount.html
@@ -14,7 +14,7 @@
   <div class="row mb-3">
 	  <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Provider Account" %}</h5>
+        <h2 class="card-header">{% trans "Provider Account" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Provider" %}</th>
@@ -41,7 +41,7 @@
     </div>
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Circuits" %}</h5>
+        <h2 class="card-header">{% trans "Circuits" %}</h2>
         {% htmx_table 'circuits:circuit_list' provider_account_id=object.pk %}
       </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html
index f074db590..000548734 100644
--- a/netbox/templates/circuits/providernetwork.html
+++ b/netbox/templates/circuits/providernetwork.html
@@ -14,7 +14,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Provider Network" %}</h5>
+        <h2 class="card-header">{% trans "Provider Network" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Provider" %}</th>
@@ -47,7 +47,7 @@
   <div class="row mb-3">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Circuits" %}</h5>
+        <h2 class="card-header">{% trans "Circuits" %}</h2>
         {% htmx_table 'circuits:circuit_list' provider_network_id=object.pk %}
       </div>
       {% plugin_full_width_page object %}
diff --git a/netbox/templates/core/configrevision.html b/netbox/templates/core/configrevision.html
index 71831e161..ecb9f1c17 100644
--- a/netbox/templates/core/configrevision.html
+++ b/netbox/templates/core/configrevision.html
@@ -32,12 +32,12 @@
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Configuration Data" %}</h5>
+        <h2 class="card-header">{% trans "Configuration Data" %}</h2>
         {% include 'core/inc/config_data.html' with config=object.data %}
       </div>
 
       <div class="card">
-        <h5 class="card-header">{% trans "Comment" %}</h5>
+        <h2 class="card-header">{% trans "Comment" %}</h2>
         <div class="card-body">
           {{ object.comment|placeholder }}
         </div>
diff --git a/netbox/templates/core/datafile.html b/netbox/templates/core/datafile.html
index db83d8378..175a0e2bc 100644
--- a/netbox/templates/core/datafile.html
+++ b/netbox/templates/core/datafile.html
@@ -21,7 +21,7 @@
   <div class="row mb-3">
     <div class="col">
       <div class="card">
-        <h5 class="card-header">{% trans "Data File" %}</h5>
+        <h2 class="card-header">{% trans "Data File" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Source" %}</th>
@@ -52,7 +52,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Content" %}</h5>
+        <h2 class="card-header">{% trans "Content" %}</h2>
         <div class="card-body">
           <pre>{{ object.data_as_string }}</pre>
         </div>
diff --git a/netbox/templates/core/datasource.html b/netbox/templates/core/datasource.html
index 3b5f86490..1ce14451b 100644
--- a/netbox/templates/core/datasource.html
+++ b/netbox/templates/core/datasource.html
@@ -28,7 +28,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Data Source" %}</h5>
+        <h2 class="card-header">{% trans "Data Source" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -81,7 +81,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Backend" %}</h5>
+        <h2 class="card-header">{% trans "Backend" %}</h2>
           {% with backend=object.backend_class %}
             <table class="table table-hover attr-table">
               {% for name, field in backend.parameters.items %}
@@ -111,7 +111,7 @@
   <div class="row mb-3">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Files" %}</h5>
+        <h2 class="card-header">{% trans "Files" %}</h2>
         {% htmx_table 'core:datafile_list' source_id=object.pk %}
       </div>
       {% plugin_full_width_page object %}
diff --git a/netbox/templates/core/job.html b/netbox/templates/core/job.html
index 1c67791b8..e9ecb5c96 100644
--- a/netbox/templates/core/job.html
+++ b/netbox/templates/core/job.html
@@ -14,7 +14,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Job" %}</h5>
+        <h2 class="card-header">{% trans "Job" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Object Type" %}</th>
@@ -45,7 +45,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Scheduling" %}</h5>
+        <h2 class="card-header">{% trans "Scheduling" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Created" %}</th>
@@ -75,7 +75,7 @@
   <div class="row">
     <div class="col col-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Data" %}</h5>
+        <h2 class="card-header">{% trans "Data" %}</h2>
         <div class="card-body">
           <pre>{{ object.data|json }}</pre>
         </div>
diff --git a/netbox/templates/core/objectchange.html b/netbox/templates/core/objectchange.html
index 6613adb22..5b6105587 100644
--- a/netbox/templates/core/objectchange.html
+++ b/netbox/templates/core/objectchange.html
@@ -26,7 +26,7 @@
 <div class="row">
     <div class="col col-md-5">
         <div class="card">
-            <h5 class="card-header">{% trans "Change" %}</h5>
+            <h2 class="card-header">{% trans "Change" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Time" %}</th>
@@ -75,7 +75,7 @@
     </div>
     <div class="col col-md-7">
         <div class="card">
-            <h5 class="card-header d-flex justify-content-between">
+            <h2 class="card-header d-flex justify-content-between">
               {% trans "Difference" %}
               <div class="btn-group btn-group-sm d-print-none">
                 <a {% if prev_change %}href="{% url 'core:objectchange' pk=prev_change.pk %}"{% else %}disabled{% endif %} class="btn btn-outline-secondary">
@@ -85,7 +85,7 @@
                   {% trans "Next" %} <i class="mdi mdi-chevron-right" aria-hidden="true"></i>
                 </a>
               </div>
-            </h5>
+            </h2>
             <div class="card-body">
                 {% if diff_added == diff_removed %}
                     <span class="text-muted" style="margin-left: 10px;">
@@ -108,7 +108,7 @@
 <div class="row">
     <div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">{% trans "Pre-Change Data" %}</h5>
+            <h2 class="card-header">{% trans "Pre-Change Data" %}</h2>
             <div class="card-body">
             {% if object.prechange_data %}
               {% spaceless %}
@@ -128,7 +128,7 @@
     </div>
     <div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">{% trans "Post-Change Data" %}</h5>
+            <h2 class="card-header">{% trans "Post-Change Data" %}</h2>
             <div class="card-body">
                 {% if object.postchange_data %}
                   {% spaceless %}
diff --git a/netbox/templates/core/rq_task.html b/netbox/templates/core/rq_task.html
index d84bc5a3f..baab5ff8d 100644
--- a/netbox/templates/core/rq_task.html
+++ b/netbox/templates/core/rq_task.html
@@ -55,7 +55,7 @@
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Job" %}</h5>
+        <h2 class="card-header">{% trans "Job" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Queue" %}</th>
diff --git a/netbox/templates/core/rq_worker.html b/netbox/templates/core/rq_worker.html
index 4dc4bf91d..d3f253a54 100644
--- a/netbox/templates/core/rq_worker.html
+++ b/netbox/templates/core/rq_worker.html
@@ -37,7 +37,7 @@
     <div class="row">
       <div class="col col-md-12">
         <div class="card">
-          <h5 class="card-header">{% trans "Worker" %}</h5>
+          <h2 class="card-header">{% trans "Worker" %}</h2>
           <table class="table table-hover attr-table">
             <tr>
               <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/core/system.html b/netbox/templates/core/system.html
index 4d133ca53..7109e54c9 100644
--- a/netbox/templates/core/system.html
+++ b/netbox/templates/core/system.html
@@ -25,7 +25,7 @@
   <div class="row mb-3">
     <div class="col">
       <div class="card">
-        <h5 class="card-header">{% trans "System Status" %}</h5>
+        <h2 class="card-header">{% trans "System Status" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "NetBox release" %}</th>
@@ -82,7 +82,7 @@
   <div class="row mb-3">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Plugins" %}</h5>
+        <h2 class="card-header">{% trans "Plugins" %}</h2>
         {% render_table plugins_table %}
       </div>
     </div>
@@ -92,7 +92,7 @@
   <div class="row mb-3">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Current Configuration" %}</h5>
+        <h2 class="card-header">{% trans "Current Configuration" %}</h2>
         {% include 'core/inc/config_data.html' with config=config.data %}
       </div>
 
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index 91ca10269..7ccf6559f 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -9,7 +9,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Cable" %}</h5>
+        <h2 class="card-header">{% trans "Cable" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Type" %}</th>
@@ -65,11 +65,11 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Termination" %} A</h5>
+        <h2 class="card-header">{% trans "Termination" %} A</h2>
         {% include 'dcim/inc/cable_termination.html' with terminations=object.a_terminations %}
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Termination" %} B</h5>
+        <h2 class="card-header">{% trans "Termination" %} B</h2>
         {% include 'dcim/inc/cable_termination.html' with terminations=object.b_terminations %}
       </div>
       {% plugin_right_page object %}
diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html
index 92ce9ef19..f216dc9b5 100644
--- a/netbox/templates/dcim/cable_trace.html
+++ b/netbox/templates/dcim/cable_trace.html
@@ -82,7 +82,7 @@
         {# Related paths #}
         <div class="col col-md-7">
             <div class="card">
-                <h5 class="card-header">{% trans "Related Paths" %}</h5>
+                <h2 class="card-header">{% trans "Related Paths" %}</h2>
                 <table class="table table-hover">
                     <thead>
                         <tr>
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index b26f21753..d6e4188b6 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -14,7 +14,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Console Port" %}</h5>
+                <h2 class="card-header">{% trans "Console Port" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Device" %}</th>
@@ -52,7 +52,7 @@
         </div>
         <div class="col col-md-6">
           <div class="card">
-            <h5 class="card-header">{% trans "Connection" %}</h5>
+            <h2 class="card-header">{% trans "Connection" %}</h2>
             {% if object.mark_connected %}
               <div class="card-body">
                 <span class="text-success"><i class="mdi mdi-check-bold"></i></span>
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index 269615f49..1b79a23b2 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -14,7 +14,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Console Server Port" %}</h5>
+                <h2 class="card-header">{% trans "Console Server Port" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Device" %}</th>
@@ -52,7 +52,7 @@
         </div>
         <div class="col col-md-6">
           <div class="card">
-            <h5 class="card-header">{% trans "Connection" %}</h5>
+            <h2 class="card-header">{% trans "Connection" %}</h2>
             <div class="card-body">
             {% if object.mark_connected %}
               <div class="card-body">
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 50136f7a9..1b2488e56 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -12,7 +12,7 @@
     <div class="row">
         <div class="col col-12 col-xl-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Device" %}</h5>
+                <h2 class="card-header">{% trans "Device" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Region" %}</th>
@@ -116,14 +116,14 @@
             </div>
             {% if vc_members %}
                 <div class="card">
-                    <h5 class="card-header">
+                    <h2 class="card-header">
                       {% trans "Virtual Chassis" %}
                       <div class="card-actions">
                         <a href="{{ object.virtual_chassis.get_absolute_url }}" class="btn btn-ghost-primary btn-sm">
                           <span class="mdi mdi-arrow-right-bold" aria-hidden="true"></span> {% trans "View Virtual Chassis" %}
                         </a>
                       </div>
-                    </h5>
+                    </h2>
                     <table class="table table-hover attr-table">
                         <tr>
                             <th>{% trans "Device" %}</th>
@@ -154,7 +154,7 @@
             {% include 'inc/panels/tags.html' %}
             {% include 'inc/panels/comments.html' %}
             <div class="card">
-              <h5 class="card-header">
+              <h2 class="card-header">
                 {% trans "Virtual Device Contexts" %}
                 {% if perms.dcim.add_virtualdevicecontext %}
                   <div class="card-actions">
@@ -163,14 +163,14 @@
                     </a>
                   </div>
                 {% endif %}
-              </h5>
+              </h2>
               {% htmx_table 'dcim:virtualdevicecontext_list' device_id=object.pk %}
             </div>
             {% plugin_left_page object %}
         </div>
         <div class="col col-12 col-xl-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Management" %}</h5>
+                <h2 class="card-header">{% trans "Management" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Status" %}</th>
@@ -242,7 +242,7 @@
             </div>
             {% if object.powerports.exists and object.poweroutlets.exists %}
                 <div class="card">
-                    <h5 class="card-header">{% trans "Power Utilization" %}</h5>
+                    <h2 class="card-header">{% trans "Power Utilization" %}</h2>
                     <table class="table table-hover">
                         <thead>
                           <tr>
@@ -291,7 +291,7 @@
                 </div>
             {% endif %}
             <div class="card">
-              <h5 class="card-header">
+              <h2 class="card-header">
                 {% trans "Services" %}
                 {% if perms.ipam.add_service %}
                   <div class="card-actions">
@@ -300,12 +300,12 @@
                     </a>
                   </div>
                 {% endif %}
-              </h5>
+              </h2>
               {% htmx_table 'ipam:service_list' device_id=object.pk %}
             </div>
             {% include 'inc/panels/image_attachments.html' %}
             <div class="card">
-                <h5 class="card-header">{% trans "Dimensions" %}</h5>
+                <h2 class="card-header">{% trans "Dimensions" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Height" %}</th>
@@ -329,13 +329,13 @@
               <div class="row" style="margin-bottom: 20px">
                 <div class="col col-md-6 col-sm-6 col-xs-12 text-center">
                   <div style="margin-left: 30px">
-                    <h4>{% trans "Front" %}</h4>
+                    <h2 class="h4">{% trans "Front" %}</h2>
                     {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='front' extra_params=svg_extra %}
                   </div>
                 </div>
                 <div class="col col-md-6 col-sm-6 col-xs-12 text-center">
                   <div style="margin-left: 30px">
-                    <h4>{% trans "Rear" %}</h4>
+                    <h2 class="h4">{% trans "Rear" %}</h2>
                     {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='rear' extra_params=svg_extra %}
                   </div>
                 </div>
diff --git a/netbox/templates/dcim/device/render_config.html b/netbox/templates/dcim/device/render_config.html
index bf53fdefb..785939a83 100644
--- a/netbox/templates/dcim/device/render_config.html
+++ b/netbox/templates/dcim/device/render_config.html
@@ -8,7 +8,7 @@
   <div class="row mb-3">
     <div class="col-5">
       <div class="card">
-        <h5 class="card-header">{% trans "Config Template" %}</h5>
+        <h2 class="card-header">{% trans "Config Template" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Config Template" %}</th>
@@ -49,12 +49,12 @@
   <div class="row">
     <div class="col">
       <div class="card">
-        <h5 class="card-header d-flex justify-content-between">
+        <h2 class="card-header d-flex justify-content-between">
           {% trans "Rendered Config" %}
             <a href="?export=True" class="btn btn-primary lh-1" role="button">
               <i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
             </a>
-        </h5>
+        </h2>
         {% if config_template %}
           <pre class="card-body">{{ rendered_config }}</pre>
         {% else %}
diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index 7824ae81b..fcf1494b7 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -4,30 +4,30 @@
 
 {% block form %}
     {% render_errors form %}
-    
+
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Device" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Device" %}</h2>
       </div>
       {% render_field form.name %}
       {% render_field form.role %}
       {% render_field form.description %}
       {% render_field form.tags %}
     </div>
-    
+
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Hardware" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Hardware" %}</h2>
       </div>
       {% render_field form.device_type %}
       {% render_field form.airflow %}
       {% render_field form.serial %}
       {% render_field form.asset_tag %}
     </div>
-    
+
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Location" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Location" %}</h2>
       </div>
       {% render_field form.site %}
       {% render_field form.location %}
@@ -58,10 +58,10 @@
         {% render_field form.longitude %}
       {% endif %}
     </div>
-    
+
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Management" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Management" %}</h2>
       </div>
       {% render_field form.status %}
       {% render_field form.platform %}
@@ -72,17 +72,17 @@
         {% render_field form.oob_ip %}
       {% endif %}
     </div>
-    
+
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Virtualization" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Virtualization" %}</h2>
       </div>
       {% render_field form.cluster %}
     </div>
-    
+
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Tenancy" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Tenancy" %}</h2>
       </div>
       {% render_field form.tenant_group %}
       {% render_field form.tenant %}
@@ -90,7 +90,7 @@
 
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Virtual Chassis" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Virtual Chassis" %}</h2>
       </div>
       {% render_field form.virtual_chassis %}
       {% render_field form.vc_position %}
@@ -100,14 +100,14 @@
     {% if form.custom_fields %}
       <div class="field-group my-5">
         <div class="row">
-          <h5 class="col-9 offset-3">{% trans "Custom Fields" %}</h5>
+          <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
         </div>
         {% render_custom_fields form %}
       </div>
     {% endif %}
 
     <div class="field-group my-5">
-      <h5 class="text-center">{% trans "Local Config Context Data" %}</h5>
+      <h2 class="text-center">{% trans "Local Config Context Data" %}</h2>
       {% render_field form.local_context_data %}
     </div>
 
diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html
index c2173c86c..c47afcb32 100644
--- a/netbox/templates/dcim/devicebay.html
+++ b/netbox/templates/dcim/devicebay.html
@@ -14,7 +14,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Device Bay" %}</h5>
+                <h2 class="card-header">{% trans "Device Bay" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Device" %}</th>
@@ -40,7 +40,7 @@
         </div>
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Installed Device" %}</h5>
+                <h2 class="card-header">{% trans "Installed Device" %}</h2>
                 {% if object.installed_device %}
                     {% with device=object.installed_device %}
                         <table class="table table-hover attr-table">
diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html
index b6e7a6560..4b89a9dfc 100644
--- a/netbox/templates/dcim/devicebay_populate.html
+++ b/netbox/templates/dcim/devicebay_populate.html
@@ -10,7 +10,7 @@
     <div class="row mb-3">
         <div class="col col-md-6 offset-md-3">
             <div class="card">
-                <h5 class="card-header">{% block title %}{% trans "Populate" %} {{ device_bay }}{% endblock %}</h5>
+                <h2 class="card-header">{% block title %}{% trans "Populate" %} {{ device_bay }}{% endblock %}</h2>
                 <div class="card-body">
                     <div class="row mb-3">
                         <label class="col-sm-3 col-form-label text-lg-end">{% trans "Parent Device" %}</label>
diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html
index 6bb16c894..d9e170af3 100644
--- a/netbox/templates/dcim/devicerole.html
+++ b/netbox/templates/dcim/devicerole.html
@@ -20,7 +20,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Device Role" %}</h5>
+      <h2 class="card-header">{% trans "Device Role" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 9709b88a7..08e2f8d63 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -8,7 +8,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Chassis" %}</h5>
+                <h2 class="card-header">{% trans "Chassis" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Manufacturer" %}</th>
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index 6a3375d39..b57c5835d 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -14,7 +14,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Front Port" %}</h5>
+                <h2 class="card-header">{% trans "Front Port" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Device" %}</th>
@@ -66,7 +66,7 @@
         </div>
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Connection" %}</h5>
+                <h2 class="card-header">{% trans "Connection" %}</h2>
                 {% if object.mark_connected %}
                     <div class="card-body text-muted">
                       <span class="text-success"><i class="mdi mdi-check-bold"></i></span> {% trans "Marked as Connected" %}
diff --git a/netbox/templates/dcim/htmx/cable_edit.html b/netbox/templates/dcim/htmx/cable_edit.html
index acd7baf0f..6bb4af973 100644
--- a/netbox/templates/dcim/htmx/cable_edit.html
+++ b/netbox/templates/dcim/htmx/cable_edit.html
@@ -7,7 +7,7 @@
 {# A side termination #}
 <div class="field-group mb-5">
   <div class="row">
-    <h5 class="col-9 offset-3">{% trans "A Side" %}</h5>
+    <h2 class="col-9 offset-3">{% trans "A Side" %}</h2>
   </div>
   {% render_field form.a_terminations_type %}
   {% if 'termination_a_device' in form.fields %}
@@ -27,7 +27,7 @@
 {# B side termination #}
 <div class="field-group mb-5">
   <div class="row">
-    <h5 class="col-9 offset-3">{% trans "B Side" %}</h5>
+    <h2 class="col-9 offset-3">{% trans "B Side" %}</h2>
   </div>
   {% render_field form.b_terminations_type %}
   {% if 'termination_b_device' in form.fields %}
@@ -47,7 +47,7 @@
 {# Cable attributes #}
 <div class="field-group mb-5">
   <div class="row">
-    <h5 class="col-9 offset-3">{% trans "Cable" %}</h5>
+    <h2 class="col-9 offset-3">{% trans "Cable" %}</h2>
   </div>
   {% render_field form.status %}
   {% render_field form.type %}
@@ -69,7 +69,7 @@
 
 <div class="field-group mb-5">
   <div class="row">
-    <h5 class="col-9 offset-3">{% trans "Tenancy" %}</h5>
+    <h2 class="col-9 offset-3">{% trans "Tenancy" %}</h2>
   </div>
   {% render_field form.tenant_group %}
   {% render_field form.tenant %}
@@ -78,7 +78,7 @@
 {% if form.custom_fields %}
   <div class="field-group mb-5">
     <div class="row">
-      <h5 class="col-9 offset-3">{% trans "Custom Fields" %}</h5>
+      <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
     </div>
     {% render_custom_fields form %}
   </div>
@@ -86,7 +86,7 @@
 
 {% if form.comments %}
   <div class="field-group mb-5">
-    <h5 class="text-center">{% trans "Comments" %}</h5>
+    <h2 class="text-center">{% trans "Comments" %}</h2>
     {% render_field form.comments %}
   </div>
 {% endif %}
diff --git a/netbox/templates/dcim/inc/panels/inventory_items.html b/netbox/templates/dcim/inc/panels/inventory_items.html
index 124d4221d..aea5eae16 100644
--- a/netbox/templates/dcim/inc/panels/inventory_items.html
+++ b/netbox/templates/dcim/inc/panels/inventory_items.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div class="card">
-  <h5 class="card-header">
+  <h2 class="card-header">
     {% trans "Inventory Items" %}
     {% if perms.dcim.add_inventoryitem %}
       <div class="card-actions">
@@ -11,7 +11,7 @@
         </a>
       </div>
     {% endif %}
-  </h5>
+  </h2>
   <table class="table table-hover">
     <thead>
       <tr>
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 0c9b639f8..016a6c890 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -24,7 +24,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Interface" %}</h5>
+        <h2 class="card-header">{% trans "Interface" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Device" %}</th>
@@ -96,7 +96,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Related Interfaces" %}</h5>
+        <h2 class="card-header">{% trans "Related Interfaces" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Parent" %}</th>
@@ -119,7 +119,7 @@
     <div class="col col-md-6">
       {% include 'inc/panel_table.html' with table=vdc_table heading="Virtual Device Contexts" %}
       <div class="card">
-        <h5 class="card-header">{% trans "Addressing" %}</h5>
+        <h2 class="card-header">{% trans "Addressing" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "MAC Address" %}</th>
@@ -137,7 +137,7 @@
       </div>
       {% if not object.is_virtual %}
         <div class="card">
-          <h5 class="card-header">{% trans "Connection" %}</h5>
+          <h2 class="card-header">{% trans "Connection" %}</h2>
           {% if object.mark_connected %}
             <div class="card-body">
               <span class="text-success"><i class="mdi mdi-check-bold"></i></span>
@@ -207,7 +207,7 @@
       {% endif %}
       {% if object.is_wireless %}
         <div class="card">
-          <h5 class="card-header">{% trans "Wireless" %}</h5>
+          <h2 class="card-header">{% trans "Wireless" %}</h2>
           {% with peer=object.connected_endpoints.0 %}
             <table class="table table-hover">
               <thead>
@@ -277,7 +277,7 @@
           {% endwith %}
         </div>
         <div class="card">
-          <h5 class="card-header">{% trans "Wireless LANs" %}</h5>
+          <h2 class="card-header">{% trans "Wireless LANs" %}</h2>
           <table class="table table-hover">
             <thead>
               <tr>
@@ -302,7 +302,7 @@
       {% endif %}
       {% if object.is_lag %}
         <div class="card">
-          <h5 class="card-header">{% trans "LAG Members" %}</h5>
+          <h2 class="card-header">{% trans "LAG Members" %}</h2>
           <table class="table table-hover">
             <thead>
               <tr>
@@ -335,7 +335,7 @@
   <div class="row mb-3">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">
+        <h2 class="card-header">
           {% trans "IP Addresses" %}
           {% if perms.ipam.add_ipaddress %}
             <div class="card-actions">
@@ -344,7 +344,7 @@
               </a>
             </div>
           {% endif %}
-        </h5>
+        </h2>
         {% htmx_table 'ipam:ipaddress_list' interface_id=object.pk %}
         
       </div>
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html
index 29d4c3ef5..44648d53e 100644
--- a/netbox/templates/dcim/inventoryitem.html
+++ b/netbox/templates/dcim/inventoryitem.html
@@ -14,7 +14,7 @@
     <div class="row mb-3">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Inventory Item" %}</h5>
+                <h2 class="card-header">{% trans "Inventory Item" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Device" %}</th>
diff --git a/netbox/templates/dcim/inventoryitemrole.html b/netbox/templates/dcim/inventoryitemrole.html
index 9dd3b5b46..4cc3c5864 100644
--- a/netbox/templates/dcim/inventoryitemrole.html
+++ b/netbox/templates/dcim/inventoryitemrole.html
@@ -12,7 +12,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Inventory Item Role" %}</h5>
+      <h2 class="card-header">{% trans "Inventory Item Role" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index 9f2b766ea..97dcc20f0 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -23,7 +23,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Location" %}</h5>
+      <h2 class="card-header">{% trans "Location" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -73,7 +73,7 @@
 <div class="row mb-3">
 	<div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Child Locations" %}
         {% if perms.dcim.add_location %}
           <div class="card-actions">
@@ -82,11 +82,11 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'dcim:location_list' parent_id=object.pk %}
     </div>
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Non-Racked Devices" %}
         {% if perms.dcim.add_device %}
           <div class="card-actions">
@@ -95,7 +95,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'dcim:device_list' location_id=object.pk rack_id='null' parent_bay_id='null' %}
     </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html
index 527dcf399..13c4b1764 100644
--- a/netbox/templates/dcim/manufacturer.html
+++ b/netbox/templates/dcim/manufacturer.html
@@ -30,7 +30,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Manufacturer" %}</h5>
+      <h2 class="card-header">{% trans "Manufacturer" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/dcim/module.html b/netbox/templates/dcim/module.html
index 2180a83a3..ab06c770e 100644
--- a/netbox/templates/dcim/module.html
+++ b/netbox/templates/dcim/module.html
@@ -48,7 +48,7 @@
 <div class="row">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Module" %}</h5>
+      <h2 class="card-header">{% trans "Module" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Device" %}</th>
diff --git a/netbox/templates/dcim/modulebay.html b/netbox/templates/dcim/modulebay.html
index c6e814ffe..33b31e288 100644
--- a/netbox/templates/dcim/modulebay.html
+++ b/netbox/templates/dcim/modulebay.html
@@ -14,7 +14,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Module Bay" %}</h5>
+        <h2 class="card-header">{% trans "Module Bay" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Device" %}</th>
@@ -46,7 +46,7 @@
     <div class="col col-md-6">
       {% include 'inc/panels/custom_fields.html' %}
       <div class="card">
-        <h5 class="card-header">{% trans "Installed Module" %}</h5>
+        <h2 class="card-header">{% trans "Installed Module" %}</h2>
         {% if object.installed_module %}
           {% with module=object.installed_module %}
             <table class="table table-hover attr-table">
diff --git a/netbox/templates/dcim/moduletype.html b/netbox/templates/dcim/moduletype.html
index 77feece97..6a65a280b 100644
--- a/netbox/templates/dcim/moduletype.html
+++ b/netbox/templates/dcim/moduletype.html
@@ -8,7 +8,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Module Type" %}</h5>
+        <h2 class="card-header">{% trans "Module Type" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Manufacturer" %}</th>
diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html
index d67c6e8fb..9c4d59cba 100644
--- a/netbox/templates/dcim/moduletype/component_templates.html
+++ b/netbox/templates/dcim/moduletype/component_templates.html
@@ -35,7 +35,7 @@
     </form>
   {% else %}
     <div class="card">
-      <h5 class="card-header">{{ title }}</h5>
+      <h2 class="card-header">{{ title }}</h2>
       <div class="htmx-container table-responsive" id="object_list">
         {% include 'htmx/table.html' %}
       </div>
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index 07dad3d0e..76b50fcbb 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -23,7 +23,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Platform" %}</h5>
+      <h2 class="card-header">{% trans "Platform" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index 367683bf0..fb3609965 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -18,7 +18,7 @@
 <div class="row">
 	<div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">{% trans "Power Feed" %}</h5>
+            <h2 class="card-header">{% trans "Power Feed" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Power Panel" %}</th>
@@ -77,7 +77,7 @@
             </table>
         </div>
         <div class="card">
-            <h5 class="card-header">{% trans "Electrical Characteristics" %}</h5>
+            <h2 class="card-header">{% trans "Electrical Characteristics" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Supply" %}</th>
@@ -107,7 +107,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Connection" %}</h5>
+        <h2 class="card-header">{% trans "Connection" %}</h2>
         {% if object.mark_connected %}
           <div class="card-body">
             <span class="text-success"><i class="mdi mdi-check-bold"></i></span>
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index 0e1b07706..ef02ec52a 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -14,7 +14,7 @@
     <div class="row mb-3">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Power Outlet" %}</h5>
+                <h2 class="card-header">{% trans "Power Outlet" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Device" %}</th>
@@ -56,7 +56,7 @@
         </div>
         <div class="col col-md-6">
           <div class="card">
-            <h5 class="card-header">{% trans "Connection" %}</h5>
+            <h2 class="card-header">{% trans "Connection" %}</h2>
             {% if object.mark_connected %}
               <div class="card-body">
                 <span class="text-success"><i class="mdi mdi-check-bold"></i></span>
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index 8866994fe..c712bbd1f 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -16,7 +16,7 @@
 <div class="row">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Power Panel" %}</h5>
+      <h2 class="card-header">{% trans "Power Panel" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Site" %}</th>
@@ -48,7 +48,7 @@
     <form method="post">
       {% csrf_token %}
       <div class="card">
-        <h5 class="card-header">{% trans "Power Feeds" %}</h5>
+        <h2 class="card-header">{% trans "Power Feeds" %}</h2>
         {% htmx_table 'dcim:powerfeed_list' power_panel_id=object.pk %}
         <div class="card-footer d-print-none">
           {% if perms.dcim.change_powerfeed %}
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index 77352f99e..7c25b2b5b 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -14,7 +14,7 @@
     <div class="row mb-3">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Power Port" %}</h5>
+                <h2 class="card-header">{% trans "Power Port" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Device" %}</th>
@@ -56,7 +56,7 @@
         </div>
         <div class="col col-md-6">
           <div class="card">
-            <h5 class="card-header">{% trans "Connection" %}</h5>
+            <h2 class="card-header">{% trans "Connection" %}</h2>
             {% if object.mark_connected %}
               <div class="card-body">
                 <span class="text-success"><i class="mdi mdi-check-bold"></i></span>
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index b28ee6e31..a472b838b 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -10,7 +10,7 @@
   <div class="row">
 	  <div class="col col-12 col-xl-5">
         <div class="card">
-            <h5 class="card-header">{% trans "Rack" %}</h5>
+            <h2 class="card-header">{% trans "Rack" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Region" %}</th>
@@ -70,7 +70,7 @@
             </table>
         </div>
         <div class="card">
-            <h5 class="card-header">{% trans "Dimensions" %}</h5>
+            <h2 class="card-header">{% trans "Dimensions" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Type" %}</th>
@@ -172,13 +172,13 @@
         <div class="row" style="margin-bottom: 20px">
             <div class="col col-md-6 col-sm-6 col-xs-12 text-center">
               <div style="margin-left: 30px">
-                <h4>{% trans "Front" %}</h4>
+                <h2 class="h4">{% trans "Front" %}</h2>
                 {% include 'dcim/inc/rack_elevation.html' with face='front' extra_params=svg_extra %}
               </div>
             </div>
             <div class="col col-md-6 col-sm-6 col-xs-12 text-center">
               <div style="margin-left: 30px">
-                <h4>{% trans "Rear" %}</h4>
+                <h2 class="h4">{% trans "Rear" %}</h2>
                 {% include 'dcim/inc/rack_elevation.html' with face='rear' extra_params=svg_extra %}
               </div>
             </div>
diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html
index e50380ba0..66e4f14b0 100644
--- a/netbox/templates/dcim/rack_elevation_list.html
+++ b/netbox/templates/dcim/rack_elevation_list.html
@@ -11,7 +11,7 @@
       <a href="{% url 'dcim:rack_list' %}{% querystring request %}" class="btn btn-primary">
         <i class="mdi mdi-format-list-checkbox"></i> {% trans "View List" %}
       </a>
-      <select class="btn btn-outline-secondary no-ts rack-view">
+      <select class="btn btn-outline-secondary no-ts rack-view" aria-label="Select rack view">
         <option value="images-and-labels" selected="selected">{% trans "Images and Labels" %}</option>
         <option value="images-only">{% trans "Images only" %}</option>
         <option value="labels-only">{% trans "Labels only" %}</option>
diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html
index 63a4da733..f0f25dd83 100644
--- a/netbox/templates/dcim/rackreservation.html
+++ b/netbox/templates/dcim/rackreservation.html
@@ -16,7 +16,7 @@
 <div class="row mb-3">
 	<div class="col col-12 col-xl-5">
         <div class="card">
-            <h5 class="card-header">{% trans "Rack" %}</h5>
+            <h2 class="card-header">{% trans "Rack" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Region" %}</th>
@@ -39,7 +39,7 @@
             </table>
         </div>
         <div class="card">
-            <h5 class="card-header">{% trans "Reservation Details" %}</h5>
+            <h2 class="card-header">{% trans "Reservation Details" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Units" %}</th>
@@ -73,13 +73,13 @@
         <div class="row" style="margin-bottom: 20px">
             <div class="col col-md-6 col-sm-6 col-xs-12 text-center">
                 <div style="margin-left: 30px">
-                    <h4>{% trans "Front" %}</h4>
+                    <h2 class="h4">{% trans "Front" %}</h2>
                     {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='front' %}
                 </div>
             </div>
             <div class="col col-md-6 col-sm-6 col-xs-12 text-center">
                 <div style="margin-left: -30px">
-                    <h4>{% trans "Rear" %}</h4>
+                    <h2 class="h4">{% trans "Rear" %}</h2>
                     {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='rear' %}
                 </div>
             </div>
diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html
index 6aa72598e..5c1ec5e07 100644
--- a/netbox/templates/dcim/rackrole.html
+++ b/netbox/templates/dcim/rackrole.html
@@ -16,7 +16,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Rack Role" %}</h5>
+      <h2 class="card-header">{% trans "Rack Role" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index d0d45ac67..7d5952c56 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -14,7 +14,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Rear Port" %}</h5>
+                <h2 class="card-header">{% trans "Rear Port" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Device" %}</th>
@@ -62,7 +62,7 @@
         </div>
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "Connection" %}</h5>
+                <h2 class="card-header">{% trans "Connection" %}</h2>
                 {% if object.mark_connected %}
                     <div class="card-body text-muted">
                       <span class="text-success"><i class="mdi mdi-check-bold"></i></span> {% trans "Marked as Connected" %}
diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html
index fd37cc026..1e1b75cd5 100644
--- a/netbox/templates/dcim/region.html
+++ b/netbox/templates/dcim/region.html
@@ -23,7 +23,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Region" %}</h5>
+      <h2 class="card-header">{% trans "Region" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -51,7 +51,7 @@
 <div class="row mb-3">
 	<div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Child Regions" %}
         {% if perms.dcim.add_region %}
           <div class="card-actions">
@@ -60,7 +60,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'dcim:region_list' parent_id=object.pk %}
     </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index ca0937bed..38b740612 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -25,7 +25,7 @@
 <div class="row">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Site" %}</h5>
+      <h2 class="card-header">{% trans "Site" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Region" %}</th>
@@ -123,7 +123,7 @@
 <div class="row">
   <div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Locations" %}
         {% if perms.dcim.add_location %}
           <div class="card-actions">
@@ -132,11 +132,11 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'dcim:location_list' site_id=object.pk %}
     </div>
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Non-Racked Devices" %}
         {% if perms.dcim.add_device %}
           <div class="card-actions">
@@ -145,7 +145,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'dcim:device_list' site_id=object.pk rack_id='null' parent_bay_id='null' %}
     </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html
index e8b25cdea..3ae43f210 100644
--- a/netbox/templates/dcim/sitegroup.html
+++ b/netbox/templates/dcim/sitegroup.html
@@ -23,7 +23,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Site Group" %}</h5>
+      <h2 class="card-header">{% trans "Site Group" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -51,7 +51,7 @@
 <div class="row mb-3">
 	<div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Child Groups" %}
         {% if perms.dcim.add_sitegroup %}
           <div class="card-actions">
@@ -60,7 +60,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'dcim:sitegroup_list' parent_id=object.pk %}
     </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index 8defd5370..d48306257 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -17,7 +17,7 @@
 <div class="row">
 	<div class="col col-md-4">
     <div class="card">
-      <h5 class="card-header">{% trans "Virtual Chassis" %}</h5>
+      <h2 class="card-header">{% trans "Virtual Chassis" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Domain" %}</th>
@@ -49,7 +49,7 @@
     </div>
     <div class="col col-md-8">
       <div class="card">
-        <h5 class="card-header">
+        <h2 class="card-header">
           {% trans "Members" %}
           {% if perms.dcim.change_virtualchassis %}
             <div class="card-actions">
@@ -58,7 +58,7 @@
               </a>
             </div>
           {% endif %}
-        </h5>
+        </h2>
         <table class="table table-hover object-list">
           <thead>
             <tr>
diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html
index 444878701..d2108fa34 100644
--- a/netbox/templates/dcim/virtualchassis_add.html
+++ b/netbox/templates/dcim/virtualchassis_add.html
@@ -5,7 +5,7 @@
 {% block form %}
   <div class="field-group my-5">
     <div class="row">
-      <h5 class="col-9 offset-3">{% trans "Virtual Chassis" %}</h5>
+      <h2 class="col-9 offset-3">{% trans "Virtual Chassis" %}</h2>
     </div>
     {% render_field form.name %}
     {% render_field form.domain %}
@@ -15,7 +15,7 @@
 
   <div class="field-group my-5">
     <div class="row">
-      <h5 class="col-9 offset-3">{% trans "Member Devices" %}</h5>
+      <h2 class="col-9 offset-3">{% trans "Member Devices" %}</h2>
     </div>
     {% render_field form.region %}
     {% render_field form.site_group %}
@@ -28,7 +28,7 @@
   {% if form.custom_fields %}
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Custom Fields" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
       </div>
       {% render_custom_fields form %}
     </div>
diff --git a/netbox/templates/dcim/virtualchassis_add_member.html b/netbox/templates/dcim/virtualchassis_add_member.html
index 2c0ba8d9c..7926c303d 100644
--- a/netbox/templates/dcim/virtualchassis_add_member.html
+++ b/netbox/templates/dcim/virtualchassis_add_member.html
@@ -16,7 +16,7 @@
 
       {% csrf_token %}
       <div class="card">
-          <h5 class="card-header">{% trans "Add New Member" %}</h5>
+          <h2 class="card-header">{% trans "Add New Member" %}</h2>
           <div class="card-body">
               {% render_form member_select_form %}
               {% render_form membership_form %}
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index feceadc80..9cc1bb753 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -21,7 +21,7 @@
       {{ formset.management_form }}
       <div class="field-group my-5">
         <div class="row">
-          <h5 class="col-9 offset-3">{% trans "Virtual Chassis" %}</h5>
+          <h2 class="col-9 offset-3">{% trans "Virtual Chassis" %}</h2>
         </div>
         {% render_field vc_form.name %}
         {% render_field vc_form.domain %}
@@ -37,14 +37,14 @@
       {% if vc_form.custom_fields %}
         <div class="field-group mb-5">
           <div class="row">
-            <h5 class="col-9 offset-3">{% trans "Custom Fields" %}</h5>
+            <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
           </div>
           {% render_custom_fields vc_form %}
         </div>
       {% endif %}
 
       <div class="field-group mb-5">
-        <h5 class="text-center">{% trans "Members" %}</h5>
+        <h2 class="text-center">{% trans "Members" %}</h2>
         <table class="table">
             <thead>
                 <tr>
diff --git a/netbox/templates/dcim/virtualdevicecontext.html b/netbox/templates/dcim/virtualdevicecontext.html
index c829b13b5..d7718cc8c 100644
--- a/netbox/templates/dcim/virtualdevicecontext.html
+++ b/netbox/templates/dcim/virtualdevicecontext.html
@@ -12,7 +12,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Virtual Device Context" %}</h5>
+      <h2 class="card-header">{% trans "Virtual Device Context" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -78,7 +78,7 @@
 <div class="row mb-3">
   <div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">{% trans "Interfaces" %}</h5>
+      <h2 class="card-header">{% trans "Interfaces" %}</h2>
       {% htmx_table 'dcim:interface_list' vdc_id=object.pk %}
     </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/extras/configcontext.html b/netbox/templates/extras/configcontext.html
index f467354b6..e60b3f234 100644
--- a/netbox/templates/extras/configcontext.html
+++ b/netbox/templates/extras/configcontext.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col col-md-5">
       <div class="card">
-        <h5 class="card-header">{% trans "Config Context" %}</h5>
+        <h2 class="card-header">{% trans "Config Context" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -57,7 +57,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Assignment" %}</h5>
+        <h2 class="card-header">{% trans "Assignment" %}</h2>
         <table class="table table-hover attr-table">
           {% for title, objects in assigned_objects %}
             <tr>
diff --git a/netbox/templates/extras/configtemplate.html b/netbox/templates/extras/configtemplate.html
index ea96e2ea6..5218a3b8f 100644
--- a/netbox/templates/extras/configtemplate.html
+++ b/netbox/templates/extras/configtemplate.html
@@ -7,7 +7,7 @@
   <div class="row mb-3">
     <div class="col col-md-5">
       <div class="card">
-        <h5 class="card-header">{% trans "Config Template" %}</h5>
+        <h2 class="card-header">{% trans "Config Template" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -53,7 +53,7 @@
     </div>
     <div class="col col-md-7">
       <div class="card">
-        <h5 class="card-header">{% trans "Environment Parameters" %}</h5>
+        <h2 class="card-header">{% trans "Environment Parameters" %}</h2>
         <div class="card-body">
           <pre>{{ object.environment_params }}</pre>
         </div>
@@ -64,7 +64,7 @@
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Template" %}</h5>
+        <h2 class="card-header">{% trans "Template" %}</h2>
         <div class="card-body">
           {% include 'inc/sync_warning.html' %}
           <pre>{{ object.template_code }}</pre>
diff --git a/netbox/templates/extras/customfield.html b/netbox/templates/extras/customfield.html
index fa0986778..f68a83f7d 100644
--- a/netbox/templates/extras/customfield.html
+++ b/netbox/templates/extras/customfield.html
@@ -7,7 +7,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Custom Field" %}</h5>
+      <h2 class="card-header">{% trans "Custom Field" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -55,7 +55,7 @@
       </table>
     </div>
     <div class="card">
-      <h5 class="card-header">{% trans "Behavior" %}</h5>
+      <h2 class="card-header">{% trans "Behavior" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Search Weight" %}</th>
@@ -90,7 +90,7 @@
 	</div>
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Object Types" %}</h5>
+      <h2 class="card-header">{% trans "Object Types" %}</h2>
       <table class="table table-hover attr-table">
         {% for ct in object.object_types.all %}
           <tr>
@@ -100,7 +100,7 @@
       </table>
     </div>
     <div class="card">
-      <h5 class="card-header">{% trans "Validation Rules" %}</h5>
+      <h2 class="card-header">{% trans "Validation Rules" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Minimum Value" %}</th>
@@ -127,8 +127,8 @@
       </table>
     </div>
     <div class="card">
-      <h5 class="card-header">Related Objects</h5>
-      <ul class="list-group list-group-flush">
+      <h2 class="card-header">Related Objects</h2>
+      <ul class="list-group list-group-flush" role="presentation">
         {% for qs in related_models %}
           <a class="list-group-item list-group-item-action d-flex justify-content-between">
             {{ qs.model|meta:"verbose_name_plural"|bettertitle }}
diff --git a/netbox/templates/extras/customfieldchoiceset.html b/netbox/templates/extras/customfieldchoiceset.html
index 7c1e5b2b8..aebcdf2a9 100644
--- a/netbox/templates/extras/customfieldchoiceset.html
+++ b/netbox/templates/extras/customfieldchoiceset.html
@@ -6,7 +6,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">Custom Field Choice Set</h5>
+        <h2 class="card-header">Custom Field Choice Set</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">Name</th>
@@ -44,7 +44,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">Choices ({{ object.choices|length }})</h5>
+        <h2 class="card-header">Choices ({{ object.choices|length }})</h2>
         <table class="table table-hover">
           <thead>
             <tr>
diff --git a/netbox/templates/extras/customlink.html b/netbox/templates/extras/customlink.html
index 0b9b068da..a3408ddff 100644
--- a/netbox/templates/extras/customlink.html
+++ b/netbox/templates/extras/customlink.html
@@ -7,7 +7,7 @@
 <div class="row mb-3">
 	<div class="col col-md-5">
     <div class="card">
-      <h5 class="card-header">{% trans "Custom Link" %}</h5>
+      <h2 class="card-header">{% trans "Custom Link" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -36,7 +36,7 @@
       </table>
     </div>
     <div class="card">
-      <h5 class="card-header">{% trans "Assigned Models" %}</h5>
+      <h2 class="card-header">{% trans "Assigned Models" %}</h2>
       <table class="table table-hover attr-table">
         {% for ct in object.object_types.all %}
           <tr>
@@ -49,17 +49,13 @@
 	</div>
 	<div class="col col-md-7">
     <div class="card">
-      <h5 class="card-header">
-        {% trans "Link Text" %}
-      </h5>
+      <h2 class="card-header">{% trans "Link Text" %}</h2>
       <div class="card-body">
         <pre>{{ object.link_text }}</pre>
       </div>
     </div>
     <div class="card">
-      <h5 class="card-header">
-        {% trans "Link URL" %}
-      </h5>
+      <h2 class="card-header">{% trans "Link URL" %}</h2>
       <div class="card-body">
         <pre>{{ object.link_url }}</pre>
       </div>
diff --git a/netbox/templates/extras/eventrule.html b/netbox/templates/extras/eventrule.html
index 844fbf9c6..cd19e0124 100644
--- a/netbox/templates/extras/eventrule.html
+++ b/netbox/templates/extras/eventrule.html
@@ -7,7 +7,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Event Rule" %}</h5>
+        <h2 class="card-header">{% trans "Event Rule" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -24,7 +24,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Object Types" %}</h5>
+        <h2 class="card-header">{% trans "Object Types" %}</h2>
         <table class="table table-hover attr-table">
           {% for object_type in object.object_types.all %}
             <tr>
@@ -34,7 +34,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Events" %}</h5>
+        <h2 class="card-header">{% trans "Events" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Create" %}</th>
@@ -62,9 +62,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">
-          {% trans "Conditions" %}
-        </h5>
+        <h2 class="card-header">{% trans "Conditions" %}</h2>
         <div class="card-body">
           {% if object.conditions %}
             <pre>{{ object.conditions|json }}</pre>
@@ -74,7 +72,7 @@
         </div>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Action" %}</h5>
+        <h2 class="card-header">{% trans "Action" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Type" %}</th>
diff --git a/netbox/templates/extras/exporttemplate.html b/netbox/templates/extras/exporttemplate.html
index 8d14e3ffb..5a19426f2 100644
--- a/netbox/templates/extras/exporttemplate.html
+++ b/netbox/templates/extras/exporttemplate.html
@@ -9,7 +9,7 @@
   <div class="row mb-3">
     <div class="col col-md-5">
       <div class="card">
-        <h5 class="card-header">{% trans "Export Template" %}</h5>
+        <h2 class="card-header">{% trans "Export Template" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -63,7 +63,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Assigned Models" %}</h5>
+        <h2 class="card-header">{% trans "Assigned Models" %}</h2>
         <table class="table table-hover attr-table">
           {% for object_type in object.object_types.all %}
             <tr>
@@ -76,7 +76,7 @@
     </div>
     <div class="col col-md-7">
       <div class="card">
-        <h5 class="card-header">{% trans "Template" %}</h5>
+        <h2 class="card-header">{% trans "Template" %}</h2>
         <div class="card-body">
           {% include 'inc/sync_warning.html' %}
           <pre>{{ object.template_code }}</pre>
diff --git a/netbox/templates/extras/htmx/script_result.html b/netbox/templates/extras/htmx/script_result.html
index 0545e2bd5..3d4fde619 100644
--- a/netbox/templates/extras/htmx/script_result.html
+++ b/netbox/templates/extras/htmx/script_result.html
@@ -20,7 +20,7 @@
     {% if tests %}
       {# Summary of test methods #}
       <div class="card">
-        <h5 class="card-header">{% trans "Test Summary" %}</h5>
+        <h2 class="card-header">{% trans "Test Summary" %}</h2>
         <table class="table table-hover">
           {% for test, data in tests.items %}
             <tr>
@@ -40,7 +40,7 @@
     {% if table %}
     <div class="card">
       <div class="table-responsive" id="object_list">
-        <h5 class="card-header">{% trans "Log" %}</h5>
+        <h2 class="card-header">{% trans "Log" %}</h2>
         {% include 'htmx/table.html' %}
       </div>
     </div>
@@ -49,7 +49,7 @@
     {# Script output. Legacy reports will not have this. #}
     {% if 'output' in job.data %}
       <div class="card mb-3">
-      <h5 class="card-header">{% trans "Output" %}</h5>
+      <h2 class="card-header">{% trans "Output" %}</h2>
         {% if job.data.output %}
           <pre class="card-body font-monospace">{{ job.data.output }}</pre>
         {% else %}
diff --git a/netbox/templates/extras/inc/configcontext_data.html b/netbox/templates/extras/inc/configcontext_data.html
index d821c87d9..ef76a170a 100644
--- a/netbox/templates/extras/inc/configcontext_data.html
+++ b/netbox/templates/extras/inc/configcontext_data.html
@@ -2,13 +2,13 @@
 {% load i18n %}
 
 {% if title %}
-  <h5 class="card-header d-flex justify-content-between">
+  <h2 class="card-header d-flex justify-content-between">
     {% trans title %}
     <div>
       {% if copyid %}{% copy_content copyid %}{% endif %}
       {% include 'extras/inc/format_toggle.html' %}
     </div>
-  </h5>
+  </h2>
 {% endif %}
 <div class="card-body">
   <div class="rendered-context-data mt-1">
diff --git a/netbox/templates/extras/journalentry.html b/netbox/templates/extras/journalentry.html
index 29c0a263c..7d75ab2dc 100644
--- a/netbox/templates/extras/journalentry.html
+++ b/netbox/templates/extras/journalentry.html
@@ -12,7 +12,7 @@
     <div class="row mb-3">
         <div class="col col-md-5">
             <div class="card">
-                <h5 class="card-header">{% trans "Journal Entry" %}</h5>
+                <h2 class="card-header">{% trans "Journal Entry" %}</h2>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Object" %}</th>
diff --git a/netbox/templates/extras/object_configcontext.html b/netbox/templates/extras/object_configcontext.html
index 4c45ceab3..4929fcc96 100644
--- a/netbox/templates/extras/object_configcontext.html
+++ b/netbox/templates/extras/object_configcontext.html
@@ -21,12 +21,12 @@
                 </div>
             </div>
             <div class="card">
-                <h5 class="card-header d-flex justify-content-between">
+                <h2 class="card-header d-flex justify-content-between">
                   {% trans "Source Contexts" %}
                   <div>
                     {% include 'extras/inc/format_toggle.html' %}
                   </div>
-                </h5>
+                </h2>
                 {% for context in source_contexts %}
                     <div class="card-body">
                         <div class="float-end">
diff --git a/netbox/templates/extras/object_journal.html b/netbox/templates/extras/object_journal.html
index 1b775b7f5..fe8ee68c2 100644
--- a/netbox/templates/extras/object_journal.html
+++ b/netbox/templates/extras/object_journal.html
@@ -14,7 +14,7 @@
   </div>
   {% if perms.extras.add_journalentry %}
     <div class="card">
-      <h4 class="card-header">{% trans "New Journal Entry" %}</h4>
+      <h2 class="card-header">{% trans "New Journal Entry" %}</h2>
       <div class="card-body">
         <form action="{% url 'extras:journalentry_add' %}" method="post" enctype="multipart/form-data">
           <div class="container">
diff --git a/netbox/templates/extras/savedfilter.html b/netbox/templates/extras/savedfilter.html
index 9b10f1375..808cb94ba 100644
--- a/netbox/templates/extras/savedfilter.html
+++ b/netbox/templates/extras/savedfilter.html
@@ -7,7 +7,7 @@
 <div class="row mb-3">
 	<div class="col col-md-5">
     <div class="card">
-      <h5 class="card-header">{% trans "Saved Filter" %}</h5>
+      <h2 class="card-header">{% trans "Saved Filter" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -36,7 +36,7 @@
       </table>
     </div>
     <div class="card">
-      <h5 class="card-header">{% trans "Assigned Models" %}</h5>
+      <h2 class="card-header">{% trans "Assigned Models" %}</h2>
       <table class="table table-hover attr-table">
         {% for object_type in object.object_types.all %}
           <tr>
@@ -49,9 +49,7 @@
 	</div>
 	<div class="col col-md-7">
     <div class="card">
-      <h5 class="card-header">
-        {% trans "Parameters" %}
-      </h5>
+      <h2 class="card-header">{% trans "Parameters" %}</h2>
       <div class="card-body">
         <pre>{{ object.parameters|json }}</pre>
       </div>
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index fe616dc8a..ff01cc59a 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -23,7 +23,7 @@
               {% if fields %}
                 <div class="field-group mb-5">
                   <div class="row">
-                    <h5 class="col-9 offset-3">{{ group }}</h5>
+                    <h2 class="col-9 offset-3">{{ group }}</h2>
                   </div>
                   {% for name in fields %}
                     {% with field=form|getfield:name %}
diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index 27b6115a7..ee5d73b1e 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -22,7 +22,7 @@
   {% for module in script_modules %}
     {% include 'inc/sync_warning.html' with object=module %}
     <div class="card">
-      <h5 class="card-header justify-content-between" id="module{{ module.pk }}">
+      <h2 class="card-header justify-content-between" id="module{{ module.pk }}">
         <div>
           <i class="mdi mdi-file-document-outline"></i> {{ module }}
         </div>
@@ -38,7 +38,7 @@
             </a>
           {% endif %}
         </div>
-      </h5>
+      </h2>
       {% if module.scripts %}
         <table class="table table-hover scripts">
           <thead>
diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html
index 6feaf2eac..4e1379fed 100644
--- a/netbox/templates/extras/tag.html
+++ b/netbox/templates/extras/tag.html
@@ -8,7 +8,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Tag" %}</h5>
+        <h2 class="card-header">{% trans "Tag" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -40,7 +40,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Allowed Object Types" %}</h5>
+        <h2 class="card-header">{% trans "Allowed Object Types" %}</h2>
         <table class="table table-hover attr-table">
           {% for ct in object.object_types.all %}
             <tr>
@@ -54,7 +54,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Tagged Item Types" %}</h5>
+        <h2 class="card-header">{% trans "Tagged Item Types" %}</h2>
         <table class="table table-hover attr-table">
           {% for object_type in object_types %}
             <tr>
@@ -78,7 +78,7 @@
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Tagged Objects" %}</h5>
+        <h2 class="card-header">{% trans "Tagged Objects" %}</h2>
         <div class="card-body table-responsive">
           {% render_table taggeditem_table 'inc/table.html' %}
           {% include 'inc/paginator.html' with paginator=taggeditem_table.paginator page=taggeditem_table.page %}
diff --git a/netbox/templates/extras/webhook.html b/netbox/templates/extras/webhook.html
index 9fce9d591..19a6bc4a2 100644
--- a/netbox/templates/extras/webhook.html
+++ b/netbox/templates/extras/webhook.html
@@ -7,7 +7,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Webhook" %}</h5>
+      <h2 class="card-header">{% trans "Webhook" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -20,7 +20,7 @@
       </table>
     </div>
     <div class="card">
-      <h5 class="card-header">{% trans "HTTP Request" %}</h5>
+      <h2 class="card-header">{% trans "HTTP Request" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "HTTP Method" %}</th>
@@ -41,7 +41,7 @@
       </table>
     </div>
     <div class="card">
-      <h5 class="card-header">{% trans "SSL" %}</h5>
+      <h2 class="card-header">{% trans "SSL" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "SSL Verification" %}</th>
@@ -57,9 +57,7 @@
 	</div>
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">
-        {% trans "Additional Headers" %}
-      </h5>
+      <h2 class="card-header">{% trans "Additional Headers" %}</h2>
       <div class="card-body">
         {% if object.additional_headers %}
           <pre>{{ object.additional_headers }}</pre>
@@ -69,9 +67,7 @@
       </div>
     </div>
     <div class="card">
-      <h5 class="card-header">
-        {% trans "Body Template" %}
-      </h5>
+      <h2 class="card-header">{% trans "Body Template" %}</h2>
       <div class="card-body">
         {% if object.body_template %}
           <pre>{{ object.body_template }}</pre>
diff --git a/netbox/templates/generic/_base.html b/netbox/templates/generic/_base.html
index 36e7178b2..6c279b102 100644
--- a/netbox/templates/generic/_base.html
+++ b/netbox/templates/generic/_base.html
@@ -10,7 +10,7 @@
 
           {# Title #}
           <div>
-            <h2 class="page-title my-1">{% block title %}{% endblock title %}</h2>
+            <h1 class="page-title mt-1 mb-2">{% block title %}{% endblock title %}</h1>
             {% block subtitle %}{% endblock %}
           </div>
 
diff --git a/netbox/templates/generic/bulk_add_component.html b/netbox/templates/generic/bulk_add_component.html
index 10a1c9861..72502f441 100644
--- a/netbox/templates/generic/bulk_add_component.html
+++ b/netbox/templates/generic/bulk_add_component.html
@@ -55,7 +55,7 @@ Context:
       <div class="row">
         <div class="col col-md-12 col-lg-10 offset-lg-1">
           <div class="card">
-            <h5 class="card-header">{{ model_name|title }} {% trans "to Add" %}</h5>
+            <h2 class="card-header">{{ model_name|title }} {% trans "to Add" %}</h2>
             <div class="card-body">
               {% for field in form.visible_fields %}
                 {% render_field field %}
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html
index 7dff03a7b..7da69a281 100644
--- a/netbox/templates/generic/bulk_edit.html
+++ b/netbox/templates/generic/bulk_edit.html
@@ -62,7 +62,7 @@ Context:
         {% if form.add_tags and form.remove_tags %}
           <div class="field-group mb-5">
             <div class="row">
-              <h5 class="col-9 offset-3">{% trans "Tags" %}</h5>
+              <h2 class="col-9 offset-3">{% trans "Tags" %}</h2>
             </div>
             {% render_field form.add_tags %}
             {% render_field form.remove_tags %}
@@ -73,7 +73,7 @@ Context:
         {% if form.custom_fields %}
           <div class="field-group mb-5">
             <div class="row">
-              <h5 class="col-9 offset-3">{% trans "Custom Fields" %}</h5>
+              <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
             </div>
             {% render_custom_fields form %}
           </div>
@@ -83,7 +83,7 @@ Context:
         {% if form.comments %}
           <div class="field-group mb-5">
             <div class="row">
-              <h5 class="col-9 offset-3">{% trans "Comments" %}</h5>
+              <h2 class="col-9 offset-3">{% trans "Comments" %}</h2>
             </div>
             {% render_field form.comments bulk_nullable=True %}
           </div>
diff --git a/netbox/templates/generic/bulk_import.html b/netbox/templates/generic/bulk_import.html
index 240f0c607..8514bf900 100644
--- a/netbox/templates/generic/bulk_import.html
+++ b/netbox/templates/generic/bulk_import.html
@@ -110,7 +110,7 @@ Context:
   <div class="row my-3">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Field Options" %}</h5>
+        <h2 class="card-header">{% trans "Field Options" %}</h2>
         <table class="table">
           <thead>
             <tr>
diff --git a/netbox/templates/generic/bulk_rename.html b/netbox/templates/generic/bulk_rename.html
index eaf08cb54..ce9d95c65 100644
--- a/netbox/templates/generic/bulk_rename.html
+++ b/netbox/templates/generic/bulk_rename.html
@@ -54,7 +54,7 @@ Context:
         <form action="" method="post" class="form form-horizontal">
             {% csrf_token %}
             <div class="card">
-                <h5 class="card-header">{% trans "Rename" %}</h5>
+                <h2 class="card-header">{% trans "Rename" %}</h2>
                 <div class="card-body">
                     {% render_form form %}
                 </div>
diff --git a/netbox/templates/generic/confirmation_form.html b/netbox/templates/generic/confirmation_form.html
index 36706edce..0f959c108 100644
--- a/netbox/templates/generic/confirmation_form.html
+++ b/netbox/templates/generic/confirmation_form.html
@@ -11,7 +11,7 @@
           {{ field }}
         {% endfor %}
         <div class="card border-danger">
-          <h5 class="card-header">{% block confirmation_title %}{% endblock %}</h5>
+          <h2 class="card-header">{% block confirmation_title %}{% endblock %}</h2>
           <div class="card-body">
             {% block message %}<p>{% trans "Are you sure" %}?</p>{% endblock %}
           </div>
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index bf0e1ae9a..5cb2cc731 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -100,9 +100,9 @@ Context:
 {% endblock controls %}
 
 {% block tabs %}
-  <ul class="nav nav-tabs">
+  <ul class="nav nav-tabs" role="presentation">
     {# Primary tab #}
-    <li class="nav-item" role="presentation">
+    <li class="nav-item">
       <a class="nav-link{% if not tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
     </li>
 
diff --git a/netbox/templates/htmx/form.html b/netbox/templates/htmx/form.html
index f9eecc2b9..530a18054 100644
--- a/netbox/templates/htmx/form.html
+++ b/netbox/templates/htmx/form.html
@@ -16,7 +16,7 @@
   {% if form.custom_fields %}
     <div class="field-group mb-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Custom Fields" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
       </div>
       {% render_custom_fields form %}
     </div>
diff --git a/netbox/templates/inc/panel_table.html b/netbox/templates/inc/panel_table.html
index 8390849b3..1a9f149d4 100644
--- a/netbox/templates/inc/panel_table.html
+++ b/netbox/templates/inc/panel_table.html
@@ -3,7 +3,7 @@
 
 <div class="card {% if panel_class %}border-{{ panel_class }}{% endif %}">
   {% if heading %}
-    <h5 class="card-header{% if panel_class %} text-{{ panel_class }}{% endif %}">{{ heading }}</h5>
+    <h2 class="card-header{% if panel_class %} text-{{ panel_class }}{% endif %}">{{ heading }}</h2>
   {% endif %}
   {% if table.rows %}
     <div class="table-responsive">
diff --git a/netbox/templates/inc/panels/comments.html b/netbox/templates/inc/panels/comments.html
index 164238200..47fd99085 100644
--- a/netbox/templates/inc/panels/comments.html
+++ b/netbox/templates/inc/panels/comments.html
@@ -2,9 +2,7 @@
 {% load i18n %}
 
 <div class="card">
-  <h5 class="card-header">
-    {% trans "Comments" %}
-  </h5>
+  <h2 class="card-header">{% trans "Comments" %}</h2>
   <div class="card-body">
     {% if object.comments %}
       {{ object.comments|markdown }}
diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html
index 7743f6fd9..317cf1631 100644
--- a/netbox/templates/inc/panels/custom_fields.html
+++ b/netbox/templates/inc/panels/custom_fields.html
@@ -4,7 +4,7 @@
 {% with custom_fields=object.get_custom_fields_by_group %}
   {% if custom_fields %}
     <div class="card">
-      <h5 class="card-header">{% trans "Custom Fields" %}</h5>
+      <h2 class="card-header">{% trans "Custom Fields" %}</h2>
       <table class="table table-hover attr-table">
         {% for group_name, fields in custom_fields.items %}
           {% if group_name %}
diff --git a/netbox/templates/inc/panels/image_attachments.html b/netbox/templates/inc/panels/image_attachments.html
index faae29dbe..2ad715335 100644
--- a/netbox/templates/inc/panels/image_attachments.html
+++ b/netbox/templates/inc/panels/image_attachments.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div class="card">
-  <h5 class="card-header">
+  <h2 class="card-header">
     {% trans "Images" %}
     {% if perms.extras.add_imageattachment %}
       <div class="card-actions">
@@ -11,6 +11,6 @@
         </a>
       </div>
     {% endif %}
-  </h5>
+  </h2>
   {% htmx_table 'extras:imageattachment_list' object_type_id=object|content_type_id object_id=object.pk %}
 </div>
diff --git a/netbox/templates/inc/panels/related_objects.html b/netbox/templates/inc/panels/related_objects.html
index 57605f110..8b4a4658b 100644
--- a/netbox/templates/inc/panels/related_objects.html
+++ b/netbox/templates/inc/panels/related_objects.html
@@ -2,8 +2,8 @@
 {% load i18n %}
 
 <div class="card">
-  <h5 class="card-header">{% trans "Related Objects" %}</h5>
-  <ul class="list-group list-group-flush">
+  <h2 class="card-header">{% trans "Related Objects" %}</h2>
+  <ul class="list-group list-group-flush" role="presentation">
     {% for qs, filter_param in related_models %}
       {% with viewname=qs.model|viewname:"list" %}
         <a href="{% url viewname %}?{{ filter_param }}={{ object.pk }}" class="list-group-item list-group-item-action d-flex justify-content-between">
diff --git a/netbox/templates/inc/panels/tags.html b/netbox/templates/inc/panels/tags.html
index 49097022d..0e676eb09 100644
--- a/netbox/templates/inc/panels/tags.html
+++ b/netbox/templates/inc/panels/tags.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div class="card">
-  <h5 class="card-header">{% trans "Tags" %}</h5>
+  <h2 class="card-header">{% trans "Tags" %}</h2>
   <div class="card-body">
     {% with url=object|validated_viewname:"list" %}
       {% for tag in object.tags.all %}
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index a6415463e..de8d5dd60 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -8,7 +8,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Aggregate" %}</h5>
+        <h2 class="card-header">{% trans "Aggregate" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Family" %}</th>
diff --git a/netbox/templates/ipam/asn.html b/netbox/templates/ipam/asn.html
index b0494cf53..7ad17c5a0 100644
--- a/netbox/templates/ipam/asn.html
+++ b/netbox/templates/ipam/asn.html
@@ -17,7 +17,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "ASN" %}</h5>
+        <h2 class="card-header">{% trans "ASN" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "AS Number" %}</th>
diff --git a/netbox/templates/ipam/asnrange.html b/netbox/templates/ipam/asnrange.html
index 314d33361..81d9cfda9 100644
--- a/netbox/templates/ipam/asnrange.html
+++ b/netbox/templates/ipam/asnrange.html
@@ -9,7 +9,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "ASN Range" %}</h5>
+        <h2 class="card-header">{% trans "ASN Range" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/ipam/fhrpgroup.html b/netbox/templates/ipam/fhrpgroup.html
index cdc7a172d..943b11bb8 100644
--- a/netbox/templates/ipam/fhrpgroup.html
+++ b/netbox/templates/ipam/fhrpgroup.html
@@ -16,7 +16,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "FHRP Group" %}</h5>
+        <h2 class="card-header">{% trans "FHRP Group" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Protocol" %}</th>
@@ -46,7 +46,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Authentication" %}</h5>
+        <h2 class="card-header">{% trans "Authentication" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Authentication Type" %}</th>
@@ -65,7 +65,7 @@
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">
+        <h2 class="card-header">
           {% trans "Virtual IP Addresses" %}
           {% if perms.ipam.add_ipaddress %}
             <div class="card-actions">
@@ -74,7 +74,7 @@
               </a>
             </div>
           {% endif %}
-        </h5>
+        </h2>
         {% htmx_table 'ipam:ipaddress_list' fhrpgroup_id=object.pk %}
       </div>
       {% include 'inc/panel_table.html' with table=members_table heading='Members' %}
diff --git a/netbox/templates/ipam/inc/panels/fhrp_groups.html b/netbox/templates/ipam/inc/panels/fhrp_groups.html
index 845e8fbf8..98ad87697 100644
--- a/netbox/templates/ipam/inc/panels/fhrp_groups.html
+++ b/netbox/templates/ipam/inc/panels/fhrp_groups.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div class="card">
-  <h5 class="card-header">
+  <h2 class="card-header">
     {% trans "FHRP Groups" %}
     <div class="card-actions">
       {% if perms.ipam.add_fhrpgroup %}
@@ -16,7 +16,7 @@
         </a>
       {% endif %}
     </div>
-  </h5>
+  </h2>
   <table class="table table-hover">
     <thead>
       <tr>
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 01b4d5a7f..e2cc88cf2 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -8,7 +8,7 @@
 <div class="row">
 	<div class="col col-md-4">
       <div class="card">
-          <h5 class="card-header">{% trans "IP Address" %}</h5>
+          <h2 class="card-header">{% trans "IP Address" %}</h2>
           <table class="table table-hover attr-table">
               <tr>
                   <th scope="row">{% trans "Family" %}</th>
@@ -115,7 +115,7 @@
       {% include 'inc/panel_table.html' with table=duplicate_ips_table heading='Duplicate IPs' panel_class='danger' %}
     {% endif %}
     <div class="card">
-      <h5 class="card-header">{% trans "Services" %}</h5>
+      <h2 class="card-header">{% trans "Services" %}</h2>
       {% htmx_table 'ipam:service_list' ipaddress_id=object.pk %}
     </div>
     {% plugin_right_page object %}
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html
index 3001bffc7..d96ad7452 100644
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ b/netbox/templates/ipam/ipaddress_assign.html
@@ -19,7 +19,7 @@
     {% endfor %}
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Select IP Address" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Select IP Address" %}</h2>
       </div>
       {% render_field form.vrf_id %}
       {% render_field form.q %}
diff --git a/netbox/templates/ipam/ipaddress_bulk_add.html b/netbox/templates/ipam/ipaddress_bulk_add.html
index e4764fd33..a5b3599fc 100644
--- a/netbox/templates/ipam/ipaddress_bulk_add.html
+++ b/netbox/templates/ipam/ipaddress_bulk_add.html
@@ -12,7 +12,7 @@
 {% block form %}
     <div class="field-group my-5">
         <div class="row">
-          <h5 class="col-9 offset-3">{% trans "IP Addresses" %}</h5>
+          <h2 class="col-9 offset-3">{% trans "IP Addresses" %}</h2>
         </div>
         {% render_field form.pattern %}
         {% render_field model_form.status %}
@@ -24,7 +24,7 @@
 
     <div class="field-group my-5">
         <div class="row">
-          <h5 class="col-9 offset-3">{% trans "Tenancy" %}</h5>
+          <h2 class="col-9 offset-3">{% trans "Tenancy" %}</h2>
         </div>
         {% render_field model_form.tenant_group %}
         {% render_field model_form.tenant %}
@@ -32,7 +32,7 @@
     {% if model_form.custom_fields %}
         <div class="field-group my-5">
             <div class="row">
-              <h5 class="col-9 offset-3">{% trans "Custom Fields" %}</h5>
+              <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
             </div>
             {% render_custom_fields model_form %}
         </div>
diff --git a/netbox/templates/ipam/iprange.html b/netbox/templates/ipam/iprange.html
index 3a1a7f6ed..19fbd5171 100644
--- a/netbox/templates/ipam/iprange.html
+++ b/netbox/templates/ipam/iprange.html
@@ -7,7 +7,7 @@
 <div class="row">
   <div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "IP Range" %}</h5>
+      <h2 class="card-header">{% trans "IP Range" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
             <th scope="row">{% trans "Family" %}</th>
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index bd6154e16..94307cddb 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Prefix" %}</h5>
+      <h2 class="card-header">{% trans "Prefix" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Family" %}</th>
@@ -91,7 +91,7 @@
   </div>
   <div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Addressing" %}
         {% if object.prefix.version == 4 %}
           <div class="card-actions">
@@ -100,7 +100,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Utilization" %}</th>
diff --git a/netbox/templates/ipam/rir.html b/netbox/templates/ipam/rir.html
index 53a259389..077c85964 100644
--- a/netbox/templates/ipam/rir.html
+++ b/netbox/templates/ipam/rir.html
@@ -16,7 +16,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "RIR" %}</h5>
+      <h2 class="card-header">{% trans "RIR" %}</h2>
         <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html
index 952e3cbf2..73f509643 100644
--- a/netbox/templates/ipam/role.html
+++ b/netbox/templates/ipam/role.html
@@ -16,7 +16,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Role" %}</h5>
+      <h2 class="card-header">{% trans "Role" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/ipam/routetarget.html b/netbox/templates/ipam/routetarget.html
index 3eccca8c6..8f2e22e28 100644
--- a/netbox/templates/ipam/routetarget.html
+++ b/netbox/templates/ipam/routetarget.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Route Target" %}</h5>
+        <h2 class="card-header">{% trans "Route Target" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -35,13 +35,13 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Importing VRFs" %}</h5>
+        <h2 class="card-header">{% trans "Importing VRFs" %}</h2>
         {% htmx_table 'ipam:vrf_list' import_target_id=object.pk %}
       </div>
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Exporting VRFs" %}</h5>
+        <h2 class="card-header">{% trans "Exporting VRFs" %}</h2>
         {% htmx_table 'ipam:vrf_list' export_target_id=object.pk %}
       </div>
     </div>
@@ -49,13 +49,13 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Importing L2VPNs" %}</h5>
+        <h2 class="card-header">{% trans "Importing L2VPNs" %}</h2>
         {% htmx_table 'vpn:l2vpn_list' import_target_id=object.pk %}
       </div>
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Exporting L2VPNs" %}</h5>
+        <h2 class="card-header">{% trans "Exporting L2VPNs" %}</h2>
         {% htmx_table 'vpn:l2vpn_list' export_target_id=object.pk %}
       </div>
     </div>
diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html
index 7f0b8451d..950438f1e 100644
--- a/netbox/templates/ipam/service.html
+++ b/netbox/templates/ipam/service.html
@@ -18,7 +18,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">{% trans "Service" %}</h5>
+            <h2 class="card-header">{% trans "Service" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/ipam/servicetemplate.html b/netbox/templates/ipam/servicetemplate.html
index edf471e6b..912c8566a 100644
--- a/netbox/templates/ipam/servicetemplate.html
+++ b/netbox/templates/ipam/servicetemplate.html
@@ -9,7 +9,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Service Template" %}</h5>
+        <h2 class="card-header">{% trans "Service Template" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index 5553be7f4..95a4f7856 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -9,7 +9,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "VLAN" %}</h5>
+                <h2 class="card-header">{% trans "VLAN" %}</h2>
                 <table class="table table-hover attr-table">
                     {% if object.site.region %}
                         <tr>
@@ -80,7 +80,7 @@
     <div class="row">
       <div class="col col-md-12">
         <div class="card">
-          <h5 class="card-header">
+          <h2 class="card-header">
             {% trans "Prefixes" %}
             {% if perms.ipam.add_prefix %}
               <div class="card-actions">
@@ -89,7 +89,7 @@
                 </a>
               </div>
             {% endif %}
-          </h5>
+          </h2>
           {% htmx_table 'ipam:prefix_list' vlan_id=object.pk %}
         </div>
         {% plugin_full_width_page object %}
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
index 3ee04980e..63509c81b 100644
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -7,7 +7,7 @@
 {% block form %}
   <div class="field-group my-5">
     <div class="row">
-      <h5 class="col-9 offset-3">{% trans "VLAN" %}</h5>
+      <h2 class="col-9 offset-3">{% trans "VLAN" %}</h2>
     </div>
     {% render_field form.vid %}
     {% render_field form.name %}
@@ -19,7 +19,7 @@
 
   <div class="field-group my-5">
     <div class="row">
-      <h5 class="col-9 offset-3">{% trans "Tenancy" %}</h5>
+      <h2 class="col-9 offset-3">{% trans "Tenancy" %}</h2>
     </div>
     {% render_field form.tenant_group %}
     {% render_field form.tenant %}
@@ -27,7 +27,7 @@
 
   <div class="field-group my-5">
     <div class="row">
-      <h5 class="col-9 offset-3">{% trans "Assignment" %}</h5>
+      <h2 class="col-9 offset-3">{% trans "Assignment" %}</h2>
     </div>
     {% with site_tab_active=form.initial.site %}
       <div class="row">
@@ -60,7 +60,7 @@
   {% if form.custom_fields %}
     <div class="field-group my-5">
       <div class="row">
-        <h5 class="col-9 offset-3">{% trans "Custom Fields" %}</h5>
+        <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
       </div>
       {% render_custom_fields form %}
     </div>
diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html
index cc8c790a9..8b869c1d2 100644
--- a/netbox/templates/ipam/vlangroup.html
+++ b/netbox/templates/ipam/vlangroup.html
@@ -24,7 +24,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "VLAN Group" %}</h5>
+      <h2 class="card-header">{% trans "VLAN Group" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index 936391ecf..644b81d71 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -10,7 +10,7 @@
 <div class="row">
 	<div class="col col-md-6">
       <div class="card">
-          <h5 class="card-header">{% trans "VRF" %}</h5>
+          <h2 class="card-header">{% trans "VRF" %}</h2>
           <table class="table table-hover attr-table">
               <tr>
                   <th scope="row">{% trans "Route Distinguisher" %}</th>
diff --git a/netbox/templates/tenancy/contact.html b/netbox/templates/tenancy/contact.html
index 9f88aa9ec..b2d1a4078 100644
--- a/netbox/templates/tenancy/contact.html
+++ b/netbox/templates/tenancy/contact.html
@@ -15,7 +15,7 @@
   <div class="row">
     <div class="col col-md-7">
       <div class="card">
-        <h5 class="card-header">{% trans "Contact" %}</h5>
+        <h2 class="card-header">{% trans "Contact" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Group" %}</th>
@@ -81,7 +81,7 @@
   <div class="row mb-3">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Assignments" %}</h5>
+        <h2 class="card-header">{% trans "Assignments" %}</h2>
         {% htmx_table 'tenancy:contactassignment_list' contact_id=object.pk %}
       </div>
       {% plugin_full_width_page object %}
diff --git a/netbox/templates/tenancy/contactgroup.html b/netbox/templates/tenancy/contactgroup.html
index 7254bf8df..bf6928c15 100644
--- a/netbox/templates/tenancy/contactgroup.html
+++ b/netbox/templates/tenancy/contactgroup.html
@@ -15,7 +15,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Contact Group" %}</h5>
+        <h2 class="card-header">{% trans "Contact Group" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -42,7 +42,7 @@
   </div>
   <div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Child Groups" %}
         {% if perms.tenancy.add_contactgroup %}
           <div class="card-actions">
@@ -51,7 +51,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'tenancy:contactgroup_list' parent_id=object.pk %}
     </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/tenancy/contactrole.html b/netbox/templates/tenancy/contactrole.html
index 335c814cb..e33d17a18 100644
--- a/netbox/templates/tenancy/contactrole.html
+++ b/netbox/templates/tenancy/contactrole.html
@@ -12,7 +12,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Contact Role" %}</h5>
+        <h2 class="card-header">{% trans "Contact Role" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index 3f0056da8..ad2b5efef 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -14,7 +14,7 @@
   <div class="row">
     <div class="col col-md-7">
       <div class="card">
-        <h5 class="card-header">{% trans "Tenant" %}</h5>
+        <h2 class="card-header">{% trans "Tenant" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Group" %}</th>
diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html
index ecd8581ec..0567f2ab3 100644
--- a/netbox/templates/tenancy/tenantgroup.html
+++ b/netbox/templates/tenancy/tenantgroup.html
@@ -23,7 +23,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Tenant Group" %}</h5>
+      <h2 class="card-header">{% trans "Tenant Group" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -51,7 +51,7 @@
 <div class="row mb-3">
 	<div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Child Groups" %}
         {% if perms.tenancy.add_tenantgroup %}
           <div class="card-actions">
@@ -60,7 +60,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'tenancy:tenantgroup_list' parent_id=object.pk %}
     </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/users/group.html b/netbox/templates/users/group.html
index defc61854..0a89f151a 100644
--- a/netbox/templates/users/group.html
+++ b/netbox/templates/users/group.html
@@ -11,7 +11,7 @@
   <div class="row mb-3">
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Group" %}</h5>
+        <h2 class="card-header">{% trans "Group" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -26,7 +26,7 @@
     </div>
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Users" %}</h5>
+        <h2 class="card-header">{% trans "Users" %}</h2>
         <div class="list-group list-group-flush">
           {% for user in object.users.all %}
             <a href="{% url 'users:user' pk=user.pk %}" class="list-group-item list-group-item-action">{{ user }}</a>
@@ -36,7 +36,7 @@
         </div>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Assigned Permissions" %}</h5>
+        <h2 class="card-header">{% trans "Assigned Permissions" %}</h2>
         <div class="list-group list-group-flush">
           {% for perm in object.object_permissions.all %}
             <a href="{% url 'users:objectpermission' pk=perm.pk %}" class="list-group-item list-group-item-action">{{ perm }}</a>
diff --git a/netbox/templates/users/objectpermission.html b/netbox/templates/users/objectpermission.html
index 3e8b71327..23f5ef866 100644
--- a/netbox/templates/users/objectpermission.html
+++ b/netbox/templates/users/objectpermission.html
@@ -11,7 +11,7 @@
   <div class="row mb-3">
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Permission" %}</h5>
+        <h2 class="card-header">{% trans "Permission" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -28,7 +28,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Actions" %}</h5>
+        <h2 class="card-header">{% trans "Actions" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "View" %}</th>
@@ -49,7 +49,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Constraints" %}</h5>
+        <h2 class="card-header">{% trans "Constraints" %}</h2>
         <div class="card-body">
           {% if object.constraints %}
             <pre>{{ object.constraints|json }}</pre>
@@ -61,7 +61,7 @@
     </div>
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Object Types" %}</h5>
+        <h2 class="card-header">{% trans "Object Types" %}</h2>
         <ul class="list-group list-group-flush">
           {% for user in object.object_types.all %}
             <li class="list-group-item">{{ user }}</li>
@@ -69,7 +69,7 @@
         </ul>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Assigned Users" %}</h5>
+        <h2 class="card-header">{% trans "Assigned Users" %}</h2>
         <div class="list-group list-group-flush">
           {% for user in object.users.all %}
             <a href="{% url 'users:user' pk=user.pk %}" class="list-group-item list-group-item-action">{{ user }}</a>
@@ -79,7 +79,7 @@
         </div>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Assigned Groups" %}</h5>
+        <h2 class="card-header">{% trans "Assigned Groups" %}</h2>
         <div class="list-group list-group-flush">
           {% for group in object.groups.all %}
             <a href="{% url 'users:group' pk=group.pk %}" class="list-group-item list-group-item-action">{{ group }}</a>
diff --git a/netbox/templates/users/token.html b/netbox/templates/users/token.html
index 968c1d421..674476d51 100644
--- a/netbox/templates/users/token.html
+++ b/netbox/templates/users/token.html
@@ -11,7 +11,7 @@
   <div class="row mb-3">
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Token" %}</h5>
+        <h2 class="card-header">{% trans "Token" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Key" %}</th>
diff --git a/netbox/templates/users/user.html b/netbox/templates/users/user.html
index c708fb963..a36a6d8b7 100644
--- a/netbox/templates/users/user.html
+++ b/netbox/templates/users/user.html
@@ -11,7 +11,7 @@
   <div class="row mb-3">
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "User" %}</h5>
+        <h2 class="card-header">{% trans "User" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Username" %}</th>
@@ -50,7 +50,7 @@
     </div>
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Assigned Groups" %}</h5>
+        <h2 class="card-header">{% trans "Assigned Groups" %}</h2>
         <div class="list-group list-group-flush">
           {% for group in object.groups.all %}
             <a href="{% url 'users:group' pk=group.pk %}" class="list-group-item list-group-item-action">{{ group }}</a>
@@ -60,7 +60,7 @@
         </div>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Assigned Permissions" %}</h5>
+        <h2 class="card-header">{% trans "Assigned Permissions" %}</h2>
         <div class="list-group list-group-flush">
           {% for perm in object.object_permissions.all %}
             <a href="{% url 'users:objectpermission' pk=perm.pk %}" class="list-group-item list-group-item-action">{{ perm }}</a>
@@ -75,7 +75,7 @@
     <div class="row">
       <div class="col-md-12">
         <div class="card">
-          <h5 class="card-header text-center">{% trans "Recent Activity" %}</h5>
+          <h2 class="text-center">{% trans "Recent Activity" %}</h2>
           <div class="card-body table-responsive">
             {% render_table changelog_table 'inc/table.html' %}
           </div>
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index a2c3e06c1..ec5598b60 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -7,7 +7,7 @@
 <div class="row">
   <div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Cluster" %}</h5>
+      <h2 class="card-header">{% trans "Cluster" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -49,7 +49,7 @@
   </div>
   <div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Allocated Resources" %}</h5>
+      <h2 class="card-header">{% trans "Allocated Resources" %}</h2>
       <table class="table table-hover attr-table">
           <tr>
               <th scope="row"><i class="mdi mdi-gauge"></i> {% trans "Virtual CPUs" %}</th>
diff --git a/netbox/templates/virtualization/clustergroup.html b/netbox/templates/virtualization/clustergroup.html
index 1c818d94c..ecc3a745d 100644
--- a/netbox/templates/virtualization/clustergroup.html
+++ b/netbox/templates/virtualization/clustergroup.html
@@ -16,7 +16,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Cluster Group" %}</h5>
+      <h2 class="card-header">{% trans "Cluster Group" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/virtualization/clustertype.html b/netbox/templates/virtualization/clustertype.html
index 877c0fec7..3313a3ec1 100644
--- a/netbox/templates/virtualization/clustertype.html
+++ b/netbox/templates/virtualization/clustertype.html
@@ -16,7 +16,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Cluster Type" %}</h5>
+      <h2 class="card-header">{% trans "Cluster Type" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/virtualization/virtualdisk.html b/netbox/templates/virtualization/virtualdisk.html
index 2cad4fcd8..23985d580 100644
--- a/netbox/templates/virtualization/virtualdisk.html
+++ b/netbox/templates/virtualization/virtualdisk.html
@@ -15,7 +15,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Virtual Disk" %}</h5>
+        <h2 class="card-header">{% trans "Virtual Disk" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Virtual Machine" %}</th>
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 37cd11836..2bff51870 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -9,7 +9,7 @@
 <div class="row my-3">
 	<div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">{% trans "Virtual Machine" %}</h5>
+            <h2 class="card-header">{% trans "Virtual Machine" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Name" %}</th>
@@ -89,7 +89,7 @@
     </div>
 	<div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">{% trans "Cluster" %}</h5>
+            <h2 class="card-header">{% trans "Cluster" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Site" %}</th>
@@ -119,7 +119,7 @@
             </table>
         </div>
         <div class="card">
-            <h5 class="card-header">{% trans "Resources" %}</h5>
+            <h2 class="card-header">{% trans "Resources" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row"><i class="mdi mdi-gauge"></i> {% trans "Virtual CPUs" %}</th>
@@ -150,7 +150,7 @@
             </table>
         </div>
         <div class="card">
-          <h5 class="card-header">
+          <h2 class="card-header">
             {% trans "Services" %}
             {% if perms.ipam.add_service %}
               <div class="card-actions">
@@ -159,7 +159,7 @@
                 </a>
               </div>
             {% endif %}
-          </h5>
+          </h2>
           {% htmx_table 'ipam:service_list' virtual_machine_id=object.pk %}
         </div>
         {% include 'inc/panels/image_attachments.html' %}
@@ -170,7 +170,7 @@
 <div class="row">
   <div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Virtual Disks" %}
         {% if perms.virtualization.add_virtualdisk %}
           <div class="card-actions">
@@ -179,7 +179,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'virtualization:virtualdisk_list' virtual_machine_id=object.pk %}
     </div>
   </div>
diff --git a/netbox/templates/virtualization/virtualmachine/render_config.html b/netbox/templates/virtualization/virtualmachine/render_config.html
index 4b67982f4..0ed66c5f7 100644
--- a/netbox/templates/virtualization/virtualmachine/render_config.html
+++ b/netbox/templates/virtualization/virtualmachine/render_config.html
@@ -8,7 +8,7 @@
   <div class="row mb-3">
     <div class="col-5">
       <div class="card">
-        <h5 class="card-header">{% trans "Config Template" %}</h5>
+        <h2 class="card-header">{% trans "Config Template" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Config Template" %}</th>
@@ -54,7 +54,7 @@
             <a href="?export=True" class="btn btn-primary lh-1" role="button">
               <i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
             </a>
-        </h5>
+        </h2>
         {% if config_template %}
           <pre class="card-body">{{ rendered_config }}</pre>
         {% else %}
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index 988d52d9e..0d679680d 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -15,7 +15,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">{% trans "Interface" %}</h5>
+            <h2 class="card-header">{% trans "Interface" %}</h2>
             <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">{% trans "Virtual Machine" %}</th>
@@ -81,7 +81,7 @@
 <div class="row mb-3">
     <div class="col col-md-12">
         <div class="card">
-            <h5 class="card-header">
+            <h2 class="card-header">
               {% trans "IP Addresses" %}
               {% if perms.ipam.add_ipaddress %}
                 <div class="card-actions">
@@ -90,7 +90,7 @@
                   </a>
                 </div>
               {% endif %}
-            </h5>
+            </h2>
             {% htmx_table 'ipam:ipaddress_list' vminterface_id=object.pk %}
         </div>
     </div>
diff --git a/netbox/templates/vpn/ikepolicy.html b/netbox/templates/vpn/ikepolicy.html
index d14cf3fd9..baab89e7e 100644
--- a/netbox/templates/vpn/ikepolicy.html
+++ b/netbox/templates/vpn/ikepolicy.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "IKE Policy" %}</h5>
+        <h2 class="card-header">{% trans "IKE Policy" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -54,7 +54,7 @@
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Proposals" %}</h5>
+        <h2 class="card-header">{% trans "Proposals" %}</h2>
         {% htmx_table 'vpn:ikeproposal_list' ike_policy_id=object.pk %}
       </div>
       {% plugin_full_width_page object %}
diff --git a/netbox/templates/vpn/ikeproposal.html b/netbox/templates/vpn/ikeproposal.html
index 616bca16a..9cdcdd2a2 100644
--- a/netbox/templates/vpn/ikeproposal.html
+++ b/netbox/templates/vpn/ikeproposal.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "IKE Proposal" %}</h5>
+        <h2 class="card-header">{% trans "IKE Proposal" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/vpn/ipsecpolicy.html b/netbox/templates/vpn/ipsecpolicy.html
index ef5a6be48..a75dbc59a 100644
--- a/netbox/templates/vpn/ipsecpolicy.html
+++ b/netbox/templates/vpn/ipsecpolicy.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "IPSec Policy" %}</h5>
+        <h2 class="card-header">{% trans "IPSec Policy" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -42,7 +42,7 @@
     <div class="col col-md-12">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Proposals" %}</h5>
+        <h2 class="card-header">{% trans "Proposals" %}</h2>
         {% htmx_table 'vpn:ipsecproposal_list' ipsec_policy_id=object.pk %}
       </div>
       {% plugin_full_width_page object %}
diff --git a/netbox/templates/vpn/ipsecprofile.html b/netbox/templates/vpn/ipsecprofile.html
index 2d31e2553..bed3fba69 100644
--- a/netbox/templates/vpn/ipsecprofile.html
+++ b/netbox/templates/vpn/ipsecprofile.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "IPSec Profile" %}</h5>
+        <h2 class="card-header">{% trans "IPSec Profile" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -30,7 +30,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "IKE Policy" %}</h5>
+        <h2 class="card-header">{% trans "IKE Policy" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -63,7 +63,7 @@
         </table>
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "IPSec Policy" %}</h5>
+        <h2 class="card-header">{% trans "IPSec Policy" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/vpn/ipsecproposal.html b/netbox/templates/vpn/ipsecproposal.html
index 68c516a6a..f103a77d1 100644
--- a/netbox/templates/vpn/ipsecproposal.html
+++ b/netbox/templates/vpn/ipsecproposal.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "IPSec Proposal" %}</h5>
+        <h2 class="card-header">{% trans "IPSec Proposal" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/vpn/l2vpn.html b/netbox/templates/vpn/l2vpn.html
index f253b64b5..7f64d8086 100644
--- a/netbox/templates/vpn/l2vpn.html
+++ b/netbox/templates/vpn/l2vpn.html
@@ -8,7 +8,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "L2VPN Attributes" %}</h5>
+      <h2 class="card-header">{% trans "L2VPN Attributes" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -52,7 +52,7 @@
 <div class="row mb-3">
 	<div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Terminations" %}
         {% if perms.vpn.add_l2vpntermination %}
           <div class="card-actions">
@@ -61,7 +61,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'vpn:l2vpntermination_list' l2vpn_id=object.pk %}
     </div>
   </div>
diff --git a/netbox/templates/vpn/l2vpntermination.html b/netbox/templates/vpn/l2vpntermination.html
index 725a98533..75567e599 100644
--- a/netbox/templates/vpn/l2vpntermination.html
+++ b/netbox/templates/vpn/l2vpntermination.html
@@ -6,7 +6,7 @@
 <div class="row">
 	<div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">{% trans "L2VPN Attributes" %}</h5>
+            <h2 class="card-header">{% trans "L2VPN Attributes" %}</h2>
             <table class="table table-hover">
                 <tr>
                     <th scope="row">{% trans "L2VPN" %}</th>
diff --git a/netbox/templates/vpn/tunnel.html b/netbox/templates/vpn/tunnel.html
index 09b11305a..b8e95cac3 100644
--- a/netbox/templates/vpn/tunnel.html
+++ b/netbox/templates/vpn/tunnel.html
@@ -15,7 +15,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Tunnel" %}</h5>
+        <h2 class="card-header">{% trans "Tunnel" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
@@ -68,7 +68,7 @@
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">
+        <h2 class="card-header">
           {% trans "Terminations" %}
           {% if perms.vpn.add_tunneltermination %}
             <div class="card-actions">
@@ -77,7 +77,7 @@
               </a>
             </div>
           {% endif %}
-        </h5>
+        </h2>
         {% htmx_table 'vpn:tunneltermination_list' tunnel_id=object.pk %}
       </div>
       {% plugin_full_width_page object %}
diff --git a/netbox/templates/vpn/tunnelgroup.html b/netbox/templates/vpn/tunnelgroup.html
index 09f4ec2d2..32caaafc0 100644
--- a/netbox/templates/vpn/tunnelgroup.html
+++ b/netbox/templates/vpn/tunnelgroup.html
@@ -20,7 +20,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Tunnel Group" %}</h5>
+        <h2 class="card-header">{% trans "Tunnel Group" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/templates/vpn/tunneltermination.html b/netbox/templates/vpn/tunneltermination.html
index c20bb6d4b..6b0ade829 100644
--- a/netbox/templates/vpn/tunneltermination.html
+++ b/netbox/templates/vpn/tunneltermination.html
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Tunnel Termination" %}</h5>
+        <h2 class="card-header">{% trans "Tunnel Termination" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Tunnel" %}</th>
@@ -48,7 +48,7 @@
   <div class="row">
     <div class="col col-md-12">
       <div class="card">
-        <h5 class="card-header">{% trans "Peer Terminations" %}</h5>
+        <h2 class="card-header">{% trans "Peer Terminations" %}</h2>
         {% htmx_table 'vpn:tunneltermination_list' tunnel_id=object.tunnel.pk id__n=object.pk %}
       </div>
       {% plugin_full_width_page object %}
diff --git a/netbox/templates/wireless/inc/authentication_attrs.html b/netbox/templates/wireless/inc/authentication_attrs.html
index 739177a3e..555a14f8b 100644
--- a/netbox/templates/wireless/inc/authentication_attrs.html
+++ b/netbox/templates/wireless/inc/authentication_attrs.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div class="card">
-  <h5 class="card-header">{% trans "Authentication" %}</h5>
+  <h2 class="card-header">{% trans "Authentication" %}</h2>
   <table class="table table-hover attr-table">
     <tr>
       <th scope="row">{% trans "Type" %}</th>
diff --git a/netbox/templates/wireless/wirelesslan.html b/netbox/templates/wireless/wirelesslan.html
index 1adcc578a..493c36132 100644
--- a/netbox/templates/wireless/wirelesslan.html
+++ b/netbox/templates/wireless/wirelesslan.html
@@ -8,7 +8,7 @@
 <div class="row">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Wireless LAN" %}</h5>
+      <h2 class="card-header">{% trans "Wireless LAN" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "SSID" %}</th>
@@ -54,7 +54,7 @@
 <div class="row">
   <div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">{% trans "Attached Interfaces" %}</h5>
+      <h2 class="card-header">{% trans "Attached Interfaces" %}</h2>
       <div class="card-body table-responsive">
         {% render_table interfaces_table 'inc/table.html' %}
         {% include 'inc/paginator.html' with paginator=interfaces_table.paginator page=interfaces_table.page %}
diff --git a/netbox/templates/wireless/wirelesslangroup.html b/netbox/templates/wireless/wirelesslangroup.html
index 8c72311e0..cb08b1b52 100644
--- a/netbox/templates/wireless/wirelesslangroup.html
+++ b/netbox/templates/wireless/wirelesslangroup.html
@@ -23,7 +23,7 @@
 <div class="row mb-3">
 	<div class="col col-md-6">
     <div class="card">
-      <h5 class="card-header">{% trans "Wireless LAN Group" %}</h5>
+      <h2 class="card-header">{% trans "Wireless LAN Group" %}</h2>
       <table class="table table-hover attr-table">
         <tr>
           <th scope="row">{% trans "Name" %}</th>
@@ -51,7 +51,7 @@
 <div class="row mb-3">
 	<div class="col col-md-12">
     <div class="card">
-      <h5 class="card-header">
+      <h2 class="card-header">
         {% trans "Child Groups" %}
         {% if perms.wireless.add_wirelesslangroup %}
           <div class="card-actions">
@@ -60,7 +60,7 @@
             </a>
           </div>
         {% endif %}
-      </h5>
+      </h2>
       {% htmx_table 'wireless:wirelesslangroup_list' parent_id=object.pk %}
     </div>
     {% plugin_full_width_page object %}
diff --git a/netbox/templates/wireless/wirelesslink.html b/netbox/templates/wireless/wirelesslink.html
index b31c3132c..e089e0dc4 100644
--- a/netbox/templates/wireless/wirelesslink.html
+++ b/netbox/templates/wireless/wirelesslink.html
@@ -7,11 +7,11 @@
   <div class="row">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Interface" %} A</h5>
+        <h2 class="card-header">{% trans "Interface" %} A</h2>
         {% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_a %}
       </div>
       <div class="card">
-        <h5 class="card-header">{% trans "Link Properties" %}</h5>
+        <h2 class="card-header">{% trans "Link Properties" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Status" %}</th>
@@ -52,7 +52,7 @@
     </div>
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Interface" %} B</h5>
+        <h2 class="card-header">{% trans "Interface" %} B</h2>
         {% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_b %}
       </div>
       {% include 'wireless/inc/authentication_attrs.html' %}
diff --git a/netbox/utilities/templates/form_helpers/render_fieldset.html b/netbox/utilities/templates/form_helpers/render_fieldset.html
index d978997af..6f4cbea7e 100644
--- a/netbox/utilities/templates/form_helpers/render_fieldset.html
+++ b/netbox/utilities/templates/form_helpers/render_fieldset.html
@@ -3,7 +3,7 @@
 <div class="field-group mb-5">
   {% if heading %}
     <div class="row">
-      <h5 class="col-9 offset-3">{{ heading }}</h5>
+      <h2 class="h5 col-9 offset-3">{{ heading }}</h2>
     </div>
   {% endif %}
   {% for layout, title, items in rows %}