diff --git a/frontend/less/espo/bootstrap/tables.less b/frontend/less/espo/bootstrap/tables.less
index a223a2fa8d..618fb1c88d 100644
--- a/frontend/less/espo/bootstrap/tables.less
+++ b/frontend/less/espo/bootstrap/tables.less
@@ -1,11 +1,5 @@
-//
 // Tables
-// --------------------------------------------------
 
-
-table {
-  //background-color: @table-bg;
-}
 caption {
   padding-top: var(--table-cell-padding);
   padding-bottom: var(--table-cell-padding);
@@ -16,9 +10,6 @@ th {
   text-align: left;
 }
 
-
-// Baseline styles
-
 .table {
   width: 100%;
   max-width: 100%;
@@ -33,14 +24,14 @@ th {
         padding: var(--table-cell-padding);
         line-height: var(--line-height-base);
         vertical-align: top;
-        border-top: 1px solid @table-border-color;
+        border-top: var(--1px) solid @table-border-color;
       }
     }
   }
   // Bottom align for column headings
   > thead > tr > th {
     vertical-align: bottom;
-    border-bottom: 2px solid @table-border-color;
+    border-bottom: var(--2px) solid @table-border-color;
   }
   // Remove top border from thead by default
   > caption + thead,
@@ -55,7 +46,7 @@ th {
   }
   // Account for multiple tbody instances
   > tbody + tbody {
-    border-top: 2px solid @table-border-color;
+    border-top: var(--2px) solid @table-border-color;
   }
 
   // Nesting
@@ -64,53 +55,40 @@ th {
   }
 }
 
-// Bordered version
-//
-// Add borders all around the table and between all the columns.
 
 .table-bordered {
-  border: 1px solid @table-border-color;
+  border: var(--1px) solid @table-border-color;
   > thead,
   > tbody,
   > tfoot {
     > tr {
       > th,
       > td {
-        border: 1px solid @table-border-color;
+        border:  var(--1px) solid @table-border-color;
       }
     }
   }
   > thead > tr {
     > th,
     > td {
-      border-bottom-width: 2px;
+      border-bottom-width:  var(--2px);
     }
   }
 }
 
 
-// Zebra-striping
-//
-// Default zebra-stripe styles (alternating gray and transparent backgrounds)
-
 .table-striped {
   > tbody > tr:nth-of-type(odd) {
-    background-color: @table-bg-accent;
+    background-color: var(--table-bg-accent);
   }
 }
 
-
-// Hover effect
-//
-// Placed here since it has to come after the potential zebra striping
-
 .table-hover {
   > tbody > tr:hover {
     background-color: @table-bg-hover;
   }
 }
 
-
 // Table cell sizing
 //
 // Reset default table behavior
@@ -137,9 +115,7 @@ table {
 // Exact selectors below required to override `.table-striped` and prevent
 // inheritance to nested tables.
 
-// Generate the contextual variants
 .table-row-variant-espo(active; @table-bg-active; @table-bg-active-5);
-
 .table-row-variant-espo(success; @state-success-bg; @state-success-bg-5);
 .table-row-variant-espo(info; @state-info-bg; @state-info-bg-5);
 .table-row-variant-espo(warning; @state-warning-bg; var(--state-warning-bg-5));
@@ -161,7 +137,7 @@ table {
     margin-bottom: calc(var(--line-height-computed) * 0.75);
     overflow-y: hidden;
     -ms-overflow-style: -ms-autohiding-scrollbar;
-    border: 1px solid @table-border-color;
+    border:  var(--1px) solid @table-border-color;
 
     // Tighten up spacing
     > .table {
diff --git a/frontend/less/espo/bootstrap/variables.less b/frontend/less/espo/bootstrap/variables.less
index 553fe8ca6e..b41f804cbe 100644
--- a/frontend/less/espo/bootstrap/variables.less
+++ b/frontend/less/espo/bootstrap/variables.less
@@ -24,35 +24,13 @@
 //** Carets increase slightly in size for larger components.
 @caret-width-large: var(--5px);
 
-
-//== Tables
-//
-//## Customizes the `.table` component with basic values, each used across all table variations.
-
-//** Default background color used for all tables.
-@table-bg:                      transparent;
-//** Background color used for `.table-striped`.
-@table-bg-accent:               #f9f9f9;
-//** Background color used for `.table-hover`.
-@table-bg-hover:                #f5f5f5;
-@table-bg-active:               @table-bg-hover;
-
-//** Border color for table and cell borders.
-@table-border-color:            #ddd;
-
-
 @btn-link-disabled-color: @gray-light;
 
 @input-color-placeholder: var(--gray-light);
 
 @legend-color:  @gray-dark;
-@legend-border-color:  #e5e5e5;
 
-//** Background color for textual input addons
-@input-group-addon-bg:           @gray-lighter;
-
-//** Disabled cursor for form controls and buttons.
-@cursor-disabled:                not-allowed;
+@cursor-disabled:  not-allowed;
 
 
 //-- Z-index master list
diff --git a/frontend/less/espo/elements/table.less b/frontend/less/espo/elements/table.less
index c712d947b9..1a49ab7b4a 100644
--- a/frontend/less/espo/elements/table.less
+++ b/frontend/less/espo/elements/table.less
@@ -78,11 +78,11 @@ th {
 }
 
 .table tr.accented {
-    background-color: @table-bg-accent;
+    background-color: var(--table-bg-accent);
 }
 
 .table td.accented {
-    background-color: @table-bg-accent;
+    background-color: var(--table-bg-accent);
 }
 
 table.table-bordered-inside {
diff --git a/frontend/less/espo/variables.less b/frontend/less/espo/variables.less
index 2fad00abb3..4ff702844c 100644
--- a/frontend/less/espo/variables.less
+++ b/frontend/less/espo/variables.less
@@ -43,6 +43,7 @@
 @table-bg: var(--table-bg);
 
 @table-bg-hover: @default-heading-bg-color;
+@table-bg-active: @table-bg-hover;
 @table-bg-active-5: var(--main-gray-5);
 
 @list-group-active-text-color: var(--main-gray-lighten-40);
@@ -97,8 +98,6 @@
 
 @panel-primary-border: var(--panel-primary-border);
 
-@table-bg-accent: var(--table-bg-accent);
-
 @navbar-inverse-color: var(--navbar-inverse-color);
 @navbar-inverse-bg: var(--navbar-inverse-bg);
 @navbar-inverse-link-active-bg: var(--navbar-inverse-link-active-bg);