diff --git a/client_add_modal.php b/client_add_modal.php
index 6bfe7fba..30723782 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -134,7 +134,7 @@
                             </div>
 
                             <div class="form-group">
-                                <label>Zip / Postal Code</label>
+                                <label>Postal Code</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
@@ -147,7 +147,7 @@
                                 <label>Country</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
                                     </div>
                                     <select class="form-control select2" name="country">
                                         <option value="">- Country -</option>
@@ -166,7 +166,7 @@
                                 <label>Primary Contact <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-user"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
                                     </div>
                                     <input type="text" class="form-control" id="primaryContact" name="contact" placeholder="Primary Contact Person" required autofocus>
                                 </div>
diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php
index e90d26bb..1a2b5a8a 100644
--- a/client_asset_add_modal.php
+++ b/client_asset_add_modal.php
@@ -258,7 +258,7 @@
                                 <label>Install Date</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
                                     </div>
                                     <input type="date" class="form-control" name="install_date" max="2999-12-31">
                                 </div>
@@ -278,7 +278,7 @@
                                     <label>Warranty Expire</label>
                                     <div class="input-group">
                                         <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                                         </div>
                                         <input type="date" class="form-control" name="warranty_expire" max="2999-12-31">
                                     </div>
diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php
index f7083a12..46a6cb50 100644
--- a/client_asset_copy_modal.php
+++ b/client_asset_copy_modal.php
@@ -253,7 +253,7 @@
                                 <label>Install Date</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
                                     </div>
                                     <input type="date" class="form-control" name="install_date" max="2999-12-31" value="<?php echo $asset_install_date; ?>">
                                 </div>
@@ -274,7 +274,7 @@
                                     <label>Warranty Expire</label>
                                     <div class="input-group">
                                         <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                                         </div>
                                         <input type="date" class="form-control" name="warranty_expire" max="2999-12-31" value="<?php echo $asset_warranty_expire; ?>">
                                     </div>
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php
index 51133ce6..bd42286b 100644
--- a/client_asset_edit_modal.php
+++ b/client_asset_edit_modal.php
@@ -255,7 +255,7 @@
                                 <label>Install Date</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
                                     </div>
                                     <input type="date" class="form-control" name="install_date" max="2999-12-31" value="<?php echo $asset_install_date; ?>">
                                 </div>
@@ -276,7 +276,7 @@
                                     <label>Warranty Expire</label>
                                     <div class="input-group">
                                         <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                                         </div>
                                         <input type="date" class="form-control" name="warranty_expire" max="2999-12-31" value="<?php echo $asset_warranty_expire; ?>">
                                     </div>
diff --git a/client_certificate_add_modal.php b/client_certificate_add_modal.php
index 3e36d9de..01261bd4 100644
--- a/client_certificate_add_modal.php
+++ b/client_certificate_add_modal.php
@@ -48,7 +48,7 @@
                         <label>Expire Date</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                             </div>
                             <input type="date" class="form-control" name="expire" id="expire" max="2999-12-31">
                         </div>
diff --git a/client_certificate_edit_modal.php b/client_certificate_edit_modal.php
index a5d884d5..31c5fd9c 100644
--- a/client_certificate_edit_modal.php
+++ b/client_certificate_edit_modal.php
@@ -49,7 +49,7 @@
                         <label>Expire Date</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                             </div>
                             <input type="date" class="form-control" id="editExpire" name="expire" max="2999-12-31" value="">
                         </div>
diff --git a/client_domain_add_modal.php b/client_domain_add_modal.php
index 59824ece..ab69e055 100644
--- a/client_domain_add_modal.php
+++ b/client_domain_add_modal.php
@@ -67,7 +67,7 @@
                         <label>Expire Date</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                             </div>
                             <input type="date" class="form-control" name="expire" max="2999-12-31">
                         </div>
diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php
index 09a415f0..4e6abd09 100644
--- a/client_domain_edit_modal.php
+++ b/client_domain_edit_modal.php
@@ -63,7 +63,7 @@
                                 <label>Expire Date</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                                     </div>
                                     <input type="date" class="form-control" id="editExpire" name="expire" max="2999-12-31">
                                 </div>
diff --git a/client_location_add_modal.php b/client_location_add_modal.php
index 6a09380b..391b1195 100644
--- a/client_location_add_modal.php
+++ b/client_location_add_modal.php
@@ -75,7 +75,7 @@
                             </div>
 
                             <div class="form-group">
-                                <label>Zip / Postal Code</label>
+                                <label>Postal Code</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
@@ -88,7 +88,7 @@
                                 <label>Country</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
                                     </div>
                                     <select class="form-control select2" name="country">
                                         <option value="">- Country -</option>
diff --git a/client_location_edit_modal.php b/client_location_edit_modal.php
index 688d1e30..de8f4283 100644
--- a/client_location_edit_modal.php
+++ b/client_location_edit_modal.php
@@ -77,7 +77,7 @@
                             </div>
 
                             <div class="form-group">
-                                <label>Zip / Postal Code</label>
+                                <label>Postal Code</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
@@ -90,7 +90,7 @@
                                 <label>Country</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
                                     </div>
                                     <select class="form-control select2" name="country">
                                         <option value="">- Country -</option>
diff --git a/client_locations.php b/client_locations.php
index 85ef0752..af9c4420 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -45,8 +45,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="col-md-8">
                     <div class="float-right">
-                        <button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportLocationModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
-                        <button type="button" class="btn btn-default" data-toggle="modal" data-target="#importLocationModal"><i class="fa fa-fw fa-upload mr-2"></i>Import</button>
+                        <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#exportLocationModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
+                        <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#importLocationModal"><i class="fa fa-fw fa-upload mr-2"></i>Import</button>
                     </div>
                 </div>
 
diff --git a/client_software_add_modal.php b/client_software_add_modal.php
index 5f020267..c6512ce7 100644
--- a/client_software_add_modal.php
+++ b/client_software_add_modal.php
@@ -109,7 +109,7 @@
                                 <label>Purchase Date</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
                                     </div>
                                     <input type="date" class="form-control" name="purchase" max="2999-12-31">
                                 </div>
@@ -119,7 +119,7 @@
                                 <label>Expire</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                                     </div>
                                     <input type="date" class="form-control" name="expire" max="2999-12-31">
                                 </div>
diff --git a/client_software_edit_modal.php b/client_software_edit_modal.php
index 1fafe933..f143e6ae 100644
--- a/client_software_edit_modal.php
+++ b/client_software_edit_modal.php
@@ -110,7 +110,7 @@
                                 <label>Purchase Date</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
                                     </div>
                                     <input type="date" class="form-control" name="purchase" max="2999-12-31" value="<?php echo $software_purchase; ?>">
                                 </div>
@@ -120,7 +120,7 @@
                                 <label>Expire</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
                                     </div>
                                     <input type="date" class="form-control" name="expire" max="2999-12-31" value="<?php echo $software_expire; ?>">
                                 </div>
diff --git a/scheduled_ticket_add_modal.php b/scheduled_ticket_add_modal.php
index f805e24e..368f12bb 100644
--- a/scheduled_ticket_add_modal.php
+++ b/scheduled_ticket_add_modal.php
@@ -77,7 +77,7 @@
                         <label>Frequency <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-calendar-plus"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
                             </div>
                             <select class="form-control select2" name="frequency" required>
                                 <option>Weekly</option>
diff --git a/scheduled_ticket_edit_modal.php b/scheduled_ticket_edit_modal.php
index 3addb030..de75a21f 100644
--- a/scheduled_ticket_edit_modal.php
+++ b/scheduled_ticket_edit_modal.php
@@ -16,7 +16,7 @@
                         <label>Frequency <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-calendar-plus"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
                             </div>
                             <!-- Not using select2 as couldn't get this working with Javascript modal population -->
                             <select class="form-control" name="frequency" required id="editTicketFrequency">
diff --git a/settings_company.php b/settings_company.php
index 881e148e..8acd297f 100644
--- a/settings_company.php
+++ b/settings_company.php
@@ -93,7 +93,7 @@ $company_initials = nullable_htmlentities(initials($company_name));
                     <label>Country</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
                         </div>
                         <select class="form-control select2" name="country">
                             <option value="">- Country -</option>
diff --git a/setup.php b/setup.php
index bc72e06b..b4374e07 100644
--- a/setup.php
+++ b/setup.php
@@ -1402,7 +1402,7 @@ if (isset($_POST['add_telemetry'])) {
                                     <label>Country <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-flag"></i></span>
+                                            <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
                                         </div>
                                         <select class="form-control select2" name="country" required>
                                             <option value="">- Country -</option>