diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index 079e1f5a9e..48f4503eef 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -2053,6 +2053,9 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb {
 table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
   background: #555;
 }
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
+  border-left: 12px solid #B4B4B4;
+}
 /* import */
 /* tablets and smartphones  */
 @media all {
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index d0c9487529..2371bd4172 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -2041,3 +2041,6 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb {
 table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
   background: #555;
 }
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
+  border-left: 12px solid #B4B4B4;
+}
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 56f297f5d1..e6546b6805 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -1207,3 +1207,4 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb {
 table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
   background: #555;
 }
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid @gray_30;}
\ No newline at end of file
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 82c5938232..c1627b8233 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -523,6 +523,9 @@
   .et2_nextmatch {
     background-color: transparent;
   }
+  .et2_nextmatch .egwGridView_outer thead tr > th:first-child {
+    border-left: 6px solid #B4B4B4;
+  }
   .et2_nextmatch .nextmatch_header {
     padding: 0;
     border: none;
@@ -4313,13 +4316,10 @@ td.message span.message {
   margin-left: 0px;
   background-repeat: no-repeat;
   background-position: center;
-  background-image: url(../images/close_button.png);
-  background-size: 10px 10px;
+  background-image: url(../images/close.svg);
+  background-size: 6px 6px;
   position: absolute;
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tab_close_button :hover {
-  background-image: url(../images/close_button_hover.png);
-}
 #egw_fw_main .egw_fw_ui_tab_header_hover {
   background-color: #FFDD73;
 }
@@ -5463,14 +5463,10 @@ table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
   padding: 3px 1px 3px 4px;
-  border-color: #B4B4B4;
-  border-left: 1px solid white;
-  border-top: 0px solid transparent;
-  border-right: 1px solid white;
-  border-bottom: 0px solid transparent;
+  border: 1px solid #B4B4B4;
   vertical-align: middle;
   overflow: auto;
-  background: #e0e0e0;
+  background-color: #f0f0f0;
 }
 table.egwGridView_outer thead tr th:hover {
   background-color: #bfbfbf;
@@ -5501,9 +5497,10 @@ table.egwGridView_outer thead tr th.optcol {
   padding: 0;
   text-align: center;
   background-image: none;
+  border-right: none;
   /*width: 32px !important;*/
   vertical-align: bottom;
-  background-color: #ffffff;
+  background-color: #f0f0f0;
 }
 table.egwGridView_outer thead tr th.optcol:hover {
   cursor: pointer;
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 22dec6c9e4..a384b17787 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -512,6 +512,9 @@
   .et2_nextmatch {
     background-color: transparent;
   }
+  .et2_nextmatch .egwGridView_outer thead tr > th:first-child {
+    border-left: 6px solid #B4B4B4;
+  }
   .et2_nextmatch .nextmatch_header {
     padding: 0;
     border: none;
@@ -4302,13 +4305,10 @@ td.message span.message {
   margin-left: 0px;
   background-repeat: no-repeat;
   background-position: center;
-  background-image: url(../images/close_button.png);
-  background-size: 10px 10px;
+  background-image: url(../images/close.svg);
+  background-size: 6px 6px;
   position: absolute;
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tab_close_button :hover {
-  background-image: url(../images/close_button_hover.png);
-}
 #egw_fw_main .egw_fw_ui_tab_header_hover {
   background-color: #FFDD73;
 }
@@ -5452,14 +5452,10 @@ table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
   padding: 3px 1px 3px 4px;
-  border-color: #B4B4B4;
-  border-left: 1px solid white;
-  border-top: 0px solid transparent;
-  border-right: 1px solid white;
-  border-bottom: 0px solid transparent;
+  border: 1px solid #B4B4B4;
   vertical-align: middle;
   overflow: auto;
-  background: #e0e0e0;
+  background-color: #f0f0f0;
 }
 table.egwGridView_outer thead tr th:hover {
   background-color: #bfbfbf;
@@ -5490,9 +5486,10 @@ table.egwGridView_outer thead tr th.optcol {
   padding: 0;
   text-align: center;
   background-image: none;
+  border-right: none;
   /*width: 32px !important;*/
   vertical-align: bottom;
-  background-color: #ffffff;
+  background-color: #f0f0f0;
 }
 table.egwGridView_outer thead tr th.optcol:hover {
   cursor: pointer;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index b09e2a93a9..d0b9cc65b3 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -523,6 +523,9 @@
   .et2_nextmatch {
     background-color: transparent;
   }
+  .et2_nextmatch .egwGridView_outer thead tr > th:first-child {
+    border-left: 6px solid #B4B4B4;
+  }
   .et2_nextmatch .nextmatch_header {
     padding: 0;
     border: none;
@@ -4313,13 +4316,10 @@ td.message span.message {
   margin-left: 0px;
   background-repeat: no-repeat;
   background-position: center;
-  background-image: url(../images/close_button.png);
-  background-size: 10px 10px;
+  background-image: url(../images/close.svg);
+  background-size: 6px 6px;
   position: absolute;
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tab_close_button :hover {
-  background-image: url(../images/close_button_hover.png);
-}
 #egw_fw_main .egw_fw_ui_tab_header_hover {
   background-color: #FFDD73;
 }
@@ -5463,14 +5463,10 @@ table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
   padding: 3px 1px 3px 4px;
-  border-color: #B4B4B4;
-  border-left: 1px solid white;
-  border-top: 0px solid transparent;
-  border-right: 1px solid white;
-  border-bottom: 0px solid transparent;
+  border: 1px solid #B4B4B4;
   vertical-align: middle;
   overflow: auto;
-  background: #e0e0e0;
+  background-color: #f0f0f0;
 }
 table.egwGridView_outer thead tr th:hover {
   background-color: #bfbfbf;
@@ -5501,9 +5497,10 @@ table.egwGridView_outer thead tr th.optcol {
   padding: 0;
   text-align: center;
   background-image: none;
+  border-right: none;
   /*width: 32px !important;*/
   vertical-align: bottom;
-  background-color: #ffffff;
+  background-color: #f0f0f0;
 }
 table.egwGridView_outer thead tr th.optcol:hover {
   cursor: pointer;
diff --git a/pixelegg/images/close.svg b/pixelegg/images/close.svg
new file mode 100644
index 0000000000..de159124fa
--- /dev/null
+++ b/pixelegg/images/close.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="#696969" d="M0.795,0.186h7.527L16.27,11.33l8.045-11.144h7.17l-11.757,15.43l12.181,16.229h-7.433L15.882,19.96
+		L7.545,31.844H0.18L12.36,15.615L0.795,0.186z"/>
+</g>
+</svg>
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 1decae6651..b53784e5f8 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -478,6 +478,11 @@ div.header_row_right{
 // AREA AROUND CONTENT
 .et2_nextmatch {
     background-color: transparent;
+	.egwGridView_outer {
+		thead tr > th:first-child {
+			border-left: 6px solid @gray_30;
+		}
+	}
 }
 
 // complete nextmatch....Background color!
diff --git a/pixelegg/less/layout_raster_main.less b/pixelegg/less/layout_raster_main.less
index 60d20e542f..0dd800d6ea 100644
--- a/pixelegg/less/layout_raster_main.less
+++ b/pixelegg/less/layout_raster_main.less
@@ -196,19 +196,14 @@
         .egw_fw_ui_tab_close_button {
             right: 3px;
             top: 1px;
-
             display: inline-block;
             .dimension_width_height_xs;
             margin-left: 0px;
             background-repeat: no-repeat;
             background-position: center;
-            background-image: url(../images/close_button.png);
-            background-size: 10px 10px;
+            background-image: url(../images/close.svg);
+            background-size: 6px 6px;
             position: absolute;
-
-            :hover {
-                background-image: url(../images/close_button_hover.png);
-            }
         }
         // Ende Tabs
     }
diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less
index 414da04ffc..ca5f963bed 100755
--- a/pixelegg/less/layout_table.less
+++ b/pixelegg/less/layout_table.less
@@ -77,14 +77,10 @@ table.egwGridView_outer{
                 background-position: -200px;
                 font-weight: normal;
                 padding: 3px 1px 3px 4px;
-                border-color: @gray_30;
-                border-left: 1px solid white;
-                border-top: 0px solid transparent;
-                border-right: 1px solid white;
-                border-bottom: 0px solid transparent;
+                border: 1px solid @gray_30;
                 vertical-align: middle;
                 overflow: auto;
-				background: rgb(224, 224, 224);
+				.background_color_10_gray;
                 &:hover {
                     .background_color_25_gray;
                     .color_0_gray;
@@ -114,9 +110,10 @@ table.egwGridView_outer{
                 padding: 0;
                 text-align: center;
                 background-image: none;
+				border-right: none;
                 /*width: 32px !important;*/
 				vertical-align: bottom;
-				.background_color_0_gray;
+				.background_color_10_gray;
                 &:hover{
                     cursor: pointer;
                 }
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 63dcddf3ae..ab1db29f8b 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -534,6 +534,9 @@
   .et2_nextmatch {
     background-color: transparent;
   }
+  .et2_nextmatch .egwGridView_outer thead tr > th:first-child {
+    border-left: 6px solid #B4B4B4;
+  }
   .et2_nextmatch .nextmatch_header {
     padding: 0;
     border: none;
@@ -4324,13 +4327,10 @@ td.message span.message {
   margin-left: 0px;
   background-repeat: no-repeat;
   background-position: center;
-  background-image: url(../images/close_button.png);
-  background-size: 10px 10px;
+  background-image: url(../images/close.svg);
+  background-size: 6px 6px;
   position: absolute;
 }
-#egw_fw_main #egw_fw_tabs .egw_fw_ui_tab_close_button :hover {
-  background-image: url(../images/close_button_hover.png);
-}
 #egw_fw_main .egw_fw_ui_tab_header_hover {
   background-color: #FFDD73;
 }
@@ -5474,14 +5474,10 @@ table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
   padding: 3px 1px 3px 4px;
-  border-color: #B4B4B4;
-  border-left: 1px solid white;
-  border-top: 0px solid transparent;
-  border-right: 1px solid white;
-  border-bottom: 0px solid transparent;
+  border: 1px solid #B4B4B4;
   vertical-align: middle;
   overflow: auto;
-  background: #e0e0e0;
+  background-color: #f0f0f0;
 }
 table.egwGridView_outer thead tr th:hover {
   background-color: #bfbfbf;
@@ -5512,9 +5508,10 @@ table.egwGridView_outer thead tr th.optcol {
   padding: 0;
   text-align: center;
   background-image: none;
+  border-right: none;
   /*width: 32px !important;*/
   vertical-align: bottom;
-  background-color: #ffffff;
+  background-color: #f0f0f0;
 }
 table.egwGridView_outer thead tr th.optcol:hover {
   cursor: pointer;