diff --git a/packages/upgrade/src/App/Heroiconsv2RectorSet.php b/packages/upgrade/src/App/Heroiconsv2RectorSet.php
deleted file mode 100644
index d9d0645ebc..0000000000
--- a/packages/upgrade/src/App/Heroiconsv2RectorSet.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-use Rector\Config\RectorConfig;
-
-return static function (RectorConfig $rectorConfig): void {
-};
diff --git a/packages/upgrade/src/App/SimpleMethodChangesRector.php b/packages/upgrade/src/App/SimpleMethodChangesRector.php
index 862fefeb4f..7a5422a9ab 100644
--- a/packages/upgrade/src/App/SimpleMethodChangesRector.php
+++ b/packages/upgrade/src/App/SimpleMethodChangesRector.php
@@ -2,6 +2,7 @@
 
 namespace Filament\Upgrade\App;
 
+use phpDocumentor\Reflection\Types\Null_;
 use PhpParser\Node;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\Variable;
@@ -10,7 +11,10 @@ use PhpParser\Node\Name;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\UnionType;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Naming\Guard\BreakingVariableRenameGuard;
+use Rector\Naming\Naming\ExpectedNameResolver;
 use Rector\Naming\VariableRenamer;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
diff --git a/packages/upgrade/src/Forms/FixGetSetClosureTypesRector.php b/packages/upgrade/src/Forms/FixGetSetClosureTypesRector.php
new file mode 100644
index 0000000000..938a2e72d3
--- /dev/null
+++ b/packages/upgrade/src/Forms/FixGetSetClosureTypesRector.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Filament\Upgrade\Forms;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\ArrowFunction;
+use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Name;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+class FixGetSetClosureTypesRector extends AbstractRector
+{
+    public function getNodeTypes(): array
+    {
+        return [ArrowFunction::class, Closure::class];
+    }
+
+    public function refactor(Node | ArrowFunction | Closure $node): ?Node
+    {
+        foreach ($node->params as $param) {
+            if (! $param->type) {
+                continue;
+            }
+
+            if (($param->var->name === 'get') && $this->isName($param->type, 'Closure')) {
+                $param->type = new Name('\\Filament\\Forms\\Get');
+            }
+
+            if (($param->var->name === 'set') && $this->isName($param->type, 'Closure')) {
+                $param->type = new Name('\\Filament\\Forms\\Set');
+            }
+        }
+
+        return $node;
+    }
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Fix the types for `$get` and `$set` closure arguments',
+            [
+                new CodeSample(
+                    'function (Closure $get, Closure $set)',
+                    'function (\\Filament\\Forms\\Get $get, \\Filament\\Forms\\Set $set)',
+                ),
+            ]
+        );
+    }
+}
diff --git a/packages/upgrade/src/SecondaryToGrayColorRector.php b/packages/upgrade/src/SecondaryToGrayColorRector.php
index b75883901a..cc61313b6f 100644
--- a/packages/upgrade/src/SecondaryToGrayColorRector.php
+++ b/packages/upgrade/src/SecondaryToGrayColorRector.php
@@ -48,4 +48,4 @@ class SecondaryToGrayColorRector extends AbstractRector
             ]
         );
     }
-}
+}
\ No newline at end of file
diff --git a/packages/upgrade/src/heroicon-changes.php b/packages/upgrade/src/heroicon-changes.php
index 8ded29af7c..6101238a80 100644
--- a/packages/upgrade/src/heroicon-changes.php
+++ b/packages/upgrade/src/heroicon-changes.php
@@ -130,4 +130,4 @@ foreach ($iconNameChanges as $oldName => $newName) {
     $changes["heroicon-s-{$oldName}"] = "heroicon-m-{$newName}";
 }
 
-return $changes;
+return $changes;
\ No newline at end of file
diff --git a/packages/upgrade/src/rector.php b/packages/upgrade/src/rector.php
index 2e80f246bf..6e51dacca4 100644
--- a/packages/upgrade/src/rector.php
+++ b/packages/upgrade/src/rector.php
@@ -3,18 +3,22 @@
 use Filament\Upgrade\App\MoveImportedClassesRector;
 use Filament\Upgrade\App\SimpleMethodChangesRector;
 use Filament\Upgrade\App\SimplePropertyChangesRector;
+use Filament\Upgrade\Forms\FixGetSetClosureTypesRector;
 use Filament\Upgrade\SecondaryToGrayColorRector;
 use Rector\Config\RectorConfig;
 use Rector\Renaming\Rector\String_\RenameStringRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rules([
+        FixGetSetClosureTypesRector::class,
         MoveImportedClassesRector::class,
         SecondaryToGrayColorRector::class,
         SimpleMethodChangesRector::class,
         SimplePropertyChangesRector::class,
     ]);
 
-    $heroiconChanges = require 'heroicon-changes.php';
-    $rectorConfig->ruleWithConfiguration(RenameStringRector::class, $heroiconChanges);
+    $rectorConfig->ruleWithConfiguration(
+        RenameStringRector::class,
+        require 'heroicon-changes.php',
+    );
 };