diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index 608ce46cbf..e4858b0ead 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -28,23 +28,23 @@
 			<rows>
 				<row>
 					<description for="n_prefix" value="prefix"/>
-					<textbox id="n_prefix" onchange="app.addressbook.check_value(this,'$cont[id]');" size="35" maxlength="64"/>
+					<textbox id="n_prefix" onchange="app.addressbook.check_value(this,'$cont[id]');" size="28" maxlength="64"/>
 				</row>
 				<row>
 					<description for="n_given" value="first name"/>
-					<textbox id="n_given" onchange="app.addressbook.check_value(this,'$cont[id]');" size="35" maxlength="64"/>
+					<textbox id="n_given" onchange="app.addressbook.check_value(this,'$cont[id]');" size="28" maxlength="64"/>
 				</row>
 				<row>
 					<description for="n_middle" value="middle name"/>
-					<textbox id="n_middle" onchange="app.addressbook.check_value(this,'$cont[id]');" size="35" maxlength="64"/>
+					<textbox id="n_middle" onchange="app.addressbook.check_value(this,'$cont[id]');" size="28" maxlength="64"/>
 				</row>
 				<row>
 					<description for="n_family" value="last name"/>
-					<textbox id="n_family" onchange="app.addressbook.check_value(this,'$cont[id]');" size="35" maxlength="64"/>
+					<textbox id="n_family" onchange="app.addressbook.check_value(this,'$cont[id]');" size="28" maxlength="64"/>
 				</row>
 				<row>
 					<description for="n_suffix" value="suffix"/>
-					<textbox id="n_suffix" onchange="app.addressbook.check_value(this,'$cont[id]');" size="35" maxlength="64"/>
+					<textbox id="n_suffix" onchange="app.addressbook.check_value(this,'$cont[id]');" size="28" maxlength="64"/>
 				</row>
 				<row>
 					<description/>
@@ -53,56 +53,46 @@
 			</rows>
 		</grid>
 	</template>
+        
 	<template id="addressbook.edit.general" template="" lang="" group="0" version="1.9.003">
-		<grid width="100%" height="286" class="addressbook_edit_general">
+            
+                                                    <!-- <image src="accounts"/> -->
+					<vbox class="addressbook_edit_general_picture">
+						<image src="photo" onclick="jQuery('table.uploadphoto').css('display','inline'); return false;" class="photo"/>
+						<template id="addressbook.edit.upload"/>
+					</vbox>
+		<grid  class="addressbook_edit_general">
 			<columns>
-				<column/>
+				<column />
 				<column/>
 				<column/>
 				<column/>
 			</columns>
 			<rows>
-				<row valign="top">
-					<!-- <image src="accounts"/> -->
-					<vbox>
-						<image src="photo" onclick="jQuery('table.uploadphoto').css('display','inline'); return false;" class="photo"/>
-						<template id="addressbook.edit.upload"/>
-					</vbox>
-					<grid>
-						<columns>
-							<column/>
-							<column/>
-							<column/>
-						</columns>
-						<rows>
-							<row>
-								<description value="Name"/>
-								<textbox id="n_fn" no_lang="1" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" rows="1" size="36" span="2" tabindex="-1" class="cursorHand"/>
-							</row>
-							<row>
-								<description/>
-								<template id="addressbook.edit.name"/>
-								<description/>
-								<description/>
-							</row>
-							<row>
-								<description for="title" value="Title"/>
-								<textbox id="title" size="36" maxlength="64" span="2"/>
-								<description/>
-							</row>
-							<row>
-								<description for="role" value="Role"/>
-								<textbox id="role" size="20" maxlength="64"/>
-								<textbox label="Room" id="room" size="5"/>
-								<description/>
-							</row>
-						</rows>
-					</grid>
+				<row>
+					<description value="Name"/>
+					<textbox id="n_fn" no_lang="1" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" rows="1" size="36" span="3" tabindex="-1" class="cursorHand"/>
+				</row>
+				<row>
+					<description/>
+					<template id="addressbook.edit.name"/>
+
+				</row>
+                                <row>
+					<description for="title" value="Title"/>
+					<textbox id="title" size="36" maxlength="64" span="2"/>
+					
+				</row>
+				<row>
+					<description for="role" value="Role"/>
+					<textbox id="role" size="20" maxlength="64"/>
+					<textbox label="Room" id="room" size="5"/>
+					
 				</row>
 				<row>
 				<!-- 	<image src="home"/> -->
 					<description value="Organisation"/>
-					<textbox id="org_name" onchange="app.addressbook.check_value(this,'$cont[id]');" size="45" maxlength="128"/>
+					<textbox id="org_name" onchange="app.addressbook.check_value(this,'$cont[id]');" size="45" maxlength="128" colspan="3"/>
 				</row>
 				<row>
 					<description for="org_unit" value="department"/>
@@ -170,6 +160,9 @@
 			</rows>
 		</grid>
 	</template>
+        
+        
+        
 	<template id="addressbook.edit.cats" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%" height="286" overflow="auto">
 			<columns>
@@ -316,6 +309,7 @@
 		</grid>
 	</template>
 	<template id="addressbook.edit.links" template="" lang="" group="0" version="1.9.001">
+            
 		<grid width="100%" height="286" overflow="auto">
 			<columns>
 				<column/>
@@ -504,6 +498,7 @@
 					<htmlarea id="msg" no_lang="1" readonly="true" span="all" class="redItalic"/>
 					<description/>
 				</row>
+                                
 				<row class="dialog-header">
 					<menulist>
 						<menupopup blur="Name" class="fileas" statustext="own sorting" id="fileas_type" no_lang="1"/>
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index 149b59276c..631cfeec5f 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -12,13 +12,16 @@
 /**
  * Give space to both contact view & infolog list
  */
-.et2_container {
-  height: 50%;
-}
-.et2_container:only-child,
 #addressbook-index {
   height: 100%;
 }
+#addressbook-edit {
+  height: 390px;
+  min-height: 390px;
+}
+.et2_container[id^="infolog-index-addressbook"] {
+  min-height: 250px;
+}
 /* Give enough (static) width to edit dialog tabs, or it will auto-size and flex */
 #addressbook-edit .et2_tabbox {
   min-width: 535px;
@@ -138,6 +141,39 @@ fieldset.emailGroup {
 .image16 img {
   height: 16px;
 }
+/* #############################################################################
+// iframe
+// Rahmen + padding**/
+/*############################################
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #       iframge                 #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+##############################################
+*/
+/**
+ * Give space to both contact view & infolog list
+ */
+#addressbook-index {
+  height: 100%;
+}
+#addressbook-edit {
+  height: auto;
+  min-height: 390px;
+}
+.et2_container[id^="infolog-index-addressbook"] {
+  min-height: 250px;
+}
 div#addressbook-index div.et2_hbox_left {
   padding: 1em;
 }
@@ -263,6 +299,7 @@ div#addressbook-index div.et2_hbox_right button#addressbook-index_add:before {
   content: "+";
   font-size: 1.5em;
   color: #ffc200;
+  line-height: 1.1em;
 }
 div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover {
   background-color: #66a1d2 !important;
@@ -293,8 +330,31 @@ div#addressbook-index table.egwGridView_outer {
 .et2_container {
   height: auto;
 }
-/* ##################################################### */
-/* ##################################################### */
+/*###########################################
+#                                           #
+#       dialog-header                       #
+#############################################
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                   dialog                  #
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#    buttons                                #
+#                                           #
+#                                           #
+##############################################*/
+#addressbook-edit_addressbook-edit-general table.addressbook_edit_general {
+  width: 80%;
+  height: 286px;
+}
+/*#######################################################*/
+/*#######################################################*/
+/*#######################################################*/
 /*State: Address selected*/
 /*ADD AREA*/
 #infolog-index_infolog-index-header_right .et2_box_widget {
@@ -317,6 +377,7 @@ div#addressbook-index table.egwGridView_outer {
   content: "+";
   font-size: 1.5em;
   color: #ffc200;
+  line-height: 1.1em;
 }
 #infolog-index_infolog-index-header_right .et2_box_widget:hover {
   background-color: #66a1d2 !important;
@@ -339,7 +400,65 @@ div#addressbook-index table.egwGridView_outer {
 #infolog-index_infolog-index-header_right .et2_box_widget img.et2_button {
   margin-top: -15px;
 }
-/*State: address edit*/
+/*#######################################################*/
+/*#######################################################*/
+/*#######################################################*/
+/* State: address edit min*/
+/*#######################################################*/
+/* Tab Generell */
+/*Layout*/
+#addressbook-edit .et2_tabbox {
+  max-width: 100%;
+  min-width: 530px;
+}
+#addressbook-edit .et2_tabs {
+  height: 380px;
+}
+table.et2_grid .addressbook_edit_general {
+  width: 80% !important;
+}
+/*##################
+#                #
+#                #
+#  Picture       #
+#                #
+#                #
+##################*/
+/*Div Image*/
+div.addressbook_edit_general_picture {
+  float: right;
+  /*Picture*/
+}
+div.addressbook_edit_general_picture img {
+  width: 180% !important;
+  max-width: 100px !important;
+  height: auto !important;
+  margin-right: 70px;
+}
+div.addressbook_edit_general_picture img.photo {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+  color: #000000;
+}
+div.addressbook_edit_general_picture img.photo:hover {
+  -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
+  -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
+  box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
+  background-color: inherit !important;
+}
+div.addressbook_edit_general_picture table.uploadphoto {
+  background-color: #f0f0f0;
+  width: auto;
+  border-top: solid 1px 1px;
+  border-left: solid 1px 0;
+  border-right: solid 1px 1px;
+  border-bottom: solid 1px 1px;
+  left: 243px;
+  top: 189px;
+}
+/*Search*/
 div#addressbook-edit,
 div#addressbook-search {
   margin: 0;
@@ -367,17 +486,24 @@ div#addressbook-search table.et2_grid {
   width: 100%;
   border-top: 0px;
 }
+div#addressbook-edit table.et2_grid img,
+div#addressbook-search table.et2_grid img {
+  width: 16px;
+  height: 16px;
+}
 div#addressbook-edit table.addressbook_edit_general,
 div#addressbook-search table.addressbook_edit_general {
   border-top: 0px;
+  /*POPUP*/
+  /* edit Name */
 }
 div#addressbook-edit table.addressbook_edit_general tr td:first-child,
 div#addressbook-search table.addressbook_edit_general tr td:first-child {
-  width: 100px;
+  width: 20%;
 }
 div#addressbook-edit table.addressbook_edit_general tr td,
 div#addressbook-search table.addressbook_edit_general tr td {
-  width: 200px;
+  width: auto;
 }
 div#addressbook-edit table.addressbook_edit_general table tr td:first-child,
 div#addressbook-search table.addressbook_edit_general table tr td:first-child {
@@ -387,81 +513,59 @@ div#addressbook-edit table.addressbook_edit_general table tr td,
 div#addressbook-search table.addressbook_edit_general table tr td {
   width: 200px;
 }
-div#addressbook-edit table.addressbook_edit_general img.photo,
-div#addressbook-search table.addressbook_edit_general img.photo {
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
-  -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
-  box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
-  color: #000000;
-}
-div#addressbook-edit table.addressbook_edit_general img.photo:hover,
-div#addressbook-search table.addressbook_edit_general img.photo:hover {
-  -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-  -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-  box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
-  background-color: inherit !important;
-}
-div#addressbook-edit table.addressbook_edit_general .uploadphoto,
-div#addressbook-search table.addressbook_edit_general .uploadphoto {
-  background-color: #f0f0f0;
-  width: auto;
-  border-top: solid 1px #eeeeee;
-  border-left: solid 1px #eeeeee;
-  border-right: solid 1px #eeeeee;
-  border-bottom: solid 1px #eeeeee;
-}
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_n_fn,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_n_fn {
-  width: 200px;
+  width: 95%;
 }
 div#addressbook-edit table.addressbook_edit_general table.editname,
 div#addressbook-search table.addressbook_edit_general table.editname {
   background-color: #f0f0f0;
   z-index: 10;
-  font-size: 1.5em;
+  font-size: 1em;
 }
 div#addressbook-edit table.addressbook_edit_general table.editname tr td:first-child,
 div#addressbook-search table.addressbook_edit_general table.editname tr td:first-child {
-  width: 100px !important;
+  width: 40% !important;
+  font-weight: bold;
+  padding: 3px 0;
 }
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_title,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_title {
-  width: 200px;
+  width: 95%;
 }
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_role,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_role {
-  width: 200px;
+  width: 95%;
 }
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_org_name,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_org_name {
-  width: 286px;
+  width: 95%;
 }
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_org_unit,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_org_unit {
-  width: 286px;
+  width: 95%;
 }
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_adr_one_street,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_adr_one_street,
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_adr_one_street2,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_adr_one_street2 {
-  width: 286px;
+  width: 95%;
 }
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_adr_one_postalcode,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_adr_one_postalcode {
-  width: 50px;
+  width: 10%;
 }
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_adr_one_locality,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_adr_one_locality {
-  width: 225px;
+  width: 83%;
 }
 div#addressbook-edit table.addressbook_edit_general .chzn-container,
 div#addressbook-search table.addressbook_edit_general .chzn-container {
-  width: 300px !important;
+  width: 95% !important;
 }
 div#addressbook-edit table.addressbook_edit_general input#addressbook-edit_adr_one_region,
 div#addressbook-search table.addressbook_edit_general input#addressbook-edit_adr_one_region {
-  width: 286px;
+  width: 95%;
 }
 div#addressbook-edit table.addressbook_edit_general select.owner,
 div#addressbook-search table.addressbook_edit_general select.owner {
@@ -549,40 +653,8 @@ div#addressbook-search fieldset.emailGroup * img {
   width: 200px !important;
   padding-top: 1em;
 }
-#addressbook-edit_addressbook-edit-home #addressbook_edit_adr_two_countrycode_chzn {
-  width: 200px !important;
-  padding-top: 1em;
-}
-#addressbook-edit_addressbook-edit-home #addressbook_edit_tz_chzn {
-  width: 15% !important;
-  padding-top: 1em;
-}
-#addressbook-edit_addressbook-edit-links .th,
-#addressbook-search_addressbook-edit-links .th {
-  height: 20px;
-}
-#addressbook-edit_addressbook-edit-links tbody,
-#addressbook-search_addressbook-edit-links tbody {
-  display: table-header-group;
-  vertical-align: top;
-}
-#addressbook-edit_addressbook-edit-distribution_list .th,
-#addressbook-search_addressbook-edit-distribution_list .th {
-  height: 20px;
-}
-#addressbook-edit_addressbook-edit-distribution_list tbody,
-#addressbook-search_addressbook-edit-distribution_list tbody {
-  display: table-header-group;
-  vertical-align: top;
-}
-#addressbook-edit_addressbook-edit-custom .th,
-#addressbook-search_addressbook-edit-custom .th {
-  height: 20px;
-}
-#addressbook-edit_addressbook-edit-custom tbody,
-#addressbook-search_addressbook-edit-custom tbody {
-  display: table-header-group;
-  vertical-align: top;
+div#addressbook-edit_addressbook-edit-cats {
+  overflow: scroll;
 }
 #addressbook-edit_addressbook-edit-custom_private .th,
 #addressbook-search_addressbook-edit-custom_private .th {
@@ -593,6 +665,60 @@ div#addressbook-search fieldset.emailGroup * img {
   display: table-header-group;
   vertical-align: top;
 }
+#addressbook-edit_addressbook-edit-home #addressbook_edit_adr_two_countrycode_chzn {
+  width: 200px !important;
+  padding-top: 1em;
+}
+#addressbook-edit_addressbook-edit-home #addressbook_edit_tz_chzn {
+  width: 15% !important;
+  padding-top: 1em;
+}
+/*################## Tab 4 Details ###############################*/
+/*################## Tab 5  Verknüpfungen ###############################*/
+#addressbook-edit_addressbook-edit-links .th,
+#addressbook-search_addressbook-edit-links .th {
+  height: 20px;
+}
+#addressbook-edit_addressbook-edit-links tbody,
+#addressbook-search_addressbook-edit-links tbody {
+  display: table-header-group;
+  vertical-align: top;
+}
+div#addressbook-edit_addressbook-edit-links {
+  /*overflow-y: scroll;*/
+  /*neue verknüpfung erstellen - div*/
+}
+div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to {
+  width: 100% !important;
+}
+div#addressbook-edit_addressbook-edit-links table#addressbook-edit_link_to {
+  overflow-y: scroll;
+}
+/*################## Tab 6  Verteilerlisten ###############################*/
+/*seems to be ok*/
+#addressbook-edit_addressbook-edit-distribution_list .th,
+#addressbook-search_addressbook-edit-distribution_list .th {
+  height: 20px;
+}
+#addressbook-edit_addressbook-edit-distribution_list tbody,
+#addressbook-search_addressbook-edit-distribution_list tbody {
+  display: table-header-group;
+  vertical-align: top;
+}
+/*################## Tab 7 Extra ###############################*/
+/*seems to be ok*/
+#addressbook-edit_addressbook-edit-custom .th,
+#addressbook-search_addressbook-edit-custom .th {
+  height: 20px;
+}
+#addressbook-edit_addressbook-edit-custom tbody,
+#addressbook-search_addressbook-edit-custom tbody {
+  display: table-header-group;
+  vertical-align: top;
+}
+/*################## Tab 8 Extra Privat###############################*/
+/*seems to be ok*/
+/*################## Tab 9 History ###############################*/
 #addressbook-edit_addressbook-edit-history .th {
   height: 20px;
 }
@@ -600,6 +726,14 @@ div#addressbook-search fieldset.emailGroup * img {
   display: table-header-group;
   vertical-align: top;
 }
+#addressbook-edit_addressbook-edit-history .et2_historylog div:first-child {
+  height: auto !important;
+}
+#addressbook-edit_addressbook-edit-history .et2_historylog table.egwGridView_outer th.optcol span.selectcols {
+  position: relative !important;
+}
+/*################################################################
+################################################################*/
 button.button_more {
   border: 1px solid rgba(0, 0, 0, 0.15);
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less
index 61f888ba03..31ce3abedc 100755
--- a/addressbook/templates/pixelegg/app.less
+++ b/addressbook/templates/pixelegg/app.less
@@ -13,8 +13,46 @@
 @import (reference) "../../../pixelegg/less/def_buttons.less";
 @import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less";
 @import (less) "../default/app.css";
-//**********************************
+/* #############################################################################
 // iframe
+// Rahmen + padding**/
+
+/*############################################
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #       iframge                 #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+#            #                               #
+##############################################
+*/
+/**
+ * Give space to both contact view & infolog list
+ */
+#addressbook-index {
+  height: 100%;
+}
+#addressbook-edit {
+  height: auto;
+  min-height: 390px;
+}
+
+
+
+
+
+.et2_container[id^="infolog-index-addressbook"] {
+  min-height: 250px;
+}
+
 
 div#addressbook-index{
 //    min-height: 700px;
@@ -83,9 +121,6 @@ div#addressbook-index{
         
         
 
-        
-        
-
     } // rechte Box
 
 
@@ -160,17 +195,54 @@ div#addressbook-index{
 }
 
 
-/* ##################################################### */
+// #############################################################################
+// Dialog addressbook
+
+/*###########################################
+#                                           #
+#       dialog-header                       #
+#############################################
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                   dialog                  #
+#                                           #
+#                                           #
+#############################################
+#                                           #
+#    buttons                                #
+#                                           #
+#                                           #
+##############################################*/
 
 
-// Dialog Addressbuch bearbeiten und alle weiteren
+
+#addressbook-edit_addressbook-edit-general {
+    
+    
+    
+    table.addressbook_edit_general {
+        width:80%;
+        height:286px;
+    }
+      
+} 
 
 
-/* ##################################################### */
 
+
+ /*#######################################################*/
+ /*#######################################################*/
+ /*#######################################################*/
 /*State: Address selected*/
 
 
+
+
+
+
 /*ADD AREA*/
    #infolog-index_infolog-index-header_right{
        
@@ -189,10 +261,64 @@ div#addressbook-index{
  }
 
 
- 
-/*State: address edit*/        
+
+ /*#######################################################*/
+ /*#######################################################*/
+ /*#######################################################*/
+/* State: address edit min*/        
 
 
+
+/*#######################################################*/
+/* Tab Generell */
+
+/*Layout*/
+
+#addressbook-edit .et2_tabbox {max-width: 100%;     min-width: 530px;}
+
+#addressbook-edit .et2_tabs {height: 380px;}
+
+table.et2_grid .addressbook_edit_general {width: 80% !important;}
+
+
+/*##################
+#                #
+#                #
+#  Picture       #
+#                #
+#                #
+##################*/
+/*Div Image*/
+div.addressbook_edit_general_picture {
+    float: right;
+    
+    
+    img {width: 180% !important; max-width: 100px !important; height: auto !important; margin-right: 70px; }
+    
+    /*Picture*/
+
+// Photo
+        img.photo {
+            .Complete_Button_normal;
+            &:hover {.Complete_Button_hover;}
+        }
+        
+// Photo Upload - POPUP
+        
+        table.uploadphoto {
+            .background-color-10-gray;
+            width: auto;
+            .bordered(1px, 1px, 1px, 0); 
+            left: 243px;
+            top: 189px;
+        }
+    
+    
+    
+}
+
+
+/*Search*/
 div#addressbook-edit,
 div#addressbook-search{
 
@@ -212,74 +338,65 @@ div#addressbook-search{
         top: 5%;
         .box_shadow_standard_light;
     }
-        table.et2_grid{
+    
+    table.et2_grid{
         width: 100%;
         border-top: 0px;
+        
+        img {width: 16px; height: 16px;}
+        
     }
+    
+    
     table.addressbook_edit_general{
         //		background: red;
 
         border-top: 0px;
 
-        tr td:first-child {width: 100px;}
-        tr td {width: 200px;}
+        tr td:first-child {width: 20%;}
+        tr td {width: auto;}
 
         table tr td:first-child {width: 60px;}
         table tr td {width: 200px;}
 
-        // Photo
-        img.photo {
-            .Complete_Button_normal;
-            &:hover {.Complete_Button_hover;}
-        }
-        
-        // Photo Upload
-        
-        .uploadphoto {
-            .background-color-10-gray;
-            width: auto;
-            .bordered();
-            
-        }
-        
 
         //Name
-        input#addressbook-edit_n_fn {width: 200px;}
+        input#addressbook-edit_n_fn {width: 95%;}
 
-        // Name bearbeiten
+        
+        /*POPUP*/
+         /* edit Name */
         table.editname {
             .background-color-10-gray;
-            //					position: relative;
-            //					top: -20px;
             z-index: 10;
-            font-size: 1.5em;
+            font-size: 1em;
 
-            tr td:first-child {width: 100px !important;}
+            tr td:first-child {width: 40% !important;font-weight: bold; padding: 3px 0;}
         }
 
 
         //Titel
-        input#addressbook-edit_title {width: 200px;}
+        input#addressbook-edit_title {width: 95%;}
         //Role
-        input#addressbook-edit_role {width: 200px;}
+        input#addressbook-edit_role {width: 95%;}
 
         //Organisation
-        input#addressbook-edit_org_name  {width: 286px;}
+        input#addressbook-edit_org_name  {width: 95%;}
         //unit
-        input#addressbook-edit_org_unit {width: 286px;}
+        input#addressbook-edit_org_unit {width: 95%;}
         // Street
         input#addressbook-edit_adr_one_street,
-        input#addressbook-edit_adr_one_street2 {width: 286px;}
+        input#addressbook-edit_adr_one_street2 {width: 95%;}
 
         // PLZ + Ort
-        input#addressbook-edit_adr_one_postalcode {width: 50px;}
-        input#addressbook-edit_adr_one_locality {width: 225px;}
+        input#addressbook-edit_adr_one_postalcode {width: 10%;}
+        input#addressbook-edit_adr_one_locality {width: 83%;}
 
         // Choosen Adresse
-        .chzn-container { width: 300px !important;}
+        .chzn-container { width: 95% !important;}
 
         //region
-        input#addressbook-edit_adr_one_region {width: 286px;}
+        input#addressbook-edit_adr_one_region {width: 95%;}
 
 
         //Owner
@@ -367,6 +484,10 @@ div#addressbook-search{
     }
 }
 
+
+
+
+
 // ################### Tab 2 / Kategorien ########################
 //
 // addressbook-edit_addressbook.edit.cats
@@ -374,7 +495,19 @@ div#addressbook-search{
 
 //div#addressbook-edit_addressbook~\.edit~\.cats {background-color: red;}
 
+div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
+
 // ################## Tab 3 / Privat #############################
+// Privat
+
+#addressbook-edit_addressbook-edit-custom_private,
+#addressbook-search_addressbook-edit-custom_private{
+    .th{ height: 20px;}
+    tbody{
+        display: table-header-group;
+        vertical-align: top;
+    }
+}
 
 #addressbook-edit_addressbook-edit-home{
 
@@ -396,6 +529,11 @@ div#addressbook-search{
     }
 
 }
+ /*################## Tab 4 Details ###############################*/
+
+
+
+ /*################## Tab 5  Verknüpfungen ###############################*/
 // Verknüpfungen
 
 #addressbook-edit_addressbook-edit-links,
@@ -406,7 +544,20 @@ div#addressbook-search{
         vertical-align: top;
     }
 }
+ div#addressbook-edit_addressbook-edit-links {
+     /*overflow-y: scroll;*/
+     
+     /*neue verknüpfung erstellen - div*/
+     div#addressbook-edit_link_to {width: 100% !important;}
+     
+     table#addressbook-edit_link_to {overflow-y: scroll;}
+ }
 
+
+
+ /*################## Tab 6  Verteilerlisten ###############################*/
+
+/*seems to be ok*/
 // Verteilerliste
 
 #addressbook-edit_addressbook-edit-distribution_list,
@@ -417,9 +568,9 @@ div#addressbook-search{
         vertical-align: top;
     }
 }
-
+ /*################## Tab 7 Extra ###############################*/
+/*seems to be ok*/
 // Extra
-
 #addressbook-edit_addressbook-edit-custom,
 #addressbook-search_addressbook-edit-custom{
     .th{ height: 20px;}
@@ -428,19 +579,10 @@ div#addressbook-search{
         vertical-align: top;
     }
 }
-
-// Privat
-
-#addressbook-edit_addressbook-edit-custom_private,
-#addressbook-search_addressbook-edit-custom_private{
-    .th{ height: 20px;}
-    tbody{
-        display: table-header-group;
-        vertical-align: top;
-    }
-}
-
-// History
+ /*################## Tab 8 Extra Privat###############################*/
+/*seems to be ok*/
+ /*################## Tab 9 History ###############################*/
+ // History
 
 #addressbook-edit_addressbook-edit-history{
     .th{ height: 20px;}
@@ -450,14 +592,59 @@ div#addressbook-search{
     }
 }
 
+ #addressbook-edit_addressbook-edit-history{
+     
+     .et2_historylog{
+
+         div:first-child {height: auto !important;}
+         
+         table.egwGridView_outer {
+             
+             th.optcol {
+                 
+                 span.selectcols {position: relative !important;}
+                 
+             }
+             
+         }
+         
+     }
+     
+ }
+
+
+
+
+
+
+
+
+
+/*################################################################
+################################################################*/
+
+
 
-// ################## Tab 4 Details ###############################
 // mehr...Phonebuch
 
 button.button_more {
     .Complete_Button_text_icon_before;
     background-image:url('../images/bearbeiten.png');
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // #####################################################
 // Adresse editieren
 
diff --git a/etemplate/templates/default/etemplate2.less b/etemplate/templates/default/etemplate2.less
deleted file mode 100644
index 672168058b..0000000000
--- a/etemplate/templates/default/etemplate2.less
+++ /dev/null
@@ -1,1219 +0,0 @@
-/**
- * Styles for etemplate2 widgets
- *
- * @version: $Id: etemplate2.css 43620 2013-08-27 20:24:55Z nathangray $
- */
-
-/**
- * Top level
- */
-.et2_container {
-	/*margin: 10px;
-	border: 1px solid gray;*/
-	padding: 0px;
-	background-color: white;
-	height: 100%;
-}
-.et2_container > div:not([class]) {
-	height: 100%;
-}
-
-
-/**
- * Basic rules
- */
-input,button,select {
-	margin: 1px;
-	padding: 0px;
-}
-
-/**
- * VBox widget
- */
-div.et2_vbox>* {
-	display: block;
-}
-
-/**
- * HBox widget
- */
-
-div.et2_hbox div.et2_hbox {
-	display: inline;
-}
-div.et2_hbox {
-	white-space: nowrap;
-}
-div.et2_hbox>* {
-	text-align: left;
-}
-
-div.et2_hbox_left {
-	float: left;
-}
-
-div.et2_hbox_al_center {
-	text-align: center;
-}
-
-div.et2_hbox_al_right {
-	text-align: right;
-}
-
-div.et2_hbox_right {
-	float: right;
-	clear: right;
-}
-div.et2_hbox>div {
-	display: inline-block;
-}
-
-/**
- * Placeholder widget - used for un-implemented widgets
- */
-.et2_placeholder {
-	display: inline-block;
-	border: 1px solid cornflowerblue;
-	background-color: #FCFCFC;
-	padding: 3px;
-	margin: 1px;
-}
-
-.et2_placeholder .et2_caption {
-	display: block;
-	font-size: 8pt;
-	margin: 0 0 5px 0;
-	font-weight: bold;
-	color: #2E2E2E;
-	cursor: pointer;
-	text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;
-}
-
-.et2_placeholder .et2_attr {
-	display: block;
-	font-size: 8pt;
-	color: #3030A0;
-	margin: 2px 0 2px 0;
-}
-
-/**
- * Splitter widget - split pane
- */
-.et2_split {
-	width: 100%;
-	min-width: 100px;
-	min-height: 100px;
-}
-.splitter-bar-vertical { cursor: ew-resize; width: 5px;}
-.splitter-bar-horizontal { cursor: ns-resize; height: 5px;}
-/* Hide iframes so moving works */
-.splitter-iframe-hide { display: none;}
-.et2_split div.splitter-bar-vertical div.ui-icon {
-	position: absolute;
-	margin-left: -5px;
-	top: 45%;
-}
-.et2_split div.splitter-bar-horizontal div.ui-icon {
-	position: absolute;
-	margin-top: -6px;
-	left: 47%;
-}
-/* Make sure there's no overflow, or hidden bits still appear */
-* > .et2_split {
-	overflow: hidden;
-}
-
-/**
- * Label widget, and labels for other widgets
- */
-.et2_label {
-	color: #101050;
-}
-#msg,.message {
-	color: red;
-	font-style: italic;
-}
-input.et2_url {
-	margin-right: 6px;
-	padding-right: 8px;
-}
-a.et2_url {
-	background-position: center;
-	background-repeat: no-repeat;
-
-	cursor: pointer;
-	margin: -4px;
-	padding: 2px;
-	padding-left: 16px;
-	margin-left: -10px;
-}
-
-a.et2_url.email {
-	background-image: url(images/email.png);
-}
-a.et2_url.phone {
-	background-image: url(images/phone.png);
-}
-a.et2_url.url {
-	background-image: url(images/url.png);
-}
-
-/**
- * Button widget - text only, and icon
- */
-.et2_button {
-	cursor: pointer;
-	text-align: center;
-
-	font-size: 9pt;
-
-	text-shadow: 1px 1px #E0E0E0;
-}
-.et2_button_text, input[type=button] {
-	background-color: #E0E0E0;
-	background-image: url(images/gradient01.png);
-	background-position: center;
-	background-repeat: repeat-x;
-
-	margin: 5px;
-	padding: 3px;
-
-	border: 1px solid silver;
-	color: #101010;
-}
-.et2_button_icon {
-	border: none;
-	background: transparent;
-	padding: 0px;
-}
-button.et2_button_text:hover, input[type=button]:hover {
-	color: #050505;
-	border: 1px solid gray;
-	background-color: #D0D0EE;
-}
-button.et2_button_text:active, input[type=button]:active {
-	background-image: url(images/gradient02.png);
-	background-color: #D0D0E0;
-}
-button.et2_button_text:focus, input[type=button]:focus {
-	border: 1px solid #2c3d6f;
-	color: #202d52;
-	outline: none;
-}
-
-/**
- * Drop down button
- */
-.et2_dropdown button {
-	height: 3.0ex;
-	display: inline-block;
-	vertical-align: middle;
-	margin-right: -2px;
-	padding: 0px 1ex;
-}
-.et2_dropdown button > div {
-	vertical-align: middle;
-}
-.et2_dropdown button:last-child {
-	padding: 0px
-}
-.et2_dropdown + ul.ui-menu {
-	position: absolute;
-	z-index: 2;
-}
-
-/**
- * Color picker widget
- */
-.et2_color {
-	padding: .5ex;
-	height: 2ex;
-	width: 2ex;
-	border: 1px solid silver;
-}
-
-/**
- * Text box
- */
-.et2_textbox {
-	resize: none;
-}
-.et2_textbox_ro {
-	white-space: pre-wrap;
-}
-
-.et2_bold {
-	font-weight: bold;
-}
-
-.et2_italic {
-	font-style: italic;
-}
-
-/**
- * Multi-select widget
- */
-.et2_selectbox .ui-widget-header {
-	padding: 0px 6px 0px 6px;
-	text-align: center;
-}
-.et2_selectbox .ui-widget-header ul {
-	float: left;
-	margin-left: -5px;
-	text-align: left;
-}
-.et2_selectbox .ui-widget-header li {
-	float: left;
-	padding-top: 0px
-}
-.et2_selectbox .ui-widget-header li>span.ui-icon {
-	float: left;
-	margin-top: -2px;
-}
-.et2_selectbox .ui-widget-header li>div.et2_link_entry {
-	/* Shrink search box to same size as header */
-	margin-top: -2px;
-	margin-bottom: -2px;
-	margin-right: 1ex;
-}
-.et2_selectbox .ui-widget-header li>div.et2_link_entry input {
-	height: 14px;
-}
-.et2_selectbox .ui-multiselect-checkboxes {
-	overflow-y: scroll;
-	position: relative;
-	text-align: left;
-}
-.et2_selectbox .ui-multiselect-checkboxes li {
-	margin: 0px;
-	clear: both;
-	padding-left: 26px;
-	padding-right: 3px;
-	text-decoration: none;
-	list-style-image: none;
-	list-style-type: none;
-	text-indent: -26px;
-}
-.et2_selectbox .ui-multiselect-checkboxes ul {
-	margin: 0px auto;
-	padding-left: 0px;
-	clear:both;
-	text-decoration: none;
-	list-style-image: none;
-	list-style-type: none;
-}
-.et2_selectbox .ui-multiselect-checkboxes ul>label {
-	border-bottom: 1px solid black;
-}
-
-.et2_selectbox .ui-multiselect-checkboxes label {
-	display: block;
-	border: 1px solid transparent;
-}
-.et2_selectbox input[type="checkbox"] {
-	margin: 3px;
-}
-.et2_selectbox .ui-multiselect-checkboxes img {
-	float: right;
-	height: 1.8em;
-}
-
-.et2_selectbox .ui-multiselect-checkboxes div.ui-icon-close {
-	visibility: hidden;
-	padding: 0px;
-}
-.et2_selectbox .ui-multiselect-checkboxes li:hover div.ui-icon-close {
-	visibility: visible;
-}
-
-/* Read-only multi-select */
-ul.et2_selectbox {
-	margin: 0px;
-	padding: 0px;
-}
-.et2_selectbox li {
-	text-decoration: none;
-	list-style-image: none;
-	list-style-type: none;
-}
-
-/**
- * Select account dialog
- */
-
-/**
- * Date / Time widgets
- */
-span.et2_date {
-	min-width: 130px;
-}
-span.et2_date input.et2_date {
-	min-width: 16.5ex;
-	background-repeat: no-repeat;
-	background-position: top right;
-	background-size: contain;
-}
-span.et2_date input.et2_time {
-	min-width: 6ex;
-}
-span.et2_date span {
-	background-position: center;
-	background-repeat: no-repeat;
-
-	color: #101010;
-	cursor: pointer;
-	padding-top: 3px;
-	padding-left: 22px;
-	text-align: center;
-
-	font-size: 9pt;
-}
-
-/**
- * Dialog widget
- * It uses jQueryUI, so this is just our little bits - icon on left
- */
-.ui-dialog-content .dialog_icon {
-	margin-right: 2ex;
-	vertical-align: middle;
-}
-.ui-dialog-content  {
-	vertical-align: middle;
-}
-/* These change button alignment, but it seems the standard is right-aligned for
-action buttons, left aligned for "extra" controls
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: none;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	float: none;
-}
-*/
-
-/** 
- * Diff widget
- */
-.diff thead,.author {
-	display: none;
-}
-.diff .ui-icon {
-	margin-top: -16px;
-	float: right;
-}
-
-/** Display a loading icon **/
-.loading {
-	background-position: center;
-	background-repeat: no-repeat;
-	background-image: url('images/ajax-loader.gif');
-}
-
-/**
- * File upload
- */
-.et2_file .progress {
-	width: 300px;
-	max-height: 6em;
-	overflow: auto;
-	margin-left: 20px;
-}
-
-.et2_file .progress span.progressBar {
-	height: 5px;
-	width: 150px;
-	max-width: 150px;
-	display: inline;
-}
-
-/* Remove icon displayed when hovering */
-.et2_file .progress li div.remove {
-	display: none;
-	cursor: pointer;
-	margin: 0px;
-}
-
-.et2_file .progress li:hover div.remove {
-	width: 16px;
-	height: 16px;
-	float: right;
-	display: block;
-	background-image: url("images/close.png");
-	background-position: center;
-	background-repeat: no-repeat;
-}
-
-.et2_file .progress p {
-	background-color: green;
-	height:5px;
-	margin: 0px;
-}
-
-.et2_file .progress li {
-}
-/* Hide progress bar when completed */
-.et2_file .progress li.success > span.progressBar {
-	display: none;
-}
-
-
-/**
- * Autocomplete - used in link widget
- * Restricting result size
- */
-.ui-autocomplete {
-	max-height: 20ex;
-	overflow-y: auto;
-	/* prevent horizontal scrollbar */
-	overflow-x: hidden;
-}
-
-/**
- * Autocomplete in dialogs - fix so they go over/out of the dialog
- */
-.ui-dialog * ul.ui-autocomplete {
-	position: fixed;
-}
-
-/**
- * Link wiget(s)
- */
-
-/* Link entry - x button*/
-div.et2_link_entry {
-	white-space: nowrap;
-}
-div.et2_link_entry:after {
-	display: inline-block;
-	content: ".";
-	height: 0;
-	visibility: hidden;
-	margin: -20px;
-}
-/* Special layout for inside nm grid */
-.et2_nextmatch div.et2_link_entry {
-	padding-right: 4px;
-}
-.et2_nextmatch .et2_link_entry:after {
-	margin: -12px;
-}
-div.et2_link_entry select {
-	width: 39%;
-}
-div.et2_link_entry input.ui-autocomplete-input {
-	width: 61%;
-	padding-bottom: 1px;
-}
-.et2_link_entry.no_app input.ui-autocomplete-input {
-	width: 100%;
-}
-.et2_link_entry.no_app select {
-	display: none;
-}
-.et2_link_entry .ui-icon-close {
-	display: inline-block;
-	background-color: inherit;
-	border: none;
-	position: relative;
-	top: 3px;
-	left: -18px;
-	cursor: pointer;
-	margin-top: -3px;
-}
-
-/* Link to */
-.et2_link_to {
-	width: 350px;
-	overflow-x: show;
-}
-.et2_link_to button {
-	display: inline;
-	float: right;
-	height: 5ex;
-}
-.et2_link_to span.status {
-	background-repeat: no-repeat;
-	background-position: 3px center;
-	width: 22px;
-	height: 22px;
-	display: block;
-	float: right;
-}
-.et2_link_to span.status.success {
-	background-image:url(images/tick.png);
-}
-.et2_link_to span.status.error {
-	background-image:url(images/error.png);
-}
-.et2_link_to .progress {
-	max-height: 12em;
-	overflow-y: scroll;
-}
-.et2_link_to .progress > .success input {
-	width: 100%;
-	margin-right: -20px; /* Leave room for remove icon */
-}
-.et2_link_to .progress li {
-	list-style: none;
-	padding-bottom: 1px;
-	padding-top: 0px;
-}
-.et2_link_to .progress li.success span.ui-icon-comment {
-	display: none;
-	float: right;
-	cursor: pointer;
-	margin-right: 5px;
-}
-.et2_link_to .progress li:hover.success span.ui-icon-comment {
-	display: inline;
-}
-.et2_link_to .et2_button_icon {
-	float: left;
-	width: 22px;
-}
-
-.et2_link {
-	cursor: pointer;
-	color: #003075;
-	text-decoration: none;
-}
-.et2_link:hover {
-	text-decoration: underline;
-}
-ul.et2_link_string {
-	list-style-type: none;
-	display: inline;
-	padding: 0px;
-}
-.et2_link_string li {
-	display: inline;
-}
-.et2_link_string li:not(:last-child):after {
-    content:           ', ';
-}
-.et2_link_list {
-	border-collapse:collapse;
-}
-.et2_link_list tr {
-	cursor: pointer;
-}
-.et2_link_list td.remark {
-	font-style: italic;
-}
-.et2_link_list td div.delete {
-	visibility: hidden;
-	background-image: url("images/close.png");
-	background-position: center;
-	background-repeat: no-repeat;
-	padding: 0px;
-}
-.et2_link_list .icon img, .et2_link_list .icon {
-	width: 16px;
-	height: 16px;
-	display: inline-block;
-}
-.et2_link_list tr:hover div.delete {
-	visibility: visible;
-}
-
-.egw_tooltip
-{
-	position: fixed;
-	border: 1px solid #897f51;
-	padding: 3px;
-	background-color: #FDF9DB;
-	max-width: 300px;
-	color: black;
-}
-
-/**
- * Tabs widget
- */
-
-.et2_tabflag {
-	display: inline-block;
-	margin-right: 5px;
-	padding: 5px;
-	cursor: pointer;
-	border: 1px solid silver;
-
-	background-color: #E0E0E0;
-	background-image: url(images/gradient01.png);
-	background-position: center;
-	background-repeat: repeat-x;
-
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	user-select: none;
-}
-
-.et2_tabflag:hover {
-	color: #050505;
-	border: 1px solid gray;
-	background-color: #D0D0EE;
-}
-
-.et2_tabflag:active {
-	background-image: url(images/gradient02.png);
-	background-color: #D0D0E0;
-}
-
-.et2_tabs {
-	border-width: 0px 1px 1px 1px;
-	border-style: solid;
-	border-color: silver;
-	padding: 5px;
-	overflow-y: auto;
-}
-
-.et2_tabflag.active {
-	border-bottom: 1px solid white;
-	background-color: white;
-	background-image: none;
-}
-
-.et2_tabheader {
-	background-image: url(images/tab_header_bg.png);
-	background-position: bottom;
-	background-repeat: repeat-x;
-}
-
-/**
- * VFS widget(s)
- */
-ul.et2_vfs {
-	padding-left: 0px;
-	margin: 1px;
-}
-.et2_vfs li.vfsFilename {
-	display: inline;
-}
-.et2_vfs li.vfsFilename:not(:last-child):after {
-	padding: 0.25ex;
-}
-
-/**
-* Validation
-*/
-[required] {
-	background-color: #ffffd0;
-}
-.invalid {
-	border: 1px solid #a6261d;
-	background-color: #faecec;
-}
-.error {
-	-moz-border-radius: 0 4px 4px 0;
-	-moz-box-shadow: 0 0 6px #DDDDDD;
-	background-color: #FFFE36;
-	border: 1px solid #E1E16D;
-	color: #000000;
-	display: none;
-	font-size: 11px;
-	height: 15px;
-	padding: 4px 10px;
-}
-.error p {
-	margin: 0;
-}
-
-/**
- * hrule widget
- */
-
-hr {
-	border-style: none;
-	border-top: 1px solid silver;
-	height: 1px;
-	margin: 10px 0px 10px 0px;
-}
-
-/**
- * grid widget
- */
-
-table.et2_grid {
-	border-collapse: collapse;
-}
-
-.et2_grid td {
-/*	border: 1px dashed silver;*/
-}
-/**
- * Sortable grid
- */
-table.et2_grid tbody.ui-sortable > tr:not(.th)  {
-	cursor: ns-resize;
-}
-
-/**
- * Create some spacing for widgets inside labels
- */
-label input, label span, label div, label select, label textarea {
-	margin-left: 1ex;
-	margin-right: 1ex;
-}
-
-/**
- * Message styles
- */
-
-/* Style used for a generic message (such as success messages or validation errors) */
-div.message {
-	display: block;
-	border: 1px solid gray;
-	padding: 3px 3px 3px 22px;
-	margin: 5px 0px 5px 0px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
-	background-repeat: no-repeat;
-	background-position: 3px center;
-	clear: left;
-	max-width: 500px;
-}
-
-div.message.floating {
-	display: inline-block;
-	margin: 0px 5px 0px 5px;
-}
-
-.message.validation_error {
-	color: #a93030;
-	font-style: italic;
-	background-color: #f3d4d0;
-	border-color: #a93030;
-	background-image:url(images/error.png);
-	background-repeat: no-repeat;
-	padding-left: 20px;
-}
-
-.message.success {
-	font-style: normal;
-	background-color: #e5f3d0;
-	color: #98a930;
-	border-color: #9ea930;
-	background-image:url(images/tick.png);
-	background-repeat: no-repeat;
-	padding-left: 20px;
-}
-
-.message.hint {
-	font-style: normal;
-	background-color: #d9e2ed;
-	border-color: #56729a;
-	color: #56729a;
-	background-image:url(images/hint.png);
-	background-repeat: no-repeat;
-	padding-left: 20px;
-}
-
-/**
- * Nextmatch widget
- */
-
-.et2_nextmatch {
-/*	background-color: silver;*/
-}
-
-/* Left & right headers*/
-.et2_nextmatch > div > .header {
-	margin-top: -20px;
-	border: none;
-}
-
-.nextmatch_header .header_count {
-	padding: 0px 20px;
-	margin: 6px 20px 0px;
-	border: 1px solid #E0E0E0;
-	float:right;
-	font-size: 150%;
-	text-align: center
-}
-.nextmatch_header > .filters {
-	padding-left: 5px;
-} 
-.nextmatch_header > .filters select {
-	margin-right: 2ex;
-}
-.nextmatch_header .et2_button_icon {
-	vertical-align: middle;
-}
-.nextmatch_header > .filters .et2_button_icon {
-	margin-top: 8px;
-}
-.et2_nextmatch .nextmatch_header {
-	border: none;
-	background-image: none;
-	background-color: transparent;
-	margin-bottom: 3px;
-}
-.et2_nextmatch .nextmatch_header > .filters {
-	border: 1px solid silver;
-	background-color: #E0E0E0;
-	background-image: url(../../../phpgwapi/templates/default/images/egw_action/header_overlay.png);
-	background-position: center;
-	background-repeat: repeat-x;
-	margin-bottom: 3px;
-}
-/* Favorites */
-.nextmatch_header div[id$=favorite_wrapper] {
-	margin-top: 6px;
-	vertical-align: middle;
-}
-#nm_favorites_popup_filters  .filter_id, #nm_favorites_popup_filters  .filter_value {
-	width: 45%;
-	display: inline-block;
-}
-.nextmatch_header ul.favorites {
-	min-width: 20ex;
-}
-.nextmatch_header .favorites li .ui-menu .ui-menu-item a {
-	text-indent: -22px;
-	margin-left: 21px;
-}
-.nextmatch_header .favorites.ui-menu li.ui-menu-item a.ui-state-hover {
-	margin-left: 20px;
-}
-.favorites li span.ui-state-active {
-	border: none;
-}
-.favorites input, .favorites img {
-	margin-right: 1ex;
-}
-.favorites div.ui-icon-trash {
-	position: relative;
-	float:right;
-	display:none;
-}
-.favorites li:hover div.ui-icon {
-	display:inline-block;
-}
-.favorites .sideboxstar {
-	height: 9px;
-	display: inline-block;
-	padding: 0px 4px;
-	margin: 0px 5px;
-
-	/* TODO: This is template specific */
-	background-image: url(../../../phpgwapi/templates/idots/images/orange-ball.png);
-}
-.sidebox-favorites ul.favorites {
-	width: 99%;
-	padding: 0px;
-	border: none;
-	background: white;
-}
-.sidebox-favorites .ui-menu .ui-menu-item a {
-	line-height: inherit;
-	padding: 2px 0px;
-}
-.sidebox-favorites .ui-menu .ui-menu-item a:hover {
-	text-decoration: underline;
-}
-.sidebox-favorites .favorites div.ui-icon-heart{
-	position: relative;
-	float: left;
-	display:inline-block;
-	margin: -3px 1px 0px 1px;
-}
-.sidebox-favorites .favorites div.ui-icon-trash{
-	margin-top: -5px;
-	margin-right: 2px;
-}
-.nextmatch_sortheader {
-	color: #003075;
-	cursor: pointer;
-	padding-right: 10px;
-	margin-right: 10px;
-	background-repeat: no-repeat;
-	background-position: right center;
-}
-
-.nextmatch_sortheader:hover {
-	text-decoration: underline;
-}
-
-.nextmatch_sortheader.asc {
-	font-weight: bold;
-	background-image: url(images/up.png);
-}
-
-.nextmatch_sortheader.desc {
-	font-weight: bold;
-	background-image: url(images/down.png);
-}
-
-.nextmatch_resize_helper {
-	border-right: 1px dotted gray;
-	min-height: 100%;
-	background-color: gray;
-	opacity: 0.5;
-}
-
-/**
- * Grid / nextmatch Hierarchy 
- */
-/* Make sure arrow & cell content don't overlap */
-.egwGridView_grid span.arrow {
-	margin: 6px -12px 4px 4px;
-	float: left;
-	position:relative;
-}
-.egwGridView_grid span.arrow ~ div.innerContainer {
-	display: inline-block;
-}
-/* Indent the sub-grid */
-.egwGridView_grid .egwGridView_grid {
-	margin-left: 10px;
-	border-left: 1px solid silver;
-}
-/** 
- * This class' margin-right is used to line up columns at each indent level
- * Classes level_# are created programmatically with margin-right * depth
- * Margin-right = -(indent + border)
- */
-.indentation { margin-right:-11px; }
-
-/* End of hierarchy */
-
-/* Mangled link-to widget inside a nextmatch - used for DnD uploads */
-.et2_nextmatch * .et2_link_to {
-	position: fixed;
-	left: 0px;
-	background-color: white;
-	border: 1px gray;
-	padding: 5px;
-}
-
-.et2_clickable {
-	cursor: pointer;
-}
-
-/**
- * et2_portlet
- */
-div.et2_portlet {
-	min-width: 100px;
-}
-.et2_portlet .ui-widget-header {
-	margin: 0em;
-	padding-bottom: 4px;
-	padding-left: 0.2em;
-}
-.et2_portlet .ui-widget-header span.ui-icon {
-	display: inline-block;
-	float: right; 
-}
-.et2_portlet .ui-widget-header span.ui-icon.ui-icon-gear {
-	display: inline-block;
-	float: left; 
-}
-
-/**
- * et2_progress
- */
-div.et2_progress {
-	display: inline-block;
-	border: 1px solid black;
-	background-color: white;
-	width: 30px;
-	padding: 1px; 
-	margin: 2px;
-	text-align: left;
-}
-div.et2_progress > div {
-	background-color: #D00000;
-	height: 5px;
-}
-
-.egwResizeOverlay {
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	top: 0px;
-	left: 0px;
-	z-index: 99999;
-	cursor: ew-resize;
-}
-
-.egwResizeHelper {
-	position: absolute;
-	display: block;
-	z-index: 99998;
-	opacity: 0.5;
-	background-color: #829cbc;
-	cursor: ew-resize;
-}
-
-/**
- * Indent grid sublevels
- */
-
-.et2_nextmatch .subentry.level_1 div.et2_vbox {
-	margin-left: 2.5em;
-}
-
-.et2_nextmatch .subentry.level_2 div.et2_vbox {
-	margin-left: 5em;
-}
-
-.et2_nextmatch .subentry.level_3 div.et2_vbox {
-	margin-left: 7.5em;
-}
-
-/**
- * itempicker widget
- */
-.et2_itempicker {
-	display: block;
-	position: relative;
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	height: 256px;
-}
-.et2_itempicker_left {
-	display: block;
-	position: absolute;
-	top: 0;
-	left: 0;
-	bottom: 0;
-	width: 50px;
-	overflow: hidden;
-}
-
-.et2_itempicker_right {
-	display: block;
-	position: absolute;
-	margin: 0;
-	top: 0;
-	left: 49px;
-	right: 0;
-	bottom: 0;
-	border: 1px solid #b6b6b6;
-	background-color: #f9f9f9;
-}
-
-.et2_itempicker_right_container {
-	display: block;
-	position: relative;
-	width: 100%;
-	height: 100%;
-}
-
-.et2_itempicker_app_select {
-	list-style-type: none;
-	padding: 0;
-}
-
-.et2_itempicker_app_select li {
-	display: block;
-	margin: 0;
-	padding: 6px;
-}
-
-.et2_itempicker_app_select li.selected {
-	border: 1px solid #b6b6b6;
-	border-right: 1px solid transparent;
-	background-color: #f9f9f9;
-	border-top-left-radius: 4px;
-	border-bottom-left-radius: 4px;
-}
-
-.et2_itempicker_search {
-	display: inline-block;
-	margin: 1em;
-	margin-bottom: 0;
-	margin-right: 0;
-	width: 67%;
-	padding: 0.2em;
-}
-
-.et2_itempicker_clear {
-	position: relative;
-	top: 3px;
-	left: -20px;
-}
-
-.et2_itempicker_button_action {
-	position: absolute;
-	margin: 1em;
-	top: 0;
-	right: 0;
-}
-
-.et2_itempicker_itemlist {
-	display: block;
-	border: 1px solid #b6b6b6;
-	margin: 1em;
-	margin-bottom: 0;
-	padding: 0;
-	height: 67%;
-	background-color: #ffffff;
-	overflow: auto;
-}
-
-.et2_itempicker_itemlist ul {
-	margin: 0;
-	padding: 0;
-	list-style-type: none;
-}
-
-.et2_itempicker_itemlist li {
-	display: block;
-	margin: 0;
-	padding: 4px;
-	color: #284d8a;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-.et2_itempicker_itemlist li.row_on {
-	background-color: #f2f9fe;
-}
-
-.et2_itempicker_itemlist li.selected {
-	color: #ffffff;
-	background-color: #3875d7;
-}
-
-/**
- * et2_dialog: EGroupware left aligns all buttons, but [Delete]
- */
-div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: left;
-}
-div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
-	float: left;
-	margin-right: 1em;
-}
-.et2_prompt #message {
-	white-space: pre-wrap;
-	padding-bottom: 10px;
-}
-.et2_prompt #value {
-	width: 100%;
-}
-
-/**
-* et2_taglist
-*/
-.ms-ctn,.ms-res-ctn {
-	/* It doesn't really work smaller than this */
-	min-width: 150px;
-}
-.ms-ctn .loading {
-	position: relative;
-	margin: 0px auto -16px auto;
-	top: 5px;
-}
-.ms-res-ctn {
-	overflow-x: hidden;
-}
\ No newline at end of file
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index f34c9eb176..da0fdb7fe6 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -155,12 +155,12 @@
 	<template id="infolog.edit" template="" lang="" group="0" version="1.9.101">
 		<grid width="100%">
 			<columns>
-				<column width="103"/>
-				<column width="100"/>
-				<column/>
-				<column width="60"/>
-				<column width="90"/>
-				<column/>
+				<column width="10%"/>
+				<column width="40%"/>
+				<column width="1%"/>
+				<column width="5%"/>
+				<column width="10%"/>
+				<column width="34%"/>
 			</columns>
 			<rows>
 				<row disabled="!@msg">
@@ -172,13 +172,13 @@
 					<description/>
 				</row>
 				<row height="28" class="dialog-header">
-					<description value="Type" for="info_type"/>
-					<hbox options="0,0">
+					<description value="Type" for="info_type" vertical-align="center"/>
+					<hbox options="0,0" span="4">
 						<menulist>
 							<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1" onchange="1"/>
 						</menulist>
 					</hbox>
-					<textbox type="integer" id="info_number" readonly="true" span="4" class="infolog_infoId"/>
+					<textbox type="integer" id="info_number" readonly="true" span="2" class="infolog_infoId"/>
 				</row>
 				<row class="row dialog-header" valign="top">
 					<description value="Contact" for="info_from"/>
@@ -190,7 +190,7 @@
 					</vbox>
 					<checkbox statustext="Check to specify custom contact" id="info_custom_from" onchange="document.getElementById(form::name('info_from')).style.display=this.checked?'block':'none';"/>
 					<description value="Phone/Email" for="info_addr"/>
-					<textbox statustext="Custom contact-address, leave empty to use information from most recent link" id="info_addr" size="30" maxlength="255" class="inputFullWidth"/>
+					<textbox statustext="Custom contact-address, leave empty to use information from most recent link" id="info_addr" size="30" maxlength="255" class="_inputFullWidth"/>
 				</row>
 				<row class="row dialog-header">
 					<description value="Category" for="info_cat"/>
diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css
index 3aafb62020..674e2b0cb6 100755
--- a/infolog/templates/pixelegg/app.css
+++ b/infolog/templates/pixelegg/app.css
@@ -215,7 +215,7 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar {
 }
 /*###########################################
 #                                           #
-#                                           #
+#       dialog-header                       #
 #############################################
 #                                           #
 #                                           #
@@ -248,4 +248,10 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar {
 .infolog_fixedHeight {
   height: auto;
 }
+.searchParent input.ui-autocomplete-input {
+  width: 95% !important;
+}
+input#infolog-edit_info_subject {
+  width: 98% !important;
+}
 /**/
diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less
index de3e374071..e2c0c90177 100755
--- a/infolog/templates/pixelegg/app.less
+++ b/infolog/templates/pixelegg/app.less
@@ -229,7 +229,7 @@ span#favorite_sidebox_infolog{
 
 /*###########################################
 #                                           #
-#                                           #
+#       dialog-header                       #
 #############################################
 #                                           #
 #                                           #
@@ -272,29 +272,42 @@ height: auto;
 }
 
 //TYP
-
 select#infolog-edit_info_type {}
-// Nummer hinter Typ
 
+// Nummer hinter Typ
 span#infolog-edit_info_number{}
 
 //Kontakt
-
 label.et2_label {}
 
 // Eingabe via Select + Input
-
 div.et2_box_widget {}
 
 //
-
 input.infolog-edit_info_custom_from {}
 
 
 // Phone + Email
-
 td.inputFullWidth{
     input#infolog-edit_info_addr{}
 }
 
+
+// Kategorie
+
+
+// Eltereintrag
+.searchParent {
+    
+    input.ui-autocomplete-input {width: 95% !important;}
+    
+}
+
+
+// Titel
+input#infolog-edit_info_subject {width: 98% !important;}
+
+
+
+
 /**/// Ende der APP INfolo
\ No newline at end of file
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 5dc43be1d3..a842fc3ca0 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -54,6 +54,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersDate
 div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject {
   width: 100%;
 }
+.egw_fw_ui_category_content {
+  /*new mail in FOlder*/
+}
 .egw_fw_ui_category_content #mail-index_buttonmailcreate {
   margin-left: 0px;
 }
@@ -108,6 +111,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
 .egw_fw_ui_category_content .dtree {
   font-family: "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
 }
+.egw_fw_ui_category_content span.standartTreeRow b {
+  color: #0c5da5;
+}
 /*###########################################
 #                                           #
 #                                           #
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index a857b8a263..f183cbf073 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -232,6 +232,12 @@ div#mail-index{
     .dtree {
         .basefontfamily;
     }
+    
+    
+    /*new mail in FOlder*/ 
+    span.standartTreeRow b {color: @egw_color_2_a;}
+    
+    
 
 } // Ende Sidebox