diff --git a/src/components/ButtonPrimary.tsx b/src/components/ButtonPrimary.tsx
index 67ec0ff..44f8808 100644
--- a/src/components/ButtonPrimary.tsx
+++ b/src/components/ButtonPrimary.tsx
@@ -11,11 +11,7 @@ export function PrimaryButton({ children, isDisabled = false, onClick }: Primary
     <button
       disabled={isDisabled}
       onClick={onClick}
-      className="w-full py-5 px-12 text-white bg-primary-blue-base font-bold text-[27px] rounded-[20px] cursor-pointer outline-none flex justify-center items-center gap-4 h-20
-      hover:bg-primary-blue-300 transition-colors duration-300 
-      active:bg-primary-blue-500
-      disabled:border-3 disabled:border-primary-gray-100 disabled:text-primary-gray-100 disabled:cursor-not-allowed disabled:hover:bg-primary-blue-base
-    ">
+      className="w-full h-full bg-[#0069A8] hover:bg-[#052F4A] disabled:bg-[#E5E7EB] disabled:text-[#99A1AF] transition-colors duration-300 text-white font-medium text-sm py-2 rounded-md cursor-pointer shadow-sm">
       {children}
     </button>
   )
diff --git a/src/components/ButtonSecondary.tsx b/src/components/ButtonSecondary.tsx
index 54d358c..321c16a 100644
--- a/src/components/ButtonSecondary.tsx
+++ b/src/components/ButtonSecondary.tsx
@@ -16,11 +16,7 @@ export function SecondaryButton({ children, isDisabled = false, onClick, isActiv
     <button
       disabled={isDisabled}
       onClick={onClick}
-      className={`w-full py-5 px-5 lg:px-12 border-2 border-primary-blue-base text-primary-blue-base font-bold text-[27px] rounded-[20px] cursor-pointer outline-none h-20 flex items-center justify-center
-      hover:bg-primary-blue-100 hover:text-primary-blue-300 transition-colors duration-300 
-      active:text-primary-blue-500
-      disabled:border-3 disabled:border-primary-gray-100 disabled:text-primary-gray-300 disabled:cursor-not-allowed disabled:hover:bg-transparent
-      ${activeStyle}
+      className={`w-full bg-transparent hover:bg-[#F3F4F6] transition-colors duration-300 text-[#6B7280] font-medium text-sm py-2 rounded-md cursor-pointer
       `}>
       {children}
     </button>
diff --git a/src/components/Input.tsx b/src/components/Input.tsx
index 6140aec..40cc5e5 100644
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@@ -2,8 +2,10 @@ import { formatCPF } from "@/utils/formatCpf";
 import { formatPhone } from "@/utils/formatPhone";
 import { useState } from "react";
 import { Controller, type Control, type FieldErrors, type FieldValues, type Path } from "react-hook-form";
+import { BiCheck } from "react-icons/bi";
 import { IoEyeOutline } from "react-icons/io5";
 import { LuEyeClosed } from "react-icons/lu";
+import { VscError } from "react-icons/vsc";
 
 interface InputProps<T extends FieldValues> {
   name: Path<T>;
@@ -13,8 +15,15 @@ interface InputProps<T extends FieldValues> {
   placeholderText: string;
   isOptional?: boolean;
   mask?: "cpf" | "phone";
+  rules?: PasswordRule[];
 }
 
+interface PasswordRule {
+  label: string;
+  valid: boolean;
+}
+
+
 export function Input<T extends FieldValues>({
   name,
   control,
@@ -22,12 +31,20 @@ export function Input<T extends FieldValues>({
   typeInput = 'text',
   placeholderText,
   isOptional = false,
-  mask
+  mask,
+  rules = []
 }: InputProps<T>) {
   const [showPassword, setShowPassword] = useState(false);
   const isPassword = typeInput === 'password';
   const formattedType = isPassword ? (showPassword ? 'text' : 'password') : typeInput;
 
+  const hasInvalidRule = rules.some((rule) => !rule.valid);
+
+  const isPasswordValid =
+    isPassword &&
+    rules.length > 0 &&
+    !hasInvalidRule;
+
   type MaskType = "cpf" | "phone" | "none";
 
   function applyMask(value: string, mask?: MaskType) {
@@ -58,40 +75,76 @@ export function Input<T extends FieldValues>({
         render={({ field }) => (
           <div className="flex flex-col gap-1.5">
             <div className="relative">
-              <input
-                {...field}
-                name={name}
-                type={formattedType}
-                placeholder={isOptional ? placeholderText : `${placeholderText} *`}
-                onChange={(e) => handleInputChange(e.target.value, field.onChange, mask)}
-                className={`w-full p-5 bg-primary-gray-100 text-primary-gray-base font-normal placeholder:text-[27px] text-[27px] rounded-[20px] outline-none border-2 h-20
-                  placeholder:text-primary-gray-base
-              focus:border-primary-blue-300
-              ${errors?.[name] ? 'border-[#CF1A0F]' : 'border-transparent'}
-              `}
-              />
-
-              {isPassword && (
-                <button
-                  type="button"
-                  data-testid="toggle-password"
-                  onClick={() => setShowPassword((prev) => !prev)}
-                  className="absolute right-5 top-1/2 -translate-y-1/2 cursor-pointer"
-                >
-                  {showPassword ? (
-                    <LuEyeClosed size={24} color="#66666E" />
-                  ) : (
-                    <IoEyeOutline size={24} color="#66666E" />
-                  )}
-                </button>
-              )}
+              <label className="text-[#171717]">
+                {placeholderText}
+                {!isOptional && <span className="text-[#F73B3B]">*</span>}
+              </label>
+              <div className="relative mt-2">
+                <input
+                  {...field}
+                  name={name}
+                  type={formattedType}
+                  placeholder={isOptional ? placeholderText : `${placeholderText} *`}
+                  onChange={(e) =>
+                    handleInputChange(e.target.value, field.onChange, mask)
+                  }
+                  className={`w-full p-5 font-normal rounded-[10px] outline-none h-[52px]
+                  placeholder:text-[#99A1AF]
+
+                  ${errors?.[name]
+                      ? "border border-[#C10007] bg-[#FEF2F2] text-[#C10007]"
+                      : isPasswordValid
+                        ? "border border-[#008235] bg-[#F0FDF4]"
+                        : "border border-[#E5E7EB] bg-[#F3F4F6] focus:border-[#0069A8]"
+                    }
+      `}
+                />
+
+                {isPassword && (
+                  <button
+                    type="button"
+                    data-testid="toggle-password"
+                    onClick={() => setShowPassword((prev) => !prev)}
+                    className="absolute right-5 top-1/2 -translate-y-1/2 cursor-pointer"
+                  >
+                    {showPassword ? (
+                      <LuEyeClosed size={24} color="#66666E" />
+                    ) : (
+                      <IoEyeOutline size={24} color="#66666E" />
+                    )}
+                  </button>
+                )}
+              </div>
             </div>
 
-            {errors?.[name] && (
-              <span className="text-[#CF1A0F] font-normal text-base">
+            {errors?.[name] && (!isPassword || rules.length === 0) && (
+              <span className="text-[#C10007] font-normal text-base">
                 {errors[name]?.message as string}
               </span>
             )}
+
+            {isPassword && hasInvalidRule && (
+              <div className="flex flex-col gap-2 text-[19px]">
+                <span className="text-[#C10007]">Sua senha deve conter:</span>
+                {rules.map((rule) => (
+                  <div key={rule.label} className="flex items-center gap-2">
+                    {rule.valid
+                      ? <BiCheck className="text-primary-blue-700 w-5 h-5" />
+                      : <VscError className="text-[#C10007] w-5 h-5" />
+                    }
+                    <span className="text-[#111111D9] text-sm">
+                      {rule.label}
+                    </span>
+                  </div>
+                ))}
+              </div>
+            )}
+
+            {isPasswordValid && (
+              <span className="text-[#008235] font-medium text-base">
+                Senha forte
+              </span>
+            )}
           </div>
         )}
       />
diff --git a/src/components/StudentForm.tsx b/src/components/StudentForm.tsx
index 4aa3801..a24f4f3 100644
--- a/src/components/StudentForm.tsx
+++ b/src/components/StudentForm.tsx
@@ -7,10 +7,9 @@ import { toast } from "react-toastify";
 import { TOAST_STYLES } from "@/pages/ToastStyleContainer";
 import { SignUpStudentSchema, type SignUpStudentSchemaType } from "@/schemas/SignUp";
 import { PrimaryButton } from "./ButtonPrimary";
-import { BiCheck } from "react-icons/bi";
-import { IoClose } from "react-icons/io5";
 import { ButtonLoader } from "./ButtonLoader";
 import { toStudentPayload } from "@/adapters/auth/toStudentPayload";
+import { getPasswordRules } from "@/utils/passwordRules";
 
 export function StudentForm() {
   const { errors, handleSubmit, reset, control, watch } = useFormValidation(SignUpStudentSchema, {
@@ -50,17 +49,8 @@ export function StudentForm() {
     }
   }, [isError, isSuccess, navigate, reset]);
 
-  function usePasswordRules(password: string) {
-    return [
-      { label: "Mais de 10 caracteres", valid: password.length > 10 },
-      { label: "Pelo menos 1 número", valid: /\d/.test(password) },
-      { label: "Letras maiúsculas e minúsculas", valid: /[a-z]/.test(password) && /[A-Z]/.test(password) },
-      { label: "Pelo menos 1 caractere especial", valid: /[!@#$%^&*(),.?":{}|<>]/.test(password) },
-    ];
-  }
-
   const passwordValue = watch("password", "");
-  const rules = usePasswordRules(passwordValue);
+  const rules = getPasswordRules(passwordValue);
 
   const onSubmit = (formData: SignUpStudentSchemaType) => {
     console.log("Formulário submetido", formData);
@@ -86,66 +76,54 @@ export function StudentForm() {
           placeholderText="E-mail"
         />
 
-        <Input<SignUpStudentSchemaType>
-          name="cpf"
-          control={control}
-          errors={errors}
-          placeholderText="CPF"
-          mask="cpf"
-        />
-
-        <Input<SignUpStudentSchemaType>
-          name="phone"
-          control={control}
-          errors={errors}
-          placeholderText="Celular"
-          mask="phone"
-          isOptional
-        />
+        <div className="grid grid-cols-2 gap-6">
+          <Input<SignUpStudentSchemaType>
+            name="cpf"
+            control={control}
+            errors={errors}
+            placeholderText="CPF"
+            mask="cpf"
+          />
+
+          <Input<SignUpStudentSchemaType>
+            name="phone"
+            control={control}
+            errors={errors}
+            placeholderText="Telefone"
+            mask="phone"
+            isOptional
+          />
+        </div>
 
         <Input<SignUpStudentSchemaType>
           name="password"
           control={control}
           errors={errors}
-          placeholderText="Crie sua senha"
+          placeholderText="Senha"
           typeInput="password"
+          rules={rules}
         />
 
         <Input<SignUpStudentSchemaType>
           name="confirmPassword"
           control={control}
           errors={errors}
-          placeholderText="Confirme sua senha"
+          placeholderText="Confirmar senha"
           typeInput="password"
         />
 
-        <div className="flex flex-col gap-2 text-[19px]">
-          <span className="text-primary-blue-700">Sua senha deve conter:</span>
-          {rules.map((rule) => (
-            <div key={rule.label} className="flex items-center gap-2">
-              {rule.valid
-                ? <BiCheck className="text-primary-blue-700 w-5 h-5" />
-                : <IoClose className="text-[#CF1A0F] w-5 h-5" />
-              }
-              <span className={rule.valid ? "text-primary-blue-700" : "text-[#CF1A0F]"}>
-                {rule.label}
-              </span>
-            </div>
-          ))}
-
-          <span className="text-primary-blue-700">*campos obrigatórios</span>
+        <div className="w-full h-[52px]">
+          <PrimaryButton isDisabled={isPending || !rules.every(rule => rule.valid) || watch("password") !== watch("confirmPassword")}>
+            {isPending ? (
+              <>
+                Carregando
+                <ButtonLoader />
+              </>
+            ) : (
+              "Criar conta"
+            )}
+          </PrimaryButton>
         </div>
-
-        <PrimaryButton isDisabled={isPending}>
-          {isPending ? (
-            <>
-              Carregando
-              <ButtonLoader />
-            </>
-          ) : (
-            "Criar conta"
-          )}
-        </PrimaryButton>
       </div>
 
 
diff --git a/src/pages/SignUp.tsx b/src/pages/SignUp.tsx
index 67d8eea..0e26107 100644
--- a/src/pages/SignUp.tsx
+++ b/src/pages/SignUp.tsx
@@ -6,54 +6,75 @@ import { CompanyForm } from '@/components/CompanyForm';
 import { StudentForm } from "@/components/StudentForm";
 import { useState } from 'react';
 import { Link } from 'react-router-dom';
-
+import { LuShieldAlert } from "react-icons/lu";
+import { PrimaryButton } from '@/components/ButtonPrimary';
 
 export const SignUpForm = () => {
   const [isStudent, setIsStudent] = useState(true);
 
   return (
-    <div className="w-full bg-[#F4F5F9] flex flex-col-reverse lg:flex-row">
-      <section className="flex-1 h-full w-full flex flex-col items-center">
-        <div className="p-[30px]">
-           {/* Logo */}
-          <div className='flex justify-center mb-18'>
-            <img src={LogoCertify} alt="Logo Certify" className="h-[4.5rem]"/>
-          </div>
+    <div className="w-full bg-[#F9FAFB] flex flex-col-reverse lg:flex-row">
+      <section className='flex-1 mt-6 mx-12'>
+        <div className='w-full flex justify-end mb-12'>
+          <Link
+            to="/login"
+            className='text-sm font-medium text-[#667085]'
+          >
+            Já tem conta? <span className="text-[#0069A8] font-semibold">Login</span>
+          </Link>
+        </div>
 
-          <h1 className="text-primary-blue-600 font-semibold text-[31px]">Criar conta</h1>
-          <p className="text-primary-blue-700 font-normal text-[22px]">Selecione se você é empresa ou aluno</p>
-
-          <div className="flex justify-between gap-4 pt-7 pb-5">
-            <div className='flex-1'>
-              <SecondaryButton onClick={() => setIsStudent(true)} isActive={isStudent}>
-                Aluno
-              </SecondaryButton>
-            </div>
-
-            <div className='flex-1'>
-              <SecondaryButton onClick={() => setIsStudent(false)} isActive={!isStudent}>
-                Empresa
-              </SecondaryButton>
-            </div>
-          </div>
+        <h1 className='text-3xl font-extrabold text-[#101828]'>
+          Criar conta
+        </h1>
 
-          {isStudent ? (
-            <StudentForm />
-          ) : (
-            <CompanyForm />
-          )}
+        <div className='my-6 flex border border-[#E5E7EB] rounded-xl p-1.5 shadow-sm'>
+          <PrimaryButton>Aluno</PrimaryButton>
+          <SecondaryButton>Empresa</SecondaryButton>
+        </div>
 
-          <div className='flex justify-center gap-5 mt-5 text-[19px]'>
-            <span>Já tem conta?</span>
-            <Link to={'/login'} className='text-primary-blue-base font-bold hover:underline'>Faça o login aqui!</Link>
-          </div>
+        <div>
+          <StudentForm />
+        </div>
 
+        <div className="flex items-start gap-5 p-8">
+          <LuShieldAlert
+            color='#0069A8'
+            className="w-6 h-6 shrink-0"
+          />
+
+          <div className="flex flex-col gap-1">
+            <p className="text-[#101828] text-base font-bold">
+              Precisa de ajuda?
+            </p>
+
+            <p className="text-[#4B5563] text-base font-medium">
+              Fale com nosso suporte:{" "}
+              <span className="text-[#0069A8]">
+                suporte@certify.com.br
+              </span>
+            </p>
+          </div>
         </div>
+
+
       </section>
 
-      <section className="hidden lg:block lg:flex-1">
-        <img src={isStudent ? GirlWithCertificateImg : SignUpCompanyImg} alt="Garota com certificado ou empresa" className="w-full h-full" />
+      {/* Div da imagem */}
+      <section className="hidden lg:block lg:flex-1 relative">
+        <img
+          src={isStudent ? GirlWithCertificateImg : SignUpCompanyImg}
+          alt="Garota com certificado ou empresa"
+          className="w-full h-full object-cover"
+        />
+
+        <img
+          src={LogoCertify}
+          alt="Certify"
+          className="absolute top-5 right-8 w-32 h-auto"
+        />
       </section>
     </div>
+
   );
 };
diff --git a/src/schemas/SignUp.ts b/src/schemas/SignUp.ts
index cab86e6..a519873 100644
--- a/src/schemas/SignUp.ts
+++ b/src/schemas/SignUp.ts
@@ -27,8 +27,24 @@ export const SignUpStudentSchema = z.object({
     }),
   password: z
     .string()
-    .min(8, { message: "A senha deve ter pelo menos 8 caracteres" })
-    .max(100, { message: "A senha deve ter no máximo 100 caracteres" }),
+    .min(8, {
+      message: "A senha deve ter pelo menos 8 caracteres",
+    })
+    .max(100, {
+      message: "A senha deve ter no máximo 100 caracteres",
+    })
+    .regex(/\d/, {
+      message: "A senha deve conter pelo menos 1 número",
+    })
+    .regex(/[A-Z]/, {
+      message: "A senha deve conter pelo menos 1 letra maiúscula",
+    })
+    .regex(/[a-z]/, {
+      message: "A senha deve conter pelo menos 1 letra minúscula",
+    })
+    .regex(/[!@#$%^&*(),.?":{}|<>]/, {
+      message: "A senha deve conter pelo menos 1 caractere especial",
+    }),
   confirmPassword: z
     .string()
     .min(8, { message: "Confirme sua senha" }),
diff --git a/src/utils/passwordRules.ts b/src/utils/passwordRules.ts
new file mode 100644
index 0000000..ef9ac4d
--- /dev/null
+++ b/src/utils/passwordRules.ts
@@ -0,0 +1,29 @@
+export interface PasswordRule {
+  label: string;
+  valid: boolean;
+}
+
+export function getPasswordRules(password: string): PasswordRule[] {
+  return [
+    {
+      label: "Mínimo 8 caracteres",
+      valid: password.length >= 8,
+    },
+    {
+      label: "1 número",
+      valid: /\d/.test(password),
+    },
+    {
+      label: "Letras maiúscula",
+      valid: /[A-Z]/.test(password),
+    },
+    {
+      label: "Letra minúscula",
+      valid: /[a-z]/.test(password),
+    },
+    {
+      label: "1 caractere especial",
+      valid: /[!@#$%^&*(),.?":{}|<>]/.test(password),
+    },
+  ];
+}