diff --git a/app/assets/css/bootstrap-override.css b/app/assets/css/bootstrap-override.css
index 5b055b718..98858edbf 100644
--- a/app/assets/css/bootstrap-override.css
+++ b/app/assets/css/bootstrap-override.css
@@ -153,78 +153,6 @@ input:checked + .slider:before {
   display: none;
 }
 
-/* Datatable */
-
-.datatable .searchBar {
-  border: 1px solid var(--border-searchbar);
-  padding: 5px;
-  background: var(--bg-searchbar) !important;
-  border-radius: 5px;
-}
-
-.datatable .searchBar input[type='text'] {
-  border: 0px !important;
-}
-
-.datatable .toolBar {
-  border-radius: 8px;
-}
-
-.datatable .footer {
-  border-bottom-left-radius: 8px;
-  border-bottom-right-radius: 8px;
-  padding-bottom: 10px;
-}
-
-.datatable .toolBar {
-  padding-top: 20px !important;
-  padding-bottom: 20px !important;
-}
-
-.toolBar {
-  display: flex;
-  flex-direction: row;
-  gap: 5px;
-}
-
-.toolBar > .toolBarTitle {
-  flex: auto;
-  display: inline-flex;
-  flex-wrap: nowarp;
-}
-
-.toolBar .searchBar {
-  flex: right;
-  margin-right: 10px;
-  width: 500px;
-  height: 30px;
-  display: inline-flex;
-}
-
-.datatable .searchBar {
-  padding: 4px 10px !important;
-  font-size: 14px;
-}
-
-.toolBar > .actionBar {
-  margin-right: 10px;
-  display: inline-flex;
-}
-
-.datatable .actionBar {
-  padding: 0px !important;
-}
-
-.toolBar > .settings {
-  width: 60px;
-  text-align: right;
-  display: inline-flex;
-}
-
-.datatable .toolBar .settings {
-  margin-right: 5px !important;
-}
-
 /* Widget */
 
 .widget .widget-icon i {
diff --git a/app/portainer/components/datatables/datatable.css b/app/portainer/components/datatables/datatable.css
index 9a417025d..47c5866f6 100644
--- a/app/portainer/components/datatables/datatable.css
+++ b/app/portainer/components/datatables/datatable.css
@@ -1,24 +1,32 @@
 .datatable .toolBar {
   background-color: var(--bg-card-color);
   overflow: auto;
-  padding: 10px;
+  padding: 20px 10px;
   font-size: 16px;
+  border-radius: 8px;
+
+  display: flex;
+  gap: 5px;
 }
 
 .datatable .actionBar {
-  padding: 10px;
+  padding: 0;
 }
 
 .datatable .toolBar .toolBarTitle {
+  @apply items-center gap-1;
   float: left;
-  margin: 5px 0 0 10px;
   color: var(--text-widget-header-color);
   font-weight: 500;
+
+  flex: auto;
+  display: inline-flex;
+  flex-wrap: nowrap;
 }
 
 .datatable .toolBar .settings {
   float: right;
-  margin: 5px 10px 0 0;
+  margin-right: 5px;
 }
 
 .datatable .toolBar .setting {
@@ -30,10 +38,24 @@
   @apply text-blue-7;
 }
 
+.toolBar .actionBar {
+  margin-right: 10px;
+  display: inline-flex;
+}
+
+.toolBar .settings {
+  width: 60px;
+  text-align: right;
+  display: inline-flex;
+}
+
 .datatable .searchBar {
-  border: 1px solid var(--border-color);
-  padding: 8px;
-  background: var(--bg-main-color);
+  border: 1px solid var(--border-searchbar);
+  padding: 5px;
+  background: var(--bg-searchbar) !important;
+  border-radius: 5px;
+  padding: 4px 10px !important;
+  font-size: 14px;
 }
 
 .datatable .searchInput {
@@ -42,6 +64,18 @@
   width: 90%;
 }
 
+.toolBar .searchBar {
+  flex: right;
+  margin-right: 10px;
+  width: 500px;
+  height: 30px;
+  display: inline-flex;
+}
+
+.datatable .searchBar input[type='text'] {
+  border: 0px !important;
+}
+
 .datatable .searchIcon {
   color: #767676;
   margin-right: 5px;
@@ -65,6 +99,10 @@
   color: var(--text-main-color);
   overflow: auto;
   border-top: 1px solid var(--border-datatable-top-color);
+
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+  padding-bottom: 10px;
 }
 
 .datatable .footer .infoBar {