diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index ac7c5c7967..963460fcda 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -147,7 +147,7 @@ class calendar_uilist extends calendar_ui
 				'placeholder_actions' => array('add')
 			);
 		}
-		$content['nm']['favorites'] = true;
+		$content['nm']['favorites'] = false;
 		$content['nm']['actions'] = $this->get_actions();
 
 		// Skip first load if view is not listview
diff --git a/calendar/js/app.js b/calendar/js/app.js
index 0b1572c25e..9854dfb6bf 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -3457,12 +3457,6 @@ var CalendarApp = /** @class */ (function (_super) {
             }
         }
         if (all_loaded) {
-            // Move nextmatch favourite button into toolbar
-            var fav_button = CalendarApp.views.listview.etemplates[0].widgetContainer.getDOMWidgetById("favorite");
-            var toolbar_1 = jQuery("#toolbar-actionbox", "#calendar-toolbar_toolbar");
-            if (fav_button && toolbar_1) {
-                toolbar_1.after(fav_button.getDOMNode(fav_button));
-            }
             jQuery(window).trigger('resize');
             this.setState({ state: this.state });
             // Hide loader after 1 second as a fallback, it will also be hidden
diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index 64446a377b..ad154a9cb4 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -4298,14 +4298,6 @@ class CalendarApp extends EgwApp
 		}
 		if(all_loaded)
 		{
-			// Move nextmatch favourite button into toolbar
-			let fav_button = (<etemplate2><unknown>CalendarApp.views.listview.etemplates[0]).widgetContainer.getDOMWidgetById("favorite");
-			let toolbar = jQuery("#toolbar-actionbox","#calendar-toolbar_toolbar");
-			if(fav_button && toolbar)
-			{
-				toolbar.after(fav_button.getDOMNode(fav_button));
-			}
-
 			jQuery(window).trigger('resize');
 			this.setState({state:this.state});
 
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 51e22f3b01..8f9ea49800 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -181,12 +181,16 @@ div.calendar_conflicts {
 	display:flex;
 	align-items: center;
 	min-height: 26px;
+	justify-content: flex-end;
 }
-#calendar-toolbar #calendar-list_favorite_wrapper {
+#calendar-toolbar #calendar-toolbar_keywords {
+	height: 14px;
+}
+#calendar-toolbar #calendar-toolbar_favorite_wrapper {
 	float: right;
 	margin-right: 5px;
 }
-#calendar-toolbar #calendar-list_favorite_wrapper #calendar-list_favorite_menu {
+#calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu {
 	z-index: 40;
 	font-weight: normal;
 }
diff --git a/calendar/templates/default/sidebox.xet b/calendar/templates/default/sidebox.xet
index 2466784614..36bf478333 100644
--- a/calendar/templates/default/sidebox.xet
+++ b/calendar/templates/default/sidebox.xet
@@ -14,7 +14,6 @@ Egroupware
 <overlay>
     <template id="calendar.sidebox">
 		<vbox parent_node="calendar-et2_target">
-			<textbox id="keywords" class="et2_fullWidth" blur="Search" onchange="app.calendar.update_state({view: 'listview',keywords: widget.getValue()});return false;"/>
 			<buttononly id="header_today" label="•" icon="nope" onclick="
 var tempDate = new Date();
 var today = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate(),0,-tempDate.getTimezoneOffset(),0);
diff --git a/calendar/templates/default/toolbar.xet b/calendar/templates/default/toolbar.xet
index fbc91dde1f..4501084c46 100644
--- a/calendar/templates/default/toolbar.xet
+++ b/calendar/templates/default/toolbar.xet
@@ -17,6 +17,8 @@ Egroupware
 		<!-- Fake an app header inside the toolbar -->
 		<box class="egw_fw_ui_app_header_container">
 			<description id="app_header"/>
+			<textbox id="keywords" blur="Search" onchange="app.calendar.update_state({view: 'listview',keywords: widget.getValue()});return false;"/>
+			<favorites app="calendar"/>
 		</box>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 86b4c8877b..04b6f28eec 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -188,12 +188,16 @@ div.calendar_conflicts {
   display: flex;
   align-items: center;
   min-height: 26px;
+  justify-content: flex-end;
 }
-#calendar-toolbar #calendar-list_favorite_wrapper {
+#calendar-toolbar #calendar-toolbar_keywords {
+  height: 14px;
+}
+#calendar-toolbar #calendar-toolbar_favorite_wrapper {
   float: right;
   margin-right: 5px;
 }
-#calendar-toolbar #calendar-list_favorite_wrapper #calendar-list_favorite_menu {
+#calendar-toolbar #calendar-toolbar_favorite_wrapper #calendar-toolbar_favorite_menu {
   z-index: 40;
   font-weight: normal;
 }
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index e78cd1ef90..2676f74991 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -12,7 +12,6 @@
  * @version $Id$
  */
 
-
 @import (reference) "../../../pixelegg/less/definitions.less";
 @import (less) "../default/app.css";