diff --git a/addressbook/templates/default/admin.types.xet b/addressbook/templates/default/admin.types.xet
index f388417491..8e983f7758 100644
--- a/addressbook/templates/default/admin.types.xet
+++ b/addressbook/templates/default/admin.types.xet
@@ -3,10 +3,7 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="addressbook.admin.types" template="" lang="" group="0" version="">
-		<vbox>
-			<template id="admin.customfields.types" content="content_types"/>
-			<button label="Save" id="save"/>
-		</vbox>
+		<template id="admin.customfields.types" content="content_types"/>
 		<styles>.header{
 font-weight: bold;
 }</styles>
diff --git a/admin/inc/class.admin_ui.inc.php b/admin/inc/class.admin_ui.inc.php
index 34c4e2c423..1ccc58b3ae 100644
--- a/admin/inc/class.admin_ui.inc.php
+++ b/admin/inc/class.admin_ui.inc.php
@@ -48,7 +48,6 @@ class admin_ui
 			'get_rows' => 'admin_ui::get_users',
 			'no_cat' => true,
 			'no_filter2' => true,
-			'filter_label' => 'Group',
 			'filter_no_lang' => true,
 			'lettersearch' => true,
 			'order' => 'account_lid',
@@ -59,7 +58,7 @@ class admin_ui
 		);
 		//$content['msg'] = 'Hi Ralf ;-)';
 		$sel_options['tree'] = $this->tree_data();
-		$sel_options['filter'] = array('' => lang('All'));
+		$sel_options['filter'] = array('' => lang('All groups'));
 		foreach(self::$accounts->search(array(
 			'type' => 'groups',
 			'start' => false,
diff --git a/admin/lang/egw_de.lang b/admin/lang/egw_de.lang
index 6894637bed..af3be0e26e 100644
--- a/admin/lang/egw_de.lang
+++ b/admin/lang/egw_de.lang
@@ -81,6 +81,7 @@ after how many unsuccessful attempts to login, an ip should be blocked (default
 aliases	admin	de	E-Mail-Alias
 all applications	admin	de	Alle Anwendungen
 all categories	admin	de	Alle Kategorien
+all groups	admin	de	Alle Gruppen
 all records and account information will be lost!	admin	de	Alle Datensätze und Kontoinformationen sind dann verloren!
 all users	admin	de	Alle Benutzer
 allow anonymous access to this app	admin	de	Anonymen Zugriff auf diese Anwendung zulassen
diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang
index 89c3b5330a..5e0ed3e587 100644
--- a/admin/lang/egw_en.lang
+++ b/admin/lang/egw_en.lang
@@ -81,6 +81,7 @@ after how many unsuccessful attempts to login, an ip should be blocked (default
 aliases	admin	en	Aliases
 all applications	admin	en	All applications
 all categories	admin	en	All categories
+all groups	admin	en	All groups
 all records and account information will be lost!	admin	en	All records and account information will be lost!
 all users	admin	en	All users
 allow anonymous access to this app	admin	en	Allow anonymous access to this app
diff --git a/admin/templates/default/categories.index.xet b/admin/templates/default/categories.index.xet
index 12c387d8eb..54691250e1 100644
--- a/admin/templates/default/categories.index.xet
+++ b/admin/templates/default/categories.index.xet
@@ -2,11 +2,6 @@
 <!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="admin.categories.index.right" template="" lang="" group="0" version="1.9.001">
-		<hbox>
-			<buttononly align="right" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;"/>
-		</hbox>
-	</template>
 	<template id="admin.categories.index.rows" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%">
 			<columns>
@@ -60,18 +55,11 @@
 			</rows>
 		</grid>
 	</template>
+	<template id="admin.categories.index.add" template="" lang="" group="0" version="1.9.001">
+		<buttononly lable="Add" id="add" onclick="window.open('$cont[add_link]','_blank','dependent=yes,width=600,height=380,scrollbars=yes,status=yes'); return false;"/>
+	</template>
 	<template id="admin.categories.index" template="" lang="" group="0" version="1.9.001">
-		<grid width="100%">
-			<columns>
-				<column/>
-				<column disabled="!@nm[selectcols]=/legacy_actions/"/>
-			</columns>
-			<rows>
-				<row>
-					<nextmatch id="nm" options="admin.categories.index.rows" span="all" header_row="admin.categories.index.right"/>
-				</row>
-			</rows>
-		</grid>
+		<nextmatch id="nm" options="admin.categories.index.rows" span="all" header_left="admin.categories.index.add"/>
 		<box class="action_popup prompt" id="owner_popup">
 			<vbox>
 				<description value="Change owner" class="promptheader"/>
diff --git a/admin/templates/default/customfields.xet b/admin/templates/default/customfields.xet
index 2aee128671..b9bcf66320 100644
--- a/admin/templates/default/customfields.xet
+++ b/admin/templates/default/customfields.xet
@@ -26,9 +26,6 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="admin.customfields.header_add" template="" lang="" group="0" version="1.9.001">
-		<buttononly label="Add" id="add" onclick="egw.open_link('admin.customfields.edit&amp;appname='+widget.getArrayMgr('content').getRoot().getEntry('nm[appname]')+'&amp;use_private='+widget.getArrayMgr('content').getRoot().getEntry('use_private'),false,'450x380');"/>
-	</template>
 	<template id="admin.customfields.fields" template="" lang="" group="0" version="1.9.001">
 		<grid readonly="true">
 			<columns>
@@ -85,19 +82,11 @@
 			</rows>
 		</grid>
 	</template>
+	<template id="admin.customfields.add" template="" lang="" group="0" version="1.9.001">
+		<buttononly label="Add" id="add" onclick="egw.open_link('admin.customfields.edit&amp;appname='+widget.getArrayMgr('content').getRoot().getEntry('nm[appname]')+'&amp;use_private='+widget.getArrayMgr('content').getRoot().getEntry('use_private'),false,'450x380');"/>
+	</template>
 	<template id="admin.customfields" template="" lang="" group="0" version="1.9.001">
-		<grid>
-			<columns>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<template id="@type_template" span="all"/>
-				</row>
-				<row>
-					<nextmatch id="nm" template="admin.customfields.fields" header_row="admin.customfields.header_add" span="all"/>
-				</row>
-			</rows>
-		</grid>
+		<template id="@type_template"/>
+		<nextmatch id="nm" template="admin.customfields.fields" header_left="admin.customfields.add"/>
 	</template>
 </overlay>
diff --git a/admin/templates/default/index.xet b/admin/templates/default/index.xet
index a27dbc944e..6e72f7101b 100644
--- a/admin/templates/default/index.xet
+++ b/admin/templates/default/index.xet
@@ -3,7 +3,7 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="admin.index.add" template="" lang="" group="0" version="1.9.001">
-		<buttononly statustext="Add" id="add" onclick='app.admin.account({id:"add"})'/>
+		<buttononly label="Add" id="add" onclick='app.admin.account({id:"add"})'/>
 	</template>
 	<template id="admin.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css
index b0c2fadc28..76c86f1442 100755
--- a/admin/templates/pixelegg/app.css
+++ b/admin/templates/pixelegg/app.css
@@ -131,9 +131,6 @@ td.admin_userAgent span {
   iframe#admin-index_iframe #admin-categories-index {
     padding: 10px;
   }
-  iframe#admin-index_iframe #admin-categories-index #admin-categories-index_add {
-    margin-top: -2px;
-  }
   iframe#admin-index_iframe table.egwGridView_grid tr td {
     color: #000;
   }
diff --git a/admin/templates/pixelegg/app.less b/admin/templates/pixelegg/app.less
index 6f7d035be2..7b0cb2b879 100755
--- a/admin/templates/pixelegg/app.less
+++ b/admin/templates/pixelegg/app.less
@@ -57,14 +57,9 @@
 
 iframe#admin-index_iframe{
 
-     background-color: transparent;
+    background-color: transparent;
 
     #admin-categories-index{
-
-		#admin-categories-index_add {
-			margin-top: -2px;
-		}
-
         padding: 10px;
 
         table.et2_grid {
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 24f8be920b..c23823dcc8 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -715,64 +715,14 @@
 * Kategorien
 *
 ################################################################*/
-  div#admin-categories-index {
+  /*div#admin-categories-index{
+
     padding: 0px;
-  }
-  div#admin-categories-index div.ui-helper-clearfix {
-    height: 0px;
-  }
-  div#admin-categories-index div.et2_hbox_right {
-    margin-right: 0;
-    padding: 0;
-  }
-  /*ADD Button*/
-  button#admin-categories-index_add {
-    width: 32px;
-    /*border: 1px solid #0C5DA5;*/
-    margin: 6px 2px;
-    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
-    padding: -0.5em;
-    background-color: #e6e6e6 !important;
-    background-size: 16px 16px;
-    -webkit-border-radius: 3px;
-    -webkit-border-top-left-radius: 10px;
-    -moz-border-radius: 3px;
-    -moz-border-radius-topleft: 10px;
-    border-radius: 3px;
-    border-top-left-radius: 10px;
-    height: 24px;
-    margin: -2px 2px;
-  }
-  button#admin-categories-index_add:before {
-    content: "";
-    font-size: 2em;
-    color: #0c5da5;
-    line-height: 0.6em;
-    padding-left: 0.1em;
-    padding-right: 100em;
-  }
-  button#admin-categories-index_add:active {
-    background-color: #1aa200;
-  }
-  button#admin-categories-index_add:hover {
-    background-color: #189800 !important;
-    color: #ffc200;
-    -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-    -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-    box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-    -webkit-border-radius: 3px;
-    -webkit-border-top-left-radius: 10px;
-    -moz-border-radius: 3px;
-    -moz-border-radius-topleft: 10px;
-    border-radius: 3px;
-    border-top-left-radius: 10px;
-  }
-  button#admin-categories-index_add:active {
-    background-color: #1aa200 !important;
-  }
-  #admin-categories-index_filter {
-    top: 8px;
-  }
+
+    // save space above nextmatch
+    // set height to zero
+    div.ui-helper-clearfix { height: 0px;}
+}*/
   /*################################################################
 *
 * Favorites
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index aef3d85889..289e7d7da7 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -641,32 +641,14 @@ div.header_row_right{
 
 
 
-div#admin-categories-index{
+/*div#admin-categories-index{
 
     padding: 0px;
 
     // save space above nextmatch
     // set height to zero
     div.ui-helper-clearfix { height: 0px;}
-
-    // move add button
-    div.et2_hbox_right {
-                        margin-right: 0;
-                        padding: 0;
-                        }
-
-}
-
-/*ADD Button*/
-button#admin-categories-index_add {
-            .Complete_Button_add_only_plus;
-            .dimension_height_m;
-            margin: -2px 2px;
-            &:hover {.Complete_Button_add_only_plus_hover;}
-            &:active {background-color: @color_positive_action_active !important;}
-}
-
- #admin-categories-index_filter {top: 8px;}
+}*/
 
 /*################################################################
 *