diff --git a/sources/Application/UI/Base/Common/Action/tActionCommon.php b/sources/Application/UI/Base/Common/Action/tActionCommon.php
index 6858b0cff..e2f29a6d8 100644
--- a/sources/Application/UI/Base/Common/Action/tActionCommon.php
+++ b/sources/Application/UI/Base/Common/Action/tActionCommon.php
@@ -42,7 +42,7 @@ trait tActionCommon
 		return $this->sUid;
 	}
 
-	public function SetUID(string $sUid)
+	public function SetUID(string $sUid): static
 	{
 		$this->sUid = $sUid;
 		return $this;
@@ -53,7 +53,7 @@ trait tActionCommon
 		return $this->sLabel;
 	}
 
-	public function SetLabel(string $sLabel)
+	public function SetLabel(string $sLabel): static
 	{
 		$this->sLabel = $sLabel;
 		return $this;
@@ -64,7 +64,7 @@ trait tActionCommon
 		return $this->sIconClass;
 	}
 
-	public function SetIconClass(string $sIconClass)
+	public function SetIconClass(string $sIconClass): static
 	{
 		$this->sIconClass = $sIconClass;
 		return $this;
@@ -75,7 +75,7 @@ trait tActionCommon
 		return $this->sTooltip;
 	}
 
-	public function SetTooltip(?string $sTooltip)
+	public function SetTooltip(?string $sTooltip): static
 	{
 		$this->sTooltip = $sTooltip;
 		return $this;
@@ -86,15 +86,15 @@ trait tActionCommon
 		return $this->aCssClasses;
 	}
 
-	public function SetCssClasses(array $aCssClasses)
+	public function SetCssClasses(array $aCssClasses): static
 	{
 		$this->aCssClasses = $aCssClasses;
 		return $this;
 	}
 
-	public function AddCssClass(string $sCssClass)
+	public function AddCssClass(string $sCssClass): static
 	{
 		$this->aCssClasses[] = $sCssClass;
 		return $this;
 	}
-}
\ No newline at end of file
+}
diff --git a/sources/Application/UI/Base/Common/Action/tActionJs.php b/sources/Application/UI/Base/Common/Action/tActionJs.php
index 4450aa300..59ac5fb36 100644
--- a/sources/Application/UI/Base/Common/Action/tActionJs.php
+++ b/sources/Application/UI/Base/Common/Action/tActionJs.php
@@ -40,7 +40,7 @@ trait tActionJs
 		return $this->sJsCode;
 	}
 
-	public function SetJsCode(string $sJsCode)
+	public function SetJsCode(string $sJsCode): static
 	{
 		$this->sJsCode = $sJsCode;
 		return $this;
@@ -51,7 +51,7 @@ trait tActionJs
 		return $this->sUrl;
 	}
 
-	public function SetUrl(string $sUrl)
+	public function SetUrl(string $sUrl): static
 	{
 		$this->sUrl = $sUrl;
 		return $this;
@@ -62,7 +62,7 @@ trait tActionJs
 		return $this->aIncludeJSFiles;
 	}
 
-	public function SetIncludeJSFiles(array $aIncludeJSFiles)
+	public function SetIncludeJSFiles(array $aIncludeJSFiles): static
 	{
 		$this->aIncludeJSFiles = $aIncludeJSFiles;
 		return $this;
diff --git a/sources/Application/UI/Base/Common/Action/tActionURL.php b/sources/Application/UI/Base/Common/Action/tActionURL.php
index bdbfc3b19..008f9d162 100644
--- a/sources/Application/UI/Base/Common/Action/tActionURL.php
+++ b/sources/Application/UI/Base/Common/Action/tActionURL.php
@@ -39,7 +39,7 @@ trait tActionURL
 		return $this->sUrl;
 	}
 
-	public function SetUrl(string $sUrl)
+	public function SetUrl(string $sUrl): static
 	{
 		$this->sUrl = $sUrl;
 		return $this;
@@ -50,9 +50,9 @@ trait tActionURL
 		return $this->sTarget;
 	}
 
-	public function SetTarget(?string $sTarget)
+	public function SetTarget(?string $sTarget): static
 	{
 		$this->sTarget = $sTarget;
 		return $this;
 	}
-}
\ No newline at end of file
+}
diff --git a/sources/Application/UI/Base/Component/Field/Field.php b/sources/Application/UI/Base/Component/Field/Field.php
index 0f62cea36..220270167 100644
--- a/sources/Application/UI/Base/Component/Field/Field.php
+++ b/sources/Application/UI/Base/Component/Field/Field.php
@@ -401,7 +401,7 @@ class Field extends UIContentBlock
 	{
 		return $this->aActions;
 	}
-	public function AddAction(UIBlock $oAction)
+	public function AddAction(UIBlock $oAction): static
 	{
 		$this->aActions[] = $oAction;
 		return $this;
@@ -411,7 +411,7 @@ class Field extends UIContentBlock
 		return !empty($this->aActions);
 	}
 
-	public function SetActions(array $aActions)
+	public function SetActions(array $aActions): static
 	{
 		$this->aActions = $aActions;
 		return $this;
diff --git a/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelAction.php b/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelAction.php
index f8eab0356..ad5670c85 100644
--- a/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelAction.php
+++ b/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelAction.php
@@ -56,13 +56,13 @@ abstract class ActivityPanelAction extends UIBlock
 		$this->sTooltip = $sTooltip;
 	}
 
-	public function SetPopupItems(array $aPopupItems)
+	public function SetPopupItems(array $aPopupItems): static
 	{
 		$this->aPopupItems = $aPopupItems;
 		return $this;
 	}
 
-	public function AddPopupItem(string $sSectionId, \ApplicationPopupMenuItem $oPopupItem)
+	public function AddPopupItem(string $sSectionId, \ApplicationPopupMenuItem $oPopupItem): static
 	{
 		if (!array_key_exists($sSectionId, $this->aPopupItems)) {
 			$this->aPopupItems[$sSectionId] = [];
@@ -77,7 +77,7 @@ abstract class ActivityPanelAction extends UIBlock
 		return $this->aPopupItems;
 	}
 
-	public function SetPopoverMenu(PopoverMenu $oPopoverMenu)
+	public function SetPopoverMenu(PopoverMenu $oPopoverMenu): static
 	{
 		$this->oPopoverMenu = $oPopoverMenu;
 		return $this;