diff --git a/lib/Controller/FederationController.php b/lib/Controller/FederationController.php
index 0bcbf0947c..08fd39c7b2 100644
--- a/lib/Controller/FederationController.php
+++ b/lib/Controller/FederationController.php
@@ -143,7 +143,7 @@ public function initiatorUser($token): DataResponse {
 			return new DataResponse([
 				'userId' => $user->getUID(),
 				'displayName' => $user->getDisplayName(),
-				'avatar' => $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $wopi->getEditorUid(), 'size' => WopiControllerTest::WOPI_AVATAR_SIZE])
+				'avatar' => $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $wopi->getEditorUid(), 'size' => WopiController::WOPI_AVATAR_SIZE])
 			]);
 		} catch (DoesNotExistException $e) {
 			$this->logger->debug('COOL-Federation-Initiator-User: Token ' . $token . 'not found');
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index e80ef01b31..9d54b9a3b9 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -88,7 +88,7 @@ class WopiController extends Controller {
 	// Signifies LOOL that document has been changed externally in this storage
 	const LOOL_STATUS_DOC_CHANGED = 1010;
 
-	const WOPI_AVATAR_SIZE = 32;
+	const WOPI_AVATAR_SIZE = 64;
 
 	public function __construct(
 		$appName,
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 9e44e9d3f3..d192566df3 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -15,6 +15,9 @@
     </RedundantCondition>
   </file>
   <file src="lib/AppInfo/Application.php">
+    <InvalidArgument occurrences="1">
+      <code>registerEventListener</code>
+    </InvalidArgument>
     <MissingDependency occurrences="5">
       <code>MSExcel</code>
       <code>MSWord</code>
@@ -212,6 +215,13 @@
       <code>$this-&gt;userSession</code>
     </UndefinedThisPropertyFetch>
   </file>
+  <file src="lib/Service/WatermarkService.php">
+    <MissingDependency occurrences="3">
+      <code>$this-&gt;rootFolder</code>
+      <code>IRootFolder</code>
+      <code>IRootFolder</code>
+    </MissingDependency>
+  </file>
   <file src="lib/Template/CollaboraTemplateProvider.php">
     <InvalidReturnStatement occurrences="1"/>
     <InvalidReturnType occurrences="1">
@@ -219,7 +229,8 @@
     </InvalidReturnType>
   </file>
   <file src="lib/TemplateManager.php">
-    <MissingDependency occurrences="6">
+    <MissingDependency occurrences="7">
+      <code>$this-&gt;rootFolder</code>
       <code>$this-&gt;rootFolder</code>
       <code>$this-&gt;rootFolder</code>
       <code>$this-&gt;rootFolder</code>