diff --git a/package-lock.json b/package-lock.json
index e0abfbc0ced..b5bb25ba2bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
 				"@nextcloud/moment": "^1.2.1",
 				"@nextcloud/paths": "^2.1.0",
 				"@nextcloud/router": "^2.0.0",
-				"@nextcloud/vue": "^6.0.0-beta.5",
+				"@nextcloud/vue": "^7.0.0-beta.0",
 				"@nextcloud/vue-dashboard": "^2.0.1",
 				"@nextcloud/vue-richtext": "^2.0.0",
 				"attachmediastream": "^2.1.0",
@@ -2749,9 +2749,9 @@
 			}
 		},
 		"node_modules/@nextcloud/vue": {
-			"version": "6.0.0-beta.5",
-			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-6.0.0-beta.5.tgz",
-			"integrity": "sha512-23vdV3Z9iyUXs5mGi++uGShpL1+lhNPLfjbnCjf9rIytG6XQV/46vzdBSttbBA91CnuEYufEsTu3grjwW9JiRg==",
+			"version": "7.0.0-beta.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.0.0-beta.0.tgz",
+			"integrity": "sha512-/LDDDokRDCvR4dm0U6AV1OOGycCjYNvp3M0bFX1iJJdFig/BCqJI00js9wIXi4g02fBEsOu0Ae3+wQmUuQqm/A==",
 			"dependencies": {
 				"@nextcloud/auth": "^2.0.0",
 				"@nextcloud/axios": "^2.0.0",
@@ -2760,7 +2760,7 @@
 				"@nextcloud/capabilities": "^1.0.4",
 				"@nextcloud/dialogs": "^3.1.4",
 				"@nextcloud/event-bus": "^3.0.0",
-				"@nextcloud/initial-state": "^1.2.1",
+				"@nextcloud/initial-state": "^2.0.0",
 				"@nextcloud/l10n": "^1.6.0",
 				"@nextcloud/logger": "^2.2.1",
 				"@nextcloud/router": "^2.0.0",
@@ -3008,6 +3008,11 @@
 				"uuid": "^8.3.2"
 			}
 		},
+		"node_modules/@nextcloud/vue/node_modules/@nextcloud/initial-state": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.0.0.tgz",
+			"integrity": "sha512-xmNP30v/RnkJ2z1HcuEo7YfcLJJa+FdWTwgNldXHOlMeMbl/ESpsGkWL2sULrhYurz64L0JpfwEdi/cHcmyuZQ=="
+		},
 		"node_modules/@nextcloud/vue/node_modules/ansi-regex": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
@@ -28234,9 +28239,9 @@
 			}
 		},
 		"@nextcloud/vue": {
-			"version": "6.0.0-beta.5",
-			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-6.0.0-beta.5.tgz",
-			"integrity": "sha512-23vdV3Z9iyUXs5mGi++uGShpL1+lhNPLfjbnCjf9rIytG6XQV/46vzdBSttbBA91CnuEYufEsTu3grjwW9JiRg==",
+			"version": "7.0.0-beta.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.0.0-beta.0.tgz",
+			"integrity": "sha512-/LDDDokRDCvR4dm0U6AV1OOGycCjYNvp3M0bFX1iJJdFig/BCqJI00js9wIXi4g02fBEsOu0Ae3+wQmUuQqm/A==",
 			"requires": {
 				"@nextcloud/auth": "^2.0.0",
 				"@nextcloud/axios": "^2.0.0",
@@ -28245,7 +28250,7 @@
 				"@nextcloud/capabilities": "^1.0.4",
 				"@nextcloud/dialogs": "^3.1.4",
 				"@nextcloud/event-bus": "^3.0.0",
-				"@nextcloud/initial-state": "^1.2.1",
+				"@nextcloud/initial-state": "^2.0.0",
 				"@nextcloud/l10n": "^1.6.0",
 				"@nextcloud/logger": "^2.2.1",
 				"@nextcloud/router": "^2.0.0",
@@ -28284,6 +28289,11 @@
 					"integrity": "sha512-Uy/etWwRmbzG1jxcfampOCEXbGMEzY1xVCBlONVrkusUmD9t02u3jWFkRJGAHvFAtLd4iM+MdTo1x3VXemBvcA==",
 					"requires": {}
 				},
+				"@nextcloud/initial-state": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.0.0.tgz",
+					"integrity": "sha512-xmNP30v/RnkJ2z1HcuEo7YfcLJJa+FdWTwgNldXHOlMeMbl/ESpsGkWL2sULrhYurz64L0JpfwEdi/cHcmyuZQ=="
+				},
 				"ansi-regex": {
 					"version": "6.0.1",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
diff --git a/package.json b/package.json
index af163ebc17f..1d9e0230b96 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 		"@nextcloud/moment": "^1.2.1",
 		"@nextcloud/paths": "^2.1.0",
 		"@nextcloud/router": "^2.0.0",
-		"@nextcloud/vue": "^6.0.0-beta.5",
+		"@nextcloud/vue": "^7.0.0-beta.0",
 		"@nextcloud/vue-dashboard": "^2.0.1",
 		"@nextcloud/vue-richtext": "^2.0.0",
 		"attachmediastream": "^2.1.0",
diff --git a/src/App.vue b/src/App.vue
index 9fe8c7cc2b9..2beade81472 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -498,14 +498,6 @@ export default {
 </script>
 
 <style lang="scss">
-body {
-	overflow: hidden;
-
-	/** override toastify position due to top bar */
-	&.has-topbar .toastify-top {
-		margin-top: 105px;
-	}
-}
 
 /* FIXME: remove after https://github.com/nextcloud/nextcloud-vue/issues/2097 is solved */
 .mx-datepicker-main.mx-datepicker-popup {
@@ -515,16 +507,8 @@ body {
 </style>
 
 <style lang="scss" scoped>
-.content {
-	height: 100%;
-
-	//FIXME: remove this v-deep once nextcloud vue v4 is adopted
-	::v-deep .app-navigation-toggle {
-		top: 8px;
-		right: -8px;
-		border-radius: var(--border-radius-pill);
-	}
 
+.content {
 	&.in-call {
 		&:hover ::v-deep .app-navigation-toggle {
 			background-color: rgba(0, 0, 0, .1) !important;
@@ -554,8 +538,4 @@ body {
 	}
 }
 
-.app-content {
-	min-width: 0;
-	flex: 1 1 100%;
-}
 </style>
diff --git a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
index a163707a860..9ff46aa243b 100644
--- a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
+++ b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
@@ -390,7 +390,12 @@ export default {
 	justify-content: space-between;
 	position: relative;
 	&__content {
-		height: calc(100% - 50px);
+		/**
+		 * Top: 30px line height header + 12px margin
+		 * Bottom: 44px buttons + 12 px margin
+		 * Total: 98px
+		 */
+		height: calc(100% - 98px);
 		display: flex;
 		flex-direction: column;
 		gap: 0.5rem;
diff --git a/src/components/LeftSidebar/SearchBox/SearchBox.vue b/src/components/LeftSidebar/SearchBox/SearchBox.vue
index c2b164b8833..555d20371cc 100644
--- a/src/components/LeftSidebar/SearchBox/SearchBox.vue
+++ b/src/components/LeftSidebar/SearchBox/SearchBox.vue
@@ -20,8 +20,7 @@
 -->
 
 <template>
-	<form class="app-navigation-search"
-		@submit.prevent="handleSubmit">
+	<form @submit.prevent="handleSubmit">
 		<NcTextField ref="searchConversations"
 			:value.sync="localValue"
 			:placeholder="placeholderText"
@@ -128,16 +127,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../../assets/variables';
 
-.app-navigation-search {
-	position: sticky;
-	top: 0;
-	background-color: var(--color-main-background);
-	z-index: 1;
-	display: flex;
-	justify-content: center;
-	flex-grow: 1;
+::v-deep .input-field__input {
+	border-radius: var(--border-radius-pill);
 }
 
 </style>
diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index 250c3823d28..a65f0874343 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -22,7 +22,6 @@
 
 <template>
 	<NcAppSidebar v-show="opened"
-		id="app-sidebar"
 		:title="title"
 		:title-tooltip="title"
 		:starred="isFavorited"