diff --git a/src/components/equipment-edit-form/index.tsx b/src/components/equipment-edit-form/index.tsx
index 5d1290d7..5d3cc27f 100644
--- a/src/components/equipment-edit-form/index.tsx
+++ b/src/components/equipment-edit-form/index.tsx
@@ -4,7 +4,6 @@ import { AxiosResponse } from 'axios';
 import { useEffect } from 'react';
 import { Button, Flex, Grid, GridItem } from '@chakra-ui/react';
 import { Datepicker } from '../form-fields/date';
-import { ControlledSelect } from '../form-fields/controlled-select';
 
 import {
   ESTADOS_EQUIPAMENTO,
@@ -16,28 +15,29 @@ import { Input } from '../form-fields/input';
 import { TextArea } from '../form-fields/text-area';
 import { toast } from '@/utils/toast';
 import { api } from '@/config/lib/axios';
+import { NewControlledSelect } from '../form-fields/new-controlled-select';
 
 export type EditEquipFormValues = {
   tippingNumber: string;
   serialNumber: string;
-  type: { value: string; label: string };
+  type: string;
   situacao: string;
   model: string;
   description?: string;
-  initialUseDate: { value: number; label: string };
+  initialUseDate: number;
   acquisitionDate: Date;
   screenSize?: string;
   invoiceNumber: string;
   power?: string;
-  screenType?: { value: string; label: string };
+  screenType?: string;
   processor?: string;
-  storageType?: { value: string; label: string };
+  storageType?: string;
   storageAmount?: string;
   brandName: string;
   acquisition: { name: string };
   unitId?: string;
   ram_size?: string;
-  estado: { value: string; label: string };
+  estado: string;
 };
 
 interface EditEquipmentFormProps {
@@ -114,11 +114,11 @@ export default function EquipmentEditForm({
       const dateString = formatDate(acquisitionDate);
 
       const payload = {
-        type: type.value,
-        estado: estado.value,
-        initialUseDate: initialUseDate.value,
-        storageType: storageType?.value,
-        screenType: screenType?.value,
+        type,
+        estado,
+        initialUseDate,
+        storageType,
+        screenType,
         acquisitionDate: dateString,
         ...rest,
       };
@@ -141,13 +141,15 @@ export default function EquipmentEditForm({
   return (
     <form id="equipment-register-form" onSubmit={onSubmit}>
       <Grid templateColumns="repeat(3, 3fr)" gap={6}>
-        <ControlledSelect
+        <NewControlledSelect
+          label="Tipo de equipamento"
           control={control}
           name="type"
           id="type"
           options={TIPOS_EQUIPAMENTO}
-          placeholder="Selecione uma opção"
-          label="Tipo de equipamento"
+          placeholder="Tipo"
+          cursor="pointer"
+          defaultValue={equip?.type}
           rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
         />
 
@@ -215,7 +217,7 @@ export default function EquipmentEditForm({
           })}
         />
 
-        <ControlledSelect
+        <NewControlledSelect
           control={control}
           name="estado"
           id="estado"
@@ -223,9 +225,11 @@ export default function EquipmentEditForm({
           placeholder="Selecione uma opção"
           label="Estado do equipamento"
           rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
+          cursor="pointer"
+          defaultValue={equip?.estado}
         />
 
-        <ControlledSelect
+        <NewControlledSelect
           control={control}
           name="initialUseDate"
           id="initialUseDate"
@@ -233,6 +237,8 @@ export default function EquipmentEditForm({
           placeholder="Selecione uma opção"
           label="Ano da aquisição"
           rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
+          cursor="pointer"
+          defaultValue={equip?.initialUseDate}
         />
 
         <Datepicker
@@ -242,7 +248,7 @@ export default function EquipmentEditForm({
           control={control}
         />
 
-        {watchType.value === 'CPU' && (
+        {watchType === 'CPU' && (
           <>
             <Input
               label="Qtd. Memória RAM (GB)"
@@ -256,7 +262,7 @@ export default function EquipmentEditForm({
               })}
             />
 
-            <ControlledSelect
+            <NewControlledSelect
               control={control}
               name="storageType"
               id="storageType"
@@ -264,6 +270,8 @@ export default function EquipmentEditForm({
               placeholder="Selecione uma opção"
               label="Tipo de armazenamento"
               rules={{ required: 'Campo obrigatório' }}
+              cursor="pointer"
+              defaultValue={equip?.storageType}
             />
 
             <Input
@@ -288,9 +296,9 @@ export default function EquipmentEditForm({
           </>
         )}
 
-        {watchType.value === 'Monitor' && (
+        {watchType === 'Monitor' && (
           <>
-            <ControlledSelect
+            <NewControlledSelect
               control={control}
               name="screenType"
               id="screenType"
@@ -298,6 +306,8 @@ export default function EquipmentEditForm({
               placeholder="Selecione uma opção"
               label="Tipo de monitor"
               rules={{ required: 'Campo obrigatório' }}
+              cursor="pointer"
+              defaultValue={equip?.screenType}
             />
 
             <Input
@@ -310,8 +320,7 @@ export default function EquipmentEditForm({
           </>
         )}
 
-        {(watchType.value === 'Estabilizador' ||
-          watchType.value === 'Nobreak') && (
+        {(watchType === 'Estabilizador' || watchType === 'Nobreak') && (
           <Input
             label="Potência (VA)"
             errors={errors.storageAmount}
diff --git a/src/components/equipment-edit-modal/index.tsx b/src/components/equipment-edit-modal/index.tsx
index c23571de..f3b4c136 100644
--- a/src/components/equipment-edit-modal/index.tsx
+++ b/src/components/equipment-edit-modal/index.tsx
@@ -15,30 +15,8 @@ function transformFields(data: any) {
   if (!data) return;
   const transformedData = { ...data };
 
-  transformedData.type = {
-    label: transformedData.type,
-    value: transformedData.type,
-  };
-
-  transformedData.estado = {
-    label: transformedData.estado,
-    value: transformedData.estado,
-  };
-
-  transformedData.storageType = {
-    label: transformedData.storageType,
-    value: transformedData.storageType,
-  };
-
-  transformedData.screenType = {
-    label: transformedData.screenType,
-    value: transformedData.screenType,
-  };
-
-  transformedData.initialUseDate = {
-    label: transformedData.initialUseDate.split('-')[0],
-    value: transformedData.initialUseDate.split('-')[0],
-  };
+  transformedData.initialUseDate =
+    transformedData.initialUseDate?.split('-')?.[0];
 
   transformedData.brandName = transformedData.brand.name;
 
diff --git a/src/components/equipment-form/index.tsx b/src/components/equipment-form/index.tsx
index 81e91d55..2a699abe 100644
--- a/src/components/equipment-form/index.tsx
+++ b/src/components/equipment-form/index.tsx
@@ -2,7 +2,6 @@ import { useForm } from 'react-hook-form';
 import { useEffect } from 'react';
 import { Button, Flex, Grid, GridItem } from '@chakra-ui/react';
 import { Datepicker } from '../form-fields/date';
-import { ControlledSelect } from '../form-fields/controlled-select';
 
 import {
   ESTADOS_EQUIPAMENTO,
@@ -14,28 +13,29 @@ import { Input } from '../form-fields/input';
 import { TextArea } from '../form-fields/text-area';
 import { toast } from '@/utils/toast';
 import { api } from '@/config/lib/axios';
+import { NewControlledSelect } from '../form-fields/new-controlled-select';
 
 type FormValues = {
   tippingNumber: string;
   serialNumber: string;
-  type: { value: string; label: string };
+  type: string;
   situacao: string;
   model: string;
   description?: string;
-  initialUseDate: { value: string; label: string };
+  initialUseDate: string;
   acquisitionDate: string;
   screenSize?: string;
   invoiceNumber: string;
   power?: string;
-  screenType?: { value: string; label: string };
+  screenType?: string;
   processor?: string;
-  storageType?: { value: string; label: string };
+  storageType?: string;
   storageAmount?: string;
   brandName: string;
   acquisitionName: string;
   unitId?: string;
   ram_size?: string;
-  estado: { value: string; label: string };
+  estado: string;
 };
 
 interface EquipmentFormProps {
@@ -58,7 +58,7 @@ export default function EquipmentForm({
     formState: { errors },
   } = useForm<FormValues>();
 
-  const watchType = watch('type', { label: '', value: '' });
+  const watchType = watch('type');
 
   useEffect(() => {
     resetField('power');
@@ -86,11 +86,11 @@ export default function EquipmentForm({
         formData;
 
       const payload = {
-        type: type.value,
-        estado: estado.value,
-        initialUseDate: initialUseDate.value,
-        storageType: storageType?.value,
-        screenType: screenType?.value,
+        type,
+        estado,
+        initialUseDate,
+        storageType,
+        screenType,
         ...rest,
       };
 
@@ -121,7 +121,7 @@ export default function EquipmentForm({
   return (
     <form id="equipment-register-form" onSubmit={onSubmit}>
       <Grid templateColumns="repeat(3, 3fr)" gap={6}>
-        <ControlledSelect
+        <NewControlledSelect
           control={control}
           name="type"
           id="type"
@@ -194,7 +194,7 @@ export default function EquipmentForm({
           })}
         />
 
-        <ControlledSelect
+        <NewControlledSelect
           control={control}
           name="estado"
           id="estado"
@@ -204,7 +204,7 @@ export default function EquipmentForm({
           rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
         />
 
-        <ControlledSelect
+        <NewControlledSelect
           control={control}
           name="initialUseDate"
           id="initialUseDate"
@@ -220,7 +220,7 @@ export default function EquipmentForm({
           required
           control={control}
         />
-        {watchType.value === 'CPU' && (
+        {watchType === 'CPU' && (
           <>
             <Input
               label="Qtd. Memória RAM (GB)"
@@ -233,7 +233,7 @@ export default function EquipmentForm({
                 },
               })}
             />
-            <ControlledSelect
+            <NewControlledSelect
               control={control}
               name="storageType"
               id="storageType"
@@ -263,9 +263,9 @@ export default function EquipmentForm({
           </>
         )}
 
-        {watchType.value === 'Monitor' && (
+        {watchType === 'Monitor' && (
           <>
-            <ControlledSelect
+            <NewControlledSelect
               control={control}
               name="screenType"
               id="screenType"
@@ -284,8 +284,7 @@ export default function EquipmentForm({
           </>
         )}
 
-        {(watchType.value === 'Estabilizador' ||
-          watchType.value === 'Nobreak') && (
+        {(watchType === 'Estabilizador' || watchType === 'Nobreak') && (
           <Input
             label="Potência (VA)"
             errors={errors.storageAmount}
diff --git a/src/components/equipment-view-form/index.tsx b/src/components/equipment-view-form/index.tsx
index a5a23e41..3241a3d7 100644
--- a/src/components/equipment-view-form/index.tsx
+++ b/src/components/equipment-view-form/index.tsx
@@ -2,38 +2,38 @@ import { useForm } from 'react-hook-form';
 import { useEffect } from 'react';
 import { Button, Flex, Grid, GridItem } from '@chakra-ui/react';
 import MovementHistory from '../movement-history';
-import { Input } from '../form-fields/input';
 import { TextArea } from '../form-fields/text-area';
-import { ControlledSelect } from '../form-fields/controlled-select';
 import { Datepicker } from '../form-fields/date';
 import { toast } from '@/utils/toast';
 import { api } from '../../config/lib/axios';
 import { EquipmentData } from '../../pages/equipments/EquipmentsControl';
 
 import { DeleteExtensiveButton } from '../action-buttons/delete-extensive-button';
+import { NewControlledSelect } from '../form-fields/new-controlled-select';
+import { Input } from '../form-fields/input';
 
 export type ViewEquipFormValues = {
   id: any;
   tippingNumber: string;
   serialNumber: string;
-  type: { value: string; label: string };
+  type: string;
   situacao: string;
   model: string;
   description?: string;
-  initialUseDate: { value: string; label: string };
+  initialUseDate: string;
   acquisitionDate: Date;
   screenSize?: string;
   invoiceNumber: string;
   power?: string;
-  screenType?: { value: string; label: string };
+  screenType?: string;
   processor?: string;
-  storageType?: { value: string; label: string };
+  storageType?: string;
   storageAmount?: string;
   brandName: string;
   acquisition: { name: string };
   unitId?: string;
   ram_size?: string;
-  estado: { value: string; label: string };
+  estado: string;
 };
 
 interface ViewEquipmentFormProps {
@@ -97,198 +97,159 @@ export default function EquipmentViewForm({
   return (
     <form id="equipment-register-form">
       <Grid templateColumns="repeat(5, 5fr)" gap={6} alignItems="end">
-        <ControlledSelect
+        <NewControlledSelect
           control={control}
           name="type"
           id="type"
           placeholder="Selecione uma opção"
           label="Tipo de equipamento"
-          rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
           isReadOnly
+          defaultValue={equipment.type}
         />
 
         <Input
+          disabled
           label="Marca"
           errors={errors.brandName}
-          {...register('brandName', {
-            required: 'Campo Obrigatório',
-            maxLength: 50,
-          })}
+          {...register('brandName')}
           isReadOnly
         />
 
         <Input
+          disabled
           label="Modelo"
           errors={errors.model}
-          {...register('model', {
-            required: 'Campo Obrigatório',
-            maxLength: 50,
-          })}
+          {...register('model')}
           isReadOnly
         />
 
         <Input
+          disabled
           label="Nº Tombamento"
           errors={errors.tippingNumber}
-          {...register('tippingNumber', {
-            required: 'Campo Obrigatório',
-            pattern: {
-              value: /^[0-9]+$/,
-              message: 'Por favor, digite apenas números.',
-            },
-          })}
+          {...register('tippingNumber')}
           isReadOnly
         />
 
         <Input
+          disabled
           label="Nº Serie"
           errors={errors.serialNumber}
-          {...register('serialNumber', {
-            required: 'Campo Obrigatório',
-            pattern: {
-              value: /^[0-9]+$/,
-              message: 'Por favor, digite apenas números.',
-            },
-          })}
+          {...register('serialNumber')}
           isReadOnly
         />
 
         <Input
+          disabled
           label="Nº da Nota Fiscal"
           errors={errors.invoiceNumber}
-          {...register('invoiceNumber', {
-            required: 'Campo Obrigatório',
-            maxLength: 50,
-            pattern: {
-              value: /^[0-9]+$/,
-              message: 'Por favor, digite apenas números.',
-            },
-          })}
+          {...register('invoiceNumber')}
           isReadOnly
         />
 
         <Input
+          disabled
           label="Tipo de aquisição"
           errors={errors.acquisition?.name}
-          {...register('acquisition.name', {
-            required: 'Campo Obrigatório',
-            maxLength: 50,
-          })}
+          {...register('acquisition.name')}
           isReadOnly
         />
 
-        <ControlledSelect
+        <NewControlledSelect
           control={control}
           name="estado"
           id="estado"
           placeholder="Selecione uma opção"
           label="Estado do equipamento"
-          rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
           isReadOnly
+          defaultValue={equipment.estado}
         />
 
-        <ControlledSelect
+        <NewControlledSelect
           control={control}
           name="initialUseDate"
           id="initialUseDate"
           placeholder="Selecione uma opção"
           label="Ano da aquisição"
-          rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
           isReadOnly
+          defaultValue={equipment.initialUseDate}
         />
 
         <Datepicker
           label="Data de aquisição"
           name="acquisitionDate"
-          required
           control={control}
           readOnly
+          disabled
         />
 
-        {equipment.type.value === 'CPU' && (
+        {equipment.type === 'CPU' && (
           <>
             <Input
+              disabled
               label="Qtd. Memória RAM (GB)"
               errors={errors.ram_size}
-              {...register('ram_size', {
-                required: 'Campo Obrigatório',
-                pattern: {
-                  value: /^[0-9]+$/,
-                  message: 'Por favor, digite apenas números.',
-                },
-              })}
+              {...register('ram_size')}
               isReadOnly
             />
 
-            <ControlledSelect
+            <NewControlledSelect
               control={control}
               name="storageType"
               id="storageType"
               placeholder="Selecione uma opção"
               label="Tipo de armazenamento"
-              rules={{ required: 'Campo obrigatório' }}
               isReadOnly
+              defaultValue={equipment.storageType}
             />
 
             <Input
+              disabled
               label="Qtd. Armazenamento (GB)"
               errors={errors.storageAmount}
-              {...register('storageAmount', {
-                required: 'Campo Obrigatório',
-                pattern: {
-                  value: /^[0-9]+$/,
-                  message: 'Por favor, digite apenas números.',
-                },
-              })}
+              {...register('storageAmount')}
               isReadOnly
             />
 
             <Input
+              disabled
               label="Processador"
               errors={errors.processor}
-              {...register('processor', {
-                required: 'Campo Obrigatório',
-              })}
+              {...register('processor')}
               isReadOnly
             />
           </>
         )}
 
-        {equipment.type.value === 'Monitor' && (
+        {equipment.type === 'Monitor' && (
           <>
-            <ControlledSelect
+            <NewControlledSelect
               control={control}
               name="screenType"
               id="screenType"
               placeholder="Selecione uma opção"
               label="Tipo de monitor"
-              rules={{ required: 'Campo obrigatório' }}
               isReadOnly
+              defaultValue={equipment.screenType}
             />
 
             <Input
+              disabled
               label="Tamanho do Monitor"
               errors={errors.storageAmount}
-              {...register('screenSize', {
-                required: 'Campo Obrigatório',
-              })}
+              {...register('screenSize')}
               isReadOnly
             />
           </>
         )}
 
-        {(equipment.type.value === 'Estabilizador' ||
-          equipment.type.value === 'Nobreak') && (
+        {(equipment.type === 'Estabilizador' ||
+          equipment.type === 'Nobreak') && (
           <Input
+            disabled
             label="Potência (VA)"
             errors={errors.storageAmount}
-            {...register('power', {
-              required: 'Campo Obrigatório',
-              pattern: {
-                value: /^[0-9]+$/,
-                message: 'Por favor, digite apenas números.',
-              },
-            })}
+            {...register('power')}
             isReadOnly
           />
         )}
@@ -298,10 +259,9 @@ export default function EquipmentViewForm({
             label="Descrição"
             errors={errors.description}
             maxChars={255}
-            {...register('description', {
-              maxLength: 255,
-            })}
+            {...register('description')}
             readOnly
+            disabled
           />
         </GridItem>
       </Grid>
diff --git a/src/components/equipment-view-modal/index.tsx b/src/components/equipment-view-modal/index.tsx
index e10d350c..3159d8d9 100644
--- a/src/components/equipment-view-modal/index.tsx
+++ b/src/components/equipment-view-modal/index.tsx
@@ -17,30 +17,8 @@ function transformFields(data: any) {
   if (!data) return;
   const transformedData = { ...data };
 
-  transformedData.type = {
-    label: transformedData.type,
-    value: transformedData.type,
-  };
-
-  transformedData.estado = {
-    label: transformedData.estado,
-    value: transformedData.estado,
-  };
-
-  transformedData.storageType = {
-    label: transformedData.storageType,
-    value: transformedData.storageType,
-  };
-
-  transformedData.screenType = {
-    label: transformedData.screenType,
-    value: transformedData.screenType,
-  };
-
-  transformedData.initialUseDate = {
-    label: transformedData.initialUseDate.split('-')[0],
-    value: transformedData.initialUseDate.split('-')[0],
-  };
+  transformedData.initialUseDate =
+    transformedData.initialUseDate.split('-')?.[0];
 
   transformedData.brandName = transformedData.brand.name;
 
diff --git a/src/components/form-fields/equipment/equipment-form.tsx b/src/components/form-fields/equipment/equipment-form.tsx
deleted file mode 100644
index 1ac9ad87..00000000
--- a/src/components/form-fields/equipment/equipment-form.tsx
+++ /dev/null
@@ -1,306 +0,0 @@
-import { useForm } from 'react-hook-form';
-import { AxiosResponse } from 'axios';
-import { useEffect } from 'react';
-import { Button, Flex, Grid, GridItem } from '@chakra-ui/react';
-
-import {
-  ESTADOS_EQUIPAMENTO,
-  TIPOS_ARMAZENAMENTO,
-  TIPOS_EQUIPAMENTO,
-  TIPOS_MONITOR,
-} from '@/constants/equipment';
-import { toast } from '@/utils/toast';
-import { ControlledSelect } from '../controlled-select';
-import { Datepicker } from '../date';
-import { TextArea } from '../text-area';
-import { Input } from '../input';
-import { api } from '@/config/lib/axios';
-
-type FormValues = {
-  tippingNumber: string;
-  serialNumber: string;
-  type: { value: string; label: string };
-  situacao: string;
-  model: string;
-  description?: string;
-  initialUseDate: { value: string; label: string };
-  acquisitionDate: string;
-  screenSize?: string;
-  invoiceNumber: string;
-  power?: string;
-  screenType?: { value: string; label: string };
-  processor?: string;
-  storageType?: { value: string; label: string };
-  storageAmount?: string;
-  brandName: string;
-  acquisitionName: string;
-  unitId?: string;
-  ram_size?: string;
-  estado: { value: string; label: string };
-};
-
-interface EquipmentFormProps {
-  onClose: () => void;
-}
-
-export default function EquipmentForm({ onClose }: EquipmentFormProps) {
-  const {
-    control,
-    register,
-    handleSubmit,
-    watch,
-    resetField,
-    formState: { errors },
-  } = useForm<FormValues>();
-
-  const watchType = watch('type', { label: '', value: '' });
-
-  useEffect(() => {
-    resetField('power');
-    resetField('screenSize');
-    resetField('screenType');
-    resetField('ram_size');
-    resetField('processor');
-    resetField('storageType');
-    resetField('storageAmount');
-  }, [resetField, watchType]);
-
-  const listOfYears: Array<{ value: number; label: string }> = (() => {
-    const endYear: number = new Date().getFullYear();
-    const startYear: number = endYear - 30;
-
-    return Array.from({ length: endYear - startYear + 1 }, (_, index) => {
-      const year = startYear + index;
-      return { value: year, label: year.toString() };
-    }).reverse();
-  })();
-
-  const onSubmit = handleSubmit(async (formData) => {
-    try {
-      const { type, estado, initialUseDate, storageType, screenType, ...rest } =
-        formData;
-
-      const payload = {
-        type: type.value,
-        estado: estado.value,
-        initialUseDate: initialUseDate.value,
-        storageType: storageType?.value,
-        screenType: screenType?.value,
-        ...rest,
-      };
-
-      const response = await api.post('equipment/createEquipment', payload);
-
-      if (response.status === 200) {
-        toast.success('Equipamento cadastrado com sucesso', 'Sucesso');
-        onClose();
-        return;
-      }
-      toast.error('Erro ao tentar cadastrar o equipamento', 'Erro');
-    } catch {
-      toast.error('Erro ao tentar cadastrar o equipamento', 'Erro');
-    }
-  });
-
-  return (
-    <form id="equipment-register-form" onSubmit={onSubmit}>
-      <Grid templateColumns="repeat(3, 3fr)" gap={6}>
-        <ControlledSelect
-          control={control}
-          name="type"
-          id="type"
-          options={TIPOS_EQUIPAMENTO}
-          placeholder="Selecione uma opção"
-          label="Tipo de equipamento"
-          rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
-        />
-        <Input
-          label="Marca"
-          errors={errors.brandName}
-          {...register('brandName', {
-            required: 'Campo Obrigatório',
-            maxLength: 50,
-          })}
-        />
-
-        <Input
-          label="Modelo"
-          errors={errors.model}
-          {...register('model', {
-            required: 'Campo Obrigatório',
-            maxLength: 50,
-          })}
-        />
-
-        <Input
-          label="Nº Tombamento"
-          errors={errors.tippingNumber}
-          {...register('tippingNumber', {
-            required: 'Campo Obrigatório',
-            pattern: {
-              value: /^[0-9]+$/,
-              message: 'Por favor, digite apenas números.',
-            },
-          })}
-        />
-
-        <Input
-          label="Nº Serie"
-          errors={errors.serialNumber}
-          {...register('serialNumber', {
-            required: 'Campo Obrigatório',
-            pattern: {
-              value: /^[0-9]+$/,
-              message: 'Por favor, digite apenas números.',
-            },
-          })}
-        />
-
-        <Input
-          label="Nº da Nota Fiscal"
-          errors={errors.invoiceNumber}
-          {...register('invoiceNumber', {
-            required: 'Campo Obrigatório',
-            maxLength: 50,
-            pattern: {
-              value: /^[0-9]+$/,
-              message: 'Por favor, digite apenas números.',
-            },
-          })}
-        />
-
-        <Input
-          label="Tipo de aquisição"
-          errors={errors.acquisitionName}
-          {...register('acquisitionName', {
-            required: 'Campo Obrigatório',
-            maxLength: 50,
-          })}
-        />
-
-        <ControlledSelect
-          control={control}
-          name="estado"
-          id="estado"
-          options={ESTADOS_EQUIPAMENTO}
-          placeholder="Selecione uma opção"
-          label="Estado do equipamento"
-          rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
-        />
-
-        <ControlledSelect
-          control={control}
-          name="initialUseDate"
-          id="initialUseDate"
-          options={listOfYears}
-          placeholder="Selecione uma opção"
-          label="Ano da aquisição"
-          rules={{ required: 'Campo obrigatório', shouldUnregister: true }}
-        />
-
-        <Datepicker
-          label="Data de aquisição"
-          name="acquisitionDate"
-          required
-          control={control}
-        />
-        {watchType.value === 'CPU' && (
-          <>
-            <Input
-              label="Qtd. Memória RAM (GB)"
-              errors={errors.ram_size}
-              {...register('ram_size', {
-                required: 'Campo Obrigatório',
-                pattern: {
-                  value: /^[0-9]+$/,
-                  message: 'Por favor, digite apenas números.',
-                },
-              })}
-            />
-            <ControlledSelect
-              control={control}
-              name="storageType"
-              id="storageType"
-              options={TIPOS_ARMAZENAMENTO}
-              placeholder="Selecione uma opção"
-              label="Tipo de armazenamento"
-              rules={{ required: 'Campo obrigatório' }}
-            />
-            <Input
-              label="Qtd. Armazenamento (GB)"
-              errors={errors.storageAmount}
-              {...register('storageAmount', {
-                required: 'Campo Obrigatório',
-                pattern: {
-                  value: /^[0-9]+$/,
-                  message: 'Por favor, digite apenas números.',
-                },
-              })}
-            />
-            <Input
-              label="Processador"
-              errors={errors.processor}
-              {...register('processor', {
-                required: 'Campo Obrigatório',
-              })}
-            />
-          </>
-        )}
-
-        {watchType.value === 'Monitor' && (
-          <>
-            <ControlledSelect
-              control={control}
-              name="screenType"
-              id="screenType"
-              options={TIPOS_MONITOR}
-              placeholder="Selecione uma opção"
-              label="Tipo de monitor"
-              rules={{ required: 'Campo obrigatório' }}
-            />
-            <Input
-              label="Tamanho do Monitor"
-              errors={errors.storageAmount}
-              {...register('screenSize', {
-                required: 'Campo Obrigatório',
-              })}
-            />
-          </>
-        )}
-
-        {(watchType.value === 'Estabilizador' ||
-          watchType.value === 'Nobreak') && (
-          <Input
-            label="Potência (VA)"
-            errors={errors.storageAmount}
-            {...register('power', {
-              required: 'Campo Obrigatório',
-              pattern: {
-                value: /^[0-9]+$/,
-                message: 'Por favor, digite apenas números.',
-              },
-            })}
-          />
-        )}
-        <GridItem gridColumn="1 / span 3">
-          <TextArea
-            label="Descrição"
-            errors={errors.description}
-            maxChars={255}
-            {...register('description', {
-              maxLength: 255,
-            })}
-          />
-        </GridItem>
-      </Grid>
-      <Flex gap="4rem" mt="2rem" mb="1rem" justify="center">
-        <Button variant="secondary" onClick={onClose}>
-          Cancelar
-        </Button>
-        <Button type="submit" form="equipment-register-form" variant="primary">
-          Confirmar
-        </Button>
-      </Flex>
-    </form>
-  );
-}
diff --git a/src/components/form-fields/new-controlled-select/index.tsx b/src/components/form-fields/new-controlled-select/index.tsx
new file mode 100644
index 00000000..7166e8a2
--- /dev/null
+++ b/src/components/form-fields/new-controlled-select/index.tsx
@@ -0,0 +1,80 @@
+import {
+  FieldValues,
+  useController,
+  UseControllerProps,
+} from 'react-hook-form';
+import {
+  FormControl,
+  FormErrorMessage,
+  FormLabel,
+  Select,
+  SelectProps,
+} from '@chakra-ui/react';
+import { theme } from '@/styles/theme';
+
+type ControlledSelectProps<FormValues extends FieldValues> =
+  UseControllerProps<FormValues> &
+    SelectProps & {
+      label?: string;
+      options?: { label: string; value: string | number }[] | undefined;
+      isReadOnly?: boolean;
+      filterStyle?: boolean;
+    };
+
+export function NewControlledSelect<FormValues extends FieldValues>({
+  control,
+  name,
+  id,
+  label,
+  rules,
+  options,
+  filterStyle,
+  ...props
+}: ControlledSelectProps<FormValues>) {
+  const {
+    field,
+    fieldState: { error },
+  } = useController<FormValues>({
+    name,
+    control,
+    rules,
+  });
+
+  if (props.defaultValue && typeof field.value === 'object') {
+    field.value = props.defaultValue;
+  }
+
+  return (
+    <FormControl
+      isInvalid={!!error}
+      id={id}
+      cursor="pointer"
+      userSelect="none"
+      display="flex"
+      justifyContent="center"
+      flexDirection="column"
+    >
+      {label && <FormLabel cursor="pointer">{label}</FormLabel>}
+      <Select
+        role="listbox"
+        {...props}
+        {...field}
+        border={filterStyle ? 'none' : '1px solid'}
+        fontWeight="normal"
+        disabled={props.isReadOnly}
+        placeholder={props.isReadOnly ? field.value : props.placeholder}
+        _focusVisible={{
+          border: filterStyle ? 'none' : `2px solid ${theme.colors.primary}`,
+        }}
+      >
+        {options?.map((option) => (
+          <option key={option.value} value={option.value}>
+            {option.label}
+          </option>
+        ))}
+      </Select>
+
+      <FormErrorMessage>{error && error?.message}</FormErrorMessage>
+    </FormControl>
+  );
+}
diff --git a/src/components/form-fields/new-controlled-select/new-controlled-select.spec.tsx b/src/components/form-fields/new-controlled-select/new-controlled-select.spec.tsx
new file mode 100644
index 00000000..dabcf9e2
--- /dev/null
+++ b/src/components/form-fields/new-controlled-select/new-controlled-select.spec.tsx
@@ -0,0 +1,33 @@
+import { render, screen, renderHook } from '@testing-library/react';
+import { useForm } from 'react-hook-form';
+import { NewControlledSelect } from './index';
+
+describe('NewControlledSelect', () => {
+  test('renders the select component with options', () => {
+    const options = [
+      { label: 'Option 1', value: '1' },
+      { label: 'Option 2', value: '2' },
+      { label: 'Option 3', value: '3' },
+    ];
+
+    const { result } = renderHook(() => useForm());
+    const { control } = result.current;
+
+    render(
+      <NewControlledSelect
+        control={control}
+        name="mySelect"
+        label="Select an option"
+        options={options}
+      />
+    );
+
+    const selectElement = screen.getByLabelText('Select an option');
+    expect(selectElement).toBeInTheDocument();
+
+    options.forEach((option) => {
+      const optionElement = screen.getByText(option.label);
+      expect(optionElement).toBeInTheDocument();
+    });
+  });
+});
diff --git a/src/components/movement-form/index.tsx b/src/components/movement-form/index.tsx
index 888fa09d..458f5259 100644
--- a/src/components/movement-form/index.tsx
+++ b/src/components/movement-form/index.tsx
@@ -19,11 +19,11 @@ import { AxiosResponse } from 'axios';
 import { useForm } from 'react-hook-form';
 import { TIPOS_LOTACAO } from '@/constants/movements';
 import { api } from '../../config/lib/axios';
-import { ControlledSelect } from '../form-fields/controlled-select';
 import { Input } from '../form-fields/input';
 import { toast } from '@/utils/toast';
 import { movement, movementEquipment } from '@/pages/movements/MovementControl';
 import { EquipmentData } from '@/pages/equipments/EquipmentsControl';
+import { NewControlledSelect } from '../form-fields/new-controlled-select';
 
 interface equipamentData {
   tippingNumber: string;
@@ -66,13 +66,13 @@ type FormValues = {
   date: Date;
   userId: string;
   equipments: string[];
-  type: SelectOption<number>;
+  type: number;
   inChargeName: string;
   inChargeRole: string;
   chiefName: string;
   chiefRole: string;
   description?: string;
-  destination: SelectOption<string>;
+  destination: string;
 };
 
 interface MovementFormProps {
@@ -108,7 +108,7 @@ export default function MovementForm({
   const [units, setUnits] = useState<unit[]>([]);
   const [materiais, setMateriais] = useState<string[]>([]);
   const date = new Date();
-  const selectedUnit: SelectOption<string> = watch('destination');
+  const selectedUnit: string = watch('destination');
 
   const onCloseCallback = useCallback(() => {
     setMateriais([]);
@@ -130,14 +130,14 @@ export default function MovementForm({
         userid: '162fba6b-1a56-4960-abf1-43be5b753697',
         date: formData.date,
         userId: formData.userId,
-        type: formData.type?.value,
+        type: formData.type,
         inchargename: formData.inChargeName,
         inchargerole: formData.inChargeRole,
         chiefname: formData.chiefName,
         chiefrole: formData.chiefRole,
         equipments: materiais || [],
         description: formData?.description || null,
-        destination: formData?.destination?.value || '',
+        destination: formData?.destination || '',
       };
 
       const response = await api.post('equipment/createMovement', body);
@@ -245,13 +245,13 @@ export default function MovementForm({
 
       <form id="movement-register-form" onSubmit={onSubmit}>
         <Grid templateColumns="repeat(3, 3fr)" width="100%" gap={6}>
-          <ControlledSelect
+          <NewControlledSelect
             control={control}
             name="destination"
             id="destination"
             options={units.map((unit) => ({
-              value: unit?.id,
-              label: unit?.name,
+              value: unit?.id ?? '',
+              label: unit?.name ?? '',
             }))}
             placeholder="Selecione uma opção"
             label="Posto de trabalho"
@@ -260,16 +260,15 @@ export default function MovementForm({
 
           <Input
             label="Cidade"
-            errors={errors.destination?.value}
+            errors={errors.destination}
             isDisabled
             defaultValue={
-              units.find(
-                (iterationUnit) => iterationUnit.id === selectedUnit?.value
-              )?.localization
+              units.find((iterationUnit) => iterationUnit.id === selectedUnit)
+                ?.localization
             }
           />
 
-          <ControlledSelect
+          <NewControlledSelect
             control={control}
             name="type"
             id="type"
diff --git a/src/components/movements-modal/index.tsx b/src/components/movements-modal/index.tsx
index 107c0a49..eca61abf 100644
--- a/src/components/movements-modal/index.tsx
+++ b/src/components/movements-modal/index.tsx
@@ -36,19 +36,6 @@ type FormValues = {
   inChargeRole: string;
 };
 
-function mapMovementType(type: number): string {
-  switch (type) {
-    case 1:
-      return 'Borrow';
-    case 2:
-      return 'Dismiss';
-    case 3:
-      return 'Ownership';
-    default:
-      return '';
-  }
-}
-
 export function MovementsModal({
   isOpen,
   onClose,
diff --git a/src/pages/equipments/EquipmentsControl.tsx b/src/pages/equipments/EquipmentsControl.tsx
index 5e4638d7..6eaa45a1 100644
--- a/src/pages/equipments/EquipmentsControl.tsx
+++ b/src/pages/equipments/EquipmentsControl.tsx
@@ -34,6 +34,7 @@ import { Input } from '@/components/form-fields/input';
 import { MovementRegisterModal } from '@/components/movement-register-modal';
 import { TermModal } from '@/components/term-modal';
 import { movement } from '../movements/MovementControl';
+import { NewControlledSelect } from '@/components/form-fields/new-controlled-select';
 
 interface ISelectOption {
   label: string;
@@ -98,7 +99,6 @@ function EquipmentTable() {
   const limit = 10;
   const [filter, setFilter] = useState<string>('');
   const [search, setSearch] = useState<string>('');
-  const [isChecked, setIsChecked] = useState(false);
 
   const {
     control,
@@ -120,14 +120,13 @@ function EquipmentTable() {
       lastModifiedDate
     ) {
       formattedDate = new Date(lastModifiedDate).toLocaleDateString('en-us');
-      console.log(formattedDate);
     }
 
     const dataFormatted = {
-      type: type?.value,
+      type,
       updatedAt: formattedDate,
-      situation: situation?.value,
-      unit: unit?.value,
+      situation,
+      unit,
       search,
     };
 
@@ -317,7 +316,7 @@ function EquipmentTable() {
             >
               <form id="equipment-filter" style={{ width: '100%' }}>
                 <Flex gap="5px" alignItems="5px" mb="15px">
-                  <ControlledSelect
+                  <NewControlledSelect
                     control={control}
                     name="type"
                     id="type"
@@ -327,6 +326,7 @@ function EquipmentTable() {
                     variant="unstyled"
                     fontWeight="semibold"
                     size="sm"
+                    filterStyle
                   />
                   <Datepicker
                     border={false}
@@ -334,7 +334,7 @@ function EquipmentTable() {
                     name="lastModifiedDate"
                     control={control}
                   />
-                  <ControlledSelect
+                  <NewControlledSelect
                     control={control}
                     name="unit"
                     id="unit"
@@ -344,8 +344,9 @@ function EquipmentTable() {
                     variant="unstyled"
                     fontWeight="semibold"
                     size="sm"
+                    filterStyle
                   />
-                  <ControlledSelect
+                  <NewControlledSelect
                     control={control}
                     name="situation"
                     id="situation"
@@ -355,6 +356,7 @@ function EquipmentTable() {
                     variant="unstyled"
                     fontWeight="semibold"
                     size="sm"
+                    filterStyle
                   />
                   <Input
                     placeholder="Pesquisa"
diff --git a/src/pages/movements/MovementControl.tsx b/src/pages/movements/MovementControl.tsx
index 55892896..32083e0e 100644
--- a/src/pages/movements/MovementControl.tsx
+++ b/src/pages/movements/MovementControl.tsx
@@ -31,11 +31,11 @@ import { SideBar } from '@/components/side-bar';
 import { theme } from '@/styles/theme';
 import { MovimentacaoTipoMap, TIPOS_MOVIMENTACAO } from '@/constants/movements';
 import { MovementsModal } from '@/components/movements-modal';
-import { ControlledSelect } from '@/components/form-fields/controlled-select';
 import { Datepicker } from '@/components/form-fields/date';
 import { Input } from '@/components/form-fields/input';
 import { MovementRegisterModal } from '@/components/movement-register-modal';
 import { TermModal } from '@/components/term-modal';
+import { NewControlledSelect } from '@/components/form-fields/new-controlled-select';
 
 interface ISelectOption {
   label: string;
@@ -204,10 +204,10 @@ function MovementsTable() {
       }
 
       const formattedFormData = {
-        type: type?.value,
-        inChargeName: inChargeName?.value,
-        destinationId: destinationId?.value,
-        equipmentId: equipmentId?.value,
+        type,
+        inChargeName,
+        destinationId,
+        equipmentId,
         lowerDate: formattedLowerDate,
         higherDate: formattedHigherDate,
         searchTerm: search,
@@ -320,7 +320,8 @@ function MovementsTable() {
               >
                 <form id="movement-filter" style={{ width: '100%' }}>
                   <Flex width="100%" gap="5px" mb="15px">
-                    <ControlledSelect
+                    <NewControlledSelect
+                      filterStyle
                       control={control}
                       name="type"
                       id="type"
@@ -332,7 +333,8 @@ function MovementsTable() {
                       fontWeight="semibold"
                       size="sm"
                     />
-                    <ControlledSelect
+                    <NewControlledSelect
+                      filterStyle
                       control={control}
                       name="destinationId"
                       id="destinationId"
diff --git a/src/pages/order-service/OrderServiceControl.tsx b/src/pages/order-service/OrderServiceControl.tsx
index b32aea86..3d89e84c 100644
--- a/src/pages/order-service/OrderServiceControl.tsx
+++ b/src/pages/order-service/OrderServiceControl.tsx
@@ -23,7 +23,6 @@ import { toast } from '@/utils/toast';
 import { SideBar } from '@/components/side-bar';
 import { api, apiSchedula } from '../../config/lib/axios';
 import { theme } from '@/styles/theme';
-import { ControlledSelect } from '@/components/form-fields/controlled-select/index';
 import {
   SelectItem,
   TIPOS_EQUIPAMENTO,
@@ -32,6 +31,7 @@ import {
 import { Datepicker } from '@/components/form-fields/date';
 import { Input } from '@/components/form-fields/input';
 import { OSStatusMap, OSStatusStyleMap } from '@/constants/orderservice';
+import { NewControlledSelect } from '@/components/form-fields/new-controlled-select';
 
 interface ISelectOption {
   label: string;
@@ -131,10 +131,10 @@ function OrderServiceTable() {
     }
 
     const dataFormatted = {
-      type: type?.value,
+      type,
       date: formattedDate,
-      status: status?.value,
-      unit: unit?.value,
+      status,
+      unit,
       search,
     };
 
@@ -265,7 +265,8 @@ function OrderServiceTable() {
             >
               <form id="orderService-filter" style={{ width: '100%' }}>
                 <Flex gap="5px" alignItems="5px" mb="15px">
-                  <ControlledSelect
+                  <NewControlledSelect
+                    filterStyle
                     control={control}
                     name="type"
                     id="type"
@@ -276,7 +277,8 @@ function OrderServiceTable() {
                     fontWeight="semibold"
                     size="sm"
                   />
-                  <ControlledSelect
+                  <NewControlledSelect
+                    filterStyle
                     control={control}
                     name="unit"
                     id="unit"
@@ -293,7 +295,8 @@ function OrderServiceTable() {
                     name="dateOS"
                     control={control}
                   />
-                  <ControlledSelect
+                  <NewControlledSelect
+                    filterStyle
                     control={control}
                     name="status"
                     id="status"