diff --git a/admin_side_nav.php b/admin_side_nav.php
index e711e14b..8a93b86c 100644
--- a/admin_side_nav.php
+++ b/admin_side_nav.php
@@ -7,37 +7,9 @@
     <!-- Sidebar Menu -->
     <nav class="mt-3">
 
-      <div class="dropdown mb-4 ml-3">
-        <a class="" href="#" data-toggle="dropdown">
-          <h3><?php echo $session_company_name; ?> <small><i class="fa fa-caret-down"></i></small></h3>
-        </a>
-
-        <ul class="dropdown-menu">
-          
-          <?php
-          
-          $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id IN ($session_user_company_access)");
-          while($row = mysqli_fetch_array($sql)){
-
-            $company_id = $row['company_id'];
-            $company_name = $row['company_name'];
-
-          ?>
-          
-            <li><a class="dropdown-item text-dark" href="post.php?switch_company=<?php echo $company_id; ?>"><?php echo $company_name; ?><?php if($company_id == $session_company_id){ echo "<i class='fa fa-check text-secondary ml-2'></i>"; } ?></a></li>
-
-          <?php
-
-          }
-          
-          ?>
-
-        </ul>
-      </div>
-
       <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
         
-        <li class="nav-item">
+        <li class="nav-item mb-3">
           <a href="dashboard_financial.php" class="nav-link">
             <i class="nav-icon fas fa-arrow-left"></i>
             <p>Back</p> | 
@@ -45,11 +17,25 @@
           </a>
         </li>
 
+        <li class="nav-item">
+          <a href="users.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "users.php") { echo "active"; } ?>">
+            <i class="nav-icon far fa-user"></i>
+            <p>Users</p>
+          </a>
+        </li>
+        
+        <li class="nav-item">
+          <a href="companies.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "companies.php") { echo "active"; } ?>">
+            <i class="nav-icon far fa-building"></i>
+            <p>Companies</p>
+          </a>
+        </li>
+
         <li class="nav-header mt-3">SETTINGS</li>
         
         <li class="nav-item">
           <a href="settings-general.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-general.php") { echo "active"; } ?>">
-            <i class="nav-icon far fa-cog"></i>
+            <i class="nav-icon fas fa-cog"></i>
             <p>General</p>
           </a> 
         </li>
@@ -65,7 +51,7 @@
         <li class="nav-item">
           <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-defaults.php") { echo "active"; } ?>" 
             href="settings-defaults.php">
-            <i class="nav-icon far fa-cog"></i>
+            <i class="nav-icon fas fa-cog"></i>
             <p>Defaults</p>
           </a> 
         </li>
@@ -73,7 +59,7 @@
         <li class="nav-item">
           <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-invoice.php") { echo "active"; } ?>" 
             href="settings-invoice.php">
-            <i class="nav-icon far fa-file"></i>
+            <i class="nav-icon fas fa-file"></i>
             <p>Invoice</p>
           </a> 
         </li>
@@ -89,7 +75,7 @@
         <li class="nav-item">
           <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-ticket.php") { echo "active"; } ?>" 
             href="settings-ticket.php">
-            <i class="nav-icon far fa-tag"></i>
+            <i class="nav-icon fas fa-ticket-alt"></i>
             <p>Ticket</p>
           </a> 
         </li>
@@ -113,7 +99,7 @@
         <li class="nav-item">
           <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-update.php") { echo "active"; } ?>" 
             href="settings-update.php">
-            <i class="nav-icon far fa-wrench"></i>
+            <i class="nav-icon fas fa-arrow-alt-circle-up"></i>
             <p>Update</p>
           </a> 
         </li>
@@ -121,7 +107,7 @@
         <li class="nav-item">
           <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-backup.php") { echo "active"; } ?>" 
             href="settings-backup.php">
-            <i class="nav-icon far fa-database"></i>
+            <i class="nav-icon fas fa-database"></i>
             <p>Backup</p>
           </a> 
         </li>
@@ -130,37 +116,25 @@
 
         <li class="nav-item">
           <a href="categories.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "categories.php") { echo "active"; } ?>">
-            <i class="nav-icon far fa-circle nav-icon"></i>
+            <i class="nav-icon fas fa-list"></i>
             <p>Categories</p>
           </a>
         </li>
         <li class="nav-item">
           <a href="custom_links.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "custom_links.php") { echo "active"; } ?>">
-            <i class="nav-icon far fa-circle nav-icon"></i>
+            <i class="nav-icon fas fa-link"></i>
             <p>Custom Links</p>
           </a>
         </li>
         <li class="nav-item">
           <a href="taxes.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "taxes.php") { echo "active"; } ?>">
-            <i class="nav-icon far fa-circle nav-icon"></i>
+            <i class="nav-icon fas fa-balance-scale"></i>
             <p>Taxes</p>
           </a>
         </li>
-        <li class="nav-item">
-          <a href="users.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "users.php") { echo "active"; } ?>">
-            <i class="nav-icon far fa-circle nav-icon"></i>
-            <p>Users</p>
-          </a>
-        </li>
-        <li class="nav-item">
-          <a href="companies.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "companies.php") { echo "active"; } ?>">
-            <i class="nav-icon far fa-circle nav-icon"></i>
-            <p>Companies</p>
-          </a>
-        </li>
         <li class="nav-item">
           <a href="logs.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "logs.php") { echo "active"; } ?>">
-            <i class="nav-icon far fa-circle nav-icon"></i>
+            <i class="nav-icon far fa-eye"></i>
             <p>Logs</p>
           </a>
         </li>
diff --git a/client_department_add_modal.php b/client_department_add_modal.php
index f7f0ac11..b4d34297 100644
--- a/client_department_add_modal.php
+++ b/client_department_add_modal.php
@@ -15,7 +15,7 @@
             <label>Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
               </div>
               <input type="text" class="form-control" name="department_name" placeholder="Department name ex. Financial" required autofocus>
             </div>
diff --git a/client_logs.php b/client_logs.php
index f0153d35..7ffae4e5 100644
--- a/client_logs.php
+++ b/client_logs.php
@@ -52,7 +52,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <div class="card card-dark">
   <div class="card-header">
-    <h3 class="card-title"><i class="fa fa-fw fa-book"></i> Logs</h3>
+    <h3 class="card-title"><i class="fa fa-fw fa-eye"></i> Logs</h3>
   </div>
 
   <div class="card-body">
diff --git a/client_side_nav.php b/client_side_nav.php
index 2734b5d2..49334ac0 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -76,7 +76,7 @@
 
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=software" class="nav-link <?php if($_GET['tab'] == "software") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-rocket"></i>
+            <i class="nav-icon fas fa-cube"></i>
             <p>
               Software
               <?php 
@@ -143,7 +143,7 @@
 
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=tickets" class="nav-link <?php if($_GET['tab'] == "tickets") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-tags"></i>
+            <i class="nav-icon fas fa-ticket-alt"></i>
             <p>
               Tickets
               <?php 
@@ -294,7 +294,7 @@
 
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=logs" class="nav-link <?php if($_GET['tab'] == "logs") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-book"></i>
+            <i class="nav-icon fas fa-eye"></i>
             <p>Logs</p>
           </a>
         </li>
diff --git a/client_software.php b/client_software.php
index 1e09be4a..75ac57f8 100644
--- a/client_software.php
+++ b/client_software.php
@@ -50,7 +50,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-rocket"></i> Software</h3>
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube"></i> Software</h3>
     <div class="card-tools">
       <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal"><i class="fas fa-fw fa-plus"></i> New Software</button>
     </div>
diff --git a/client_software_add_modal.php b/client_software_add_modal.php
index 547659e0..2abc8f82 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-rocket"></i> New Software</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-cube"></i> New Software</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 0f2c88c8..ce0a582a 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-rocket"></i> <?php echo $software_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-cube"></i> <?php echo $software_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/client_tickets.php b/client_tickets.php
index 63f949b5..3cf4d718 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -54,7 +54,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-tags"></i> Tickets</h3>
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-ticket-alt"></i> Tickets</h3>
     <div class="card-tools">
       <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal"><i class="fas fa-fw fa-plus"></i> New Ticket</button>
       <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addScheduledTicketModal"><i class="fas fa-fw fa-plus"></i> Scheduled Ticket</button>
diff --git a/logs.php b/logs.php
index d007fd8a..a67df20c 100644
--- a/logs.php
+++ b/logs.php
@@ -1,4 +1,4 @@
-<?php include("inc_all.php");
+<?php include("inc_all_admin.php");
 
 //Paging
 if(isset($_GET['p'])){
@@ -92,7 +92,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <div class="card card-dark">
   <div class="card-header">
-    <h3 class="card-title"><i class="fa fa-fw fa-book"></i> Audit Logs <?php echo $extended_query; ?></h3>
+    <h3 class="card-title"><i class="fa fa-fw fa-eye"></i> Audit Logs <?php echo $extended_query; ?></h3>
   </div>
   <div class="card-body">
     <form class="mb-4" autocomplete="off">
diff --git a/post.php b/post.php
index 4e6ba1c0..9cbbee9f 100644
--- a/post.php
+++ b/post.php
@@ -6749,6 +6749,16 @@ if(isset($_GET['export_client_pdf'])){
                                 style: 'item'
                             }
                         ],
+                        [ 
+                            {
+                                text: 'Contact',
+                                style: 'itemHeader' 
+                            }, 
+                            {
+                                text: <?php echo json_encode($contact_name); ?>, 
+                                style: 'item'
+                            }
+                        ],
                         [ 
                             { 
                                 text: 'Email',
diff --git a/settings-ticket.php b/settings-ticket.php
index 5b8b2bf4..5f596eba 100644
--- a/settings-ticket.php
+++ b/settings-ticket.php
@@ -2,7 +2,7 @@
 
 <div class="card card-dark">
   <div class="card-header">
-    <h3 class="card-title"><i class="fa fa-fw fa-tag"></i> Ticket Settings</h3>
+    <h3 class="card-title"><i class="fa fa-fw fa-ticket-alt"></i> Ticket Settings</h3>
   </div>
   <div class="card-body">
     <form action="post.php" method="post" autocomplete="off">
@@ -11,7 +11,7 @@
         <label>Ticket Prefix</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-ticket-alt"></i></span>
           </div>
           <input type="text" class="form-control" name="config_ticket_prefix" placeholder="Ticket Prefix" value="<?php echo $config_ticket_prefix; ?>">
         </div>
diff --git a/settings-update.php b/settings-update.php
index 1e6c1669..f6a8b8f2 100644
--- a/settings-update.php
+++ b/settings-update.php
@@ -19,18 +19,18 @@ $git_log = shell_exec("git log master..origin/master --pretty=format:'<tr><td>%h
 
 <div class="card card-dark">
   <div class="card-header">
-    <h3 class="card-title"><i class="fa fa-fw fa-wrench"></i> Update</h3>
+    <h3 class="card-title"><i class="fas fa-fw fa-arrow-alt-circle-up"></i> Update</h3>
   </div>
   <div class="card-body">
     <center>
-      <h5><small class="text-secondary">Current Version</small><br><?php echo $current_version; ?></h5>
       <?php if(!empty($git_log)){ ?>
-      <a class="btn btn-primary btn-lg my-4" href="post.php?update"><i class="fa fa-fw fa-4x fa-check-square"></i><br>Update<br>App</a>
+      <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>
       <?php
       }else{
       ?>
-      <a class="btn btn-dark btn-lg my-4" href="post.php?update_db"><i class="fa fa-fw fa-4x fa-check-square"></i><br>Update<br>Database Structure</a>
-      <h3 class="text-success">Congratulations you are up to date!</h3>
+      <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>
+      <h3 class="text-success"><i class="fas fa-check-square"></i> Latest version</h3>
+      <small class="text-secondary"><?php echo $current_version; ?></small>
       <?php
       }
       ?>
diff --git a/side_nav.php b/side_nav.php
index c426b88d..4386d2b7 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -79,7 +79,7 @@
         <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" OR basename($_SERVER["PHP_SELF"]) == "ticket.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-tags"></i>
+            <i class="nav-icon fas fa-ticket-alt"></i>
             <p>Tickets</p>
           </a>
         </li>
@@ -199,13 +199,13 @@
             </li>
              <li class="nav-item">
               <a href="report_tax_summary.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "report_tax_summary.php") { echo "active"; } ?>">
-                <i class="far fa-circle nav-icon"></i>
+                <i class="fas fa-percent nav-icon"></i>
                 <p>Tax Summary</p>
               </a>
             </li>
             <li class="nav-item">
               <a href="report_profit_loss.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "report_profit_loss.php") { echo "active"; } ?>">
-                <i class="far fa-circle nav-icon"></i>
+                <i class="fas fa-balance-scale nav-icon"></i>
                 <p>Profit & Loss</p>
               </a>
             </li>
diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index f80571e2..e95f7bad 100644
--- a/ticket_add_modal.php
+++ b/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-tag"></i> New Ticket</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-ticket-alt"></i> New Ticket</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index e18ffa8f..88d03760 100644
--- a/ticket_edit_modal.php
+++ b/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="fa fa-fw fa-tag"></i> Ticket <?php echo "$ticket_prefix$ticket_number"; ?> for <?php echo $client_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-ticket-alt"></i> Ticket <?php echo "$ticket_prefix$ticket_number"; ?> for <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/ticket_merge_modal.php b/ticket_merge_modal.php
index 99259185..8521733b 100644
--- a/ticket_merge_modal.php
+++ b/ticket_merge_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-md">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-tag"></i> Merge & Close <?php echo "$ticket_prefix$ticket_number"; ?> into another ticket</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-ticket-alt"></i> Merge & Close <?php echo "$ticket_prefix$ticket_number"; ?> into another ticket</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/tickets.php b/tickets.php
index 5a542a48..c41207c6 100644
--- a/tickets.php
+++ b/tickets.php
@@ -174,7 +174,7 @@ $total_tickets_assigned = $row['total_tickets_assigned'];
 ?>
     <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-tags"></i> Tickets
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-ticket-alt"></i> Tickets
                 <small class="ml-3">
                     <a href="?status=%"><strong><?php echo $total_tickets; ?></strong> Total</a> |
                     <a href="?status=Open"><strong><?php echo $total_tickets_open; ?></strong> Open</a> |