diff --git a/package-lock.json b/package-lock.json
index 1959e0262..d81c83dac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,7 @@
         "@nextcloud/moment": "^1.2.1",
         "@nextcloud/notify_push": "^1.1.3",
         "@nextcloud/router": "^2.1.1",
-        "@nextcloud/vue": "^7.8.4",
-        "@nextcloud/vue-richtext": "^2.0.4",
+        "@nextcloud/vue": "^7.10.0",
         "blueimp-md5": "^2.19.0",
         "dompurify": "^3.0.2",
         "lodash": "^4.17.21",
@@ -30,7 +29,7 @@
         "markdown-it-link-attributes": "^4.0.1",
         "markdown-it-task-checkbox": "^1.0.6",
         "moment": "^2.29.4",
-        "nextcloud-vue-collections": "^0.11.0",
+        "nextcloud-vue-collections": "^0.11.1",
         "p-queue": "^7.3.4",
         "url-search-params-polyfill": "^8.1.1",
         "vue": "^2.7.14",
@@ -50,7 +49,7 @@
         "@nextcloud/cypress": "^1.0.0-beta.2",
         "@nextcloud/eslint-config": "^8.2.1",
         "@nextcloud/stylelint-config": "^2.3.0",
-        "@nextcloud/webpack-vue-config": "^5.5.0",
+        "@nextcloud/webpack-vue-config": "^5.5.1",
         "@relative-ci/agent": "^4.1.4",
         "@vue/test-utils": "^1.3.5",
         "@vue/vue2-jest": "^29.2.3",
@@ -2954,19 +2953,6 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@nextcloud/calendar-js": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-5.0.3.tgz",
-      "integrity": "sha512-x6xvQKmuaO/Z/S6uK6qxGAJSaPOAM7DUhe+sJ1QEQAgUx9WIhaJOU+zYw2vdn8hiQ9R4gxfp/bgb6B0I+QBZvw==",
-      "engines": {
-        "node": ">=16.0.0",
-        "npm": ">=8.0.0"
-      },
-      "peerDependencies": {
-        "ical.js": "^1.5.0",
-        "uuid": "^8.3.2"
-      }
-    },
     "node_modules/@nextcloud/capabilities": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.0.4.tgz",
@@ -3442,15 +3428,15 @@
       }
     },
     "node_modules/@nextcloud/vue": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.8.4.tgz",
-      "integrity": "sha512-rUdLwB/9aPtBNgo6H0dDVCEaFctbePp6NwH/uPJ10h67pzra+KcUqVvVEvaXxTwFTVf36K/WrGQAGY+0fV+bdg==",
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.10.0.tgz",
+      "integrity": "sha512-RYh3luZgyXftewE97fVhI779l7FFWqKSa8OCa7xdNnKtOoS9o6AxFG6yOI9IWkifA3F9WYalRBJle6lffaMi/g==",
       "dependencies": {
         "@floating-ui/dom": "^1.1.0",
         "@nextcloud/auth": "^2.0.0",
         "@nextcloud/axios": "^2.0.0",
         "@nextcloud/browser-storage": "^0.2.0",
-        "@nextcloud/calendar-js": "^5.0.3",
+        "@nextcloud/calendar-js": "^6.0.0",
         "@nextcloud/capabilities": "^1.0.4",
         "@nextcloud/dialogs": "^4.0.0",
         "@nextcloud/event-bus": "^3.0.0",
@@ -3494,24 +3480,6 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@nextcloud/vue-richtext": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.4.tgz",
-      "integrity": "sha512-+873AF/G8OPVz2lwajpGVRfJ1v492CeiBTrguOkOwSGReNukGyHryCucF6rZGiMFenVIpp8BjNkqjHwkh6Cs4A==",
-      "dependencies": {
-        "@nextcloud/axios": "^2.0.0",
-        "@nextcloud/router": "^2.0.0",
-        "clone": "^2.1.2",
-        "vue": "^2.7.8"
-      },
-      "engines": {
-        "node": ">=14.0.0",
-        "npm": ">=7.0.0"
-      },
-      "peerDependencies": {
-        "vue": "^2.7.8"
-      }
-    },
     "node_modules/@nextcloud/vue-select": {
       "version": "3.22.2",
       "resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.22.2.tgz",
@@ -3545,6 +3513,19 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/@nextcloud/vue/node_modules/@nextcloud/calendar-js": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-6.0.0.tgz",
+      "integrity": "sha512-kZBRFIG8J3TNU6K92iEpNzBa3r9JbpCr1MZFJHqVy/5+xTtQG9FqsHhqUWptPwLEBhUNMwN+oCCa7QJAnBKKyg==",
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "ical.js": "^1.5.0",
+        "uuid": "^9.0.0"
+      }
+    },
     "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",
@@ -3629,10 +3610,19 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
+    "node_modules/@nextcloud/vue/node_modules/uuid": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+      "peer": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/@nextcloud/webpack-vue-config": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.0.tgz",
-      "integrity": "sha512-bKlGYEqblSiSHNmpaGM9fz/f9v6JNwHp63V63yaI26gE0Zs+DpZSzJWC6HWWbJ1BgmoKT7wLN1GJc4W/NxvnxQ==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.1.tgz",
+      "integrity": "sha512-2Q3kPnsvkKeENG3rruTjAE1oz/9w0u5QMKO8oh9arL2TIO2aswkDKBtkmu6q7Po3tE+3B2f+ggHq1PNkhtwu6w==",
       "dev": true,
       "engines": {
         "node": "^16.0.0",
@@ -13005,21 +12995,6 @@
         "node": ">=6.11.5"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
     "node_modules/locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -14397,22 +14372,21 @@
       "peer": true
     },
     "node_modules/nextcloud-vue-collections": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.11.0.tgz",
-      "integrity": "sha512-sVeJzwVF7z/71n6TVk3RY+OewvF7gRRexYQ9ZRURbRUK9NIwByFNM7Y2S+U2LJFBsjM58twUhxwll9yWxYqdeA==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.11.1.tgz",
+      "integrity": "sha512-2t4a4mWvjTq+5Kly80pUzq7qpEZz6GHv3bI/yIxhC2K7Y0Rx5XqMSkhxeDuHPsR8KlmIeaPNOyYLMGfO7mgHQA==",
       "dependencies": {
         "@nextcloud/axios": "^2.3.0",
-        "@nextcloud/router": "^2.0.1",
-        "@nextcloud/vue": "^7.5.0",
-        "lodash-es": "^4.17.21",
-        "vue": "^2.7.14"
+        "@nextcloud/router": "^2.1.1",
+        "@nextcloud/vue": "^7.10.0",
+        "lodash-es": "^4.17.21"
       },
       "engines": {
         "node": "^16.0.0",
         "npm": "^8.0.0"
       },
       "peerDependencies": {
-        "@nextcloud/vue": "^7.5.0"
+        "vue": "^2.7.14"
       }
     },
     "node_modules/node-fetch": {
@@ -17938,6 +17912,7 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -21146,12 +21121,6 @@
       "integrity": "sha512-1Tpkof2e9Q0UicHWahQnXXrubJoqyiaqsH9G52v3cjGeVeH3BCfa1FOa41eBwBSFe2/Jxj/wCH2YVLgIXpWbBg==",
       "dev": true
     },
-    "@nextcloud/calendar-js": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-5.0.3.tgz",
-      "integrity": "sha512-x6xvQKmuaO/Z/S6uK6qxGAJSaPOAM7DUhe+sJ1QEQAgUx9WIhaJOU+zYw2vdn8hiQ9R4gxfp/bgb6B0I+QBZvw==",
-      "requires": {}
-    },
     "@nextcloud/capabilities": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.0.4.tgz",
@@ -21509,15 +21478,15 @@
       }
     },
     "@nextcloud/vue": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.8.4.tgz",
-      "integrity": "sha512-rUdLwB/9aPtBNgo6H0dDVCEaFctbePp6NwH/uPJ10h67pzra+KcUqVvVEvaXxTwFTVf36K/WrGQAGY+0fV+bdg==",
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-7.10.0.tgz",
+      "integrity": "sha512-RYh3luZgyXftewE97fVhI779l7FFWqKSa8OCa7xdNnKtOoS9o6AxFG6yOI9IWkifA3F9WYalRBJle6lffaMi/g==",
       "requires": {
         "@floating-ui/dom": "^1.1.0",
         "@nextcloud/auth": "^2.0.0",
         "@nextcloud/axios": "^2.0.0",
         "@nextcloud/browser-storage": "^0.2.0",
-        "@nextcloud/calendar-js": "^5.0.3",
+        "@nextcloud/calendar-js": "^6.0.0",
         "@nextcloud/capabilities": "^1.0.4",
         "@nextcloud/dialogs": "^4.0.0",
         "@nextcloud/event-bus": "^3.0.0",
@@ -21578,6 +21547,12 @@
             "core-js": "3.25.5"
           }
         },
+        "@nextcloud/calendar-js": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-6.0.0.tgz",
+          "integrity": "sha512-kZBRFIG8J3TNU6K92iEpNzBa3r9JbpCr1MZFJHqVy/5+xTtQG9FqsHhqUWptPwLEBhUNMwN+oCCa7QJAnBKKyg==",
+          "requires": {}
+        },
         "ansi-regex": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
@@ -21630,20 +21605,15 @@
           "requires": {
             "ansi-regex": "^6.0.1"
           }
+        },
+        "uuid": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+          "peer": true
         }
       }
     },
-    "@nextcloud/vue-richtext": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.4.tgz",
-      "integrity": "sha512-+873AF/G8OPVz2lwajpGVRfJ1v492CeiBTrguOkOwSGReNukGyHryCucF6rZGiMFenVIpp8BjNkqjHwkh6Cs4A==",
-      "requires": {
-        "@nextcloud/axios": "^2.0.0",
-        "@nextcloud/router": "^2.0.0",
-        "clone": "^2.1.2",
-        "vue": "^2.7.8"
-      }
-    },
     "@nextcloud/vue-select": {
       "version": "3.22.2",
       "resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.22.2.tgz",
@@ -21651,9 +21621,9 @@
       "requires": {}
     },
     "@nextcloud/webpack-vue-config": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.0.tgz",
-      "integrity": "sha512-bKlGYEqblSiSHNmpaGM9fz/f9v6JNwHp63V63yaI26gE0Zs+DpZSzJWC6HWWbJ1BgmoKT7wLN1GJc4W/NxvnxQ==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.1.tgz",
+      "integrity": "sha512-2Q3kPnsvkKeENG3rruTjAE1oz/9w0u5QMKO8oh9arL2TIO2aswkDKBtkmu6q7Po3tE+3B2f+ggHq1PNkhtwu6w==",
       "dev": true,
       "requires": {}
     },
@@ -28588,18 +28558,6 @@
       "version": "4.2.0",
       "peer": true
     },
-    "loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      }
-    },
     "locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -29513,15 +29471,14 @@
       "peer": true
     },
     "nextcloud-vue-collections": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.11.0.tgz",
-      "integrity": "sha512-sVeJzwVF7z/71n6TVk3RY+OewvF7gRRexYQ9ZRURbRUK9NIwByFNM7Y2S+U2LJFBsjM58twUhxwll9yWxYqdeA==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.11.1.tgz",
+      "integrity": "sha512-2t4a4mWvjTq+5Kly80pUzq7qpEZz6GHv3bI/yIxhC2K7Y0Rx5XqMSkhxeDuHPsR8KlmIeaPNOyYLMGfO7mgHQA==",
       "requires": {
         "@nextcloud/axios": "^2.3.0",
-        "@nextcloud/router": "^2.0.1",
-        "@nextcloud/vue": "^7.5.0",
-        "lodash-es": "^4.17.21",
-        "vue": "^2.7.14"
+        "@nextcloud/router": "^2.1.1",
+        "@nextcloud/vue": "^7.10.0",
+        "lodash-es": "^4.17.21"
       }
     },
     "node-fetch": {
@@ -32092,7 +32049,8 @@
     "uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true
     },
     "uvu": {
       "version": "0.5.6",
diff --git a/package.json b/package.json
index b44f02c9a..36ca5a278 100644
--- a/package.json
+++ b/package.json
@@ -41,8 +41,7 @@
     "@nextcloud/moment": "^1.2.1",
     "@nextcloud/notify_push": "^1.1.3",
     "@nextcloud/router": "^2.1.1",
-    "@nextcloud/vue": "^7.8.4",
-    "@nextcloud/vue-richtext": "^2.0.4",
+    "@nextcloud/vue": "^7.10.0",
     "blueimp-md5": "^2.19.0",
     "dompurify": "^3.0.2",
     "lodash": "^4.17.21",
@@ -50,7 +49,7 @@
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-task-checkbox": "^1.0.6",
     "moment": "^2.29.4",
-    "nextcloud-vue-collections": "^0.11.0",
+    "nextcloud-vue-collections": "^0.11.1",
     "p-queue": "^7.3.4",
     "url-search-params-polyfill": "^8.1.1",
     "vue": "^2.7.14",
@@ -77,7 +76,7 @@
     "@nextcloud/cypress": "^1.0.0-beta.2",
     "@nextcloud/eslint-config": "^8.2.1",
     "@nextcloud/stylelint-config": "^2.3.0",
-    "@nextcloud/webpack-vue-config": "^5.5.0",
+    "@nextcloud/webpack-vue-config": "^5.5.1",
     "@relative-ci/agent": "^4.1.4",
     "@vue/test-utils": "^1.3.5",
     "@vue/vue2-jest": "^29.2.3",
diff --git a/src/components/ActivityEntry.vue b/src/components/ActivityEntry.vue
index 0b65d2de4..211ffb208 100644
--- a/src/components/ActivityEntry.vue
+++ b/src/components/ActivityEntry.vue
@@ -24,7 +24,7 @@
 	<div v-if="activity" class="activity">
 		<div class="activity--header">
 			<img :src="activity.icon" class="activity--icon">
-			<RichText class="activity--subject" :text="message.subject" :arguments="message.parameters" />
+			<NcRichText class="activity--subject" :text="message.subject" :arguments="message.parameters" />
 			<div class="activity--timestamp">
 				{{ relativeDate(activity.datetime) }}
 			</div>
@@ -35,8 +35,7 @@
 </template>
 
 <script>
-import { RichText } from '@nextcloud/vue-richtext'
-import { NcUserBubble } from '@nextcloud/vue'
+import { NcRichText, NcUserBubble } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 import DOMPurify from 'dompurify'
 import relativeDate from '../mixins/relativeDate.js'
@@ -61,7 +60,7 @@ const InternalLink = {
 export default {
 	name: 'ActivityEntry',
 	components: {
-		RichText,
+		NcRichText,
 	},
 	mixins: [relativeDate],
 	props: {
diff --git a/src/components/board/BoardSidebar.vue b/src/components/board/BoardSidebar.vue
index 6ce0613ee..d907bb2b0 100644
--- a/src/components/board/BoardSidebar.vue
+++ b/src/components/board/BoardSidebar.vue
@@ -27,31 +27,39 @@
 		@close="closeSidebar">
 		<NcAppSidebarTab id="sharing"
 			:order="0"
-			:name="t('deck', 'Sharing')"
-			icon="icon-shared">
+			:name="t('deck', 'Sharing')">
+			<template #icon>
+				<SharingIcon :size="20" />
+			</template>
 			<SharingTabSidebar :board="board" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab id="tags"
 			:order="1"
-			:name="t('deck', 'Tags')"
-			icon="icon-tag">
+			:name="t('deck', 'Tags')">
+			<template #icon>
+				<TagsIcon :size="20" />
+			</template>
 			<TagsTabSidebar :board="board" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab v-if="canEdit"
 			id="deleted"
 			:order="2"
-			:name="t('deck', 'Deleted items')"
-			icon="icon-delete">
+			:name="t('deck', 'Deleted items')">
+			<template #icon>
+				<TrashIcon :size="20" />
+			</template>
 			<DeletedTabSidebar :board="board" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab v-if="hasActivity"
 			id="activity"
 			:order="3"
-			:name="t('deck', 'Timeline')"
-			icon="icon-activity">
+			:name="t('deck', 'Timeline')">
+			<template #icon>
+				<ActivityIcon :size="20" />
+			</template>
 			<TimelineTabSidebar :board="board" />
 		</NcAppSidebarTab>
 	</NcAppSidebar>
@@ -64,7 +72,10 @@ import TagsTabSidebar from './TagsTabSidebar.vue'
 import DeletedTabSidebar from './DeletedTabSidebar.vue'
 import TimelineTabSidebar from './TimelineTabSidebar.vue'
 import { NcAppSidebar, NcAppSidebarTab } from '@nextcloud/vue'
-
+import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
+import SharingIcon from 'vue-material-design-icons/ShareVariant.vue'
+import TagsIcon from 'vue-material-design-icons/TagMultiple.vue'
+import TrashIcon from 'vue-material-design-icons/Delete.vue'
 const capabilities = window.OC.getCapabilities()
 
 export default {
@@ -76,6 +87,10 @@ export default {
 		TagsTabSidebar,
 		DeletedTabSidebar,
 		TimelineTabSidebar,
+		ActivityIcon,
+		SharingIcon,
+		TagsIcon,
+		TrashIcon,
 	},
 	props: {
 		id: {
diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index 460d99aba..603cc4af8 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -50,32 +50,38 @@
 
 		<NcAppSidebarTab id="details"
 			:order="0"
-			:name="t('deck', 'Details')"
-			icon="icon-home">
+			:name="t('deck', 'Details')">
 			<CardSidebarTabDetails :card="currentCard" />
+			<template #icon>
+				<HomeIcon :size="20" />
+			</template>
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab id="attachments"
 			:order="1"
 			:name="t('deck', 'Attachments')">
 			<template #icon>
-				<AttachmentIcon :size="20" decorative />
+				<AttachmentIcon :size="20" />
 			</template>
 			<CardSidebarTabAttachments :card="currentCard" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab id="comments"
 			:order="2"
-			:name="t('deck', 'Comments')"
-			icon="icon-comment">
+			:name="t('deck', 'Comments')">
+			<template #icon>
+				<CommentIcon :size="20" />
+			</template>
 			<CardSidebarTabComments :card="currentCard" :tab-query="tabQuery" />
 		</NcAppSidebarTab>
 
 		<NcAppSidebarTab v-if="hasActivity"
 			id="timeline"
 			:order="3"
-			:name="t('deck', 'Timeline')"
-			icon="icon-activity">
+			:name="t('deck', 'Timeline')">
+			<template #icon>
+				<ActivityIcon :size="20" />
+			</template>
 			<CardSidebarTabActivity :card="currentCard" />
 		</NcAppSidebarTab>
 	</NcAppSidebar>
@@ -92,6 +98,9 @@ import CardSidebarTabActivity from './CardSidebarTabActivity.vue'
 import relativeDate from '../../mixins/relativeDate.js'
 import moment from '@nextcloud/moment'
 import AttachmentIcon from 'vue-material-design-icons/Paperclip.vue'
+import HomeIcon from 'vue-material-design-icons/Home.vue'
+import CommentIcon from 'vue-material-design-icons/Comment.vue'
+import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
 
 import { showError } from '@nextcloud/dialogs'
 import { getLocale } from '@nextcloud/l10n'
@@ -108,7 +117,10 @@ export default {
 		CardSidebarTabComments,
 		CardSidebarTabActivity,
 		CardSidebarTabDetails,
+		ActivityIcon,
 		AttachmentIcon,
+		CommentIcon,
+		HomeIcon,
 	},
 	mixins: [relativeDate],
 	props: {
diff --git a/src/components/card/CommentItem.vue b/src/components/card/CommentItem.vue
index 32da38194..66b20d8e6 100644
--- a/src/components/card/CommentItem.vue
+++ b/src/components/card/CommentItem.vue
@@ -12,7 +12,7 @@
 					</NcActionButton>
 				</NcActions>
 			</div>
-			<RichText class="comment--content"
+			<NcRichText class="comment--content"
 				:text="richText(comment)"
 				:arguments="richArgs(comment)"
 				:autolink="true" />
@@ -54,7 +54,7 @@
 		</div>
 		<CommentItem v-if="comment.replyTo" :reply="true" :comment="comment.replyTo" />
 		<div v-show="!edit" ref="richTextElement">
-			<RichText class="comment--content"
+			<NcRichText class="comment--content"
 				:text="richText(comment)"
 				:arguments="richArgs(comment)"
 				:autolink="true" />
@@ -64,8 +64,7 @@
 </template>
 
 <script>
-import { NcAvatar, NcActions, NcActionButton, NcUserBubble } from '@nextcloud/vue'
-import { RichText } from '@nextcloud/vue-richtext'
+import { NcAvatar, NcActions, NcActionButton, NcRichText, NcUserBubble } from '@nextcloud/vue'
 import CommentForm from './CommentForm.vue'
 import { getCurrentUser } from '@nextcloud/auth'
 import md5 from 'blueimp-md5'
@@ -93,7 +92,7 @@ export default {
 		NcActions,
 		NcActionButton,
 		CommentForm,
-		RichText,
+		NcRichText,
 		ReplyIcon,
 	},
 	mixins: [relativeDate],
diff --git a/src/components/search/GlobalSearchResults.vue b/src/components/search/GlobalSearchResults.vue
index bf1c61ecc..1d34e61c4 100644
--- a/src/components/search/GlobalSearchResults.vue
+++ b/src/components/search/GlobalSearchResults.vue
@@ -23,7 +23,7 @@
 <template>
 	<div v-if="searchQuery!==''" class="global-search">
 		<h2>
-			<RichText :text="t('deck', 'Search for {searchQuery} in all boards')" :arguments="queryStringArgs" />
+			<NcRichText :text="t('deck', 'Search for {searchQuery} in all boards')" :arguments="queryStringArgs" />
 			<div v-if="loading" class="icon-loading-small" />
 		</h2>
 		<NcActions>
@@ -57,9 +57,8 @@ import { mapState } from 'vuex'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import InfiniteLoading from 'vue-infinite-loading'
-import { RichText } from '@nextcloud/vue-richtext'
 import Placeholder from './Placeholder.vue'
-import { NcActions, NcActionButton } from '@nextcloud/vue'
+import { NcActions, NcActionButton, NcRichText } from '@nextcloud/vue'
 
 const createCancelToken = () => axios.CancelToken.source()
 
@@ -88,7 +87,7 @@ function search({ query, cursor }) {
 
 export default {
 	name: 'GlobalSearchResults',
-	components: { CardItem, InfiniteLoading, RichText, Placeholder, NcActions, NcActionButton },
+	components: { CardItem, InfiniteLoading, NcRichText, Placeholder, NcActions, NcActionButton },
 	data() {
 		return {
 			results: [],
diff --git a/src/init-reference.js b/src/init-reference.js
index 25b630a37..08b804742 100644
--- a/src/init-reference.js
+++ b/src/init-reference.js
@@ -19,7 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { registerWidget } from '@nextcloud/vue-richtext'
+import { registerWidget } from '@nextcloud/vue/dist/Components/NcRichText.js'
 import { Tooltip } from '@nextcloud/vue'
 import Vue from 'vue'
 import CardReferenceWidget from './views/CardReferenceWidget.vue'
diff --git a/src/views/CardReferenceWidget.vue b/src/views/CardReferenceWidget.vue
index 2f2db2fa0..a0e7d9d92 100644
--- a/src/views/CardReferenceWidget.vue
+++ b/src/views/CardReferenceWidget.vue
@@ -67,7 +67,7 @@
 					'description': true,
 					'short-description': shortDescription,
 				}">
-				<RichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
+				<NcRichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
 					:text="card.description"
 					:use-markdown="true"
 					@click.native="shortDescription = !shortDescription" />
@@ -90,7 +90,7 @@ import DeckIcon from '../components/icons/DeckIcon.vue'
 import AvatarList from '../components/cards/AvatarList.vue'
 import labelStyle from '../mixins/labelStyle.js'
 
-import { RichText } from '@nextcloud/vue-richtext'
+import { NcRichText } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 import { generateUrl } from '@nextcloud/router'
 
@@ -103,7 +103,7 @@ export default {
 		CalendarBlankIcon,
 		CardBulletedOutlineIcon,
 		TextIcon,
-		RichText,
+		NcRichText,
 	},
 
 	mixins: [labelStyle],
diff --git a/src/views/CommentReferenceWidget.vue b/src/views/CommentReferenceWidget.vue
index ffa8f4276..b8d76c2f3 100644
--- a/src/views/CommentReferenceWidget.vue
+++ b/src/views/CommentReferenceWidget.vue
@@ -67,7 +67,7 @@
 					'description': true,
 					'short-description': shortDescription,
 				}">
-				<RichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
+				<NcRichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
 					:text="card.description"
 					:use-markdown="true"
 					@click.native="shortDescription = !shortDescription" />
@@ -84,7 +84,7 @@
 				'comment': true,
 				'short-comment': shortComment,
 			}">
-				<RichText v-tooltip.top="{ content: shortComment ? t('deck', 'Click to expand comment') : undefined }"
+				<NcRichText v-tooltip.top="{ content: shortComment ? t('deck', 'Click to expand comment') : undefined }"
 					:text="commentMessageText"
 					:use-markdown="false"
 					@click.native="shortComment = !shortComment" />
@@ -103,7 +103,7 @@ import DeckIcon from '../components/icons/DeckIcon.vue'
 import AvatarList from '../components/cards/AvatarList.vue'
 import labelStyle from '../mixins/labelStyle.js'
 
-import { RichText } from '@nextcloud/vue-richtext'
+import { NcRichText } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 import { generateUrl } from '@nextcloud/router'
 
@@ -116,7 +116,7 @@ export default {
 		CalendarBlankIcon,
 		TextIcon,
 		CardBulletedOutlineIcon,
-		RichText,
+		NcRichText,
 		CommentProcessingOutlineIcon,
 	},