diff --git a/admin/project_template.php b/admin/project_template.php
index 87e7d1311..3291e1b22 100644
--- a/admin/project_template.php
+++ b/admin/project_template.php
@@ -60,7 +60,7 @@ if (isset($_GET['project_template_id'])) {
 </ol>
 
 <!-- Project Header -->
-<div class="card card-body">
+<div class="card card-body mb-3">
     <div class="row">
         <div class="col-sm-4">
             <div class="d-flex">
diff --git a/agent/asset.php b/agent/asset.php
index d3af6e1ad..e112cd4b4 100644
--- a/agent/asset.php
+++ b/agent/asset.php
@@ -297,7 +297,7 @@ if (isset($_GET['asset_id'])) {
 
             <div class="col-md-3">
 
-                <div class="card">
+                <div class="card mb-3">
                     <div class="card-header">
                         <button type="button" class="btn btn-light float-end ajax-modal"
                             data-modal-url="modals/asset/asset_edit.php?id=<?= $asset_id ?>">
@@ -343,7 +343,7 @@ if (isset($_GET['asset_id'])) {
                     </div>
                 </div>
 
-                <div class="card card-dark">
+                <div class="card card-dark mb-3">
                     <div class="card-header">
                         <h5 class="card-title">Primary Network Interface</h5>
                     </div>
@@ -371,7 +371,7 @@ if (isset($_GET['asset_id'])) {
                 </div>
 
 
-                <div class="card card-dark">
+                <div class="card card-dark mb-3">
                     <div class="card-header">
                         <h5 class="card-title">Assignment</h5>
                     </div>
@@ -484,7 +484,7 @@ if (isset($_GET['asset_id'])) {
                     </div>
                 </div>
 
-                <div class="card card-dark">
+                <div class="card card-dark mb-3">
                     <div class="card-header py-2">
                         <h3 class="card-title mt-1"><i class="fa fa-fw fa-ethernet me-2"></i>Interfaces</h3>
                         <div class="card-tools">
@@ -651,7 +651,7 @@ if (isset($_GET['asset_id'])) {
 
                 <?php if (lookupUserPermission('module_credential')) { // Begin Credential Enforcement ?>
 
-                <div class="card card-dark <?php if ($credential_count == 0) { echo "d-none"; } ?>">
+                <div class="card card-dark mb-3 <?php if ($credential_count == 0) { echo "d-none"; } ?>">
                     <div class="card-header">
                         <h3 class="card-title"><i class="fa fa-fw fa-key me-2"></i>Credentials</h3>
                     </div>
@@ -780,7 +780,7 @@ if (isset($_GET['asset_id'])) {
 
                 <?php } // End Credential Enforcement ?>
 
-                <div class="card card-dark <?php if ($software_count == 0) { echo "d-none"; } ?>">
+                <div class="card card-dark mb-3 <?php if ($software_count == 0) { echo "d-none"; } ?>">
                     <div class="card-header py-2">
                         <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube me-2"></i>Licenses</h3>
                         <div class="card-tools">
@@ -866,7 +866,7 @@ if (isset($_GET['asset_id'])) {
                     </div>
                 </div>
 
-                <div class="card card-dark <?php if ($document_count == 0) { echo "d-none"; } ?>">
+                <div class="card card-dark mb-3 <?php if ($document_count == 0) { echo "d-none"; } ?>">
                     <div class="card-header py-2">
                         <h3 class="card-title mt-2"><i class="fa fa-fw fa-folder me-2"></i>Documents</h3>
                         <div class="card-tools">
@@ -932,7 +932,7 @@ if (isset($_GET['asset_id'])) {
                     </div>
                 </div>
 
-                <div class="card card-dark <?php if ($files_count == 0) { echo "d-none"; } ?>">
+                <div class="card card-dark mb-3 <?php if ($files_count == 0) { echo "d-none"; } ?>">
                     <div class="card-header py-2">
                         <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube me-2"></i>Files</h3>
                         <div class="card-tools">
@@ -1022,7 +1022,7 @@ if (isset($_GET['asset_id'])) {
                     </div>
                 </div>
 
-                <div class="card card-dark <?php if ($recurring_ticket_count == 0) { echo "d-none"; } ?>">
+                <div class="card card-dark mb-3 <?php if ($recurring_ticket_count == 0) { echo "d-none"; } ?>">
                     <div class="card-header">
                         <h3 class="card-title"><i class="fa fa-fw fa-recycle me-2"></i>Recurring Tickets</h3>
                     </div>
@@ -1098,7 +1098,7 @@ if (isset($_GET['asset_id'])) {
                     </div>
                 </div>
 
-                <div class="card card-dark <?php if ($ticket_count == 0) { echo "d-none"; } ?>">
+                <div class="card card-dark mb-3 <?php if ($ticket_count == 0) { echo "d-none"; } ?>">
                     <div class="card-header">
                         <h3 class="card-title"><i class="fa fa-fw fa-life-ring me-2"></i>Tickets</h3>
                     </div>
@@ -1189,7 +1189,7 @@ if (isset($_GET['asset_id'])) {
                     </div>
                 </div>
 
-                <div class="card card-dark <?php if ($service_count == 0) { echo "d-none"; } ?>">
+                <div class="card card-dark mb-3 <?php if ($service_count == 0) { echo "d-none"; } ?>">
                     <div class="card-header py-2">
                         <h3 class="card-title mt-2"><i class="fa fa-fw fa-stream me-2"></i>Linked Services</h3>
                         <div class="card-tools">
diff --git a/agent/contact.php b/agent/contact.php
index 19f0cfda7..58b5b8585 100644
--- a/agent/contact.php
+++ b/agent/contact.php
@@ -204,7 +204,7 @@ if (isset($_GET['contact_id'])) {
 
         <div class="col-md-3">
 
-            <div class="card card-dark">
+            <div class="card card-dark mb-3">
                 <div class="card-body">
                     <button type="button" class="btn btn-default float-end ajax-modal"
                         data-modal-url="modals/contact/contact_edit.php?id=<?= $contact_id ?>">
@@ -359,7 +359,7 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-            <div class="card card-dark <?php if ($asset_count == 0) { echo "d-none"; } ?>">
+            <div class="card card-dark mb-3 <?php if ($asset_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-desktop me-2"></i>Related Assets</h3>
                     <div class="card-tools">
@@ -532,7 +532,7 @@ if (isset($_GET['contact_id'])) {
 
             <?php if (lookupUserPermission('module_credential')) { // Begin Credential Enforcement ?>
 
-            <div class="card card-dark <?php if ($credential_count == 0) { echo "d-none"; } ?>">
+            <div class="card card-dark mb-3 <?php if ($credential_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-key me-2"></i>Credentials</h3>
                     <div class="card-tools">
@@ -669,7 +669,7 @@ if (isset($_GET['contact_id'])) {
 
             <?php } // End Credential Enforcement ?>
 
-            <div class="card card-dark <?php if ($software_count == 0) { echo "d-none"; } ?>">
+            <div class="card card-dark mb-3 <?php if ($software_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube me-2"></i>Related Licenses</h3>
                     <div class="card-tools">
@@ -750,7 +750,7 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-            <div class="card card-dark <?php if ($recurring_ticket_count == 0) { echo "d-none"; } ?>">
+            <div class="card card-dark mb-3 <?php if ($recurring_ticket_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header">
                     <h3 class="card-title"><i class="fa fa-fw fa-recycle me-2"></i>Recurring Tickets</h3>
                 </div>
@@ -820,7 +820,7 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-            <div class="card card-dark <?php if ($ticket_count == 0) { echo "d-none"; } ?>">
+            <div class="card card-dark mb-3 <?php if ($ticket_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-life-ring me-2"></i>Related Tickets</h3>
                     <div class="card-tools">
@@ -916,7 +916,7 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-            <div class="card card-dark <?php if ($service_count == 0) { echo "d-none"; } ?>">
+            <div class="card card-dark mb-3 <?php if ($service_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-stream me-2"></i>Linked Services</h3>
                     <div class="card-tools">
@@ -974,7 +974,7 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-            <div class="card card-dark <?php if ($document_count == 0) { echo "d-none"; } ?>">
+            <div class="card card-dark mb-3 <?php if ($document_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-folder me-2"></i>Linked Documents</h3>
                     <div class="card-tools">
@@ -1040,7 +1040,7 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-            <div class="card card-dark <?php if ($file_count == 0) { echo "d-none"; } ?>">
+            <div class="card card-dark mb-3 <?php if ($file_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-folder me-2"></i>Linked Files</h3>
                     <div class="card-tools">
@@ -1102,7 +1102,7 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-            <div class="card card-dark <?php if ($note_count == 0) { echo "d-none"; } ?>">
+            <div class="card card-dark mb-3 <?php if ($note_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-sticky-note me-2"></i>Notes</h3>
                     <div class="card-tools">
diff --git a/agent/document.php b/agent/document.php
index 28971730b..bae5029c8 100644
--- a/agent/document.php
+++ b/agent/document.php
@@ -201,7 +201,7 @@ $page_title = $row['document_name'];
                 <a class="btn btn-danger confirm-link" href="post.php?delete_document=<?= $document_id ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>&from=document_details" title="Delete"><i class='fas fa-fw fa-trash-alt'></i></a>
             </div>
         </div>
-        <div class="card card-body bg-light">
+        <div class="card card-body bg-light mb-3">
             <h5 class="mb-3"><i class="fas fa-tags me-2"></i>Related Items</h5>
             <h6>
                 <i class="fas fa-fw fa-paperclip text-secondary me-2"></i>Files
@@ -375,7 +375,7 @@ $page_title = $row['document_name'];
         </div>
 
         <?php if ($config_client_portal_enable) { ?>
-            <div class="card card-body bg-light">
+            <div class="card card-body bg-light mb-3">
                 <h6><i class="fas fa-handshake me-2"></i>Portal Collaboration</h6>
                 <div class="mt-1">
                     <i class="fa fa-fw fa-eye<?php if (!$document_client_visible) { echo '-slash'; } ?> text-secondary me-2"></i>Document is
diff --git a/agent/invoice.php b/agent/invoice.php
index 2427cd8c8..c06849b2d 100644
--- a/agent/invoice.php
+++ b/agent/invoice.php
@@ -220,7 +220,7 @@ if (isset($_GET['invoice_id'])) {
         <?php } ?>
     </ol>
 
-    <div class="card">
+    <div class="card mb-3">
 
             <div class="card-header d-print-none">
 
@@ -587,7 +587,7 @@ if (isset($_GET['invoice_id'])) {
     </div>
     <div class="row d-print-none mb-3">
         <div class="col-sm">
-            <div class="card">
+            <div class="card mb-3">
                 <div class="card-header text-bold">
                     <i class="fa fa-history me-2"></i>History
                     <div class="card-tools">
@@ -632,7 +632,7 @@ if (isset($_GET['invoice_id'])) {
             </div>
         </div>
         <div class="col-sm d-print-none <?php if (mysqli_num_rows($sql_payments) == 0) { echo "d-none"; } ?>">
-            <div class="card">
+            <div class="card mb-3">
                 <div class="card-header text-bold">
                     <i class="fa fa-credit-card me-2"></i>Payments
                     <div class="card-tools">
diff --git a/agent/project.php b/agent/project.php
index f99254936..158cd13a9 100644
--- a/agent/project.php
+++ b/agent/project.php
@@ -171,7 +171,7 @@ if (isset($_GET['project_id'])) {
 </ol>
 
 <!-- Project Header -->
-<div class="card">
+<div class="card mb-3">
     <div class="card-header">
         <h5 class="card-title">
             <i class="fas fa-project-diagram text-secondary me-2"></i>
diff --git a/agent/quote.php b/agent/quote.php
index d45bc5f05..19193ba24 100644
--- a/agent/quote.php
+++ b/agent/quote.php
@@ -144,7 +144,7 @@ if (isset($_GET['quote_id'])) {
         <li class="breadcrumb-item active"><?= "$quote_prefix$quote_number" ?></li>
     </ol>
 
-    <div class="card">
+    <div class="card mb-3">
         <div class="card-header d-print-none">
 
             <?php if (lookupUserPermission("module_sales") >= 2) { ?>
diff --git a/agent/recurring_invoice.php b/agent/recurring_invoice.php
index 0ddb42318..2db896fbb 100644
--- a/agent/recurring_invoice.php
+++ b/agent/recurring_invoice.php
@@ -149,7 +149,7 @@ if (isset($_GET['recurring_invoice_id'])) {
         <li class="breadcrumb-item active"><?= "$recurring_invoice_prefix$recurring_invoice_number" ?></li>
     </ol>
 
-    <div class="card">
+    <div class="card mb-3">
         <div class="card-header d-print-none">
 
             <div class="row">