diff --git a/BTCPayServer/Views/Invoice/Invoice.cshtml b/BTCPayServer/Views/Invoice/Invoice.cshtml
index 831cbf37a..2863e84ef 100644
--- a/BTCPayServer/Views/Invoice/Invoice.cshtml
+++ b/BTCPayServer/Views/Invoice/Invoice.cshtml
@@ -35,7 +35,7 @@
         <div class="row">
             <div class="col-md-6">
                 <h3>Information</h3>
-                <table class="table table-sm table-responsive-md">
+                <table class="table table-sm table-responsive-md removetopborder">
                     <tr>
                         <th>Store</th>
                         <td><a href="@Model.StoreLink">@Model.StoreName</a></td>
@@ -93,7 +93,7 @@
 
             <div class="col-md-6">
                 <h3>Buyer information</h3>
-                <table class="table table-sm table-responsive-md">
+                <table class="table table-sm table-responsive-md removetopborder">
                     <tr>
                         <th>Name</th>
                         <td>@Model.BuyerInformation.BuyerName</td>
@@ -134,7 +134,7 @@
                 @if (Model.PosData.Count == 0)
                 {
                     <h3>Product information</h3>
-                    <table class="table table-sm table-responsive-md">
+                    <table class="table table-sm table-responsive-md removetopborder">
                         <tr>
                             <th>Item code</th>
                             <td>@Model.ProductInformation.ItemCode</td>
@@ -161,7 +161,7 @@
             <div class="row">
                 <div class="col-md-6">
                     <h3>Product information</h3>
-                    <table class="table table-sm table-responsive-md">
+                    <table class="table table-sm table-responsive-md removetopborder">
                         <tr>
                             <th>Item code</th>
                             <td>@Model.ProductInformation.ItemCode</td>
diff --git a/BTCPayServer/Views/Server/Rates.cshtml b/BTCPayServer/Views/Server/Rates.cshtml
index 1dcf9bea6..21fe1d3a2 100644
--- a/BTCPayServer/Views/Server/Rates.cshtml
+++ b/BTCPayServer/Views/Server/Rates.cshtml
@@ -37,7 +37,7 @@
             @if(Model.RateLimits != null)
             {
                 <h5>Current Bitcoin Average Quotas:</h5>
-                <table class="table table-sm">
+                <table class="table table-sm removetopborder">
                     <tr>
                         <th>Quota period</th>
                         <td>@Model.RateLimits.TotalPeriod.TimeString()</td>
diff --git a/BTCPayServer/wwwroot/main/css/site.css b/BTCPayServer/wwwroot/main/css/site.css
index 3a1b9d86a..623edccca 100644
--- a/BTCPayServer/wwwroot/main/css/site.css
+++ b/BTCPayServer/wwwroot/main/css/site.css
@@ -16,7 +16,7 @@
 }
 
 
-.only-for-js, .input-group-clear{
+.only-for-js, .input-group-clear {
     display: none;
 }
 
@@ -27,6 +27,59 @@
     border-radius: 4px;
 }
 
+.table {
+    background: #fff;
+    border: 1px solid #DFE3E8;
+    border-radius: 4px;
+    border-collapse: separate !important;
+    border-spacing: 0px !important;
+    margin-top: 16px;
+    margin-bottom: 16px;
+}
+
+.table thead > tr {
+    height: 36px;
+}
+
+.table thead th {
+    border-bottom: none;
+    border-top: none;
+    vertical-align: middle;
+    padding: 4px 12px 4px 12px;
+}
+
+.table tbody tr:hover {
+    background-color: #f8fafc;
+}
+
+.table tr {
+    height: 36px;
+}
+
+    .table th {
+        display: table-cell;
+        padding: 4px 12px 4px 12px;
+        vertical-align: middle;
+    }
+
+    .table td {
+        display: table-cell;
+        padding: 4px 12px 4px 12px;
+        text-align: left;
+        color: #12161B;
+        font-size: 0.8125rem;
+        font-weight: 400;
+        vertical-align: middle;
+    }
+
+.removetopborder tr:first-child td {
+    border-top: none;
+}
+
+.removetopborder tr:first-child th {
+    border-top: none;
+}
+
 a.nav-link {
     color: #66788A;
 }