diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index d9a4d53bad..10b181be4a 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -816,7 +816,7 @@ div.message.floating {
 }
 .nextmatch_header .header_count {
   padding: 0px 20px;
-  margin: 6px 20px 0px;
+  margin: 6px 6px 0px;
   border: 1px solid #E0E0E0;
   float: right;
   font-size: 150%;
@@ -824,18 +824,26 @@ div.message.floating {
 }
 .nextmatch_header > .search {
 	float: left;
+	width: 14%;
+}
+.nextmatch_header > .search > input {
+	width: 75%;
 }
 .nextmatch_header > .filters {
   padding-left: 5px;
+  position: relative;
+  top: 7px;
+  white-space: nowrap;
 }
 .nextmatch_header > .filters select {
+  width: 14%;
   margin-right: 2ex;
 }
 .nextmatch_header .et2_button_icon {
   vertical-align: middle;
 }
 .nextmatch_header > .filters .et2_button_icon {
-  margin-top: 8px;
+  margin-right: 1ex;
 }
 .et2_nextmatch .nextmatch_header {
   border: none;
@@ -844,12 +852,13 @@ div.message.floating {
   margin-bottom: 3px;
 }
 .et2_nextmatch .nextmatch_header > .filters {
+/* no background
   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;
+  margin-bottom: 3px;*/
 }
 /* Favorites */
 .nextmatch_header div[id$=favorite_wrapper] {