diff --git a/admin/templates/default/app.css b/admin/templates/default/app.css
index ff30728674..5b45ae869c 100644
--- a/admin/templates/default/app.css
+++ b/admin/templates/default/app.css
@@ -55,4 +55,16 @@ td.admin_userAgent span {
 }
 .admin_account_delete > * {
 	padding: 8px;
-}
\ No newline at end of file
+}
+/* Global Category classes*/
+.globalCat_confirmDelete {
+  position: absolute;
+  left: 120px;
+  top: 80px;
+  background-color: white;
+  display: none;
+  border: 2px solid black;
+}
+.globalCat_hiddenCatid {
+  display: none;
+}
diff --git a/admin/templates/default/categories.edit.xet b/admin/templates/default/categories.edit.xet
index 73e6945928..fa2bd97914 100644
--- a/admin/templates/default/categories.edit.xet
+++ b/admin/templates/default/categories.edit.xet
@@ -8,7 +8,7 @@
 			</columns>
 			<rows>
 				<row>
-					<groupbox class="confirmDelete">
+					<groupbox class="globalCat_confirmDelete">
 						<caption label="Delete this category"/>
 						<grid>
 							<columns>
@@ -19,7 +19,7 @@
 								<row height="30">
 									<description align="center" value="Are you sure you want to delete this category ?" span="all"/>
 								</row>
-								<row class="confirmSubs">
+								<row>
 									<checkbox align="center" label="Do you also want to delete all global subcategories ?" id="delete[subs]" span="all"/>
 								</row>
 								<row height="40">
@@ -32,46 +32,27 @@
 				</row>
 			</rows>
 		</grid>
-		<textbox id="delete[cat_id]" class="hiddenCatid"/>
-		<styles>
-			.confirmDelete {
-  position: absolute;
-  left: 120px;
-  top: 80px;
-  background-color: white;
-  display: none;
-  border: 2px solid black;
-}
-.hiddenCatid {
-  display: none;
-}
-.confirmSubs
-{
-}
-		</styles>
+		<textbox id="delete[cat_id]" class="globalCat_hiddenCatid"/>
 	</template>
 	<template id="admin.categories.edit" template="" lang="" group="0" version="1.9.001">
-		<grid>
+		<grid width="100%">
 			<columns>
-				<column/>
-				<column/>
+				<column width="90"/>
+				<column width="300"/>
 			</columns>
 			<rows>
-				<row disabled="!@msg">
-					<description align="center" id="msg" span="all" class="redItalic"/>
-					<description/>
+				
+				<row class="dialogHeader">
+					<description value="Name" for="name"/>
+					<textbox id="name" needed="1" size="50" maxlength="150" class="et2_fullWidth"/>
 				</row>
-				<row class="th" height="25">
+				<row>
 					<description value="Parent category" for="parent"/>
 					<menulist>
 						<menupopup type="select-cat" id="parent" options="None,$cont[all_cats],,$cont[appname]"/>
 					</menulist>
 				</row>
-				<row class="row">
-					<description value="Name" for="name"/>
-					<textbox id="name" needed="1" size="50" maxlength="150"/>
-				</row>
-				<row class="row" valign="top">
+				<row valign="top">
 					<description value="Description" for="description"/>
 					<textbox multiline="true" id="description" rows="5" cols="50"/>
 				</row>
@@ -79,11 +60,11 @@
 					<description value="Private"/>
 					<checkbox id="access" options="private,public"/>
 				</row>
-				<row class="row">
+				<row>
 					<description value="Color" for="cat_data[color]"/>
 					<colorpicker id="data[color]"/>
 				</row>
-				<row class="row">
+				<row>
 					<description value="Icon" for="data[icon]"/>
 					<hbox options="0,0">
 						<menulist>
@@ -92,22 +73,22 @@
 						<image src="icon_url" id="icon_url" class="leftPad5"/>
 					</hbox>
 				</row>
-				<row class="row" disabled="@appname=phpgw">
+				<row disabled="@appname=phpgw">
 					<description value="Application"/>
 					<menulist>
 						<menupopup type="select-app" id="appname" readonly="true" options="All applications"/>
 					</menulist>
 				</row>
-				<row class="row">
+				<row>
 					<description value="Category owner" for="owner"/>
 					<listbox statustext="Limit global category to members of a certain group" id="owner" needed="1" rows="3"/>
 				</row>
-				<row class="row" disabled="!@last_mod">
+				<row disabled="!@last_mod">
 					<description value="Modified"/>
 					<date-time id="last_mod" readonly="true"/>
 				</row>
-				<row>
-					<hbox span="all" width="100%" class="dialogFooterToolbar">
+				<row  class="dialogFooterToolbar">
+					<hbox span="all">
 						<button label="Save" id="button[save]" onclick="return app.admin.check_owner(widget);" image="save" background_image="1"/>
 						<button label="Apply" id="button[apply]" onclick="return app.admin.check_owner(widget);" image="apply" background_image="1"/>
 						<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css
index afe683c513..22c009ed8c 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 46330 2014-03-19 13:20:46Z ralfbecker $
+ * @version $Id: app.css 46650 2014-04-17 12:09:11Z hnategh $
  */
 .admin_tree table,
 .admin_tree tr,
@@ -65,6 +65,18 @@ td.admin_userAgent span {
 .admin_account_delete > * {
   padding: 8px;
 }
+/* Global Category classes*/
+.globalCat_confirmDelete {
+  position: absolute;
+  left: 120px;
+  top: 80px;
+  background-color: white;
+  display: none;
+  border: 2px solid black;
+}
+.globalCat_hiddenCatid {
+  display: none;
+}
 @media all {
   /* #############################################################################
 // iframe