diff --git a/kdots/assets/styles/framework.css b/kdots/assets/styles/framework.css
index 008fa57197..86b885e64d 100644
--- a/kdots/assets/styles/framework.css
+++ b/kdots/assets/styles/framework.css
@@ -302,8 +302,21 @@ div.et2_nextmatch > div:not(:first-child) {
 }
 div.et2_nextmatch .egwGridView_outer {
   height: 100%;
+  border-collapse: collapse;
 }
-div.et2_nextmatch .egwGridView_outer thead tr th.optcol span.selectcols {
+div.et2_nextmatch .egwGridView_outer thead > tr {
+  background-color: var(--sl-color-neutral-50);
+  border-bottom: var(--sl-panel-border-width) solid var(--sl-color-neutral-200);
+}
+div.et2_nextmatch .egwGridView_outer thead > tr th {
+  border-right: var(--sl-panel-border-width) solid var(--sl-color-neutral-200);
+}
+div.et2_nextmatch .egwGridView_outer thead > tr th div.innerContainer {
+  max-height: 10em;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+div.et2_nextmatch .egwGridView_outer thead > tr th.optcol span.selectcols {
   height: 9px;
   padding: 4px 14px 0 2px;
   margin-top: 4px;
@@ -313,8 +326,17 @@ div.et2_nextmatch .egwGridView_outer thead tr th.optcol span.selectcols {
   display: inline-block;
   background-position: top;
 }
-.egwGridView_scrollarea {
+div.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea {
   overflow-x: hidden;
   overflow-y: auto;
 }
+div.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea table {
+  border-collapse: collapse;
+}
+div.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea table tr {
+  border-bottom: var(--sl-panel-border-width) solid var(--sl-color-neutral-200);
+}
+div.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea table tr.selected {
+  background-color: var(--highlight-background-color);
+}
 /*** END WIDGETS ***/
diff --git a/kdots/assets/styles/framework.less b/kdots/assets/styles/framework.less
index 92a02637c3..b5b7b3c54e 100644
--- a/kdots/assets/styles/framework.less
+++ b/kdots/assets/styles/framework.less
@@ -352,24 +352,50 @@ div.et2_nextmatch {
 
   .egwGridView_outer {
 	height: 100%;
+	border-collapse: collapse;
 
-	thead tr th.optcol span.selectcols {
-	  height: 9px;
-	  padding: 4px 14px 0 2px;
-	  margin-top: 4px;
-	  background-image: url(../../../api/templates/default/images/selectcols.svg);
-	  background-repeat: no-repeat;
-	  background-size: 10px 10px;
-	  display: inline-block;
-	  background-position: top;
+	thead > tr {
+	  background-color: var(--sl-color-neutral-50);
+	  border-bottom: var(--sl-panel-border-width) solid var(--sl-color-neutral-200);
+
+	  th {
+		border-right: var(--sl-panel-border-width) solid var(--sl-color-neutral-200);
+
+		div.innerContainer {
+		  max-height: 10em;
+		  overflow-x: hidden;
+		  overflow-y: auto;
+		}
+	  }
+
+	  th.optcol span.selectcols {
+		height: 9px;
+		padding: 4px 14px 0 2px;
+		margin-top: 4px;
+		background-image: url(../../../api/templates/default/images/selectcols.svg);
+		background-repeat: no-repeat;
+		background-size: 10px 10px;
+		display: inline-block;
+		background-position: top;
+	  }
+	}
+
+	.egwGridView_scrollarea {
+	  overflow-x: hidden;
+	  overflow-y: auto;
+	  table {
+		border-collapse: collapse;
+		tr {
+		  border-bottom: var(--sl-panel-border-width) solid var(--sl-color-neutral-200);
+		}
+		tr.selected {
+		  background-color: var(--highlight-background-color);
+		}
+	  }
 	}
   }
 }
 
 
-.egwGridView_scrollarea {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
 
 /*** END WIDGETS ***/
\ No newline at end of file