diff --git a/img/x-office-document.svg b/img/x-office-document.svg
index d19fa659a6..adc8454f60 100644
--- a/img/x-office-document.svg
+++ b/img/x-office-document.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#49abea" d="m2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3h-8.5zm1.5 2h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#000000">
+	<path d="M0 0h24v24H0z" fill="none" />
+	<path fill="#49abea"
+		d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z" />
+</svg>
diff --git a/img/x-office-drawing.svg b/img/x-office-drawing.svg
index 352347b634..2fc507fa85 100644
--- a/img/x-office-drawing.svg
+++ b/img/x-office-drawing.svg
@@ -1 +1,4 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M2.5 1c-.28 0-.5.22-.5.5v13c0 .28.22.5.5.5h11c.28 0 .5-.22.5-.5V4l-3-3H2.5zM4 6h2.8v1.2h2.4V6H12v3.2H9.2V8h-.8v3.2h.8V10H12v3.2H9.2V12H7.6V8h-.8v1.2H4V6z" style="fill:#ebc94a;fill-opacity:1"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+	<path fill="#b39114"
+		d="M18,18H12V12.21C11.34,12.82 10.47,13.2 9.5,13.2C7.46,13.2 5.8,11.54 5.8,9.5A3.7,3.7 0 0,1 9.5,5.8C11.54,5.8 13.2,7.46 13.2,9.5C13.2,10.47 12.82,11.34 12.21,12H18M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
+</svg>
diff --git a/img/x-office-presentation.svg b/img/x-office-presentation.svg
index 523aa38ec2..d7b61cba0d 100644
--- a/img/x-office-presentation.svg
+++ b/img/x-office-presentation.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16" version="1.1"><path fill="#f0965f" d="m1.5 2c-0.25 0-0.5 0.25-0.5 0.5v11c0 0.25 0.25 0.5 0.5 0.5h13c0.25 0 0.5-0.25 0.5-0.5v-11c0-0.25-0.25-0.5-0.5-0.5zm0.5 3h12v6h-12z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+	<path fill="#f0965f"
+		d="M19,16H5V8H19M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
+</svg>
diff --git a/img/x-office-spreadsheet.svg b/img/x-office-spreadsheet.svg
index b7006a98ea..5e29558fe4 100644
--- a/img/x-office-spreadsheet.svg
+++ b/img/x-office-spreadsheet.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#9abd4e" d="m2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3h-8.5zm1.5 3h2v2h-2v-2zm3 0h5v2h-5v-2zm-3 3h2v2h-2v-2zm3 0h5v2h-5v-2zm-3 3h2v2h-2v-2zm3 0h5v2h-5v-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+	<path fill="#9abd4e"
+		d="M19 3H5C3.89 3 3 3.89 3 5V19C3 20.1 3.9 21 5 21H19C20.1 21 21 20.1 21 19V5C21 3.89 20.1 3 19 3M9 18H6V16H9V18M9 15H6V13H9V15M9 12H6V10H9V12M13 18H10V16H13V18M13 15H10V13H13V15M13 12H10V10H13V12Z" />
+</svg>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 831e56b78c..084edf8bf2 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -101,12 +101,12 @@ public function register(IRegistrationContext $context): void {
 	}
 
 	public function boot(IBootContext $context): void {
-		$context->injectFn(function (ITemplateManager $templateManager, IL10N $l10n, IConfig $config, CapabilitiesService $capabilitiesService, PermissionManager $permissionManager) {
+		$context->injectFn(function (ITemplateManager $templateManager, IL10N $l10n, IConfig $config, CapabilitiesService $capabilitiesService, PermissionManager $permissionManager, IAppManager $appManager) {
 			if (!$permissionManager->isEnabledForUser() || empty($capabilitiesService->getCapabilities())) {
 				return;
 			}
 			$ooxml = $config->getAppValue(self::APPNAME, 'doc_format', '') === 'ooxml';
-			$templateManager->registerTemplateFileCreator(function () use ($l10n, $ooxml) {
+			$templateManager->registerTemplateFileCreator(function () use ($l10n, $ooxml, $appManager) {
 				$odtType = new TemplateFileCreator('richdocuments', $l10n->t('New document'), ($ooxml ? '.docx' : '.odt'));
 				if ($ooxml) {
 					$odtType->addMimetype('application/msword');
@@ -115,11 +115,11 @@ public function boot(IBootContext $context): void {
 					$odtType->addMimetype('application/vnd.oasis.opendocument.text');
 					$odtType->addMimetype('application/vnd.oasis.opendocument.text-template');
 				}
-				$odtType->setIconClass('icon-filetype-document');
+				$odtType->setIconSvgInline(file_get_contents($appManager->getAppPath('richdocuments') . '/img/x-office-document.svg'));
 				$odtType->setRatio(21 / 29.7);
 				return $odtType;
 			});
-			$templateManager->registerTemplateFileCreator(function () use ($l10n, $ooxml) {
+			$templateManager->registerTemplateFileCreator(function () use ($l10n, $ooxml, $appManager) {
 				$odsType = new TemplateFileCreator('richdocuments', $l10n->t('New spreadsheet'), ($ooxml ? '.xlsx' : '.ods'));
 				if ($ooxml) {
 					$odsType->addMimetype('application/vnd.ms-excel');
@@ -128,11 +128,11 @@ public function boot(IBootContext $context): void {
 					$odsType->addMimetype('application/vnd.oasis.opendocument.spreadsheet');
 					$odsType->addMimetype('application/vnd.oasis.opendocument.spreadsheet-template');
 				}
-				$odsType->setIconClass('icon-filetype-spreadsheet');
+				$odsType->setIconSvgInline(file_get_contents($appManager->getAppPath('richdocuments') . '/img/x-office-spreadsheet.svg'));
 				$odsType->setRatio(16 / 9);
 				return $odsType;
 			});
-			$templateManager->registerTemplateFileCreator(function () use ($l10n, $ooxml) {
+			$templateManager->registerTemplateFileCreator(function () use ($l10n, $ooxml, $appManager) {
 				$odpType = new TemplateFileCreator('richdocuments', $l10n->t('New presentation'), ($ooxml ? '.pptx' : '.odp'));
 				if ($ooxml) {
 					$odpType->addMimetype('application/vnd.ms-powerpoint');
@@ -141,7 +141,7 @@ public function boot(IBootContext $context): void {
 					$odpType->addMimetype('application/vnd.oasis.opendocument.presentation');
 					$odpType->addMimetype('application/vnd.oasis.opendocument.presentation-template');
 				}
-				$odpType->setIconClass('icon-filetype-presentation');
+				$odpType->setIconSvgInline(file_get_contents($appManager->getAppPath('richdocuments') . '/img/x-office-presentation.svg'));
 				$odpType->setRatio(16 / 9);
 				return $odpType;
 			});
@@ -149,11 +149,11 @@ public function boot(IBootContext $context): void {
 			if (!$capabilitiesService->hasDrawSupport()) {
 				return;
 			}
-			$templateManager->registerTemplateFileCreator(function () use ($l10n, $ooxml) {
+			$templateManager->registerTemplateFileCreator(function () use ($l10n, $ooxml, $appManager) {
 				$odpType = new TemplateFileCreator('richdocuments', $l10n->t('New diagram'), '.odg');
 				$odpType->addMimetype('application/vnd.oasis.opendocument.graphics');
 				$odpType->addMimetype('application/vnd.oasis.opendocument.graphics-template');
-				$odpType->setIconClass('icon-filetype-draw');
+				$odpType->setIconSvgInline(file_get_contents($appManager->getAppPath('richdocuments') . '/img/x-office-drawing.svg'));
 				$odpType->setRatio(1);
 				return $odpType;
 			});