diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 475f57341..1ba5d6de4 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -315,19 +315,5 @@ else()
 			install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink application-x-cdoc.png \
 				\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${RES}x${RES}/mimetypes/${TGT})")
 		endforeach()
-		# Workaround Ubuntu 21.10 Yaru icon theme issues
-		install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory \
-			\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_DATADIR}/icons/Yaru/${RES}x${RES}/mimetypes/)")
-		foreach(TGT
-				application-vnd.etsi.asic-e+zip.png
-				application-vnd.etsi.asic-s+zip.png
-				application-x-ddoc.png
-				application-vnd.lt.archyvai.adoc-2008.png
-				application-x-cdoc.png
-				application-x-cdoc2.png)
-			install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
-				${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${RES}x${RES}/mimetypes/${TGT} \
-				\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_DATADIR}/icons/Yaru/${RES}x${RES}/mimetypes/${TGT})")
-		endforeach()
 	endforeach()
 endif()
diff --git a/client/qdigidoc4.xml b/client/qdigidoc4.xml
index 308e87c61..7a01d668f 100644
--- a/client/qdigidoc4.xml
+++ b/client/qdigidoc4.xml
@@ -3,11 +3,13 @@
 	<mime-type type="application/vnd.lt.archyvai.adoc-2008">
 		<comment>DigiDoc signed document</comment>
 		<comment xml:lang="et">DigiDoc allkirjastatud dokument</comment>
+		<generic-icon name="application-vnd.lt.archyvai.adoc-2008"/>
 		<glob pattern="*.adoc"/>
 	</mime-type>
 	<mime-type type="application/vnd.etsi.asic-e+zip">
 		<comment>DigiDoc signed document</comment>
 		<comment xml:lang="et">DigiDoc allkirjastatud dokument</comment>
+		<generic-icon name="application-vnd.etsi.asic-e+zip"/>
 		<glob pattern="*.bdoc"/>
 		<glob pattern="*.asice"/>
 		<glob pattern="*.sce"/>
@@ -16,22 +18,26 @@
 	<mime-type type="application/x-ddoc">
 		<comment>DigiDoc signed document</comment>
 		<comment xml:lang="et">DigiDoc allkirjastatud dokument</comment>
+		<generic-icon name="application-x-ddoc"/>
 		<glob pattern="*.ddoc"/>
 	</mime-type>
 	<mime-type type="application/vnd.etsi.asic-s+zip">
 		<comment>DigiDoc timestamped document</comment>
 		<comment xml:lang="et">DigiDoc ajatembeldatud dokument</comment>
+		<generic-icon name="application-vnd.etsi.asic-s+zip"/>
 		<glob pattern="*.asics"/>
 		<glob pattern="*.scs"/>
 	</mime-type>
 	<mime-type type="application/x-cdoc">
 		<comment>DigiDoc encrypted container</comment>
 		<comment xml:lang="et">DigiDoc turvaümbrik</comment>
+		<generic-icon name="application-x-cdoc"/>
 		<glob pattern="*.cdoc"/>
 	</mime-type>
 	<mime-type type="application/x-cdoc2">
 		<comment>DigiDoc encrypted container</comment>
 		<comment xml:lang="et">DigiDoc turvaümbrik</comment>
+		<generic-icon name="application-x-cdoc2"/>
 		<glob pattern="*.cdoc2"/>
 	</mime-type>
 </mime-info>