diff --git a/src/components/ui/Input.tsx b/src/components/ui/Input.tsx
index acc0b68..2674e40 100644
--- a/src/components/ui/Input.tsx
+++ b/src/components/ui/Input.tsx
@@ -7,6 +7,7 @@ interface InputProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, '
     error?: string;
     helperText?: string;
     inputSize?: 'sm' | 'md' | 'lg';
+    icon?: React.ComponentType<{ className?: string }>;
 }
 
 export const Input = React.forwardRef<HTMLInputElement, InputProps>(
diff --git a/src/components/ui/Typography.tsx b/src/components/ui/Typography.tsx
index fde16f8..cc41333 100644
--- a/src/components/ui/Typography.tsx
+++ b/src/components/ui/Typography.tsx
@@ -86,10 +86,11 @@ interface FormHeaderProps {
     title: string;
     subtitle?: string;
     backButton?: React.ReactNode;
+    actions?: React.ReactNode;
     className?: string;
 }
 
-export const FormHeader = ({ title, subtitle, backButton, className = '' }: FormHeaderProps) => (
+export const FormHeader = ({ title, subtitle, backButton, actions, className = '' }: FormHeaderProps) => (
     <div className={`space-y-3 sm:space-y-4 ${className}`}>
         {/* Mobile: Stack vertically, Desktop: Side by side */}
         <div className="flex flex-col space-y-3 sm:flex-row sm:items-center sm:gap-4 sm:space-y-0">
diff --git a/src/pages/Users.tsx b/src/pages/Users.tsx
index 6553fad..16ae829 100644
--- a/src/pages/Users.tsx
+++ b/src/pages/Users.tsx
@@ -171,6 +171,7 @@ export const Users = () => {
             </div>
 
             <Modal
+                title={editingUser ? "ویرایش کاربر" : "افزودن کاربر"}
                 isOpen={showUserModal}
                 onClose={handleCloseModal}
                 size="lg"
diff --git a/src/pages/UsersNew.tsx b/src/pages/UsersNew.tsx
index 14d8134..219e4a2 100644
--- a/src/pages/UsersNew.tsx
+++ b/src/pages/UsersNew.tsx
@@ -233,6 +233,7 @@ const Users = () => {
             </div>
 
             <Modal
+                title={editingUser ? "ویرایش کاربر" : "افزودن کاربر"}
                 isOpen={showUserModal}
                 onClose={handleCloseModal}
                 size="lg"