diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 73aa8413f5..2b3708c404 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -407,7 +407,7 @@ action buttons, left aligned for "extra" controls
 .loading {
   background-position: center;
   background-repeat: no-repeat;
-  background-image: url('images/ajax-loader.gif');
+  background-image: url('../images/ajax-loader.gif');
 }
 /**
  * File upload
@@ -815,19 +815,20 @@ div.message.floating {
   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 .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;
+  width: 15%;
 }
 .nextmatch_header .et2_button_icon {
   vertical-align: middle;
@@ -840,14 +841,14 @@ div.message.floating {
   background-image: none;
   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;
-}
+/*.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;
@@ -1386,6 +1387,7 @@ option:checked {
   border-bottom: solid 1px 1px;
   border-color: #f0f0f0;
   background: #ffc200;
+  background-image: none !important;
   color: #000000;
 }
 .ui-state-hover a,
@@ -1456,6 +1458,24 @@ option:checked {
   color: #ffffff;
   background-color: #ff0000;
 }
+span.ui-icon-search {
+  background-image: url(../images/search.png) !important;
+  background-position: 0px;
+  background-size: 10px 10px;
+}
+/*###########################################*/
+/*Dialog: edit row*/
+.ui-widget-content .et2_selectbox button.et2_button_text,
+.ui-widget-content .et2_selectbox select.et2_selectbox {
+  height: 20px;
+}
+.ui-widget-content .et2_selectbox button {
+  background-image: none;
+}
+.ui-widget-content .et2_selectbox div.ui-widget-header ul li label.ui-state-hover {
+  background-color: #ffc200;
+  font-weight: normal;
+}
 /**
  * EGroupware: Stylite Pixelegg template
  *
@@ -1686,399 +1706,7 @@ option:checked {
 /**
  * layout_*.less files are Pixelegg template specific
  */
-/**
- * EGroupware: CSS with less preprocessor
- *
- * Definitions for apps
- *
- * Please do NOT change css-files directly, instead change less-files and compile them!
- *
- * @link http://www.egroupware.org
- * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
- * @package phpgwapi
- * @version $Id$
- * 
- * definitions of globally used items (buttons, fields, tables)
- * 
- */
-input[type="submit"],
-input[type="button"],
-input[type="reset"],
-button,
-.egwbutton {
-  background-color: #B9D5E3;
-  border: 1px outset #B9D5E3;
-  color: #004E7D;
-}
-.et2_button_text,
-input[type="button"] {
-  background-color: #f0f0f0;
-  color: #b3b3b3;
-  margin: 5px;
-  padding: 3px;
-  border-radius: 20px 3px 3px 3px;
-  -webkit-border-radius: 20px 3px 3px 3px;
-  -moz-border-radius: 20px 3px 3px 3px;
-}
-.et2_button_text :before,
-input[type="button"] :before {
-  content: "►";
-  color: red;
-  font-size: 50px;
-}
-/**##################################################################################################
- * Button widget - text only, and icon
- *
- * ##################################################################################################
- */
-.et2_button_text,
-input[type=button] {
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  background-color: #f0f0f0;
-  border-color: #808080;
-  cursor: pointer;
-  -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);
-}
-.et2_button_text:hover,
-input[type=button]:hover {
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  border: 1px solid rgba(0, 0, 0, 0.5);
-  text-align: center;
-  cursor: pointer;
-  background-color: #b3b3b3 !important;
-}
-.et2_button_text:active,
-input[type=button]:active {
-  color: #000000;
-}
-.et2_button_text:focus,
-input[type=button]:focus {
-  color: #000000;
-}
-/* Button Hinzufügen */
-#add.et2_button {
-  background-color: #0b5fa4;
-  color: #FFF;
-  text-shadow: none;
-  height: 35px;
-  background-image: none !important;
-  -webkit-border-radius: 3px;
-  -webkit-border-top-left-radius: 20px;
-  -moz-border-radius: 3px;
-  -moz-border-radius-topleft: 20px;
-  border-radius: 3px;
-  border-top-left-radius: 20px;
-}
-#add.et2_button:before {
-  content: "+";
-  font-size: 2em;
-  color: #ffc200;
-}
-input[type="submit"][id="edit"],
-input[type="button"][id="edit"],
-button[id*="edit"],
-input[type="submit"][id="edit"]:hover,
-input[type="button"][id="edit"]:hover,
-button[id*="edit"]:hover {
-  background-image: url('../images/edit.png');
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-}
-input[type="submit"][id*="copy"],
-input[type="button"][id*="copy"],
-button[id*="copy"],
-input[type="submit"][id*="copy"]:hover,
-input[type="button"][id*="copy"]:hover,
-button[id*="copy"]:hover {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/copy.png');
-}
-input[type="submit"][id*="cancel"],
-input[type="button"][id*="cancel"],
-button[id*="cancel"],
-input[type="submit"][id*="cancel"]:hover,
-input[type="button"][id*="cancel"]:hover,
-button[id*="cancel"]:hover {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/cancel.png');
-}
-input[type="submit"][id*="delete"],
-input[type="button"][id*="delete"],
-button[id*="delete"] {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/delete.png');
-  margin-left: 3em;
-}
-input[type="submit"][id*="delete"]:hover,
-input[type="button"][id*="delete"]:hover,
-button[id*="delete"]:hover {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/delete.png');
-  background-color: red !important;
-}
-input[type="submit"][id*="apply"],
-input[type="button"][id*="apply"],
-button[id*="apply"],
-input[type="submit"][id*="apply"]:hover,
-input[type="button"][id*="apply"]:hover,
-button[id*="apply"]:hover {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/apply.png');
-}
-input[type="submit"][id*="save"],
-input[type="button"][id*="save"],
-button[id*="save"],
-input[type="submit"][id*="save"]:hover,
-input[type="button"][id*="save"]:hover,
-button[id*="save"]:hover {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/save.png');
-}
-input[type="submit"][id*="search"],
-input[type="button"][id*="search"],
-button[id*="search"] {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/advanced-search.png');
-}
-input[type="submit"][id*="search"]:hover,
-input[type="button"][id*="search"]:hover,
-button[id*="search"]: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-image: url('../images/advanced-search.png');
-}
-input[type="submit"][id*="search"]:focus,
-input[type="button"][id*="search"]:focus,
-button[id*="search"]: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);
-  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
-}
-button.button_ok {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/save.png');
-}
-button.button_ok:hover {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/save.png');
-}
-button#infolog-index_legacy_actions {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url('../images/edit.png');
-}
-button#infolog-index_legacy_actions: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-image: url('../images/edit.png');
-}
-button#infolog-index_legacy_actions: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);
-  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
-}
-button[id*="note"] {
-  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;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-}
-button[id*="note"]: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);
-}
-button[id*="note"]: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);
-  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
-}
-button#mail-compose_button[send],
-button#mail-compose_button[id*="send"],
-.mail-compose_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);
-  color: #000000;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  background-image: url(../../mail/templates/default/images/mail_send.png) !important;
-  height: 26px;
-  padding: 0 3px 0 0;
-  background-color: #d9d9d9;
-}
-button#mail-compose_button[send]:hover,
-button#mail-compose_button[id*="send"]:hover,
-.mail-compose_button: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);
-}
-button#mail-compose_button[send]:focus,
-button#mail-compose_button[id*="send"]:focus,
-.mail-compose_button: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);
-  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
-}
-button[id*="add_alarm"] {
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  color: #000000;
-  padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  width: auto;
-  height: 32px;
-  -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);
-  background-image: url("../images/k_alarm.png") !important;
-  height: 26px;
-  padding: 0 3px 0 0;
-  background-color: #d9d9d9;
-}
-button[id*="add_alarm"]: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);
-  height: 26px;
-}
-button[id*="add_alarm"]: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);
-  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
-  height: 26px;
-}
+/*@import "../less/layout_buttons_global.less";*/
 /**
  * EGroupware: Stylite Pixelegg template
  *
@@ -2346,7 +1974,11 @@ h6 {
 /*table {font-size: 16px;}*/
 @media screen and (-webkit-min-device-pixel-ratio: 0) {
   select {
-    padding-right: 18px;
+    padding-right: 20px !important;
+    -webkit-appearance: none;
+    margin: 0;
+    background: #ffffff url(../images/selectarrowdown.png) no-repeat center right;
+    background-size: 20px auto;
   }
 }
 select {
@@ -2659,7 +2291,7 @@ td.lettersearch {
   display: inline-block;
   width: 16px;
   height: 16px;
-  background-image: url(images/ajax-loader.gif);
+  background-image: url(../images/ajax-loader.gif);
   background-repeat: no-repeat;
   background-position: center;
   float: right;
@@ -2882,6 +2514,59 @@ a.textSidebox {
   text-align: center;
   width: 99%;
 }
+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);
+  color: #000000;
+  padding-left: 30px !important;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
+  width: auto;
+  height: 32px;
+  /*    background-repeat: no-repeat;
+    background-position: 6px center;
+    background-size: 20px auto;*/
+}
+button:hover {
+  background-color: #b3b3b3 !important;
+}
+input[type="submit"][id*="delete"],
+input[type="button"][id*="delete"],
+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);
+  color: #000000;
+  padding-left: 30px !important;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
+  width: auto;
+  height: 32px;
+}
+input[type="submit"][id*="delete"]:hover,
+input[type="button"][id*="delete"]:hover,
+button[id*="delete"]:hover {
+  background-image: url('../images/delete.png');
+  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);
+  color: #000000;
+  padding-left: 30px !important;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
+  width: auto;
+  height: 32px;
+}
 /**
  * EGroupware: Stylite Pixelegg template
  *
@@ -3300,7 +2985,7 @@ img {
  *
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
+ * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
  * @package pixelegg
  * @version $Id$
  */
@@ -3324,9 +3009,9 @@ img {
   width: 100%;
   float: left;
   /*     ###########################################################################################################################################
-    /* ###########################################################################################################################################
-    * Topmenu / Home / Einstellungen / usw..
-    /* ###########################################################################################################################################
+        /* ###########################################################################################################################################
+        * Topmenu / Home / Einstellungen / usw..
+        /* ###########################################################################################################################################
     */
 }
 #egw_fw_header #egw_divLogo {
@@ -3379,7 +3064,7 @@ img {
   border-color: #808080;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child {
-  margin-left: -28px;
+  margin-left: 10px;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child :before {
   border: none;
@@ -3394,35 +3079,52 @@ img {
   height: 15px;
   float: left;
   position: fixed;
-  left: 196px;
+  left: 194px;
 }
-#egw_fw_topmenu_slide .slidedown {
-  background-image: url("../images/slidedown.png");
+#egw_fw_topmenu_slide.slidedown {
+  background-image: url("../images/list.png");
   background-position: center center;
   height: 15px;
   width: 15px;
   display: block;
-  margin-left: 40px;
-  margin-top: 0px;
+  margin-left: 5px;
+  margin-top: 10px;
+  background-size: 15px 15px;
+  float: left;
+  position: relative;
+  left: -5px;
 }
-#egw_fw_topmenu_slide .slideup {
+#egw_fw_topmenu_slide.slideup {
   background-image: url("../images/slideup.png");
   background-position: center center;
   height: 15px;
   width: 15px;
   display: block;
-  margin-top: 10px;
+  margin-top: -55px;
   margin-left: 40px;
 }
+#slidetoggle {
+  width: 20px;
+  height: 20px;
+  display: block;
+}
 /*#################################################
 ###################################################
  Add / Print / Logout / 
     - Name / Date
 ###################################################*/
-#egw_fw_topmenu_addons {
-  /*Name / Datum / angemeldete User*/
-}
 #egw_fw_topmenu_addons span#quick_add {
+  background-color: #0b5fa4 !important;
+  color: #FFF;
+  text-shadow: none;
+  height: 35px;
+  background-image: none !important;
+  -webkit-border-radius: 3px;
+  -webkit-border-top-left-radius: 20px;
+  -moz-border-radius: 3px;
+  -moz-border-radius-topleft: 20px;
+  border-radius: 3px;
+  border-top-left-radius: 20px;
   position: fixed;
   right: 88px;
   top: 0;
@@ -3434,6 +3136,11 @@ img {
   font-size: 2em;
   color: #ffc200;
 }
+#egw_fw_topmenu_addons span#quick_add:before {
+  content: "+";
+  font-size: 2em;
+  color: #ffc200;
+}
 #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);
@@ -3443,6 +3150,11 @@ img {
   padding: 0 0 0 10px;
   font-size: 0.9em;
   line-height: 1.1em;
+  /*            option {
+                &:first-child{
+                    &:before {content: "+";font-size: 2em;color: @egw_color_1;}
+
+                }*/
 }
 #egw_fw_topmenu_addons span#quick_add select#quick_add_selectbox:hover {
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -3454,12 +3166,7 @@ img {
   -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_topmenu_addons span#quick_add select#quick_add_selectbox option:first-child:before {
-  content: "+";
-  font-size: 2em;
-  color: #ffc200;
-}
-#egw_fw_topmenu_addons #egw_fw_logout {
+#egw_fw_logout {
   background-image: url(../images/logout.png);
   background-size: 16px 16px;
   background-position: center center;
@@ -3481,12 +3188,12 @@ img {
   position: fixed;
   right: 5px;
 }
-#egw_fw_topmenu_addons #egw_fw_logout:hover {
+#egw_fw_logout: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);
 }
-#egw_fw_topmenu_addons #egw_fw_print {
+#egw_fw_print {
   background-image: url(../images/print.png);
   background-size: 16px 16px;
   background-position: center center;
@@ -3508,44 +3215,45 @@ img {
   right: 45px;
   z-index: 200;
 }
-#egw_fw_topmenu_addons #egw_fw_print:hover {
+#egw_fw_print: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);
 }
-#egw_fw_topmenu_addons #egw_fw_print:focus {
+#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);
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items {
+/*Name / Datum / angemeldete User*/
+#egw_fw_topmenu_info_items {
   padding-right: 20px;
   white-space: nowrap;
   float: right;
   display: flex;
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(2) {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(2) {
   /*float: right;*/
   margin-top: 0;
   font-size: 1em;
   padding-right: 5px;
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3) {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3) {
   position: relative;
   top: 0px;
   display: inline-block;
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):hover {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):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);
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):focus {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):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);
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):before {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):before {
   content: "| ";
   font-size: 1em;
   color: #0c5da5;
@@ -4125,16 +3833,12 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
 * Nextmatch widget
 */
 .et2_nextmatch .nextmatch_header > .filters {
-  padding: 0 0 0 1em;
+  border: none !important;
+  background-image: none !important;
   background-color: #f0f0f0;
-  margin-bottom: 3px;
-  margin: 0em;
-  border-width: 0 0 1px 0;
-  border-color: #d9d9d9;
-  background-image: none;
 }
 .et2_nextmatch {
-  /* Left & right headers*/
+  background-color: #f0f0f0;
   /* Favorites */
 }
 .et2_nextmatch div > .header {
@@ -4147,8 +3851,8 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
   width: auto;
 }
 .et2_nextmatch .nextmatch_header {
-  border: none;
-  background-image: none;
+  border: none !important;
+  background-image: none !important;
   background-color: #f0f0f0;
   background-size: 80% 10;
   margin-bottom: 3px;
@@ -4192,12 +3896,8 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
 .et2_nextmatch .nextmatch_header .header_count {
   position: relative;
   top: 7px;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  background-color: #f0f0f0;
-  border-color: #808080;
-  cursor: pointer;
+  width: 50px;
+  font-size: 0.8em;
 }
 .et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper,
 .et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper,
@@ -4220,14 +3920,32 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
 .et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown,
 .et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown,
 .et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown {
-  height: 2em;
+  /*linke Seite Bild*/
 }
-.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown img,
-.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown img,
-.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown img,
-.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown img {
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown button#ui-corner-left,
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown .ui-state-default,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown .ui-state-default,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown .ui-state-default,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown .ui-state-default {
+  background-image: none;
+  width: auto;
+}
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button#ui-corner-left img,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button#ui-corner-left img,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown button#ui-corner-left img,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown button#ui-corner-left img,
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown .ui-state-default img,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown .ui-state-default img,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown .ui-state-default img,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown .ui-state-default img {
   height: 16px;
   width: 16px;
+  text-align: left;
+  position: relative;
+  right: 20px;
 }
 .et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button,
 .et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button,
@@ -4307,21 +4025,30 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
   margin-top: 8px;
   vertical-align: middle;
 }
+/*#########################################################
+#
+# Filterleiste
+#
+#########################################################*/
 .filters {
-  padding: 0 0 0 1em;
+  padding: 0 0 1em 1em;
   background-color: #f0f0f0;
-  margin-bottom: 3px;
-  margin: 0em;
   border-width: 0 0 1px 0;
   border-color: #d9d9d9;
   background-image: none;
   width: 80%;
+  margin-bottom: 1em;
 }
 .filters img.et2_button_icon {
   float: right;
   position: relative;
   top: 0px;
 }
+.filters select,
+.filters input,
+.filters button {
+  height: 20px;
+}
 .filters 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);
@@ -4337,7 +4064,6 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
   cursor: pointer;
   margin-right: 2ex;
   padding: 5px;
-  height: 25px;
   padding: 0px 0px 0px 3px;
 }
 .filters select:hover {
@@ -4362,7 +4088,6 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  height: 25px;
 }
 .filters input:hover {
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -4388,6 +4113,8 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
   cursor: pointer;
   padding: 3px;
   margin-left: 5px;
+  background-image: none;
+  width: auto;
 }
 .filters button:hover {
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -4473,6 +4200,7 @@ div.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et2
  * @package pixelegg
  * @version $Id$
  */
+/*@import (reference) "def_content_elements.less";*/
 /*Main div*/
 table.dialog-main-view {
   width: 100%;
diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less
index d000d4a2be..a01f36f4a1 100644
Binary files a/pixelegg/css/pixelegg.less and b/pixelegg/css/pixelegg.less differ
diff --git a/pixelegg/images/ajax-loader.gif b/pixelegg/images/ajax-loader.gif
new file mode 100755
index 0000000000..84ee0a68b4
Binary files /dev/null and b/pixelegg/images/ajax-loader.gif differ
diff --git a/pixelegg/images/list.png b/pixelegg/images/list.png
new file mode 100755
index 0000000000..15c40c84b1
Binary files /dev/null and b/pixelegg/images/list.png differ
diff --git a/pixelegg/images/more-white.png b/pixelegg/images/more-white.png
index 48e9bfe146..fc35c650f3 100644
Binary files a/pixelegg/images/more-white.png and b/pixelegg/images/more-white.png differ
diff --git a/pixelegg/images/selectarrowdown.png b/pixelegg/images/selectarrowdown.png
new file mode 100755
index 0000000000..2028cfed47
Binary files /dev/null and b/pixelegg/images/selectarrowdown.png differ
diff --git a/pixelegg/images/view.png b/pixelegg/images/view.png
new file mode 100755
index 0000000000..bb67b72634
Binary files /dev/null and b/pixelegg/images/view.png differ
diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js
index 77b9d1f200..eb2f792415 100644
--- a/pixelegg/js/slider.js
+++ b/pixelegg/js/slider.js
@@ -3,7 +3,7 @@
  *
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
+ * @author Wolfgang Ott <wolfgang.ott@pixelegg.de>
  * @package pixelegg
  * @version $Id: class.pixelegg_framework.inc.php 2741 2013-11-14 13:53:24Z ralfbecker $
  */
@@ -13,20 +13,22 @@ function show_pixelegg_header(_toggle, _delay)
 	$j("#egw_fw_header").slideToggle();
 	$j("#egw_fw_topmenu_addons").animate({'margin-right': '20px'},_delay);
 	$j("#egw_fw_sidebar").animate({'top':'57px'},_delay);
-	$j(_toggle).removeClass("slidedown");
-	$j(_toggle).addClass("slideup");
+        $j("#egw_fw_tabs").animate({'margin-top':'0px'},_delay);
+	$j(_toggle).parent().removeClass("slidedown");
+	$j(_toggle).parent().addClass("slideup");
 }
 
 function hide_pixelegg_header(_toggle, _delay)
 {
 	$j("#egw_fw_header").slideToggle();
-	$j("#egw_fw_sidebar").animate({'top':'12px'},_delay);
+	$j("#egw_fw_sidebar").animate({'top':'0px'},_delay);
 	$j("#egw_fw_topmenu_info_items").show();
 	$j("#egw_fw_logout").show();
 	$j("#egw_fw_print").show();
-	$j("#egw_fw_topmenu_addons").animate({'margin-right': '250px'},_delay);
-	$j(_toggle).removeClass("slideup");
-	$j(_toggle).addClass("slidedown");
+        $j("#egw_fw_tabs").animate({'margin-top':'-13px'},_delay);
+	$j("#egw_fw_topmenu_addons").animate({'margin-right': '270px'},_delay);
+	$j(_toggle).parent().removeClass("slideup");
+	$j(_toggle).parent().addClass("slidedown");
 }
 
 egw_LAB.wait(function() {
diff --git a/pixelegg/less/def_buttons.less b/pixelegg/less/def_buttons.less
index 589531edb2..659a9fa4f3 100755
--- a/pixelegg/less/def_buttons.less
+++ b/pixelegg/less/def_buttons.less
@@ -44,7 +44,7 @@
 // komplette Schaltflächen
 
 .Complete_Button_add {
-	background-color: @egw_color_blue_lighter;
+	background-color: @egw_color_blue_lighter !important;
 	color: #FFF;
 	text-shadow: none;
 	height: 35px;
@@ -216,9 +216,9 @@
 .Complete_Button_text_icon_before{
 	.Complete_Button_normal;
 	padding-left: 30px !important;
-	background-position: 6px center;
-	background-repeat: no-repeat;
-	background-size: 20px auto;
+	background-position: 6px center !important;
+	background-repeat: no-repeat !important;
+	background-size: 20px auto !important;
 	.Button_size_h32_auto;
 }
 
diff --git a/pixelegg/less/def_content_elements.less b/pixelegg/less/def_content_elements.less
index 7af5238d4e..9e4938f299 100755
--- a/pixelegg/less/def_content_elements.less
+++ b/pixelegg/less/def_content_elements.less
@@ -497,7 +497,7 @@ td.lettersearch {
 	display: inline-block;
 	width: 16px;
 	height: 16px;
-	background-image:url(images/ajax-loader.gif);
+	background-image:url(../images/ajax-loader.gif);
 	background-repeat: no-repeat;
 	background-position: center;
 	float: right;
@@ -795,4 +795,6 @@ a.textSidebox
 	bottom:4px;
 	text-align:center;
 	width:99%;
-}
\ No newline at end of file
+}
+
+//
\ No newline at end of file
diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less
index 5c31be1589..be81149f27 100755
--- a/pixelegg/less/def_design_pattern_color_font_shadow.less
+++ b/pixelegg/less/def_design_pattern_color_font_shadow.less
@@ -354,19 +354,16 @@
 }
 
 
-
+/*
 // Flächen
 
 // Hintergrund für Filter
-// Filterfläche
+// Filterfläche*/
 
-.Rectangle_filters {
-
-				padding: 0 0 0 1em;
+.nm_filters_rectangle {
 
+				padding: 0 0 1em 1em;
 				.background-color-10-gray;
-				margin-bottom: 3px;
-				margin: 0em;
 //				vertical-align: top;
 				border-width: 0 0 1px 0;
 				.border-color-15-gray;
@@ -374,6 +371,8 @@
 
 }
 
+
+
 /*---------------------------------------------------
     LESS Elements 0.9
   ---------------------------------------------------
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 7d83627f5d..772aca64e8 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -428,7 +428,7 @@ action buttons, left aligned for "extra" controls
 .loading {
     background-position: center;
     background-repeat: no-repeat;
-    background-image: url('images/ajax-loader.gif');
+    background-image: url('../images/ajax-loader.gif');
 }
 
 /**
@@ -881,19 +881,20 @@ div.message.floating {
     border: none;
 }
 
-.nextmatch_header .header_count {
+/*.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;
+    width: 15%;
 }
 .nextmatch_header .et2_button_icon {
     vertical-align: middle;
@@ -908,14 +909,14 @@ div.message.floating {
     margin-bottom: 3px;
     //	margin-right: 3px;
 }
-.et2_nextmatch .nextmatch_header > .filters {
+/*.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;
diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less
index 620781c552..a527b27f90 100755
--- a/pixelegg/less/jquery-ui.less
+++ b/pixelegg/less/jquery-ui.less
@@ -108,6 +108,7 @@ option:checked {background-color: @egw_color_1_e;}
 	.border-color-10-gray;
 //	background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x;
 	background: @color-hint;
+        background-image: none !important;
 //	font-size: 105%;
 	.color-100-gray;
 }
@@ -174,4 +175,39 @@ option:checked {background-color: @egw_color_1_e;}
     
   .color-0-gray;
   background-color: @red;
-}
\ No newline at end of file
+}
+
+
+span.ui-icon-search{
+background-image: url(../images/search.png) !important;
+background-position: 0px;
+background-size: 10px 10px;
+    
+}
+
+
+/*###########################################*/
+/*Dialog: edit row*/
+
+
+.ui-widget-content {
+    
+        .et2_selectbox {
+        
+                    button.et2_button_text, 
+                    select.et2_selectbox {height: 20px;}
+
+                    button {background-image: none;}
+
+                    div.ui-widget-header {
+
+                            ul li label.ui-state-hover {background-color: @color-hint; font-weight: normal;}
+
+                                        } 
+
+                         }
+    
+}
+
+
+//
\ No newline at end of file
diff --git a/pixelegg/less/layout_buttons_global.less b/pixelegg/less/layout_buttons_global.less
index 88602e3c5b..e69de29bb2 100755
--- a/pixelegg/less/layout_buttons_global.less
+++ b/pixelegg/less/layout_buttons_global.less
@@ -1,271 +0,0 @@
-/**
- * EGroupware: CSS with less preprocessor
- *
- * Definitions for apps
- *
- * Please do NOT change css-files directly, instead change less-files and compile them!
- *
- * @link http://www.egroupware.org
- * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
- * @package phpgwapi
- * @version $Id$
- * 
- * definitions of globally used items (buttons, fields, tables)
- * 
- */
-
-@import (reference) "def_design_pattern_color_font_shadow.less";
-@import (reference) "def_buttons.less";
-
-
-//########################################################################################################
-// Buttons
-//
-//########################################################################################################
-// #####################################################
-
-//Buttons et2
-
-input[type="submit"],
-input[type="button"],
-input[type="reset"],
-button, .egwbutton {
-    background-color: #B9D5E3;
-    border: 1px outset #B9D5E3;
-    color: #004E7D;
-}
-.et2_button_text,
-input[type="button"] {
-    .background-color-10-gray;
-
-    .color-30-gray;
-
-    margin: 5px;
-    padding: 3px;
-    border-radius: 20px 3px 3px 3px;
-    -webkit-border-radius: 20px 3px 3px 3px;
-	-moz-border-radius: 20px 3px 3px 3px;
-
-    :before {content: "►"; color: red; font-size: 50px; }
-}
-
-/**##################################################################################################
- * Button widget - text only, and icon
- *
- * ##################################################################################################
- */
-//.et2_button {
-//	cursor: pointer;
-//	text-align: center;
-//	font-size: 9pt;
-//	text-shadow: 1px 1px #E0E0E0;
-//}
-
-// Button mit Text
-
-.et2_button_text,
-input[type=button] {
-		.Complete_Button_text;
-	 	.box_shadow_standard_light;
-
-	 &:hover {.Complete_Button_text_hover;}
-	 &:active {.Complete_Button_text_active;}
-	 &:focus {.Complete_Button_text_active;}
-}
-
-
-// Button mit Bild
-//
-//.et2_button_icon {
-//	border: none;
-//	background: transparent;
-//	padding: 0px;
-//}
-//
-// #####################################################
-/* Button Hinzufügen */
-#add.et2_button {
-	.Complete_Button_add;
-//	&:before {.Complete_Button_add_before;}
-	}
-
-
-
-
-// #####################################################
-// Button bearbeiten
-
-input[type="submit"][id="edit"],
-input[type="button"][id="edit"],
-button[id*="edit"],
-input[type="submit"][id="edit"]:hover,
-input[type="button"][id="edit"]:hover,
-button[id*="edit"]:hover {
-	background-image:url('../images/edit.png');
-	.Complete_Button_text_icon_before;
-}
-
-// #####################################################
-// Button Kopieren
-
-input[type="submit"][id*="copy"],
-input[type="button"][id*="copy"],
-button[id*="copy"],
-input[type="submit"][id*="copy"]:hover,
-input[type="button"][id*="copy"]:hover,
-button[id*="copy"]:hover{
-	.Complete_Button_text_icon_before;
-	background-image:url('../images/copy.png');
-}
-// #####################################################
-// Button Abbruch
-
-input[type="submit"][id*="cancel"],
-input[type="button"][id*="cancel"],
-button[id*="cancel"],
-input[type="submit"][id*="cancel"]:hover,
-input[type="button"][id*="cancel"]:hover,
-button[id*="cancel"]:hover{
-	.Complete_Button_text_icon_before;
-	background-image:url('../images/cancel.png');
-}
-
-// #####################################################
-// Button löschen
-
-input[type="submit"][id*="delete"],
-input[type="button"][id*="delete"],
-button[id*="delete"]  {
-	.Complete_Button_text_icon_before;
-	background-image:url('../images/delete.png');
-	margin-left: 3em;
-
-}
-input[type="submit"][id*="delete"]:hover,
-input[type="button"][id*="delete"]:hover,
-button[id*="delete"]:hover {
-	.Complete_Button_text_icon_before;
-	background-image:url('../images/delete.png');
-	background-color: red !important;
-}
-// #####################################################
-// Button übernehmen
-
-input[type="submit"][id*="apply"],
-input[type="button"][id*="apply"],
-button[id*="apply"],
-input[type="submit"][id*="apply"]:hover,
-input[type="button"][id*="apply"]:hover,
-button[id*="apply"]:hover {
-	.Complete_Button_text_icon_before;
-	background-image:url('../images/apply.png');
-}
-
-// #####################################################
-// Button speichern
-
-input[type="submit"][id*="save"],
-input[type="button"][id*="save"],
-button[id*="save"],
-input[type="submit"][id*="save"]:hover,
-input[type="button"][id*="save"]:hover,
-button[id*="save"]:hover
-
- {
-	.Complete_Button_text_icon_before;
-	background-image:url('../images/save.png');
-}
-// #####################################################
-// Button Suchen
-
-input[type="submit"][id*="search"],
-input[type="button"][id*="search"],
-button[id*="search"]{
-	.Complete_Button_text_icon_before;
-
-	background-image:url('../images/advanced-search.png');
-
-
-	&:hover {.box_shadow_standard_light_hover; background-image:url('../images/advanced-search.png');}
-
-	&:focus {.box_shadow_standard_light_inset;}
-}
-
-// #####################################################
-// Button ok = speichern
-
-button.button_ok {
-	.Complete_Button_text_icon_before;
-	background-image:url('../images/save.png');
-}
-button.button_ok:hover {
-	.Complete_Button_text_icon_before;
-	background-image:url('../images/save.png');
-}
-
-// #####################################################
-// Button Befehl auswählen (infolog)
-
-button#infolog-index_legacy_actions{
-
-	.Complete_Button_text_icon_before;
-	background-image:url('../images/edit.png');
-
-	&:hover {.box_shadow_standard_light_hover; background-image:url('../images/edit.png');}
-
-	&:focus {.box_shadow_standard_light_inset;}
-
-}
-// #####################################################
-// Button hinzufügen (infolog)
-
-button[id*="note"]{
-	.Complete_Button_text_icon_before;
-
-//	&:before {content: "+"; font-size: 2em;}
-
-//	background-image:url('../images/bearbeiten.png');
-
-	&:hover {
-		.box_shadow_standard_light_hover;
-//		background-image:url('../images/bearbeiten.png');
-	}
-
-	&:focus {.box_shadow_standard_light_inset;}
-
-}
-
-
-// #####################################################
-// Senden Button (mail Dialog)
-
-button#mail-compose_button[send],
-button#mail-compose_button[id*="send"],
-.mail-compose_button {
-				.Complete_Button_text_icon_before;
-				background-image: url(../../mail/templates/default/images/mail_send.png) !important;
-				height: 26px;
-				padding: 0 3px 0 0;
-				.background-color-15-gray;
-				&:hover {.box_shadow_standard_light_hover; }
-
-				&:focus {.box_shadow_standard_light_inset;}
-
-			}
-                        
- // Alarm hinzufügen (calendar dialog)    
-button[id*="add_alarm"]{
-                                .Complete_Button_text_icon_before;
-                                .box_shadow_standard_light;
-				background-image: url("../images/k_alarm.png") !important;
-				height: 26px;
-				padding: 0 3px 0 0;
-				.background-color-15-gray;
-				&:hover {.box_shadow_standard_light_hover; height: 26px;}
-
-				&:focus {.box_shadow_standard_light_inset; height: 26px;}
-    
-}                       
-
-//
\ No newline at end of file
diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less
index dd6f911a6c..ab36dea016 100755
--- a/pixelegg/less/layout_content_elements.less
+++ b/pixelegg/less/layout_content_elements.less
@@ -97,7 +97,7 @@ select {
 
 	&:hover{.Complete_Button_select_hover;}
 	&:focus{.Complete_Button_select_focus;}
-
+        &.after{}
 }
 
 
@@ -149,10 +149,19 @@ h6 {
 
 /////* 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:18px}
+    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}
+select {
+    position:relative;
+
+}
 select:after {
     content:'<>';
     font:11px "Consolas", monospace;
@@ -488,7 +497,7 @@ td.lettersearch {
 	display: inline-block;
 	width: 16px;
 	height: 16px;
-	background-image:url(images/ajax-loader.gif);
+	background-image:url(../images/ajax-loader.gif);
 	background-repeat: no-repeat;
 	background-position: center;
 	float: right;
@@ -786,4 +795,37 @@ a.textSidebox
 	bottom:4px;
 	text-align:center;
 	width:99%;
-}
\ No newline at end of file
+}
+
+// Button global for all and everything:
+button{
+    .Complete_Button_normal;
+    .Complete_Button_text_icon_before;
+/*    background-repeat: no-repeat;
+    background-position: 6px center;
+    background-size: 20px auto;*/
+    &:hover{.background-color-30-gray;}
+}
+
+// #####################################################
+// Button löschen
+
+input[type="submit"][id*="delete"],
+input[type="button"][id*="delete"],
+button[id*="delete"]  {
+	
+	background-image:url('../images/delete.png');
+	margin-left: 3em;
+        .Complete_Button_text_icon_before;
+
+}
+input[type="submit"][id*="delete"]:hover,
+input[type="button"][id*="delete"]:hover,
+button[id*="delete"]:hover {
+	
+	background-image:url('../images/delete.png');
+	background-color: red !important;
+        .Complete_Button_text_icon_before;
+}
+
+// hier ist das ENDE_ELEMENTS
\ No newline at end of file
diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less
index 65f85705d2..cd4771b436 100755
Binary files a/pixelegg/less/layout_dialog.less and b/pixelegg/less/layout_dialog.less differ
diff --git a/pixelegg/less/layout_nextmatch.css b/pixelegg/less/layout_nextmatch.css
index e7509c0806..6c0b23be4a 100644
--- a/pixelegg/less/layout_nextmatch.css
+++ b/pixelegg/less/layout_nextmatch.css
@@ -48,7 +48,7 @@
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 .Complete_Button_add {
-  background-color: #0b5fa4;
+  background-color: #0b5fa4 !important;
   color: #FFF;
   text-shadow: none;
   height: 35px;
@@ -245,9 +245,9 @@
   box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   color: #000000;
   padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
   width: auto;
   height: 32px;
 }
@@ -258,9 +258,9 @@
   box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   color: #000000;
   padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
   width: auto;
   height: 32px;
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -274,9 +274,9 @@
   box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   color: #000000;
   padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
   width: auto;
   height: 32px;
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -345,16 +345,12 @@
 * Nextmatch widget
 */
 .et2_nextmatch .nextmatch_header > .filters {
-  padding: 0 0 0 1em;
+  border: none !important;
+  background-image: none !important;
   background-color: #f0f0f0;
-  margin-bottom: 3px;
-  margin: 0em;
-  border-width: 0 0 1px 0;
-  border-color: #d9d9d9;
-  background-image: none;
 }
 .et2_nextmatch {
-  /* Left & right headers*/
+  background-color: #f0f0f0;
   /* Favorites */
 }
 .et2_nextmatch div > .header {
@@ -367,8 +363,8 @@
   width: auto;
 }
 .et2_nextmatch .nextmatch_header {
-  border: none;
-  background-image: none;
+  border: none !important;
+  background-image: none !important;
   background-color: #f0f0f0;
   background-size: 80% 10;
   margin-bottom: 3px;
@@ -412,12 +408,8 @@
 .et2_nextmatch .nextmatch_header .header_count {
   position: relative;
   top: 7px;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  background-color: #f0f0f0;
-  border-color: #808080;
-  cursor: pointer;
+  width: 50px;
+  font-size: 0.8em;
 }
 .et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper,
 .et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper,
@@ -440,14 +432,32 @@
 .et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown,
 .et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown,
 .et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown {
-  height: 2em;
+  /*linke Seite Bild*/
 }
-.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown img,
-.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown img,
-.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown img,
-.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown img {
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown button#ui-corner-left,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown button#ui-corner-left,
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown .ui-state-default,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown .ui-state-default,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown .ui-state-default,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown .ui-state-default {
+  background-image: none;
+  width: auto;
+}
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button#ui-corner-left img,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button#ui-corner-left img,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown button#ui-corner-left img,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown button#ui-corner-left img,
+.et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown .ui-state-default img,
+.et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown .ui-state-default img,
+.et2_nextmatch .nextmatch_header div#timesheet-index_favorite_wrapper .et2_dropdown .ui-state-default img,
+.et2_nextmatch .nextmatch_header div#projectmanager-list_favorite_wrapper .et2_dropdown .ui-state-default img {
   height: 16px;
   width: 16px;
+  text-align: left;
+  position: relative;
+  right: 20px;
 }
 .et2_nextmatch .nextmatch_header div#infolog-index_favorite_wrapper .et2_dropdown button,
 .et2_nextmatch .nextmatch_header div#addressbook-index_favorite_wrapper .et2_dropdown button,
@@ -527,21 +537,30 @@
   margin-top: 8px;
   vertical-align: middle;
 }
+/*#########################################################
+#
+# Filterleiste
+#
+#########################################################*/
 .filters {
-  padding: 0 0 0 1em;
+  padding: 0 0 1em 1em;
   background-color: #f0f0f0;
-  margin-bottom: 3px;
-  margin: 0em;
   border-width: 0 0 1px 0;
   border-color: #d9d9d9;
   background-image: none;
   width: 80%;
+  margin-bottom: 1em;
 }
 .filters img.et2_button_icon {
   float: right;
   position: relative;
   top: 0px;
 }
+.filters select,
+.filters input,
+.filters button {
+  height: 20px;
+}
 .filters 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);
@@ -557,7 +576,6 @@
   cursor: pointer;
   margin-right: 2ex;
   padding: 5px;
-  height: 25px;
   padding: 0px 0px 0px 3px;
 }
 .filters select:hover {
@@ -582,7 +600,6 @@
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  height: 25px;
 }
 .filters input:hover {
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -608,6 +625,8 @@
   cursor: pointer;
   padding: 3px;
   margin-left: 5px;
+  background-image: none;
+  width: auto;
 }
 .filters button:hover {
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
diff --git a/pixelegg/less/layout_nextmatch.less b/pixelegg/less/layout_nextmatch.less
index 78890e5b94..db478ec3da 100644
Binary files a/pixelegg/less/layout_nextmatch.less and b/pixelegg/less/layout_nextmatch.less differ
diff --git a/pixelegg/less/layout_raster.css b/pixelegg/less/layout_raster.css
index a71aac0751..6f7270a6cc 100644
--- a/pixelegg/less/layout_raster.css
+++ b/pixelegg/less/layout_raster.css
@@ -7,7 +7,7 @@
  *
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
+ * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
  * @package pixelegg
  * @version $Id$
  */
@@ -48,7 +48,7 @@
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 .Complete_Button_add {
-  background-color: #0b5fa4;
+  background-color: #0b5fa4 !important;
   color: #FFF;
   text-shadow: none;
   height: 35px;
@@ -245,9 +245,9 @@
   box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   color: #000000;
   padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
   width: auto;
   height: 32px;
 }
@@ -258,9 +258,9 @@
   box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   color: #000000;
   padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
   width: auto;
   height: 32px;
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -274,9 +274,9 @@
   box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   color: #000000;
   padding-left: 30px !important;
-  background-position: 6px center;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
+  background-position: 6px center !important;
+  background-repeat: no-repeat !important;
+  background-size: 20px auto !important;
   width: auto;
   height: 32px;
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -361,9 +361,9 @@
   width: 100%;
   float: left;
   /*     ###########################################################################################################################################
-    /* ###########################################################################################################################################
-    * Topmenu / Home / Einstellungen / usw..
-    /* ###########################################################################################################################################
+        /* ###########################################################################################################################################
+        * Topmenu / Home / Einstellungen / usw..
+        /* ###########################################################################################################################################
     */
 }
 #egw_fw_header #egw_divLogo {
@@ -416,7 +416,7 @@
   border-color: #808080;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child {
-  margin-left: -28px;
+  margin-left: 10px;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child :before {
   border: none;
@@ -431,35 +431,52 @@
   height: 15px;
   float: left;
   position: fixed;
-  left: 196px;
+  left: 194px;
 }
-#egw_fw_topmenu_slide .slidedown {
-  background-image: url("../images/slidedown.png");
+#egw_fw_topmenu_slide.slidedown {
+  background-image: url("../images/list.png");
   background-position: center center;
   height: 15px;
   width: 15px;
   display: block;
-  margin-left: 40px;
-  margin-top: 0px;
+  margin-left: 5px;
+  margin-top: 10px;
+  background-size: 15px 15px;
+  float: left;
+  position: relative;
+  left: -5px;
 }
-#egw_fw_topmenu_slide .slideup {
+#egw_fw_topmenu_slide.slideup {
   background-image: url("../images/slideup.png");
   background-position: center center;
   height: 15px;
   width: 15px;
   display: block;
-  margin-top: 10px;
+  margin-top: -55px;
   margin-left: 40px;
 }
+#slidetoggle {
+  width: 20px;
+  height: 20px;
+  display: block;
+}
 /*#################################################
 ###################################################
  Add / Print / Logout / 
     - Name / Date
 ###################################################*/
-#egw_fw_topmenu_addons {
-  /*Name / Datum / angemeldete User*/
-}
 #egw_fw_topmenu_addons span#quick_add {
+  background-color: #0b5fa4 !important;
+  color: #FFF;
+  text-shadow: none;
+  height: 35px;
+  background-image: none !important;
+  -webkit-border-radius: 3px;
+  -webkit-border-top-left-radius: 20px;
+  -moz-border-radius: 3px;
+  -moz-border-radius-topleft: 20px;
+  border-radius: 3px;
+  border-top-left-radius: 20px;
   position: fixed;
   right: 88px;
   top: 0;
@@ -471,6 +488,11 @@
   font-size: 2em;
   color: #ffc200;
 }
+#egw_fw_topmenu_addons span#quick_add:before {
+  content: "+";
+  font-size: 2em;
+  color: #ffc200;
+}
 #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);
@@ -480,6 +502,11 @@
   padding: 0 0 0 10px;
   font-size: 0.9em;
   line-height: 1.1em;
+  /*            option {
+                &:first-child{
+                    &:before {content: "+";font-size: 2em;color: @egw_color_1;}
+
+                }*/
 }
 #egw_fw_topmenu_addons span#quick_add select#quick_add_selectbox:hover {
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
@@ -491,12 +518,7 @@
   -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_topmenu_addons span#quick_add select#quick_add_selectbox option:first-child:before {
-  content: "+";
-  font-size: 2em;
-  color: #ffc200;
-}
-#egw_fw_topmenu_addons #egw_fw_logout {
+#egw_fw_logout {
   background-image: url(../images/logout.png);
   background-size: 16px 16px;
   background-position: center center;
@@ -518,12 +540,12 @@
   position: fixed;
   right: 5px;
 }
-#egw_fw_topmenu_addons #egw_fw_logout:hover {
+#egw_fw_logout: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);
 }
-#egw_fw_topmenu_addons #egw_fw_print {
+#egw_fw_print {
   background-image: url(../images/print.png);
   background-size: 16px 16px;
   background-position: center center;
@@ -545,44 +567,45 @@
   right: 45px;
   z-index: 200;
 }
-#egw_fw_topmenu_addons #egw_fw_print:hover {
+#egw_fw_print: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);
 }
-#egw_fw_topmenu_addons #egw_fw_print:focus {
+#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);
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items {
+/*Name / Datum / angemeldete User*/
+#egw_fw_topmenu_info_items {
   padding-right: 20px;
   white-space: nowrap;
   float: right;
   display: flex;
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(2) {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(2) {
   /*float: right;*/
   margin-top: 0;
   font-size: 1em;
   padding-right: 5px;
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3) {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3) {
   position: relative;
   top: 0px;
   display: inline-block;
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):hover {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):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);
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):focus {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):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);
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
-#egw_fw_topmenu_addons #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):before {
+#egw_fw_topmenu_info_items .topmenu_info_item:nth-child(3):before {
   content: "| ";
   font-size: 1em;
   color: #0c5da5;
diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less
index bd3e2b9cc0..8099d621e6 100644
--- a/pixelegg/less/layout_raster.less
+++ b/pixelegg/less/layout_raster.less
@@ -7,7 +7,7 @@
  *
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
+ * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
  * @package pixelegg
  * @version $Id$
  */
@@ -23,12 +23,6 @@
  * #################################################
  */
 
-
-
-
-
-
-
 //IFRAME
 
 .egw_fw_content_browser_iframe,
@@ -40,8 +34,8 @@
 }
 
 .egwGridView_scrollarea {
-	width: 100%;
-	overflow: auto;
+    width: 100%;
+    overflow: auto;
 }
 #egw_fw_header{
 
@@ -66,11 +60,10 @@
         }
 
     }
-
-/*     ###########################################################################################################################################
-    /* ###########################################################################################################################################
-    * Topmenu / Home / Einstellungen / usw..
-    /* ###########################################################################################################################################
+    /*     ###########################################################################################################################################
+        /* ###########################################################################################################################################
+        * Topmenu / Home / Einstellungen / usw..
+        /* ###########################################################################################################################################
     */
 
     #egw_fw_topmenu ul,
@@ -80,48 +73,48 @@
     #egw_fw_topmenu_info_items {
         display: inline;
     }
-    
+
     #egw_fw_topmenu{
-        
+
         #egw_fw_topmenu_items {
             float: left;
             padding-top: 10px;
             //														height: 30px;
 
-                ul {
-                    //															padding: 10px;
-                    //															margin-left: 2em;
+            ul {
+                //															padding: 10px;
+                //															margin-left: 2em;
 
-                        li{
-                            .color-100-gray;
-                            .Button_size_square_32;
-                            padding: 0.3em 0.4em;
-                            .Complete_Button_normal;
+                li{
+                    .color-100-gray;
+                    .Button_size_square_32;
+                    padding: 0.3em 0.4em;
+                    .Complete_Button_normal;
 
-                            &:hover{.Complete_Button_hover;.color-100-gray;}
-                            a {.color-100-gray;}
-                            a:hover {
-                                .color-50-gray;
-                                .border-color-50-gray;
-                                    }
-                            }
+                    &:hover{.Complete_Button_hover;.color-100-gray;}
+                    a {.color-100-gray;}
+                    a:hover {
+                        .color-50-gray;
+                        .border-color-50-gray;
+                    }
+                }
 
-                        li:first-child{
-                            margin-left: -28px;
-                            :before{border: none;}
-                        }
-                    } // Ende ul
+                li:first-child{
+                    margin-left: 10px;
+                    :before{border: none;}
+                }
+            } // Ende ul
 
 
         }	// Ende Items
-        
-        
+
+
     } // Ende Topmenu
-    
+
 
 } // Ende Header
 
-	
+
 /*#################################################
 ###################################################
  Slide Effekt
@@ -133,32 +126,39 @@
     width: auto;
     text-align: center;
     height: 15px;
-    float:left;
+    float: left;
     position: fixed;
-    left: 196px;
-
-    .slidedown{
-        background-image: url("../images/slidedown.png");
+    left: 194px;
+    
+}
+#egw_fw_topmenu_slide.slidedown{
+        background-image: url("../images/list.png");
         background-position: center center;
         height: 15px;
         width: 15px;
         display: block;
-        margin-left: 40px;
-        margin-top: 0px;
-        //					z-index: 100;
-        //float:right;
+        margin-left: 5px;
+        margin-top: 10px;
+        background-size: 15px 15px;
+        float: left;
+        position: relative;
+        left: -5px;
     }
-    .slideup{
+#egw_fw_topmenu_slide.slideup{
         background-image: url("../images/slideup.png");
         background-position: center center;
         height: 15px;
         width: 15px;
         display: block;
-        margin-top: 10px;
+        margin-top: -55px;
         margin-left: 40px;
 
     }
-}
+    #slidetoggle{
+        width: 20px;
+        height: 20px;
+        display: block;
+    }
 
 
 
@@ -168,65 +168,66 @@
     - Name / Date
 ###################################################*/
 #egw_fw_topmenu_addons{
-    
-        // ########################################
+
+    // ########################################
     // quick_add
 
     span#quick_add{
+        .Complete_Button_add;
         position: fixed;
         right: 88px;
         top: 0;
         z-index: 200;
 
         padding: 0 0.8em 0.8em 0.5em;
-
+        
         &:before {content: "+";font-size: 2em;color: @egw_color_1;}
 
         select#quick_add_selectbox{
-                                    .border_normal;
-                                    .box_shadow_standard_light;
-                                    height: 30px;
-                                    padding: 0 0 0 10px;
-                                    font-size: 0.9em;
-                                    line-height: 1.1em;
-                                    &:hover {.box_shadow_standard_light_hover;}
-                                    &:focus {.box_shadow_standard_light_inset;}
-                                    option {
-                                        &:first-child{
-                                                    &:before {content: "+";font-size: 2em;color: @egw_color_1;}
+            .border_normal;
+            .box_shadow_standard_light;
+            height: 30px;
+            padding: 0 0 0 10px;
+            font-size: 0.9em;
+            line-height: 1.1em;
+            &:hover {.box_shadow_standard_light_hover;}
+            &:focus {.box_shadow_standard_light_inset;}
+/*            option {
+                &:first-child{
+                    &:before {content: "+";font-size: 2em;color: @egw_color_1;}
 
-                                                    }
+                }*/
 
-                                            }
-                                }
+            }
+        }
 
     }
-    
-    
-   
+
+
+
     // Logout
-        #egw_fw_logout {
-                        background-image: url(../images/logout.png);
-                        background-size: 16px 16px;
-                        background-position: center center;
-                        background-repeat: no-repeat;
-                        cursor: pointer;
-                        display: inline-block;
-                        float: right;
-                        margin-right: 1em;
-                        margin-top: 0px;
-                        z-index: 200;
-                        .Button_size_square_16;
-                        .border_normal;
-                        .box_shadow_standard_light;
-                        padding: 0.5em;
-                        top: 5px;
-                        position: fixed;
-                        right: 5px;
+    #egw_fw_logout {
+        background-image: url(../images/logout.png);
+        background-size: 16px 16px;
+        background-position: center center;
+        background-repeat: no-repeat;
+        cursor: pointer;
+        display: inline-block;
+        float: right;
+        margin-right: 1em;
+        margin-top: 0px;
+        z-index: 200;
+        .Button_size_square_16;
+        .border_normal;
+        .box_shadow_standard_light;
+        padding: 0.5em;
+        top: 5px;
+        position: fixed;
+        right: 5px;
 
 
-                        &:hover {.box_shadow_standard_light_hover;}
-                    }
+        &:hover {.box_shadow_standard_light_hover;}
+    }
 
 
 
@@ -248,7 +249,6 @@
         .box_shadow_standard_light;
         padding: 0.5em;
         top: 5px;
-        //													position: relative;
         right: 45px;
         z-index: 200;
         &:hover {.box_shadow_standard_light_hover;}
@@ -256,10 +256,10 @@
         &:focus {.box_shadow_standard_light_inset;}
 
     }
-    
-    
-    
- /*Name / Datum / angemeldete User*/
+
+
+
+    /*Name / Datum / angemeldete User*/
 
     #egw_fw_topmenu_info_items {
 
@@ -268,43 +268,44 @@
         float: right;
         display: flex;
         .topmenu_info_item {
-                            
-                            // Info Bell
-                            &:nth-child(1) {
-                            }
 
-                            // Name
-                            &:nth-child(2) {
-                                /*float: right;*/
-                                margin-top: 0;
-                                font-size: 1em;
-                                padding-right: 5px;
-                                
-                            }
+            // Info Bell
+            &:nth-child(1) {
+            }
 
-                            // angemeldete User
-                            &:nth-child(3) {
-                                position: relative;
-                                top: 0px;
-                                  display: inline-block;
-                                  
-                                &:hover {.box_shadow_standard_light_hover;}
-                                &:focus {.box_shadow_standard_light_inset;}
-                                
-                                &:before {content: "| ";font-size: 1em;color: @egw_color_2_a;}
-                                  
-                            }
+            // Name
+            &:nth-child(2) {
+                /*float: right;*/
+                margin-top: 0;
+                font-size: 1em;
+                padding-right: 5px;
 
-                            // Add
-                            &:nth-child(4) {
+            }
 
-                            }
+            // angemeldete User
+            &:nth-child(3) {
+                position: relative;
+                top: 0px;
+                display: inline-block;
 
-                         }
+                &:hover {.box_shadow_standard_light_hover;}
+                &:focus {.box_shadow_standard_light_inset;}
+
+                &:before {content: "| ";font-size: 1em;color: @egw_color_2_a;}
+
+            }
+
+            // Add
+            &:nth-child(4) {
+
+            }
+
+        }
+
+    } 
+    // Ende items
 
-    } // Ende items
 
-} // Ende Addons
 
 
 
@@ -313,7 +314,7 @@
  ################################################################################################################
  * Sidebar
  * ################################################################################################################*/
- 
+
 
 #egw_fw_sidebar {
     position: fixed;
@@ -342,29 +343,29 @@
 
             // Alle Tabs
             .egw_fw_ui_sidemenu_entry_header {
-                                                cursor: pointer;
+                cursor: pointer;
 
-                                                display: block;
-                                                height: 30px;
-                                                margin: 0 0;
-                                                padding: 4px 5px 5px 15px;
-                                                .background-color-5-gray;
-                                                background-image: none;
-                                                .border-color-10-gray;
+                display: block;
+                height: 30px;
+                margin: 0 0;
+                padding: 4px 5px 5px 15px;
+                .background-color-5-gray;
+                background-image: none;
+                .border-color-10-gray;
 
-                                                .rounded(5px);
-                                                &:hover {  .background-color-15-gray;}
+                .rounded(5px);
+                &:hover {  .background-color-15-gray;}
 
-                                                h1 {
-                                                    font-size: 1em;
-                                                    font-weight: normal;
-                                                    margin: 0 0 10px 0;
-                                                    padding-top: 0.31em;
-                                                    .color-40-gray;
+                h1 {
+                    font-size: 1em;
+                    font-weight: normal;
+                    margin: 0 0 10px 0;
+                    padding-top: 0.31em;
+                    .color-40-gray;
 
-                                                }
+                }
 
-                                            }
+            }
 
 
 
@@ -500,7 +501,7 @@
                     }
 
                 }
-             
+
             }
 
             .egw_fw_ui_sidemenu_entry_content_bottom {
@@ -579,8 +580,8 @@
         .background-color-0-gray;
         .border-color-50-gray;
     } 
-     
-    
+
+
     // Favoriten anlegen und löschen            
     .sidebox-favorites{} // ist in etemplate2.less definiert
 
@@ -594,59 +595,59 @@
 
 .egw_fw_ui_sidemenu_listitem {
 
-                    padding: 0.5em 0;
-                    margin: 4px 0 5px 0px;
-                    position: relative;
+    padding: 0.5em 0;
+    margin: 4px 0 5px 0px;
+    position: relative;
 
 
-                    
 
-                    // Icon before
-                    img.egw_fw_ui_sidemenu_listitem_icon {
-                        height: 9px; 
-                        width: 9p; 
-                        padding: 0px;
-                        float: left;
-                        background-image: url("../images/bullet.png");
-                        
-                    }
-    
-                    input {
-                        height: 16px;
-                        width: 81% !important;
-                    }
 
-                    input[type="image"] {
-                        height: 10px; 
-                        width: 10px !important; 
-                        margin-left: 1px;
-                    } // mehrere Benutzer auswählen
+    // Icon before
+    img.egw_fw_ui_sidemenu_listitem_icon {
+        height: 9px; 
+        width: 9p; 
+        padding: 0px;
+        float: left;
+        background-image: url("../images/bullet.png");
 
-                    select { max-width: 85% !important; }
-                    
-                    // Icon rechts der Liste - Auswahl Button
-                    img { 
-                            height: 9px; 
-                            width: 9px; 
-                            padding: 0px;
-                            float: right;
-                    }
-                    
-                    // normale Links
-                    a {
-                        // .Complete_Button_text;
-                        padding: 5px 0px 5px 5px;
-                        text-decoration: none;
-                        min-width: 5em;
+    }
 
-                               &:hover{
-                                       .color-100-gray;
-                                    }
+    input {
+        height: 16px;
+        width: 81% !important;
+    }
 
-                                    &:active {
-                                        .box_shadow_standard_light_inset;
-                                    }
-                        }
+    input[type="image"] {
+        height: 10px; 
+        width: 10px !important; 
+        margin-left: 1px;
+    } // mehrere Benutzer auswählen
+
+    select { max-width: 85% !important; }
+
+    // Icon rechts der Liste - Auswahl Button
+    img { 
+        height: 9px; 
+        width: 9px; 
+        padding: 0px;
+        float: right;
+    }
+
+    // normale Links
+    a {
+        // .Complete_Button_text;
+        padding: 5px 0px 5px 5px;
+        text-decoration: none;
+        min-width: 5em;
+
+        &:hover{
+            .color-100-gray;
+        }
+
+        &:active {
+            .box_shadow_standard_light_inset;
+        }
+    }
 
 
     div {
@@ -701,11 +702,11 @@
 
     // Submenu Item
     &:hover{
-                                        .color-100-gray;
-                                        background-color: @egw_color_1_e;
-                                        padding: 0.5em 0;
-                                    }
-    
+        .color-100-gray;
+        background-color: @egw_color_1_e;
+        padding: 0.5em 0;
+    }
+
 } // .egw_fw_ui_sidemenu_listitem
 
 
@@ -839,8 +840,8 @@ div#calendar-container {
                     .weekend {}
                 }
                 // hover tr
-                 tr.rowhilite td{background-color: @egw_color_1_a;}
-               
+                tr.rowhilite td{background-color: @egw_color_1_a;}
+
             }
 
 
@@ -1125,13 +1126,13 @@ div.et2_container {
                                 table.et2_grid {.background-color-0-gray;}
 
                             }
-                            
+
                         }
                     }
                 }
-                    
+
             }
         }
     }
 }
-//
\ No newline at end of file
+//
\ No newline at end of file
diff --git a/pixelegg/templates/pixelegg/head.tpl b/pixelegg/templates/pixelegg/head.tpl
index a9146f93e2..accfc3a487 100644
--- a/pixelegg/templates/pixelegg/head.tpl
+++ b/pixelegg/templates/pixelegg/head.tpl
@@ -38,7 +38,7 @@
 					</div>
 			</div>	
 			
-			<div id="egw_fw_topmenu_slide"><span id="slidetoggle" class="slideup"></span></div>
+			
 			<div id="egw_fw_topmenu_addons">
 					<div id="egw_fw_topmenu_info_items">{topmenu_info_items}</div>
 						<div id="egw_fw_logout" title="{title_logout}" data-logout-url="{link_logout}"></div>
@@ -50,7 +50,7 @@
 			</div>
 			<div id="egw_fw_main">
 				
-				<div id="egw_fw_tabs">
+				<div id="egw_fw_tabs"><div id="egw_fw_topmenu_slide" class="slideup"><span id="slidetoggle"></span></div>
 					
 				</div>