diff --git a/guest/guest_view_invoice.php b/guest/guest_view_invoice.php
index 175cef38..32b69411 100644
--- a/guest/guest_view_invoice.php
+++ b/guest/guest_view_invoice.php
@@ -238,7 +238,7 @@ if ($balance > 0) {
             <div class="col-md-12">
                 <div class="card">
                     <div class="table-responsive">
-                        <table class="table table-borderless">
+                        <table class="table table-hover mb-0">
                             <thead class="bg-light">
                             <tr>
                                 <th>Item</th>
@@ -297,7 +297,7 @@ if ($balance > 0) {
                 <?php } ?>
             </div>
             <div class="col-sm-3 offset-sm-2">
-                <table class="table table-borderless">
+                <table class="table table-hover mb-0">
                     <tbody>
                     <tr>
                         <td>Subtotal:</td>
@@ -331,7 +331,7 @@ if ($balance > 0) {
                     <?php
                     } 
                     ?>
-                    <tr class="border-top h5 text-bold">
+                    <tr class="h5 text-bold">
                         <td>Balance:</td>
                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $invoice_currency_code); ?></td>
                     </tr>
diff --git a/guest/guest_view_quote.php b/guest/guest_view_quote.php
index 19eb9f3c..90c7c044 100644
--- a/guest/guest_view_quote.php
+++ b/guest/guest_view_quote.php
@@ -186,7 +186,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
             <div class="col-md-12">
                 <div class="card">
                     <div class="table-responsive">
-                        <table class="table table-borderless">
+                        <table class="table table-hover mb-0">
                             <thead class="bg-light">
                             <tr>
                                 <th>Item</th>
@@ -249,7 +249,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
             </div>
 
             <div class="col-sm-3 offset-sm-2">
-                <table class="table table-borderless">
+                <table class="table table-hover mb-0">
                     <tbody>
                     <tr>
                         <td>Subtotal:</td>
diff --git a/invoice.php b/invoice.php
index f0f9ff6b..df211cd6 100644
--- a/invoice.php
+++ b/invoice.php
@@ -403,7 +403,7 @@ if (isset($_GET['invoice_id'])) {
                 <div class="col-md-12">
                     <div class="card">
                         <div class="table-responsive">
-                            <table class="table table-borderless" id="items">
+                            <table class="table table-hover mb-0" id="items">
                                 <thead class="bg-light">
                                 <tr>
                                     <th class="d-print-none"></th>
@@ -536,7 +536,7 @@ if (isset($_GET['invoice_id'])) {
                     </div>
                 </div>
                 <div class="col-sm-3 offset-sm-2">
-                    <table class="table table-borderless">
+                    <table class="table table-hover mb-0">
                         <tbody>
 
                         <tr>
@@ -581,7 +581,7 @@ if (isset($_GET['invoice_id'])) {
                             </tr>
                         <?php } ?>
 
-                        <tr class="h5 text-bold border-top">
+                        <tr class="h5 text-bold">
                             <td>Balance:</td>
                             <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $invoice_currency_code); ?></td>
                         </tr>
diff --git a/quote.php b/quote.php
index b0d3797e..72fe8ff8 100644
--- a/quote.php
+++ b/quote.php
@@ -305,7 +305,7 @@ if (isset($_GET['quote_id'])) {
                 <div class="col-md-12">
                     <div class="card">
                         <div class="table-responsive">
-                            <table class="table table-borderless" id="items">
+                            <table class="table table-hover mb-0" id="items">
                                 <thead class="bg-light">
                                     <tr>
                                         <th class="d-print-none"></th>
@@ -457,7 +457,8 @@ if (isset($_GET['quote_id'])) {
                 </div>
 
                 <div class="col-sm-3 offset-sm-2">
-                    <table class="table table-borderless">
+                    
+                    <table class="table table-hover mb-0">
                         <tbody>
                             <tr>
                                 <td>Subtotal:</td>
@@ -475,12 +476,13 @@ if (isset($_GET['quote_id'])) {
                                     <td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $quote_currency_code); ?></td>
                                 </tr>
                             <?php } ?>
-                            <tr class="h5 text-bold border-top">
+                            <tr class="h5 text-bold">
                                 <td>Total:</td>
                                 <td class="text-right"><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
                             </tr>
                         </tbody>
                     </table>
+                    
                 </div>
             </div>
 
diff --git a/recurring_invoice.php b/recurring_invoice.php
index a308e9f7..4084e0d7 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -272,7 +272,7 @@ if (isset($_GET['recurring_invoice_id'])) {
                 <div class="col-md-12">
                     <div class="card">
                         <div class="table-responsive">
-                            <table class="table table-borderless" id="items">
+                            <table class="table table-hover mb-0" id="items">
                                 <thead class="bg-light">
                                     <tr>
                                         <th class="d-print-none"></th>
@@ -414,7 +414,7 @@ if (isset($_GET['recurring_invoice_id'])) {
                     </div>
                 </div>
                 <div class="col-sm-3 offset-sm-2">
-                    <table class="table table-borderless">
+                    <table class="table table-hover mb-0">
                         <tbody>
                             <tr>
                                 <td>Subtotal</td>
@@ -432,7 +432,7 @@ if (isset($_GET['recurring_invoice_id'])) {
                                     <td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $recurring_invoice_currency_code); ?></td>
                                 </tr>
                             <?php } ?>
-                            <tr class="border-top h5 text-bold">
+                            <tr class="h5 text-bold">
                                 <td>Total</td>
                                 <td class="text-right"><?php echo numfmt_format_currency($currency_format, $recurring_invoice_amount, $recurring_invoice_currency_code); ?></td>
                             </tr>