diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index 9964a9784d..a45a413098 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -119,3 +119,4 @@ select#addressbook-index_col_filter\[tid\] {
 	float: right;
 	width: 134px;
 }
+#addressbook-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid transparent;}
\ No newline at end of file
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index 6e2f048724..d08fc85bcc 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -134,6 +134,9 @@ select#addressbook-index_col_filter\[tid\] {
   float: right;
   width: 134px;
 }
+#addressbook-index_nm.et2_nextmatch .egwGridView_outer thead tr {
+  border-left: 12px solid transparent;
+}
 @media all {
   /* #############################################################################
 
diff --git a/admin/templates/default/acl.xet b/admin/templates/default/acl.xet
index b11064e7df..c0449dce4c 100644
--- a/admin/templates/default/acl.xet
+++ b/admin/templates/default/acl.xet
@@ -65,9 +65,6 @@
 				<column width="100%"/>
 			</columns>
 			<rows>
-				<row class="dialogHeader">
-					<description value="Access control" class=""/>
-				</row>
 				<row>
 					<nextmatch id="nm" template="admin.acl.rows" header_left="admin.acl.add" height="400"/>
 				</row>
diff --git a/admin/templates/default/app.css b/admin/templates/default/app.css
index 7146915be4..6da1b94948 100644
--- a/admin/templates/default/app.css
+++ b/admin/templates/default/app.css
@@ -168,3 +168,4 @@ select#admin-mailaccount_ident_id {
 	font-weight: bold;
 	font-size: 110%;
 }
+#admin-acl {width:99%;}
diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css
index 0334e31f0a..1f0e3d2748 100755
--- a/admin/templates/pixelegg/app.css
+++ b/admin/templates/pixelegg/app.css
@@ -18,7 +18,7 @@
  * @package etemplate
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @version $Id: app.css 55790 2016-04-20 18:52:55Z ralfbecker $
+ * @version $Id: app.css 55801 2016-04-21 16:39:59Z ralfbecker $
  */
 .admin_tree table,
 .admin_tree tr,
@@ -174,6 +174,9 @@ select#admin-mailaccount_ident_id {
   font-weight: bold;
   font-size: 110%;
 }
+#admin-acl {
+  width: 99%;
+}
 @media all {
   div.dhtmlxTree td.standartTreeRow span.selectedTreeRow {
     background-color: #ffdd73;
diff --git a/api/js/etemplate/et2_dataview.js b/api/js/etemplate/et2_dataview.js
index 2cb7e9150e..8ec3364617 100644
--- a/api/js/etemplate/et2_dataview.js
+++ b/api/js/etemplate/et2_dataview.js
@@ -163,6 +163,9 @@ var et2_dataview = (function(){ "use strict"; return Class.extend({
 		{
 			this.width = _w;
 
+			// Take grid header border's width into account. eg. category colors may add extra pixel into width
+			_w = _w - (this.thead.find('tr').outerWidth() - this.thead.find('tr').innerWidth());
+
 			// Rebuild the column stylesheets
 			this.columnMgr.setTotalWidth(_w - this.scrollbarWidth);
 			this._updateColumns();
diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css
index 1aec50a703..d3354f2831 100644
--- a/infolog/templates/default/app.css
+++ b/infolog/templates/default/app.css
@@ -95,4 +95,6 @@ div#infolog-edit_infolog-edit-description {
 #infolog-index select#infolog-index_filter {
 	width: 150px;
 }
-#infolog_edit_info_responsible_chzn { width:99% !important;}
\ No newline at end of file
+#infolog_edit_info_responsible_chzn { width:99% !important;}
+
+#infolog-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid transparent;}
\ No newline at end of file
diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css
index 5b4dde4798..a55499e60e 100755
--- a/infolog/templates/pixelegg/app.css
+++ b/infolog/templates/pixelegg/app.css
@@ -163,6 +163,9 @@ div#infolog-edit_infolog-edit-description {
 #infolog_edit_info_responsible_chzn {
   width: 99% !important;
 }
+#infolog-index_nm.et2_nextmatch .egwGridView_outer thead tr {
+  border-left: 12px solid transparent;
+}
 /*###########################################
 #                                           #
 #       dialogHeader                       #
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 4149f9eae8..1c9b35b78a 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -877,4 +877,6 @@ div.mailComposeHeaderSection>table {
 	font-size: 12pt;
 	vertical-align: middle;
 }
-.sieve-title .ruleID::before {content:'#'}
\ No newline at end of file
+.sieve-title .ruleID::before {content:'#'}
+
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid transparent;}
\ No newline at end of file
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index 27e3773e39..d908978055 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -862,6 +862,9 @@ div.mailComposeHeaderSection > table {
 .sieve-title .ruleID::before {
   content: '#';
 }
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
+  border-left: 12px solid transparent;
+}
 #popupMainDiv {
   padding: 5px;
 }
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 3cac7682ad..ec9cbdc0b1 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -850,6 +850,9 @@ div.mailComposeHeaderSection > table {
 .sieve-title .ruleID::before {
   content: '#';
 }
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
+  border-left: 12px solid transparent;
+}
 #popupMainDiv {
   padding: 5px;
 }
diff --git a/timesheet/templates/default/app.css b/timesheet/templates/default/app.css
index d03a379b15..2a9c86e41f 100644
--- a/timesheet/templates/default/app.css
+++ b/timesheet/templates/default/app.css
@@ -24,4 +24,6 @@
 {
 	display: inline-block;
 	float: left;
-}
\ No newline at end of file
+}
+
+#timesheet-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid transparent;}
\ No newline at end of file
diff --git a/timesheet/templates/pixelegg/app.css b/timesheet/templates/pixelegg/app.css
index 6b3513df1c..dfb5bfb7f5 100755
--- a/timesheet/templates/pixelegg/app.css
+++ b/timesheet/templates/pixelegg/app.css
@@ -33,6 +33,9 @@
   display: inline-block;
   float: left;
 }
+#timesheet-index_nm.et2_nextmatch .egwGridView_outer thead tr {
+  border-left: 12px solid transparent;
+}
 /*###########################################
 #                                           #
 #       dialogHeader                       #