diff --git a/package.json b/package.json
index 80be8ac36d0..6e071f9f546 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
     ],
     "moduleNameMapper": {
       "^@/(.*)$": "<rootDir>/src/$1",
-      "\\.(css)$": "identity-obj-proxy"
+      "^.+\\.(css|less|scss)$": "identity-obj-proxy"
     },
     "testPathIgnorePatterns": [
       "<rootDir>/src/tests/fixtures/",
diff --git a/src/components/Suggestion/LinkPicker/LinkPickerList.vue b/src/components/Suggestion/LinkPicker/LinkPickerList.vue
index ff059add2af..d08e4eb0add 100644
--- a/src/components/Suggestion/LinkPicker/LinkPickerList.vue
+++ b/src/components/Suggestion/LinkPicker/LinkPickerList.vue
@@ -25,7 +25,8 @@
 		@select="(item) => $emit('select', item)">
 		<template #default="{ item }">
 			<div class="link-picker__item">
-				<img :src="item.icon">
+				<compoent :is="item.icon" v-if="typeof item.icon !== 'string'" />
+				<img v-else :src="item.icon">
 				<div>{{ item.label }}</div>
 			</div>
 		</template>
diff --git a/src/components/Suggestion/LinkPicker/suggestions.js b/src/components/Suggestion/LinkPicker/suggestions.js
index 3391c10b169..08e62cf9ddd 100644
--- a/src/components/Suggestion/LinkPicker/suggestions.js
+++ b/src/components/Suggestion/LinkPicker/suggestions.js
@@ -24,9 +24,37 @@ import LinkPickerList from './LinkPickerList.vue'
 
 import { searchProvider, getLinkWithPicker } from '@nextcloud/vue/dist/Components/NcRichText.js'
 
+import menuEntries from './../../Menu/entries.js'
+
+const suggestGroupFormat = t('text', 'Formatting')
+const suggestGroupPicker = t('text', 'Embed')
+
+const filterOut = (e) => {
+	return ['undo', 'redo', 'outline', 'emoji-picker'].indexOf(e.key) > -1
+}
+
+const formattingSuggestions = (query) => {
+	return [
+		...menuEntries.find(e => e.key === 'headings').children,
+		...menuEntries.filter(e => e.action && !filterOut(e)),
+		...menuEntries.find(e => e.key === 'callouts').children,
+		{
+			...menuEntries.find(e => e.key === 'emoji-picker'),
+			action: (command) => command.insertContent(':'),
+		},
+	].filter(e => e?.label?.toLowerCase?.()?.includes(query.toLowerCase()))
+		.map(e => ({ ...e, suggestGroup: suggestGroupFormat }))
+}
+
 export default () => createSuggestions({
 	listComponent: LinkPickerList,
 	command: ({ editor, range, props }) => {
+		if (props.action) {
+			const commandChain = editor.chain().deleteRange(range)
+			props.action(commandChain)
+			commandChain.run()
+			return
+		}
 		getLinkWithPicker(props.providerId, true)
 			.then(link => {
 				editor
@@ -40,13 +68,17 @@ export default () => createSuggestions({
 			})
 	},
 	items: ({ query }) => {
-		return searchProvider(query)
-			.map(p => {
-				return {
-					label: p.title,
-					icon: p.icon_url,
-					providerId: p.id,
-				}
-			})
+		return [
+			...formattingSuggestions(query),
+			...searchProvider(query)
+				.map(p => {
+					return {
+						suggestGroup: suggestGroupPicker,
+						label: p.title,
+						icon: p.icon_url,
+						providerId: p.id,
+					}
+				}),
+		]
 	},
 })
diff --git a/src/components/Suggestion/SuggestionListWrapper.vue b/src/components/Suggestion/SuggestionListWrapper.vue
index 0dc9d6f850d..7aa054ba5b8 100644
--- a/src/components/Suggestion/SuggestionListWrapper.vue
+++ b/src/components/Suggestion/SuggestionListWrapper.vue
@@ -23,12 +23,17 @@
 <template>
 	<div class="suggestion-list">
 		<template v-if="hasResults">
-			<div v-for="(item, index) in items"
-				:key="index"
-				class="suggestion-list__item"
-				:class="{ 'is-selected': index === selectedIndex }"
-				@click="selectItem(index)">
-				<slot :item="item" :active="index === selectedIndex" />
+			<div v-for="(groupItems, key, groupIndex) in itemGroups" :key="key">
+				<div class="suggestion-list__group">
+					{{ key }}
+				</div>
+				<div v-for="(item, index) in groupItems"
+					:key="combineIndex(groupIndex, index)"
+					class="suggestion-list__item"
+					:class="{ 'is-selected': combineIndex(groupIndex, index) === selectedIndex }"
+					@click="selectItem(combineIndex(groupIndex, index))">
+					<slot :item="item" :active="combineIndex(groupIndex, index) === selectedIndex" />
+				</div>
 			</div>
 		</template>
 		<div v-else class="suggestion-list__item is-empty">
@@ -68,6 +73,26 @@ export default {
 			return this.selectedIndex * this.itemHeight >= this.$el.scrollTop
 				&& (this.selectedIndex + 1) * this.itemHeight <= this.$el.scrollTop + this.$el.clientHeight
 		},
+		itemGroups() {
+			const groups = {}
+			this.items.forEach((item) => {
+				if (!groups[item.suggestGroup]) {
+					groups[item.suggestGroup] = []
+				}
+				groups[item.suggestGroup].push(item)
+			})
+			return groups
+		},
+		combineIndex() {
+			return (groupIndex, index) => {
+				const previousItemCount = Object.values(this.itemGroups)
+					.slice(0, groupIndex)
+					.reduce((sum, items) => {
+						return sum + items.length
+					}, 0)
+				return previousItemCount + index
+			}
+		},
 	},
 	watch: {
 		items() {
@@ -128,11 +153,26 @@ export default {
 
 	min-width: 200px;
 	max-width: 400px;
+	width: 80vw;
 	padding: 4px;
 	// Show maximum 5 entries and a half to show scroll
 	max-height: 35.5px * 5 + 18px;
 	margin: 5px 0;
 
+	&__group {
+		font-weight: bold;
+		color: var(--color-primary-element);
+		font-size: var(--default-font-size);
+		line-height: 44px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		opacity: .7;
+		box-shadow: none !important;
+		flex-shrink: 0;
+		padding-left: 8px;
+	}
+
 	&__item {
 		border-radius: 8px;
 		padding: 4px 8px;