diff --git a/client_assets.php b/client_assets.php
index ecad987e..c52568fb 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -300,7 +300,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <div class="dropdown dropleft text-center">
                                     <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addAssetInterfaceModal<?php echo $asset_id; ?>">Interfaces</a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addAssetInterfaceModal<?php echo $asset_id; ?>">
+                                            <i class="fas fa-fw fa-ethernet mr-2"></i>Interfaces
+                                        </a>
+                                        <div class="dropdown-divider"></div>
                                         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editAssetModal<?php echo $asset_id; ?>">
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
diff --git a/client_certificates.php b/client_certificates.php
index 4a417f6e..64f49f7d 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -19,7 +19,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <div class="card card-dark">
     <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fa fa-fw fa-lock mr-2"></i>Certificates</h3>
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-lock mr-2"></i>Certificates</h3>
         <div class="card-tools">
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCertificateModal"><i class="fas fa-plus mr-2"></i>New Certificate</button>
         </div>
@@ -80,10 +80,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" onclick="populateCertificateEditModal(<?php echo $client_id, ",", $certificate_id ?>)" data-target="#editCertificateModal">Edit</a>
+                                    <a class="dropdown-item" href="#" data-toggle="modal" onclick="populateCertificateEditModal(<?php echo $client_id, ",", $certificate_id ?>)" data-target="#editCertificateModal">
+                                        <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                    </a>
                                     <?php if ($session_user_role == 3) { ?>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item text-danger" href="post.php?delete_certificate=<?php echo $certificate_id; ?>">Delete</a>
+                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_certificate=<?php echo $certificate_id; ?>">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </a>
                                     <?php } ?>
                                 </div>
                             </div>
diff --git a/client_contacts.php b/client_contacts.php
index af1c08b5..49a770bc 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -183,7 +183,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     </button>
                                     <div class="dropdown-menu">
                                         <a class="dropdown-item" href="client_contact_details.php?client_id=<?php echo $client_id; ?>&contact_id=<?php echo $contact_id; ?>">
-                                            <i class="fas fa-fw fa-eye-open mr-2"></i>View Details
+                                            <i class="fas fa-fw fa-eye mr-2"></i>Details
                                         </a>
                                         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editContactModal<?php echo $contact_id; ?>">
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
diff --git a/client_documents.php b/client_documents.php
index c1bae3c5..af14d143 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -113,10 +113,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                 <i class="fas fa-ellipsis-v"></i>
                                             </button>
                                             <div class="dropdown-menu">
-                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFolderModal<?php echo $folder_id; ?>">Rename</a>
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFolderModal<?php echo $folder_id; ?>">
+                                                    <i class="fas fa-fw fa-edit mr-2"></i>Rename
+                                                </a>
                                                 <?php if ($session_user_role == 3) { ?>
                                                     <div class="dropdown-divider"></div>
-                                                    <a class="dropdown-item text-danger text-bold" href="post.php?delete_folder=<?php echo $folder_id; ?>">Delete</a>
+                                                    <a class="dropdown-item text-danger text-bold" href="post.php?delete_folder=<?php echo $folder_id; ?>">
+                                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                    </a>
                                                 <?php } ?>
                                             </div>
                                         </div>
diff --git a/client_files.php b/client_files.php
index 9493a667..bfa570d2 100644
--- a/client_files.php
+++ b/client_files.php
@@ -14,7 +14,7 @@ $num_of_files = mysqli_num_rows($sql_files_images) + mysqli_num_rows($sql_files_
         <div class="card-header py-2">
             <h3 class="card-title mt-2"><i class="fa fa-fw fa-paperclip mr-2"></i>Files</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addFileModal"><i class="fas fa-fw fa-cloud-upload-alt"></i> Upload File</button>
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addFileModal"><i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload File</button>
             </div>
         </div>
         <div class="card-body">
diff --git a/client_networks.php b/client_networks.php
index 530b58ca..b9e11b8c 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -24,7 +24,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <div class="card card-dark">
     <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fa fa-fw fa-network-wired mr-2"></i>Networks</h3>
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-network-wired mr-2"></i>Networks</h3>
         <div class="card-tools">
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addNetworkModal"><i class="fas fa-plus mr-2"></i>New Network</button>
         </div>
@@ -45,7 +45,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="col-md-8">
                     <div class="float-right">
-                        <a href="post.php?export_client_networks_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
+                        <a href="post.php?export_client_networks_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download mr-2"></i>Export</a>
                     </div>
                 </div>
 
@@ -71,7 +71,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 while ($row = mysqli_fetch_array($sql)) {
                     $network_id = intval($row['network_id']);
                     $network_name = htmlentities($row['network_name']);
-                    $network_vlan = htmlentities($row['network_vlan']);
+                    $network_vlan = intval($row['network_vlan']);
                     if (empty($network_vlan)) {
                         $network_vlan_display = "-";
                     } else {
@@ -118,7 +118,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <?php if ($session_user_role == 3) { ?>
                                         <div class="dropdown-divider"></div>
                                         <a class="dropdown-item text-danger text-bold" href="post.php?delete_network=<?php echo $network_id; ?>">
-                                            <i class="fas fa-fw fa-trash mr-2">Delete
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                         </a>
                                     <?php } ?>
                                 </div>
diff --git a/client_quotes.php b/client_quotes.php
index 8e2977b2..dace3b79 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -120,14 +120,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <i class="fas fa-ellipsis-h"></i>
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editQuoteModal<?php echo $quote_id; ?>">Edit</a>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addQuoteCopyModal<?php echo $quote_id; ?>">Copy</a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editQuoteModal<?php echo $quote_id; ?>">
+                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                        </a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addQuoteCopyModal<?php echo $quote_id; ?>">
+                                            <i class="fas fa-fw fa-copy mr-2"></i>Copy
+                                        </a>
                                         <div class="dropdown-divider"></div>
                                         <?php if (!empty($config_smtp_host)) { ?>
-                                            <a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">Send</a>
+                                            <a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">
+                                                <i class="fas fa-fw fa-paper-plane mr-2"></i>Send
+                                            </a>
                                             <div class="dropdown-divider"></div>
                                         <?php } ?>
-                                        <a class="dropdown-item text-danger" href="post.php?delete_quote=<?php echo $quote_id; ?>">Delete</a>
+                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_quote=<?php echo $quote_id; ?>">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </a>
                                     </div>
                                 </div>
                             </td>
diff --git a/client_services.php b/client_services.php
index 93ada87d..34d94918 100644
--- a/client_services.php
+++ b/client_services.php
@@ -82,10 +82,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <tr>
                             <!-- Name/Category/Updated/Importance from DB -->
-                            <td><a href="#" data-toggle="modal" data-target="#viewServiceModal<?php echo $service_id; ?>"> <?php echo $service_name ?></a></td>
-                            <td><a> <?php echo $service_category ?></a></td>
-                            <td><a> <?php echo $service_updated_at ?></a></td>
-                            <td><a> <?php echo $service_importance ?></a></td>
+                            <td class="text-bold"><a href="#" data-toggle="modal" data-target="#viewServiceModal<?php echo $service_id; ?>"> <?php echo $service_name ?></a></td>
+                            <td><?php echo $service_category ?></td>
+                            <td><?php echo $service_updated_at ?></td>
+                            <td><?php echo $service_importance ?></td>
 
                             <!-- Action -->
                             <td>
diff --git a/client_tickets.php b/client_tickets.php
index 0f7e1aaa..b7e5ab19 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -29,20 +29,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <div class="card card-dark">
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-life-ring mr-2"></i>Tickets</h3>
-        <button type="button" class="btn btn-dark dropdown-toggle ml-1" data-toggle="dropdown"></button>
-        <div class="dropdown-menu">
-            <a class="dropdown-item text-dark" href="client_scheduled_tickets.php?client_id=<?php echo $client_id; ?>">Scheduled Tickets</a>
-        </div>
         <div class="card-tools">
-            <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal">
-                    <i class="fas fa-plus mr-2"></i>New Ticket
-                </button>
-                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
-                <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addScheduledTicketModal">Scheduled</a>
-                </div>
-            </div>
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal">
+                <i class="fas fa-plus mr-2"></i>New Ticket
+            </button>
         </div>
     </div>
     <div class="card-body">
@@ -169,10 +159,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <i class="fas fa-ellipsis-h"></i>
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">
+                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                        </a>
                                         <?php if ($session_user_role == 3) { ?>
                                             <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
+                                            <a class="dropdown-item text-danger text-bold" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">
+                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                            </a>
                                         <?php } ?>
                                     </div>
                                 </div>
@@ -196,5 +190,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 require_once("ticket_add_modal.php");
-require_once("scheduled_ticket_add_modal.php");
 require_once("footer.php");
diff --git a/client_trips.php b/client_trips.php
index a76b5237..c17880a8 100644
--- a/client_trips.php
+++ b/client_trips.php
@@ -108,7 +108,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     </button>
                                     <div class="dropdown-menu">
                                         <a class="dropdown-item" href="//maps.google.com?q=<?php echo $trip_source; ?> to <?php echo $trip_destination; ?>" target="_blank">
-                                            <i class="fa fa-fw fa-map-marker mr-2"></i>Map it
+                                            <i class="fa fa-fw fa-map-marker-alt mr-2"></i>Map it
                                         </a>
                                         <div class="dropdown-divider"></div>
                                         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>">
@@ -118,7 +118,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                             <i class="fa fa-fw fa-copy mr-2"></i>Copy
                                         </a>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item text-danger" href="post.php?delete_trip=<?php echo $trip_id; ?>">
+                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_trip=<?php echo $trip_id; ?>">
                                             <i class="fa fa-fw fa-trash mr-2"></i>Delete
                                         </a>
                                     </div>
diff --git a/recurring_invoices.php b/recurring_invoices.php
index 21cc83e1..381c678e 100644
--- a/recurring_invoices.php
+++ b/recurring_invoices.php
@@ -155,7 +155,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item text-danger" href="post.php?delete_recurring=<?php echo $recurring_id; ?>">
+                                    <a class="dropdown-item text-danger text-bold" href="post.php?delete_recurring=<?php echo $recurring_id; ?>">
                                         <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                     </a>
                                 </div>
diff --git a/revenues.php b/revenues.php
index 0ee43196..cb665ff1 100644
--- a/revenues.php
+++ b/revenues.php
@@ -132,7 +132,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item text-danger" href="post.php?delete_revenue=<?php echo $revenue_id; ?>">
+                                    <a class="dropdown-item text-danger text-bold" href="post.php?delete_revenue=<?php echo $revenue_id; ?>">
                                         <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                     </a>
                                 </div>
diff --git a/scheduled_tickets.php b/scheduled_tickets.php
index 8fa8e9f7..1d0c450e 100644
--- a/scheduled_tickets.php
+++ b/scheduled_tickets.php
@@ -1,11 +1,10 @@
 <?php
-require_once("inc_all.php");
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "scheduled_ticket_subject";
-}
+// Default Column Sortby Filter
+$sb = "scheduled_ticket_subject";
+$o = "ASC";
+
+require_once("inc_all.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
@@ -20,13 +19,14 @@ $sql = mysqli_query(
 );
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
 ?>
 
     <script src="js/scheduled_tickets_edit_modal.js"></script>
 
     <div class="card card-dark">
         <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fas fa-fw fa-sync mr-2"></i>Scheduled Tickets</h3>
+            <h3 class="card-title mt-2"><i class="fas fa-fw fa-clock mr-2"></i>Scheduled Tickets</h3>
             <div class='card-tools'>
                 <div class="float-left">
                     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addScheduledTicketModal">
diff --git a/side_nav.php b/side_nav.php
index 9d56730e..165e8986 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -81,11 +81,17 @@
 
                     <li class="nav-header mt-3">SUPPORT</li>
                     <li class="nav-item">
-                        <a href="tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php" || basename($_SERVER["PHP_SELF"]) == "scheduled_tickets.php") { echo "active"; } ?>">
+                        <a href="tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets.php" || basename($_SERVER["PHP_SELF"]) == "ticket.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Tickets</p>
                         </a>
                     </li>
+                    <li class="nav-item">
+                        <a href="scheduled_tickets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "scheduled_tickets.php") { echo "active"; } ?>">
+                            <i class="nav-icon fas fa-clock"></i>
+                            <p>Schedule Ticket</p>
+                        </a>
+                    </li>
                     <li class="nav-item">
                         <a href="calendar_events.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "calendar_events.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-calendar"></i>
diff --git a/tickets.php b/tickets.php
index 2fafdc76..1e55b858 100644
--- a/tickets.php
+++ b/tickets.php
@@ -55,10 +55,8 @@ $sql = mysqli_query(
     ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
-
 //Get Total tickets open
 $sql_total_tickets_open = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets_open FROM tickets WHERE ticket_status != 'Closed' AND company_id = $session_company_id");
 $row = mysqli_fetch_array($sql_total_tickets_open);
@@ -93,11 +91,6 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                     <a href="?status=Closed" class="text-white"><strong><?php echo $total_tickets_closed; ?></strong> Closed</a>
                 </small>
             </h3>
-            <button type="button" class="btn btn-dark dropdown-toggle ml-1" data-toggle="dropdown"></button>
-            <div class="dropdown-menu">
-                <a class="dropdown-item text-dark" href="scheduled_tickets.php">Scheduled Tickets</a>
-            </div>
-
             <div class='card-tools'>
                 <div class="float-left">
                     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal">
@@ -111,9 +104,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                 <div class="row">
                     <div class="col-sm-4">
                         <div class="input-group">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {
-                                echo stripslashes(htmlentities($q));
-                            } ?>" placeholder="Search Tickets">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(htmlentities($q)); } ?>" placeholder="Search Tickets">
                             <div class="input-group-append">
                                 <button class="btn btn-secondary" type="button" data-toggle="collapse"
                                         data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
@@ -358,12 +349,14 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                                             <i class="fas fa-ellipsis-h"></i>
                                         </button>
                                         <div class="dropdown-menu">
-                                            <a class="dropdown-item" href="#" data-toggle="modal"
-                                               data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
+                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">
+                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                            </a>
                                             <?php if ($session_user_role == 3) { ?>
                                                 <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger"
-                                                   href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
+                                                <a class="dropdown-item text-danger text-bold" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">
+                                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                </a>
                                             <?php } ?>
                                         </div>
                                     </div>