diff --git a/app/Controllers/Reports.php b/app/Controllers/Reports.php
index 69f242c61..06571fbe5 100644
--- a/app/Controllers/Reports.php
+++ b/app/Controllers/Reports.php
@@ -1301,7 +1301,7 @@ class Reports extends Secure_Controller
                 'comment'       => $row['comment'],
                 'edit'          => anchor(
                     'sales/edit/' . $row['sale_id'],
-                    '<span class="glyphicon glyphicon-edit"></span>',
+                    '<i class="bi bi-pencil-square"></i>',
                     [
                         'class'           => 'modal-dlg print_hide',
                         $button_key       => $button_label,
@@ -1428,7 +1428,7 @@ class Reports extends Secure_Controller
                 'comment'       => $row['comment'],
                 'edit'          => anchor(
                     'sales/edit/' . $row['sale_id'],
-                    '<span class="glyphicon glyphicon-edit"></span>',
+                    '<i class="bi bi-pencil-square"></i>',
                     [
                         'class'           => 'modal-dlg print_hide',
                         $button_key       => $button_label,
@@ -1560,7 +1560,7 @@ class Reports extends Secure_Controller
                 'comment'       => $row['comment'],
                 'edit'          => anchor(
                     'sales/edit/' . $row['sale_id'],
-                    '<span class="glyphicon glyphicon-edit"></span>',
+                    '<i class="bi bi-pencil-square"></i>',
                     [
                         'class'           => 'modal-dlg print_hide',
                         $button_key       => $button_label,
@@ -1648,7 +1648,7 @@ class Reports extends Secure_Controller
             'comment'       => $report_data['comment'],
             'edit'          => anchor(
                 'sales/edit/' . $report_data['sale_id'],
-                '<span class="glyphicon glyphicon-edit"></span>',
+                '<i class="bi bi-pencil-square"></i>',
                 [
                     'class'           => 'modal-dlg print_hide',
                     $button_key       => $button_label,
@@ -1819,7 +1819,7 @@ class Reports extends Secure_Controller
                 'comment'       => $row['comment'],
                 'edit'          => anchor(
                     'sales/edit/' . $row['sale_id'],
-                    '<span class="glyphicon glyphicon-edit"></span>',
+                    '<i class="bi bi-pencil-square"></i>',
                     [
                         'class'           => 'modal-dlg print_hide',
                         $button_key       => $button_label,
@@ -1899,7 +1899,7 @@ class Reports extends Secure_Controller
             'comment'        => $report_data['comment'],
             'edit'           => anchor(
                 'receivings/edit/' . $report_data['receiving_id'],
-                '<span class="glyphicon glyphicon-edit"></span>',
+                '<i class="bi bi-pencil-square"></i>',
                 [
                     'class'           => 'modal-dlg print_hide',
                     'data-btn-submit' => lang('Common.submit'),
@@ -1954,7 +1954,7 @@ class Reports extends Secure_Controller
                 'comment'        => $row['comment'],
                 'edit'           => anchor(
                     'receivings/edit/' . $row['receiving_id'],
-                    '<span class="glyphicon glyphicon-edit"></span>',
+                    '<i class="bi bi-pencil-square"></i>',
                     [
                         'class'           => 'modal-dlg print_hide',
                         'data-btn-delete' => lang('Common.delete'),
diff --git a/app/Helpers/tabular_helper.php b/app/Helpers/tabular_helper.php
index 82f6dedd9..39c622f12 100644
--- a/app/Helpers/tabular_helper.php
+++ b/app/Helpers/tabular_helper.php
@@ -117,19 +117,19 @@ function get_sale_data_row(object $sale): array
             ? '-'
             : anchor(
                 "$controller/invoice/$sale->sale_id",
-                '<span class="glyphicon glyphicon-list-alt"></span>',
+                '<i class="bi bi-file-text"></i>',
                 ['title' => lang('Sales.show_invoice')]
             );
     }
 
     $row['receipt'] = anchor(
         "$controller/receipt/$sale->sale_id",
-        '<span class="glyphicon glyphicon-usd"></span>',
+        '<i class="bi bi-receipt"></i>',
         ['title' => lang('Sales.show_receipt')]
     );
     $row['edit'] = anchor(
         "$controller/edit/$sale->sale_id",
-        '<span class="glyphicon glyphicon-edit"></span>',
+        '<i class="bi bi-pencil-square"></i>',
         [
             'class'           => 'modal-dlg print_hide',
             'data-btn-delete' => lang('Common.delete'),
@@ -231,7 +231,7 @@ function get_person_data_row(object $person): array
             ? ''
             : anchor(
                 "Messages/view/$person->person_id",
-                '<span class="glyphicon glyphicon-phone"></span>',
+                '<i class="bi bi-telephone"></i>',
                 [
                     'class'           => 'modal-dlg',
                     'data-btn-submit' => lang('Common.submit'),
@@ -240,7 +240,7 @@ function get_person_data_row(object $person): array
             ),
         'edit'             => anchor(
             "$controller/view/$person->person_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -298,7 +298,7 @@ function get_customer_data_row(object $person, object $stats): array
             ? ''
             : anchor(
                 "Messages/view/$person->person_id",
-                '<span class="glyphicon glyphicon-phone"></span>',
+                '<i class="bi bi-telephone"></i>',
                 [
                     'class'           => 'modal-dlg',
                     'data-btn-submit' => lang('Common.submit'),
@@ -307,7 +307,7 @@ function get_customer_data_row(object $person, object $stats): array
             ),
         'edit'             => anchor(
             "$controller/view/$person->person_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -368,7 +368,7 @@ function get_supplier_data_row(object $supplier): array
             ? ''
             : anchor(
                 "Messages/view/$supplier->person_id",
-                '<span class="glyphicon glyphicon-phone"></span>',
+                '<i class="bi bi-telephone"></i>',
                 [
                     'class'           => "modal-dlg",
                     'data-btn-submit' => lang('Common.submit'),
@@ -377,7 +377,7 @@ function get_supplier_data_row(object $supplier): array
             ),
         'edit'             => anchor(
             "$controller/view/$supplier->person_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => "modal-dlg",
                 'data-btn-submit' => lang('Common.submit'),
@@ -496,7 +496,7 @@ function get_item_data_row(object $item): array
     $icons = [
         'inventory' => anchor(
             "$controller/inventory/$item->item_id",
-            '<span class="glyphicon glyphicon-pushpin"></span>',
+            '<i class="bi bi-box"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -505,7 +505,7 @@ function get_item_data_row(object $item): array
         ),
         'stock'     => anchor(
             "$controller/countDetails/$item->item_id",
-            '<span class="glyphicon glyphicon-list-alt"></span>',
+            '<i class="bi bi-info-square"></i>',
             [
                 'class' => 'modal-dlg',
                 'title' => lang(ucfirst($controller) . ".details_count")
@@ -513,7 +513,7 @@ function get_item_data_row(object $item): array
         ),
         'edit'      => anchor(
             "$controller/view/$item->item_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -559,7 +559,7 @@ function get_giftcard_data_row(object $giftcard): array
         'value'           => to_currency($giftcard->value),
         'edit'            => anchor(
             "$controller/view/$giftcard->giftcard_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -605,7 +605,7 @@ function get_item_kit_data_row(object $item_kit): array
         'total_unit_price' => to_currency($item_kit->total_unit_price),
         'edit'             => anchor(
             "$controller/view/$item_kit->item_kit_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -707,7 +707,7 @@ function get_attribute_definition_data_row(object $attribute_row): array
         'definition_flags' => $definition_flags,
         'edit'             => anchor(
             "$controller/view/$attribute_row->definition_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -747,7 +747,7 @@ function get_expense_category_data_row(object $expense_category): array
         'category_description' => $expense_category->category_description,
         'edit'                 => anchor(
             "$controller/view/$expense_category->expense_category_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -801,7 +801,7 @@ function get_expenses_data_row(object $expense): array
         'created_by'        => $expense->first_name . ' ' . $expense->last_name,
         'edit'              => anchor(
             "$controller/view/$expense->expense_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -896,14 +896,14 @@ function get_cash_up_data_row(object $cash_up): array
         'close_date'           => to_datetime(strtotime($cash_up->close_date)),
         'close_employee_id'    => $cash_up->close_first_name . ' ' . $cash_up->close_last_name,
         'closed_amount_cash'   => to_currency($cash_up->closed_amount_cash),
-        'note'                 => $cash_up->note ? '<span class="glyphicon glyphicon-ok"></span>' : '<span class="glyphicon glyphicon-remove"></span>',
+        'note'                 => $cash_up->note ? '<i class="bi bi-check-lg"></i>' : '<i class="bi bi-x-lg"></i>',
         'closed_amount_due'    => to_currency($cash_up->closed_amount_due),
         'closed_amount_card'   => to_currency($cash_up->closed_amount_card),
         'closed_amount_check'  => to_currency($cash_up->closed_amount_check),
         'closed_amount_total'  => to_currency($cash_up->closed_amount_total),
         'edit'                 => anchor(
             "$controller/view/$cash_up->cashup_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
diff --git a/app/Helpers/tax_helper.php b/app/Helpers/tax_helper.php
index 9e5008e38..e8241c70d 100644
--- a/app/Helpers/tax_helper.php
+++ b/app/Helpers/tax_helper.php
@@ -36,7 +36,7 @@ function get_tax_code_data_row($tax_code_row): array
         'state'         => $tax_code_row->state,
         'edit'          => anchor(
             "$controller_name/view_tax_codes/$tax_code_row->tax_code",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -74,7 +74,7 @@ function get_tax_categories_data_row($tax_categories_row): array
         'tax_group_sequence' => $tax_categories_row->tax_group_sequence,
         'edit'               => anchor(
             "$controller_name/view/$tax_categories_row->tax_category_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -111,7 +111,7 @@ function get_tax_jurisdictions_data_row($tax_jurisdiction_row): array
         'reporting_authority' => $tax_jurisdiction_row->reporting_authority,
         'edit'                => anchor(
             "$controller_name/view/$tax_jurisdiction_row->jurisdiction_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
@@ -157,7 +157,7 @@ function get_tax_rates_data_row($tax_rates_row): array
         'rounding_code_name' => Rounding_mode::get_rounding_code_name($tax_rates_row->tax_rounding_code),
         'edit'               => anchor(
             "$controller_name/view/$tax_rates_row->tax_rate_id",
-            '<span class="glyphicon glyphicon-edit"></span>',
+            '<i class="bi bi-pencil-square"></i>',
             [
                 'class'           => 'modal-dlg',
                 'data-btn-submit' => lang('Common.submit'),
diff --git a/app/Views/attributes/form.php b/app/Views/attributes/form.php
index 8e216af8e..5042e99ff 100644
--- a/app/Views/attributes/form.php
+++ b/app/Views/attributes/form.php
@@ -83,7 +83,7 @@
                 <div class="input-group">
                     <?= form_input(['name' => 'definition_value', 'class' => 'form-control input-sm', 'id' => 'definition_value']) ?>
                     <span id="add_attribute_value" class="input-group-addon input-sm btn btn-default">
-                        <span class="glyphicon glyphicon-plus-sign"></span>
+                        <i class="bi bi-plus-circle"></i>
                     </span>
                 </div>
             </div>
@@ -192,7 +192,7 @@
                 }
             }
 
-            $('#definition_list_group').append('<li class="list-group-item">' + value + '<a href="javascript:void(0);"><span class="glyphicon glyphicon-trash pull-right"></span></a></li>')
+            $('#definition_list_group').append('<li class="list-group-item">' + value + '<a href="javascript:void(0);"><i class="bi bi-trash pull-right"></i></a></li>')
                 .find(':last-child a').click(remove_attribute_value);
             $('#definition_value').val('');
         };
diff --git a/app/Views/attributes/item.php b/app/Views/attributes/item.php
index c158ecf36..f99a17d2c 100644
--- a/app/Views/attributes/item.php
+++ b/app/Views/attributes/item.php
@@ -92,7 +92,7 @@
                 }
                 ?>
                 <span class="input-group-addon input-sm btn btn-default remove_attribute_btn">
-                    <span class="glyphicon glyphicon-trash"></span>
+                    <i class="bi bi-trash"></i>
                 </span>
             </div>
         </div>
diff --git a/app/Views/attributes/manage.php b/app/Views/attributes/manage.php
index 7130189c2..91e9e5478 100644
--- a/app/Views/attributes/manage.php
+++ b/app/Views/attributes/manage.php
@@ -23,14 +23,14 @@
 
 <div id="title_bar" class="btn-toolbar print_hide">
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name) . ".new") ?>">
-        <span class="glyphicon glyphicon-star">&nbsp;</span><?= lang(ucfirst($controller_name) . ".new") ?>
+        <i class="bi bi-star icon-spacing"></i><?= lang(ucfirst($controller_name) . ".new") ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left form-inline" role="toolbar">
         <button id="delete" class="btn btn-default btn-sm print_hide">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
     </div>
 </div>
diff --git a/app/Views/cashups/form.php b/app/Views/cashups/form.php
index 052c6733b..9d69faa62 100644
--- a/app/Views/cashups/form.php
+++ b/app/Views/cashups/form.php
@@ -23,7 +23,7 @@
             <div class="col-xs-6">
                 <div class="input-group">
                     <span class="input-group-addon input-sm">
-                        <span class="glyphicon glyphicon-calendar"></span>
+                        <i class="bi bi-calendar2"></i>
                     </span>
                     <?= form_input([
                         'name'  => 'open_date',
@@ -87,7 +87,7 @@
             <div class="col-xs-6">
                 <div class="input-group">
                     <span class="input-group-addon input-sm">
-                        <span class="glyphicon glyphicon-calendar"></span>
+                        <i class="bi bi-calendar2"></i>
                     </span>
                     <?= form_input([
                         'name'  => 'close_date',
diff --git a/app/Views/cashups/manage.php b/app/Views/cashups/manage.php
index db21cbb37..ac7e1adaf 100644
--- a/app/Views/cashups/manage.php
+++ b/app/Views/cashups/manage.php
@@ -45,17 +45,17 @@
 
 <div id="title_bar" class="print_hide btn-toolbar">
     <button onclick="javascript:printdoc()" class="btn btn-info btn-sm pull-right">
-        <span class="glyphicon glyphicon-print">&nbsp;</span><?= lang('Common.print') ?>
+        <i class="bi bi-printer icon-spacing"></i><?= lang('Common.print') ?>
     </button>
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/view" ?>" title="<?= lang(ucfirst($controller_name) . ".new") ?>">
-        <span class="glyphicon glyphicon-tags">&nbsp;</span><?= lang(esc(ucfirst($controller_name)) . '.new')    // TODO: String Interpolation ?>
+        <i class="bi bi-journal-check icon-spacing"></i><?= lang(esc(ucfirst($controller_name)) . '.new')    // TODO: String Interpolation ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left form-inline" role="toolbar">
         <button id="delete" class="btn btn-default btn-sm print_hide">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
         <?= form_input(['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
         <?= form_multiselect('filters[]', $filters, [''], [
diff --git a/app/Views/configs/barcode_config.php b/app/Views/configs/barcode_config.php
index f32f9b753..d20bcd328 100644
--- a/app/Views/configs/barcode_config.php
+++ b/app/Views/configs/barcode_config.php
@@ -90,7 +90,7 @@
                     ]) ?>
                     &nbsp;
                     <label class="control-label">
-                        <span class="glyphicon glyphicon-warning-sign" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.barcode_tooltip') ?>"></span>
+                        <span class="bi bi-exclamation-triangle" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.barcode_tooltip') ?>"></span>
                     </label>
                 </div>
             </div>
diff --git a/app/Views/configs/email_config.php b/app/Views/configs/email_config.php
index 6396a978b..98a118f13 100644
--- a/app/Views/configs/email_config.php
+++ b/app/Views/configs/email_config.php
@@ -96,7 +96,7 @@
                 <div class="col-xs-4">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-user"></span>
+                            <i class="bi bi-person"></i>
                         </span>
                         <?= form_input([
                             'name'  => 'smtp_user',
@@ -113,7 +113,7 @@
                 <div class="col-xs-4">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-asterisk"></span>
+                            <i class="bi bi-lock"></i>
                         </span>
                         <?= form_password([
                             'name'  => 'smtp_pass',
diff --git a/app/Views/configs/general_config.php b/app/Views/configs/general_config.php
index b9c9f71da..2e5581edf 100644
--- a/app/Views/configs/general_config.php
+++ b/app/Views/configs/general_config.php
@@ -31,7 +31,7 @@
                         <div class="col-sm-7">
                             <a href="<?= 'https://bootswatch.com/3/' . ('bootstrap' == ($config['theme']) ? 'default' : esc($config['theme'])) ?>" target="_blank" rel=”noopener”>
                                 <span><?= lang('Config.theme_preview') . ' ' . ucfirst(esc($config['theme'])) . ' ' ?></span>
-                                <span class="glyphicon glyphicon-new-window"></span>
+                                <i class="bi bi-box-arrow-up-right"></i>
                             </a>
                         </div>
                     </div>
@@ -124,7 +124,7 @@
                     ]) ?>
                     &nbsp;
                     <label class="control-label">
-                        <span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.enforce_privacy_tooltip') ?>"></span>
+                        <span class="bi bi-info-circle" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.enforce_privacy_tooltip') ?>"></span>
                     </label>
                 </div>
             </div>
@@ -194,7 +194,7 @@
                         <div class="col-sm-2">
                             <div class="input-group">
                                 <span class="input-group-addon input-sm">
-                                    <span class="glyphicon glyphicon-resize-horizontal"></span>
+                                    <i class="bi bi-arrows"></i>
                                 </span>
                                 <?= form_input([
                                     'name'           => 'image_max_width',
@@ -213,7 +213,7 @@
                         <div class="col-sm-2">
                             <div class="input-group">
                                 <span class="input-group-addon input-sm">
-                                    <span class="glyphicon glyphicon-resize-vertical"></span>
+                                    <i class="bi bi-arrows-vertical"></i>
                                 </span>
                                 <?= form_input([
                                     'name'           => 'image_max_height',
@@ -232,7 +232,7 @@
                         <div class="col-sm-2">
                             <div class="input-group">
                                 <span class="input-group-addon input-sm">
-                                    <span class="glyphicon glyphicon-hdd"></span>
+                                    <i class="bi bi-hdd"></i>
                                 </span>
                                 <?= form_input([
                                     'name'           => 'image_max_size',
@@ -279,7 +279,7 @@
                     ]) ?>
                     <label class="control-label">
                         <a href="https://www.google.com/recaptcha/admin" target="_blank">
-                            <span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.gcaptcha_tooltip') ?>"></span>
+                            <span class="bi bi-info-circle" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.gcaptcha_tooltip') ?>"></span>
                         </a>
                     </label>
                 </div>
@@ -400,7 +400,7 @@
                     ]) ?>
                     &nbsp;
                     <label class="control-label">
-                        <span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.derive_sale_quantity_tooltip') ?>"></span>
+                        <span class="bi bi-info-circle" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.derive_sale_quantity_tooltip') ?>"></span>
                     </label>
                 </div>
             </div>
diff --git a/app/Views/configs/info_config.php b/app/Views/configs/info_config.php
index 2dcf372c7..cb257c38f 100644
--- a/app/Views/configs/info_config.php
+++ b/app/Views/configs/info_config.php
@@ -18,7 +18,7 @@
                 <div class="col-xs-6">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-home"></span>
+                            <i class="bi bi-shop-window"></i>
                         </span>
                         <?= form_input([
                             'name'  => 'company',
@@ -67,7 +67,7 @@
                 <div class="col-xs-6">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-globe"></span>
+                            <i class="bi bi-globe"></i>
                         </span>
                         <?= form_input([
                             'name'  => 'website',
@@ -84,7 +84,7 @@
                 <div class="col-xs-6">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-envelope"></span>
+                            <i class="bi bi-at"></i>
                         </span>
                         <?= form_input([
                             'name'  => 'email',
@@ -102,7 +102,7 @@
                 <div class="col-xs-6">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-phone-alt"></span>
+                            <i class="bi bi-telephone"></i>
                         </span>
                         <?= form_input([
                             'name'  => 'phone',
@@ -119,7 +119,7 @@
                 <div class="col-xs-6">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-phone-alt"></span>
+                            <i class="bi bi-printer"></i>
                         </span>
                         <?= form_input([
                             'name'  => 'fax',
diff --git a/app/Views/configs/integrations_config.php b/app/Views/configs/integrations_config.php
index ea5881643..a494fba2c 100644
--- a/app/Views/configs/integrations_config.php
+++ b/app/Views/configs/integrations_config.php
@@ -18,7 +18,7 @@
                 <div class="col-xs-4">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-cloud"></span>
+                            <i class="bi bi-key"></i>
                         </span>
                         <?= form_input([
                             'name'  => 'mailchimp_api_key',
@@ -31,7 +31,7 @@
                 <div class="col-xs-1">
                     <label class="control-label">
                         <a href="https://eepurl.com/b9a05b" target="_blank">
-                            <span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.mailchimp_tooltip') ?>"></span>
+                            <span class="bi bi-info-circle" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.mailchimp_tooltip') ?>"></span>
                         </a>
                     </label>
                 </div>
@@ -42,7 +42,7 @@
                 <div class="col-xs-4">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-user"></span>
+                            <i class="bi bi-list-stars"></i>
                         </span>
                         <?= form_dropdown(
                             'mailchimp_list_id',
diff --git a/app/Views/configs/locale_config.php b/app/Views/configs/locale_config.php
index 93bd72d8b..d83010867 100644
--- a/app/Views/configs/locale_config.php
+++ b/app/Views/configs/locale_config.php
@@ -28,7 +28,7 @@
                 <div class="col-xs-2">
                     <label class="control-label">
                         <a href="https://github.com/opensourcepos/opensourcepos/wiki/Localisation-support" target="_blank">
-                            <span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.number_locale_tooltip') ?>"></span>
+                            <span class="bi bi-info-circle" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.number_locale_tooltip') ?>"></span>
                         </a>
                         <span id="number_locale_example">
                             &nbsp;&nbsp;<?= to_currency(1234567890.12300) ?>
@@ -141,7 +141,7 @@
                 </div>
                 <div class="col-xs-1">
                     <label class="control-label">
-                        <span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.cash_decimals_tooltip') ?>"></span>
+                        <span class="bi bi-info-circle" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.cash_decimals_tooltip') ?>"></span>
                     </label>
                 </div>
             </div>
@@ -188,7 +188,7 @@
                 <div class="col-xs-1">
                     <label class="control-label">
                         <a href="https://wiki.openstreetmap.org/wiki/Nominatim/Country_Codes" target="_blank">
-                            <span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.country_codes_tooltip'); ?>"></span>
+                            <span class="bi bi-info-circle" data-toggle="tooltip" data-placement="right" title="<?= lang('Config.country_codes_tooltip'); ?>"></span>
                         </a>
                     </label>
                 </div>
diff --git a/app/Views/configs/message_config.php b/app/Views/configs/message_config.php
index 3ddae26b6..fcd6402f9 100644
--- a/app/Views/configs/message_config.php
+++ b/app/Views/configs/message_config.php
@@ -16,7 +16,7 @@
                 <div class="col-xs-4">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-user"></span>
+                            <i class="bi bi-person"></i>
                         </span>
                         <?= form_input([
                             'name'  => 'msg_uid',
@@ -33,7 +33,7 @@
                 <div class="col-xs-4">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-lock"></span>
+                            <i class="bi bi-lock"></i>
                         </span>
                         <?= form_password([
                             'name'  => 'msg_pwd',
@@ -50,7 +50,7 @@
                 <div class="col-xs-4">
                     <div class="input-group">
                         <span class="input-group-addon input-sm">
-                            <span class="glyphicon glyphicon-bullhorn"></span>
+                            <i class="bi bi-megaphone"></i>
                         </span>
                         <?= form_input([
                             'name'  => 'msg_src',
diff --git a/app/Views/customers/form.php b/app/Views/customers/form.php
index c314ac6e4..2aa45698d 100644
--- a/app/Views/customers/form.php
+++ b/app/Views/customers/form.php
@@ -175,7 +175,7 @@
                     <?= form_label(lang('Customers.date'), 'date', ['class' => 'control-label col-xs-3']) ?>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-calendar"></span></span>
+                            <span class="input-group-addon input-sm"><i class="bi bi-calendar2"></i></span>
                             <?= form_input([
                                 'name'     => 'date',
                                 'id'       => 'datetime',
diff --git a/app/Views/customers/form_csv_import.php b/app/Views/customers/form_csv_import.php
index a915f1699..1ca85c018 100644
--- a/app/Views/customers/form_csv_import.php
+++ b/app/Views/customers/form_csv_import.php
@@ -12,7 +12,9 @@
         <div class="form-group form-group-sm">
             <div class="col-xs-12">
                 <div class="fileinput fileinput-new input-group" data-provides="fileinput">
-                    <div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i><span class="fileinput-filename"></span></div>
+                    <div class="form-control" data-trigger="fileinput">
+                        <i class="bi bi-filetype-csv icon-spacing fileinput-exists"></i><span class="fileinput-filename"></span>
+                    </div>
                     <span class="input-group-addon input-sm btn btn-default btn-file">
                         <span class="fileinput-new"><?= lang('Common.import_select_file') ?></span><span class="fileinput-exists"><?= lang('Common.import_change_file') ?></span><input type="file" id="file_path" name="file_path" accept=".csv">
                     </span>
diff --git a/app/Views/employees/form.php b/app/Views/employees/form.php
index 1a1be5290..70d6e6e2f 100644
--- a/app/Views/employees/form.php
+++ b/app/Views/employees/form.php
@@ -38,7 +38,7 @@
                     <?= form_label(lang('Employees.username'), 'username', ['class' => 'required control-label col-xs-3']) ?>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
+                            <span class="input-group-addon input-sm"><i class="bi bi-person"></i></span>
                             <?= form_input([
                                 'name'  => 'username',
                                 'id'    => 'username',
@@ -55,7 +55,7 @@
                     <?= form_label(lang('Employees.password'), 'password', array_merge($password_label_attributes, ['class' => 'control-label col-xs-3'])) ?>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
+                            <span class="input-group-addon input-sm"><i class="bi bi-lock"></i></span>
                             <?= form_password([
                                 'name'  => 'password',
                                 'id'    => 'password',
@@ -69,7 +69,7 @@
                     <?= form_label(lang('Employees.repeat_password'), 'repeat_password', array_merge($password_label_attributes, ['class' => 'control-label col-xs-3'])) ?>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
+                            <span class="input-group-addon input-sm"><i class="bi bi-lock"></i></span>
                             <?= form_password([
                                 'name'  => 'repeat_password',
                                 'id'    => 'repeat_password',
diff --git a/app/Views/expenses/form.php b/app/Views/expenses/form.php
index 2fc89f99e..9cb830379 100644
--- a/app/Views/expenses/form.php
+++ b/app/Views/expenses/form.php
@@ -24,7 +24,7 @@
             <?= form_label(lang('Expenses.date'), 'date', ['class' => 'required control-label col-xs-3']) ?>
             <div class="col-xs-6">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-calendar"></span></span>
+                    <span class="input-group-addon input-sm"><i class="bi bi-calendar2"></i></span>
                     <?= form_input([
                         'name'     => 'date',
                         'class'    => 'form-control input-sm datetime',
@@ -52,7 +52,7 @@
             </div>
             <div class="col-xs-2">
                 <a id="remove_supplier_button" class="btn btn-danger btn-sm" title="Remove Supplier">
-                    <span class="glyphicon glyphicon-remove"></span>
+                    <i class="bi bi-x-circle"></i>
                 </a>
             </div>
         </div>
diff --git a/app/Views/expenses/manage.php b/app/Views/expenses/manage.php
index a47e57334..d5c86fa3c 100644
--- a/app/Views/expenses/manage.php
+++ b/app/Views/expenses/manage.php
@@ -52,17 +52,17 @@
 
 <div id="title_bar" class="print_hide btn-toolbar">
     <button onclick="javascript:printdoc()" class="btn btn-info btn-sm pull-right">
-        <span class="glyphicon glyphicon-print">&nbsp;</span><?= lang('Common.print') ?>
+        <i class="bi bi-printer icon-spacing"></i><?= lang('Common.print') ?>
     </button>
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/view" ?>" title="<?= lang(ucfirst($controller_name) . '.new') ?>">
-        <span class="glyphicon glyphicon-tags">&nbsp;</span><?= lang(ucfirst($controller_name) . '.new') ?>
+        <i class="bi bi-bag-check icon-spacing"></i><?= lang(ucfirst($controller_name) . '.new') ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left form-inline" role="toolbar">
         <button id="delete" class="btn btn-default btn-sm print_hide">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
         <?= form_input(['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
         <?= form_multiselect('filters[]', esc($filters), [''], [
diff --git a/app/Views/expenses_categories/manage.php b/app/Views/expenses_categories/manage.php
index 43b6a2842..8e8ef9b2f 100644
--- a/app/Views/expenses_categories/manage.php
+++ b/app/Views/expenses_categories/manage.php
@@ -29,14 +29,14 @@
 
 <div id="title_bar" class="btn-toolbar">
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name) . '.new') ?>">
-        <span class="glyphicon glyphicon-list">&nbsp;</span><?= lang(ucfirst($controller_name) . '.new') ?>
+        <i class="bi bi-bookmark-plus icon-spacing"></i><?= lang(ucfirst($controller_name) . '.new') ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left form-inline" role="toolbar">
         <button id="delete" class="btn btn-default btn-sm print_hide">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
     </div>
 </div>
diff --git a/app/Views/giftcards/manage.php b/app/Views/giftcards/manage.php
index c8b103a13..4dc0b8fe9 100644
--- a/app/Views/giftcards/manage.php
+++ b/app/Views/giftcards/manage.php
@@ -22,14 +22,14 @@
 
 <div id="title_bar" class="btn-toolbar">
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name) . '.new') ?>">
-        <span class="glyphicon glyphicon-heart">&nbsp;</span><?= lang(ucfirst($controller_name) . '.new') ?>
+        <i class="bi bi-gift icon-spacing"></i><?= lang(ucfirst($controller_name) . '.new') ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left btn-toolbar">
         <button id="delete" class="btn btn-default btn-sm">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
     </div>
 </div>
diff --git a/app/Views/home/form_change_password.php b/app/Views/home/form_change_password.php
index 71d431cbe..53d0191fe 100644
--- a/app/Views/home/form_change_password.php
+++ b/app/Views/home/form_change_password.php
@@ -16,7 +16,9 @@
                     <?= form_label(lang('Employees.username'), 'username', ['class' => 'required control-label col-xs-3']) ?>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
+                            <span class="input-group-addon input-sm">
+                                <i class="bi bi-person"></i>
+                            </span>
                             <?= form_input([
                                 'name'     => 'username',
                                 'id'       => 'username',
@@ -34,7 +36,9 @@
                     <?= form_label(lang('Employees.current_password'), 'current_password', array_merge($password_label_attributes, ['class' => 'control-label col-xs-3'])) ?>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
+                            <span class="input-group-addon input-sm">
+                                <i class="bi bi-lock"></i>
+                            </span>
                             <?= form_password([
                                 'name'  => 'current_password',
                                 'id'    => 'current_password',
@@ -48,7 +52,9 @@
                     <?= form_label(lang('Employees.password'), 'password', array_merge($password_label_attributes, ['class' => 'control-label col-xs-3'])) ?>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
+                            <span class="input-group-addon input-sm">
+                                <i class="bi bi-lock"></i>
+                            </span>
                             <?= form_password([
                                 'name'  => 'password',
                                 'id'    => 'password',
@@ -62,7 +68,9 @@
                     <?= form_label(lang('Employees.repeat_password'), 'repeat_password', array_merge($password_label_attributes, ['class' => 'control-label col-xs-3'])) ?>
                     <div class="col-xs-8">
                         <div class="input-group">
-                            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
+                            <span class="input-group-addon input-sm">
+                                <i class="bi bi-lock"></i>
+                            </span>
                             <?= form_password([
                                 'name'  => 'repeat_password',
                                 'id'    => 'repeat_password',
diff --git a/app/Views/item_kits/form.php b/app/Views/item_kits/form.php
index 4cce6522d..749d5ecae 100644
--- a/app/Views/item_kits/form.php
+++ b/app/Views/item_kits/form.php
@@ -18,7 +18,7 @@
             <?= form_label(lang('Item_kits.item_kit_number'), 'item_kit_number', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-8">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
+                    <span class="input-group-addon input-sm"><i class="bi bi-upc-scan"></i></span>
                     <?= form_input([
                         'name'  => 'item_kit_number',
                         'id'    => 'item_kit_number',
@@ -192,7 +192,7 @@
             <tbody>
                 <?php foreach ($item_kit_items as $item_kit_item) { ?>
                     <tr>
-                        <td><a href="#" onclick="return delete_item_kit_row(this);"><span class="glyphicon glyphicon-trash"></span></a></td>
+                        <td><a href="#" onclick="return delete_item_kit_row(this);"><i class="bi bi-trash"></i></a></td>
                         <td><input class="quantity form-control input-sm" id="item_seq_<?= $item_kit_item['item_id'] ?>" name="item_kit_seq[<?= $item_kit_item['item_id'] ?>]" value="<?= parse_decimals($item_kit_item['kit_sequence'], 0) ?>"></td>
                         <td><?= esc($item_kit_item['name']) ?></td>
                         <td><input class="quantity form-control input-sm" id="item_qty_<?= $item_kit_item['item_id'] ?>" name="item_kit_qty[<?= $item_kit_item['item_id'] ?>]" value="<?= to_quantity_decimals($item_kit_item['quantity']) ?>"></td>
@@ -218,7 +218,7 @@
                     $('#item_kit_item_' + ui.item.value).val(parseFloat($('#item_kit_item_' + ui.item.value).val()) + 1);
                 } else {
                     $('#item_kit_items').append('<tr>' +
-                        '<td><a href="#" onclick="return delete_item_kit_row(this);"><span class="glyphicon glyphicon-trash"></span></a></td>' +
+                        '<td><a href="#" onclick="return delete_item_kit_row(this);"><i class="bi bi-trash"></i></a></td>' +
                         '<td><input class="quantity form-control input-sm" id="item_seq_' + ui.item.value + '" name="item_kit_seq[' + ui.item.value + ']" value="0"></td>' +
                         '<td>' + ui.item.label + '</td>' +
                         '<td><input class="quantity form-control input-sm" id="item_qty_' + ui.item.value + '" name="item_kit_qty[' + ui.item.value + ']" value="1"></td>' +
diff --git a/app/Views/item_kits/manage.php b/app/Views/item_kits/manage.php
index 6056e2883..99a401190 100644
--- a/app/Views/item_kits/manage.php
+++ b/app/Views/item_kits/manage.php
@@ -30,18 +30,18 @@
 
 <div id="title_bar" class="btn-toolbar">
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name) . '.new') ?>">
-        <span class="glyphicon glyphicon-tags">&nbsp;</span><?= lang(ucfirst($controller_name) . '.new') ?>
+        <i class="bi bi-tags icon-spacing"></i><?= lang(ucfirst($controller_name) . '.new') ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left btn-toolbar">
         <button id="delete" class="btn btn-default btn-sm">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
 
         <button id="generate_barcodes" class="btn btn-default btn-sm" data-href="<?= esc("$controller_name/generateBarcodes") ?>">
-            <span class="glyphicon glyphicon-barcode">&nbsp;</span><?= lang('Items.generate_barcodes') ?>
+            <i class="bi bi-upc-scan icon-spacing"></i><?= lang('Items.generate_barcodes') ?>
         </button>
     </div>
 </div>
diff --git a/app/Views/items/form.php b/app/Views/items/form.php
index f14002fc7..0912ee1ea 100644
--- a/app/Views/items/form.php
+++ b/app/Views/items/form.php
@@ -35,7 +35,9 @@
             <?= form_label(lang('Items.item_number'), 'item_number', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-8">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
+                    <span class="input-group-addon input-sm">
+                        <i class="bi bi-upc-scan"></i>
+                    </span>
                     <?= form_input([
                         'name'  => 'item_number',
                         'id'    => 'item_number',
@@ -62,7 +64,9 @@
             <?= form_label(lang('Items.category'), 'category', ['class' => 'required control-label col-xs-3']) ?>
             <div class="col-xs-8">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
+                    <span class="input-group-addon input-sm">
+                        <i class="bi bi-bookmark"></i>
+                    </span>
                     <?php
                     if ($config['category_dropdown']) {
                         echo form_dropdown('category', $categories, $selected_category, ['class' => 'form-control']);
diff --git a/app/Views/items/form_bulk.php b/app/Views/items/form_bulk.php
index e4c32d712..0e7bb394d 100644
--- a/app/Views/items/form_bulk.php
+++ b/app/Views/items/form_bulk.php
@@ -29,7 +29,9 @@
             <?= form_label(lang('Items.category'), 'category', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-8">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
+                    <span class="input-group-addon input-sm">
+                        <i class="bi bi-tag"></i>
+                    </span>
                     <?= form_input([
                         'name'  => 'category',
                         'id'    => 'category',
diff --git a/app/Views/items/form_count_details.php b/app/Views/items/form_count_details.php
index 242888fb7..7b35f6300 100644
--- a/app/Views/items/form_count_details.php
+++ b/app/Views/items/form_count_details.php
@@ -16,7 +16,9 @@ use App\Models\Inventory;
             <?= form_label(lang('Items.item_number'), 'name', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-8">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
+                    <span class="input-group-addon input-sm">
+                        <i class="bi bi-upc-scan"></i>
+                    </span>
                     <?= form_input([
                         'name'     => 'item_number',
                         'id'       => 'item_number',
@@ -45,7 +47,9 @@ use App\Models\Inventory;
             <?= form_label(lang('Items.category'), 'category', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-8">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
+                    <span class="input-group-addon input-sm">
+                        <i class="bi bi-tag"></i>
+                    </span>
                     <?= form_input([
                         'name'     => 'category',
                         'id'       => 'category',
diff --git a/app/Views/items/form_csv_import.php b/app/Views/items/form_csv_import.php
index 96a7ce6a4..cb4e1b985 100644
--- a/app/Views/items/form_csv_import.php
+++ b/app/Views/items/form_csv_import.php
@@ -12,7 +12,7 @@
         <div class="form-group form-group-sm">
             <div class="col-xs-12">
                 <div class="fileinput fileinput-new input-group" data-provides="fileinput">
-                    <div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i><span class="fileinput-filename"></span></div>
+                    <div class="form-control" data-trigger="fileinput"><i class="bi bi-filetype-csv icon-spacing fileinput-exists"></i><span class="fileinput-filename"></span></div>
                     <span class="input-group-addon input-sm btn btn-default btn-file">
                         <span class="fileinput-new"><?= lang('Common.import_select_file') ?></span><span class="fileinput-exists"><?= lang('Common.import_change_file') ?></span><input type="file" id="file_path" name="file_path" accept=".csv">
                     </span>
diff --git a/app/Views/items/form_inventory.php b/app/Views/items/form_inventory.php
index 690057d76..086c50537 100644
--- a/app/Views/items/form_inventory.php
+++ b/app/Views/items/form_inventory.php
@@ -17,7 +17,9 @@
             <?= form_label(lang('Items.item_number'), 'name', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-8">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-barcode"></span></span>
+                    <span class="input-group-addon input-sm">
+                        <i class="bi bi-upc-scan"></i>
+                    </span>
                     <?= form_input([
                         'name'     => 'item_number',
                         'id'       => 'item_number',
@@ -46,7 +48,9 @@
             <?= form_label(lang('Items.category'), 'category', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-8">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
+                    <span class="input-group-addon input-sm">
+                        <i class="bi bi-tag"></i>
+                    </span>
                     <?= form_input([
                         'name'     => 'category',
                         'id'       => 'category',
diff --git a/app/Views/items/manage.php b/app/Views/items/manage.php
index 71d0428df..72920a505 100644
--- a/app/Views/items/manage.php
+++ b/app/Views/items/manage.php
@@ -77,24 +77,24 @@ use App\Models\Employee;
 
 <div id="title_bar" class="btn-toolbar print_hide">
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/csvImport" ?>" title="<?= lang('Items.import_items_csv') ?>">
-        <span class="glyphicon glyphicon-import">&nbsp;</span><?= lang('Common.import_csv') ?>
+        <i class="bi bi-file-earmark-arrow-down icon-spacing"></i><?= lang('Common.import_csv') ?>
     </button>
 
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-new="<?= lang('Common.new') ?>" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/view" ?>" title="<?= lang(ucfirst($controller_name) . '.new') ?>">
-        <span class="glyphicon glyphicon-tag">&nbsp;</span><?= lang(ucfirst($controller_name) . '.new') ?>
+        <i class="bi bi-tag icon-spacing"></i><?= lang(ucfirst($controller_name) . '.new') ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left form-inline" role="toolbar">
         <button id="delete" class="btn btn-default btn-sm print_hide">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
         <button id="bulk_edit" class="btn btn-default btn-sm modal-dlg print_hide" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "items/bulkEdit" ?>" title="<?= lang('Items.edit_multiple_items') ?>">
-            <span class="glyphicon glyphicon-edit">&nbsp;</span><?= lang('Items.bulk_edit') ?>
+            <i class="bi bi-pencil-square icon-spacing"></i><?= lang('Items.bulk_edit') ?>
         </button>
         <button id="generate_barcodes" class="btn btn-default btn-sm print_hide" data-href="<?= "$controller_name/generateBarcodes" ?>" title="<?= lang('Items.generate_barcodes') ?>">
-            <span class="glyphicon glyphicon-barcode">&nbsp;</span><?= lang('Items.generate_barcodes') ?>
+            <i class="bi bi-upc-scan icon-spacing"></i><?= lang('Items.generate_barcodes') ?>
         </button>
         <?= form_input(['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
         <?= form_multiselect('filters[]', $filters, [''], [
diff --git a/app/Views/login.php b/app/Views/login.php
index 0893bfd44..ac47bef1c 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -27,6 +27,7 @@
         : $config['theme']);
     ?>
     <link rel="stylesheet" href="resources/bootswatch5/<?= "$theme" ?>/bootstrap.min.css">
+    <link rel="stylesheet" href="resources/bootstrap-icons/bootstrap-icons.min.css">
     <link rel="stylesheet" href="css/login.css">
     <meta name="theme-color" content="#2c3e50">
 </head>
@@ -72,19 +73,13 @@
                 <?php elseif ('input_groups' == ($config['login_form'])): ?>
                     <div class="input-group mt-3">
                         <span class="input-group-text" id="input-username">
-                            <svg class="bi bi-person-fill" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-                                <title><?= lang('Common.icon') . '&nbsp;' . lang('Login.username') ?></title>
-                                <path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6" />
-                            </svg>
+                            <i class="bi bi-person" title="<?= lang('Common.icon') . '&nbsp;' . lang('Login.username') ?>"></i>
                         </span>
                         <input class="form-control" name="username" type="text" placeholder="<?= lang('Login.username'); ?>" aria-label="<?= lang('Login.username') ?>" aria-describedby="input-username" <?php if (ENVIRONMENT == "testing") echo 'value="admin"'; ?>>
                     </div>
                     <div class="input-group mb-3">
                         <span class="input-group-text" id="input-password">
-                            <svg class="bi bi-key-fill" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-                                <title><?= lang('Common.icon') . '&nbsp;' . lang('Login.password') ?></title>
-                                <path d="M3.5 11.5a3.5 3.5 0 1 1 3.163-5H14L15.5 8 14 9.5l-1-1-1 1-1-1-1 1-1-1-1 1H6.663a3.5 3.5 0 0 1-3.163 2M2.5 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2" />
-                            </svg>
+                            <i class="bi bi-lock" title="<?= lang('Common.icon') . '&nbsp;' . lang('Login.password') ?>"></i>
                         </span>
                         <input class="form-control" name="password" type="password" placeholder="<?= lang('Login.password') ?>" aria-label="<?= lang('Login.password') ?>" aria-describedby="input-password" <?php if (ENVIRONMENT == "testing") echo 'value="pointofsale"'; ?>>
                     </div>
diff --git a/app/Views/messages/form_sms.php b/app/Views/messages/form_sms.php
index cacb64bef..04270ba1c 100644
--- a/app/Views/messages/form_sms.php
+++ b/app/Views/messages/form_sms.php
@@ -30,7 +30,7 @@
             <?= form_label(lang('Messages.phone'), 'phone_label', ['for' => 'phone', 'class' => 'control-label col-xs-2 required']) ?>
             <div class="col-xs-10">
                 <div class="input-group">
-                    <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-phone-alt"></span></span>
+                    <span class="input-group-addon input-sm"><i class="bi bi-telephone"></i></span>
                     <?= form_input(['class' => 'form-control input-sm required', 'type' => 'text', 'name' => 'phone', 'value' => $person_info->phone_number]) ?>
                 </div>
             </div>
diff --git a/app/Views/partial/customer_rewards.php b/app/Views/partial/customer_rewards.php
index d6631f349..677752769 100644
--- a/app/Views/partial/customer_rewards.php
+++ b/app/Views/partial/customer_rewards.php
@@ -38,9 +38,9 @@ foreach ($customer_rewards as $reward_key => $reward_category) {
             echo form_input($form_data);
             ?>
         </div>
-        <span class="add_customer_reward glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
+        <span class="add_customer_reward bi bi-plus-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
         <span>&nbsp;&nbsp;</span>
-        <span class="remove_customer_reward glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
+        <span class="remove_customer_reward bi bi-dash-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
     </div>
 
 <?php } ?>
diff --git a/app/Views/partial/dinner_tables.php b/app/Views/partial/dinner_tables.php
index 899a9aaeb..949d86c1f 100644
--- a/app/Views/partial/dinner_tables.php
+++ b/app/Views/partial/dinner_tables.php
@@ -28,9 +28,9 @@ foreach ($dinner_tables as $table_key => $table) {
             echo form_input($form_data);
             ?>
         </div>
-        <span class="add_dinner_table glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
+        <span class="add_dinner_table bi bi-plus-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
         <span>&nbsp;&nbsp;</span>
-        <span class="remove_dinner_table glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
+        <span class="remove_dinner_table bi bi-dash-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
     </div>
 
 <?php } ?>
diff --git a/app/Views/partial/header.php b/app/Views/partial/header.php
index 3bb51ac57..29e213f19 100644
--- a/app/Views/partial/header.php
+++ b/app/Views/partial/header.php
@@ -20,6 +20,7 @@ $request = Services::request();
     <title><?= esc($config['company']) . ' | ' . lang('Common.powered_by') . ' OSPOS ' . esc(config('App')->application_version) ?></title>
     <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
     <link rel="stylesheet" href="<?= 'resources/bootswatch/' . (empty($config['theme']) ? 'flatly' : esc($config['theme'])) . '/bootstrap.min.css' ?>">
+    <link rel="stylesheet" href="resources/bootstrap-icons/bootstrap-icons.min.css">
 
     <?php if (ENVIRONMENT == 'development' || get_cookie('debug') == 'true' || $request->getGet('debug') == 'true') : ?>
         <!-- inject:debug:css -->
diff --git a/app/Views/partial/stock_locations.php b/app/Views/partial/stock_locations.php
index 356212728..aa0a563ea 100644
--- a/app/Views/partial/stock_locations.php
+++ b/app/Views/partial/stock_locations.php
@@ -26,9 +26,9 @@ foreach ($stock_locations as $location => $location_data) {
             echo form_input($form_data);
             ?>
         </div>
-        <span class="add_stock_location glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
+        <span class="add_stock_location bi bi-plus-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
         <span>&nbsp;&nbsp;</span>
-        <span class="remove_stock_location glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
+        <span class="remove_stock_location bi bi-dash-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
     </div>
 
 <?php } ?>
diff --git a/app/Views/partial/tax_categories.php b/app/Views/partial/tax_categories.php
index f556090b4..05df0c879 100644
--- a/app/Views/partial/tax_categories.php
+++ b/app/Views/partial/tax_categories.php
@@ -37,9 +37,9 @@ foreach ($tax_categories as $key => $category) {
             echo form_input($form_data);
             ?>
         </div>
-        <span class="add_tax_category glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
+        <span class="add_tax_category bi bi-plus-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
         <span>&nbsp;&nbsp;</span>
-        <span class="remove_tax_category glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
+        <span class="remove_tax_category bi bi-dash-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
         <?= form_hidden('tax_category_id[]', (string)$tax_category_id) ?>
     </div>
 
diff --git a/app/Views/partial/tax_codes.php b/app/Views/partial/tax_codes.php
index 65fe0a0ba..7dd0dfa1e 100644
--- a/app/Views/partial/tax_codes.php
+++ b/app/Views/partial/tax_codes.php
@@ -60,9 +60,9 @@ foreach ($tax_codes as $tax_code => $tax_code_data) {
             ?>
         </div>
 
-        <span class="add_tax_code glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
+        <span class="add_tax_code bi bi-plus-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
         <span>&nbsp;&nbsp;</span>
-        <span class="remove_tax_code glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
+        <span class="remove_tax_code bi bi-dash-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
         <?= form_hidden('tax_code_id[]', (string)$tax_code_id) ?>
     </div>
 
diff --git a/app/Views/partial/tax_jurisdictions.php b/app/Views/partial/tax_jurisdictions.php
index c0190b384..7016d4fe0 100644
--- a/app/Views/partial/tax_jurisdictions.php
+++ b/app/Views/partial/tax_jurisdictions.php
@@ -80,9 +80,9 @@ foreach ($tax_jurisdictions as $tax_jurisdiction => $jurisdiction) {
             echo form_input($form_data)
             ?>
         </div>
-        <span class="add_tax_jurisdiction glyphicon glyphicon-plus" style="padding-top: 0.5em;"></span>
+        <span class="add_tax_jurisdiction bi bi-plus-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
         <span>&nbsp;&nbsp;</span>
-        <span class="remove_tax_jurisdiction glyphicon glyphicon-minus" style="padding-top: 0.5em;"></span>
+        <span class="remove_tax_jurisdiction bi bi-dash-circle" style="padding-top: 0.5em; display: inline-block; cursor: pointer;"></span>
         <?= form_hidden('jurisdiction_id[]', (string)$jurisdiction_id) ?>
     </div>
 
diff --git a/app/Views/people/form_basic_info.php b/app/Views/people/form_basic_info.php
index d3822a452..bab79cff7 100644
--- a/app/Views/people/form_basic_info.php
+++ b/app/Views/people/form_basic_info.php
@@ -58,7 +58,9 @@
     <?= form_label(lang('Common.email'), 'email', ['class' => 'control-label col-xs-3']) ?>
     <div class="col-xs-8">
         <div class="input-group">
-            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-envelope"></span></span>
+            <span class="input-group-addon input-sm">
+                <i class="bi bi-envelope"></i>
+            </span>
             <?= form_input([
                 'name'  => 'email',
                 'id'    => 'email',
@@ -73,7 +75,9 @@
     <?= form_label(lang('Common.phone_number'), 'phone_number', ['class' => 'control-label col-xs-3']) ?>
     <div class="col-xs-8">
         <div class="input-group">
-            <span class="input-group-addon input-sm"><span class="glyphicon glyphicon-phone-alt"></span></span>
+            <span class="input-group-addon input-sm">
+                <i class="bi bi-telephone"></i>
+            </span>
             <?= form_input([
                 'name'  => 'phone_number',
                 'id'    => 'phone_number',
diff --git a/app/Views/people/manage.php b/app/Views/people/manage.php
index 598b4d44a..e87ba52e3 100644
--- a/app/Views/people/manage.php
+++ b/app/Views/people/manage.php
@@ -35,21 +35,21 @@
 <div id="title_bar" class="btn-toolbar">
     <?php if ($controller_name === 'customers') { ?>
         <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/csvImport" ?>" title="<?= lang(ucfirst($controller_name) . '.import_items_csv') ?>">
-            <span class="glyphicon glyphicon-import">&nbsp;</span><?= lang('Common.import_csv') ?>
+            <i class="bi bi-file-earmark-arrow-down icon-spacing"></i><?= lang('Common.import_csv') ?>
         </button>
     <?php } ?>
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/view" ?>" title="<?= lang(ucfirst($controller_name) . '.new') ?>">
-        <span class="glyphicon glyphicon-user">&nbsp;</span><?= lang(ucfirst($controller_name) . '.new') ?>
+        <i class="bi bi-person-add icon-spacing"></i><?= lang(ucfirst($controller_name) . '.new') ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left btn-toolbar">
         <button id="delete" class="btn btn-default btn-sm">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
         <button id="email" class="btn btn-default btn-sm">
-            <span class="glyphicon glyphicon-envelope">&nbsp;</span><?= lang('Common.email') ?>
+            <i class="bi bi-envelope icon-spacing"></i><?= lang('Common.email') ?>
         </button>
     </div>
 </div>
diff --git a/app/Views/receivings/receipt.php b/app/Views/receivings/receipt.php
index 22b5bc380..549d0de0e 100644
--- a/app/Views/receivings/receipt.php
+++ b/app/Views/receivings/receipt.php
@@ -28,9 +28,9 @@ echo view('partial/print_receipt', ['print_after_sale', $print_after_sale, 'sele
 
 <div class="print_hide" id="control_buttons" style="text-align: right;">
     <a href="javascript:printdoc();">
-        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print') ?></div>
+        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print') ?></div>
     </a>
-    <?= anchor("receivings", '<span class="glyphicon glyphicon-save">&nbsp;</span>' . lang('Receivings.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+    <?= anchor("receivings", '<i class="bi bi-box icon-spacing"></i>' . lang('Receivings.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
 </div>
 
 <div id="receipt_wrapper">
diff --git a/app/Views/receivings/receiving.php b/app/Views/receivings/receiving.php
index 2fce3f898..8828a1ba4 100644
--- a/app/Views/receivings/receiving.php
+++ b/app/Views/receivings/receiving.php
@@ -93,7 +93,7 @@ if (isset($success)) {
 
             <li class="pull-right">
                 <button id="new_item_button" class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-btn-new="<?= lang('Common.new') ?>" data-href="<?= "items/view" ?>" title="<?= lang('Sales.new_item') ?>">
-                    <span class="glyphicon glyphicon-tag">&nbsp;</span><?= lang('Sales.new_item') ?>
+                    <i class="bi bi-tag icon-spacing"></i><?= lang('Sales.new_item') ?>
                 </button>
             </li>
         </ul>
@@ -133,7 +133,7 @@ if (isset($success)) {
                     <?= form_open("$controller_name/editItem/$line", ['class' => 'form-horizontal', 'id' => "cart_$line"]) ?>
 
                     <tr>
-                        <td><?= anchor("$controller_name/deleteItem/$line", '<span class="glyphicon glyphicon-trash"></span>') ?></td>
+                        <td><?= anchor("$controller_name/deleteItem/$line", '<i class="bi bi-trash"></i>') ?></td>
                         <td><?= esc($item['item_number']) ?></td>
                         <td style="text-align: center;">
                             <?= esc($item['name'] . ' ' . implode(' ', [$item['attribute_values'], $item['attribute_dtvalues']])) ?><br>
@@ -198,7 +198,7 @@ if (isset($success)) {
                         </td>
                         <td>
                             <a href="javascript:$('#<?= esc("cart_$line", 'js') ?>').submit();" title=<?= lang(ucfirst($controller_name) . '.update') ?>>
-                                <span class="glyphicon glyphicon-refresh"></span>
+                                <i class="bi bi-arrow-repeat"></i>
                             </a>
                         </td>
                     </tr>
@@ -272,7 +272,7 @@ if (isset($success)) {
 
             <?= anchor(
                 "$controller_name/removeSupplier",
-                '<span class="glyphicon glyphicon-remove">&nbsp;</span>' . lang('Common.remove') . ' ' . lang('Suppliers.supplier'),
+                '<i class="bi bi-x-circle icon-spacing"></i>' . lang('Common.remove') . ' ' . lang('Suppliers.supplier'),
                 [
                     'class' => 'btn btn-danger btn-sm',
                     'id'    => 'remove_supplier_button',
@@ -296,7 +296,7 @@ if (isset($success)) {
                 ]) ?>
 
                 <button id="new_supplier_button" class="btn btn-info btn-sm modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "suppliers/view" ?>" title="<?= lang(ucfirst($controller_name) . '.new_supplier') ?>">
-                    <span class="glyphicon glyphicon-user">&nbsp;</span><?= lang(ucfirst($controller_name) . '.new_supplier') ?>
+                    <i class="bi bi-building-add icon-spacing"></i><?= lang(ucfirst($controller_name) . '.new_supplier') ?>
                 </button>
 
             </div>
@@ -334,10 +334,10 @@ if (isset($success)) {
                         ]) ?>
 
                         <div class="btn btn-sm btn-danger pull-left" id="cancel_receiving_button">
-                            <span class="glyphicon glyphicon-remove">&nbsp;</span><?= lang(ucfirst($controller_name) . '.cancel_receiving') ?>
+                            <i class="bi bi-x-circle icon-spacing"></i><?= lang(ucfirst($controller_name) . '.cancel_receiving') ?>
                         </div>
                         <div class="btn btn-sm btn-success pull-right" id="finish_receiving_button">
-                            <span class="glyphicon glyphicon-ok">&nbsp;</span><?= lang(ucfirst($controller_name) . '.complete_receiving') ?>
+                            <i class="bi bi-check-circle icon-spacing"></i><?= lang(ucfirst($controller_name) . '.complete_receiving') ?>
                         </div>
                     </div>
 
@@ -415,10 +415,10 @@ if (isset($success)) {
                         </div>
 
                         <div class="btn btn-sm btn-danger pull-left" id="cancel_receiving_button">
-                            <span class="glyphicon glyphicon-remove">&nbsp;</span><?= lang(ucfirst($controller_name) . '.cancel_receiving') ?>
+                            <i class="bi bi-x-circle icon-spacing"></i><?= lang(ucfirst($controller_name) . '.cancel_receiving') ?>
                         </div>
                         <div class="btn btn-sm btn-success pull-right" id="finish_receiving_button">
-                            <span class="glyphicon glyphicon-ok">&nbsp;</span><?= lang(ucfirst($controller_name) . '.complete_receiving') ?>
+                            <i class="bi bi-check-circle icon-spacing"></i><?= lang(ucfirst($controller_name) . '.complete_receiving') ?>
                         </div>
                     </div>
 
diff --git a/app/Views/reports/listing.php b/app/Views/reports/listing.php
index 8d02d3caf..e2aedcd70 100644
--- a/app/Views/reports/listing.php
+++ b/app/Views/reports/listing.php
@@ -31,7 +31,7 @@ if (isset($error)) {
     <div class="col-md-4">
         <div class="panel panel-primary">
             <div class="panel-heading">
-                <h3 class="panel-title"><span class="glyphicon glyphicon-stats">&nbsp;</span><?= lang('Reports.graphical_reports') ?></h3>
+                <h3 class="panel-title"><i class="bi bi-bar-chart icon-spacing"></i><?= lang('Reports.graphical_reports') ?></h3>
             </div>
             <div class="list-group">
                 <?php foreach ($permission_ids as $permission_id) {
@@ -50,7 +50,7 @@ if (isset($error)) {
     <div class="col-md-4">
         <div class="panel panel-primary">
             <div class="panel-heading">
-                <h3 class="panel-title"><span class="glyphicon glyphicon-list">&nbsp;</span><?= lang('Reports.summary_reports') ?></h3>
+                <h3 class="panel-title"><i class="bi bi-card-list icon-spacing"></i><?= lang('Reports.summary_reports') ?></h3>
             </div>
             <div class="list-group">
                 <?php foreach ($permission_ids as $permission_id) {
@@ -69,7 +69,7 @@ if (isset($error)) {
     <div class="col-md-4">
         <div class="panel panel-primary">
             <div class="panel-heading">
-                <h3 class="panel-title"><span class="glyphicon glyphicon-list-alt">&nbsp;</span><?= lang('Reports.detailed_reports') ?></h3>
+                <h3 class="panel-title"><i class="bi bi-card-checklist icon-spacing"></i><?= lang('Reports.detailed_reports') ?></h3>
             </div>
             <div class="list-group">
                 <?php foreach ($detailed_reports as $report_name => $prefix) {
@@ -87,7 +87,7 @@ if (isset($error)) {
         <?php if (in_array('reports_inventory', $permission_ids, true)) { ?>
             <div class="panel panel-primary">
                 <div class="panel-heading">
-                    <h3 class="panel-title"><span class="glyphicon glyphicon-book">&nbsp;</span><?= lang('Reports.inventory_reports') ?></h3>
+                    <h3 class="panel-title"><i class="bi bi-box icon-spacing"></i><?= lang('Reports.inventory_reports') ?></h3>
                 </div>
                 <div class="list-group">
                     <?php
diff --git a/app/Views/sales/invoice.php b/app/Views/sales/invoice.php
index 743f71188..fac10b246 100644
--- a/app/Views/sales/invoice.php
+++ b/app/Views/sales/invoice.php
@@ -57,20 +57,20 @@ if (isset($error_message)) {
 
 <div class="print_hide" id="control_buttons" style="text-align: right;">
     <a href="javascript:printdoc();">
-        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print') ?></div>
+        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print') ?></div>
     </a>
     <?php
     /* This line will allow to print and go back to sales automatically.
-     * echo anchor('sales', '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();'));
+     * echo anchor('sales', '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();'));
      */
     ?>
     <?php if (isset($customer_email) && !empty($customer_email)): ?>
         <a href="javascript:void(0);">
-            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<span class="glyphicon glyphicon-envelope">&nbsp;</span>' . lang('Sales.send_invoice') ?></div>
+            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<i class="bi bi-envelope icon-spacing"></i>' . lang('Sales.send_invoice') ?></div>
         </a>
     <?php endif; ?>
-    <?= anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp;</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
-    <?= anchor("sales/manage", '<span class="glyphicon glyphicon-list-alt">&nbsp;</span>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
+    <?= anchor("sales", '<i class="bi bi-cart2 icon-spacing"></i>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+    <?= anchor("sales/manage", '<i class="bi bi-receipt-cutoff icon-spacing"></i>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
 </div>
 
 <div id="page-wrap">
diff --git a/app/Views/sales/manage.php b/app/Views/sales/manage.php
index 277d438ab..21da870af 100644
--- a/app/Views/sales/manage.php
+++ b/app/Views/sales/manage.php
@@ -62,15 +62,15 @@
 
 <div id="title_bar" class="print_hide btn-toolbar">
     <button onclick="javascript:printdoc()" class="btn btn-info btn-sm pull-right">
-        <span class="glyphicon glyphicon-print">&nbsp;</span><?= lang('Common.print') ?>
+        <i class="bi bi-printer icon-spacing"></i><?= lang('Common.print') ?>
     </button>
-    <?= anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp;</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm pull-right', 'id' => 'show_sales_button']) ?>
+    <?= anchor("sales", '<i class="bi bi-cart2 icon-spacing"></i>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm pull-right', 'id' => 'show_sales_button']) ?>
 </div>
 
 <div id="toolbar">
     <div class="pull-left form-inline" role="toolbar">
         <button id="delete" class="btn btn-default btn-sm print_hide">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
 
         <?= form_input(['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
diff --git a/app/Views/sales/quote.php b/app/Views/sales/quote.php
index 28bf59352..4e793dfa8 100644
--- a/app/Views/sales/quote.php
+++ b/app/Views/sales/quote.php
@@ -53,20 +53,20 @@ if (isset($error_message)) {
 
 <div class="print_hide" id="control_buttons" style="text-align: right;">
     <a href="javascript:printdoc();">
-        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print') ?></div>
+        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print') ?></div>
     </a>
     <?php
     /* This line will allow to print and go back to sales automatically.
-     * echo anchor('sales', '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();'));
+     * echo anchor('sales', '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();'));
      */
     ?>
     <?php if (isset($customer_email) && !empty($customer_email)): ?>
         <a href="javascript:void(0);">
-            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<span class="glyphicon glyphicon-envelope">&nbsp;</span>' . lang('Sales.send_quote') ?></div>
+            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<i class="bi bi-envelope icon-spacing"></i>' . lang('Sales.send_quote') ?></div>
         </a>
     <?php endif; ?>
-    <?= anchor('sales', '<span class="glyphicon glyphicon-shopping-cart">&nbsp;</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
-    <?= anchor('sales/discardsuspendedsale', '<span class="glyphicon glyphicon-remove">&nbsp;</span>' . lang('Sales.discard'), ['class' => 'btn btn-danger btn-sm', 'id' => 'discard_quote_button']) ?>
+    <?= anchor('sales', '<i class="bi bi-cart2 icon-spacing"></i>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+    <?= anchor('sales/discardsuspendedsale', '<i class="bi bi-x-circle icon-spacing"></i>' . lang('Sales.discard'), ['class' => 'btn btn-danger btn-sm', 'id' => 'discard_quote_button']) ?>
 </div>
 
 <div id="page-wrap">
diff --git a/app/Views/sales/receipt.php b/app/Views/sales/receipt.php
index cd168cb33..390d62bf2 100644
--- a/app/Views/sales/receipt.php
+++ b/app/Views/sales/receipt.php
@@ -46,18 +46,18 @@ if (isset($error_message)) {
 
 <div class="print_hide" id="control_buttons" style="text-align: right;">
     <a href="javascript:printdoc();">
-        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print') ?></div>
+        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print') ?></div>
     </a>
     <?php if (!empty($customer_email)): ?>
         <a href="javascript:void(0);">
-            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<span class="glyphicon glyphicon-envelope">&nbsp;</span>' . lang('Sales.send_receipt') ?></div>
+            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<i class="bi bi-envelope icon-spacing"></i>' . lang('Sales.send_receipt') ?></div>
         </a>
     <?php endif; ?>
-    <?= anchor('sales', '<span class="glyphicon glyphicon-shopping-cart">&nbsp;</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+    <?= anchor('sales', '<i class="bi bi-cart2 icon-spacing"></i>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
     <?php
     $employee = model(Employee::class);
     if ($employee->has_grant('reports_sales', session('person_id'))): ?>
-        <?= anchor('sales/manage', '<span class="glyphicon glyphicon-list-alt">&nbsp;</span>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
+        <?= anchor('sales/manage', '<i class="bi bi-receipt-cutoff icon-spacing"></i>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
     <?php endif; ?>
 </div>
 
diff --git a/app/Views/sales/register.php b/app/Views/sales/register.php
index d6c65deeb..2c0c629df 100644
--- a/app/Views/sales/register.php
+++ b/app/Views/sales/register.php
@@ -91,9 +91,8 @@ helper('url');
                 <?php } ?>
 
                 <li class="pull-right">
-                    <button class="btn btn-default btn-sm modal-dlg" id="show_suspended_sales_button" data-href="<?= esc("$controller_name/suspended") ?>"
-                        title="<?= lang(ucfirst($controller_name) . '.suspended_sales') ?>">
-                        <span class="glyphicon glyphicon-align-justify">&nbsp;</span><?= lang(ucfirst($controller_name) . '.suspended_sales') ?>
+                    <button class="btn btn-default btn-sm modal-dlg" id="show_suspended_sales_button" data-href="<?= esc("$controller_name/suspended") ?>" title="<?= lang(ucfirst($controller_name) . '.suspended_sales') ?>">
+                        <i class="bi bi-pause-circle icon-spacing"></i><?= lang(ucfirst($controller_name) . '.suspended_sales') ?>
                     </button>
                 </li>
 
@@ -104,7 +103,7 @@ helper('url');
                     <li class="pull-right">
                         <?= anchor(
                             "$controller_name/manage",
-                            '<span class="glyphicon glyphicon-list-alt">&nbsp;</span>' . lang(ucfirst($controller_name) . '.takings'),
+                            '<i class="bi bi-receipt-cutoff icon-spacing"></i>' . lang(ucfirst($controller_name) . '.takings'),
                             array('class' => 'btn btn-primary btn-sm', 'id' => 'sales_takings_button', 'title' => lang(ucfirst($controller_name) . '.takings'))
                         ) ?>
                     </li>
@@ -127,7 +126,7 @@ helper('url');
                 </li>
                 <li class="pull-right">
                     <button id="new_item_button" class="btn btn-info btn-sm pull-right modal-dlg" data-btn-new="<?= lang('Common.new') ?>" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "items/view" ?>" title="<?= lang(ucfirst($controller_name) . ".new_item") ?>">
-                        <span class="glyphicon glyphicon-tag">&nbsp;</span><?= lang(ucfirst($controller_name) . ".new_item") ?>
+                        <i class="bi bi-tag icon-spacing"></i><?= lang(ucfirst($controller_name) . ".new_item") ?>
                     </button>
                 </li>
             </ul>
@@ -166,7 +165,7 @@ helper('url');
                         <tr>
                             <td>
                                 <?php
-                                echo anchor("$controller_name/deleteItem/$line", '<span class="glyphicon glyphicon-trash"></span>');
+                                echo anchor("$controller_name/deleteItem/$line", '<i class="bi bi-trash"></i>');
                                 echo form_hidden('location', (string)$item['item_location']);
                                 echo form_input(['type' => 'hidden', 'name' => 'item_id', 'value' => $item['item_id']]);
                                 ?>
@@ -229,7 +228,7 @@ helper('url');
 
                             <td>
                                 <a href="javascript:document.getElementById('<?= "cart_$line" ?>').submit();" title="<?= lang(ucfirst($controller_name) . '.update') ?>">
-                                    <span class="glyphicon glyphicon-refresh"></span>
+                                    <i class="bi bi-arrow-repeat"></i>
                                 </a>
                             </td>
                         </tr>
@@ -348,7 +347,7 @@ helper('url');
 
                 <?= anchor(
                     "$controller_name/removeCustomer",
-                    '<span class="glyphicon glyphicon-remove">&nbsp;</span>' . lang('Common.remove') . ' ' . lang('Customers.customer'),
+                    '<i class="bi bi-x-circle icon-spacing"></i>' . lang('Common.remove') . ' ' . lang('Customers.customer'),
                     ['class' => 'btn btn-danger btn-sm', 'id' => 'remove_customer_button', 'title' => lang('Common.remove') . ' ' . lang('Customers.customer')]
                 )
                 ?>
@@ -360,10 +359,10 @@ helper('url');
                     <?= form_input(['name' => 'customer', 'id' => 'customer', 'class' => 'form-control input-sm', 'value' => lang(ucfirst($controller_name) . '.start_typing_customer_name')]) ?>
 
                     <button class="btn btn-info btn-sm modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "customers/view" ?>" title="<?= lang(ucfirst($controller_name) . ".new_customer") ?>">
-                        <span class="glyphicon glyphicon-user">&nbsp;</span><?= lang(ucfirst($controller_name) . ".new_customer") ?>
+                        <i class="bi bi-person-add icon-spacing"></i><?= lang(ucfirst($controller_name) . ".new_customer") ?>
                     </button>
                     <button class="btn btn-default btn-sm modal-dlg" id="show_keyboard_help" data-href="<?= esc("$controller_name/salesKeyboardHelp") ?>" title="<?= lang(ucfirst($controller_name) . '.key_title') ?>">
-                        <span class="glyphicon glyphicon-share-alt">&nbsp;</span><?= lang(ucfirst($controller_name) . '.key_help') ?>
+                        <i class="bi bi-keyboard icon-spacing"></i><?= lang(ucfirst($controller_name) . '.key_help') ?>
                     </button>
                 </div>
             <?php } ?>
@@ -437,7 +436,7 @@ helper('url');
                         if (!$due_payment || ($due_payment && isset($customer))) {    // TODO: $due_payment is not needed because the first clause insures that it will always be true if it gets to this point.  Can be shortened to if (!$due_payment || isset($customer))
                     ?>
                             <div class="btn btn-sm btn-success pull-right" id="finish_sale_button" tabindex="<?= ++$tabindex ?>">
-                                <span class="glyphicon glyphicon-ok">&nbsp;</span><?= lang(ucfirst($controller_name) . '.complete_sale') ?>
+                                <i class="bi bi-check-circle icon-spacing"></i><?= lang(ucfirst($controller_name) . '.complete_sale') ?>
                             </div>
                     <?php
                         }
@@ -463,7 +462,7 @@ helper('url');
                     <?= form_close() ?>
 
                     <div class="btn btn-sm btn-success pull-right" id="add_payment_button" tabindex="<?= ++$tabindex ?>">
-                        <span class="glyphicon glyphicon-credit-card">&nbsp;</span><?= lang(ucfirst($controller_name) . '.add_payment') ?>
+                        <i class="bi bi-cash-coin icon-spacing"></i><?= lang(ucfirst($controller_name) . '.add_payment') ?>
                     </div>
                 <?php } ?>
 
@@ -480,7 +479,7 @@ helper('url');
                         <tbody id="payment_contents">
                             <?php foreach ($payments as $payment_id => $payment) { ?>
                                 <tr>
-                                    <td><?= anchor("$controller_name/deletePayment/". base64url_encode($payment_id), '<span class="glyphicon glyphicon-trash"></span>') ?></td>
+                                    <td><?= anchor("$controller_name/deletePayment/". base64url_encode($payment_id), '<i class="bi bi-trash"></i>') ?></td>
                                     <td><?= $payment['payment_type'] ?></td>
                                     <td style="text-align: right;"><?= to_currency($payment['payment_amount']) ?></td>
                                 </tr>
@@ -492,12 +491,18 @@ helper('url');
 
             <?= form_open("$controller_name/cancel", ['id' => 'buttons_form']) ?>
             <div class="form-group" id="buttons_sale">
-                <div class="btn btn-sm btn-default pull-left" id="suspend_sale_button"><span class="glyphicon glyphicon-align-justify">&nbsp;</span><?= lang(ucfirst($controller_name) . '.suspend_sale') ?></div>
+                <div class="btn btn-sm btn-default pull-left" id="suspend_sale_button">
+                    <i class="bi bi-pause-circle icon-spacing"></i><?= lang(ucfirst($controller_name) . '.suspend_sale') ?>
+                </div>
                 <?php if (!$pos_mode && isset($customer)) { // Only show this part if the payment covers the total ?>
-                    <div class="btn btn-sm btn-success" id="finish_invoice_quote_button"><span class="glyphicon glyphicon-ok">&nbsp;</span><?= esc($mode_label) ?></div>
+                    <div class="btn btn-sm btn-success" id="finish_invoice_quote_button">
+                        <i class="bi bi-check-circle icon-spacing"></i><?= esc($mode_label) ?>
+                    </div>
                 <?php } ?>
 
-                <div class="btn btn-sm btn-danger pull-right" id="cancel_sale_button"><span class="glyphicon glyphicon-remove">&nbsp;</span><?= lang(ucfirst($controller_name) . '.cancel_sale') ?></div>
+                <div class="btn btn-sm btn-danger pull-right" id="cancel_sale_button">
+                    <i class="bi bi-x-circle icon-spacing"></i><?= lang(ucfirst($controller_name) . '.cancel_sale') ?>
+                </div>
             </div>
             <?= form_close() ?>
 
diff --git a/app/Views/sales/tax_invoice.php b/app/Views/sales/tax_invoice.php
index fddcc6d3f..56a4e73cc 100644
--- a/app/Views/sales/tax_invoice.php
+++ b/app/Views/sales/tax_invoice.php
@@ -57,20 +57,20 @@ if (isset($error_message)) {
 
 <div class="print_hide" id="control_buttons" style="text-align: right;">
     <a href="javascript:printdoc();">
-        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print') ?></div>
+        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print') ?></div>
     </a>
     <?php
     /* This line will allow to print and go back to sales automatically.
-     * echo anchor('sales', '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();'));
+     * echo anchor('sales', '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();'));
      */
     ?>
     <?php if (isset($customer_email) && !empty($customer_email)): ?>
         <a href="javascript:void(0);">
-            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<span class="glyphicon glyphicon-envelope">&nbsp;</span>' . lang('Sales.send_invoice') ?></div>
+            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<i class="bi bi-envelope icon-spacing"></i>' . lang('Sales.send_invoice') ?></div>
         </a>
     <?php endif; ?>
-    <?= anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp;</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
-    <?= anchor("sales/manage", '<span class="glyphicon glyphicon-list-alt">&nbsp;</span>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
+    <?= anchor("sales", '<i class="bi bi-cart2 icon-spacing"></i>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+    <?= anchor("sales/manage", '<i class="bi bi-receipt-cutoff icon-spacing"></i>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
 </div>
 
 <div id="page-wrap">
diff --git a/app/Views/sales/work_order.php b/app/Views/sales/work_order.php
index 65ee082fb..741e7f7aa 100644
--- a/app/Views/sales/work_order.php
+++ b/app/Views/sales/work_order.php
@@ -55,20 +55,20 @@ if (isset($error_message)) {
 
 <div class="print_hide" id="control_buttons" style="text-align: right;">
     <a href="javascript:printdoc();">
-        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print') ?></div>
+        <div class="btn btn-info btn-sm" id="show_print_button"><?= '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print') ?></div>
     </a>
     <?php
     /* This line will allow to print and go back to sales automatically.
-     * echo anchor('sales', '<span class="glyphicon glyphicon-print">&nbsp;</span>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();'));
+     * echo anchor('sales', '<i class="bi bi-printer icon-spacing"></i>' . lang('Common.print'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_print_button', 'onclick' => 'window.print();'));
      */
     ?>
     <?php if (isset($customer_email) && !empty($customer_email)): ?>
         <a href="javascript:void(0);">
-            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<span class="glyphicon glyphicon-envelope">&nbsp;</span>' . lang('Sales.send_work_order') ?></div>
+            <div class="btn btn-info btn-sm" id="show_email_button"><?= '<i class="bi bi-envelope icon-spacing"></i>' . lang('Sales.send_work_order') ?></div>
         </a>
     <?php endif; ?>
-    <?= anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp;</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
-    <?= anchor("sales/discard_suspended_sale", '<span class="glyphicon glyphicon-remove">&nbsp;</span>' . lang('Sales.discard'), ['class' => 'btn btn-danger btn-sm', 'id' => 'discard_work_order_button']) ?>
+    <?= anchor("sales", '<i class="bi bi-cart2 icon-spacing"></i>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
+    <?= anchor("sales/discard_suspended_sale", '<i class="bi bi-x-circle icon-spacing"></i>' . lang('Sales.discard'), ['class' => 'btn btn-danger btn-sm', 'id' => 'discard_work_order_button']) ?>
 </div>
 
 <div id="page-wrap">
diff --git a/app/Views/taxes/tax_rates.php b/app/Views/taxes/tax_rates.php
index b1e78acf3..1c4331464 100644
--- a/app/Views/taxes/tax_rates.php
+++ b/app/Views/taxes/tax_rates.php
@@ -20,14 +20,14 @@
 
 <div id="title_bar" class="btn-toolbar">
     <button class="btn btn-info btn-sm pull-right modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name) . ".new") ?>">
-        <span class="glyphicon glyphicon-usd">&nbsp;</span><?= lang(ucfirst($controller_name) . ".new") ?>
+        <i class="bi bi-piggy-bank icon-spacing"></i><?= lang(ucfirst($controller_name) . ".new") ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left btn-toolbar">
         <button id="delete" class="btn btn-default btn-sm">
-            <span class="glyphicon glyphicon-trash">&nbsp;</span><?= lang('Common.delete') ?>
+            <i class="bi bi-trash icon-spacing"></i><?= lang('Common.delete') ?>
         </button>
     </div>
 </div>
diff --git a/gulpfile.js b/gulpfile.js
index 7b8c146f8..0b82e7482 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -63,8 +63,7 @@ gulp.task('copy-bootswatch', function() {
     pipeline(gulp.src('./node_modules/bootswatch/spacelab/*.min.css'),gulp.dest('public/resources/bootswatch/spacelab'));
     pipeline(gulp.src('./node_modules/bootswatch/superhero/*.min.css'),gulp.dest('public/resources/bootswatch/superhero'));
     pipeline(gulp.src('./node_modules/bootswatch/united/*.min.css'),gulp.dest('public/resources/bootswatch/united'));
-    pipeline(gulp.src('./node_modules/bootswatch/yeti/*.min.css'),gulp.dest('public/resources/bootswatch/yeti'));
-    return pipeline(gulp.src('./node_modules/bootswatch/fonts/*.*', {encoding:false}),gulp.dest('public/resources/bootswatch/fonts'));
+    return pipeline(gulp.src('./node_modules/bootswatch/yeti/*.min.css'),gulp.dest('public/resources/bootswatch/yeti'));
 });
 
 // Copy the bootswatch styles into their own folder so OSPOS can select one from the collection
@@ -255,8 +254,8 @@ gulp.task('prod-css', function() {
 });
 
 
-gulp.task('copy-fonts', function() {
-    return pipeline(gulp.src('./node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.*', {encoding: false}),rev(),gulp.dest('public/resources'));
+gulp.task('copy-icons', function() {
+    return pipeline(gulp.src('./node_modules/bootstrap-icons/font/**/*', {encoding: false}),gulp.dest('public/resources/bootstrap-icons'));
 });
 
 
@@ -301,7 +300,7 @@ gulp.task('default',
         'prod-js',
         'debug-css',
         'prod-css',
-        'copy-fonts',
+        'copy-icons',
         'copy-menubar',
         'build-database'
     ));
diff --git a/package-lock.json b/package-lock.json
index 9ed4dcf39..e2298bd1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
                 "bootstrap": "^3.4.1",
                 "bootstrap-daterangepicker": "^2.1.27",
                 "bootstrap-datetime-picker": "2.4.4",
+                "bootstrap-icons": "^1.13.1",
                 "bootstrap-notify": "^3.1.3",
                 "bootstrap-select": "^1.13.18",
                 "bootstrap-table": "^1.23.5",
@@ -689,6 +690,22 @@
             "resolved": "https://registry.npmjs.org/bootstrap-datetime-picker/-/bootstrap-datetime-picker-2.4.4.tgz",
             "integrity": "sha512-TTknlrqoJ7DcJJpkmvg+TneUiWNG65gfjHYbTM5MpJ60DGWmcQJWN7+6eU78WvqxE6Dz/yKmeyLDEzzWVgw43A=="
         },
+        "node_modules/bootstrap-icons": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.13.1.tgz",
+            "integrity": "sha512-ijombt4v6bv5CLeXvRWKy7CuM3TRTuPEuGaGKvTV5cz65rQSY8RQ2JcHt6b90cBBAC7s8fsf2EkQDldzCoXUjw==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/twbs"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/bootstrap"
+                }
+            ],
+            "license": "MIT"
+        },
         "node_modules/bootstrap-notify": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/bootstrap-notify/-/bootstrap-notify-3.1.3.tgz",
diff --git a/package.json b/package.json
index b33082861..822427354 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
         "bootstrap": "^3.4.1",
         "bootstrap-daterangepicker": "^2.1.27",
         "bootstrap-datetime-picker": "2.4.4",
+        "bootstrap-icons": "^1.13.1",
         "bootstrap-notify": "^3.1.3",
         "bootstrap-select": "^1.13.18",
         "bootstrap-table": "^1.23.5",
diff --git a/public/css/login.css b/public/css/login.css
index 551b45ec7..4e880ed07 100644
--- a/public/css/login.css
+++ b/public/css/login.css
@@ -61,10 +61,6 @@ img.logo {
     margin-top: 1rem; /* Space between multiple validation errors */
 }
 
-.bi {
-    height: 1em;
-}
-
 footer a:not(:hover) {
     text-decoration: none;
 }
diff --git a/public/css/ospos.css b/public/css/ospos.css
index b283b3a24..ed0bd5304 100644
--- a/public/css/ospos.css
+++ b/public/css/ospos.css
@@ -176,6 +176,10 @@ label.required {
     padding-left: 0;
 }
 
+.icon-spacing {
+    margin-right: .5em;
+}
+
 /* Recreate font-monospace class from Bootstrap 5 */
 .font-monospace {
     font-family: Menlo, Monaco, Consolas, "Courier New", monospace;