diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/account/AccountScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/account/AccountScreen.kt
index 5fa42731..ce527ee4 100644
--- a/presentation/src/main/java/daily/dayo/presentation/screen/account/AccountScreen.kt
+++ b/presentation/src/main/java/daily/dayo/presentation/screen/account/AccountScreen.kt
@@ -1,6 +1,5 @@
 package daily.dayo.presentation.screen.account
 
-import android.annotation.SuppressLint
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -9,6 +8,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material3.BottomSheetScaffold
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SheetValue
@@ -28,7 +28,6 @@ import daily.dayo.presentation.theme.Dark
 import daily.dayo.presentation.view.dialog.getBottomSheetDialogState
 import kotlinx.coroutines.launch
 
-@SuppressLint("UnusedMaterialScaffoldPaddingParameter")
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun AccountScreen(
@@ -44,6 +43,7 @@ internal fun AccountScreen(
     val animatedDimAlpha by animateFloatAsState(targetValue = bottomSheetDimAlpha)
 
     BottomSheetScaffold(
+        modifier = Modifier.systemBarsPadding(),
         scaffoldState = bottomSheetState,
         sheetDragHandle = null,
         sheetContent = {
diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/account/SignInEmailScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/account/SignInEmailScreen.kt
index e2039c6d..4511ae24 100644
--- a/presentation/src/main/java/daily/dayo/presentation/screen/account/SignInEmailScreen.kt
+++ b/presentation/src/main/java/daily/dayo/presentation/screen/account/SignInEmailScreen.kt
@@ -137,51 +137,46 @@ fun SignInEmailScreen(
         emailState.value.isNotBlank() && passwordState.value.isNotBlank()
     }
 
-    Surface(
+    Column(
         modifier = Modifier
-            .background(White_FFFFFF)
             .fillMaxSize()
+            .background(DayoTheme.colorScheme.background),
+        verticalArrangement = Arrangement.Top
     ) {
+        SignInEmailActionbarLayout(onBackClick = onBackClick)
         Column(
-            modifier = Modifier.fillMaxSize(),
+            modifier = Modifier
+                .padding(horizontal = 20.dp, vertical = 0.dp)
+                .fillMaxWidth()
+                .wrapContentSize(),
             verticalArrangement = Arrangement.Top
         ) {
-            SignInEmailActionbarLayout(onBackClick = onBackClick)
-            Column(
+            Spacer(
                 modifier = Modifier
-                    .background(White_FFFFFF)
-                    .padding(horizontal = 20.dp, vertical = 0.dp)
                     .fillMaxWidth()
-                    .wrapContentSize(),
-                verticalArrangement = Arrangement.Top
-            ) {
-                Spacer(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(8.dp)
-                )
-                SignInEmailTitle()
-                Spacer(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(20.dp)
-                )
-                SignInEmailInputLayout(
-                    emailValue = emailState.value,
-                    onEmailChange = { emailState.value = it },
-                    passwordValue = passwordState.value,
-                    onPasswordChange = { passwordState.value = it },
-                    onForgetPasswordClick = onForgetPasswordClick,
-                    onSignInClick = { onSignInClick(emailState.value, passwordState.value) }
-                )
-            }
-            Spacer(modifier = Modifier.weight(1f))
-            SignInEmailBottomLayout(
-                onSignUpClick = onSignUpClick,
-                onSignInClick = { onSignInClick(emailState.value, passwordState.value) },
-                isSignInButtonEnabled = isSignInButtonEnabled
+                    .height(8.dp)
+            )
+            SignInEmailTitle()
+            Spacer(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(20.dp)
+            )
+            SignInEmailInputLayout(
+                emailValue = emailState.value,
+                onEmailChange = { emailState.value = it },
+                passwordValue = passwordState.value,
+                onPasswordChange = { passwordState.value = it },
+                onForgetPasswordClick = onForgetPasswordClick,
+                onSignInClick = { onSignInClick(emailState.value, passwordState.value) }
             )
         }
+        Spacer(modifier = Modifier.weight(1f))
+        SignInEmailBottomLayout(
+            onSignUpClick = onSignUpClick,
+            onSignInClick = { onSignInClick(emailState.value, passwordState.value) },
+            isSignInButtonEnabled = isSignInButtonEnabled
+        )
     }
 }