diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index 88db5251eb..603801b846 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -12,142 +12,96 @@
  * @version $Id$
  */
 /**
- * Give space to both contact view & infolog list
+ * CRM view with contact data in sidebox
  */
-#addressbook-index {
-  height: 100%;
+.addressbook_sidebox_name {
+  font-weight: bold;
 }
-#addressbook-edit {
-  height: 390px;
-  min-height: 390px;
+.addressbook_sidebox_name,
+.addressbook_sidebox_org {
+  font-size: 130%;
+  padding: 2px 0 2px 0;
 }
-.et2_container[id^="infolog-index-addressbook"] {
-  min-height: 250px;
+td.addressbook_sidebox_header {
+  font-weight: bold;
+  height: 20px;
+  vertical-align: bottom;
 }
-/* Give enough (static) width to edit dialog tabs, or it will auto-size and flex */
-#addressbook-edit .et2_tabbox {
-  min-width: 535px;
+div#addressbook-view.et2_container {
+  height: 0;
 }
-.cursorHand {
-  cursor: hand;
+td.addressbook_sidebox_toolbar {
+  vertical-align: bottom;
+  height: 32px;
 }
-.countrySelect select {
-  width: 150px;
-}
-.custom_country input {
+div#divGenTime_addressbook {
   display: none;
 }
-.contactid:before {
-  content: "#";
+/**
+ * new addressbook.edit
+ */
+div#addressbook-edit.et2_container {
+  width: 842px;
 }
-.emailCol div {
-  width: 100%;
+div.addressbook_edit_general_picture {
+  position: relative;
 }
-.fixedHeight,
-.telNumbers {
-  height: 12px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.telNumbers {
-  white-space: nowrap;
-}
-.leftPad5 {
-  padding-left: 5px;
-}
-.bold {
-  font-weight: bold;
-}
-.fileas select,
-.fileas,
-.owner select,
-.owner {
-  width: 100%;
-  font-weight: bold;
-}
-.photo img,
-.iphoto img {
-  width: 60px;
-}
-.photo img {
-  cursor: hand;
+div.addressbook_edit_general_picture img {
+  position: absolute;
+  width: auto;
+  max-width: 80px;
+  height: 105px;
+  left: 2px;
 }
 .uploadphoto {
   position: absolute;
-  top: 168px;
-  left: 48px;
+  top: 70px;
+  left: 0;
   display: none;
   border: 2px solid black;
   background-color: #ffffff;
   padding: 4px;
-}
-.checkAllArrow {
-  padding-right: 5px;
+  z-index: 1;
 }
 .typeIcon {
   height: 16px;
   width: 16px;
 }
-.editphones,
 .editname {
   position: absolute;
-  top: 10%;
-  left: 30%;
   display: none;
   border: 2px solid black;
   background-color: #ffffff;
   padding: 4px;
+  top: 55px;
+  left: 102px;
+  z-index: 1;
 }
-.editname {
-  top: 97px;
-  left: 173px;
+.custom_country {
+  display: none;
 }
-.windowheader {
-  background-image: url(../../../phpgwapi/templates/idots/images/appbox-header-background.png);
-  background-repeat: repeat-x;
-  height: 20px;
-  border-spacing: 0px;
-  border-collapse: collapse;
-  border-bottom: #9c9c9c 1px solid;
+tr.dialogHeader td,
+tr.dialogHeader2 td,
+tr.dialogHeader3 td,
+tr.dialogHeader4 td,
+tr.dialogOperators td,
+.dialogFooterToolbar {
+  padding: 5px 0 5px 0;
+  vertical-align: middle;
 }
-fieldset.phoneGroup {
-  margin-top: 12px;
-  font-size: 110%;
-  height: 140px;
-  border: solid black 2px;
-  margin-bottom: 0px;
+input.et2_radiobox {
+  position: relative;
+  left: -16px;
 }
-.phoneGroup table {
-  height: 122px;
+#addressbook-edit_tel_prefer-tel_work,
+#addressbook-edit_tel_prefer-tel_cell {
+  left: -13px;
 }
-fieldset.emailGroup {
-  margin-top: 10px;
-  font-size: 110%;
-  height: 112px;
-  border: solid black 2px;
-  margin-bottom: 0px;
-}
-.emailGroup table {
-  height: 87px;
-}
-.space {
-  width: 80px;
-}
-.noWrap {
-  white-space: nowrap;
-}
-.customfields td {
-  white-space: nowrap;
-  line-height: 12px;
-}
-.image16 img {
-  height: 16px;
-}
-/* changes from pixelegg 11/12/13 - upload foto in right column */
-#addressbook-edit_addressbook-edit-general table.addressbook_edit_general td.addressbook_edit_general_right {
-  widtH: 20%;
-  vertical-align: top;
-  text-align: center;
+/**
+ * Index page
+ */
+img.iphoto {
+  width: 100%;
 }
 @media all {
   /* #############################################################################
@@ -196,6 +150,7 @@ fieldset.emailGroup {
     cursor: pointer;
     height: 24px;
     margin-top: 0;
+    margin-left: 2px;
     -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
     -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
     box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
@@ -389,7 +344,7 @@ fieldset.emailGroup {
   /*Infolog*/
   .et2_container[id^="infolog-index-addressbook"] {
     /*height: auto;*/
-    padding: 1em;
+    /*padding: 1em;*/
     /*min-height: 250px;*/
     /*ADD Button */
     /*        div.et2_hbox,
@@ -496,7 +451,7 @@ fieldset.emailGroup {
   }
   /*###########################################
 #                                           #
-#       dialog-header                       #
+#       dialogHeader                       #
 #############################################
 #                                           #
 #                                           #
@@ -517,11 +472,11 @@ fieldset.emailGroup {
     height: 286px;
   }
   #addressbook-edit_addressbook-edit-general table.addressbook_edit_general td.addressbook_edit_general_right {
-    widtH: 20%;
+    width: 20%;
     vertical-align: top;
     text-align: center;
   }
-  #addressbook-edit tr.dialog-footer-toolbar label.et2_label {
+  #addressbook-edit tr.dialogFooterToolbar label.et2_label {
     top: 0px !important;
   }
   button[id="addressbook-edit_button[delete]"] {
@@ -1211,10 +1166,12 @@ fieldset.emailGroup {
     font-weight: bold;
     width: 100%;
   }
-  .photo img,
   .iphoto img {
     width: 60px;
   }
+  .photo img {
+    height: auto;
+  }
   .uploadphoto {
     background-color: #cdcdcd;
     border: 1px solid black !important;
diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less
index 1f59029a89..6f7a43aca4 100755
--- a/addressbook/templates/pixelegg/app.less
+++ b/addressbook/templates/pixelegg/app.less
@@ -91,7 +91,7 @@ div#addressbook-index{
     // ###########################
     div.et2_hbox_right {
         padding: 0px 11px 0px 0px;
-        
+
         width: auto;
         margin-right: 0em;
         margin-top: -5px;
@@ -124,16 +124,16 @@ div#addressbook-index{
 
         // hinzufügen
         button#addressbook-index_add{
-           
+
             .Complete_Button_add_only_plus;
             .dimension_height_m;
             margin-right: 0px;
-            
+
             &:hover {.Complete_Button_add_only_plus_hover;}
             &:active {background-color: @color_positive_action_active !important;}
-            
+
         }
-           
+
 
 
 
@@ -193,37 +193,37 @@ div#addressbook-index{
 .et2_container[id^="infolog-index-addressbook"] {
 
     /*height: auto;*/
-    padding: 1em;
+    /*padding: 1em;*/
     /*min-height: 250px;*/
-       
-    
+
+
 /*ADD Button */
 /*        div.et2_hbox,
         div.et2_box_widget*/
         .et2_hbox_right[id*="_infolog-index-header_right"]{
 
-                
+
                     div.et2_box_widget{
                         /*border: 1px solid rgba(0, 0, 0, 0.15);*/
                         /*box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);*/
-                        text-shadow: none;                      
+                        text-shadow: none;
                         .dimension_height_l;
                         margin-top: 5px;
                         background-image: none !important;
                         transition: all 0.5s linear;
                         -webkit-transition: all 0.5s linear; /* Safari */
-                        
+
                          &:before {
                             content: "+";
                             font-size: 2em;
-                            color: @egw_color_1; 
+                            color: @egw_color_1;
                             line-height: 0.5em;
                             }
-                            
+
                        /*Text ""hinzufügen" "*/
                        span {display: none;}
 
-                      
+
                       // IMG
                         img {
                             .Complete_Button_Icon_normal;
@@ -231,38 +231,38 @@ div#addressbook-index{
                             margin-left: 0.5em;
                             padding: 0px;
                             margin-top: 0px;
-                            vertical-align: middle;                            
+                            vertical-align: middle;
                             /*.gradient_vertical (@egw_color_2_a, @egw_color_2_a);*/
 
                             &:hover{.Complete_Button_Icon_hover ;}
 
                             &:active { .Complete_Button_Icon_active ;}
                         }
-                        
+
                         img:last-child {margin-right: 5px;};
-                      
-                        
-                        
+
+
+
                 /*MouseOver*/
                       &:hover {
-                          .box_shadow_standard_light_hover; 
+                          .box_shadow_standard_light_hover;
                           background-color: @egw_color_2_a !important;
                           .border_radius_button_lefttop;
                           .dimension_height_l;
                           &:before {content: ""; font-size: 1em;padding-left: 5px;}
                           /*Text*/
                           span {visibility: hidden; display: none;};
-                         img {.scale; margin: 0.5em; background: @gray_0;} 
+                         img {.scale; margin: 0.5em; background: @gray_0;}
                       }
-                    }  
+                    }
+
+
 
 
-                
-                
         }
 
         // Scrollarea in Infolog
-        .egwGridView_scrollarea{ 
+        .egwGridView_scrollarea{
             overflow-y: scroll !important;
             overflow-x: hidden !important;
         }
@@ -325,7 +325,7 @@ div#addressbook-index{
         width:100%;
         height:286px;
     td.addressbook_edit_general_right {
-    	widtH: 20%;
+    	width: 20%;
 		vertical-align: top;
 		text-align: center;
 
@@ -342,7 +342,7 @@ div#addressbook-index{
 button[id="addressbook-edit_button[delete]"]{
     /*position: absolute;*/
     right: 0.5em;
-    
+
 }
 
 
@@ -445,7 +445,7 @@ div.addressbook_edit_general_picture {
             .bordered(@gray_100, @gray_100, @gray_100, @gray_100);
             left: 30%;
             top: 289px;
-            
+
         }
 
 
@@ -562,10 +562,10 @@ div#addressbook-search{
         table.et2_grid {
             margin-left: -7px;
             tr:nth-child(even) {background: @color_even;}
-            tr:nth-child(odd) {background: @color_odd;} 
+            tr:nth-child(odd) {background: @color_odd;}
             td {padding: 3px 0px;}
         }
-        
+
         table.et2_grid td.telNumbers{
             width: 155px;
             input { width: 140px !important; }
@@ -602,7 +602,7 @@ div#addressbook-search{
         table.et2_grid {
             margin-left: -7px;
             tr:nth-child(even) {background: @color_even;}
-            tr:nth-child(odd) {background: @color_odd;}   
+            tr:nth-child(odd) {background: @color_odd;}
             td {padding: 3px 0px;}
         }
 
@@ -649,41 +649,41 @@ div#addressbook-search{
         //		background-color: red !important;
         padding-top: 1em;
     }
-    
+
     td.addressbook_edit_general_left {
-        
-        
+
+
         // table Addressfield
         table.et2_grid{
-           
+
             margin-left: 2px;
 /*            tr:nth-child(even) {background: @color-even;}
             tr:nth-child(odd) {background:  @color-odd;} */
             td {padding: 5px 0px 5px 3px;}
-            
-            
+
+
             // Edit Name
             div#addressbook-edit_addressbook-edit-name{
-                
+
                  table.et2_grid{
-                     
+
                 background-color: @gray_30;
                 .bordered (@gray_30,@gray_30,@gray_30,@gray_30);
                 .rounded (5px);
-                     
+
                         margin-left: 2px;
                         border-top: 1px solid @gray_30 !important;
                         /*tr:nth-child(even) {background: @color_even;}*/
-                        /*tr:nth-child(odd) {background: @color_odd;}*/ 
+                        /*tr:nth-child(odd) {background: @color_odd;}*/
                         td {padding: 5px 0px 5px 3px;}
                  }
-                
+
             }
-            
+
         }
-        
+
     }
-    
+
 }
 
 
@@ -747,19 +747,19 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;}
  /*################## Tab 4 Details ###############################*/
 
  #addressbook-edit_addressbook-edit-details {
-     
+
                       table.et2_grid{
                         margin-left: 2px;
                         border-top: 1px solid @gray_30 !important;
                         /*tr:nth-child(even) {background: @color_even;}*/
-                        /*tr:nth-child(odd) {background: @color_odd;}*/ 
+                        /*tr:nth-child(odd) {background: @color_odd;}*/
                         td {padding: 5px 0px 5px 3px;}
                  }
-     
-     
+
+
      // Kategorie List
      .et2_selectbox .ui-multiselect-checkboxes li {text-indent: -17px;}
-     
+
  }
 
  /*################## Tab 5  Verknüpfungen ###############################*/
@@ -791,22 +791,22 @@ div#addressbook-edit_addressbook-edit-links {
 
     /*neue verknüpfung erstellen - div*/
     div#addressbook-edit_link_to {
-       
+
         width: 550px;
-        
-         // Comment                            
+
+         // Comment
         input {width: 86%;}
-        
-        
+
+
         // Button
         button {
-        .Complete_Button_normal; 
+        .Complete_Button_normal;
         height: 3.1ex;
         background-color: @gray_10;
         background-image[src$="svg"]{.gradient_vertical (@gray_30, @gray_30);}
-    
-        &:hover{ 
-            /*background-color: @gray_30;*/ 
+
+        &:hover{
+            /*background-color: @gray_30;*/
             text-shadow: 0px 0px;
             color: @gray_0;
             .box_shadow_standard_light_hover;
@@ -815,28 +815,28 @@ div#addressbook-edit_addressbook-edit-links {
            }
 
         &:active {.box_shadow_standard_light_active !important;}
-            
+
         }
-        
-        div#addressbook-edit_link_to_link_entry{ 
+
+        div#addressbook-edit_link_to_link_entry{
             margin-top: 11px;
             width: 100%;
 
-        
+
         // APP Selector
         /*div.et2_link_entry {*/
-            
+
             select {width: 39%;}
-        
+
         // Input Field
             input.ui-autocomplete-input {
                                     width: 56%;
                                     padding-bottom: 1px;
                                     }
 
-                                    
-            /*}*/                        
-                                    
+
+            /*}*/
+
        }
 
         // 2. Icon
@@ -885,18 +885,18 @@ div#addressbook-edit_addressbook-edit-links {
 // Extra
 #addressbook-edit_addressbook-edit-custom,
 #addressbook-search_addressbook-edit-custom{
-    
+
     max-width: 560px;
-    
+
     .th{ height: 20px;}
     tbody{
         display: table-header-group;
         vertical-align: top;
     }
-    
+
     // Table Customfields
     table#addressbook-edit_custom_fields{max-width: 550px;}
-    
+
 }
  /*################## Tab 8 Extra Privat###############################*/
 /*seems to be ok*/
@@ -1021,10 +1021,11 @@ div.addressbook.edit.general{
     font-weight: bold;
     width: 100%;
 }
-.photo img, .iphoto img {
+.iphoto img {
     width: 60px;
 }
 .photo img {
+	height: auto;
 }
 
 // Dialog Upload photo