diff --git a/presentation/src/main/java/kr/genti/presentation/generate/waiting/PushDialog.kt b/presentation/src/main/java/kr/genti/presentation/generate/waiting/PushDialog.kt
index bfa4cb2f..3ba78fbd 100644
--- a/presentation/src/main/java/kr/genti/presentation/generate/waiting/PushDialog.kt
+++ b/presentation/src/main/java/kr/genti/presentation/generate/waiting/PushDialog.kt
@@ -26,7 +26,7 @@ class PushDialog : BaseDialog<DialogPushBinding>(R.layout.dialog_push) {
         super.onStart()
         dialog?.window?.apply {
             setLayout(
-                WindowManager.LayoutParams.WRAP_CONTENT,
+                WindowManager.LayoutParams.MATCH_PARENT,
                 WindowManager.LayoutParams.WRAP_CONTENT,
             )
             setBackgroundDrawableResource(R.color.transparent)
@@ -50,7 +50,12 @@ class PushDialog : BaseDialog<DialogPushBinding>(R.layout.dialog_push) {
     }
 
     private fun initCloseBtnListener() {
-        binding.btnClose.setOnSingleClickListener { dismiss() }
+        binding.btnClose.setOnSingleClickListener {
+            with(requireActivity()) {
+                setResult(Activity.RESULT_OK)
+                finish()
+            }
+        }
     }
 
     private fun initGetAlarmBtnListener() {
@@ -92,13 +97,4 @@ class PushDialog : BaseDialog<DialogPushBinding>(R.layout.dialog_push) {
             requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
         }
     }
-
-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-
-        with(requireActivity()) {
-            setResult(Activity.RESULT_OK)
-            finish()
-        }
-    }
 }
diff --git a/presentation/src/main/java/kr/genti/presentation/main/profile/ProfileFragment.kt b/presentation/src/main/java/kr/genti/presentation/main/profile/ProfileFragment.kt
index 4691ab2e..60d7c669 100644
--- a/presentation/src/main/java/kr/genti/presentation/main/profile/ProfileFragment.kt
+++ b/presentation/src/main/java/kr/genti/presentation/main/profile/ProfileFragment.kt
@@ -19,9 +19,14 @@ import kr.genti.core.extension.stringOf
 import kr.genti.core.extension.toast
 import kr.genti.core.state.UiState
 import kr.genti.domain.entity.response.ImageModel
+import kr.genti.domain.enums.GenerateStatus
 import kr.genti.presentation.R
 import kr.genti.presentation.create.CreateActivity
 import kr.genti.presentation.databinding.FragmentProfileBinding
+import kr.genti.presentation.generate.waiting.WaitingActivity
+import kr.genti.presentation.main.CreateErrorDialog
+import kr.genti.presentation.main.CreateFinishedDialog
+import kr.genti.presentation.main.CreateUnableDialog
 import kr.genti.presentation.setting.SettingActivity
 import kr.genti.presentation.util.AmplitudeManager
 
@@ -34,6 +39,9 @@ class ProfileFragment() : BaseFragment<FragmentProfileBinding>(R.layout.fragment
     private val viewModel by activityViewModels<ProfileViewModel>()
 
     private var profileImageDialog: ProfileImageDialog? = null
+    private var createFinishedDialog: CreateFinishedDialog? = null
+    private var createErrorDialog: CreateErrorDialog? = null
+    private var createUnableDialog: CreateUnableDialog? = null
 
     override fun onViewCreated(
         view: View,
@@ -47,6 +55,7 @@ class ProfileFragment() : BaseFragment<FragmentProfileBinding>(R.layout.fragment
         setListWithInfinityScroll()
         observeGenerateStatus()
         observePictureListPageState()
+        observeServerAvailableState()
     }
 
     private fun initView() {
@@ -78,7 +87,27 @@ class ProfileFragment() : BaseFragment<FragmentProfileBinding>(R.layout.fragment
     }
 
     private fun initMoveClickListener(x: Boolean) {
-        startActivity(Intent(requireActivity(), CreateActivity::class.java))
+        when (viewModel.currentStatus) {
+            GenerateStatus.NEW_REQUEST_AVAILABLE -> {
+                viewModel.getIsServerAvailable()
+            }
+
+            GenerateStatus.AWAIT_USER_VERIFICATION -> {
+                createFinishedDialog = CreateFinishedDialog()
+                createFinishedDialog?.show(parentFragmentManager, DIALOG_FINISHED)
+            }
+
+            GenerateStatus.IN_PROGRESS -> {
+                startActivity(Intent(requireActivity(), WaitingActivity::class.java))
+            }
+
+            GenerateStatus.CANCELED -> {
+                createErrorDialog = CreateErrorDialog()
+                createErrorDialog?.show(parentFragmentManager, DIALOG_ERROR)
+            }
+
+            GenerateStatus.EMPTY -> return
+        }
     }
 
     private fun setListWithInfinityScroll() {
@@ -153,13 +182,41 @@ class ProfileFragment() : BaseFragment<FragmentProfileBinding>(R.layout.fragment
         }
     }
 
+    private fun observeServerAvailableState() {
+        viewModel.serverAvailableState.flowWithLifecycle(lifecycle).onEach { state ->
+            when (state) {
+                is UiState.Success -> {
+                    if (state.data.status) {
+                        AmplitudeManager.trackEvent("click_createpictab")
+                        startActivity(Intent(requireActivity(), CreateActivity::class.java))
+                    } else {
+                        createUnableDialog =
+                            CreateUnableDialog.newInstance(state.data.message.orEmpty())
+                        createUnableDialog?.show(parentFragmentManager, DIALOG_UNABLE)
+                    }
+                }
+
+                is UiState.Failure -> toast(stringOf(R.string.error_msg))
+                else -> return@onEach
+            }
+            viewModel.resetIsServerAvailable()
+        }.launchIn(lifecycleScope)
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _adapter = null
         profileImageDialog = null
+        createFinishedDialog = null
+        createErrorDialog = null
+        createUnableDialog = null
     }
 
     companion object {
         private const val IMAGE_VIEWER = "IMAGE_VIEWER"
+
+        private const val DIALOG_FINISHED = "DIALOG_FINISHED"
+        private const val DIALOG_ERROR = "DIALOG_ERROR"
+        private const val DIALOG_UNABLE = "DIALOG_UNABLE"
     }
 }
diff --git a/presentation/src/main/java/kr/genti/presentation/main/profile/ProfileViewModel.kt b/presentation/src/main/java/kr/genti/presentation/main/profile/ProfileViewModel.kt
index 985419ca..c27088b5 100644
--- a/presentation/src/main/java/kr/genti/presentation/main/profile/ProfileViewModel.kt
+++ b/presentation/src/main/java/kr/genti/presentation/main/profile/ProfileViewModel.kt
@@ -8,66 +8,92 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kr.genti.core.state.UiState
 import kr.genti.domain.entity.response.PicturePagedListModel
+import kr.genti.domain.entity.response.ServerAvailableModel
 import kr.genti.domain.enums.GenerateStatus
 import kr.genti.domain.repository.GenerateRepository
 import javax.inject.Inject
 
 @HiltViewModel
 class ProfileViewModel
-    @Inject
-    constructor(
-        private val generateRepository: GenerateRepository,
-    ) : ViewModel() {
-        private val _getGenerateStatusState =
-            MutableStateFlow<UiState<Boolean>>(UiState.Empty)
-        val getGenerateStatusState: StateFlow<UiState<Boolean>> = _getGenerateStatusState
+@Inject
+constructor(
+    private val generateRepository: GenerateRepository,
+) : ViewModel() {
+    private val _getGenerateStatusState =
+        MutableStateFlow<UiState<Boolean>>(UiState.Empty)
+    val getGenerateStatusState: StateFlow<UiState<Boolean>> = _getGenerateStatusState
 
-        private val _getPictureListState =
-            MutableStateFlow<UiState<PicturePagedListModel>>(UiState.Loading)
-        val getPictureListState: StateFlow<UiState<PicturePagedListModel>> = _getPictureListState
+    var currentStatus: GenerateStatus = GenerateStatus.NEW_REQUEST_AVAILABLE
 
-        private var currentPage = -1
-        private var isPagingFinish = false
-        private var totalPage = Int.MAX_VALUE
+    private val _serverAvailableState =
+        MutableStateFlow<UiState<ServerAvailableModel>>(UiState.Empty)
+    val serverAvailableState: StateFlow<UiState<ServerAvailableModel>> = _serverAvailableState
 
-        var isFirstLoading = true
+    private val _getPictureListState =
+        MutableStateFlow<UiState<PicturePagedListModel>>(UiState.Loading)
+    val getPictureListState: StateFlow<UiState<PicturePagedListModel>> = _getPictureListState
 
-        fun getGenerateStatusFromServer() {
-            viewModelScope.launch {
-                _getGenerateStatusState.value = UiState.Loading
-                generateRepository.getGenerateStatus()
-                    .onSuccess {
-                        _getGenerateStatusState.value =
-                            UiState.Success(it.status == GenerateStatus.IN_PROGRESS)
-                    }
-                    .onFailure { t ->
-                        _getGenerateStatusState.value = UiState.Failure(t.message.toString())
-                    }
-            }
+    private var currentPage = -1
+    private var isPagingFinish = false
+    private var totalPage = Int.MAX_VALUE
+
+    var isFirstLoading = true
+
+    fun getGenerateStatusFromServer() {
+        viewModelScope.launch {
+            _getGenerateStatusState.value = UiState.Loading
+            generateRepository.getGenerateStatus()
+                .onSuccess {
+                    currentStatus = it.status
+                    _getGenerateStatusState.value =
+                        UiState.Success(it.status == GenerateStatus.IN_PROGRESS)
+
+                }
+                .onFailure { t ->
+                    _getGenerateStatusState.value = UiState.Failure(t.message.toString())
+                }
         }
+    }
+
+    fun getIsServerAvailable() {
+        _serverAvailableState.value = UiState.Loading
+        viewModelScope.launch {
+            generateRepository
+                .getIsServerAvailable()
+                .onSuccess {
+                    _serverAvailableState.value = UiState.Success(it)
+                }.onFailure {
+                    _serverAvailableState.value = UiState.Failure(it.message.orEmpty())
+                }
+        }
+    }
+
+    fun resetIsServerAvailable() {
+        _serverAvailableState.value = UiState.Empty
+    }
 
-        fun getPictureListFromServer() {
-            viewModelScope.launch {
-                if (isPagingFinish) return@launch
-                _getPictureListState.value = UiState.Loading
-                generateRepository.getGeneratedPictureList(
-                    ++currentPage,
-                    10,
-                    null,
-                    null,
-                )
-                    .onSuccess {
-                        totalPage = it.totalPages - 1
-                        if (totalPage == currentPage) isPagingFinish = true
-                        if (it.content.isEmpty()) {
-                            _getPictureListState.value = UiState.Empty
-                            return@launch
-                        }
-                        if (isFirstLoading) isFirstLoading = false
-                        _getPictureListState.value = UiState.Success(it)
-                    }.onFailure {
-                        _getPictureListState.value = UiState.Failure(it.message.toString())
+    fun getPictureListFromServer() {
+        viewModelScope.launch {
+            if (isPagingFinish) return@launch
+            _getPictureListState.value = UiState.Loading
+            generateRepository.getGeneratedPictureList(
+                ++currentPage,
+                10,
+                null,
+                null,
+            )
+                .onSuccess {
+                    totalPage = it.totalPages - 1
+                    if (totalPage == currentPage) isPagingFinish = true
+                    if (it.content.isEmpty()) {
+                        _getPictureListState.value = UiState.Empty
+                        return@launch
                     }
-            }
+                    if (isFirstLoading) isFirstLoading = false
+                    _getPictureListState.value = UiState.Success(it)
+                }.onFailure {
+                    _getPictureListState.value = UiState.Failure(it.message.toString())
+                }
         }
     }
+}
diff --git a/presentation/src/main/res/drawable/btn_play.xml b/presentation/src/main/res/drawable/ic_play.xml
similarity index 100%
rename from presentation/src/main/res/drawable/btn_play.xml
rename to presentation/src/main/res/drawable/ic_play.xml
diff --git a/presentation/src/main/res/drawable/img_alarm.png b/presentation/src/main/res/drawable/img_alarm.png
index 2723140e..2b58393f 100644
Binary files a/presentation/src/main/res/drawable/img_alarm.png and b/presentation/src/main/res/drawable/img_alarm.png differ
diff --git a/presentation/src/main/res/drawable/img_glow.png b/presentation/src/main/res/drawable/img_glow.png
new file mode 100644
index 00000000..fbcc58df
Binary files /dev/null and b/presentation/src/main/res/drawable/img_glow.png differ
diff --git a/presentation/src/main/res/drawable/img_wait_background.png b/presentation/src/main/res/drawable/img_wait_background.png
deleted file mode 100644
index 9d2c5c88..00000000
Binary files a/presentation/src/main/res/drawable/img_wait_background.png and /dev/null differ
diff --git a/presentation/src/main/res/drawable/img_wait_character.png b/presentation/src/main/res/drawable/img_wait_character.png
deleted file mode 100644
index a3cebdb9..00000000
Binary files a/presentation/src/main/res/drawable/img_wait_character.png and /dev/null differ
diff --git a/presentation/src/main/res/drawable/img_waiting_title.xml b/presentation/src/main/res/drawable/img_waiting_title.xml
deleted file mode 100644
index a46d96e7..00000000
--- a/presentation/src/main/res/drawable/img_waiting_title.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="140dp"
-    android:height="55dp"
-    android:viewportWidth="140"
-    android:viewportHeight="55">
-  <path
-      android:pathData="M10.97,40.32C10.95,42.96 12.48,45.65 14.7,46.73L13.72,47.99C12.1,47.15 10.85,45.48 10.2,43.49C9.53,45.62 8.23,47.39 6.53,48.27L5.55,47C7.85,45.9 9.39,43.04 9.39,40.32V37.78H10.97V40.32ZM17.39,36.54V42.46H19.78V43.81H17.39V51.41H15.81V36.54H17.39ZM26.01,39.64C26.01,41.57 27.44,43.38 29.73,44.11L28.91,45.33C27.2,44.77 25.91,43.6 25.24,42.11C24.57,43.73 23.25,45.01 21.48,45.63L20.66,44.39C22.97,43.61 24.4,41.68 24.41,39.64V38.99H21.08V37.71H29.28V38.99H26.01V39.64ZM32.83,36.55V47.41H31.25V36.55H32.83ZM33.28,49.82V51.1H23.1V46.38H24.7V49.82H33.28ZM41.96,36.79C45.32,36.79 47.27,37.68 47.27,39.34C47.27,41 45.32,41.92 41.96,41.92C38.61,41.92 36.65,41 36.65,39.34C36.65,37.68 38.61,36.79 41.96,36.79ZM41.96,37.95C39.59,37.95 38.28,38.46 38.29,39.34C38.28,40.25 39.59,40.74 41.96,40.74C44.34,40.74 45.65,40.25 45.65,39.34C45.65,38.46 44.34,37.95 41.96,37.95ZM48.75,42.83V44.09H35.19V42.83H48.75ZM47.04,45.24V48.72H38.38V50.05H47.46V51.26H36.83V47.58H45.48V46.41H36.82V45.24H47.04ZM66.58,46.15V51.41H65V47.41H56.22V46.15H66.58ZM66.58,36.54V45.43H65V36.54H66.58ZM57.68,39.42C57.68,40.55 58,42.17 59.11,43.28C60.17,42.2 60.47,40.62 60.47,39.42V38.89H59.44V37.62H63.69V38.89H61.98V39.42C61.97,40.95 62.61,42.84 64.32,43.74L63.49,44.87C62.34,44.26 61.63,43.23 61.24,42.05C60.9,43.24 60.25,44.36 59.09,45.02C57.96,44.36 57.3,43.24 56.95,42.06C56.55,43.23 55.85,44.27 54.71,44.87L53.87,43.74C55.56,42.83 56.22,40.92 56.22,39.42V38.89H54.41V37.62H58.75V38.89H57.68V39.42ZM80.76,37.96V39.42C80.76,41.27 80.76,43.33 80.2,46.36L78.6,46.2C79.18,43.33 79.18,41.22 79.18,39.42V39.24H70.15V37.96H80.76ZM82.29,48.09V49.4H68.72V48.09H73.89V42.84H75.45V48.09H82.29ZM92.73,46.36C92.73,47.64 93.36,49 94.71,49.8C96.07,48.93 96.75,47.5 96.75,46.36V45.65H98.29V46.36C98.29,47.91 99.3,49.4 101.25,50.03L100.47,51.2C99,50.69 98,49.7 97.48,48.47C97,49.68 96.12,50.76 94.75,51.33C93.33,50.79 92.42,49.73 91.97,48.52C91.43,49.69 90.45,50.68 89.04,51.2L88.25,50.03C90.16,49.35 91.19,47.81 91.2,46.36V45.65H92.73V46.36ZM99.9,36.55V45.02H98.32V36.55H99.9ZM91.83,37.37C94.11,37.37 95.78,38.81 95.78,40.89C95.78,42.94 94.11,44.37 91.83,44.37C89.56,44.37 87.87,42.94 87.87,40.89C87.87,38.81 89.56,37.37 91.83,37.37ZM91.83,38.71C90.42,38.69 89.41,39.57 89.41,40.89C89.41,42.18 90.42,43.06 91.83,43.06C93.23,43.06 94.24,42.18 94.24,40.89C94.24,39.57 93.23,38.69 91.83,38.71ZM106.29,37.65C108.31,37.65 109.79,39.36 110.03,42.11H113.1V36.54H114.66V51.44H113.1V43.39H110.04C109.87,46.29 108.36,48.09 106.29,48.09C104.07,48.09 102.51,46.07 102.52,42.86C102.51,39.67 104.07,37.65 106.29,37.65ZM106.29,39.06C104.95,39.06 104.02,40.52 104.02,42.86C104.02,45.22 104.95,46.68 106.29,46.68C107.64,46.68 108.57,45.22 108.57,42.86C108.57,40.52 107.64,39.06 106.29,39.06ZM130.56,48.24V49.55H116.95V48.24H120.21V44.36C118.99,43.68 118.25,42.61 118.25,41.28C118.25,38.94 120.54,37.4 123.72,37.4C126.93,37.4 129.22,38.94 129.22,41.28C129.22,42.6 128.51,43.65 127.31,44.32V48.24H130.56ZM123.72,38.66C121.38,38.66 119.77,39.67 119.77,41.28C119.77,42.88 121.38,43.92 123.72,43.92C126.05,43.92 127.69,42.88 127.69,41.28C127.69,39.67 126.05,38.66 123.72,38.66ZM121.77,48.24H125.72V44.92C125.11,45.08 124.44,45.15 123.72,45.15C123.03,45.15 122.36,45.08 121.77,44.94V48.24ZM134.38,37.98L134.23,46.53H132.59L132.44,37.98H134.38ZM133.42,50.12C132.77,50.12 132.23,49.58 132.24,48.94C132.23,48.29 132.77,47.76 133.42,47.76C134.05,47.76 134.6,48.29 134.6,48.94C134.6,49.58 134.05,50.12 133.42,50.12Z"
-      android:fillColor="#00FF20"/>
-  <path
-      android:pathData="M5.27,11.6C5.27,13.98 6.27,16.52 8.26,17.73L7.38,18.94C5.99,18.1 5.04,16.62 4.54,14.89C3.99,16.78 2.97,18.39 1.52,19.27L0.54,18.09C2.65,16.83 3.75,14.21 3.75,11.67V8.9H5.27V11.6ZM13.54,7.54V22.41H12.03V7.54H13.54ZM10.45,7.82V21.68H8.96V14.08H6.65V12.77H8.96V7.82H10.45ZM20.56,9.91C20.56,11.87 21.93,13.68 24.15,14.41L23.3,15.65C21.68,15.08 20.46,13.92 19.82,12.45C19.16,14.12 17.9,15.42 16.16,16.07L15.32,14.81C17.64,13.98 18.99,12 19,9.78V8.32H20.56V9.91ZM27.12,7.54V11.27H29.28V12.6H27.12V16.52H25.54V7.54H27.12ZM22.32,16.87C25.38,16.87 27.25,17.88 27.25,19.62C27.25,21.38 25.38,22.39 22.32,22.38C19.24,22.39 17.33,21.38 17.33,19.62C17.33,17.88 19.24,16.87 22.32,16.87ZM22.32,18.11C20.17,18.11 18.89,18.68 18.9,19.62C18.89,20.6 20.17,21.13 22.32,21.15C24.47,21.13 25.71,20.6 25.71,19.62C25.71,18.68 24.47,18.11 22.32,18.11ZM42.93,7.54V22.41H41.42V7.54H42.93ZM39.9,7.82V21.68H38.39V14.51H36.72C36.58,17.41 35.34,19.22 33.5,19.21C31.55,19.22 30.29,17.18 30.29,13.96C30.29,10.74 31.55,8.71 33.5,8.73C35.31,8.71 36.53,10.43 36.72,13.23H38.39V7.82H39.9ZM33.5,10.21C32.42,10.21 31.75,11.59 31.75,13.96C31.75,16.33 32.42,17.71 33.5,17.71C34.59,17.71 35.27,16.33 35.27,13.96C35.27,11.59 34.59,10.21 33.5,10.21ZM52.14,16.25V17.98H54.46V16.25H55.93V22.23H50.66V16.25H52.14ZM52.14,21H54.46V19.17H52.14V21ZM60.24,17.36C60.24,18.92 61.1,20.5 62.95,21.15L62.13,22.34C60.79,21.83 59.92,20.86 59.46,19.67C58.96,20.83 58.08,21.81 56.81,22.34L56.01,21.15C57.8,20.42 58.68,18.84 58.68,17.36V16.15H60.24V17.36ZM53.09,8.17C55.05,8.17 56.56,9.28 56.89,10.94H59.79V7.54H61.37V15.42H59.79V12.23H56.9C56.58,13.94 55.06,15.06 53.09,15.06C50.81,15.06 49.19,13.66 49.19,11.6C49.19,9.58 50.81,8.17 53.09,8.17ZM53.09,9.48C51.68,9.48 50.7,10.34 50.7,11.6C50.7,12.88 51.68,13.76 53.09,13.78C54.46,13.76 55.44,12.88 55.44,11.6C55.44,10.34 54.46,9.48 53.09,9.48ZM71.36,8.7V9.99H66.1V14.97C68.59,14.97 70.26,14.89 72.16,14.53L72.33,15.8C70.25,16.17 68.46,16.27 65.69,16.27H64.54V8.7H71.36ZM76.06,7.55V18.39H74.49V12.85H70.44V11.59H74.49V7.55H76.06ZM76.44,20.9V22.18H66.37V17.55H67.96V20.9H76.44Z"
-      android:fillColor="#00FF20"/>
-  <path
-      android:pathData="M101.26,12.84V15.07H98.49V24.93H95.74V5.43H98.49V12.84H101.26ZM86.41,7.29V17.89C88.91,17.85 91.6,17.62 94.42,17.05L94.7,19.33C91.44,19.99 88.26,20.16 85.38,20.16H83.68V7.29H86.41ZM112.04,7.04V16.43H102.65V7.04H112.04ZM105.36,9.23V14.28H109.33V9.23H105.36ZM117.58,5.43V11.05H120.23V13.31H117.58V19.69H114.83V5.43H117.58ZM118.29,22.44V24.63H104.91V18.29H107.64V22.44H118.29ZM127.43,6.74C130.52,6.71 132.84,8.73 132.84,11.53C132.84,14.34 130.52,16.34 127.43,16.34C124.33,16.34 121.99,14.34 121.99,11.53C121.99,8.73 124.33,6.71 127.43,6.74ZM127.43,9.1C125.88,9.1 124.7,10 124.72,11.53C124.7,13.07 125.88,13.96 127.43,13.96C128.97,13.96 130.15,13.07 130.18,11.53C130.15,10 128.99,9.1 127.43,9.1ZM137.52,5.43V25.02H134.79V5.43H137.52ZM121.17,18.79C124.65,18.81 129.49,18.75 133.68,18.17L133.89,20.14C129.55,20.98 124.91,21.02 121.5,21.02L121.17,18.79Z"
-      android:fillColor="#00FF20"/>
-  <path
-      android:pathData="M92,2m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#00FF20"/>
-  <path
-      android:pathData="M111,2m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#00FF20"/>
-  <path
-      android:pathData="M130,2m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#00FF20"/>
-</vector>
diff --git a/presentation/src/main/res/drawable/shape_gray_fill_16_rect.xml b/presentation/src/main/res/drawable/shape_gray_fill_16_rect.xml
new file mode 100644
index 00000000..0a3552c3
--- /dev/null
+++ b/presentation/src/main/res/drawable/shape_gray_fill_16_rect.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp"/>
+    <solid android:color="@color/gray" />
+</shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/activity_wait.xml b/presentation/src/main/res/layout/activity_wait.xml
index 7d72ea3e..d3bbc5c2 100644
--- a/presentation/src/main/res/layout/activity_wait.xml
+++ b/presentation/src/main/res/layout/activity_wait.xml
@@ -8,107 +8,125 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/black">
 
-        <ImageView
-            android:id="@+id/iv_wait_background"
+        <TextView
+            android:id="@+id/tv_wait_header"
+            style="@style/TextAppearance.Genti.Body_14_Bold"
             android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="centerCrop"
-            android:src="@drawable/img_wait_background"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:layout_marginTop="70dp"
+            android:gravity="center"
+            android:text="@string/wait_tv_header"
+            android:textColor="@color/genti_green"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ScrollView
+        <TextView
+            android:id="@+id/tv_wait_title"
+            style="@style/TextAppearance.Genti.Title_20_Bold"
             android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toTopOf="@id/btn_wait_return"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:text="@string/wait_tv_title"
+            android:textSize="24sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            app:layout_constraintTop_toBottomOf="@id/tv_wait_header" />
 
-                <ImageView
-                    android:id="@+id/iv_wait_logo"
-                    android:layout_width="197dp"
-                    android:layout_height="0dp"
-                    android:layout_marginTop="84dp"
-                    android:adjustViewBounds="true"
-                    android:src="@drawable/logo_genti_3d"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+            android:id="@+id/tv_wait_subtitle"
+            style="@style/TextAppearance.Genti.Body_14_Medium"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:text="@string/wait_tv_subtitle"
+            android:textColor="@color/white_80"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_wait_title" />
 
-                <ImageView
-                    android:id="@+id/iv_wait_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="30dp"
-                    android:src="@drawable/img_waiting_title"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_wait_logo" />
+        <com.airbnb.lottie.LottieAnimationView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/tv_wait_time_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_wait_subtitle"
+            app:lottie_autoPlay="true"
+            app:lottie_loop="true"
+            app:lottie_rawRes="@raw/lottie_loading" />
 
-                <ImageView
-                    android:id="@+id/iv_wait_character"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="58dp"
-                    android:layout_marginTop="30dp"
-                    android:adjustViewBounds="true"
-                    android:src="@drawable/img_wait_character"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_wait_title" />
+        <TextView
+            android:id="@+id/tv_wait_time_title"
+            style="@style/TextAppearance.Genti.Body_14_Bold"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:layout_marginBottom="6dp"
+            android:gravity="center"
+            android:text="@string/wait_tv_time_title"
+            android:textColor="@color/white_40"
+            app:layout_constraintBottom_toTopOf="@id/tv_wait_time_subtitle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-                <TextView
-                    android:id="@+id/tv_wait_time"
-                    style="@style/TextAppearance.Genti.BodyNormal"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:gravity="center"
-                    android:text="@string/wait_tv_time"
-                    android:textColor="@color/black"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_wait_character" />
+        <TextView
+            android:id="@+id/tv_wait_time_subtitle"
+            style="@style/TextAppearance.Genti.Subtitle1_18_Bold"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:layout_marginBottom="12dp"
+            android:gravity="center"
+            android:text="@string/wait_tv_time_subtitle"
+            app:layout_constraintBottom_toTopOf="@id/tv_wait_time_guide"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-                <TextView
-                    android:id="@+id/tv_wait_time_guide"
-                    style="@style/TextAppearance.Genti.BodySmall"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="25dp"
-                    android:gravity="center"
-                    android:text="@string/wait_tv_time_guide"
-                    android:textColor="@color/grey_1"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_wait_time" />
+        <TextView
+            android:id="@+id/tv_wait_time_guide"
+            style="@style/TextAppearance.Genti.Body_14_Medium"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:layout_marginBottom="32dp"
+            android:gravity="center"
+            android:text="@string/wait_tv_time_guide"
+            android:textColor="@color/white_60"
+            app:layout_constraintBottom_toTopOf="@id/btn_wait_return"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </ScrollView>
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:src="@drawable/img_glow"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
             android:id="@+id/btn_wait_return"
-            style="@style/TextAppearance.Genti.Headline1"
+            style="@style/TextAppearance.Genti.Subtitle2_16_Bold"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="28dp"
+            android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="28dp"
             android:background="@drawable/sel_btn"
             android:enabled="true"
             android:gravity="center"
-            android:paddingVertical="12dp"
+            android:paddingVertical="14dp"
             android:text="@string/wait_btn_return"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
diff --git a/presentation/src/main/res/layout/dialog_push.xml b/presentation/src/main/res/layout/dialog_push.xml
index 22422f49..06fc0efb 100644
--- a/presentation/src/main/res/layout/dialog_push.xml
+++ b/presentation/src/main/res/layout/dialog_push.xml
@@ -8,103 +8,91 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/view_push_top"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:src="@drawable/img_dialog_bg_green_top"
+            android:layout_marginHorizontal="24dp"
+            android:background="@drawable/shape_gray_fill_16_rect"
+            android:paddingBottom="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/view_push_bottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-80dp"
-            android:adjustViewBounds="true"
-            android:src="@drawable/img_dialog_bg_green_bottom"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_get_alarm" />
+            <ImageView
+                android:id="@+id/iv_push_alarm"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:adjustViewBounds="true"
+                android:src="@drawable/img_alarm"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:layout_width="0dp"
-            android:layout_marginTop="-20dp"
-            android:layout_marginHorizontal="0.1dp"
-            android:layout_height="0dp"
-            android:background="@color/background_white"
-            app:layout_constraintBottom_toTopOf="@id/view_push_bottom"
-            app:layout_constraintEnd_toEndOf="@id/view_push_bottom"
-            app:layout_constraintStart_toStartOf="@id/view_push_bottom"
-            app:layout_constraintTop_toBottomOf="@id/view_push_top" />
+            <TextView
+                android:id="@+id/tv_push_title"
+                style="@style/TextAppearance.Genti.Title_20_Bold"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="-8dp"
+                android:gravity="center"
+                android:text="@string/push_tv_title"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/iv_push_alarm" />
 
-        <ImageView
-            android:id="@+id/btn_close"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="14dp"
-            android:src="@drawable/ic_close_dialog"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_push_title"
-            style="@style/TextAppearance.Genti.Headline4"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="44dp"
-            android:layout_marginTop="26dp"
-            android:gravity="center"
-            android:text="@string/push_tv_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            <TextView
+                android:id="@+id/tv_push_subtitle"
+                style="@style/TextAppearance.Genti.Body_14_Medium"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="12dp"
+                android:layout_marginTop="16dp"
+                android:gravity="center"
+                android:text="@string/push_tv_subtitle"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_push_title" />
 
-        <ImageView
-            android:id="@+id/iv_push_alarm"
-            android:layout_width="75dp"
-            android:layout_height="75dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="20dp"
-            android:adjustViewBounds="true"
-            android:src="@drawable/img_alarm"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_push_title" />
+            <TextView
+                android:id="@+id/btn_close"
+                style="@style/TextAppearance.Genti.Subtitle2_16_Bold"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="4dp"
+                android:background="@drawable/shape_white_fill_10_rect"
+                android:gravity="center"
+                android:paddingVertical="14dp"
+                android:text="@string/push_btn_close"
+                android:textColor="@color/black"
+                app:layout_constraintEnd_toStartOf="@id/btn_get_alarm"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_push_subtitle" />
 
-        <TextView
-            android:id="@+id/tv_push_subtitle"
-            style="@style/TextAppearance.Genti.BodySmall"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="12dp"
-            android:layout_marginTop="4dp"
-            android:gravity="center"
-            android:text="@string/push_tv_subtitle"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_push_alarm" />
+            <TextView
+                android:id="@+id/btn_get_alarm"
+                style="@style/TextAppearance.Genti.Subtitle2_16_Bold"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="16dp"
+                android:background="@drawable/shape_green_gradation_fill_10_rect"
+                android:gravity="center"
+                android:paddingVertical="14dp"
+                android:text="@string/push_btn_get_alarm"
+                android:textColor="@color/black"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/btn_close"
+                app:layout_constraintTop_toBottomOf="@id/tv_push_subtitle" />
 
-        <TextView
-            android:id="@+id/btn_get_alarm"
-            style="@style/TextAppearance.Genti.Headline4"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="29dp"
-            android:layout_marginTop="16dp"
-            android:background="@drawable/shape_green1_fill_6_rect"
-            android:gravity="center"
-            android:paddingVertical="6dp"
-            android:text="@string/push_btn_get_alarm"
-            android:textColor="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_push_subtitle" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/presentation/src/main/res/layout/fragment_define.xml b/presentation/src/main/res/layout/fragment_define.xml
index b9765dcf..a21c242b 100644
--- a/presentation/src/main/res/layout/fragment_define.xml
+++ b/presentation/src/main/res/layout/fragment_define.xml
@@ -146,7 +146,7 @@
                     android:background="@drawable/sel_btn"
                     android:enabled="@{vm.isWritten}"
                     android:padding="10dp"
-                    android:src="@drawable/btn_play"
+                    android:src="@drawable/ic_play"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
diff --git a/presentation/src/main/res/layout/fragment_pose.xml b/presentation/src/main/res/layout/fragment_pose.xml
index 8f297f40..1c703e4f 100644
--- a/presentation/src/main/res/layout/fragment_pose.xml
+++ b/presentation/src/main/res/layout/fragment_pose.xml
@@ -23,10 +23,10 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="30dp"
             app:layout_constraintBottom_toTopOf="@id/btn_pose_next"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginBottom="30dp"
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
@@ -72,35 +72,35 @@
                     android:id="@+id/iv_ratio_3_2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
                     android:src="@drawable/img_ratio_3_2"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    android:layout_marginTop="16dp"
-                    app:layout_constraintTop_toTopOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
+                    android:id="@+id/tv_ratio_3_2_title"
+                    style="@style/TextAppearance.Genti.Body_14_Bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Genti.Body_14_Bold"
                     android:text="@string/pose_btn_sero_title"
-                    android:id="@+id/tv_ratio_3_2_title"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintBottom_toTopOf="@id/tv_ratio_3_2_subitle"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed"
-                    app:layout_constraintTop_toBottomOf="@id/iv_ratio_3_2"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/iv_ratio_3_2"
+                    app:layout_constraintVertical_chainStyle="packed" />
 
                 <TextView
+                    android:id="@+id/tv_ratio_3_2_subitle"
+                    style="@style/TextAppearance.Genti.Body_14_Medium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Genti.Body_14_Medium"
                     android:text="@string/pose_btn_sero_subtitle"
                     android:textColor="@color/white_60"
-                    android:id="@+id/tv_ratio_3_2_subitle"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_ratio_3_2_title"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_ratio_3_2_title" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -135,35 +135,35 @@
                     android:id="@+id/iv_ratio_2_3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
                     android:src="@drawable/img_ratio_2_3"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    android:layout_marginTop="16dp"
-                    app:layout_constraintTop_toTopOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
+                    android:id="@+id/tv_ratio_2_3_title"
+                    style="@style/TextAppearance.Genti.Body_14_Bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Genti.Body_14_Bold"
                     android:text="@string/pose_btn_garo_title"
-                    android:id="@+id/tv_ratio_2_3_title"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintBottom_toTopOf="@id/tv_ratio_2_3_subitle"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed"
-                    app:layout_constraintTop_toBottomOf="@id/iv_ratio_2_3"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/iv_ratio_2_3"
+                    app:layout_constraintVertical_chainStyle="packed" />
 
                 <TextView
+                    android:id="@+id/tv_ratio_2_3_subitle"
+                    style="@style/TextAppearance.Genti.Body_14_Medium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Genti.Body_14_Medium"
                     android:text="@string/pose_btn_garo_subtitle"
                     android:textColor="@color/white_60"
-                    android:id="@+id/tv_ratio_2_3_subitle"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_ratio_2_3_title"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_ratio_2_3_title" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -174,7 +174,6 @@
             style="@style/TextAppearance.Genti.Subtitle2_16_Bold"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:textColor="@color/black"
             android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="28dp"
             android:background="@drawable/sel_btn"
@@ -182,6 +181,7 @@
             android:gravity="center"
             android:paddingVertical="14dp"
             android:text="@string/btn_next"
+            android:textColor="@color/black"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index b5c65264..f184b2e9 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -73,11 +73,13 @@
     <string name="create_guide_tv_title_down">을 선택해야 해요!</string>
     <string name="create_guide_tv_ex">예시</string>
 
-    <string name="wait_tv_title">세상에 없던 나만의\n   사진을 찍고있어요!</string>
-    <string name="wait_tv_title_dot">• • •</string>
-    <string name="wait_tv_time">예상 소요시간은 2시간입니다.</string>
-    <string name="wait_tv_time_guide">미리 만들어놓은 컨셉에 얼굴만 바꾸는게 아니라\n’나만의 하나뿐인 사진’을 찍어드리기 위해 \n배경부터 의상, 구도까지 꼼꼼하게 준비하고 있어요</string>
     <string name="wait_btn_return">피드로 돌아가기</string>
+    <string name="wait_tv_header">사진 생성 중</string>
+    <string name="wait_tv_title">세상에 없던\n나만의 사진을 찍고 있어요!</string>
+    <string name="wait_tv_subtitle">사진이 완성되면, 완료 알림을 보내드려요.</string>
+    <string name="wait_tv_time_title">예상 소요 시간</string>
+    <string name="wait_tv_time_subtitle">2시간 정도 걸릴 예정이에요.</string>
+    <string name="wait_tv_time_guide">세상에 하나뿐인 사진을 만들어 드리기 위해\n배경부터 의상까지 꼼꼼하게 준비하고 있어요.</string>
 
     <string name="waiting_error_tv_title">정말 죄송합니다.</string>
     <string name="waiting_error_tv_subtitle">서버에 오류가 발생해서\n사진이 만들어지지 않았어요.</string>
@@ -141,8 +143,9 @@
     <string name="setting_quit_btn_quit">탈퇴하기</string>
 
     <string name="push_tv_title">사진 완성 알림을 받아보세요!</string>
-    <string name="push_tv_subtitle">알림에 동의해 주시면\n사진이 완성되었을 때 알려드릴게요</string>
-    <string name="push_btn_get_alarm">사진 완성 알림 받기</string>
+    <string name="push_tv_subtitle">알림에 동의해 주시면\n사진이 완성되었을 때 알려드릴게요.</string>
+    <string name="push_btn_close">다음에</string>
+    <string name="push_btn_get_alarm">알림 받기</string>
 
     <string name="openchat_tv_title_up">내가 만든 특별한 사진,</string>
     <string name="openchat_tv_title_down">다른 사람에게 보여주고 싶다면?</string>