diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index ac65bd5..07d0b65 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-09-07T14:32:57.846132400Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\carly\.android\avd\Pixel_API_34.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
       <SelectionState runConfigName="CustomTextFieldPreview">
         <option name="selectionMode" value="DROPDOWN" />
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CodeNumberField.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CodeNumberField.kt
index 134134e..09c33e7 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CodeNumberField.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CodeNumberField.kt
@@ -28,8 +28,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.nuvemconnect.app.nuvemconnect.ui.theme.dmSansFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.secondary200
-import com.nuvemconnect.app.nuvemconnect.ui.theme.secondary700
+import com.nuvemconnect.app.nuvemconnect.ui.theme.primary100
+import com.nuvemconnect.app.nuvemconnect.ui.theme.white_two
 
 @Composable
 fun CodeNumberField(
@@ -66,12 +66,12 @@ fun CodeNumberField(
                             .width(41.dp)
                             .height(46.dp)
                             .background(
-                                color = secondary200,
+                                color = white_two,
                                 shape = RoundedCornerShape(8.dp)
                             )
                             .border(
                                 width = 1.dp,
-                                color = if (index == otpText.length) secondary700 else Color.Transparent,
+                                color = if (index == otpText.length) primary100 else Color.Transparent,
                                 shape = RoundedCornerShape(8.dp)
                             )
                     ) {
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CustomButton.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CustomButton.kt
index e5a98df..b526688 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CustomButton.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CustomButton.kt
@@ -1,5 +1,6 @@
 package com.nuvemconnect.app.nuvemconnect.ui.components
 
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -23,7 +24,6 @@ import com.nuvemconnect.app.nuvemconnect.ui.theme.poppinsFontFamily
 
 @Composable
 fun CustomButton(
-
     modifier: Modifier = Modifier,
     text: String,
     fontFamily: FontFamily = poppinsFontFamily,
@@ -33,6 +33,7 @@ fun CustomButton(
     contentPadding: PaddingValues = PaddingValues(16.dp),
     textColor: Color = MaterialTheme.colorScheme.surface,
     fontSize: TextUnit = 18.sp,
+    border: BorderStroke? = null,
     fontWeight: FontWeight = FontWeight.SemiBold,
     onClick: () -> Unit,
 ) {
@@ -48,7 +49,8 @@ fun CustomButton(
                 contentColor = contentColor
             )
         },
-        shape = RoundedCornerShape(20.dp),
+        border = border,
+        shape = RoundedCornerShape(100.dp),
         contentPadding = contentPadding,
     ) {
         Text(
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CustomTextField.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CustomTextField.kt
index e82e01e..7510b47 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CustomTextField.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/CustomTextField.kt
@@ -4,9 +4,10 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Icon
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Text
@@ -16,25 +17,28 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.nuvemconnect.app.nuvemconnect.R
 import com.nuvemconnect.app.nuvemconnect.model.error.EmailErrorType
 import com.nuvemconnect.app.nuvemconnect.ui.theme.dmSansFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.error300
-import com.nuvemconnect.app.nuvemconnect.ui.theme.mediumGray
+import com.nuvemconnect.app.nuvemconnect.ui.theme.error100
+import com.nuvemconnect.app.nuvemconnect.ui.theme.neutral20
 import com.nuvemconnect.app.nuvemconnect.ui.theme.poppinsFontFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary
+import com.nuvemconnect.app.nuvemconnect.ui.theme.white_two
 
 @Composable
 fun CustomTextField(
     modifier: Modifier = Modifier,
     onValueChange: (String) -> Unit,
+    leadingIcon: Painter = painterResource(id = R.drawable.ic_launcher_foreground),
     value: String,
-    titleContainer: String,
     placeholder: String,
     validate: (String) -> EmailErrorType,
     isUserInteracted: Boolean
@@ -44,12 +48,6 @@ fun CustomTextField(
     Column(
         modifier = Modifier.fillMaxWidth()
     ) {
-        Text(
-            text = titleContainer,
-            fontSize = 16.sp,
-            fontFamily = dmSansFamily,
-            fontWeight = FontWeight.Bold
-        )
         Spacer(modifier = modifier.height(5.dp))
         OutlinedTextField(
             value = value,
@@ -57,6 +55,13 @@ fun CustomTextField(
                 if (newValue.length <= 40)
                     onValueChange(newValue)
             },
+            leadingIcon = {
+                Icon(
+                    painter = leadingIcon,
+                    modifier = modifier.size(24.dp),
+                    contentDescription = "Leading Icon"
+                )
+            },
             singleLine = true,
             placeholder = {
                 Text(
@@ -71,10 +76,10 @@ fun CustomTextField(
             keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Text),
             shape = RoundedCornerShape(8),
             colors = OutlinedTextFieldDefaults.colors(
-                unfocusedBorderColor = mediumGray,
-                focusedBorderColor = primary,
+                unfocusedBorderColor = white_two,
+                focusedBorderColor = white_two,
                 focusedTextColor = Color.Black,
-                unfocusedContainerColor = mediumGray,
+                unfocusedContainerColor = white_two,
             ),
             textStyle = TextStyle(
                 fontFamily = poppinsFontFamily,
@@ -85,7 +90,7 @@ fun CustomTextField(
         if (error != EmailErrorType.None) {
             Text(
                 text = error.message,
-                color = error300,
+                color = error100,
                 fontSize = 12.sp,
                 fontFamily = poppinsFontFamily
             )
@@ -95,7 +100,7 @@ fun CustomTextField(
     }
 }
 
-@Preview(showSystemUi = false, showBackground = true)
+@Preview(showBackground = true, showSystemUi = true)
 @Composable
 private fun CustomTextFieldPreview() {
     val value by rememberSaveable {
@@ -104,11 +109,9 @@ private fun CustomTextFieldPreview() {
     CustomTextField(
         onValueChange = {},
         value = value,
-        titleContainer = "Titulo do container",
         placeholder = "Descrição do texto",
         validate = { EmailErrorType.None },
-        isUserInteracted = false
-
+        isUserInteracted = false,
     )
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/GoogleButton.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/GoogleButton.kt
index e78b4b3..0be75ca 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/GoogleButton.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/GoogleButton.kt
@@ -34,7 +34,7 @@ fun GoogleButton(
     textStyle: TextStyle = MaterialTheme.typography.titleLarge,
     contentPadding: PaddingValues = PaddingValues(16.dp),
     textColor: Color = MaterialTheme.colorScheme.surface,
-    fontSize: TextUnit = 16.sp,
+    fontSize: TextUnit = 18.sp,
     border: BorderStroke? = null,
     fontWeight: FontWeight = FontWeight.SemiBold
 ) {
@@ -49,7 +49,7 @@ fun GoogleButton(
             )
 
         },
-        shape = RoundedCornerShape(20.dp),
+        shape = RoundedCornerShape(100.dp),
         contentPadding = contentPadding,
     ) {
         Icon(
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/PasswordTextField.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/PasswordTextField.kt
index cd790d7..1acafba 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/PasswordTextField.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/PasswordTextField.kt
@@ -18,7 +18,9 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
@@ -29,17 +31,15 @@ import androidx.compose.ui.unit.sp
 import com.nuvemconnect.app.nuvemconnect.R
 import com.nuvemconnect.app.nuvemconnect.model.error.PasswordErrorType
 import com.nuvemconnect.app.nuvemconnect.ui.theme.dmSansFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.error300
-import com.nuvemconnect.app.nuvemconnect.ui.theme.mediumGray
+import com.nuvemconnect.app.nuvemconnect.ui.theme.error100
 import com.nuvemconnect.app.nuvemconnect.ui.theme.poppinsFontFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary
+import com.nuvemconnect.app.nuvemconnect.ui.theme.white_two
 
 @Composable
 fun PasswordTextField(
     modifier: Modifier = Modifier,
     onValueChange: (String) -> Unit,
     value: String,
-    titleContainer: String,
     placeholder: String,
     validate: (String) -> PasswordErrorType,
     isUserInteracted: Boolean
@@ -49,24 +49,24 @@ fun PasswordTextField(
 
     Column(
         modifier = Modifier.fillMaxWidth()
-
     ) {
-        Text(
-            text = titleContainer,
-            fontSize = 16.sp,
-            fontFamily = dmSansFamily,
-            fontWeight = FontWeight.Bold
-        )
+
         Spacer(modifier = modifier.height(5.dp))
         OutlinedTextField(
             value = value,
             onValueChange = { newValue ->
                 if (newValue.length <= 40) onValueChange(newValue)
             },
+            leadingIcon = {
+                Icon(
+                    imageVector = ImageVector.vectorResource(id = R.drawable.baseline_lock_outline),
+                    contentDescription = "Icone de senha"
+                )
+            },
             trailingIcon = {
                 val image =
-                    if (passwordVisibility) painterResource(id = R.drawable.baseline_visibility_24) else painterResource(
-                        id = R.drawable.baseline_visibility_off_24
+                    if (passwordVisibility) painterResource(id = R.drawable.outline_visibility_24) else painterResource(
+                        id = R.drawable.outline_visibility_off_24
                     )
                 val description = if (passwordVisibility) "Hide password" else "Show password"
 
@@ -89,17 +89,17 @@ fun PasswordTextField(
             keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Text),
             shape = RoundedCornerShape(8),
             colors = OutlinedTextFieldDefaults.colors(
-                unfocusedBorderColor = mediumGray,
-                focusedBorderColor = primary,
+                unfocusedBorderColor = white_two,
+                focusedBorderColor = white_two,
                 focusedTextColor = Color.Black,
-                unfocusedContainerColor = mediumGray,
-                ),
+                unfocusedContainerColor = white_two,
+            ),
             isError = error != PasswordErrorType.None
-            )
-        if (error != PasswordErrorType.None)  {
+        )
+        if (error != PasswordErrorType.None) {
             Text(
                 text = error.message,
-                color = error300,
+                color = error100,
                 fontSize = 12.sp,
                 fontFamily = poppinsFontFamily
             )
@@ -117,10 +117,9 @@ private fun CustomTextFieldPreview() {
     PasswordTextField(
         onValueChange = {},
         value = value,
-        titleContainer = "Titulo do container",
         placeholder = "Descrição do texto",
-        isUserInteracted = false,
-        validate = {PasswordErrorType.rulePassword}
+        validate = { PasswordErrorType.rulePassword },
+        isUserInteracted = false
     )
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/Topbar.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/Topbar.kt
index 06b8342..361d474 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/Topbar.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/components/Topbar.kt
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -27,9 +27,12 @@ import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.nuvemconnect.app.nuvemconnect.R
 import com.nuvemconnect.app.nuvemconnect.ui.theme.dmSansFamily
+import com.nuvemconnect.app.nuvemconnect.ui.theme.neutral100
 import com.nuvemconnect.app.nuvemconnect.ui.theme.poppinsFontFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.secondary100
-import com.nuvemconnect.app.nuvemconnect.ui.theme.secondary700
+import com.nuvemconnect.app.nuvemconnect.ui.theme.neutral60
+import com.nuvemconnect.app.nuvemconnect.ui.theme.neutral70
+import com.nuvemconnect.app.nuvemconnect.ui.theme.neutral700
+import com.nuvemconnect.app.nuvemconnect.ui.theme.white_two
 
 @Composable
 fun TopBar(
@@ -48,23 +51,24 @@ fun TopBar(
             .fillMaxWidth()
     ) {
         Image(
-            painter = painterResource(id = R.drawable.baseline_chevron_left_24),
+            painter = painterResource(id = R.drawable.baseline_arrow_back_24),
             contentDescription = stringResource(id = R.string.voltar),
             modifier = modifier
-                .clip(RoundedCornerShape(6.dp))
-                .width(46.dp)
-                .height(46.dp)
-                .background(secondary100)
+                .clip(CircleShape)
+                .width(36.dp)
+                .height(36.dp)
+                .background(white_two)
                 .clickable {
                     onBackClick?.invoke() ?: navController.navigateUp()
                 },
-            contentScale = ContentScale.Crop,
+           contentScale = ContentScale.Inside
         )
 
         Spacer(modifier = modifier.height(30.dp))
         Text(
             text = headingTitle,
             fontSize = headingSize,
+            color = neutral100,
             fontFamily = poppinsFontFamily,
             fontWeight = FontWeight.Bold,
             modifier = modifier.fillMaxWidth()
@@ -73,7 +77,7 @@ fun TopBar(
         Text(
             text = subtitleText,
             fontSize = subtitleSize,
-            color = secondary700,
+            color = neutral70,
             fontFamily = dmSansFamily,
             fontWeight = FontWeight.Normal,
             textAlign = TextAlign.Justify,
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/ForgotPassword.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/ForgotPassword.kt
index 5965816..69c8774 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/ForgotPassword.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/ForgotPassword.kt
@@ -15,6 +15,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
@@ -32,8 +33,7 @@ import com.nuvemconnect.app.nuvemconnect.ui.screens.login.LoginViewModel
 import com.nuvemconnect.app.nuvemconnect.ui.screens.login.validateEmail
 import com.nuvemconnect.app.nuvemconnect.ui.theme.dmSansFamily
 import com.nuvemconnect.app.nuvemconnect.ui.theme.poppinsFontFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary600
+import com.nuvemconnect.app.nuvemconnect.ui.theme.primary100
 
 
 @Composable
@@ -65,8 +65,8 @@ fun ForgotPassword(
                 viewModel.onEmailChange(newEmail)
                 validateEmail(email)
             },
-            titleContainer = stringResource(R.string.digite_seu_email),
             placeholder = stringResource(R.string.digite_seu_email),
+            leadingIcon = painterResource(id = R.drawable.baseline_mail_outline_24),
             validate = { email ->
                 validateEmail(email)
             },
@@ -78,7 +78,7 @@ fun ForgotPassword(
                 navController.navigate(Screens.PasswordCode.route)
             },
             text = stringResource(R.string.enviar_codigo),
-            backgroundColor = primary,
+            backgroundColor = primary100,
             fontFamily = poppinsFontFamily,
             fontWeight = FontWeight.SemiBold
         )
@@ -96,7 +96,7 @@ fun ForgotPassword(
             )
             Text(
                 text = stringResource(R.string.fazer_login),
-                color = primary600,
+                color = primary100,
                 fontSize = 16.sp,
                 fontFamily = dmSansFamily,
                 fontWeight = FontWeight.Normal,
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/PasswordCode.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/PasswordCode.kt
index 80da71c..59b583e 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/PasswordCode.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/PasswordCode.kt
@@ -22,7 +22,7 @@ import com.nuvemconnect.app.nuvemconnect.ui.components.CodeNumberField
 import com.nuvemconnect.app.nuvemconnect.ui.components.CustomButton
 import com.nuvemconnect.app.nuvemconnect.ui.components.TopBar
 import com.nuvemconnect.app.nuvemconnect.ui.theme.poppinsFontFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary
+import com.nuvemconnect.app.nuvemconnect.ui.theme.primary100
 
 @Composable
 fun PasswordCode(modifier: Modifier = Modifier, navController: NavController) {
@@ -52,7 +52,7 @@ fun PasswordCode(modifier: Modifier = Modifier, navController: NavController) {
                 navController.navigate(Screens.ResetPassword.route)
             },
             text = stringResource(R.string.verificar),
-            backgroundColor = primary,
+            backgroundColor = primary100,
             fontFamily = poppinsFontFamily,
             fontWeight = FontWeight.Normal
         )
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/ResetPassword.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/ResetPassword.kt
index b500c35..119fcc9 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/ResetPassword.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/forgotpassword/ResetPassword.kt
@@ -22,7 +22,7 @@ import com.nuvemconnect.app.nuvemconnect.ui.components.CustomButton
 import com.nuvemconnect.app.nuvemconnect.ui.components.PasswordTextField
 import com.nuvemconnect.app.nuvemconnect.ui.components.TopBar
 import com.nuvemconnect.app.nuvemconnect.ui.screens.login.LoginViewModel
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary
+import com.nuvemconnect.app.nuvemconnect.ui.theme.primary100
 
 @Composable
 fun ResetPassword(
@@ -49,40 +49,38 @@ fun ResetPassword(
             navController = navController,
             onBackClick = { navController.navigateUp() }
         )
-        Spacer(modifier = modifier.height(45.dp))
+        Spacer(modifier = modifier.height(68.dp))
         PasswordTextField(
-            value = password,
             onValueChange = { newPassword ->
                 viewModel.onPasswordChange(newPassword  )
 
             },
-            titleContainer = stringResource(R.string.senha),
+            value = password,
             placeholder = stringResource(R.string.digite_sua_senha),
             validate = { password ->
                 validatePassword(password)
             },
             isUserInteracted = isUserInteracted,
         )
-        Spacer(modifier = modifier.height(5.dp))
+        Spacer(modifier = modifier.height(30.dp))
         PasswordTextField(
-            value = confirmedPassword,
             onValueChange = { newPassword ->
                 viewModel.onConfirmPassword(newPassword)
             },
-            titleContainer = stringResource(R.string.confirme_sua_senha),
-            placeholder = stringResource(id = R.string.digite_sua_senha),
-            isUserInteracted = isUserInteracted,
+            value = confirmedPassword,
+            placeholder = stringResource(id = R.string.confirme_sua_senha),
             validate = {
                 validatePassword(password)
-            }
+            },
+            isUserInteracted = isUserInteracted
         )
-        Spacer(modifier = modifier.height(26.dp))
+        Spacer(modifier = modifier.height(40.dp))
         CustomButton(
             onClick = {
                 navController.navigate(Screens.Login.route)
             },
             text = stringResource(R.string.redefinir),
-            backgroundColor = primary
+            backgroundColor = primary100
         )
         Spacer(modifier = Modifier.height(21.dp))
     }
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/login/LoginScreen.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/login/LoginScreen.kt
index 448facb..d38d3b1 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/login/LoginScreen.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/login/LoginScreen.kt
@@ -17,9 +17,9 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -36,8 +36,11 @@ import com.nuvemconnect.app.nuvemconnect.ui.components.GoogleButton
 import com.nuvemconnect.app.nuvemconnect.ui.components.PasswordTextField
 import com.nuvemconnect.app.nuvemconnect.ui.theme.dmSansFamily
 import com.nuvemconnect.app.nuvemconnect.ui.theme.mediumGray
+import com.nuvemconnect.app.nuvemconnect.ui.theme.neutral100
+import com.nuvemconnect.app.nuvemconnect.ui.theme.neutral60
+import com.nuvemconnect.app.nuvemconnect.ui.theme.neutral70
 import com.nuvemconnect.app.nuvemconnect.ui.theme.poppinsFontFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary
+import com.nuvemconnect.app.nuvemconnect.ui.theme.primary100
 
 @Composable
 fun LoginScreen(
@@ -61,7 +64,8 @@ fun LoginScreen(
             text = stringResource(R.string.title_login_screen),
             fontSize = 28.sp,
             fontFamily = poppinsFontFamily,
-            fontWeight = FontWeight.ExtraBold
+            fontWeight = FontWeight.ExtraBold,
+            color = neutral100
         )
         Spacer(modifier = modifier.height(21.dp))
         Text(
@@ -69,7 +73,7 @@ fun LoginScreen(
             fontSize = 16.sp,
             fontFamily = dmSansFamily,
             fontWeight = FontWeight.Normal,
-            color = Color.Gray
+            color = neutral70
         )
         Spacer(modifier = modifier.height(52.dp))
         CustomTextField(
@@ -77,8 +81,8 @@ fun LoginScreen(
             onValueChange = { newEmail ->
                 viewModel.onEmailChange(newEmail)
             },
-            titleContainer = stringResource(R.string.email),
-            placeholder = stringResource(id = R.string.digite_seu_email),
+            leadingIcon = painterResource(id = R.drawable.baseline_mail_outline_24),
+            placeholder = stringResource(id = R.string.email),
             validate = { email ->
                 validateEmail(email)
             },
@@ -90,8 +94,7 @@ fun LoginScreen(
                 viewModel.onPasswordChange(newPassword)
             },
             value = password,
-            titleContainer = stringResource(R.string.senha),
-            placeholder = stringResource(R.string.digite_sua_senha),
+            placeholder = stringResource(R.string.senha),
             validate = { password ->
                 validatePassword(password)
 
@@ -101,7 +104,7 @@ fun LoginScreen(
         Spacer(modifier = modifier.height(26.dp))
         Text(
             text = stringResource(R.string.esqueceu_sua_senha),
-            color = primary,
+            color = primary100,
             modifier = modifier
                 .align(Alignment.End)
                 .clickable {
@@ -110,9 +113,8 @@ fun LoginScreen(
                 .padding(top = 10.dp),
             fontSize = 16.sp,
             fontFamily = dmSansFamily,
-            textDecoration = TextDecoration.Underline
         )
-        Spacer(modifier = modifier.height(26.dp))
+        Spacer(modifier = modifier.height(66.dp))
         CustomButton(
             onClick = {
                     viewModel.onEmailChange(email)
@@ -122,10 +124,10 @@ fun LoginScreen(
             },
             text = "Entrar",
             modifier = modifier.fillMaxWidth(),
-            backgroundColor = primary,
-            fontWeight = FontWeight.Bold
+            backgroundColor = primary100,
+            fontWeight = FontWeight.SemiBold
         )
-        Spacer(modifier = modifier.height(40.dp))
+        Spacer(modifier = modifier.height(16.dp))
         Row(
             verticalAlignment = Alignment.CenterVertically,
             modifier = modifier.fillMaxWidth()
@@ -146,10 +148,10 @@ fun LoginScreen(
                 modifier = modifier.weight(1f)
             )
         }
-        Spacer(modifier = modifier.height(17.dp))
+        Spacer(modifier = modifier.height(16.dp))
         GoogleButton(
             onClick = { /*TODO*/ },
-            text = "Google",
+            text = "Entrar com Google",
             backgroundColor = Color.Transparent,
             textColor = Color.Black,
             contentColor = Color.Gray,
@@ -159,17 +161,17 @@ fun LoginScreen(
         Row {
             Text(
                 text = stringResource(R.string.nao_tem_uma_conta),
-                color = Color.Gray,
+                color = neutral60,
                 fontSize = 16.sp,
                 fontFamily = dmSansFamily,
                 fontWeight = FontWeight.Normal
             )
             Text(
                 text = stringResource(R.string.inscreva_se),
-                color = primary,
+                color = primary100,
                 fontSize = 16.sp,
                 fontFamily = dmSansFamily,
-                fontWeight = FontWeight.Bold,
+                fontWeight = FontWeight.Normal,
                 modifier = Modifier.clickable {
                     navController.navigate(Screens.Register.route)
                 }
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/login/WelcomeScreen.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/login/WelcomeScreen.kt
index 4091202..d23a7f3 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/login/WelcomeScreen.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/login/WelcomeScreen.kt
@@ -1,5 +1,7 @@
 package com.nuvemconnect.app.nuvemconnect.ui.screens.login
 
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -11,7 +13,9 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.paint
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
@@ -29,64 +33,82 @@ import androidx.navigation.compose.rememberNavController
 import com.nuvemconnect.app.nuvemconnect.R
 import com.nuvemconnect.app.nuvemconnect.navigation.Screens
 import com.nuvemconnect.app.nuvemconnect.ui.components.CustomButton
+import com.nuvemconnect.app.nuvemconnect.ui.theme.base_white
+import com.nuvemconnect.app.nuvemconnect.ui.theme.dmSansFamily
 import com.nuvemconnect.app.nuvemconnect.ui.theme.poppinsFontFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary300
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary600
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary950
+import com.nuvemconnect.app.nuvemconnect.ui.theme.primary100
 
 @Composable
 fun WelcomeScreen(modifier: Modifier = Modifier, navController: NavController) {
-    Column(
+    Box(
         modifier = modifier
-            .fillMaxSize()
-            .padding(horizontal = 16.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
+            .paint(
+                painter = painterResource(id = R.drawable.background_screen_welcome),
+                sizeToIntrinsics = true,
+                contentScale = ContentScale.Crop
+            )
+
+
     ) {
-        Text(
-            text = stringResource(id = R.string.logo_name),
-            fontWeight = FontWeight.Bold,
-            color = primary950,
-            fontSize = 40.sp,
-            modifier = modifier.padding(top = 100.dp)
-        )
-        Icon(
-            painter = painterResource(id = R.drawable.nuvem_connect_logo),
-            contentDescription = stringResource(
-                id = R.string.logo
-            ),
-            modifier = modifier.padding(top = 85.9.dp)
-        )
-        CustomButton(
-            modifier = modifier
-                .fillMaxWidth()
-                .padding(top = 120.1.dp),
-            onClick = {
-                navController.navigate(Screens.Register.route)
-            },
-            text = "Registre-se",
-            backgroundColor = primary600,
-            textColor = Color.White,
-            fontSize = 20.sp,
-            fontWeight = FontWeight.Bold,
-        )
-        CustomButton(
+        Column(
             modifier = modifier
-                .fillMaxWidth()
-                .padding(top = 20.dp),
-            onClick = {
-                navController.navigate(Screens.Login.route)
-            },
-            text = "Entrar",
-            backgroundColor = primary300,
-            textColor = primary950,
-            fontSize = 20.sp,
-            fontWeight = FontWeight.Bold
-        )
-        Spacer(modifier = modifier.height(56.dp))
-        Text(text = helpText(), textAlign = TextAlign.Center)
+                .fillMaxSize()
+                .padding(horizontal = 16.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
 
+            Icon(
+                painter = painterResource(id = R.drawable.nuvem_connect_logo),
+                contentDescription = stringResource(
+                    id = R.string.logo
+                ),
+                tint = Color.White,
+                modifier = modifier.padding(top = 170.dp)
+            )
+            Text(
+                text = stringResource(id = R.string.logo_name),
+                fontWeight = FontWeight.Bold,
+                color = Color.White,
+                fontSize = 40.sp,
+                modifier = modifier.padding(25.dp)
+            )
+            Spacer(modifier = modifier.padding(top = 139.dp))
+            CustomButton(
+                modifier = modifier
+                    .fillMaxWidth(),
+                onClick = {
+                    navController.navigate(Screens.Login.route)
+                },
+                text = "Login",
+                fontFamily = dmSansFamily,
+                backgroundColor = primary100,
+                textColor = Color.White,
+                fontSize = 20.sp,
+                fontWeight = FontWeight.SemiBold
+            )
+            CustomButton(
+                modifier = modifier
+                    .fillMaxWidth()
+                    .padding(top = 16.dp),
+                onClick = {
+                    navController.navigate(Screens.Register.route)
+                },
+                text = "Registre-se",
+                backgroundColor = Color.Transparent,
+                textColor = Color.White,
+                fontFamily = dmSansFamily,
+                fontSize = 18.sp,
+                border = BorderStroke(1.dp, Color.White),
+                fontWeight = FontWeight.Bold,
+            )
+
+            Spacer(modifier = modifier.height(56.dp))
+            Text(text = helpText(), textAlign = TextAlign.Center)
 
+
+        }
     }
+
 }
 
 @Composable
@@ -97,6 +119,7 @@ fun helpText(): AnnotatedString {
                 fontSize = 14.sp,
                 fontFamily = poppinsFontFamily,
                 fontWeight = FontWeight.Normal,
+                color = base_white
             )
         ) {
             append(stringResource(R.string.precisa_de_ajuda))
@@ -107,7 +130,7 @@ fun helpText(): AnnotatedString {
                 fontSize = 14.sp,
                 fontFamily = poppinsFontFamily,
                 fontWeight = FontWeight.Normal,
-
+                color = base_white,
                 textDecoration = TextDecoration.Underline
             )
         ) {
@@ -120,7 +143,8 @@ fun helpText(): AnnotatedString {
                 fontSize = 14.sp,
                 fontFamily = poppinsFontFamily,
                 fontWeight = FontWeight.Normal,
-                textDecoration = TextDecoration.Underline
+                textDecoration = TextDecoration.Underline,
+                color = base_white
             )
         ) {
             append(stringResource(R.string.conosco))
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/register/RegisterScreen.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/register/RegisterScreen.kt
index a1f2ff7..f5bbcdf 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/register/RegisterScreen.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/register/RegisterScreen.kt
@@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -26,7 +27,9 @@ import com.nuvemconnect.app.nuvemconnect.ui.components.TopBar
 import com.nuvemconnect.app.nuvemconnect.ui.screens.login.LoginViewModel
 import com.nuvemconnect.app.nuvemconnect.ui.screens.login.validateEmail
 import com.nuvemconnect.app.nuvemconnect.ui.screens.login.validatePassword
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary
+import com.nuvemconnect.app.nuvemconnect.ui.theme.dmSansFamily
+import com.nuvemconnect.app.nuvemconnect.ui.theme.primary100
+import com.nuvemconnect.app.nuvemconnect.ui.theme.primary60
 
 @Composable
 fun RegisterScreen(
@@ -59,8 +62,8 @@ fun RegisterScreen(
                 viewModel.onEmailChange(newEmail)
             },
             value = email,
-            titleContainer = stringResource(id = R.string.email),
-            placeholder = stringResource(id = R.string.digite_seu_email),
+            leadingIcon = painterResource(id = R.drawable.baseline_mail_outline_24),
+            placeholder = stringResource(id = R.string.email),
             validate = {
                 validateEmail(email)
             },
@@ -71,9 +74,9 @@ fun RegisterScreen(
             onValueChange = { newName ->
                 viewModel.onName(newName)
             },
+            leadingIcon = painterResource(id = R.drawable.baseline_user_01),
             value = name,
-            titleContainer = stringResource(R.string.nome_do_usuario),
-            placeholder = stringResource(R.string.digite_seu_nome),
+            placeholder = stringResource(R.string.nome_do_usuario),
             validate = { validateEmail(name) }, /* TODO: ajuda para a validação do nome e não do tipo Email*/
             isUserInteracted = false
         )
@@ -83,7 +86,6 @@ fun RegisterScreen(
                 viewModel.onPasswordChange(newPassword)
             },
             value = password,
-            titleContainer = stringResource(id = R.string.senha),
             placeholder = stringResource(id = R.string.digite_sua_senha),
             validate = { password ->
                 validatePassword(password)
@@ -96,8 +98,7 @@ fun RegisterScreen(
                 viewModel.onConfirmPassword(newConfirmPassword)
             },
             value = confirmPassword,
-            titleContainer = stringResource(id = R.string.confirme_sua_senha),
-            placeholder = stringResource(id = R.string.digite_sua_senha),
+            placeholder = stringResource(id = R.string.confirme_sua_senha),
             validate = { confirmedPassword ->
                 validatePassword(confirmedPassword)
             },
@@ -109,8 +110,9 @@ fun RegisterScreen(
                 navController.navigate(Screens.VerificationLink.route)
 
             }, text = stringResource(R.string.registrar),
-            backgroundColor = primary,
-            fontSize = 18.sp
+            backgroundColor = primary100,
+            fontSize = 18.sp,
+            fontFamily = dmSansFamily
         )
     }
 }
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/register/VerificationLinkScreen.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/register/VerificationLinkScreen.kt
index 7c1ea65..72e9be3 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/register/VerificationLinkScreen.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/screens/register/VerificationLinkScreen.kt
@@ -28,9 +28,9 @@ import coil.size.Size
 import com.nuvemconnect.app.nuvemconnect.ui.components.TopBar
 import com.nuvemconnect.app.nuvemconnect.ui.theme.NuvemConnectTheme
 import com.nuvemconnect.app.nuvemconnect.ui.theme.dmSansFamily
+import com.nuvemconnect.app.nuvemconnect.ui.theme.neutral100
 import com.nuvemconnect.app.nuvemconnect.ui.theme.poppinsFontFamily
-import com.nuvemconnect.app.nuvemconnect.ui.theme.primary
-import com.nuvemconnect.app.nuvemconnect.ui.theme.secondary700
+import com.nuvemconnect.app.nuvemconnect.ui.theme.primary100
 
 @Composable
 fun VerificationLinkScreen(
@@ -67,7 +67,7 @@ fun VerificationLinkScreen(
             fontFamily = dmSansFamily,
             fontWeight = FontWeight.Normal,
             textAlign = TextAlign.Center,
-            color = secondary700
+            color = neutral100
         )
         Spacer(modifier = modifier.height(30.dp))
         AsyncImage(
@@ -85,13 +85,16 @@ fun VerificationLinkScreen(
             Text(
                 text = "Não recebeu o email? ",
                 fontFamily = dmSansFamily,
-                fontWeight = FontWeight.Normal
+                fontWeight = FontWeight.Normal,
+                fontSize = 16.sp,
+                color = neutral100
             )
             Text(
                 text = "enviar novamente",
                 fontFamily = dmSansFamily,
                 fontWeight = FontWeight.Normal,
-                color = primary
+                color = primary100,
+                fontSize = 16.sp
             )
         }
     }
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/theme/Color.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/theme/Color.kt
index bf2ad76..156194f 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/theme/Color.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/theme/Color.kt
@@ -11,49 +11,50 @@ val PurpleGrey40 = Color(0xFF625b71)
 val Pink40 = Color(0xFF7D5260)
 
 // TODO: Color Primary
-val primary50 = Color(0xFFF1F7FE)
-val primary100 = Color(0xFFE2EFFC)
-val primary200 = Color(0xFFBFDEF8)
-val primary300 = Color(0xFF86C3F3)
-val primary400 = Color(0xFF45A5EB)
-val primary = Color(0xFF1D89DA)
-val primary600 = Color(0xFF0F67B1)
-val primary700 = Color(0xFF0E5696)
-val primary800 = Color(0xFF104C78)
-val primary900 = Color(0xFF133E67)
-val primary950 = Color(0xFF0D2844)
+val primary10 = Color(0xFFD1DDE4)
+val primary20 = Color(0xFFBDD2E3)
+val primary30 = Color(0xFFAACAE2)
+val primary40 = Color(0xFF95C0E0)
+val primary50 = Color(0xFF80B6DF)
+val primary60 = Color(0xFF6DAEDF)
+val primary70 = Color(0xFF59A5DE)
+val primary80 = Color(0xFF459CDC)
+val primary90 = Color(0xFF3192DB)
+val primary100 = Color(0xFF1D89DA)
 
 //TODO: Color Neutral
-val secondary50 = Color(0xFFF5F7F9)
-val secondary100 = Color(0xFFE9EDF0)
-val secondary200 = Color(0xFFD8DFE5)
-val secondary300 = Color(0xFFBDC9D3)
-val secondary400 = Color(0xFFAAB9C5)
-val secondary500 = Color(0xFF8698AB)
-val secondary = Color(0xFFAAB9C5)
-val secondary600 = Color(0xFF74859C)
-val secondary700 = Color(0xFF68768D)
-val secondary800 = Color(0xFF586275)
-val secondary900 = Color(0xFF49515F)
-val secondary950 = Color(0xFF2F333C)
-
-// TODO: Success
-val success100 = Color(0xFFE3F0D7)
-val success200 = Color(0xFF85BB60)
-val success300 = Color(0xFF3D612A)
+val neutral5 = Color(0xFFF3F3F3)
+val neutral20 = Color(0xFFCDD0D5)
+val neutral60 = Color(0xFF838C9B)
+val neutral70 = Color(0xFF6A7686)
+val neutral90 = Color(0xFF38475E)
+val neutral100 = Color(0xFF091A36)
+val neutral500 = Color(0xFF8698AB)
+val neutral = Color(0xFFAAB9C5)
+val neutral600 = Color(0xFF74859C)
+val neutral700 = Color(0xFF68768D)
+val neutral800 = Color(0xFF586275)
+val neutral900 = Color(0xFF49515F)
+val neutral950 = Color(0xFF2F333C)
+
+//TODO: Color White
+val white_default = Color(0xFFFFFFFF)
+val white_two = Color(0xFFF3F4F6)
+
+//TODO: Color Third
+val third10 = Color(0xFFE7EAED)
+val third40 = Color(0xFF75808B)
+val third100 = Color(0xFF0D2844)
 
 //TODO: Warning
-val warning100 = Color(0xFFFEF3C7)
-val warning200 = Color(0xFFF9BF26)
-val warning300 = Color(0xFF91410F)
+val warning100 = Color(0xFFFDEDD1)
+val warning200 = Color(0xFFF9D18C)
+val warning300 = Color(0xFFF4A41A)
 
 //TODO: Error
-val error100 = Color(0xFFFFDDDD)
-val error200 = Color(0xFFFF5757)
-val error300 = Color(0xFFB10303)
-
-//TODO: Button Reset
-val button_color = Color(0xFFF8F8F8)
+val error10 = Color(0xFF0D2844)
+val error40 = Color(0xFF0D2844)
+val error100 = Color(0xFF0D2844)
 
 val base_black = Color(0xFF2F333C)
 val base_white = Color(0xFFF5F7F9)
diff --git a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/theme/Theme.kt b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/theme/Theme.kt
index d42366b..a9a7dce 100644
--- a/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/theme/Theme.kt
+++ b/app/src/main/java/com/nuvemconnect/app/nuvemconnect/ui/theme/Theme.kt
@@ -12,14 +12,14 @@ import androidx.compose.ui.platform.LocalContext
 
 
 private val DarkColorScheme = darkColorScheme(
-    primary = primary,
-    secondary = secondary,
+    primary = primary60,
+    secondary = neutral,
     tertiary = Pink80
 )
 
 private val LightColorScheme = lightColorScheme(
-    primary = primary,
-    secondary = secondary,
+    primary = primary60,
+    secondary = neutral,
     tertiary = Pink40
 
     /* Other default colors to override
diff --git a/app/src/main/res/drawable/background_screen_welcome.png b/app/src/main/res/drawable/background_screen_welcome.png
new file mode 100644
index 0000000..b5be9fb
Binary files /dev/null and b/app/src/main/res/drawable/background_screen_welcome.png differ
diff --git a/app/src/main/res/drawable/baseline_arrow_back_24.xml b/app/src/main/res/drawable/baseline_arrow_back_24.xml
new file mode 100644
index 0000000..43b3ea7
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_arrow_back_24.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#091A36"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/baseline_lock_outline.xml b/app/src/main/res/drawable/baseline_lock_outline.xml
new file mode 100644
index 0000000..13637a3
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_lock_outline.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.23,9H7.2C6.08,9 5.52,9 5.092,9.218C4.715,9.41 4.41,9.715 4.218,10.092C4,10.52 4,11.08 4,12.2V17.8C4,18.92 4,19.48 4.218,19.908C4.41,20.284 4.715,20.59 5.092,20.782C5.519,21 6.079,21 7.197,21H16.803C17.921,21 18.48,21 18.907,20.782C19.284,20.59 19.59,20.284 19.782,19.908C20,19.48 20,18.921 20,17.804V12.197C20,11.079 20,10.519 19.782,10.092C19.59,9.715 19.284,9.41 18.907,9.218C18.48,9 17.92,9 16.8,9H14.769M9.23,9H14.769M9.23,9C9.103,9 9,8.897 9,8.769V6C9,4.343 10.343,3 12,3C13.657,3 15,4.343 15,6V8.769C15,8.897 14.896,9 14.769,9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#6A7686"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_lock_outline_24.xml b/app/src/main/res/drawable/baseline_lock_outline_24.xml
new file mode 100644
index 0000000..552802e
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_lock_outline_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#6A7686" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,17 12,17zM18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2H8.9V6zM18,20H6V10h12V20z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/baseline_mail_outline_24.xml b/app/src/main/res/drawable/baseline_mail_outline_24.xml
new file mode 100644
index 0000000..a8dc256
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_mail_outline_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#6A7686"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8l8,5 8,-5v10zM12,11L4,6h16l-8,5z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/baseline_user_01.png b/app/src/main/res/drawable/baseline_user_01.png
new file mode 100644
index 0000000..e3285f7
Binary files /dev/null and b/app/src/main/res/drawable/baseline_user_01.png differ
diff --git a/app/src/main/res/drawable/baseline_visibility_24.xml b/app/src/main/res/drawable/baseline_visibility_24.xml
deleted file mode 100644
index 3b10891..0000000
--- a/app/src/main/res/drawable/baseline_visibility_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#141B34" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
-    
-</vector>
diff --git a/app/src/main/res/drawable/baseline_visibility_off_24.xml b/app/src/main/res/drawable/baseline_visibility_off_24.xml
deleted file mode 100644
index 3de51c1..0000000
--- a/app/src/main/res/drawable/baseline_visibility_off_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#141B34" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
-    
-</vector>
diff --git a/app/src/main/res/drawable/outline_visibility_24.xml b/app/src/main/res/drawable/outline_visibility_24.xml
new file mode 100644
index 0000000..2cb173d
--- /dev/null
+++ b/app/src/main/res/drawable/outline_visibility_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#6A7686" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5C19.17,14.87 15.79,17 12,17s-7.17,-2.13 -8.82,-5.5C4.83,8.13 8.21,6 12,6m0,-2C7,4 2.73,7.11 1,11.5 2.73,15.89 7,19 12,19s9.27,-3.11 11,-7.5C21.27,7.11 17,4 12,4zM12,9c1.38,0 2.5,1.12 2.5,2.5S13.38,14 12,14s-2.5,-1.12 -2.5,-2.5S10.62,9 12,9m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5S9.52,16 12,16s4.5,-2.02 4.5,-4.5S14.48,7 12,7z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/outline_visibility_off_24.xml b/app/src/main/res/drawable/outline_visibility_off_24.xml
new file mode 100644
index 0000000..44021ba
--- /dev/null
+++ b/app/src/main/res/drawable/outline_visibility_off_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#6A7686" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5 -0.59,1.22 -1.42,2.27 -2.41,3.12l1.41,1.41c1.39,-1.23 2.49,-2.77 3.18,-4.53C21.27,7.11 17,4 12,4c-1.27,0 -2.49,0.2 -3.64,0.57l1.65,1.65C10.66,6.09 11.32,6 12,6zM10.93,7.14L13,9.21c0.57,0.25 1.03,0.71 1.28,1.28l2.07,2.07c0.08,-0.34 0.14,-0.7 0.14,-1.07C16.5,9.01 14.48,7 12,7c-0.37,0 -0.72,0.05 -1.07,0.14zM2.01,3.87l2.68,2.68C3.06,7.83 1.77,9.53 1,11.5 2.73,15.89 7,19 12,19c1.52,0 2.98,-0.29 4.32,-0.82l3.42,3.42 1.41,-1.41L3.42,2.45 2.01,3.87zM9.51,11.37l2.61,2.61c-0.04,0.01 -0.08,0.02 -0.12,0.02 -1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.05 0.01,-0.08 0.01,-0.13zM6.11,7.97l1.75,1.75c-0.23,0.55 -0.36,1.15 -0.36,1.78 0,2.48 2.02,4.5 4.5,4.5 0.63,0 1.23,-0.13 1.77,-0.36l0.98,0.98c-0.88,0.24 -1.8,0.38 -2.75,0.38 -3.79,0 -7.17,-2.13 -8.82,-5.5 0.7,-1.43 1.72,-2.61 2.93,-3.53z"/>
+    
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ecb4df..fdc06a4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,7 +31,7 @@
     <string name="subtitle_login_screen">Para começar, faça login em sua conta</string>
     <string name="insira_suas_informacoes_pessoais">Insira suas informações pessoais</string>
 
-    <string name="ou_faca_seu_login">" Ou faça seu login "</string>
+    <string name="ou_faca_seu_login">" ou "</string>
     <string name="nao_tem_uma_conta">"Não tem uma conta "</string>
 
     <string name="nome_do_usuario">Nome</string>