diff --git a/agent/ticket.php b/agent/ticket.php
index 9241d368..ef0fe023 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -915,12 +915,12 @@ if (isset($_GET['ticket_id'])) {
                 <!-- Tasks Card -->
                 <?php if (empty($ticket_resolved_at) || (!empty($ticket_resolved_at) && $task_count > 0)) { ?>
                     <div class="card">
-                        <div class="card-header py-2">
-                            <h5 class="card-title"><i class="fas fa-fw fa-tasks mr-2 mt-2"></i>Tasks</h5>
+                        <div class="card-header">
+                            <h5 class="card-title"><i class="fas fa-fw fa-tasks mr-2"></i>Tasks</h5>
+                            <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
                             <div class="card-tools">
-                                <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
                                 <div class="dropdown dropleft text-center">
-                                    <button class="btn btn-light text-secondary btn-sm" type="button" data-toggle="dropdown">
+                                    <button class="btn btn-tool" type="button" data-toggle="dropdown">
                                         <i class="fas fa-ellipsis-v"></i>
                                     </button>
                                     <div class="dropdown-menu">
@@ -937,8 +937,8 @@ if (isset($_GET['ticket_id'])) {
                                         </a>
                                     </div>
                                 </div>
-                                <?php } ?>
                             </div>
+                            <?php } ?>
                         </div>
                         <div class="card-body p-0">
 
@@ -967,7 +967,7 @@ if (isset($_GET['ticket_id'])) {
                                     $task_completion_estimate = intval($row['task_completion_estimate']);
                                     $task_completed_at = nullable_htmlentities($row['task_completed_at']);
                                     ?>
-                                    <tr data-task-id="<?php echo $task_id; ?>">
+                                    <tr data-task-id="<?= $task_id ?>">
                                         <td>
                                             <?php if ($task_completed_at) { ?>
                                                 <i class="far fa-check-square text-success"></i>
@@ -1025,16 +1025,16 @@ if (isset($_GET['ticket_id'])) {
                 <!-- Contact card -->
                 <?php if ($contact_id) { ?>
                     <div class="card">
-                        <div class="card-header py-2">
-                            <h5 class="card-title"><i class="fas fa-fw fa-user-check mr-2 mt-2"></i>Contact</h5>
+                        <div class="card-header">
+                            <h5 class="card-title"><i class="fas fa-fw fa-user-check mr-2"></i>Contact</h5>
+                            <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
                             <div class="card-tools">
-                                <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
-                                    <a class="btn btn-light text-secondary btn-sm ajax-modal" href="#"
-                                        data-modal-url="modals/ticket/ticket_contact.php?id=<?= $ticket_id ?>">
-                                        <i class="fas fa-edit"></i>
-                                    </a>
-                                <?php } ?>
+                                <a class="btn btn-tool ajax-modal" href="#"
+                                    data-modal-url="modals/ticket/ticket_contact.php?id=<?= $ticket_id ?>">
+                                    <i class="fas fa-edit"></i>
+                                </a>
                             </div>
+                            <?php } ?>
                         </div>
                         <div class="card-body">
 
@@ -1076,23 +1076,19 @@ if (isset($_GET['ticket_id'])) {
                 <?php } ?>
                 <!-- End contact card -->
 
-
-                
-
-
                 <!-- Ticket watchers card -->
                 <?php if (empty($ticket_closed_at) && mysqli_num_rows($sql_ticket_watchers) > 0) { ?>
 
                     <div class="card">
-                        <div class="card-header py-2">
-                            <h5 class="card-title"><i class="fas fa-fw fa-eye mr-2 mt-2"></i>Watchers</h5>
+                        <div class="card-header">
+                            <h5 class="card-title"><i class="fas fa-fw fa-eye mr-2"></i>Watchers</h5>
+                            <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
                             <div class="card-tools">
-                                <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
-                                    <a class="btn btn-light text-secondary btn-sm ajax-modal" href="#" data-modal-url="modals/ticket/ticket_add_watcher.php?ticket_id=<?= $ticket_id ?>">
-                                        <i class="fas fa-fw fa-plus"></i>
-                                    </a>
-                                <?php } ?>
+                                <a class="btn btn-tool ajax-modal" href="#" data-modal-url="modals/ticket/ticket_add_watcher.php?ticket_id=<?= $ticket_id ?>">
+                                    <i class="fas fa-fw fa-plus"></i>
+                                </a>
                             </div>
+                            <?php } ?>
                         </div>
                         <div class="card-body">
 
@@ -1120,15 +1116,15 @@ if (isset($_GET['ticket_id'])) {
                 <!-- Asset card -->
                 <?php if ($asset_id) { ?>
                     <div class="card mb-3">
-                        <div class="card-header py-2">
-                            <h5 class="card-title"><i class="fas fa-fw fa-desktop mr-2 mt-2"></i>Assets</h5>
+                        <div class="card-header">
+                            <h5 class="card-title"><i class="fas fa-fw fa-desktop mr-2"></i>Assets</h5>
+                            <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
                             <div class="card-tools">
-                                <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
-                                    <a class="btn btn-light text-secondary btn-sm ajax-modal" href="#" data-modal-url="modals/ticket/ticket_edit_asset.php?id=<?= $ticket_id ?>">
-                                        <i class="fas fa-fw fa-edit"></i>
-                                    </a>
-                                <?php } ?>
+                                <a class="btn btn-tool ajax-modal" href="#" data-modal-url="modals/ticket/ticket_edit_asset.php?id=<?= $ticket_id ?>">
+                                    <i class="fas fa-fw fa-edit"></i>
+                                </a>
                             </div>
+                            <?php } ?>
                         </div>
                         <div class="card-body">
                             <div>
@@ -1168,15 +1164,15 @@ if (isset($_GET['ticket_id'])) {
                 <!-- Vendor card -->
                 <?php if ($vendor_id) { ?>
                     <div class="card mb-3">
-                        <div class="card-header py-2">
-                            <h5 class="card-title"><i class="fas fa-fw fa-building mr-2 mt-2"></i>Vendor</h5>
+                        <div class="card-header">
+                            <h5 class="card-title"><i class="fas fa-fw fa-building mr-2"></i>Vendor</h5>
+                            <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
                             <div class="card-tools">
-                                <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
-                                    <a class="btn btn-light text-secondary btn-sm ajax-modal" href="#" data-modal-url="modals/ticket/ticket_edit_vendor.php?ticket_id=<?= $ticket_id ?>">
-                                        <i class="fas fa-fw fa-edit"></i>
-                                    </a>
-                                <?php } ?>
+                                <a class="btn btn-tool ajax-modal" href="#" data-modal-url="modals/ticket/ticket_edit_vendor.php?ticket_id=<?= $ticket_id ?>">
+                                    <i class="fas fa-fw fa-edit"></i>
+                                </a>
                             </div>
+                            <?php } ?>
                         </div>
                         <div class="card-body">
 
@@ -1223,15 +1219,15 @@ if (isset($_GET['ticket_id'])) {
                 <!-- project card -->
                 <?php if ($project_id) { ?>
                     <div class="card">
-                        <div class="card-header py-2">
-                            <h5 class="card-title"><i class="fas fa-fw fa-project-diagram mr-2 mt-2"></i>Project</h5>
+                        <div class="card-header">
+                            <h5 class="card-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Project</h5>
+                            <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
                             <div class="card-tools">
-                                <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
-                                    <button type="button" class="btn btn-light text-secondary btn-sm ajax-modal" data-modal-url="modals/ticket/ticket_edit_project.php?id=<?= $ticket_id ?>">
-                                        <i class="fas fa-edit"></i>
-                                    </button>
-                                <?php } ?>
+                                <button type="button" class="btn btn-tool ajax-modal" data-modal-url="modals/ticket/ticket_edit_project.php?id=<?= $ticket_id ?>">
+                                    <i class="fas fa-edit"></i>
+                                </button>
                             </div>
+                            <?php } ?>
                         </div>
                         <div class="card-body">
                             <div>