diff --git a/budget_edit_modal.php b/budget_edit_modal.php
index 70b2a348..de635a39 100644
--- a/budget_edit_modal.php
+++ b/budget_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Editing Budget</h5>
+                <h5 class="modal-title text-white"><i class="fa fa-fw fa-balance-scale mr-2"></i>Editing Budget</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span aria-hidden="true">&times;</span>
                 </button>
diff --git a/categories.php b/categories.php
index 43868943..721a54a6 100644
--- a/categories.php
+++ b/categories.php
@@ -46,9 +46,9 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
 
     <div class="card card-dark">
         <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fa fa-fw fa-list mr-2"></i><?php echo nullable_htmlentities($category); ?> Categories</h3>
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-list-ul mr-2"></i><?php echo nullable_htmlentities($category); ?> Categories</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCategoryModal"><i class="fas fa-plus mr-2"></i>New</button>
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCategoryModal"><i class="fas fa-plus mr-2"></i>Create</button>
             </div>
         </div>
         <div class="card-body">
diff --git a/category_add_modal.php b/category_add_modal.php
index 811175e7..ddeddac9 100644
--- a/category_add_modal.php
+++ b/category_add_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>New <?php echo nullable_htmlentities($category); ?> Category</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-list-ul mr-2"></i>New <?php echo nullable_htmlentities($category); ?> Category</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/category_edit_modal.php b/category_edit_modal.php
index 0e1f8494..e1b343f3 100644
--- a/category_edit_modal.php
+++ b/category_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Editing category: <strong><?php echo $category_name; ?></strong></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-list-ul mr-2"></i>Editing category: <strong><?php echo $category_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/client_logs.php b/client_logs.php
index 47a8597e..e59722f1 100644
--- a/client_logs.php
+++ b/client_logs.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-3">
-        <h3 class="card-title"><i class="fa fa-fw fa-eye mr-2"></i>Audit Logs</h3>
+        <h3 class="card-title"><i class="fa fa-fw fa-history mr-2"></i>Audit Logs</h3>
     </div>
 
     <div class="card-body">
diff --git a/client_quotes.php b/client_quotes.php
index 1085fcbc..9c7c698e 100644
--- a/client_quotes.php
+++ b/client_quotes.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-file mr-2"></i>Quotes</h3>
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-comment-dollar mr-2"></i>Quotes</h3>
             <div class="card-tools">
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-plus mr-2"></i>New Quote</button>
             </div>
diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
index ea31808c..4b19c7dd 100644
--- a/client_recurring_invoices.php
+++ b/client_recurring_invoices.php
@@ -23,7 +23,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="fas fa-fw fa-sync-alt mr-2"></i>Recurring Invoices</h3>
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-redo-alt mr-2"></i>Recurring Invoices</h3>
         <div class="card-tools">
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-plus mr-2"></i>New Recurring</button>
         </div>
diff --git a/client_scheduled_tickets.php b/client_scheduled_tickets.php
index bace654c..5577a42b 100644
--- a/client_scheduled_tickets.php
+++ b/client_scheduled_tickets.php
@@ -25,7 +25,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-clock mr-2"></i>Scheduled Tickets</h3>
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-calendar-check mr-2"></i>Scheduled Tickets</h3>
         <div class='card-tools'>
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addScheduledTicketModal">
                 <i class="fas fa-plus mr-2"></i>New Scheduled Ticket
diff --git a/client_side_nav.php b/client_side_nav.php
index 8fdc5eaf..f3bad26a 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -66,7 +66,7 @@
 
                 <li class="nav-item">
                     <a href="client_software.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_software.php") { echo "active"; } ?>">
-                        <i class="nav-icon fas fa-cube"></i>
+                        <i class="nav-icon fas fa-certificate"></i>
                         <p>
                             Licenses
                             <?php
diff --git a/client_software.php b/client_software.php
index 13adf303..d67db4c4 100644
--- a/client_software.php
+++ b/client_software.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="fas fa-fw fa-cube mr-2"></i>Licenses</h3>
+            <h3 class="card-title mt-2"><i class="fas fa-fw fa-certificate mr-2"></i>Licenses</h3>
             <div class="card-tools">
                 <div class="btn-group">
                     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal">
diff --git a/client_software_add_modal.php b/client_software_add_modal.php
index 7727fcaa..5f020267 100644
--- a/client_software_add_modal.php
+++ b/client_software_add_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>New License</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-certificate mr-2"></i>New License</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/client_software_edit_modal.php b/client_software_edit_modal.php
index 5e462957..1fafe933 100644
--- a/client_software_edit_modal.php
+++ b/client_software_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>Editing license: <strong><?php echo $software_name; ?></strong></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-certificate mr-2"></i>Editing license: <strong><?php echo $software_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/custom_field_create_modal.php b/custom_field_create_modal.php
index 8c6161ac..a2b2ff54 100644
--- a/custom_field_create_modal.php
+++ b/custom_field_create_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Create <?php echo nullable_htmlentities($table); ?> field</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-th-list mr-2"></i>Create <?php echo nullable_htmlentities($table); ?> field</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/custom_field_edit_modal.php b/custom_field_edit_modal.php
index 43b389ba..b86595a6 100644
--- a/custom_field_edit_modal.php
+++ b/custom_field_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Editing custom field: <strong><?php echo $custom_field_label; ?></strong></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-th-list mr-2"></i>Editing custom field: <strong><?php echo $custom_field_label; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index b51212c0..f3345e41 100644
--- a/expense_edit_modal.php
+++ b/expense_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Editing expense</h5>
+                <h5 class="modal-title text-white"><i class="fa fa-fw fa-shopping-cart mr-2"></i>Editing expense</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span aria-hidden="true">&times;</span>
                 </button>
diff --git a/expense_refund_modal.php b/expense_refund_modal.php
index 7bbe12fb..c4bf5a89 100644
--- a/expense_refund_modal.php
+++ b/expense_refund_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-undo-alt mr-2"></i>Refunding expense</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-undo mr-2"></i>Refunding expense</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/invoice_add_modal.php b/invoice_add_modal.php
index b6eccdd5..7dd365c8 100644
--- a/invoice_add_modal.php
+++ b/invoice_add_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-file mr-2"></i>New Invoice</h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>New Invoice</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/invoice_edit_modal.php b/invoice_edit_modal.php
index 8e8fa619..f98cf7cc 100644
--- a/invoice_edit_modal.php
+++ b/invoice_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-fw fa-file mr-2"></i>Editing invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></h5>
+        <h5 class="modal-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>Editing invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/product_add_modal.php b/product_add_modal.php
index 4b3a6366..0ec4ebab 100644
--- a/product_add_modal.php
+++ b/product_add_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-box mr-2"></i>New Product</h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-box-open mr-2"></i>New Product</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/product_edit_modal.php b/product_edit_modal.php
index 1ae32762..d47f7c77 100644
--- a/product_edit_modal.php
+++ b/product_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-box mr-2"></i>Editing product: <strong><?php echo $product_name; ?></strong></h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-box-open mr-2"></i>Editing product: <strong><?php echo $product_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/products.php b/products.php
index ca7233e4..26c9700e 100644
--- a/products.php
+++ b/products.php
@@ -22,7 +22,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="fas fa-fw fa-box mr-2"></i>Products</h3>
+            <h3 class="card-title mt-2"><i class="fas fa-fw fa-box-open mr-2"></i>Products</h3>
             <div class="card-tools">
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addProductModal"><i class="fas fa-plus mr-2"></i>New Product</button>
             </div>
diff --git a/quote_add_modal.php b/quote_add_modal.php
index 2f7a5bd8..e5474106 100644
--- a/quote_add_modal.php
+++ b/quote_add_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-file mr-2"></i>New Quote</h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-comment-dollar mr-2"></i>New Quote</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/quote_edit_modal.php b/quote_edit_modal.php
index f9ebc8c4..a6a0960f 100644
--- a/quote_edit_modal.php
+++ b/quote_edit_modal.php
@@ -3,7 +3,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title text-white"><i class="fas fa-fw fa-file mr-2"></i>Editing quote: <span class="text-bold" id="editQuoteHeaderID"></span> - <span class="text" id="editQuoteHeaderClient"></span></h5>
+                <h5 class="modal-title text-white"><i class="fas fa-fw fa-comment-dollar mr-2"></i>Editing quote: <span class="text-bold" id="editQuoteHeaderID"></span> - <span class="text" id="editQuoteHeaderClient"></span></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/quotes.php b/quotes.php
index 46a27dcf..9f783406 100644
--- a/quotes.php
+++ b/quotes.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-file mr-2"></i>Quotes</h3>
+            <h3 class="card-title mt-2"><i class="fa fa-comment-dollar mr-2"></i>Quotes</h3>
             <div class="card-tools">
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-plus mr-2"></i>New Quote</button>
             </div>
diff --git a/recurring_expense_edit_modal.php b/recurring_expense_edit_modal.php
index 818bf40b..430a2301 100644
--- a/recurring_expense_edit_modal.php
+++ b/recurring_expense_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Editing recurring expense</h5>
+                <h5 class="modal-title text-white"><i class="fa fa-fw fa-clock mr-2"></i>Editing recurring expense</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span aria-hidden="true">&times;</span>
                 </button>
diff --git a/recurring_invoice_add_modal.php b/recurring_invoice_add_modal.php
index b31e0db3..1e8ec876 100644
--- a/recurring_invoice_add_modal.php
+++ b/recurring_invoice_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-sync-alt mr-2"></i>New Recurring Invoice</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-redo-alt mr-2"></i>New Recurring Invoice</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/recurring_invoice_edit_modal.php b/recurring_invoice_edit_modal.php
index 3cc6cf1a..21430551 100644
--- a/recurring_invoice_edit_modal.php
+++ b/recurring_invoice_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-fw fa-sync-alt mr-2"></i>Editing Recur Invoice: <strong><?php echo "$recurring_prefix$recurring_number"; ?></strong></h5>
+        <h5 class="modal-title"><i class="fas fa-fw fa-redo-alt mr-2"></i>Editing Recur Invoice: <strong><?php echo "$recurring_prefix$recurring_number"; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/recurring_invoices.php b/recurring_invoices.php
index 7efa2c90..bfae2e17 100644
--- a/recurring_invoices.php
+++ b/recurring_invoices.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-sync-alt mr-2"></i>Recurring Invoices</h3>
+        <h3 class="card-title mt-2"><i class="fa fa-redo-alt mr-2"></i>Recurring Invoices</h3>
         <div class="card-tools">
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-plus mr-2"></i>Create</button>
         </div>
diff --git a/revenue_add_modal.php b/revenue_add_modal.php
index 0f5f83cf..6255fb4e 100644
--- a/revenue_add_modal.php
+++ b/revenue_add_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-money-bill-alt mr-2"></i>New Revenue</h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>New Revenue</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/revenue_edit_modal.php b/revenue_edit_modal.php
index af7ad995..9e19f5c8 100644
--- a/revenue_edit_modal.php
+++ b/revenue_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-money-bill-alt mr-2"></i>Edit Revenue</h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>Edit Revenue</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/revenues.php b/revenues.php
index fa75ff77..28650fe7 100644
--- a/revenues.php
+++ b/revenues.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="fas fa-fw fa-credit-card mr-2"></i>Revenues</h3>
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>Revenues</h3>
         <div class="card-tools">
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRevenueModal"><i class="fas fa-plus mr-2"></i>New Revenue</button>
         </div>
diff --git a/scheduled_ticket_add_modal.php b/scheduled_ticket_add_modal.php
index 2f5d9467..f805e24e 100644
--- a/scheduled_ticket_add_modal.php
+++ b/scheduled_ticket_add_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-sync mr-2"></i>New Scheduled Ticket</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-calendar-check mr-2"></i>New Scheduled Ticket</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/scheduled_ticket_edit_modal.php b/scheduled_ticket_edit_modal.php
index 008b1db3..3addb030 100644
--- a/scheduled_ticket_edit_modal.php
+++ b/scheduled_ticket_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-sync mr-2"></i><span id="editHeader"></span></h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-calendar-check mr-2"></i><span id="editHeader"></span></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/scheduled_tickets.php b/scheduled_tickets.php
index 0a0c141b..8027586a 100644
--- a/scheduled_tickets.php
+++ b/scheduled_tickets.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="fas fa-fw fa-clock mr-2"></i>Scheduled Tickets</h3>
+            <h3 class="card-title mt-2"><i class="fas fa-fw fa-calendar-check 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/settings_company.php b/settings_company.php
index 7f0c913d..688e1f43 100644
--- a/settings_company.php
+++ b/settings_company.php
@@ -24,7 +24,7 @@ $company_initials = nullable_htmlentities(initials($company_name));
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-building mr-2"></i>Company Details</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-briefcase mr-2"></i>Company Details</h3>
         </div>
         <div class="card-body">
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
diff --git a/settings_custom_fields.php b/settings_custom_fields.php
index c82900b9..a22fb5e4 100644
--- a/settings_custom_fields.php
+++ b/settings_custom_fields.php
@@ -30,7 +30,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-list mr-2"></i><?php echo nullable_htmlentities($table); ?> Fields</h3>
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-th-list mr-2"></i><?php echo nullable_htmlentities($table); ?> Fields</h3>
             <div class="card-tools">
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#createCustomFieldModal"><i class="fas fa-plus mr-2"></i>Create</button>
             </div>
diff --git a/settings_defaults.php b/settings_defaults.php
index 66a65f03..761ec526 100644
--- a/settings_defaults.php
+++ b/settings_defaults.php
@@ -4,7 +4,7 @@ require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-cog mr-2"></i>Defaults</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-cogs mr-2"></i>Defaults</h3>
         </div>
         <div class="card-body">
             <form action="post.php" method="post" autocomplete="off">
diff --git a/settings_integrations.php b/settings_integrations.php
index f64b7230..14486370 100644
--- a/settings_integrations.php
+++ b/settings_integrations.php
@@ -3,7 +3,7 @@ require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-puzzle-piece mr-2"></i>Integration Settings</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-plug mr-2"></i>Integration Settings</h3>
         </div>
         <div class="card-body">
             <form action="post.php" method="post" autocomplete="off">
diff --git a/settings_invoice.php b/settings_invoice.php
index 8b053367..7a643fa2 100644
--- a/settings_invoice.php
+++ b/settings_invoice.php
@@ -3,7 +3,7 @@ require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-file mr-2"></i>Invoice Settings</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>Invoice Settings</h3>
         </div>
         <div class="card-body">
             <form action="post.php" method="post" autocomplete="off">
diff --git a/settings_mail.php b/settings_mail.php
index 9d5e3181..5c1c90cb 100644
--- a/settings_mail.php
+++ b/settings_mail.php
@@ -191,7 +191,7 @@ require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-paper-plane mr-2"></i>Test Email Receiving</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-plug mr-2"></i>Test IMAP Connection</h3>
         </div>
         <div class="card-body">
             <form action="post.php" method="post" autocomplete="off">
diff --git a/settings_modules.php b/settings_modules.php
index a891eadd..e73da10d 100644
--- a/settings_modules.php
+++ b/settings_modules.php
@@ -3,7 +3,7 @@ require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-puzzle-piece mr-2"></i>Modules</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-cube mr-2"></i>Modules</h3>
         </div>
         <div class="card-body">
             <form action="post.php" method="post" autocomplete="off">
diff --git a/settings_quote.php b/settings_quote.php
index 77f1dedc..c57e685c 100644
--- a/settings_quote.php
+++ b/settings_quote.php
@@ -3,7 +3,7 @@ require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-file mr-2"></i>Quote Settings</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-comment-dollar mr-2"></i>Quote Settings</h3>
         </div>
         <div class="card-body">
             <form action="post.php" method="post" autocomplete="off">
diff --git a/settings_software_template_add_modal.php b/settings_software_template_add_modal.php
index f5275493..823c1c89 100644
--- a/settings_software_template_add_modal.php
+++ b/settings_software_template_add_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>New License Template</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-rocket mr-2"></i>New License Template</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/settings_software_template_edit_modal.php b/settings_software_template_edit_modal.php
index 1ed24642..2cf30347 100644
--- a/settings_software_template_edit_modal.php
+++ b/settings_software_template_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>Editing template: <strong><?php echo $software_name; ?></strong></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-rocket mr-2"></i>Editing template: <strong><?php echo $software_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/settings_software_templates.php b/settings_software_templates.php
index dc4a5e96..829087ed 100644
--- a/settings_software_templates.php
+++ b/settings_software_templates.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="fas fa-fw fa-cube mr-2"></i>License Templates</h3>
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-rocket mr-2"></i>License Templates</h3>
         <div class="card-tools">
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareTemplateModal"><i class="fas fa-plus mr-2"></i>New License Template</button>
         </div>
diff --git a/settings_telemetry.php b/settings_telemetry.php
index 0f993926..8a7c29bc 100644
--- a/settings_telemetry.php
+++ b/settings_telemetry.php
@@ -3,7 +3,7 @@ require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-broadcast-tower mr-2"></i>Telemetry</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-satellite-dish mr-2"></i>Telemetry</h3>
         </div>
         <div class="card-body">
 
diff --git a/settings_theme.php b/settings_theme.php
index 16e5d75a..6d45d815 100644
--- a/settings_theme.php
+++ b/settings_theme.php
@@ -3,7 +3,7 @@ require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-palette mr-2"></i>Theme</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-paint-brush mr-2"></i>Theme</h3>
         </div>
         <div class="card-body">
             <form action="post.php" method="post" autocomplete="off">
diff --git a/settings_update.php b/settings_update.php
index 7eeda546..9d9805db 100644
--- a/settings_update.php
+++ b/settings_update.php
@@ -20,7 +20,7 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-arrow-alt-circle-up mr-2"></i>Update</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-download mr-2"></i>Update</h3>
         </div>
         <div class="card-body" style="text-align: center;">
 
@@ -32,7 +32,7 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
             <?php } ?>
 
             <?php if (!empty($git_log)) { ?>
-                <a class="btn btn-primary btn-lg my-4" href="post.php?update"><i class="fas fa-fw fa-4x fa-arrow-alt-circle-up mb-1"></i><h5>Update App</h5></a>
+                <a class="btn btn-primary btn-lg my-4" href="post.php?update"><i class="fas fa-fw fa-4x fa-download mb-1"></i><h5>Update App</h5></a>
                 <hr>
 
             <?php } else {
@@ -41,14 +41,15 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
                         <strong>Ensure you have a current app & database backup before updating!</strong>
                     </div>
                     <br>
-                    <a class="btn btn-dark btn-lg my-4" href="post.php?update_db"><i class="fas fa-fw fa-4x fa-arrow-alt-circle-up mb-1"></i><h5>Update Database</h5></a>
+                    <a class="btn btn-dark btn-lg my-4" href="post.php?update_db"><i class="fas fa-fw fa-4x fa-download mb-1"></i><h5>Update Database</h5></a>
                     <br>
                     <small class="text-secondary">Current DB Version: <?php echo CURRENT_DATABASE_VERSION; ?></small>
                     <br>
                     <small class="text-secondary">Latest DB Version: <?php echo LATEST_DATABASE_VERSION; ?></small>
                 <?php } else { ?>
-                    <h3 class="text-success">Congratulations!<br><i class="far fa-3x fa-smile-wink"></i><br><small>You are on the latest version!</small></h3>
+                    <h3 class="text-success text-bold">Congratulations!<br><i class="far fa-3x text-dark fa-smile-wink"></i><br><small>You are on the latest version!</small></h3>
                     <p class="text-secondary">Current Database Version:<br><strong><?php echo CURRENT_DATABASE_VERSION; ?></strong></p>
+                    <p class="text-secondary">Current App Version:<br><strong><?php echo $current_version; ?></strong></p>
                 <?php }
             }
 
diff --git a/tickets.php b/tickets.php
index 0b2aeaf7..24338fcb 100644
--- a/tickets.php
+++ b/tickets.php
@@ -84,7 +84,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
     </style>
     <div class="card card-dark elevation-3">
         <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 class="card-title mt-2"><i class="fa fa-fw fa-life-ring mr-2"></i>Support Tickets
                 <small class="ml-3">
                     <a href="?status=Open" class="text-white"><strong><?php echo $total_tickets_open; ?></strong> Open</a> |
                     <a href="?status=Closed" class="text-white"><strong><?php echo $total_tickets_closed; ?></strong> Closed</a>
diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php
index 2f648bf8..518943c1 100644
--- a/transfer_edit_modal.php
+++ b/transfer_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-exchange-alt mr-2"></i>Edit Transfer</h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-exchange-alt mr-2"></i>Editing Transfer</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/trip_copy_modal.php b/trip_copy_modal.php
index a91f675c..269567e8 100644
--- a/trip_copy_modal.php
+++ b/trip_copy_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-route mr-2"></i>Copying Trip</h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Copying Trip</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/trip_edit_modal.php b/trip_edit_modal.php
index 8f326457..ef986e15 100644
--- a/trip_edit_modal.php
+++ b/trip_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-route mr-2"></i>Edit Trip</h5>
+                <h5 class="modal-title"><i class="fa fa-route mr-2"></i>Editing Trip</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/trips.php b/trips.php
index 68247f4e..33c79605 100644
--- a/trips.php
+++ b/trips.php
@@ -144,7 +144,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<i class="fa fa-fw fa-external-link-alt ml-2"></i>
                                         </a>
                                         <div class="dropdown-divider"></div>
                                         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>">