diff --git a/core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilTextButton.kt b/core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilTextButton.kt
index cb9ec3f4..f4096627 100644
--- a/core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilTextButton.kt
+++ b/core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilTextButton.kt
@@ -58,7 +58,6 @@ fun BitnagilTextButton(
 
     Box(
         modifier = modifier
-            .fillMaxWidth()
             .height(54.dp)
             .clip(shape)
             .background(backgroundColor)
@@ -122,6 +121,7 @@ private fun BitnagilTextButtonPreview() {
             text = "시작하기",
             onClick = {},
             enabled = false,
+            modifier = Modifier.fillMaxWidth(),
         )
 
         Spacer(modifier = Modifier.height(12.dp))
@@ -129,6 +129,7 @@ private fun BitnagilTextButtonPreview() {
         BitnagilTextButton(
             text = "시작하기",
             onClick = {},
+            modifier = Modifier.fillMaxWidth(),
         )
 
         Spacer(modifier = Modifier.height(12.dp))
@@ -139,6 +140,7 @@ private fun BitnagilTextButtonPreview() {
             colors = BitnagilTextButtonColor.skip(),
             textStyle = BitnagilTheme.typography.body2Regular,
             textDecoration = TextDecoration.Underline,
+            modifier = Modifier.fillMaxWidth(),
         )
     }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt
index da61975e..f1f4bd68 100644
--- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt
+++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
@@ -200,6 +201,7 @@ private fun EmotionRecommendRoutineScreen(
             text = "변경하기",
             onClick = onClickRegisterRecommendRoutines,
             enabled = state.registerRecommendRoutinesButtonEnabled,
+            modifier = Modifier.fillMaxWidth(),
         )
 
         Spacer(modifier = Modifier.height(10.dp))
@@ -214,6 +216,7 @@ private fun EmotionRecommendRoutineScreen(
             ),
             textStyle = BitnagilTheme.typography.body2Regular,
             textDecoration = TextDecoration.Underline,
+            modifier = Modifier.fillMaxWidth(),
         )
     }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingSelectTemplate.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingSelectTemplate.kt
index 9c84e45d..944145a7 100644
--- a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingSelectTemplate.kt
+++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingSelectTemplate.kt
@@ -2,6 +2,7 @@ package com.threegap.bitnagil.presentation.onboarding.component.template
 
 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.rememberScrollState
@@ -76,6 +77,7 @@ fun OnBoardingSelectTemplate(
             text = "다음",
             onClick = onClickNextButton,
             enabled = nextButtonEnable,
+            modifier = Modifier.fillMaxWidth(),
         )
 
         onClickSkip?.let {
@@ -87,6 +89,7 @@ fun OnBoardingSelectTemplate(
                 colors = BitnagilTextButtonColor.skip(),
                 textStyle = BitnagilTheme.typography.body2Regular,
                 textDecoration = TextDecoration.Underline,
+                modifier = Modifier.fillMaxWidth(),
             )
         }
     }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt
index defda7dc..cd49a39b 100644
--- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt
+++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt
@@ -333,7 +333,8 @@ private fun WriteRoutineScreen(
             onClick = onClickRegister,
             enabled = state.registerButtonEnabled,
             modifier = Modifier
-                .padding(start = 16.dp, end = 16.dp, top = 14.dp, bottom = 14.dp),
+                .padding(start = 16.dp, end = 16.dp, top = 14.dp, bottom = 14.dp)
+                .fillMaxWidth(),
         )
     }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/TimePickerBottomSheet.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/TimePickerBottomSheet.kt
index 2ca93c5a..86384f8d 100644
--- a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/TimePickerBottomSheet.kt
+++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/TimePickerBottomSheet.kt
@@ -4,6 +4,7 @@ import android.view.View
 import android.widget.TimePicker
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
@@ -105,7 +106,9 @@ fun TimePickerBottomSheetContent(
         )
 
         BitnagilTextButton(
-            modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 14.dp),
+            modifier = Modifier
+                .padding(start = 16.dp, end = 16.dp, bottom = 14.dp)
+                .fillMaxWidth(),
             text = "저장",
             onClick = {
                 onTimeSelected(currentHour, currentMinute)