diff --git a/client_contact_details.php b/client_contact_details.php
index 51b2c1fa..45b79986 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -272,7 +272,7 @@ if (isset($_GET['contact_id'])) {
 
             <div class="card card-dark <?php if ($login_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header">
-                    <h3 class="card-title"><i class="fa fa-fw fa-key mr-2"></i>Passwords</h3>
+                    <h3 class="card-title"><i class="fa fa-fw fa-key mr-2"></i>Logins</h3>
                 </div>
                 <div class="card-body">
                     <div class="table-responsive-sm-sm">
diff --git a/client_download_pdf_modal.php b/client_download_pdf_modal.php
index e9617f49..8c127a55 100644
--- a/client_download_pdf_modal.php
+++ b/client_download_pdf_modal.php
@@ -55,7 +55,7 @@
                                     <div class="custom-control custom-checkbox">
                                         <input class="custom-control-input" type="checkbox" id="logins" name="export_logins" value="1">
                                         <label for="logins" class="custom-control-label">
-                                            <i class='fas fa-fw fa-key mr-2'></i>Logins/Passwords
+                                            <i class='fas fa-fw fa-key mr-2'></i>Logins
                                         </label>
                                     </div>
                                 </li>
@@ -64,7 +64,7 @@
                                     <div class="custom-control custom-checkbox">
                                         <input class="custom-control-input" type="checkbox" id="networks" name="export_networks" value="1" checked>
                                         <label for="networks" class="custom-control-label">
-                                            <i class='fas fa-fw fa-network-wired mr-2'></i>networks
+                                            <i class='fas fa-fw fa-network-wired mr-2'></i>Networks
                                         </label>
                                     </div>
                                 </li>
diff --git a/client_events.php b/client_events.php
index c5f3afdd..f05f0479 100644
--- a/client_events.php
+++ b/client_events.php
@@ -60,13 +60,13 @@ while ($row = mysqli_fetch_array($sql)) {
             defaultView: 'dayGridMonth',
             customButtons: {
                 addEvent: {
-                    bootstrapFontAwesome: 'fa fa-plus',
+                    bootstrapFontAwesome: 'fa fa-fw fa-plus',
                     click: function() {
                         $("#addCalendarEventModal").modal();
                     }
                 },
                 addCalendar: {
-                    bootstrapFontAwesome: 'fa fa-calendar-plus',
+                    bootstrapFontAwesome: 'fa fa-fw fa-calendar-plus',
                     click: function() {
                         $("#addCalendarModal").modal();
                     }
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index 81567e12..7aa1039f 100644
--- a/client_login_edit_modal.php
+++ b/client_login_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-key mr-2"></i>Editing password: <strong><?php echo $login_name; ?></strong></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>Editing login: <strong><?php echo $login_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/client_logins.php b/client_logins.php
index 2eeeb62a..dc1ddf21 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -24,11 +24,11 @@ $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-key mr-2"></i>Passwords</h3>
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-key mr-2"></i>Logins</h3>
         <div class="card-tools">
             <div class="btn-group">
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLoginModal">
-                    <i class="fas fa-plus mr-2"></i>Create
+                    <i class="fas fa-plus mr-2"></i>New Login
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
@@ -50,7 +50,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="col-md-4">
                     <div class="input-group mb-3 mb-md-0">
-                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Passwords">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Logins">
                         <div class="input-group-append">
                             <button class="btn btn-dark"><i class="fa fa-search"></i></button>
                         </div>
diff --git a/client_side_nav.php b/client_side_nav.php
index 158fc814..2c72be6d 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -125,7 +125,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-certificate"></i>
+                        <i class="nav-icon fas fa-cube"></i>
                         <p>
                             Licenses
                             <?php
@@ -140,7 +140,7 @@
                     <a href="client_logins.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_logins.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-key"></i>
                         <p>
-                            Passwords
+                            Logins
                             <?php
                             if ($num_logins > 0) { ?>
                                 <span class="right badge text-light"><?php echo $num_logins; ?></span>
diff --git a/client_software.php b/client_software.php
index 141ce5c3..8a6a5607 100644
--- a/client_software.php
+++ b/client_software.php
@@ -26,7 +26,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-certificate mr-2"></i>Software & Licenses</h3>
+            <h3 class="card-title mt-2"><i class="fas fa-fw fa-cube mr-2"></i>Software & 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 bd899b9a..115d71ad 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-certificate mr-2"></i>New License</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-cube 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 44d39ece..e379394d 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-certificate mr-2"></i>Editing license: <strong><?php echo $software_name; ?></strong></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-cube 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/ticket.php b/ticket.php
index afba2d3e..39a2b89d 100644
--- a/ticket.php
+++ b/ticket.php
@@ -296,27 +296,25 @@ if (isset($_GET['ticket_id'])) {
                         </div>
                         <div class="form-row">
                             <div class="col-md-3">
-                                <div class="form-group">
-                                    <div class="input-group input-group-sm">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="status" required>
-                                            <option <?php if ($ticket_status == "In-Progress") {echo "selected";}?> >In-Progress</option>
-                                            <option <?php if ($ticket_status == "Pending-Client") {echo "selected";}?> >Pending-Client</option>
-                                            <option <?php if ($ticket_status == "Pending-Vendor") {echo "selected";}?> >Pending-Vendor</option>
-                                            <option <?php if ($ticket_status == "Pending-Shipment") {echo "selected";}?> >Pending-Shipment</option>
-                                            <option <?php if ($ticket_status == "Scheduled") {echo "selected";}?> >Scheduled</option>
-                                            <?php if($config_ticket_autoclose) { ?>
-                                                <option <?php if ($ticket_status == 'Auto Close') { echo "selected"; } ?> >Auto Close</option>
-                                            <?php } ?>
-                                        </select>
+                                <div class="input-group mb-3">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
                                     </div>
+                                    <select class="form-control select2" name="status" required>
+                                        <option <?php if ($ticket_status == "In-Progress") {echo "selected";}?> >In-Progress</option>
+                                        <option <?php if ($ticket_status == "Pending-Client") {echo "selected";}?> >Pending-Client</option>
+                                        <option <?php if ($ticket_status == "Pending-Vendor") {echo "selected";}?> >Pending-Vendor</option>
+                                        <option <?php if ($ticket_status == "Pending-Shipment") {echo "selected";}?> >Pending-Shipment</option>
+                                        <option <?php if ($ticket_status == "Scheduled") {echo "selected";}?> >Scheduled</option>
+                                        <?php if($config_ticket_autoclose) { ?>
+                                            <option <?php if ($ticket_status == 'Auto Close') { echo "selected"; } ?> >Auto Close</option>
+                                        <?php } ?>
+                                    </select>
                                 </div>
                             </div>
 
                             <!-- Time Tracking: Hours -->
-                            <div class="col-sm-2">
+                            <div class="col-md-2">
                                 <div class="input-group input-group-sm mb-3">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fas fa-fw fa-clock"></i></span>
@@ -329,7 +327,7 @@ if (isset($_GET['ticket_id'])) {
                             </div>
 
                             <!-- Time Tracking: Minutes -->
-                            <div class="col-sm-1">
+                            <div class="col-md-1">
                                 <div class="input-group input-group-sm mb-3">
                                     <input type="text" class="form-control" inputmode="numeric" id="minutes" name="minutes" placeholder="Mins" min="0" max="59" pattern="[0-5]?[0-9]">
                                     <div class="input-group-append">
@@ -339,7 +337,7 @@ if (isset($_GET['ticket_id'])) {
                             </div>
 
                             <!-- Time Tracking: Seconds -->
-                            <div class="col-sm-1">
+                            <div class="col-md-1">
                                 <div class="input-group input-group-sm mb-3">
                                     <input type="text" class="form-control" inputmode="numeric" id="seconds" name="seconds" placeholder="Secs" min="0" max="59" pattern="[0-5]?[0-9]">
                                     <div class="input-group-append">
@@ -349,7 +347,7 @@ if (isset($_GET['ticket_id'])) {
                             </div>
 
                             <!-- Timer Controls -->
-                            <div class="col-sm-1">
+                            <div class="col-md-2">
                                 <div class="btn-group" role="group">
                                     <button type="button" class="btn btn-success btn-sm" id="startStopTimer"><i class="fas fa-fw fa-pause"></i></button>
                                     <button type="button" class="btn btn-danger btn-sm" id="resetTimer"><i class="fas fa-fw fa-redo-alt"></i></button>