diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index a3a3b40e42..9668c72313 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -1278,11 +1278,11 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
   .et2_label {
     color: #1e1e1e;
   }
-  #msg,
-  .message {
+  /*defined in layout_messages.less*/
+  /*#msg,.message {
     color: red;
     font-style: italic;
-  }
+}*/
   input.et2_url {
     margin-right: 6px;
     padding-right: 8px;
@@ -1312,7 +1312,7 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
     cursor: pointer;
     text-align: center;
     font-size: 9pt;
-    text-shadow: 1px 1px #E0E0E0;
+    text-shadow: 0px 0px;
   }
   /*in Nextmatch definiert*/
   .et2_button_icon {
@@ -1329,7 +1329,7 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
   }
   button.et2_button_text:active,
   input[type=button]:active {
-    background-image: none !important;
+    /*background-image: none !important;*/
     background-color: #828282;
     color: #ffffff;
   }
@@ -1570,7 +1570,7 @@ action buttons, left aligned for "extra" controls
     background-repeat: no-repeat;
   }
   .et2_file .progress p {
-    background-color: green;
+    background-color: #ffdd73;
     height: 5px;
     margin: 0px;
   }
@@ -1686,8 +1686,39 @@ action buttons, left aligned for "extra" controls
     display: inline;
   }
   .et2_link_to .et2_button_icon {
+    background-color: #f0f0f0;
+    -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
     float: left;
-    width: 22px;
+    margin: 0.5em 2em;
+    padding: 0.5em;
+    width: 32px;
+    height: 32px;
+  }
+  .et2_link_to .et2_button_icon:hover {
+    background-color: #b3b3b3 !important;
+    -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);
+    border: 1px solid rgba(0, 0, 0, 0.5);
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+  }
+  .et2_link_to .et2_button_icon:active {
+    background-color: #808080;
+    border: 1px solid rgba(0, 0, 0, 0.9);
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+    box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   }
   .et2_link {
     cursor: pointer;
@@ -1896,6 +1927,9 @@ action buttons, left aligned for "extra" controls
     padding: 1em;
     background-color: #ffc200;
   }
+  .et2_grid td .gray span {
+    background-color: transparent;
+  }
   /**
  * Sortable grid
  */
@@ -1974,8 +2008,8 @@ action buttons, left aligned for "extra" controls
   }
   /* images*/
   .et2_nextmatch > img {
-    height: 16px;
     width: 16px;
+    height: 16px;
   }
   .nextmatch_header .header_count {
     padding: 0px 20px;
@@ -2019,28 +2053,16 @@ action buttons, left aligned for "extra" controls
     background-clip: padding-box;
   }
   .nextmatch_header > .filters .et2_label {
-    font-size: 0.9em;
+    /*        font-size: 0.9em;*/
     padding: 0.2em;
   }
   .nextmatch_header > .filters .et2_label select {
-    -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);
-    width: auto;
-    margin: 5px 0em 5px 5px;
-    padding: 3px;
-    outline: none;
-    display: inline-block;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    appearance: none;
-    cursor: pointer;
+    /*.Complete_Button_select;*/
     margin-left: 2px;
     margin-right: 1px;
-    margin-top: 6px;
-    font-size: 1.2em;
+    margin-top: 8px;
     max-width: 14% !important;
-    height: 25px;
+    /*height: 25px;*/
     /*top: 8px;*/
     /*padding: 5px 0px 0px 3px;*/
     /*Dialog - Addressbook - View */
@@ -2066,9 +2088,9 @@ action buttons, left aligned for "extra" controls
   .nextmatch_header > .filters button.et2_button {
     border: 1px solid rgba(0, 0, 0, 0.15);
     border-color: #b4b4b4;
-    -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);
+    -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     width: 45px;
     height: 27px;
     -webkit-border-radius: 3px;
@@ -2119,9 +2141,9 @@ action buttons, left aligned for "extra" controls
     width: 15%;
     border: 1px solid rgba(0, 0, 0, 0.15);
     border-color: #b4b4b4;
-    -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);
+    -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     width: auto;
     margin: 0.5em 0em 0.5em 0;
     -webkit-border-radius: 3px;
@@ -2145,17 +2167,17 @@ action buttons, left aligned for "extra" controls
   .nextmatch_header .et2_button_icon {
     vertical-align: middle;
     background-color: #f0f0f0;
-    -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);
+    -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     border: 1px solid rgba(0, 0, 0, 0.15);
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
     margin-top: 0px;
     margin-right: 1em;
-    height: 16px;
     width: 16px;
+    height: 16px;
     padding: 2px;
   }
   .nextmatch_header .et2_button_icon .et2_button_icon:hover {
@@ -2233,9 +2255,9 @@ action buttons, left aligned for "extra" controls
   .nextmatch_header div[id$=favorite_wrapper] {
     margin-top: 6px;
     vertical-align: middle;
-    -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);
+    -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
@@ -2275,8 +2297,8 @@ action buttons, left aligned for "extra" controls
   }
   .et2_dropdown button.ui-corner-left img,
   .et2_dropdown button.ui-state-default img {
-    height: 16px;
     width: 16px;
+    height: 16px;
     text-align: left;
     position: relative;
     right: 1px;
@@ -2318,8 +2340,8 @@ action buttons, left aligned for "extra" controls
   }
   .favorites img {
     margin-right: 1ex;
-    height: 16px;
     width: 16px;
+    height: 16px;
   }
   .favorites div.ui-icon-trash {
     position: relative;
@@ -2329,8 +2351,8 @@ action buttons, left aligned for "extra" controls
   .favorites .sideboxstar {
     background-image: url("../images/bullet.png");
     background-repeat: no-repeat;
-    height: 9px;
-    width: 9px;
+    width: 12px;
+    height: 12px;
   }
   .sidebox-favorites ul.favorites {
     width: 99%;
@@ -2348,9 +2370,9 @@ action buttons, left aligned for "extra" controls
     height: 16px;
     padding: 3px;
     background-color: #f0f0f0;
-    -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);
+    -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     border: 1px solid rgba(0, 0, 0, 0.15);
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
@@ -2364,9 +2386,9 @@ action buttons, left aligned for "extra" controls
     margin-right: 1ex;
     height: 16px;
     background-color: #f0f0f0;
-    -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);
+    -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     border: 1px solid rgba(0, 0, 0, 0.15);
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
@@ -2428,8 +2450,8 @@ action buttons, left aligned for "extra" controls
     /*.Complete_Button_Icon_hover ;*/
   }
   .sidebox-favorites .ui-menu .ui-menu-item a img {
-    height: 16px;
     width: 16px;
+    height: 16px;
   }
   .sidebox-favorites div.ui-icon-heart {
     position: relative;
@@ -2550,7 +2572,7 @@ action buttons, left aligned for "extra" controls
     text-align: left;
   }
   div.et2_progress > div {
-    background-color: #D00000;
+    background-color: #ffdd73;
     height: 5px;
   }
   .egwResizeOverlay {
@@ -2721,6 +2743,14 @@ action buttons, left aligned for "extra" controls
   .ms-res-ctn {
     overflow-x: hidden;
   }
+  /**
+ * et2_textbox
+ */
+  textarea,
+  textarea.description {
+    background-color: rgba(255, 194, 0, 0.1);
+    padding: 0.3em 0 0 0.3em;
+  }
 }
 /*#################################### Media Queries #####################################################*/
 @media only screen and (min-width: 980px) and (max-width: 1279px) {
@@ -2776,10 +2806,7 @@ option:checked {
   font-size: 1em;
 }
 .ui-widget-content {
-  border-top: solid 1px #ffc200;
-  border-left: solid 1px #ffc200;
-  border-right: solid 1px #ffc200;
-  border-bottom: solid 1px #ffc200;
+  /*.bordered (@color-hint,@color-hint,@color-hint,@color-hint);*/
   background-image: none;
   color: #808080 !important;
   background: white;
@@ -2928,10 +2955,18 @@ span.ui-icon-search {
   background-color: #679fd2;
 }
 .ui-dialog-buttonset button {
-  background-color: #cdcdcd !important;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  color: #000000;
 }
 .ui-dialog-buttonset button:hover {
-  background-color: #b4b4b4 !important;
+  background-color: #b4b4b4;
+  color: #1e1e1e;
 }
 .ui-dialog-buttonset button.ui-button-text-only {
   background-color: #cdcdcd !important;
@@ -3222,9 +3257,9 @@ span.ui-icon-search {
   color: #111 !important;
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-color: #b4b4b4;
-  -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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   width: auto;
   margin: 0.5em 0em 0.5em 0;
   -webkit-border-radius: 3px;
@@ -3268,6 +3303,12 @@ span.ui-icon-search {
  * @package phpgwapi
  * @version $Id$
  */
+#msg,
+.message {
+  color: red;
+  font-style: italic;
+  background: #ffffff;
+}
 .egw_fw_ui_app_header_container {
   border-width: 9px 0px 0px 9px;
   border-style: solid;
@@ -3299,6 +3340,15 @@ span.ui-icon-search {
 .colselection.ui-widget-content {
   width: 33%;
 }
+/*Calendar ##############*/
+td.message span.message {
+  height: 35px;
+  border-bottom: 2px solid #e6e6e6;
+  color: white;
+  background: red;
+  height: auto;
+  width: 100%;
+}
 /**
  * EGroupware: CSS with less preprocessor
  *
@@ -3349,9 +3399,9 @@ textarea {
 input {
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-color: #b4b4b4;
-  -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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   width: auto;
   margin: 0.5em 0em 0.5em 0;
   -webkit-border-radius: 3px;
@@ -3374,28 +3424,12 @@ input:focus {
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
 }
 select {
-  -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);
-  width: auto;
-  margin: 5px 0em 5px 5px;
+  /*.Complete_Button_select;*/
   padding: 3px;
   margin: 0;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  -webkit-box-shadow: 0 3px 0 #cccccc, 0 -1px #ffffff inset;
-  -moz-box-shadow: 0 3px 0 #cccccc, 0 -1px #ffffff inset;
-  box-shadow: 0 3px 0 #cccccc, 0 -1px #ffffff inset;
-  background: #f8f8f8;
-  color: #888;
-  border: none;
-  outline: none;
-  display: inline-block;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  cursor: pointer;
 }
 select:hover {
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -3449,15 +3483,6 @@ h6 {
   margin: 1.5em 0 0;
 }
 /*table {font-size: 16px;}*/
-@media screen and (-webkit-min-device-pixel-ratio: 0) {
-  select {
-    padding-right: 20px !important;
-    -webkit-appearance: none;
-    margin: 0;
-    background: #ffffff url(../images/selectarrowdown.png) no-repeat center right;
-    background-size: 20px auto;
-  }
-}
 select {
   position: relative;
 }
@@ -3506,9 +3531,9 @@ div.selectbox-wrapper ul li {
   cursor: pointer;
 }
 .sbHolder {
-  -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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   width: auto;
   margin: 5px 0em 5px 5px;
   padding: 3px;
@@ -3713,9 +3738,9 @@ a.textSidebox,
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  -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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   border: 1px solid rgba(0, 0, 0, 0.15);
   text-align: center;
   cursor: pointer;
@@ -3728,9 +3753,9 @@ a.textSidebox,
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  -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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   border: 1px solid rgba(0, 0, 0, 0.15);
   text-align: center;
   cursor: pointer;
@@ -3997,9 +4022,12 @@ a.textSidebox {
 }
 button {
   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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
   color: #000000;
 }
 button:hover {
@@ -4014,9 +4042,12 @@ button[id*="delete"] {
   background-image: url('../images/delete.png');
   margin-left: 3em;
   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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
   color: #000000;
   padding-left: 30px !important;
   background-position: 6px center !important;
@@ -4031,9 +4062,12 @@ button[id*="delete"]:hover {
   background-image: url('../images/delete-hover.png') !important;
   background-color: red !important;
   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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
   color: #000000;
   padding-left: 30px !important;
   background-position: 6px center !important;
@@ -4043,6 +4077,51 @@ button[id*="delete"]:hover {
   height: 32px;
   color: #ffffff;
 }
+/* #####################################################
+ *  Button edit + save + apply + copy = positive action   */
+button[id*="save"]:active {
+  background-color: #00ab00;
+}
+button[id*="apply"]:active {
+  background-color: #00ab00;
+}
+button[id*="copy"]:active {
+  background-color: #00ab00;
+}
+button[id*="edit_button[edit]"]:active {
+  background-color: #00ab00;
+}
+button#filemanager-select_button[ok]:active {
+  background-color: #00ab00;
+}
+/*ui-widget*/
+button#series:active {
+  background-color: #00ab00 !important;
+}
+button#exception:active {
+  background-color: #00ab00 !important;
+}
+/*calendar series add*/
+#calendar-edit_add {
+  /*    .Complete_Button_add;
+    &:hover {.Complete_Button_add_hover;} */
+}
+#calendar-edit_add:active {
+  background-color: #00ab00 !important;
+}
+/*calendar search freetime*/
+#calendar-edit_freetime:active {
+  background-color: #00ab00 !important;
+}
+/*calendar search freetime*/
+button[id*="edit_button[add_alarm]"]:active {
+  background-color: #00ab00 !important;
+}
+/* #####################################################*/
+/*Button cancel */
+button[id*="cancel"]:active {
+  background-color: #ffc200;
+}
 /* #####################################################*/
 /*Button abbruch / cancel */
 button#cancel:hover {
@@ -4053,9 +4132,12 @@ button#cancel:hover {
 /*Button mit Bildern*/
 button.et2_button_with_image {
   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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
   color: #000000;
   padding-left: 30px !important;
   background-position: 6px center !important;
@@ -4087,6 +4169,15 @@ button.add:before {
   color: #ffc200;
   line-height: 1.1em;
 }
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+  select {
+    padding-right: 20px !important;
+    -webkit-appearance: none;
+    margin: 0;
+    background: #ffffff url(../images/selectarrowdown.png) no-repeat center right;
+    background-size: 20px auto;
+  }
+}
 /**
  * EGroupware: Stylite Pixelegg template
  *
@@ -4230,6 +4321,12 @@ table.egwGridView_grid tbody {
   margin: 0;
   vertical-align: top;
 }
+table.egwGridView_grid tbody tr:nth-child(even) {
+  background: #e6e6e6;
+}
+table.egwGridView_grid tbody tr:nth-child(odd) {
+  background: #ffffff;
+}
 table.egwGridView_grid tbody tr.selected {
   background: rgba(255, 221, 115, 0.2) !important;
   /*.bw-gradient;*/
@@ -4395,9 +4492,9 @@ table.egwGridView_grid span.arrow.loading {
   margin: 1em;
 }
 #loginMainDiv div#centerBox form table.divLoginbox {
-  -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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   -webkit-border-radius: 3px;
   -webkit-border-top-left-radius: 20px;
   -moz-border-radius: 3px;
@@ -4409,9 +4506,9 @@ table.egwGridView_grid span.arrow.loading {
   padding: 0.5em;
 }
 #loginMainDiv div#centerBox form table.divLoginbox select {
-  -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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   width: auto;
   margin: 5px 0em 5px 5px;
   padding: 3px;
@@ -4430,9 +4527,9 @@ table.egwGridView_grid span.arrow.loading {
 #loginMainDiv div#centerBox form table.divLoginbox input {
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-color: #b4b4b4;
-  -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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   width: auto;
   margin: 0.5em 0em 0.5em 0;
   -webkit-border-radius: 3px;
@@ -4609,14 +4706,27 @@ img {
   float: left;
   padding-top: 10px;
 }
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul {
+  /*Home*/
+  /*Setup*/
+  /*access*/
+  /*category*/
+  /*password*/
+  /*help*/
+  /*Search*/
+  /*logout*/
+}
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li {
   width: 32px;
   height: 32px;
   padding: 0.3em 0.4em;
   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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
   color: #000000;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover {
@@ -4626,12 +4736,19 @@ img {
   background-color: inherit !important;
   color: #000000;
 }
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:active {
+  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+}
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a {
   color: #000000;
+  text-decoration: none;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
   color: #808080;
   border-color: #828282;
+  text-decoration: none !important;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child {
   margin-left: 10px;
@@ -4639,6 +4756,54 @@ img {
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child :before {
   border: none;
 }
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child a:before {
+  padding-right: 5px;
+  content: url(../images/topmenu_items/home.png);
+  width: 16px;
+  height: 16px;
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(2) a:before {
+  padding-right: 5px;
+  content: url(../images/topmenu_items/setup.png);
+  width: 16px;
+  height: 16px;
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(3) a:before {
+  padding-right: 5px;
+  content: url(../images/topmenu_items/access.png);
+  width: 16px;
+  height: 16px;
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(4) a:before {
+  padding-right: 5px;
+  content: url(../images/topmenu_items/category.png);
+  width: 16px;
+  height: 16px;
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(5) a:before {
+  padding-right: 5px;
+  content: url(../images/topmenu_items/password.png);
+  width: 16px;
+  height: 16px;
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(6) a:before {
+  padding-right: 5px;
+  content: url(../images/topmenu_items/help.png);
+  width: 16px;
+  height: 16px;
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(7) a:before {
+  padding-right: 5px;
+  content: url(../images/topmenu_items/search.png);
+  width: 16px;
+  height: 16px;
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:nth-child(8) a:before {
+  padding-right: 5px;
+  content: url(../images/topmenu_items/logout.png);
+  width: 16px;
+  height: 16px;
+}
 /*#################################################
 ###################################################
  Slide Effekt
@@ -4715,9 +4880,9 @@ img {
 }
 #egw_fw_topmenu_addons span#quick_add select#quick_add_selectbox {
   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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   height: 30px;
   padding: 0 0 0 10px;
   font-size: 0.9em;
@@ -4752,9 +4917,9 @@ img {
   width: 16px;
   height: 16px;
   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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   padding: 0.5em;
   top: 5px;
   position: fixed;
@@ -4765,6 +4930,11 @@ img {
   -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
   box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
 }
+#egw_fw_logout:active {
+  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+}
 #egw_fw_logout:focus {
   -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -4784,9 +4954,9 @@ img {
   width: 16px;
   height: 16px;
   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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   padding: 0.5em;
   top: 5px;
   right: 45px;
@@ -4797,6 +4967,11 @@ img {
   -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
   box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
 }
+#egw_fw_print:active {
+  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+}
 #egw_fw_print:focus {
   -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -4863,21 +5038,25 @@ img {
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv {
   background-color: #fafafa;
 }
-#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header {
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv div.ui-sortable div {
+  padding: 3px 0 1px 3px;
   cursor: pointer;
+}
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header {
   display: block;
-  height: 30px;
   margin: 0 0;
-  padding: 4px 5px 5px 15px;
-  background-color: #fafafa;
-  background-image: none;
-  border-color: #e6e6e6;
+  /*padding: 0px 5px 5px 10px;*/
+}
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header:hover {
+  background-color: #d9d9d9;
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
-#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header:hover {
-  background-color: #d9d9d9;
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header:active {
+  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header h1 {
   font-size: 1em;
@@ -5164,28 +5343,11 @@ img {
   padding: 0px;
   margin: 0px 5px;
   float: left;
-  background-color: #f0f0f0;
-  -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);
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
+  /*.Complete_Button_Icon_normal;*/
   background-image: url("../images/bullet.png");
   background-size: 16px 16px;
   background-position: center;
-}
-.egw_fw_ui_sidemenu_listitem img.egw_fw_ui_sidemenu_listitem_icon:hover {
-  height: 16px;
-  background-color: #b3b3b3 !important;
-  -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);
-  border: 1px solid rgba(0, 0, 0, 0.5);
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
+  /*&:hover {height: 16px; .Complete_Button_Icon_hover ;}*/
 }
 .egw_fw_ui_sidemenu_listitem input {
   height: 16px;
@@ -5524,26 +5686,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
  * @version $Id$
  */
 /*@import (reference) "def_content_elements.less";*/
-/*###########################################
-#                                           #
-#     dialog-header                         #
-#############################################
-#                                           #
-#                                           #
-#                                           #
-#                                           #
-#                                           #
-#    main + tabs                            #
-#                                           #
-#                                           #
-#############################################
-#   dialog-operators                        #
-#############################################
-#                                           #
-#    buttons                                #
-#                                           #
-#                                           #
-##############################################*/
 div.et2_container {
   padding: 0;
 }
@@ -5574,9 +5716,12 @@ div.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
   -webkit-background-clip: padding-box;
   background-clip: padding-box;
 }
-div.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input.hasDatepicker:hover {
+div.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input.hasDatepicker {
   background-image: url("../images/datepopup.png");
 }
+div.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input.hasDatepicker:hover {
+  cursor: pointer;
+}
 div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2_grid {
   background-color: #ffffff;
 }
@@ -5588,26 +5733,47 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
 table.dialog-main-view {
   width: 100%;
 }
-/*Header Part*/
+/*###########################################
+#                                           #
+#     dialog-header                         #
+#############################################
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#                                           #
+#    main + tabs                            #
+#                                           #
+#                                           #
+#############################################
+#   dialog-operators                        #
+#############################################
+#                                           #
+#    buttons                                #
+#                                           #
+#                                           #
+##############################################*/
+/**********    Header Part ********************/
 .dialog-header {
   background-color: #0c5da5;
   color: #ffffff;
 }
-.dialog-header .th {
-  background-color: #0c5da5 !important;
-}
-.dialog-header tr {
-  height: 30px;
-}
-.dialog-header td {
-  padding: 0px;
-}
 .dialog-header table.et2_grid {
   border-top: none;
 }
+.dialog-header table.et2_grid .th {
+  background-color: #0c5da5 !important;
+}
+.dialog-header table.et2_grid tr {
+  height: 30px;
+}
+.dialog-header table.et2_grid td {
+  padding: 0px 0px 0px 3px;
+}
 .dialog-header .et2_label {
   color: #ffffff;
   vertical-align: bottom;
+  padding: 0px 0px 0px 3px !important;
 }
 .dialog-header td.space span img {
   background: #ffffff;
@@ -5624,11 +5790,25 @@ table.dialog-main-view {
   filter: gray;
   /* IE 6-9 */
 }
-/*Main*/
+tr.dialog-header2,
+tr.dialog-header3,
+tr.dialog-header4 {
+  background-color: #679fd2 !important;
+  border-top: 2px solid #e6e6e6;
+  border-bottom: 2px solid #e6e6e6;
+}
+tr.dialog-header2 .et2_label,
+tr.dialog-header3 .et2_label,
+tr.dialog-header4 .et2_label {
+  color: #ffffff;
+  vertical-align: bottom;
+  padding: 0px 0px 0px 3px !important;
+}
+/************* Main  **********************************/
 .dialog-main-timeframe div {
   min-height: 100px;
 }
-/* Operators */
+/**********    Operators *******************************/
 .dialog-operators {
   background-color: #b4b4b4;
   border-top: 2px solid #e6e6e6;
@@ -5637,6 +5817,7 @@ table.dialog-main-view {
 .dialog-operators td {
   padding: 2px;
 }
+/**********    Footer  *******************************/
 /*Buttons / Toolbar*/
 .dialog-footer-toolbar {
   background-color: #679fd2;
@@ -5647,6 +5828,9 @@ table.dialog-main-view {
 .dialog-footer-toolbar button {
   height: 32px;
 }
+.dialog-footer-toolbar .et2_selectbox {
+  height: 32px;
+}
 .dialog-footer-toolbar label.et2_label {
   border-color: #b4b4b4;
   width: auto;
@@ -5655,14 +5839,17 @@ table.dialog-main-view {
   -moz-border-radius: 3px;
   border-radius: 3px;
   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);
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   color: #000000;
   background-color: #f0f0f0;
   padding: 6px 5px 6px 0;
-  /*        position: relative;
-        top: 11px;*/
+  position: relative;
+  top: 11px;
+}
+.dialog-footer-toolbar input.et2_checkbox {
+  top: 0px;
 }
 /*
 	Printing
diff --git a/pixelegg/images/logout.png b/pixelegg/images/logout.png
index a83b8dfc4d..f4a6abd1a5 100644
Binary files a/pixelegg/images/logout.png and b/pixelegg/images/logout.png differ
diff --git a/pixelegg/less/def_buttons.less b/pixelegg/less/def_buttons.less
index e69b0ccb37..a1a31e9a0f 100755
Binary files a/pixelegg/less/def_buttons.less and b/pixelegg/less/def_buttons.less differ
diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less
index b1fadb09b3..7291621f53 100755
--- a/pixelegg/less/def_design_pattern_color_font_shadow.less
+++ b/pixelegg/less/def_design_pattern_color_font_shadow.less
@@ -1,4 +1,4 @@
-/**
+ /**
  * EGroupware: CSS with less preprocessor
  *
  * Definitions for colors, fonts, borders and box shadow
@@ -120,9 +120,19 @@
 // soll EGROUPWARE FARBE GEBEN
 /*@active_button_border_bottom : @egw_color_2_d;*/ 
 
-// Hint / 
+// Hint / or have to do / must field
 @color-hint : @egw_color_1_a;
 
+/*optional / can field*/
+@color-optional : fade(@egw_color_1_a, 10%);
+
+
+
+/*Listenausgabe*/   
+
+@color-even : @gray-10;
+@color-odd :  @gray-10 + 222; 
+
 // aktiverte Zeilen in allen APP mit Listenausgabe
 @color_active_row : @egw_color_1_a;
 
@@ -132,6 +142,9 @@
 // Mouse over
 @color_hover_row : @egw_color_2_e;
 
+ /*Button edit + save + apply + copy = positive action         */
+@color-positive-action : #00AB00;
+
 
 // Search Button
 
@@ -141,7 +154,9 @@
 
 .background-table-cal-head { background-color : @egw_color_1_a;}
 
+@color-progress : @egw_color_1_e;
 
+/*#####################################################################*/
 // Schriften
 
 .basefontfamily{
@@ -152,8 +167,8 @@
 }
 
 
-
-// Radius
+/*#####################################################################*/
+/* Radius*/
 
 .border_radius_button_lefttop {
     -webkit-border-radius: 3px;
@@ -184,9 +199,9 @@
 // auf hellem Hintergrund
 
 .box_shadow_standard_light {
-    -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);
+    -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow:  0px 1px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
 }
 
 
@@ -306,6 +321,8 @@
     /* Opera 9+, IE 9+ */
     opacity: 0.5;
 }
+
+
 // #############################
 //  Button Größen
 
@@ -330,6 +347,88 @@
     height: 32px;
 }
 
+
+  /*Icon Buttons   ##################  */ 
+
+/* ##############
+ #  big Icon    #
+ #              #
+ #  32 x 32     #
+ #              #
+ #              #
+ ################*/
+
+.dimension_width_height_xl{
+    
+    width: 32px;
+    height: 32px;
+}
+
+/* ###########
+ # medium    # 
+ # Icon      #
+ #           #
+ #  24 x 24  #
+ #           #
+ #############*/
+
+.dimension_width_height_m{
+    
+    width: 24px;
+    height: 24px;
+}
+
+/* ########
+ # small  # 
+ # Icon   #
+ # 16x16  #
+ ##########*/
+
+.dimension_width_height_s{
+    
+    width: 16px;
+    height: 16px;
+}
+
+/* ####
+   #xs#
+   ####*/
+.dimension_width_height_xs{
+    
+    width: 12px;
+    height: 12px;
+}
+
+/* only Buttons   ##################  */ 
+
+/* ##########################
+ #  big Button              #
+ #                          #
+ #                          #
+ #                          #
+ #  N x 32                  #
+ ############################*/
+
+.dimension_height_xl{ height: 32px; }
+
+/* ##########################
+ #  medium Button           #
+ #                          #
+ #  N x 24                  #
+ ############################*/
+
+.dimension_height_m{ height: 24px; }
+
+/* ##########################
+ #  small Button           #
+ #                          #
+ #  N x 16                  #
+ ############################*/
+
+.dimension_height_s{ height: 16px; }
+
+
+
 // Rahmen für Schaltflächen
 
 .border_normal{
@@ -520,4 +619,4 @@
 }
 
 
-//
\ No newline at end of file
+//
\ No newline at end of file
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index c175182eaa..cabac3ad88 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -143,10 +143,12 @@ div.et2_hbox>div {
     color: @gray-90;
 //    float: left;
 }
-#msg,.message {
+
+ /*defined in layout_messages.less*/ 
+/*#msg,.message {
     color: red;
     font-style: italic;
-}
+}*/
 input.et2_url {
     margin-right: 6px;
     padding-right: 8px;
@@ -181,7 +183,7 @@ a.et2_url.url {
 
     font-size: 9pt;
 
-    text-shadow: 1px 1px #E0E0E0;
+    text-shadow: 0px 0px;
 }
 
  /*in Nextmatch definiert*/
@@ -196,7 +198,7 @@ a.et2_url.url {
     background: transparent;
     padding: 0px;
 //    width: 16px;
-    height: 16px;
+    .dimension_height_s;
 }
 button.et2_button_text:hover, input[type=button]:hover {
     color: @gray-90;
@@ -204,7 +206,7 @@ button.et2_button_text:hover, input[type=button]:hover {
     background-color: @gray-30;
 }
 button.et2_button_text:active, input[type=button]:active {
-    background-image: none !important;
+    /*background-image: none !important;*/
     background-color: @gray-50;
     color: @gray-0;
 }
@@ -462,8 +464,7 @@ div.et2_file input {background-color: @egw_color_1_a;}
 }
 
 .et2_file .progress li:hover div.remove {
-    width: 16px;
-    height: 16px;
+    .dimension_width_height_s;
     float: right;
     display: block;
     background-image: url("images/close.png");
@@ -472,7 +473,7 @@ div.et2_file input {background-color: @egw_color_1_a;}
 }
 
 .et2_file .progress p {
-    background-color: green;
+    background-color: @color-progress;
     height:5px;
     margin: 0px;
 }
@@ -484,7 +485,6 @@ div.et2_file input {background-color: @egw_color_1_a;}
     display: none;
 }
 
-
 /**
  * Autocomplete - used in link widget
  * Restricting result size
@@ -596,8 +596,14 @@ div.et2_link_entry input.ui-autocomplete-input {
     display: inline;
 }
 .et2_link_to .et2_button_icon {
-    float: left;
-    width: 22px;
+            .Complete_Button_Icon_normal;
+            float: left;
+            margin: 0.5em 2em;
+            padding: 0.5em;
+            .dimension_width_height_xl;
+
+            &:hover {.Complete_Button_Icon_hover;}
+            &:active {.Complete_Button_Icon_active;}
 }
 
 .et2_link {
@@ -814,7 +820,10 @@ table.et2_grid {
 .et2_grid td {
     /*	border: 1px dashed silver;*/
     
-    .gray {padding: 1em; background-color: @color-hint}
+    .gray {
+        padding: 1em; background-color: @color-hint;
+        span {background-color: transparent;}
+        }
 }
 /**
  * Sortable grid
@@ -901,7 +910,7 @@ div.message.floating {
 }
 
 /* images*/
-.et2_nextmatch > img {height: 16px; width: 16px;}
+.et2_nextmatch > img {.dimension_width_height_s;}
 
 // little rectangle
 
@@ -937,19 +946,18 @@ div.message.floating {
     
     .et2_label {
         
-        font-size: 0.9em;
+/*        font-size: 0.9em;*/
         padding: 0.2em;
         
         
         select {
-            .Complete_Button_select;
+            /*.Complete_Button_select;*/
             margin-left: 2px; 
             margin-right: 1px;
-            margin-top: 6px;
+            margin-top: 8px;
             
-            font-size: 1.2em;
             max-width: 14% !important;
-            height: 25px;
+            /*height: 25px;*/
             /*top: 8px;*/
             /*padding: 5px 0px 0px 3px;*/
             
@@ -1029,8 +1037,7 @@ div.message.floating {
     .Complete_Button_Icon_normal;
     margin-top: 0px;
     margin-right: 1em;
-    height: 16px;
-    width: 16px;
+    .dimension_width_height_s;
     padding: 2px;
 
     .et2_button_icon:hover{.Complete_Button_Icon_hover ;}
@@ -1125,8 +1132,7 @@ div.message.floating {
 //            background-size: 10px 10px;
           
             img {
-                height: 16px; 
-                width: 16px;
+                .dimension_width_height_s;
                 text-align: left;
                 position: relative;
                 right: 1px;
@@ -1206,7 +1212,8 @@ div.message.floating {
     input {margin-right: 1ex;}
 
     img {
-        margin-right: 1ex; height: 16px; width: 16px;
+        margin-right: 1ex; 
+        .dimension_width_height_s;
     }
 
     div.ui-icon-trash {
@@ -1219,8 +1226,7 @@ div.message.floating {
     .sideboxstar{
         background-image: url("../images/bullet.png");
         background-repeat: no-repeat;
-        height: 9px;
-        width: 9px
+        .dimension_width_height_xs;
     }
 
 }
@@ -1245,24 +1251,24 @@ div.message.floating {
             img {
 //                margin-right: 1ex; 
                 margin: 0px 5px;
-                height: 16px; 
+                .dimension_height_s;
                 padding: 3px;
                 .Complete_Button_Icon_normal;
 
 
                 &:hover {
-                    height: 16px; 
+                    .dimension_height_s; 
                     /*.Complete_Button_Icon_hover ;*/
                 }
             }
 
             img.sideboxstar {
                 margin-right: 1ex; 
-                height: 16px; 
+                .dimension_height_s; 
                 .Complete_Button_Icon_normal;
 				background-size: 16px 16px;
 				background-position: center;
-                &:hover {height: 16px; .Complete_Button_Icon_hover ;}
+                &:hover {.dimension_height_s; .Complete_Button_Icon_hover ;}
 
             }
 
@@ -1315,8 +1321,7 @@ div.message.floating {
                          /*.Complete_Button_Icon_hover ;*/
                 }
 
-                img { height: 16px; 
-                      width: 16px;
+                img { .dimension_width_height_s ;
                 }
             }
 
@@ -1333,11 +1338,6 @@ div.message.floating {
         background-image: none;
     }	
     div.ui-icon-trash{
-        //								margin-top: -5px;
-        //					 			margin-right: 2px;
-
-
-        //								background: transparent;
 
         background-image:url(../images/delete.png);
         background-size: 16px 16px;
@@ -1469,7 +1469,7 @@ div.et2_progress {
     text-align: left;
 }
 div.et2_progress > div {
-    background-color: #D00000;
+    background-color: @color-progress;
     height: 5px;
 }
 
@@ -1654,6 +1654,15 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
     overflow-x: hidden;
 }
 
+/**
+ * et2_textbox
+ */
+
+textarea,
+textarea.description {
+    background-color: @color-optional;
+    padding: 0.3em 0 0 0.3em;
+}
 
 } // Ende Media all
 
@@ -1673,4 +1682,5 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
 
 }
 
-//
\ No newline at end of file
+//
+//
\ No newline at end of file
diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less
index 78cb7c2e48..4c221fb7a9 100755
--- a/pixelegg/less/jquery-ui.less
+++ b/pixelegg/less/jquery-ui.less
@@ -13,6 +13,7 @@
  */
 
 @import (reference) "def_design_pattern_color_font_shadow.less";
+@import (reference) "def_buttons.less";
 
 // calender
 
@@ -49,7 +50,7 @@ option:checked {background-color: @egw_color_1_e;}
     font-size: 1em;
 }
 .ui-widget-content {
-    .bordered (@color-hint,@color-hint,@color-hint,@color-hint);
+    /*.bordered (@color-hint,@color-hint,@color-hint,@color-hint);*/
 
     //	border: 1px solid #a6c9e2;
     //	background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x;
@@ -215,16 +216,17 @@ span.ui-icon-search{
 
 .ui-dialog-buttonset{ 
 
-    button {
-        background-color: @gray-20 !important;
-        &:hover{ background-color: @gray-30 !important;}        
+    button{
+        .Complete_Button_normal;
+
+        &:hover{ background-color: @gray-30; color: @gray-90;}
     }
 
     button.ui-button-text-only {background-color: @gray-20 !important; 
                                 background: inherit; 
                                 color: @gray-100 !important; 
                                 font-weight: normal !important;
-                                
+
                                 &:hover{ background-color: @gray-30 !important;}
     }
 }
diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less
index a69ac6e235..43981f229e 100755
--- a/pixelegg/less/layout_content_elements.less
+++ b/pixelegg/less/layout_content_elements.less
@@ -77,23 +77,10 @@ input {
 
 select {
 
-    .Complete_Button_select;
+    /*.Complete_Button_select;*/
     padding:3px;
     margin: 0;
     .rounded (4px);
-    //	.drop-shadow( 0, 3px, 0, 191, 191, 191, 0.1, inset);
-    -webkit-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
-    -moz-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
-    box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
-    background: #f8f8f8;
-    color:#888;
-    border:none;
-    outline:none;
-    display: inline-block;
-    -webkit-appearance:none;
-    -moz-appearance:none;
-    appearance:none;
-    cursor:pointer;
 
     &:hover{.Complete_Button_select_hover;}
     &:focus{.Complete_Button_select_focus;}
@@ -147,16 +134,7 @@ h6 {
 /*table {font-size: 16px;}*/
 
 
-/////* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-    select {
-        padding-right: 20px !important;
-        -webkit-appearance:none;
-        margin:0;
-        background:  #ffffff url(../images/selectarrowdown.png) no-repeat center right;
-        background-size: 20px auto;
-    }
-}
+
 
 select {
     position:relative;
@@ -382,6 +360,8 @@ a:hover,a:active
     text-decoration: underline;
 }
 
+
+
 .divLoginboxHeader,
 .divSideboxHeader,
 a.appTitles,
@@ -820,19 +800,71 @@ button[id*="delete"]{
 
 }
 
-// Hover
+            // Hover
 
-input[type="submit"][id*="delete"]:hover,
-input[type="button"][id*="delete"]:hover,
-button[id*="delete"]:hover {
+            input[type="submit"][id*="delete"]:hover,
+            input[type="button"][id*="delete"]:hover,
+            button[id*="delete"]:hover {
 
-    background-image:url('../images/delete-hover.png') !important;
-    background-color: red !important;
-    .Complete_Button_text_icon_before;
-    color: @gray-0;
+                background-image:url('../images/delete-hover.png') !important;
+                background-color: red !important;
+                .Complete_Button_text_icon_before;
+                color: @gray-0;
+            }
+
+/* #####################################################
+ *  Button edit + save + apply + copy = positive action   */
+ 
+button[id*="save"] {
+    &:active {background-color: @color-positive-action;}
+}
+button[id*="apply"]{
+    &:active {background-color: @color-positive-action;}
+}
+button[id*="copy"]{  
+    &:active {background-color: @color-positive-action;}
+    }
+    
+button[id*="edit_button[edit]"]{
+    &:active {background-color: @color-positive-action;}
 }
 
+button#filemanager-select_button[ok]{
+    &:active {background-color: @color-positive-action;}
+}
 
+/*ui-widget*/
+button#series {
+    &:active {background-color: @color-positive-action !important;}
+}
+button#exception {
+    &:active {background-color: @color-positive-action !important;}
+}
+
+/*calendar series add*/
+#calendar-edit_add {
+    &:active {background-color: @color-positive-action !important;}
+/*    .Complete_Button_add;
+    &:hover {.Complete_Button_add_hover;} */
+}
+/*calendar search freetime*/
+#calendar-edit_freetime{
+    &:active {background-color: @color-positive-action !important;}
+}
+/*calendar search freetime*/
+button[id*="edit_button[add_alarm]"]{
+    &:active {background-color: @color-positive-action !important;}
+}
+/* #####################################################*/
+ /*Button cancel */
+ 
+button[id*="cancel"] {
+
+    &:active {background-color: @color-hint;}
+
+}
+ 
+ 
 
 /* #####################################################*/
  /*Button abbruch / cancel */
@@ -854,4 +886,20 @@ button.et2_button_with_image{
 button.add {
     .Complete_Button_add ;
 }
+
+
+
+
+/////* Targetting Webkit browsers only. FF will show the dropdown arrow with so much padding. */
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    select {
+        padding-right: 20px !important;
+        -webkit-appearance:none;
+        margin:0;
+        background:  #ffffff url(../images/selectarrowdown.png) no-repeat center right;
+        background-size: 20px auto;
+    }
+}
+//
+//
 //
\ No newline at end of file
diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less
index dab4baeb35..d96f750b05 100755
Binary files a/pixelegg/less/layout_dialog.less and b/pixelegg/less/layout_dialog.less differ
diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less
index 407beaf32e..8c068cf421 100755
--- a/pixelegg/less/layout_messages.less
+++ b/pixelegg/less/layout_messages.less
@@ -15,6 +15,14 @@
 @import (reference) "def_design_pattern_color_font_shadow.less";
 //@import "def_buttons.less";
 
+#msg,.message {
+            color: red;
+            font-style: italic;
+            background: @gray-0;
+}
+
+
+
 .egw_fw_ui_app_header_container {
 
 		border-width: 9px 0px 0px 9px;
@@ -51,4 +59,21 @@
 
 
 		}
-                
\ No newline at end of file
+
+                
+ /*Calendar ##############*/
+ 
+ td.message {
+        
+     span.message {
+                 height: 35px;
+                border-bottom: 2px solid @gray-10;
+                 color: white;
+                 background: red;
+                 height: auto;
+                 width: 100%;
+     }
+     
+ }
+ 
+ //
\ No newline at end of file
diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less
index 097ae98ebf..a6058744f3 100644
--- a/pixelegg/less/layout_raster.less
+++ b/pixelegg/less/layout_raster.less
@@ -81,11 +81,9 @@
         #egw_fw_topmenu_items {
             float: left;
             padding-top: 10px;
-            //														height: 30px;
 
             ul {
-                //															padding: 10px;
-                //															margin-left: 2em;
+
 
                 li{
                     .color-100-gray;
@@ -94,17 +92,87 @@
                     .Complete_Button_normal;
 
                     &:hover{.Complete_Button_hover;.color-100-gray;}
-                    a {.color-100-gray;}
+                    &:active {.Complete_Button_active;}
+                    
+                    
+                    a {.color-100-gray; text-decoration: none; }
+                    
                     a:hover {
                         .color-50-gray;
                         border-color: @gray-50;
+                        text-decoration: none !important;
+                        
                     }
                 }
 
+                /*Home*/
                 li:first-child{
                     margin-left: 10px;
                     :before{border: none;}
+                    a:before {
+                        padding-right: 5px;
+                        content: url(../images/topmenu_items/home.png);
+                        .dimension_width_height_s;
+                    }
+                    
                 }
+                
+                /*Setup*/
+                li:nth-child(2){
+                    a:before {
+                        padding-right: 5px;
+                        content: url(../images/topmenu_items/setup.png);
+                        .dimension_width_height_s;
+                    }    
+                } 
+                /*access*/
+                 li:nth-child(3){
+                    a:before {
+                        padding-right: 5px;
+                        content: url(../images/topmenu_items/access.png);
+                        .dimension_width_height_s;
+                    }    
+                }               
+                /*category*/
+                 li:nth-child(4){
+                    a:before {
+                        padding-right: 5px;
+                        content: url(../images/topmenu_items/category.png);
+                        .dimension_width_height_s;
+                    }    
+                }               
+                /*password*/
+                 li:nth-child(5){
+                    a:before {
+                        padding-right: 5px;
+                        content: url(../images/topmenu_items/password.png);
+                        .dimension_width_height_s;
+                    }    
+                }               
+                /*help*/
+                 li:nth-child(6){
+                    a:before {
+                        padding-right: 5px;
+                        content: url(../images/topmenu_items/help.png);
+                        .dimension_width_height_s;
+                    }    
+                }               
+                /*Search*/
+                 li:nth-child(7){
+                    a:before {
+                        padding-right: 5px;
+                        content: url(../images/topmenu_items/search.png);
+                        .dimension_width_height_s;
+                    }    
+                }               
+                /*logout*/
+                li:nth-child(8){
+                    a:before {
+                        padding-right: 5px;
+                        content: url(../images/topmenu_items/logout.png);
+                        .dimension_width_height_s;
+                    }    
+                }                
             } // Ende ul
 
 
@@ -229,7 +297,7 @@
 
 
         &:hover {.box_shadow_standard_light_hover;}
-        
+        &:active {.Complete_Button_active;}
          &:focus {.box_shadow_standard_light_inset;}
     }
 
@@ -256,7 +324,7 @@
         right: 45px;
         z-index: 200;
         &:hover {.box_shadow_standard_light_hover;}
-
+        &:active {.Complete_Button_active;}
         &:focus {.box_shadow_standard_light_inset;}
 
     }
@@ -346,19 +414,32 @@
 
 
             // Alle Tabs
+            div.ui-sortable {
+                
+                div {
+                    padding: 3px 0 1px 3px;
+                    cursor: pointer;
+                
+ 
+                
+                }
+                
+            }
+            
             .egw_fw_ui_sidemenu_entry_header {
-                cursor: pointer;
+                
 
                 display: block;
-                height: 30px;
                 margin: 0 0;
-                padding: 4px 5px 5px 15px;
-                .background-color-5-gray;
-                background-image: none;
-                border-color: @gray-10;
+                /*padding: 0px 5px 5px 10px;*/
+
+               &:hover {  
+                    .background-color-15-gray;
+                    .rounded(5px);
+                    }
+                    
+               &:active {.box_shadow_standard_light_inset;}
 
-                .rounded(5px);
-                &:hover {  .background-color-15-gray;}
 
                 h1 {
                     font-size: 1em;
@@ -647,11 +728,11 @@
         padding: 0px;
         margin: 0px 5px;
         float: left;
-        .Complete_Button_Icon_normal;
+        /*.Complete_Button_Icon_normal;*/
         background-image: url("../images/bullet.png");
 		background-size: 16px 16px;
 		background-position: center;
-		 &:hover {height: 16px; .Complete_Button_Icon_hover ;}
+		 /*&:hover {height: 16px; .Complete_Button_Icon_hover ;}*/
     }
 
     input {
diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less
index 961faa7ae2..1ba45b9287 100755
Binary files a/pixelegg/less/layout_table.less and b/pixelegg/less/layout_table.less differ