diff --git a/admin/inc/class.customfields.inc.php b/admin/inc/class.customfields.inc.php
index 2168118bdf..98f5c419e4 100644
--- a/admin/inc/class.customfields.inc.php
+++ b/admin/inc/class.customfields.inc.php
@@ -223,6 +223,9 @@ class customfields
 		// Allow extending app a change to change content before display
 		static::app_index($content, $sel_options, $readonlys, $preserve);
 
+		// Make sure app css gets loaded, extending app might cause et2 to miss it
+		egw_framework::includeCSS('admin','app');
+
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
 
 		// Some logic to make sure extending class (if there is one) gets called
diff --git a/admin/templates/default/app.css b/admin/templates/default/app.css
index 5b45ae869c..ebbc0e8dc7 100644
--- a/admin/templates/default/app.css
+++ b/admin/templates/default/app.css
@@ -68,3 +68,17 @@ td.admin_userAgent span {
 .globalCat_hiddenCatid {
   display: none;
 }
+
+/**
+ * Custom fields list
+ */
+#admin-customfields_nm .values {
+	display: inline-block;
+	max-height: 13em;
+	overflow: auto;
+}
+/* Set a max height for all app type options */
+#admin-customfields_admin-customfields-types + table {
+	max-height: 300px;
+	overflow: auto;
+}
\ No newline at end of file
diff --git a/admin/templates/default/customfields.xet b/admin/templates/default/customfields.xet
index a31c09d325..f3d86abd6b 100644
--- a/admin/templates/default/customfields.xet
+++ b/admin/templates/default/customfields.xet
@@ -70,7 +70,7 @@
 					<customfields-types statustext="Type of customfield" id="{$row}[cf_type]"/>
 					<checkbox id="${row}[cf_needed]" selected_value="1" unselected_value="0"/>
 					<select-account id="${row}[cf_private]" account_type="both"/>
-					<description id="${row}[cf_values]" no_lang="1"/>
+					<description id="${row}[cf_values]" no_lang="1" class="values"/>
 					<vbox>
 						<description id="${row}[cf_len]" no_lang="1"/>
 						<description id="${row}[cf_rows]" no_lang="1"/>
diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css
index f867a03e77..9fce417da0 100755
--- a/admin/templates/pixelegg/app.css
+++ b/admin/templates/pixelegg/app.css
@@ -1,3 +1,4 @@
+@import "../default/app.css";
 /**
  * EGroupware: CSS with less preprocessor
 
@@ -11,72 +12,6 @@
  * @package addressbook
  * @version $Id$
  */
-/**
- * EGroupware - CSS Styles used by admin app
- *
- * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @package etemplate
- * @link http://www.egroupware.org
- * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @version $Id: app.css 47432 2014-06-30 07:48:05Z hnategh $
- */
-.admin_tree table,
-.admin_tree tr,
-.admin_tree td {
-  border: none;
-}
-div#divAppbox {
-  padding: 0;
-}
-body {
-  background-image: none;
-  background-color: white;
-}
-/* otherwise it is transparent */
-#admin_iframe {
-  background-color: white;
-}
-tr.adminAccountInactive .adminStatus {
-  color: red;
-}
-.adminOverflowEllipsis {
-  width: 100%;
-  white-space: nowrap;
-  display: block;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-img.admin_aclApp {
-  width: 16px;
-}
-td.admin_userAgent {
-  max-width: 200px;
-}
-td.admin_userAgent span {
-  display: block;
-  white-space: nowrap;
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-#admin-acl_filter {
-  max-width: 100% !important;
-}
-.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 {
   div.dhtmlxTree td.standartTreeRow span.selectedTreeRow {
     background-color: #ffdd73;
diff --git a/admin/templates/pixelegg/app.less b/admin/templates/pixelegg/app.less
index 02db9aea52..6c5e3b51e2 100755
--- a/admin/templates/pixelegg/app.less
+++ b/admin/templates/pixelegg/app.less
@@ -14,7 +14,7 @@
 
 
 @import (reference) "../../../pixelegg/less/definitions.less";
-@import (less) "../default/app.css";
+@import (reference) "../default/app.css";
 
 
 @media all {