diff --git a/.gitignore b/.gitignore
index 5cfecf3e..f9398ef0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/misc.xml
 .DS_Store
 /build
 /captures
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
new file mode 100644
index 00000000..940b2649
--- /dev/null
+++ b/.idea/appInsightsSettings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="tabSettings">
+      <map>
+        <entry key="Firebase Crashlytics">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="com.moneymong.moneymong.tb" />
+                  <option name="mobileSdkAppId" value="1:276339224954:android:6e845b0b1d59a02fbe66c3" />
+                  <option name="projectId" value="moneymong-ab377" />
+                  <option name="projectNumber" value="276339224954" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="THIRTY_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f55eebcb..09e95c5b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -16,8 +16,9 @@
             </builds>
           </compositeBuild>
         </compositeConfiguration>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9b..e0da3ee5 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,34 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
@@ -9,6 +37,10 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 8978d23d..00000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..16660f1d
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1c79b8d5..8bca4297 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         applicationId = "com.moneymong.moneymong"
         minSdk = 24
         targetSdk = 34
-        versionCode = 29
-        versionName = "1.4.0"
+        versionCode = 30
+        versionName = "2.0.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/Button.kt b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/Button.kt
index b9a158ed..14c32952 100644
--- a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/Button.kt
+++ b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/Button.kt
@@ -16,9 +16,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.moneymong.moneymong.design_system.theme.Body2
+import com.moneymong.moneymong.design_system.R
+import com.moneymong.moneymong.design_system.theme.Body3
 
 @Composable
 fun MDSButton(
@@ -30,7 +32,7 @@ fun MDSButton(
     @DrawableRes iconResource: Int? = null,
     enabled: Boolean = true,
     contentHorizontalPadding: Dp = 0.dp,
-    cornerShape : Dp = 10.dp,
+    cornerShape: Dp = 10.dp,
 ) {
     val backgroundColor = if (enabled) type.backgroundColor else disabledBackgroundColor
     val contentColor = if (enabled) type.contentColor else disabledContentColor
@@ -57,19 +59,31 @@ fun MDSButton(
             ),
             horizontalArrangement = Arrangement.spacedBy(6.dp)
         ) {
+            Text(
+                text = text,
+                color = contentColor,
+                style = Body3,
+            )
             if (iconResource != null) {
                 Icon(
-                    modifier = Modifier.size(18.dp),
+                    modifier = Modifier.size(20.dp),
                     painter = painterResource(id = iconResource),
                     contentDescription = "Button icon",
                     tint = contentColor
                 )
             }
-            Text(
-                text = text,
-                color = contentColor,
-                style = Body2,
-            )
         }
     }
+}
+
+@Preview
+@Composable
+private fun MDSButtonPreview() {
+    MDSButton(
+        onClick = {},
+        text = "Button",
+        type = MDSButtonType.PRIMARY,
+        size = MDSButtonSize.LARGE,
+        iconResource = R.drawable.ic_scan
+    )
 }
\ No newline at end of file
diff --git a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/ButtonType.kt b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/ButtonType.kt
index cbab1fcc..3bcd544a 100644
--- a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/ButtonType.kt
+++ b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/ButtonType.kt
@@ -7,6 +7,7 @@ import com.moneymong.moneymong.design_system.theme.Gray02
 import com.moneymong.moneymong.design_system.theme.Gray03
 import com.moneymong.moneymong.design_system.theme.Gray04
 import com.moneymong.moneymong.design_system.theme.Gray05
+import com.moneymong.moneymong.design_system.theme.Gray08
 import com.moneymong.moneymong.design_system.theme.White
 
 enum class MDSButtonType(val backgroundColor: Color, val contentColor: Color) {
@@ -14,6 +15,7 @@ enum class MDSButtonType(val backgroundColor: Color, val contentColor: Color) {
     PRIMARY(backgroundColor = Blue04, contentColor = White),
     SECONDARY(backgroundColor = Blue01, contentColor = Blue04),
     NEGATIVE(backgroundColor = Gray02, contentColor = Gray05),
+    THIRDARY(backgroundColor = Gray08, contentColor = White)
 }
 
 val disabledBackgroundColor = Gray03
diff --git a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/datepicker/MDSBottomSheetDatePicker.kt b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/datepicker/MDSBottomSheetDatePicker.kt
index 80dbcf93..92ccf7ea 100644
--- a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/datepicker/MDSBottomSheetDatePicker.kt
+++ b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/datepicker/MDSBottomSheetDatePicker.kt
@@ -1,6 +1,5 @@
 package com.moneymong.moneymong.design_system.component.datepicker
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider
@@ -20,7 +19,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
@@ -38,7 +37,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.DpSize
@@ -57,12 +55,12 @@ import com.moneymong.moneymong.design_system.theme.Gray03
 import com.moneymong.moneymong.design_system.theme.Gray05
 import com.moneymong.moneymong.design_system.theme.Gray09
 import com.moneymong.moneymong.design_system.theme.Heading2
+import com.moneymong.moneymong.design_system.theme.Heading3
+import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
 import com.moneymong.moneymong.design_system.theme.Red01
 import com.moneymong.moneymong.design_system.theme.Red02
 import com.moneymong.moneymong.design_system.theme.Red03
 import com.moneymong.moneymong.design_system.theme.White
-import com.moneymong.moneymong.ui.pxToDp
-import com.moneymong.moneymong.ui.spToDp
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
@@ -73,12 +71,15 @@ enum class MDSDateType(val description: String) {
     END(description = "종료일")
 }
 
+private const val START_DATE_OF_LOCAL_DATE = 1
+private val MONTH_RANGE = 1..12
+
 @Composable
 fun MDSWheelDatePicker(
     modifier: Modifier = Modifier,
     startDate: LocalDate = LocalDate.now().minusMonths(6),
     endDate: LocalDate = LocalDate.now(),
-    yearRange: IntProgression = IntProgression.fromClosedRange(LocalDate.now().year + 1, 2017, -1), // empty string 표시를 위해 1씩 추가함
+    yearRange: IntProgression = IntProgression.fromClosedRange(LocalDate.now().year, 2017, -1),
     confirmDateChange: (startDate: LocalDate, endDate: LocalDate) -> Unit,
     confirmValidValue: (Boolean) -> Unit = {},
     onDismissRequest: () -> Unit,
@@ -89,10 +90,22 @@ fun MDSWheelDatePicker(
     var snappedEndMonth by remember { mutableIntStateOf(endDate.monthValue) }
     var dateType: MDSDateType by remember { mutableStateOf(MDSDateType.END) }
     var isValidValue by remember { mutableStateOf(true) }
-    val months by remember { mutableStateOf((0..13).toList()) }
     val years by remember { mutableStateOf(yearRange.toList()) }
-    var startYearIndex by remember { mutableIntStateOf(years.indexOf(endDate.year)) }
-    var startMonthIndex by remember { mutableIntStateOf(months.indexOf(endDate.monthValue)) }
+    val months by remember { mutableStateOf(MONTH_RANGE.toList()) }
+
+    var startYearIndex by remember { mutableIntStateOf(years.indexOf(startDate.year).coerceIn(0, years.size - 1)) }
+    var startMonthIndex by remember { mutableIntStateOf(months.indexOf(startDate.monthValue).coerceIn(0, months.size - 1)) }
+    var endYearIndex by remember { mutableIntStateOf(years.indexOf(endDate.year).coerceIn(0, years.size - 1)) }
+    var endMonthIndex by remember { mutableIntStateOf(months.indexOf(endDate.monthValue).coerceIn(0, months.size - 1)) }
+    val wheelYearStartIndex = when (dateType) {
+        MDSDateType.START -> startYearIndex
+        MDSDateType.END -> endYearIndex
+    }
+    val wheelMonthStartIndex = when (dateType) {
+        MDSDateType.START -> startMonthIndex
+        MDSDateType.END -> endMonthIndex
+    }
+
 
     val scope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
@@ -109,9 +122,11 @@ fun MDSWheelDatePicker(
     }
 
     val updateMonth: (Int) -> Unit = {
-        when (dateType) {
-            MDSDateType.START -> snappedStartMonth = it
-            MDSDateType.END -> snappedEndMonth = it
+        if (it in MONTH_RANGE) {
+            when (dateType) {
+                MDSDateType.START -> snappedStartMonth = it
+                MDSDateType.END -> snappedEndMonth = it
+            }
         }
     }
 
@@ -123,8 +138,8 @@ fun MDSWheelDatePicker(
             }
 
             MDSDateType.END -> {
-                startYearIndex = years.indexOf(snappedEndYear)
-                startMonthIndex = months.indexOf(snappedEndMonth)
+                endYearIndex = years.indexOf(snappedEndYear)
+                endMonthIndex = months.indexOf(snappedEndMonth)
             }
         }
     }
@@ -135,7 +150,10 @@ fun MDSWheelDatePicker(
         snappedEndYear,
         snappedEndMonth
     ) {
-        isValidValue = snappedStartYear <= snappedEndYear && snappedStartMonth <= snappedEndMonth
+        val startLocalDate = LocalDate.of(snappedStartYear, snappedStartMonth, START_DATE_OF_LOCAL_DATE)
+        val endLocalDate = LocalDate.of(snappedEndYear, snappedEndMonth, START_DATE_OF_LOCAL_DATE)
+
+        isValidValue = startLocalDate.isBefore(endLocalDate) || startLocalDate.isEqual(endLocalDate)
         confirmValidValue(isValidValue)
     }
 
@@ -158,11 +176,15 @@ fun MDSWheelDatePicker(
         modifier = modifier
             .fillMaxWidth()
     ) {
-
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(start = 20.dp, top = 20.dp, end = 20.dp, bottom = 16.dp),
+                .padding(
+                    start = MMHorizontalSpacing,
+                    top = 20.dp,
+                    end = MMHorizontalSpacing,
+                    bottom = 12.dp
+                ),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Box(modifier = Modifier.fillMaxWidth()) {
@@ -179,9 +201,10 @@ fun MDSWheelDatePicker(
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceBetween
+                horizontalArrangement = Arrangement.spacedBy(40.dp),
             ) {
                 MDSDatePickerDateView(
+                    modifier = Modifier.weight(1f),
                     dateType = MDSDateType.START,
                     year = snappedStartYear,
                     month = snappedStartMonth,
@@ -190,6 +213,7 @@ fun MDSWheelDatePicker(
                     onClick = onChangeDateType
                 )
                 MDSDatePickerDateView(
+                    modifier = Modifier.weight(1f),
                     dateType = MDSDateType.END,
                     year = snappedEndYear,
                     month = snappedEndMonth,
@@ -199,7 +223,7 @@ fun MDSWheelDatePicker(
                 )
             }
             Spacer(modifier = Modifier.height(16.dp))
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier.fillMaxWidth(),
                 thickness = 1.dp,
                 color = Gray02
@@ -211,12 +235,12 @@ fun MDSWheelDatePicker(
             ) {
                 WheelPicker(
                     items = years,
-                    startIndex = startYearIndex,
+                    startIndex = wheelYearStartIndex,
                     confirmDateChange = updateYear
                 ) { year, color ->
                     Text(
                         modifier = Modifier.width(64.dp),
-                        text = if (year == yearRange.first || year == yearRange.last) "" else "${year}년",
+                        text = "${year}년",
                         style = Heading2,
                         color = color,
                         textAlign = TextAlign.Center
@@ -225,12 +249,12 @@ fun MDSWheelDatePicker(
                 Spacer(modifier = Modifier.width(40.dp))
                 WheelPicker(
                     items = months,
-                    startIndex = startMonthIndex,
+                    startIndex = wheelMonthStartIndex,
                     confirmDateChange = updateMonth
                 ) { month, color ->
                     Text(
                         modifier = Modifier.width(64.dp),
-                        text = if (month == months.first() || month == months.last()) "" else "${month}월",
+                        text = "${month}월",
                         style = Heading2,
                         color = color,
                         textAlign = TextAlign.Center
@@ -251,11 +275,10 @@ fun MDSWheelDatePicker(
                     )
                 }
             )
-            Spacer(modifier = Modifier.height(16.dp))
         }
         MDSSnackbarHost(
             modifier = Modifier
-                .padding(start = 20.dp, bottom = 100.dp, end = 20.dp)
+                .padding(start = 20.dp, bottom = 76.dp, end = 20.dp)
                 .align(Alignment.BottomCenter),
             hostState = snackbarHostState
         )
@@ -284,7 +307,7 @@ internal fun MDSDatePickerDateView(
         Column(
             modifier = Modifier
                 .wrapContentSize()
-                .padding(start = 12.dp, top = 10.dp, end = 19.dp, bottom = 10.dp)
+                .padding(vertical = 10.dp, horizontal = 12.dp),
         ) {
             Text(
                 text = dateType.description,
@@ -294,47 +317,49 @@ internal fun MDSDatePickerDateView(
             Spacer(modifier = Modifier.height(2.dp))
             Text(
                 text = "${year}년 ${month}월",
-                style = Heading2,
+                style = Heading3,
                 color = if (!isValidValue && selected) Red03 else Blue04
             )
         }
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 internal fun <T> WheelPicker(
     modifier: Modifier = Modifier,
     state: DatePickerState = rememberMDSDatePickerState(),
-    size: DpSize = DpSize(width = 64.dp, height = ((Heading2.lineHeight.spToDp * 3) + (28.dp * 2))),
+    size: DpSize = DpSize(width = 64.dp, height = 140.dp),
     items: List<T>,
     startIndex: Int = 0,
     visibleItemsCount: Int = 3,
     confirmDateChange: (value: T) -> Unit = {},
     content: @Composable LazyItemScope.(item: T, color: Color) -> Unit
 ) {
-    val lazyListState =
-        rememberLazyListState(startIndex - 1) // empty string을 위해 리스트 처음과 끝 값을 제외함
+    val paddedItems = listOf(null) + items + listOf(null)
+    val safeStartIndex = startIndex.coerceIn(0, (items.lastIndex))
+    val lazyListState = rememberLazyListState(safeStartIndex)
     val snappingLayout = remember(lazyListState) { SnapLayoutInfoProvider(lazyListState) }
     val snapFlingBehavior = rememberSnapFlingBehavior(snappingLayout)
 
     val visibleItemsMiddle by remember { derivedStateOf { visibleItemsCount / 2 } }
-    val itemHeightPixels = remember { mutableIntStateOf(0) }
-    val itemHeightDp = itemHeightPixels.intValue.pxToDp
-
+    val itemHeightDp = 28.dp
+    val centerLinePosition = size.height / 2
 
     LaunchedEffect(lazyListState) {
         snapshotFlow { lazyListState.firstVisibleItemIndex }
             .map { index -> index + visibleItemsMiddle }
             .distinctUntilChanged()
             .collect { item ->
-                state.currentIndex = item
-                confirmDateChange(items[item])
+                val realIndex = item - visibleItemsMiddle
+                if (realIndex in items.indices) {
+                    state.currentIndex = realIndex
+                    confirmDateChange(items[realIndex])
+                }
             }
     }
 
     LaunchedEffect(startIndex) {
-        lazyListState.scrollToItem(startIndex - 1)
+        lazyListState.scrollToItem(safeStartIndex)
     }
 
     Box(modifier = modifier) {
@@ -344,28 +369,33 @@ internal fun <T> WheelPicker(
                 .height(size.height),
             verticalArrangement = Arrangement.spacedBy(28.dp),
             state = lazyListState,
-            flingBehavior = snapFlingBehavior
+            flingBehavior = snapFlingBehavior,
         ) {
-            items(items.size) { index ->
+            items(paddedItems.size) { paddedIndex ->
+                val actualIndex = paddedIndex - visibleItemsMiddle
                 Box(
-                    modifier = Modifier
-                        .onSizeChanged { size -> itemHeightPixels.intValue = size.height }
+                    modifier = Modifier.height(itemHeightDp),
+                    contentAlignment = Alignment.Center,
                 ) {
-                    content(items[index], state.calculateItemColor(index))
+                    if (actualIndex in items.indices) {
+                        content(items[actualIndex], state.calculateItemColor(actualIndex))
+                    } else {
+                        Spacer(modifier = Modifier.height(itemHeightDp))
+                    }
                 }
             }
         }
-        Divider(
+        HorizontalDivider(
             modifier = Modifier
                 .width(64.dp)
-                .offset(y = (itemHeightDp - 4.dp) * (visibleItemsMiddle + 1)),
+                .offset(y = centerLinePosition - itemHeightDp / 2 - 6.dp),
             thickness = 2.dp,
             color = Blue04
         )
-        Divider(
+        HorizontalDivider(
             modifier = Modifier
                 .width(64.dp)
-                .offset(y = (itemHeightDp + 4.dp) * (visibleItemsMiddle + 2)),
+                .offset(y = centerLinePosition + itemHeightDp / 2 + 6.dp),
             thickness = 2.dp,
             color = Blue04
         )
@@ -375,7 +405,7 @@ internal fun <T> WheelPicker(
 @Composable
 fun rememberMDSDatePickerState() = remember { DatePickerState() }
 
-class DatePickerState() {
+class DatePickerState {
     var currentIndex by mutableIntStateOf(0)
 
     fun calculateItemColor(itemIndex: Int) =
diff --git a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/navigation/NavigationBar.kt b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/navigation/NavigationBar.kt
index b86c1ba4..89bb0ec1 100644
--- a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/navigation/NavigationBar.kt
+++ b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/navigation/NavigationBar.kt
@@ -2,6 +2,7 @@ package com.moneymong.moneymong.design_system.component.navigation
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -13,12 +14,14 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.res.painterResource
@@ -33,6 +36,7 @@ import com.moneymong.moneymong.design_system.theme.Blue04
 import com.moneymong.moneymong.design_system.theme.Body2
 import com.moneymong.moneymong.design_system.theme.Gray02
 import com.moneymong.moneymong.design_system.theme.Gray04
+import com.moneymong.moneymong.design_system.theme.Gray09
 import com.moneymong.moneymong.design_system.theme.White
 
 @Composable
@@ -45,6 +49,12 @@ fun MDSNavigationBar(
             .fillMaxWidth()
             .navigationBarsPadding()
             .background(color = White)
+            .clip(shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp))
+            .border(
+                width = 1.dp,
+                color = Gray02,
+                shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp)
+            )
             .drawBehind {
                 val strokeWidth = 1.dp.toPx()
                 drawLine(
@@ -111,12 +121,6 @@ fun MDSNavigationBarPreview() {
     MDSNavigationBar(
         modifier = Modifier,
         content = {
-            MDSNavigationBarItem(
-                selected = true,
-                labelText = "소속",
-                icon = R.drawable.ic_party,
-                onClick = {}
-            )
             MDSNavigationBarItem(
                 selected = false,
                 labelText = "장부",
diff --git a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/theme/Dimen.kt b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/theme/Dimen.kt
index 0b79d234..eab6403f 100644
--- a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/theme/Dimen.kt
+++ b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/theme/Dimen.kt
@@ -2,4 +2,4 @@ package com.moneymong.moneymong.design_system.theme
 
 import androidx.compose.ui.unit.dp
 
-val MMHorizontalSpacing = 20.dp
\ No newline at end of file
+val MMHorizontalSpacing = 16.dp
\ No newline at end of file
diff --git a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/theme/Type.kt b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/theme/Type.kt
index 6a3f5c7c..4824e2fc 100644
--- a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/theme/Type.kt
+++ b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/theme/Type.kt
@@ -16,7 +16,7 @@ private val SpoqaHanSansNeo = FontFamily(
 
 private val MMLetterSpacing = (-0.6).sp
 
-val Heading5 = TextStyle(
+val Heading6 = TextStyle(
     fontFamily = SpoqaHanSansNeo,
     fontWeight = FontWeight.Bold,
     fontSize = 28.sp,
@@ -24,7 +24,7 @@ val Heading5 = TextStyle(
     letterSpacing = MMLetterSpacing,
 )
 
-val Heading4 = TextStyle(
+val Heading5 = TextStyle(
     fontFamily = SpoqaHanSansNeo,
     fontWeight = FontWeight.Bold,
     fontSize = 24.sp,
@@ -32,23 +32,23 @@ val Heading4 = TextStyle(
     letterSpacing = MMLetterSpacing,
 )
 
-val Heading3 = TextStyle(
+val Heading4 = TextStyle(
     fontFamily = SpoqaHanSansNeo,
     fontWeight = FontWeight.Bold,
-    fontSize = 22.sp,
+    fontSize = 20.sp,
     lineHeight = 30.sp,
     letterSpacing = MMLetterSpacing,
 )
 
-val Heading2 = TextStyle(
+val Heading3 = TextStyle(
     fontFamily = SpoqaHanSansNeo,
     fontWeight = FontWeight.Bold,
-    fontSize = 20.sp,
+    fontSize = 18.sp,
     lineHeight = 28.sp,
     letterSpacing = MMLetterSpacing,
 )
 
-val Heading1 = TextStyle(
+val Heading2 = TextStyle(
     fontFamily = SpoqaHanSansNeo,
     fontWeight = FontWeight.Bold,
     fontSize = 18.sp,
@@ -56,6 +56,14 @@ val Heading1 = TextStyle(
     letterSpacing = MMLetterSpacing,
 )
 
+val Heading1 = TextStyle(
+    fontFamily = SpoqaHanSansNeo,
+    fontWeight = FontWeight.Bold,
+    fontSize = 16.sp,
+    lineHeight = 24.sp,
+    letterSpacing = MMLetterSpacing,
+)
+
 val Body5 = TextStyle(
     fontFamily = SpoqaHanSansNeo,
     fontWeight = FontWeight.Medium,
diff --git a/core/design-system/src/main/res/drawable/ic_study.xml b/core/design-system/src/main/res/drawable/ic_study.xml
new file mode 100644
index 00000000..996fd89a
--- /dev/null
+++ b/core/design-system/src/main/res/drawable/ic_study.xml
@@ -0,0 +1,66 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="32dp"
+    android:height="28dp"
+    android:viewportWidth="32"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M13.613,4.502C11.333,4.099 9,4.099 6.72,4.502L6.058,4.618C4.386,4.913 3.167,6.367 3.167,8.065V19.866C3.167,22.006 5.099,23.628 7.206,23.256C9.165,22.91 11.168,22.91 13.127,23.256L15.797,23.727C16.137,23.787 16.486,23.693 16.75,23.472C17.014,23.25 17.167,22.923 17.167,22.578V6.107C17.167,5.541 16.76,5.057 16.203,4.958L13.613,4.502Z"
+      android:fillColor="#5562FF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16,6.108V22.578L18.67,22.107C20.763,21.738 22.904,21.738 24.996,22.107C26.389,22.353 27.667,21.281 27.667,19.867V8.065C27.667,6.933 26.854,5.964 25.739,5.768L25.077,5.651C22.931,5.272 20.735,5.272 18.589,5.651L16,6.108Z"
+      android:fillColor="#CCCFFF"/>
+  <path
+      android:pathData="M24.875,6.8C22.863,6.445 20.804,6.445 18.792,6.8L17.167,7.086V21.188L18.468,20.958C20.694,20.565 22.972,20.565 25.199,20.958C25.878,21.078 26.5,20.556 26.5,19.867V8.065C26.5,7.499 26.094,7.015 25.536,6.916L24.875,6.8ZM18.387,4.502C20.667,4.099 23,4.099 25.28,4.502L25.942,4.618C27.614,4.914 28.833,6.367 28.833,8.065V19.867C28.833,22.007 26.901,23.628 24.794,23.256C22.835,22.91 20.831,22.91 18.873,23.256L16.203,23.727C15.863,23.787 15.514,23.694 15.25,23.472C14.986,23.25 14.833,22.923 14.833,22.578V6.108C14.833,5.541 15.24,5.057 15.797,4.959L18.387,4.502Z"
+      android:fillColor="#5562FF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M6.304,10.272L6.602,11.867C6.602,11.868 6.602,11.868 6.602,11.868C6.672,12.245 6.958,12.48 7.255,12.507L7.255,12.507C7.405,12.519 7.57,12.495 7.713,12.411C7.858,12.326 7.973,12.183 8.024,11.974L8.024,11.974L8.024,11.972L8.409,10.272H8.845L9.23,11.972L9.23,11.972L9.23,11.974C9.281,12.183 9.396,12.326 9.541,12.411C9.684,12.495 9.849,12.519 9.999,12.507L9.999,12.507C10.297,12.48 10.583,12.244 10.652,11.867L10.944,10.272H11.198C11.345,10.272 11.459,10.22 11.535,10.133C11.608,10.048 11.637,9.939 11.637,9.838C11.637,9.738 11.61,9.632 11.535,9.549C11.458,9.466 11.344,9.421 11.198,9.421H11.098L11.261,8.56L11.261,8.559C11.294,8.376 11.277,8.208 11.203,8.075C11.129,7.94 11.001,7.851 10.839,7.824L10.839,7.824L10.838,7.824C10.682,7.799 10.525,7.814 10.397,7.894C10.267,7.976 10.182,8.116 10.151,8.308L10.151,8.308L9.974,9.421H9.555L9.298,8.313C9.298,8.313 9.298,8.313 9.298,8.313C9.253,8.115 9.144,7.987 9.013,7.91C8.885,7.835 8.742,7.812 8.627,7.812C8.512,7.812 8.369,7.835 8.241,7.91C8.11,7.987 8.001,8.115 7.956,8.312C7.956,8.313 7.956,8.313 7.956,8.313L7.694,9.421H7.28L7.104,8.308L7.104,8.308L7.103,8.308C7.072,8.116 6.987,7.976 6.857,7.894C6.729,7.814 6.573,7.799 6.416,7.824L6.416,7.824L6.415,7.824C6.251,7.851 6.122,7.939 6.046,8.075C5.972,8.209 5.954,8.379 5.988,8.565L5.988,8.565L5.988,8.565L6.145,9.421H6.051C5.905,9.421 5.79,9.466 5.714,9.549C5.638,9.632 5.612,9.738 5.612,9.838C5.612,9.939 5.64,10.048 5.714,10.133C5.79,10.22 5.904,10.272 6.051,10.272H6.304ZM7.413,10.272H7.498L7.448,10.489L7.413,10.272ZM8.6,9.421L8.625,9.309L8.65,9.421H8.6ZM9.752,10.272H9.836L9.803,10.486L9.752,10.272Z"
+      android:strokeWidth="0.196689"
+      android:fillColor="#ffffff"
+      android:strokeColor="#ffffff"/>
+  <path
+      android:pathData="M8.679,15.659a0.825,0.66 116.648,1 0,1.18 0.592a0.825,0.66 116.648,1 0,-1.18 -0.592z"
+      android:fillColor="#FFF4EF"/>
+  <path
+      android:pathData="M13.398,18.027a0.825,0.66 116.648,1 0,1.18 0.592a0.825,0.66 116.648,1 0,-1.18 -0.592z"
+      android:fillColor="#FFF4EF"/>
+  <path
+      android:pathData="M11.554,17.287m-2.36,-1.184a2.64,2.64 71.648,1 1,4.719 2.368a2.64,2.64 71.648,1 1,-4.719 -2.368">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="12.738"
+          android:startY="14.927"
+          android:endX="10.37"
+          android:endY="19.646"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFF5F0"/>
+        <item android:offset="1" android:color="#FFFFEEE9"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M11.063,16.696a0.22,0.176 116.648,1 0,0.315 0.158a0.22,0.176 116.648,1 0,-0.315 -0.158z"
+      android:fillColor="#1F2126"/>
+  <path
+      android:pathData="M12.007,17.17a0.22,0.176 116.648,1 0,0.315 0.158a0.22,0.176 116.648,1 0,-0.315 -0.158z"
+      android:fillColor="#1F2126"/>
+  <path
+      android:pathData="M11.121,17.365V17.365C11.208,17.626 11.489,17.767 11.75,17.681V17.681"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.211202"
+      android:fillColor="#00000000"
+      android:strokeColor="#FF5473"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M10.452,17.128m-0.551,-0.276a0.616,0.616 71.648,1 1,1.101 0.553a0.616,0.616 71.648,1 1,-1.101 -0.553"
+      android:strokeAlpha="0.2"
+      android:fillColor="#FF5473"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12.34,18.075m-0.551,-0.276a0.616,0.616 71.648,1 1,1.101 0.553a0.616,0.616 71.648,1 1,-1.101 -0.553"
+      android:strokeAlpha="0.2"
+      android:fillColor="#FF5473"
+      android:fillAlpha="0.2"/>
+</vector>
diff --git a/core/design-system/src/main/res/drawable/img_empty_expense.png b/core/design-system/src/main/res/drawable/img_empty_expense.png
new file mode 100644
index 00000000..a3918afa
Binary files /dev/null and b/core/design-system/src/main/res/drawable/img_empty_expense.png differ
diff --git a/core/design-system/src/main/res/drawable/img_empty_income.png b/core/design-system/src/main/res/drawable/img_empty_income.png
new file mode 100644
index 00000000..b8ad6095
Binary files /dev/null and b/core/design-system/src/main/res/drawable/img_empty_income.png differ
diff --git a/core/design-system/src/main/res/drawable/img_empty_ledger.png b/core/design-system/src/main/res/drawable/img_empty_ledger.png
index 4cad7e7c..7125715f 100644
Binary files a/core/design-system/src/main/res/drawable/img_empty_ledger.png and b/core/design-system/src/main/res/drawable/img_empty_ledger.png differ
diff --git a/core/design-system/src/main/res/drawable/img_expenditure_empty.png b/core/design-system/src/main/res/drawable/img_expenditure_empty.png
deleted file mode 100644
index 00ed8745..00000000
Binary files a/core/design-system/src/main/res/drawable/img_expenditure_empty.png and /dev/null differ
diff --git a/core/design-system/src/main/res/drawable/img_login_mymong.png b/core/design-system/src/main/res/drawable/img_login_mymong.png
deleted file mode 100644
index db3aa1cf..00000000
Binary files a/core/design-system/src/main/res/drawable/img_login_mymong.png and /dev/null differ
diff --git a/core/design-system/src/main/res/drawable/img_login_onboarding1.png b/core/design-system/src/main/res/drawable/img_login_onboarding1.png
new file mode 100644
index 00000000..14beff34
Binary files /dev/null and b/core/design-system/src/main/res/drawable/img_login_onboarding1.png differ
diff --git a/core/design-system/src/main/res/drawable/img_login_onboarding2.png b/core/design-system/src/main/res/drawable/img_login_onboarding2.png
new file mode 100644
index 00000000..65687430
Binary files /dev/null and b/core/design-system/src/main/res/drawable/img_login_onboarding2.png differ
diff --git a/core/design-system/src/main/res/drawable/img_login_onboarding3.png b/core/design-system/src/main/res/drawable/img_login_onboarding3.png
new file mode 100644
index 00000000..9b0d4eef
Binary files /dev/null and b/core/design-system/src/main/res/drawable/img_login_onboarding3.png differ
diff --git a/core/model/src/main/java/com/moneymong/moneymong/model/agency/AgencyJoinResponse.kt b/core/model/src/main/java/com/moneymong/moneymong/model/agency/AgencyJoinResponse.kt
index c2781912..bd0887b8 100644
--- a/core/model/src/main/java/com/moneymong/moneymong/model/agency/AgencyJoinResponse.kt
+++ b/core/model/src/main/java/com/moneymong/moneymong/model/agency/AgencyJoinResponse.kt
@@ -1,5 +1,6 @@
 package com.moneymong.moneymong.model.agency
 
 data class AgencyJoinResponse(
-    val certified: Boolean
+    val agencyId: Int,
+    val certified: Boolean,
 )
\ No newline at end of file
diff --git a/core/model/src/main/java/com/moneymong/moneymong/model/ledger/LedgerTransactionRequest.kt b/core/model/src/main/java/com/moneymong/moneymong/model/ledger/LedgerTransactionRequest.kt
index 6dae55a6..7436c0a6 100644
--- a/core/model/src/main/java/com/moneymong/moneymong/model/ledger/LedgerTransactionRequest.kt
+++ b/core/model/src/main/java/com/moneymong/moneymong/model/ledger/LedgerTransactionRequest.kt
@@ -6,6 +6,5 @@ data class LedgerTransactionRequest(
     val amount: Int,
     val description: String,
     val paymentDate: String,
-    val receiptImageUrls: List<String>,
     val documentImageUrls: List<String> = emptyList()
 )
diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/api/AgencyApi.kt b/core/network/src/main/java/com/moneymong/moneymong/network/api/AgencyApi.kt
index c664b584..bda1058b 100644
--- a/core/network/src/main/java/com/moneymong/moneymong/network/api/AgencyApi.kt
+++ b/core/network/src/main/java/com/moneymong/moneymong/network/api/AgencyApi.kt
@@ -39,9 +39,8 @@ interface AgencyApi {
     ): Result<List<AgencyGetResponse>>
 
     // POST
-    @POST("/api/v1/agencies/{agencyId}/invitation-code")
+    @POST("/api/v2/agencies/invitation-code")
     suspend fun agencyCodeNumbers(
-        @Path("agencyId") agencyId: Long,
         @Body body: AgencyJoinRequest
     ): Result<AgencyJoinResponse>
 
diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/api/LedgerApi.kt b/core/network/src/main/java/com/moneymong/moneymong/network/api/LedgerApi.kt
index 625405db..61b87ff0 100644
--- a/core/network/src/main/java/com/moneymong/moneymong/network/api/LedgerApi.kt
+++ b/core/network/src/main/java/com/moneymong/moneymong/network/api/LedgerApi.kt
@@ -29,7 +29,7 @@ interface LedgerApi {
     ): Result<Boolean>
 
     // POST
-    @POST("api/v1/ledger/{id}")
+    @POST("api/v2/ledger/{id}")
     suspend fun postLedgerTransaction(
         @Path("id") id: Int,
         @Body body: LedgerTransactionRequest
diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/di/NetworkModule.kt b/core/network/src/main/java/com/moneymong/moneymong/network/di/NetworkModule.kt
index b73dc026..45466353 100644
--- a/core/network/src/main/java/com/moneymong/moneymong/network/di/NetworkModule.kt
+++ b/core/network/src/main/java/com/moneymong/moneymong/network/di/NetworkModule.kt
@@ -19,7 +19,7 @@ import com.moneymong.moneymong.network.api.UniversityApi
 import com.moneymong.moneymong.network.api.UserApi
 import com.moneymong.moneymong.network.api.VersionApi
 import com.moneymong.moneymong.network.util.AuthInterceptor
-import com.moneymong.moneymong.network.util.MoneyMongTokenAuthenticator
+import com.moneymong.moneymong.network.util.MoneyMongAuthenticator
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -47,7 +47,7 @@ object NetworkModule {
     @Provides
     fun provideOkhttpClient(
         chuckerInterceptor: ChuckerInterceptor,
-        moneymongAuthenticator: MoneyMongTokenAuthenticator,
+        moneymongAuthenticator: MoneyMongAuthenticator,
         authInterceptor: AuthInterceptor
     ): OkHttpClient {
         val okhttpLoggingClient = if (BuildConfig.DEBUG) {
diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt b/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt
index 06193943..fd35b7ed 100644
--- a/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt
+++ b/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt
@@ -13,23 +13,24 @@ class AuthInterceptor @Inject constructor(
     override fun intercept(chain: Interceptor.Chain): Response {
         val originalRequest = chain.request()
 
-        // refreshTokenApi 호출
-        if (originalRequest.url.toString() == BuildConfig.MONEYMONG_BASE_URL + "api/v1/tokens"
-            || originalRequest.url.toString() == BuildConfig.MONEYMONG_BASE_URL + "api/v1/users"
-        ) {
+        if (originalRequest.url.toString() in IGNORE_FILTER_URL) {
             return chain.proceed(originalRequest)
         }
 
-        val accessToken = runBlocking {
-            tokenRepository.getAccessToken()
-        }
-
+        val accessToken = runBlocking { tokenRepository.getAccessToken() }
         val newRequest = originalRequest.newBuilder().apply {
             accessToken.getOrNull()?.let {
                 addHeader("Authorization", "Bearer $it")
-            } ?: addHeader("Authorization", "null")
+            }
         }.build()
 
         return chain.proceed(newRequest)
     }
+
+    companion object {
+        private val IGNORE_FILTER_URL = listOf(
+            "${BuildConfig.MONEYMONG_BASE_URL}api/v1/tokens",
+            "${BuildConfig.MONEYMONG_BASE_URL}api/v1/users"
+        )
+    }
 }
diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/util/MoneyMongAuthenticator.kt b/core/network/src/main/java/com/moneymong/moneymong/network/util/MoneyMongAuthenticator.kt
new file mode 100644
index 00000000..98e0d9e9
--- /dev/null
+++ b/core/network/src/main/java/com/moneymong/moneymong/network/util/MoneyMongAuthenticator.kt
@@ -0,0 +1,82 @@
+package com.moneymong.moneymong.network.util
+
+import com.moneymong.moneymong.domain.repository.token.TokenRepository
+import com.moneymong.moneymong.model.sign.RefreshTokenResponse
+import com.moneymong.moneymong.network.BuildConfig
+import kotlinx.coroutines.runBlocking
+import okhttp3.Authenticator
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.Route
+import javax.inject.Inject
+
+class MoneyMongAuthenticator @Inject constructor(
+    private val tokenRepository: TokenRepository,
+    private val tokenCallback: TokenCallback
+) : Authenticator {
+    override fun authenticate(route: Route?, response: Response): Request? {
+        val isReIssuePath = response.request.url.toString() == REISSUE_URL
+
+        if (response.code == UNAUTHORIZED && isReIssuePath) {
+            handleReIssueFailure()
+            return null
+        }
+
+        return if (response.code == UNAUTHORIZED) {
+            reIssueAndCreateNewRequest(oldRequest = response.request)
+        } else {
+            null
+        }
+    }
+
+    private fun handleReIssueFailure() {
+        runBlocking {
+            tokenRepository.notifyTokenUpdateFailed(true)
+            tokenRepository.deleteToken()
+            tokenCallback.onTokenFailure()
+        }
+    }
+
+    private fun reIssueAndCreateNewRequest(oldRequest: Request): Request? {
+        return runBlocking {
+            try {
+                val refreshToken = tokenRepository.getRefreshToken().getOrThrow()
+                val newToken = tokenRepository.getUpdateToken(refreshToken).getOrThrow()
+                val newRequest =
+                    createNewRequest(oldRequest = oldRequest, accessToken = newToken.accessToken)
+                updateTokens(
+                    oldRefreshToken = refreshToken,
+                    newToken = newToken,
+                )
+
+                newRequest
+            } catch (e: Exception) {
+                handleReIssueFailure()
+                null
+            }
+        }
+    }
+
+    private fun createNewRequest(oldRequest: Request, accessToken: String): Request {
+        return oldRequest.newBuilder()
+            .removeHeader("Authorization")
+            .addHeader("Authorization", "Bearer $accessToken")
+            .build()
+    }
+
+    private suspend fun updateTokens(oldRefreshToken: String, newToken: RefreshTokenResponse) {
+        if (newToken.refreshToken == oldRefreshToken) {
+            tokenRepository.updateAccessToken(accessToken = newToken.accessToken)
+        } else {
+            tokenRepository.updateTokens(
+                accessToken = newToken.accessToken,
+                refreshToken = newToken.refreshToken,
+            )
+        }
+    }
+
+    companion object {
+        private const val REISSUE_URL = "${BuildConfig.MONEYMONG_BASE_URL}api/v1/tokens"
+        private const val UNAUTHORIZED = 401
+    }
+}
\ No newline at end of file
diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/util/MoneyMongTokenAuthenticator.kt b/core/network/src/main/java/com/moneymong/moneymong/network/util/MoneyMongTokenAuthenticator.kt
deleted file mode 100644
index 1a599a89..00000000
--- a/core/network/src/main/java/com/moneymong/moneymong/network/util/MoneyMongTokenAuthenticator.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.moneymong.moneymong.network.util
-
-import com.moneymong.moneymong.domain.repository.token.TokenRepository
-import com.moneymong.moneymong.network.BuildConfig
-import kotlinx.coroutines.runBlocking
-import okhttp3.Authenticator
-import okhttp3.Request
-import okhttp3.Response
-import okhttp3.Route
-import javax.inject.Inject
-
-class MoneyMongTokenAuthenticator @Inject constructor(
-    private val tokenRepository: TokenRepository,
-    private val tokenCallback: TokenCallback
-) : Authenticator {
-    override fun authenticate(route: Route?, response: Response): Request? {
-        val isPathRefresh =
-            response.request.url.toString() == BuildConfig.MONEYMONG_BASE_URL + "api/v1/tokens"
-        if (response.code == 401 && !isPathRefresh) {
-            return runBlocking {
-                var newRequest: Request? = null
-                tokenRepository.getRefreshToken().onSuccess {
-                    tokenRepository.getUpdateToken(it)
-                        .onSuccess { token ->
-                            newRequest = response.request.newBuilder().apply {
-                                removeHeader("Authorization")
-                                addHeader("Authorization", "Bearer ${token.accessToken}")
-                            }.build()
-
-                            if (token.refreshToken == it) {
-                                tokenRepository.updateAccessToken(token.accessToken)
-                            } else {
-                                tokenRepository.updateTokens(
-                                    token.accessToken,
-                                    token.refreshToken
-                                )
-                            }
-                        }
-                        .onFailure {
-                            tokenRepository.notifyTokenUpdateFailed(true)
-                        }
-                }.onFailure {
-                    tokenRepository.notifyTokenUpdateFailed(true)
-                }
-                newRequest
-            }
-        } else {
-            //로컬에 저장된 데이터 제거
-            // RefreshToken도 만료되어 로그인화면으로 이동 .
-            runBlocking {
-                tokenRepository.notifyTokenUpdateFailed(true)
-                tokenRepository.deleteToken()
-                tokenCallback.onTokenFailure()
-            }
-        }
-
-        return null
-    }
-}
\ No newline at end of file
diff --git a/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSource.kt b/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSource.kt
index 10832478..3bd7fe51 100644
--- a/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSource.kt
+++ b/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSource.kt
@@ -13,5 +13,5 @@ interface AgencyRemoteDataSource {
     suspend fun getAgencies(page: Int, size: Int): Result<AgenciesGetResponse>
     suspend fun fetchMyAgencyList(): Result<List<MyAgencyResponse>>
     suspend fun fetchAgencyByName(agencyName: String): Result<List<AgencyGetResponse>>
-    suspend fun agencyCodeNumbers(agencyId : Long, data: AgencyJoinRequest) : Result<AgencyJoinResponse>
+    suspend fun agencyCodeNumbers(data: AgencyJoinRequest): Result<AgencyJoinResponse>
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSourceImpl.kt b/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSourceImpl.kt
index 6643d480..2495a6d4 100644
--- a/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSourceImpl.kt
+++ b/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSourceImpl.kt
@@ -31,12 +31,8 @@ class AgencyRemoteDataSourceImpl @Inject constructor(
     }
 
     override suspend fun agencyCodeNumbers(
-        agencyId: Long,
         data: AgencyJoinRequest
     ): Result<AgencyJoinResponse> {
-        return agencyApi.agencyCodeNumbers(
-            agencyId = agencyId,
-            body = data
-        )
+        return agencyApi.agencyCodeNumbers(body = data)
     }
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSourceMock.kt b/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSourceMock.kt
index 1c14125b..2aceeedd 100644
--- a/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSourceMock.kt
+++ b/data/src/main/java/com/moneymong/moneymong/data/datasource/agency/AgencyRemoteDataSourceMock.kt
@@ -29,13 +29,10 @@ class AgencyRemoteDataSourceMock : AgencyRemoteDataSource {
     }
 
     override suspend fun agencyCodeNumbers(
-        agencyId: Long,
         data: AgencyJoinRequest
     ): Result<AgencyJoinResponse> {
         return Result.success(
-            AgencyJoinResponse(
-                certified = true,
-            )
+            AgencyJoinResponse(agencyId = Int.MAX_VALUE, certified = true)
         )
     }
 
diff --git a/data/src/main/java/com/moneymong/moneymong/data/datasource/login/LoginLocalDataSource.kt b/data/src/main/java/com/moneymong/moneymong/data/datasource/login/LoginLocalDataSource.kt
index 33410314..c33c074b 100644
--- a/data/src/main/java/com/moneymong/moneymong/data/datasource/login/LoginLocalDataSource.kt
+++ b/data/src/main/java/com/moneymong/moneymong/data/datasource/login/LoginLocalDataSource.kt
@@ -7,9 +7,9 @@ interface LoginLocalDataSource {
     suspend fun getAccessToken(): Result<String>
     suspend fun getDataStoreInfo(): Result<UserDataStoreInfoResponse>
     suspend fun deleteToken()
-    suspend fun setDataStore(aToken: String, rToken: String, success: Boolean, infoExist: Boolean)
-    suspend fun updateTokens(aToken: String, rToken: String)
-    suspend fun updateAccessToken(aToken: String)
+    suspend fun setDataStore(accessToken: String, refreshToken: String, success: Boolean, infoExist: Boolean)
+    suspend fun updateTokens(accessToken: String, refreshToken: String)
+    suspend fun updateAccessToken(accessToken: String)
     suspend fun getSchoolInfo(): Result<Boolean>
     suspend fun setSchoolInfoProvided(infoExist: Boolean)
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moneymong/moneymong/data/datasource/login/LoginLocalDataSourceImpl.kt b/data/src/main/java/com/moneymong/moneymong/data/datasource/login/LoginLocalDataSourceImpl.kt
index 7cf33267..27b5a7cb 100644
--- a/data/src/main/java/com/moneymong/moneymong/data/datasource/login/LoginLocalDataSourceImpl.kt
+++ b/data/src/main/java/com/moneymong/moneymong/data/datasource/login/LoginLocalDataSourceImpl.kt
@@ -1,7 +1,6 @@
 package com.moneymong.moneymong.data.datasource.login
 
 import android.content.Context
-import android.util.Log
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
@@ -16,73 +15,73 @@ val Context.dataStore by preferencesDataStore(name = "jwt")
 class LoginLocalDataSourceImpl @Inject constructor(
     @ApplicationContext private val context: Context,
 ) : LoginLocalDataSource {
-    private val accessToken = stringPreferencesKey("ACCESS_TOKEN")
-    private val refreshToken = stringPreferencesKey("REFRESH_TOKEN")
-    private val loginSuccess = booleanPreferencesKey("LOGIN_SUCCESS")
-    private val schoolInfoProvided = booleanPreferencesKey("SCHOOL_INFO_PROVIDED")
+    private val accessTokenKey = stringPreferencesKey("ACCESS_TOKEN")
+    private val refreshTokenKey = stringPreferencesKey("REFRESH_TOKEN")
+    private val loginSuccessKey = booleanPreferencesKey("LOGIN_SUCCESS")
+    private val schoolInfoProvidedKey = booleanPreferencesKey("SCHOOL_INFO_PROVIDED")
 
     override suspend fun getRefreshToken(): Result<String> {
         val preferences = context.dataStore.data.first()
-        return preferences[refreshToken]?.let { Result.success(it) }
+        return preferences[refreshTokenKey]?.let { Result.success(it) }
             ?: Result.failure(Exception("refreshToken is null"))
     }
 
     override suspend fun getAccessToken(): Result<String> {
         val preferences = context.dataStore.data.first()
-        return preferences[accessToken]?.let { Result.success(it) }
+        return preferences[accessTokenKey]?.let { Result.success(it) }
             ?: Result.failure(Exception("accessToken is null"))
     }
 
     override suspend fun getDataStoreInfo(): Result<UserDataStoreInfoResponse> {
         val preferences = context.dataStore.data.first()
-        return Result.success(UserDataStoreInfoResponse(preferences[accessToken] ?: "",preferences[schoolInfoProvided] ?: false))
+        return Result.success(UserDataStoreInfoResponse(preferences[accessTokenKey] ?: "",preferences[schoolInfoProvidedKey] ?: false))
     }
 
-    override suspend fun updateTokens(aToken: String, rToken: String) {
+    override suspend fun updateTokens(accessToken: String, refreshToken: String) {
         context.dataStore.edit { preferences ->
-            preferences[accessToken] = aToken
-            preferences[refreshToken] = rToken
+            preferences[accessTokenKey] = accessToken
+            preferences[refreshTokenKey] = refreshToken
         }
     }
 
-    override suspend fun updateAccessToken(aToken: String) {
+    override suspend fun updateAccessToken(accessToken: String) {
         context.dataStore.edit { preferences ->
-            preferences[accessToken] = aToken
+            preferences[accessTokenKey] = accessToken
         }
     }
 
     override suspend fun getSchoolInfo(): Result<Boolean> {
         val preferences = context.dataStore.data.first()
-        return preferences[schoolInfoProvided]?.let { Result.success(it) }
+        return preferences[schoolInfoProvidedKey]?.let { Result.success(it) }
             ?: Result.failure(Exception("schoolInfoProvided is null"))
     }
 
     override suspend fun deleteToken() {
         context.dataStore.edit { preferences ->
-            preferences.remove(accessToken)
-            preferences.remove(refreshToken)
-            preferences.remove(loginSuccess)
-            preferences.remove(schoolInfoProvided)
+            preferences.remove(accessTokenKey)
+            preferences.remove(refreshTokenKey)
+            preferences.remove(loginSuccessKey)
+            preferences.remove(schoolInfoProvidedKey)
         }
     }
 
     override suspend fun setDataStore(
-        aToken: String,
-        rToken: String,
+        accessToken: String,
+        refreshToken: String,
         success: Boolean,
         infoExist: Boolean
     ) {
         context.dataStore.edit { preferences ->
-            preferences[accessToken] = aToken
-            preferences[refreshToken] = rToken
-            preferences[loginSuccess] = success
-            preferences[schoolInfoProvided] = infoExist
+            preferences[accessTokenKey] = accessToken
+            preferences[refreshTokenKey] = refreshToken
+            preferences[loginSuccessKey] = success
+            preferences[schoolInfoProvidedKey] = infoExist
         }
     }
 
     override suspend fun setSchoolInfoProvided(infoExist: Boolean) {
         context.dataStore.edit { preferences ->
-            preferences[schoolInfoProvided] = infoExist
+            preferences[schoolInfoProvidedKey] = infoExist
         }
 
     }
diff --git a/data/src/main/java/com/moneymong/moneymong/data/repository/agency/AgencyRepositoryImpl.kt b/data/src/main/java/com/moneymong/moneymong/data/repository/agency/AgencyRepositoryImpl.kt
index 3d8445a3..459a807c 100644
--- a/data/src/main/java/com/moneymong/moneymong/data/repository/agency/AgencyRepositoryImpl.kt
+++ b/data/src/main/java/com/moneymong/moneymong/data/repository/agency/AgencyRepositoryImpl.kt
@@ -39,10 +39,9 @@ class AgencyRepositoryImpl @Inject constructor(
         agencyRemoteDataSource.fetchAgencyByName(agencyName)
 
     override suspend fun agencyCodeNumbers(
-        agencyId: Long,
         data: AgencyJoinRequest
     ): Result<AgencyJoinResponse> {
-        return agencyRemoteDataSource.agencyCodeNumbers(agencyId, data)
+        return agencyRemoteDataSource.agencyCodeNumbers(data)
     }
 
     override suspend fun saveAgencyId(agencyId: Int) =
diff --git a/data/src/main/java/com/moneymong/moneymong/data/repository/token/TokenRepositoryImpl.kt b/data/src/main/java/com/moneymong/moneymong/data/repository/token/TokenRepositoryImpl.kt
index a6784c7c..f4f00823 100644
--- a/data/src/main/java/com/moneymong/moneymong/data/repository/token/TokenRepositoryImpl.kt
+++ b/data/src/main/java/com/moneymong/moneymong/data/repository/token/TokenRepositoryImpl.kt
@@ -56,12 +56,12 @@ class TokenRepositoryImpl @Inject constructor(
         loginLocalDataSource.deleteToken()
     }
 
-    override suspend fun updateTokens(aToken: String, rToken: String) {
-        loginLocalDataSource.updateTokens(aToken, rToken)
+    override suspend fun updateTokens(accessToken: String, refreshToken: String) {
+        loginLocalDataSource.updateTokens(accessToken, refreshToken)
     }
 
-    override suspend fun updateAccessToken(aToken: String) {
-        loginLocalDataSource.updateAccessToken(aToken)
+    override suspend fun updateAccessToken(accessToken: String) {
+        loginLocalDataSource.updateAccessToken(accessToken)
     }
 
     override suspend fun deleteRefreshToken(body: RefreshTokenRequest) {
diff --git a/domain/src/main/java/com/moneymong/moneymong/domain/repository/agency/AgencyRepository.kt b/domain/src/main/java/com/moneymong/moneymong/domain/repository/agency/AgencyRepository.kt
index a8cabcc1..94762027 100644
--- a/domain/src/main/java/com/moneymong/moneymong/domain/repository/agency/AgencyRepository.kt
+++ b/domain/src/main/java/com/moneymong/moneymong/domain/repository/agency/AgencyRepository.kt
@@ -14,7 +14,7 @@ interface AgencyRepository {
     fun getAgencies(): Flow<PagingData<AgencyGetResponse>>
     suspend fun fetchMyAgencyList(): Result<List<MyAgencyResponse>>
     suspend fun fetchAgencyByName(agencyName: String): Result<List<AgencyGetResponse>>
-    suspend fun agencyCodeNumbers(agencyId: Long, data: AgencyJoinRequest): Result<AgencyJoinResponse>
+    suspend fun agencyCodeNumbers(data: AgencyJoinRequest): Result<AgencyJoinResponse>
 
     suspend fun saveAgencyId(agencyId: Int)
     suspend fun fetchAgencyId(): Int
diff --git a/domain/src/main/java/com/moneymong/moneymong/domain/repository/token/TokenRepository.kt b/domain/src/main/java/com/moneymong/moneymong/domain/repository/token/TokenRepository.kt
index 2dec49e2..575ae2e1 100644
--- a/domain/src/main/java/com/moneymong/moneymong/domain/repository/token/TokenRepository.kt
+++ b/domain/src/main/java/com/moneymong/moneymong/domain/repository/token/TokenRepository.kt
@@ -16,8 +16,8 @@ interface TokenRepository {
     suspend fun getDataStoreInfo(): Result<UserDataStoreInfoResponse>
     suspend fun getUpdateToken(refreshToken: String): Result<RefreshTokenResponse>
     suspend fun deleteToken()
-    suspend fun updateTokens(aToken: String, rToken: String)
-    suspend fun updateAccessToken(aToken: String)
+    suspend fun updateTokens(accessToken: String, refreshToken: String)
+    suspend fun updateAccessToken(accessToken: String)
     suspend fun deleteRefreshToken(body: RefreshTokenRequest)
     suspend fun getSchoolInfo(): Result<Boolean>
     suspend fun setSchoolInfoProvided(infoExist: Boolean)
diff --git a/domain/src/main/java/com/moneymong/moneymong/domain/usecase/agency/AgencyJoinUseCase.kt b/domain/src/main/java/com/moneymong/moneymong/domain/usecase/agency/AgencyJoinUseCase.kt
index 3fab295c..6dd7b3c4 100644
--- a/domain/src/main/java/com/moneymong/moneymong/domain/usecase/agency/AgencyJoinUseCase.kt
+++ b/domain/src/main/java/com/moneymong/moneymong/domain/usecase/agency/AgencyJoinUseCase.kt
@@ -9,9 +9,8 @@ class AgencyJoinUseCase @Inject constructor(
     private val agencyRepository: AgencyRepository
 ) {
     suspend operator fun invoke(
-        agencyId: Long,
         data: AgencyJoinRequest
     ): Result<AgencyJoinResponse> {
-        return agencyRepository.agencyCodeNumbers(agencyId, data)
+        return agencyRepository.agencyCodeNumbers(data)
     }
 }
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f3fe70e2..d2684a56 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -77,20 +77,15 @@ platform :android do
 
   desc "Deploy a new version to the Firebase Distribution"
   lane :distribute do
-    latest_release = firebase_app_distribution_get_latest_release(
-         service_credentials_file: "#{ENV["FIREBASE_CREDENTIALS"]}",
-         app: "#{ENV["APP_ID"]}"
-    )
+    gradle_file = File.read("../app/build.gradle.kts")
+    version_code_match = gradle_file.match(/versionCode\s*=\s*(\d+)/)
+    version_code = version_code_match[1]
+
     version_name = get_version_name(
          gradle_file_path:"./app/build.gradle.kts",
          ext_constant_name:"versionName"
     )
-    new_version_code = latest_release[:buildVersion].to_i + 1
-    release_note = "머니몽 Android TB [#{version_name} (#{new_version_code})]"
-
-    increment_code(
-            new_version_code: new_version_code
-    )
+    release_note = "머니몽 Android TB [#{version_name} (#{version_code})]"
 
     gradle(
         task: 'assemble',
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinScreen.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinScreen.kt
index 0c49ab0a..ccdab9fd 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinScreen.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinScreen.kt
@@ -46,7 +46,6 @@ fun AgencyJoinScreen(
     viewModel: AgencyJoinViewModel = hiltViewModel(),
     navigateToComplete: () -> Unit,
     navigateUp: () -> Unit,
-    agencyId: Long
 ) {
     val state = viewModel.collectAsState().value
 
@@ -79,7 +78,6 @@ fun AgencyJoinScreen(
         content = { innerPadding ->
             JoinContent(
                 modifier = Modifier.padding(innerPadding),
-                agencyId = agencyId,
                 state = state,
                 viewModel = viewModel,
                 navigateToComplete = navigateToComplete,
@@ -92,7 +90,6 @@ fun AgencyJoinScreen(
 @Composable
 private fun JoinContent(
     modifier: Modifier = Modifier,
-    agencyId: Long,
     state: AgencyJoinState,
     viewModel: AgencyJoinViewModel,
     navigateToComplete: () -> Unit,
@@ -117,7 +114,7 @@ private fun JoinContent(
     LaunchedEffect(key1 = state.isError) {
         if (state.isError) {
             val result = snackbarHostState.showSnackbar(
-                message = "잘못된 초대코드입니다.",
+                message = state.snackBarMessage,
                 actionLabel = "다시입력"
             )
 
@@ -147,7 +144,7 @@ private fun JoinContent(
     ) {
         Text(
             modifier = Modifier.fillMaxWidth(),
-            text = "Yapp에서 받은\n초대코드를 입력해주세요",
+            text = "초대코드를 입력해주세요",
             color = Gray10,
             style = Heading3
         )
@@ -164,7 +161,7 @@ private fun JoinContent(
                 inputCode = state.inputCode,
                 onValueChanged = viewModel::changeInputNumber,
                 checkInviteCode = {
-                    viewModel.checkInviteCode(agencyId = agencyId)
+                    viewModel.findLedgerByInviteCode()
                     focusManager.clearFocus()
                 },
             )
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinState.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinState.kt
index 16f0d284..4a1486cf 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinState.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinState.kt
@@ -4,6 +4,7 @@ import com.moneymong.moneymong.common.base.State
 
 data class AgencyJoinState(
     val isError: Boolean = false,
+    val snackBarMessage: String = "",
     val inputCode: String = "",
     val codeAccess: Boolean = false,
     val visiblePopUpError: Boolean = false,
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinViewModel.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinViewModel.kt
index 5a687b77..cf406852 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinViewModel.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinViewModel.kt
@@ -19,31 +19,24 @@ class AgencyJoinViewModel @Inject constructor(
     private val saveAgencyIdUseCase: SaveAgencyIdUseCase
 ) : BaseViewModel<AgencyJoinState, AgencyJoinSideEffect>(AgencyJoinState()) {
 
-    fun checkInviteCode(agencyId: Long) = intent {
+    fun findLedgerByInviteCode() = intent {
         viewModelScope.launch {
-            agencyJoinUseCase(agencyId = agencyId, data = AgencyJoinRequest(state.inputCode))
-                .onSuccess {
-                    if (it.certified) {
-                        saveAgencyIdUseCase(agencyId.toInt())
-                        reduce {
-                            state.copy(
-                                isError = false,
-                                codeAccess = true
-                            )
-                        }
-                    } else {
-                        reduce {
-                            state.copy(
-                                isError = true
-                            )
-                        }
+            agencyJoinUseCase(data = AgencyJoinRequest(state.inputCode))
+                .onSuccess { response ->
+                    reduce {
+                        state.copy(
+                            isError = response.certified.not(),
+                            codeAccess = response.certified
+                        )
                     }
-                }
-                .onFailure {
+                    if (response.certified) {
+                        saveAgencyIdUseCase(agencyId = response.agencyId)
+                    }
+                }.onFailure { exception ->
                     reduce {
                         state.copy(
-                            visiblePopUpError = true,
-                            errorPopUpMessage = it.message.toString()
+                            isError = true,
+                            snackBarMessage = exception.message ?: "잘못된 초대코드입니다."
                         )
                     }
                 }
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/component/AgencyCompleteView.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/component/AgencyCompleteView.kt
index afbf4e46..bdb04033 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/component/AgencyCompleteView.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/component/AgencyCompleteView.kt
@@ -41,7 +41,7 @@ fun AgencyCompleteView(modifier: Modifier = Modifier) {
                 .fillMaxWidth()
                 .background(White)
                 .padding(top = 12.dp),
-            text = "가입을 축하합니다!",
+            text = "초대가 완료됐습니다",
             style = Heading1,
             color = Gray10,
             textAlign = TextAlign.Center
@@ -52,7 +52,7 @@ fun AgencyCompleteView(modifier: Modifier = Modifier) {
                 .fillMaxWidth()
                 .background(White)
                 .padding(top = 4.dp),
-            text = "이제 동아리 가계부를 확인할 수 있어요",
+            text = "초대 받은 장부를 확인할 수 있어요",
             style = Body4,
             color = Gray07,
             textAlign = TextAlign.Center
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/navigation/AgencyJoinNavigation.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/navigation/AgencyJoinNavigation.kt
index 7393216e..8cd81de5 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/navigation/AgencyJoinNavigation.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/navigation/AgencyJoinNavigation.kt
@@ -3,37 +3,23 @@ package com.moneymong.moneymong.feature.agency.join.navigation
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
-import androidx.navigation.NavType
 import androidx.navigation.compose.composable
-import androidx.navigation.navArgument
 import com.moneymong.moneymong.feature.agency.join.AgencyJoinScreen
 
-const val agencyIdArg = "agencyId"
 const val agencyJoinRoute = "agencyJoin_route"
-const val routeWithArgs = "${agencyJoinRoute}/{${agencyIdArg}}"
 
-private val arguments = listOf(
-    navArgument(agencyIdArg) {
-        type = NavType.LongType
-    }
-)
-
-fun NavController.navigateAgencyJoin(agencyId: Long, navOptions: NavOptions? = null) {
-    navigate("${agencyJoinRoute}/$agencyId", navOptions)
+fun NavController.navigateAgencyJoin(navOptions: NavOptions? = null) {
+    navigate(agencyJoinRoute, navOptions)
 }
 
 fun NavGraphBuilder.agencyJoinScreen(
     navigateToComplete: () -> Unit,
     navigateUp: () -> Unit,
 ) {
-    composable(
-        route = routeWithArgs,
-        arguments = arguments
-    ) {
+    composable(route = agencyJoinRoute) {
         AgencyJoinScreen(
             navigateToComplete = navigateToComplete,
             navigateUp = navigateUp,
-            agencyId = it.arguments?.getLong(agencyIdArg) ?: 0
         )
     }
 }
\ No newline at end of file
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyNavigation.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyNavigation.kt
index b8e29e87..740c4dc9 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyNavigation.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyNavigation.kt
@@ -19,7 +19,7 @@ fun NavController.navigateAgency(
 
 fun NavGraphBuilder.agencyScreen(
     padding: PaddingValues,
-    navigateToRegister: (isUniversityStudent: Boolean) -> Unit,
+    navigateToRegister: () -> Unit,
     navigateAgencyJoin: (agencyId: Long) -> Unit
 ) {
     composable(route = agencyRoute) {
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyRegisterNavigation.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyRegisterNavigation.kt
index 36edc7b2..535a7feb 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyRegisterNavigation.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyRegisterNavigation.kt
@@ -3,42 +3,23 @@ package com.moneymong.moneymong.feature.agency.navigation
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
-import androidx.navigation.NavType
 import androidx.navigation.compose.composable
-import androidx.navigation.navArgument
 import com.moneymong.moneymong.feature.agency.register.AgencyRegisterScreen
 
 const val agencyRegisterRoute = "agencyRegister_route"
-const val IS_UNIVERSITY_STUDENT = "isUniversityStudent"
-const val agencyRegisterRouteWithArgs = "${agencyRegisterRoute}/{${IS_UNIVERSITY_STUDENT}}"
-
-private val arguments = listOf(
-    navArgument(IS_UNIVERSITY_STUDENT) {
-        type = NavType.BoolType
-        defaultValue = false
-    }
-)
 
 fun NavController.navigateAgencyRegister(
-    isUniversityStudent: Boolean,
     navOptions: NavOptions? = null
 ) {
-    navigate("${agencyRegisterRoute}/${isUniversityStudent}", navOptions)
+    navigate(agencyRegisterRoute, navOptions)
 }
 
 fun NavGraphBuilder.agencyRegisterScreen(
-    navigateToComplete: () -> Unit,
-    navigateUp: () -> Unit
+    navigateToLedger: () -> Unit
 ) {
     composable(
-        route = agencyRegisterRouteWithArgs,
-        arguments = arguments
-    ) { backStackEntry ->
-        AgencyRegisterScreen(
-            navigateToComplete = navigateToComplete,
-            navigateUp = navigateUp,
-            registrableClubOrCouncil = backStackEntry.arguments?.getBoolean(IS_UNIVERSITY_STUDENT)
-                ?: false
-        )
+        route = agencyRegisterRoute,
+    ) {
+        AgencyRegisterScreen(navigateToLedger = navigateToLedger,)
     }
 }
\ No newline at end of file
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterScreen.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterScreen.kt
index 8e4a3fda..c575a041 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterScreen.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterScreen.kt
@@ -9,9 +9,8 @@ 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.material.Icon
+import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -35,7 +34,6 @@ import com.moneymong.moneymong.design_system.theme.Gray07
 import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
 import com.moneymong.moneymong.design_system.theme.White
 import com.moneymong.moneymong.feature.agency.register.view.AgencyResisterContentView
-import com.moneymong.moneymong.feature.agency.search.AgencyType
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
@@ -43,9 +41,7 @@ import org.orbitmvi.orbit.compose.collectSideEffect
 fun AgencyRegisterScreen(
     modifier: Modifier = Modifier,
     viewModel: AgencyRegisterViewModel = hiltViewModel(),
-    navigateToComplete: () -> Unit,
-    navigateUp: () -> Unit,
-    registrableClubOrCouncil: Boolean
+    navigateToLedger: () -> Unit,
 ) {
     val state by viewModel.collectAsState()
     val focusManager = LocalFocusManager.current
@@ -53,19 +49,10 @@ fun AgencyRegisterScreen(
 
     viewModel.collectSideEffect {
         when (it) {
-            is AgencyRegisterSideEffect.NavigateToComplete -> {
-                navigateToComplete()
+            is AgencyRegisterSideEffect.NavigateToLedger -> {
+                focusManager.clearFocus()
+                navigateToLedger()
             }
-
-            is AgencyRegisterSideEffect.NavigateUp -> {
-                navigateUp()
-            }
-        }
-    }
-
-    LaunchedEffect(key1 = registrableClubOrCouncil) {
-        if (registrableClubOrCouncil.not()) {
-            viewModel.changeAgencyType(AgencyType.GENERAL)
         }
     }
 
@@ -77,7 +64,7 @@ fun AgencyRegisterScreen(
             negativeBtnText = "취소",
             positiveBtnText = "확인",
             onClickNegative = { viewModel.changeOutDialogVisibility(false) },
-            onClickPositive = viewModel::navigateUp
+            onClickPositive = viewModel::navigateToLedger
         )
     }
 
@@ -95,48 +82,49 @@ fun AgencyRegisterScreen(
             .pointerInput(key1 = Unit) {
                 detectTapGestures(onTap = { focusManager.clearFocus() })
             }
-            .padding(horizontal = MMHorizontalSpacing)
     ) {
-        Icon(
+        Column(
             modifier = Modifier
-                .align(Alignment.End)
-                .padding(vertical = 10.dp)
-                .size(24.dp)
-                .noRippleClickable(onClick = { viewModel.changeOutDialogVisibility(true) }),
-            painter = painterResource(id = R.drawable.ic_close_default),
-            tint = Gray07,
-            contentDescription = null
-        )
-        Spacer(modifier = Modifier.height(8.dp))
+                .fillMaxWidth()
+                .weight(1f)
+                .padding(horizontal = MMHorizontalSpacing)
+        ) {
+            Icon(
+                modifier = Modifier
+                    .align(Alignment.End)
+                    .padding(vertical = 10.dp)
+                    .size(24.dp)
+                    .noRippleClickable(onClick = { viewModel.changeOutDialogVisibility(true) }),
+                painter = painterResource(id = R.drawable.ic_close_default),
+                tint = Gray07,
+                contentDescription = null
+            )
+            Spacer(modifier = Modifier.height(8.dp))
 
-        var contentHeight by remember { mutableStateOf(0.dp) }
-        val contentModifier = if (contentHeight == 0.dp) Modifier.weight(1f) else Modifier
-        AgencyResisterContentView(
-            modifier = contentModifier
-                .onSizeChanged {
-                    if (contentHeight == 0.dp) {
-                        with(density) {
-                            contentHeight = it.height.toDp()
+            var contentHeight by remember { mutableStateOf(0.dp) }
+            val contentModifier = if (contentHeight == 0.dp) Modifier.weight(1f) else Modifier
+            AgencyResisterContentView(
+                modifier = contentModifier
+                    .onSizeChanged {
+                        if (contentHeight == 0.dp) {
+                            with(density) {
+                                contentHeight = it.height.toDp()
+                            }
                         }
                     }
-                }
-                .height(contentHeight),
-            agencyType = state.agencyType,
-            onAgencyTypeChange = viewModel::changeAgencyType,
-            agencyName = state.agencyName,
-            onAgencyNameChange = viewModel::changeAgencyName,
-            changeNameTextFieldIsError = viewModel::changeNameTextFieldIsError,
-            registrableClubOrCouncil = registrableClubOrCouncil
-        )
-
+                    .height(contentHeight),
+                agencyName = state.agencyName,
+                onAgencyNameChange = viewModel::changeAgencyName,
+                changeNameTextFieldIsError = viewModel::changeNameTextFieldIsError,
+            )
+        }
         val canRegister = state.agencyName.text.isNotEmpty() && state.nameTextFieldIsError.not()
         MDSButton(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(bottom = 28.dp),
+            modifier = Modifier.fillMaxWidth(),
             onClick = viewModel::registerAgency,
             text = "등록하기",
-            enabled = canRegister
+            enabled = canRegister,
+            cornerShape = 0.dp
         )
     }
 }
@@ -146,8 +134,6 @@ fun AgencyRegisterScreen(
 @Composable
 fun AgencyRegisterScreenPreview() {
     AgencyRegisterScreen(
-        navigateToComplete = {},
-        navigateUp = {},
-        registrableClubOrCouncil = false
+        navigateToLedger = {},
     )
 }
\ No newline at end of file
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterSideEffect.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterSideEffect.kt
index af6509bc..99b1b3b1 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterSideEffect.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterSideEffect.kt
@@ -3,6 +3,5 @@ package com.moneymong.moneymong.feature.agency.register
 import com.moneymong.moneymong.common.base.SideEffect
 
 sealed interface AgencyRegisterSideEffect : SideEffect {
-    data object NavigateToComplete : AgencyRegisterSideEffect
-    data object NavigateUp : AgencyRegisterSideEffect
+    data object NavigateToLedger : AgencyRegisterSideEffect
 }
\ No newline at end of file
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterViewModel.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterViewModel.kt
index d1135772..fcc3b09c 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterViewModel.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterViewModel.kt
@@ -5,7 +5,6 @@ import com.moneymong.moneymong.common.base.BaseViewModel
 import com.moneymong.moneymong.common.error.MoneyMongError
 import com.moneymong.moneymong.domain.usecase.agency.RegisterAgencyUseCase
 import com.moneymong.moneymong.domain.usecase.agency.SaveAgencyIdUseCase
-import com.moneymong.moneymong.feature.agency.search.AgencyType
 import com.moneymong.moneymong.model.agency.AgencyRegisterRequest
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.orbitmvi.orbit.annotation.OrbitExperimental
@@ -21,7 +20,7 @@ class AgencyRegisterViewModel @Inject constructor(
     private val saveAgencyIdUseCase: SaveAgencyIdUseCase
 ) : BaseViewModel<AgencyRegisterState, AgencyRegisterSideEffect>(AgencyRegisterState()) {
 
-    fun navigateUp() = eventEmit(sideEffect = AgencyRegisterSideEffect.NavigateUp)
+    fun navigateToLedger() = eventEmit(sideEffect = AgencyRegisterSideEffect.NavigateToLedger)
 
     fun registerAgency() = intent {
         registerAgencyUseCase(
@@ -31,7 +30,7 @@ class AgencyRegisterViewModel @Inject constructor(
             )
         ).onSuccess {
             saveAgencyIdUseCase(it.id)
-            postSideEffect(AgencyRegisterSideEffect.NavigateToComplete)
+            postSideEffect(AgencyRegisterSideEffect.NavigateToLedger)
         }.onFailure {
             reduce {
                 state.copy(
@@ -51,14 +50,6 @@ class AgencyRegisterViewModel @Inject constructor(
         }
     }
 
-    fun changeAgencyType(agencyType: AgencyType) = intent {
-        reduce {
-            state.copy(
-                agencyType = agencyType
-            )
-        }
-    }
-
     fun changeNameTextFieldIsError(isError: Boolean) = intent {
         reduce {
             state.copy(
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/view/AgencyRegisterContentView.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/view/AgencyRegisterContentView.kt
index ef9dce22..dd770151 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/view/AgencyRegisterContentView.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/view/AgencyRegisterContentView.kt
@@ -1,13 +1,11 @@
 package com.moneymong.moneymong.feature.agency.register.view
 
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
@@ -22,34 +20,24 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.moneymong.moneymong.design_system.component.selection.MDSSelection
 import com.moneymong.moneymong.design_system.component.textfield.MDSTextField
 import com.moneymong.moneymong.design_system.component.textfield.util.MDSTextFieldIcons
-import com.moneymong.moneymong.design_system.theme.Body2
-import com.moneymong.moneymong.design_system.theme.Gray06
+import com.moneymong.moneymong.design_system.component.textfield.util.withRequiredMark
+import com.moneymong.moneymong.design_system.theme.Body3
+import com.moneymong.moneymong.design_system.theme.Gray05
 import com.moneymong.moneymong.design_system.theme.Gray10
-import com.moneymong.moneymong.design_system.theme.Heading2
-import com.moneymong.moneymong.feature.agency.search.AgencyType
+import com.moneymong.moneymong.design_system.theme.Heading5
 
 @Composable
 internal fun AgencyResisterContentView(
     modifier: Modifier = Modifier,
-    agencyType: AgencyType?,
-    onAgencyTypeChange: (AgencyType) -> Unit,
     agencyName: TextFieldValue,
     onAgencyNameChange: (TextFieldValue) -> Unit,
     changeNameTextFieldIsError: (Boolean) -> Unit,
-    registrableClubOrCouncil: Boolean
 ) {
     Column(modifier = modifier) {
         TitleView()
-        Spacer(modifier = Modifier.height(44.dp))
-        SelectTypeView(
-            agencyType = agencyType,
-            onAgencyTypeChange = onAgencyTypeChange,
-            registrableClubOrCouncil = registrableClubOrCouncil
-        )
-        Spacer(modifier = Modifier.height(24.dp))
+        Spacer(modifier = Modifier.height(28.dp))
         InputNameView(
             agencyName = agencyName,
             onAgencyNameChange = onAgencyNameChange,
@@ -62,54 +50,19 @@ internal fun AgencyResisterContentView(
 @Composable
 private fun TitleView() {
     Text(
-        text = "회비 관리가 필요한\n소속 정보를 알려주세요!",
+        text = "장부 생성하기",
         color = Gray10,
-        style = Heading2
+        style = Heading5
     )
+    Spacer(modifier = Modifier.height(4.dp))
+    Text(
+        text = "사용할 장부는 언제든지 추가로 만들 수 있어요",
+        color = Gray05,
+        style = Body3
+    )
+    Spacer(modifier = Modifier.height(16.dp))
 }
 
-
-@Composable
-private fun SelectTypeView(
-    agencyType: AgencyType?,
-    onAgencyTypeChange: (AgencyType) -> Unit,
-    registrableClubOrCouncil: Boolean
-) {
-    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-        Text(
-            text = "소속 유형",
-            color = Gray06,
-            style = Body2
-        )
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy(10.dp)
-        ) {
-            MDSSelection(
-                modifier = Modifier.weight(1f),
-                text = AgencyType.CLUB.text,
-                enabled = registrableClubOrCouncil,
-                isSelected = agencyType == AgencyType.CLUB,
-                onClick = { onAgencyTypeChange(AgencyType.CLUB) }
-            )
-            MDSSelection(
-                modifier = Modifier.weight(1f),
-                text = AgencyType.COUNCIL.text,
-                enabled = registrableClubOrCouncil,
-                isSelected = agencyType == AgencyType.COUNCIL,
-                onClick = { onAgencyTypeChange(AgencyType.COUNCIL) }
-            )
-            MDSSelection(
-                modifier = Modifier.weight(1f),
-                text = AgencyType.GENERAL.text,
-                isSelected = agencyType == AgencyType.GENERAL || registrableClubOrCouncil.not(),
-                onClick = { onAgencyTypeChange(AgencyType.GENERAL) }
-            )
-        }
-    }
-}
-
-
 @Composable
 private fun InputNameView(
     agencyName: TextFieldValue,
@@ -143,8 +96,8 @@ private fun InputNameView(
             .onFocusChanged { isFilled = !it.isFocused },
         value = agencyNameValue,
         onValueChange = { onAgencyNameChange(it.copy(text = filterText(it.text))) },
-        title = "소속 이름",
-        placeholder = "소속 이름을 입력해주세요",
+        title = withRequiredMark("장부"),
+        placeholder = "ex) 제주도 여행",
         isFilled = isFilled,
         isError = isError,
         helperText = "${maxCount}자 이하로 입력해주세요",
@@ -159,15 +112,12 @@ private fun InputNameView(
 }
 
 
-@Preview
+@Preview(showBackground = true)
 @Composable
 private fun AgencyResisterContentViewPreview() {
     AgencyResisterContentView(
-        agencyType = AgencyType.GENERAL,
-        onAgencyTypeChange = {},
         agencyName = TextFieldValue("동아리"),
         onAgencyNameChange = {},
         changeNameTextFieldIsError = {},
-        registrableClubOrCouncil = true
     )
 }
\ No newline at end of file
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchScreen.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchScreen.kt
index 25c84600..7c114b46 100644
--- a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchScreen.kt
+++ b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchScreen.kt
@@ -46,7 +46,7 @@ import org.orbitmvi.orbit.compose.collectSideEffect
 fun AgencySearchScreen(
     modifier: Modifier = Modifier,
     viewModel: AgencySearchViewModel = hiltViewModel(),
-    navigateToRegister: (isUniversityStudent: Boolean) -> Unit,
+    navigateToRegister: () -> Unit,
     navigateAgencyJoin: (agencyId: Long) -> Unit
 ) {
     val state by viewModel.collectAsState()
@@ -60,7 +60,7 @@ fun AgencySearchScreen(
     viewModel.collectSideEffect {
         when (it) {
             is AgencySearchSideEffect.NavigateToRegister -> {
-                navigateToRegister(it.isUniversityStudent)
+                navigateToRegister()
             }
 
             is AgencySearchSideEffect.NavigateToAgencyJoin -> {
diff --git a/feature/home/src/main/java/com/moneymong/moneymong/home/HomeBottomTabs.kt b/feature/home/src/main/java/com/moneymong/moneymong/home/HomeBottomTabs.kt
index c54a9658..6a703b26 100644
--- a/feature/home/src/main/java/com/moneymong/moneymong/home/HomeBottomTabs.kt
+++ b/feature/home/src/main/java/com/moneymong/moneymong/home/HomeBottomTabs.kt
@@ -11,11 +11,6 @@ enum class HomeBottomTabs(
     @DrawableRes val icon: Int,
     val route: String
 ) {
-    AGENCY(
-        labelText = R.string.home_bottom_tabs_label_agency,
-        icon = com.moneymong.moneymong.design_system.R.drawable.ic_party,
-        route = agencyRoute
-    ),
     LEDGER(
         labelText = R.string.home_bottom_tabs_label_ledger,
         icon = com.moneymong.moneymong.design_system.R.drawable.ic_record,
diff --git a/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt b/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt
index 2f690615..890ac73c 100644
--- a/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt
+++ b/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt
@@ -20,15 +20,12 @@ import com.moneymong.moneymong.feature.agency.navigation.agencyRoute
 import com.moneymong.moneymong.feature.agency.navigation.agencyScreen
 import com.moneymong.moneymong.feature.agency.navigation.navigateAgency
 import com.moneymong.moneymong.feature.agency.navigation.navigateAgencyRegister
-import com.moneymong.moneymong.feature.agency.navigation.navigateAgencyRegisterComplete
 import com.moneymong.moneymong.feature.mymong.navigation.myMongNavGraph
 import com.moneymong.moneymong.feature.mymong.navigation.navigatePrivacyPolicy
 import com.moneymong.moneymong.feature.mymong.navigation.navigateTermsOfUse
 import com.moneymong.moneymong.feature.mymong.navigation.navigateWithdrawal
 import com.moneymong.moneymong.feature.sign.navigation.loginScreen
 import com.moneymong.moneymong.feature.sign.navigation.navigateLogin
-import com.moneymong.moneymong.feature.sign.navigation.navigateSignComplete
-import com.moneymong.moneymong.feature.sign.navigation.navigateSignUp
 import com.moneymong.moneymong.feature.sign.navigation.navigateSignUpUniversity
 import com.moneymong.moneymong.feature.sign.navigation.signCompleteScreen
 import com.moneymong.moneymong.feature.sign.navigation.signUpScreen
@@ -43,7 +40,6 @@ import com.moneymong.moneymong.ledgerdetail.navigation.ledgerDetailScreen
 import com.moneymong.moneymong.ledgerdetail.navigation.navigateLedgerDetail
 import com.moneymong.moneymong.ledgermanual.navigation.ledgerManualScreen
 import com.moneymong.moneymong.ledgermanual.navigation.navigateLedgerManual
-import com.moneymong.moneymong.ocr.navigation.navigateOCR
 import com.moneymong.moneymong.ocr.navigation.ocrScreen
 import com.moneymong.moneymong.ocr_detail.navigation.navigateOCRDetail
 import com.moneymong.moneymong.ocr_detail.navigation.ocrDetailScreen
@@ -96,8 +92,8 @@ fun HomeScreen(
             // sign
             loginScreen(
                 navigateToLedger = homeNavController::navigateLedger,
-                navigateToSignUp = homeNavController::navigateSignUp,
                 navigateToLogin = homeNavController::navigateLogin,
+                navigateToAgencyRegister = homeNavController::navigateAgencyRegister
             )
 
             signUpScreen(
@@ -121,7 +117,7 @@ fun HomeScreen(
             agencyScreen(
                 padding = padding,
                 navigateToRegister = homeNavController::navigateAgencyRegister,
-                navigateAgencyJoin = homeNavController::navigateAgencyJoin
+                navigateAgencyJoin = {}
             )
 
             agencyJoinScreen(
@@ -141,8 +137,7 @@ fun HomeScreen(
             )
 
             agencyRegisterScreen(
-                navigateToComplete = homeNavController::navigateAgencyRegisterComplete,
-                navigateUp = homeNavController::navigateUp
+                navigateToLedger = homeNavController::navigateLedger
             )
 
             agencyRegisterCompleteScreen(
@@ -160,16 +155,13 @@ fun HomeScreen(
             // ledger
             ledgerScreen(
                 padding = padding,
-                navigateToAgency = { homeNavigator.navigate(agencyRoute) },
-                navigateToOCR = homeNavController::navigateOCR,
+                navigateToAgencyRegister = homeNavController::navigateAgencyRegister,
+                navigateToAgencyJoin = homeNavController::navigateAgencyJoin,
                 navigateToLedgerDetail = homeNavController::navigateLedgerDetail,
-                navigateToLedgerManual = homeNavController::navigateLedgerManual
+                navigateToLedgerManual = homeNavController::navigateLedgerManual,
             )
 
-            ledgerDetailScreen(
-                navigateToLedger = homeNavController::navigateLedger,
-                popBackStack = homeNavController::popBackStack
-            )
+            ledgerDetailScreen(navigateToLedger = homeNavController::navigateLedger)
 
             ledgerManualScreen(
                 navigateToLedger = homeNavController::navigateLedger,
diff --git a/feature/home/src/main/java/com/moneymong/moneymong/home/navigation/HomeNavigator.kt b/feature/home/src/main/java/com/moneymong/moneymong/home/navigation/HomeNavigator.kt
index 5d7f92d8..2baf82ad 100644
--- a/feature/home/src/main/java/com/moneymong/moneymong/home/navigation/HomeNavigator.kt
+++ b/feature/home/src/main/java/com/moneymong/moneymong/home/navigation/HomeNavigator.kt
@@ -45,10 +45,10 @@ internal class HomeNavigator(
         get() = when (currentRoute) {
             in listOf(
                 splashRoute,
-                loginRoute
             ) -> Blue04
 
             in listOf(
+                loginRoute,
                 agencyRoute,
                 ledgerDetailRoute,
                 mymongRoute
@@ -64,7 +64,6 @@ internal class HomeNavigator(
         get() = when (currentRoute) {
             in listOf(
                 splashRoute,
-                loginRoute,
                 agencyRegisterCompleteRoute
             ) -> false
 
@@ -83,7 +82,6 @@ internal class HomeNavigator(
             restoreState = route != agencyRoute
         }
         when (route) {
-            HomeBottomTabs.AGENCY.route -> navHostController.navigateAgency(navOptions = navOptions)
             HomeBottomTabs.LEDGER.route -> navHostController.navigateLedger(navOptions = navOptions)
             HomeBottomTabs.MYMONG.route -> navHostController.navigateMyMong(navOptions = navOptions)
         }
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerScreen.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerScreen.kt
index 318e22ad..11eec6ee 100644
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerScreen.kt
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerScreen.kt
@@ -1,20 +1,10 @@
 package com.moneymong.moneymong.ledger
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.FastOutLinearInEasing
-import androidx.compose.animation.core.LinearOutSlowInEasing
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
@@ -34,7 +24,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.tooling.preview.Preview
@@ -46,18 +35,17 @@ import com.moneymong.moneymong.common.event.Event
 import com.moneymong.moneymong.common.ui.plus
 import com.moneymong.moneymong.design_system.R
 import com.moneymong.moneymong.design_system.component.bottomSheet.MDSBottomSheet
-import com.moneymong.moneymong.design_system.component.button.FABIconSize
 import com.moneymong.moneymong.design_system.component.button.MDSFloatingActionButton
 import com.moneymong.moneymong.design_system.component.datepicker.MDSWheelDatePicker
 import com.moneymong.moneymong.design_system.component.indicator.MDSRefreshIndicator
 import com.moneymong.moneymong.design_system.component.snackbar.MDSSnackbarHost
 import com.moneymong.moneymong.design_system.error.ErrorDialog
-import com.moneymong.moneymong.design_system.theme.Mint02
+import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
 import com.moneymong.moneymong.design_system.theme.Mint03
 import com.moneymong.moneymong.design_system.theme.White
 import com.moneymong.moneymong.ledger.view.LedgerAgencyEmptyView
-import com.moneymong.moneymong.ledger.view.LedgerAgencySelectBottomSheet
 import com.moneymong.moneymong.ledger.view.LedgerDefaultView
+import com.moneymong.moneymong.ledger.view.LedgerSelectBottomSheet
 import com.moneymong.moneymong.ledger.view.LedgerTab
 import com.moneymong.moneymong.ledger.view.LedgerTabRowView
 import com.moneymong.moneymong.ledger.view.LedgerTopbarView
@@ -67,22 +55,20 @@ import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
 @OptIn(
-    ExperimentalFoundationApi::class,
-    ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class
+    ExperimentalMaterial3Api::class,
+    ExperimentalMaterialApi::class,
 )
 @Composable
 fun LedgerScreen(
     modifier: Modifier = Modifier,
     viewModel: LedgerViewModel = hiltViewModel(),
     padding: PaddingValues,
-    navigateToAgency: () -> Unit,
-    navigateToOCR: (NavOptions?) -> Unit,
+    navigateToAgencyRegister: () -> Unit,
+    navigateToAgencyJoin: () -> Unit,
     navigateToLedgerDetail: (NavOptions?, Int, Boolean) -> Unit,
     navigateToLedgerManual: (NavOptions?) -> Unit
 ) {
     val state = viewModel.collectAsState().value
-    var expandableFab by remember { mutableStateOf(false) }
-    val rotationAngle by animateFloatAsState(if (expandableFab) 45f else 0f, label = "")
     val tabs = listOf(LedgerTab.Ledger, LedgerTab.Member)
     val coroutineScope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
@@ -106,10 +92,6 @@ fun LedgerScreen(
                 navigateToLedgerDetail(null, it.id, state.isStaff)
             }
 
-            is LedgerSideEffect.LedgerNavigateToOCR -> {
-                navigateToOCR(null)
-            }
-
             is LedgerSideEffect.LedgerNavigateToLedgerManual -> {
                 navigateToLedgerManual(null)
             }
@@ -170,9 +152,9 @@ fun LedgerScreen(
         snackbarHost = {
             MDSSnackbarHost(
                 modifier = Modifier.padding(
-                    start = 20.dp,
+                    start = MMHorizontalSpacing,
                     bottom = 12.dp + padding.calculateBottomPadding(),
-                    end = 20.dp
+                    end = MMHorizontalSpacing
                 ),
                 hostState = snackbarHostState
             )
@@ -185,7 +167,7 @@ fun LedgerScreen(
                 content = {
                     when (state.sheetType) {
                         LedgerSheetType.Agency -> {
-                            LedgerAgencySelectBottomSheet(
+                            LedgerSelectBottomSheet(
                                 currentAgencyId = state.agencyId,
                                 agencyList = state.agencyList,
                                 onClickItem = {
@@ -194,7 +176,9 @@ fun LedgerScreen(
                                             it
                                         )
                                     )
-                                }
+                                },
+                                onClickInvitation = navigateToAgencyJoin,
+                                onClickCreateLedger = navigateToAgencyRegister
                             )
                         }
 
@@ -217,7 +201,7 @@ fun LedgerScreen(
                 .padding(it + padding)
         ) {
             if (!state.existAgency) {
-                LedgerAgencyEmptyView(onClickFindAgency = navigateToAgency)
+                LedgerAgencyEmptyView(onClickAgencyRegister = navigateToAgencyRegister)
             } else {
                 LedgerTabRowView(
                     tabs = tabs,
@@ -260,74 +244,18 @@ fun LedgerScreen(
                                         .padding(end = 20.dp, bottom = 20.dp),
                                     horizontalAlignment = Alignment.End
                                 ) {
-                                    AnimatedVisibility(
-                                        visible = expandableFab,
-                                        enter = slideInVertically(
-                                            initialOffsetY = { fullHeight -> fullHeight },
-                                            animationSpec = tween(
-                                                durationMillis = 250,
-                                                easing = LinearOutSlowInEasing
-                                            )
-                                        ),
-                                        exit = slideOutVertically(
-                                            targetOffsetY = { fullHeight -> fullHeight },
-                                            animationSpec = tween(
-                                                durationMillis = 150,
-                                                easing = FastOutLinearInEasing
-                                            )
-                                        )
-                                    ) {
-                                        MDSFloatingActionButton(
-                                            iconResource = R.drawable.ic_scan,
-                                            iconSize = FABIconSize(
-                                                width = 30.dp,
-                                                height = 24.dp
-                                            ),
-                                            containerColor = Mint03,
-                                            onClick = viewModel::onClickLedgerRegisterOCR
-                                        )
-                                    }
-                                    if (expandableFab) Spacer(modifier = Modifier.height(10.dp))
-                                    AnimatedVisibility(
-                                        visible = expandableFab,
-                                        enter = slideInVertically(
-                                            initialOffsetY = { fullHeight -> fullHeight },
-                                            animationSpec = tween(
-                                                durationMillis = 150,
-                                                easing = LinearOutSlowInEasing
-                                            )
-                                        ),
-                                        exit = slideOutVertically(
-                                            targetOffsetY = { fullHeight -> fullHeight },
-                                            animationSpec = tween(
-                                                durationMillis = 250,
-                                                easing = FastOutLinearInEasing
-                                            )
-                                        )
-                                    ) {
-                                        MDSFloatingActionButton(
-                                            iconResource = R.drawable.ic_pencil,
-                                            containerColor = Mint03,
-                                            onClick = viewModel::onClickLedgerRegisterManual
-                                        )
-                                    }
-                                    if (expandableFab) Spacer(modifier = Modifier.height(10.dp))
-                                    val containerColor =
-                                        if (expandableFab) Mint02 else Mint03
                                     MDSFloatingActionButton(
-                                        modifier = Modifier
-                                            .rotate(rotationAngle)
-                                            .onGloballyPositioned { layoutCoordinates ->
-                                                addFABState = OnboardingComponentState(
-                                                    offset = layoutCoordinates.localToRoot(Offset.Zero),
-                                                    size = layoutCoordinates.size
-                                                )
-                                            },
+                                        modifier = Modifier.onGloballyPositioned { layoutCoordinates ->
+                                            addFABState = OnboardingComponentState(
+                                                offset = layoutCoordinates.localToRoot(Offset.Zero),
+                                                size = layoutCoordinates.size
+                                            )
+                                        },
                                         iconResource = R.drawable.ic_plus_default,
-                                        containerColor = containerColor,
+                                        containerColor = Mint03,
                                         onClick = {
                                             viewModel.eventTracker.logEvent(Event.PLUS_CLICK)
-                                            expandableFab = !expandableFab
+                                            viewModel.onClickLedgerRegisterManual()
                                         }
                                     )
                                 }
@@ -363,9 +291,9 @@ fun LedgerScreen(
 fun LedgerScreenPreview() {
     LedgerScreen(
         padding = PaddingValues(),
-        navigateToAgency = {},
-        navigateToOCR = {},
+        navigateToAgencyRegister = {},
+        navigateToAgencyJoin = {},
         navigateToLedgerDetail = { navOptions, i, b -> },
-        navigateToLedgerManual = {}
+        navigateToLedgerManual = {},
     )
 }
\ No newline at end of file
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerSideEffect.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerSideEffect.kt
index c5039c2a..ccae7da7 100644
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerSideEffect.kt
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerSideEffect.kt
@@ -5,7 +5,6 @@ import com.moneymong.moneymong.common.base.SideEffect
 sealed class LedgerSideEffect : SideEffect {
     data object LedgerOpenSheet : LedgerSideEffect()
     data object LedgerCloseSheet : LedgerSideEffect()
-    data object LedgerNavigateToOCR : LedgerSideEffect()
     data object LedgerNavigateToLedgerManual : LedgerSideEffect()
     data object LedgerFetchRetry : LedgerSideEffect()
     data class LedgerNavigateToLedgerDetail(val id: Int): LedgerSideEffect()
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerViewModel.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerViewModel.kt
index 1da493e5..c2a864f6 100644
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerViewModel.kt
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/LedgerViewModel.kt
@@ -233,11 +233,6 @@ class LedgerViewModel @Inject constructor(
         fetchLedgerTransactionList()
     }
 
-    fun onClickLedgerRegisterOCR() = intent {
-        eventTracker.logEvent(Event.OCR_CLICK)
-        postSideEffect(LedgerSideEffect.LedgerNavigateToOCR)
-    }
-
     fun onClickLedgerRegisterManual() = intent {
         eventTracker.logEvent(Event.HAND_CLICK)
         postSideEffect(LedgerSideEffect.LedgerNavigateToLedgerManual)
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/navigation/LedgerNavigation.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/navigation/LedgerNavigation.kt
index 20a6e398..6cddece6 100644
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/navigation/LedgerNavigation.kt
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/navigation/LedgerNavigation.kt
@@ -33,10 +33,10 @@ fun NavController.navigateLedger(
 
 fun NavGraphBuilder.ledgerScreen(
     padding: PaddingValues,
-    navigateToAgency: () -> Unit,
-    navigateToOCR: (NavOptions?) -> Unit,
+    navigateToAgencyRegister: () -> Unit,
+    navigateToAgencyJoin: () -> Unit,
     navigateToLedgerDetail: (NavOptions?, Int, Boolean) -> Unit,
-    navigateToLedgerManual: (NavOptions?) -> Unit
+    navigateToLedgerManual: (NavOptions?) -> Unit,
 ) {
     composable(
         route = ledgerRouteWithArgs,
@@ -44,8 +44,8 @@ fun NavGraphBuilder.ledgerScreen(
     ) {
         LedgerScreen(
             padding = padding,
-            navigateToAgency = navigateToAgency,
-            navigateToOCR = navigateToOCR,
+            navigateToAgencyRegister = navigateToAgencyRegister,
+            navigateToAgencyJoin = navigateToAgencyJoin,
             navigateToLedgerDetail = navigateToLedgerDetail,
             navigateToLedgerManual = navigateToLedgerManual
         )
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerAgencyEmptyView.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerAgencyEmptyView.kt
index 32c3f681..8897bc2d 100644
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerAgencyEmptyView.kt
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerAgencyEmptyView.kt
@@ -19,7 +19,9 @@ import androidx.compose.ui.unit.dp
 import com.moneymong.moneymong.design_system.component.button.MDSButton
 import com.moneymong.moneymong.design_system.component.button.MDSButtonSize
 import com.moneymong.moneymong.design_system.component.button.MDSButtonType
+import com.moneymong.moneymong.design_system.theme.Body3
 import com.moneymong.moneymong.design_system.theme.Body4
+import com.moneymong.moneymong.design_system.theme.Gray07
 import com.moneymong.moneymong.design_system.theme.Gray08
 import com.moneymong.moneymong.design_system.theme.White
 import com.moneymong.moneymong.ledger.R
@@ -27,7 +29,7 @@ import com.moneymong.moneymong.ledger.R
 @Composable
 fun LedgerAgencyEmptyView(
     modifier: Modifier = Modifier,
-    onClickFindAgency: () -> Unit
+    onClickAgencyRegister: () -> Unit
 ) {
     Column(
         modifier = modifier
@@ -43,17 +45,17 @@ fun LedgerAgencyEmptyView(
         )
         Spacer(modifier = Modifier.height(12.dp))
         Text(
-            text = "소속에 가입후 장부를 사용할 수 있습니다",
-            style = Body4,
-            color = Gray08
+            text = "기록한 장부를 만들어보세요",
+            style = Body3,
+            color = Gray07
         )
         Spacer(modifier = Modifier.height(16.dp))
         MDSButton(
-            modifier = Modifier.width(160.dp),
-            text = "내 소속 찾으러가기",
+            modifier = Modifier.width(140.dp),
+            text = "장부 생성하기",
             type = MDSButtonType.PRIMARY,
             size = MDSButtonSize.MEDIUM,
-            onClick = onClickFindAgency
+            onClick = onClickAgencyRegister
         )
     }
 }
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerAgencySelectBottomSheet.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerAgencySelectBottomSheet.kt
deleted file mode 100644
index e726c107..00000000
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerAgencySelectBottomSheet.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.moneymong.moneymong.ledger.view
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.moneymong.moneymong.ledger.view.item.LedgerAgencySelectItem
-import com.moneymong.moneymong.model.agency.MyAgencyResponse
-
-@Composable
-fun LedgerAgencySelectBottomSheet(
-    modifier: Modifier = Modifier,
-    currentAgencyId: Int,
-    agencyList: List<MyAgencyResponse>,
-    onClickItem: (agencyId: Int) -> Unit
-) {
-    val scrollState = rememberScrollState()
-
-    Column(
-        modifier = modifier
-            .verticalScroll(scrollState)
-            .padding(vertical = 24.dp, horizontal = 20.dp),
-        verticalArrangement = Arrangement.spacedBy(space = 12.dp)
-    ) {
-        agencyList.forEachIndexed { index, item ->
-            LedgerAgencySelectItem(
-                agencyResponse = item,
-                currentAgency = currentAgencyId == item.id,
-                onClick = onClickItem
-            )
-        }
-    }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun LedgerAgencySelectBottomSheetPreview() {
-    LedgerAgencySelectBottomSheet(
-        currentAgencyId = 0,
-        agencyList = listOf(MyAgencyResponse(0, "asddfkjfdsafhadskfjahdfkjldashfkdaslsdahfjk", 1, ""))
-    ) {}
-}
\ No newline at end of file
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerDefaultView.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerDefaultView.kt
index 34aa6c82..28e447ff 100644
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerDefaultView.kt
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerDefaultView.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.moneymong.moneymong.common.ui.noRippleClickable
 import com.moneymong.moneymong.common.ui.toWonFormat
@@ -60,17 +61,17 @@ enum class LedgerTransactionType(
     전체(
         type = "ALL",
         description = "장부 기록이 없어요",
-        imgRes = drawable.img_expenditure_empty
+        imgRes = drawable.img_empty_ledger
     ),
     지출(
         type = "EXPENSE",
         description = "지출 기록이 없어요",
-        imgRes = drawable.img_expenditure_empty
+        imgRes = drawable.img_empty_expense
     ),
     수입(
         type = "INCOME",
         description = "수입 기록이 없어요",
-        imgRes = drawable.img_expenditure_empty
+        imgRes = drawable.img_empty_income
     )
 }
 
@@ -165,28 +166,27 @@ internal fun LedgerDefaultView(
                 LoadingScreen(modifier = Modifier.fillMaxSize())
             }
         } else {
-            if (!isExistLedger && isStaff) {
-                item {
-                    Spacer(modifier = Modifier.height(75.dp))
-                    LedgerStaffEmptyView()
+            if (hasTransaction) {
+                itemsIndexed(ledgerDetails) { index, item ->
+                    LedgerTransactionItem(
+                        modifier = Modifier.padding(horizontal = 20.dp),
+                        ledgerDetail = item,
+                        onClickTransactionItem = onClickTransactionItem
+                    )
                 }
             } else {
-                if (hasTransaction) {
-                    itemsIndexed(ledgerDetails) { index, item ->
-                        LedgerTransactionItem(
-                            modifier = Modifier.padding(horizontal = 20.dp),
-                            ledgerDetail = item,
-                            onClickTransactionItem = onClickTransactionItem
-                        )
-                    }
-                } else {
-                    item {
-                        Spacer(modifier = Modifier.height(121.dp))
-                        LedgerTransactionEmptyView(
-                            text = transactionType.description,
-                            image = transactionType.imgRes
-                        )
-                    }
+                val defaultImageSize = DpSize(width = 100.dp, height = 100.dp)
+                item {
+                    Spacer(modifier = Modifier.height(100.dp))
+                    LedgerTransactionEmptyView(
+                        text = transactionType.description,
+                        image = transactionType.imgRes,
+                        imageSize = if (transactionType == LedgerTransactionType.전체) {
+                            DpSize(width = 147.dp, height = 88.dp)
+                        } else {
+                            defaultImageSize
+                        }
+                    )
                 }
             }
         }
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerSelectBottomSheet.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerSelectBottomSheet.kt
new file mode 100644
index 00000000..9b1017be
--- /dev/null
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerSelectBottomSheet.kt
@@ -0,0 +1,154 @@
+package com.moneymong.moneymong.ledger.view
+
+import androidx.compose.foundation.layout.Arrangement
+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.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.moneymong.moneymong.design_system.component.button.MDSButton
+import com.moneymong.moneymong.design_system.component.button.MDSButtonSize
+import com.moneymong.moneymong.design_system.component.button.MDSButtonType
+import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
+import com.moneymong.moneymong.ledger.view.item.LedgerAgencySelectItem
+import com.moneymong.moneymong.model.agency.MyAgencyResponse
+import com.moneymong.moneymong.ui.pxToDp
+import com.moneymong.moneymong.design_system.R as MDSR
+
+@Composable
+internal fun LedgerSelectBottomSheet(
+    modifier: Modifier = Modifier,
+    currentAgencyId: Int,
+    agencyList: List<MyAgencyResponse>,
+    onClickItem: (agencyId: Int) -> Unit,
+    onClickInvitation: () -> Unit,
+    onClickCreateLedger: () -> Unit
+) {
+    Column(
+        modifier = modifier.padding(horizontal = MMHorizontalSpacing)
+    ) {
+        if (agencyList.isNotEmpty()) {
+            Spacer(modifier = Modifier.height(20.dp))
+        }
+
+        LedgerAgencySelectItems(
+            currentAgencyId = currentAgencyId,
+            agencyList = agencyList,
+            onClickItem = onClickItem
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+        MDSButton(
+            modifier = Modifier.fillMaxWidth(),
+            text = "초대코드 입력하기",
+            type = MDSButtonType.THIRDARY,
+            size = MDSButtonSize.LARGE,
+            iconResource = MDSR.drawable.ic_pencil,
+            onClick = onClickInvitation,
+        )
+        Spacer(modifier = Modifier.height(12.dp))
+        MDSButton(
+            modifier = Modifier.fillMaxWidth(),
+            text = "새로운 장부 만들기",
+            type = MDSButtonType.PRIMARY,
+            size = MDSButtonSize.LARGE,
+            iconResource = MDSR.drawable.ic_plus_outline,
+            onClick = onClickCreateLedger,
+        )
+        Spacer(modifier = Modifier.height(12.dp))
+    }
+}
+
+@Composable
+private fun LedgerAgencySelectItems(
+    currentAgencyId: Int,
+    agencyList: List<MyAgencyResponse>,
+    onClickItem: (agencyId: Int) -> Unit,
+) {
+    var itemHeight by remember { mutableIntStateOf(0) }
+    val itemSpace = 12.dp
+    val maxVisibleItemCount = 3
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(key1 = Unit) {
+        val currentAgencyIndex =
+            agencyList.indexOfFirst { it.id == currentAgencyId }.coerceAtLeast(0)
+        listState.animateScrollToItem(index = currentAgencyIndex)
+    }
+
+    LazyColumn(
+        modifier = Modifier
+            .height(
+                if (itemHeight > 0 && agencyList.size > maxVisibleItemCount) {
+                    (itemHeight.pxToDp * maxVisibleItemCount) + itemSpace * (maxVisibleItemCount - 1)
+                } else {
+                    Dp.Unspecified
+                }
+            ),
+        state = listState,
+        verticalArrangement = Arrangement.spacedBy(space = itemSpace),
+    ) {
+        items(items = agencyList) { item ->
+            LedgerAgencySelectItem(
+                modifier = Modifier.onGloballyPositioned {
+                    if (itemHeight == 0) {
+                        itemHeight = it.size.height
+                    }
+                },
+                agencyResponse = item,
+                currentAgency = currentAgencyId == item.id,
+                onClick = onClickItem
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun LedgerSelectBottomSheetPreview() {
+    LedgerSelectBottomSheet(
+        currentAgencyId = 0,
+        agencyList = listOf(
+            MyAgencyResponse(
+                id = 0,
+                name = "국민은행",
+                headCount = 0,
+                type = "은행"
+            ),
+            MyAgencyResponse(
+                id = 0,
+                name = "국민은행",
+                headCount = 0,
+                type = "은행"
+            ),
+            MyAgencyResponse(
+                id = 0,
+                name = "국민은행",
+                headCount = 0,
+                type = "은행"
+            ),
+            MyAgencyResponse(
+                id = 0,
+                name = "국민은행",
+                headCount = 0,
+                type = "은행"
+            )
+        ),
+        onClickCreateLedger = {},
+        onClickInvitation = {},
+        onClickItem = {}
+    )
+}
\ No newline at end of file
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerTransactionEmptyView.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerTransactionEmptyView.kt
index 4f280afb..5440aad3 100644
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerTransactionEmptyView.kt
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/LedgerTransactionEmptyView.kt
@@ -13,8 +13,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
-import com.moneymong.moneymong.design_system.R.*
+import com.moneymong.moneymong.design_system.R.drawable
 import com.moneymong.moneymong.design_system.theme.Body3
 import com.moneymong.moneymong.design_system.theme.Gray07
 
@@ -22,7 +23,8 @@ import com.moneymong.moneymong.design_system.theme.Gray07
 fun LedgerTransactionEmptyView(
     modifier: Modifier = Modifier,
     text: String,
-    image: Int
+    image: Int,
+    imageSize: DpSize
 ) {
     Column(
         modifier = modifier.fillMaxSize(),
@@ -30,7 +32,7 @@ fun LedgerTransactionEmptyView(
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Image(
-            modifier = Modifier.size(88.dp),
+            modifier = Modifier.size(size = imageSize),
             painter = painterResource(id = image),
             contentDescription = null
         )
@@ -46,5 +48,9 @@ fun LedgerTransactionEmptyView(
 @Preview(showBackground = true)
 @Composable
 fun LedgerTransactionEmptyPreview() {
-    LedgerTransactionEmptyView(text = "10월에 기록된 장부가 없습니다", image = drawable.img_transaction_empty)
+    LedgerTransactionEmptyView(
+        text = "10월에 기록된 장부가 없습니다",
+        image = drawable.img_transaction_empty,
+        imageSize = DpSize(100.dp, 100.dp)
+    )
 }
\ No newline at end of file
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/item/LedgerAgencySelectItem.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/item/LedgerAgencySelectItem.kt
index 31e76492..33014ff8 100644
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/item/LedgerAgencySelectItem.kt
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/item/LedgerAgencySelectItem.kt
@@ -25,16 +25,20 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.moneymong.moneymong.design_system.R.*
 import com.moneymong.moneymong.design_system.theme.Blue01
+import com.moneymong.moneymong.design_system.theme.Blue03
 import com.moneymong.moneymong.design_system.theme.Blue04
 import com.moneymong.moneymong.design_system.theme.Body2
 import com.moneymong.moneymong.design_system.theme.Body3
 import com.moneymong.moneymong.design_system.theme.Gray02
 import com.moneymong.moneymong.design_system.theme.Gray03
 import com.moneymong.moneymong.design_system.theme.Gray05
+import com.moneymong.moneymong.design_system.theme.Gray08
 import com.moneymong.moneymong.design_system.theme.Gray09
+import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
 import com.moneymong.moneymong.design_system.theme.SkyBlue01
 import com.moneymong.moneymong.design_system.theme.White
 import com.moneymong.moneymong.model.agency.MyAgencyResponse
+import java.text.DecimalFormat
 
 @Composable
 fun LedgerAgencySelectItem(
@@ -45,8 +49,11 @@ fun LedgerAgencySelectItem(
 ) {
     val backgroundColor = if (currentAgency) Blue01 else White
     val borderColor = if (currentAgency) Blue04 else Gray02
-    val textColor = if (currentAgency) Blue04 else Gray09
-    val iconColor = if (currentAgency) Blue04 else Gray03
+    val textColor = if (currentAgency) Blue04 else Gray08
+    val leftIconColor = if (currentAgency) Blue03 else SkyBlue01
+    val rightIconColor = if (currentAgency) Blue04 else Gray03
+
+    val memberFormat = DecimalFormat("00")
 
     Row(
         modifier = modifier
@@ -55,19 +62,19 @@ fun LedgerAgencySelectItem(
             .clickable { onClick(agencyResponse.id) }
             .border(width = 1.dp, color = borderColor, shape = RoundedCornerShape(16.dp)) // TODO
             .background(color = backgroundColor)
-            .padding(16.dp),
+            .padding(vertical = 12.dp, horizontal = MMHorizontalSpacing),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Box(
             modifier = Modifier
                 .size(48.dp)
                 .clip(RoundedCornerShape(100))
-                .background(SkyBlue01),
+                .background(leftIconColor),
             contentAlignment = Alignment.Center
         ) {
             Image(
-                modifier = Modifier.size(36.dp),
-                painter = painterResource(id = drawable.img_club),
+                modifier = Modifier.size(28.dp),
+                painter = painterResource(id = drawable.ic_study),
                 contentDescription = null
             )
         }
@@ -82,7 +89,7 @@ fun LedgerAgencySelectItem(
             )
             Spacer(modifier = Modifier.width(4.dp))
             Text(
-                text = "멤버수 ${agencyResponse.headCount}",
+                text = "멤버수 ${memberFormat.format(agencyResponse.headCount)}",
                 style = Body2,
                 color = Gray05
             )
@@ -91,7 +98,7 @@ fun LedgerAgencySelectItem(
         Icon(
             painter = painterResource(id = drawable.ic_check),
             contentDescription = null,
-            tint = iconColor
+            tint = rightIconColor
         )
     }
 }
diff --git a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/item/LedgerTransactionItem.kt b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/item/LedgerTransactionItem.kt
index aaae6b61..b2d850c2 100644
--- a/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/item/LedgerTransactionItem.kt
+++ b/feature/ledger/src/main/java/com/moneymong/moneymong/ledger/view/item/LedgerTransactionItem.kt
@@ -27,10 +27,9 @@ import com.moneymong.moneymong.design_system.theme.Blue04
 import com.moneymong.moneymong.design_system.theme.Body1
 import com.moneymong.moneymong.design_system.theme.Body2
 import com.moneymong.moneymong.design_system.theme.Body3
-import com.moneymong.moneymong.design_system.theme.Body4
 import com.moneymong.moneymong.design_system.theme.Gray04
-import com.moneymong.moneymong.design_system.theme.Gray06
-import com.moneymong.moneymong.design_system.theme.Gray10
+import com.moneymong.moneymong.design_system.theme.Gray07
+import com.moneymong.moneymong.design_system.theme.Heading1
 import com.moneymong.moneymong.design_system.theme.Red03
 import com.moneymong.moneymong.model.ledger.FundType
 import com.moneymong.moneymong.model.ledger.LedgerDetail
@@ -66,8 +65,8 @@ fun LedgerTransactionItem(
         Column(modifier = Modifier.weight(1f)) {
             Text(
                 text = ledgerDetail.storeInfo,
-                style = Body4,
-                color = Gray10
+                style = Heading1,
+                color = Gray07
             )
             Spacer(modifier = Modifier.height(2.dp))
             Text(
@@ -77,7 +76,7 @@ fun LedgerTransactionItem(
             )
         }
         Column(horizontalAlignment = Alignment.End) {
-            val amountColor = if (ledgerDetail.fundType == FundType.INCOME.name) Gray10 else Red03
+            val amountColor = if (ledgerDetail.fundType == FundType.INCOME.name) Gray07 else Red03
             val sign = if (ledgerDetail.amount == 0) {
                 FundType.NONE.sign
             } else {
@@ -89,14 +88,14 @@ fun LedgerTransactionItem(
             }
             Text(
                 text = "${sign}${ledgerDetail.amount.toString().toWonFormat()}원",
-                style = Body4,
+                style = Heading1,
                 color = amountColor
             )
             Spacer(modifier = Modifier.height(2.dp))
             Text(
                 text = "잔액 ${ledgerDetail.balance.toString().toWonFormat()}원",
                 style = Body2,
-                color = Gray06
+                color = Gray04
             )
         }
     }
diff --git a/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailScreen.kt b/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailScreen.kt
index fbbeba72..8dd5409a 100644
--- a/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailScreen.kt
+++ b/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailScreen.kt
@@ -1,5 +1,6 @@
 package com.moneymong.moneymong.ledgerdetail
 
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
@@ -80,8 +81,7 @@ fun LedgerDetailScreen(
     modifier: Modifier = Modifier,
     viewModel: LedgerDetailViewModel = hiltViewModel(),
     ledgerTransactionId: Int,
-    navigateToLedger: (ledgerPostSuccess: Boolean) -> Unit,
-    popBackStack: () -> Unit
+    navigateToLedger: () -> Unit,
 ) {
     val context = LocalContext.current
     val state = viewModel.collectAsState().value
@@ -97,6 +97,7 @@ fun LedgerDetailScreen(
         }
     )
 
+
     viewModel.collectSideEffect {
         when (it) {
             is LedgerDetailSideEffect.LedgerDetailEdit -> {
@@ -123,7 +124,7 @@ fun LedgerDetailScreen(
             }
 
             is LedgerDetailSideEffect.LedgerDetailNavigateToLedger -> {
-                popBackStack()
+                navigateToLedger()
             }
 
             is LedgerDetailSideEffect.LedgerDetailConfirmModalNegative -> {
@@ -137,6 +138,8 @@ fun LedgerDetailScreen(
         }
     }
 
+    BackHandler { navigateToLedger() }
+
     LaunchedEffect(Unit) {
         viewModel.eventEmit(
             LedgerDetailSideEffect.LedgerDetailFetchTransactionDetail(
@@ -162,406 +165,329 @@ fun LedgerDetailScreen(
             onClickPositive = { viewModel.eventEmit(LedgerDetailSideEffect.LedgerDetailConfirmModalPositive) })
     }
 
-    if (state.isLoading) {
-        LoadingScreen(modifier = Modifier.fillMaxSize())
-    } else {
-        Scaffold(
-            topBar = {
-                LedgerDetailTopbarView(
-                    title = "${state.fundTypeText} 상세내역",
-                    useEditMode = state.useEditMode,
-                    enabledDone = state.enabledEdit,
-                    onClickPrev = popBackStack,
-                    onClickDelete = { viewModel.onChangeVisibleConfirmModal(true) },
-                    onClickDone = { viewModel.eventEmit(LedgerDetailSideEffect.LedgerDetailEditDone) }
-                )
-            }
+    Scaffold(
+        topBar = {
+            LedgerDetailTopbarView(
+                title = "${state.fundTypeText} 상세내역",
+                useEditMode = state.useEditMode,
+                enabledDone = state.enabledEdit,
+                onClickPrev = navigateToLedger,
+                onClickDelete = { viewModel.onChangeVisibleConfirmModal(true) },
+                onClickDone = viewModel::onClickEditButton
+            )
+        }
+    ) {
+        Column(
+            modifier = modifier
+                .fillMaxSize()
+                .verticalScroll(verticalScrollState)
+                .background(Gray01)
+                .padding(it)
         ) {
-            Column(
-                modifier = modifier
+            Spacer(modifier = Modifier.height(4.dp))
+            Box(
+                modifier = Modifier
                     .fillMaxSize()
-                    .verticalScroll(verticalScrollState)
-                    .background(Gray01)
-                    .padding(it)
+                    .padding(horizontal = MMHorizontalSpacing)
+                    .clip(RoundedCornerShape(16.dp))
+                    .border(width = 1.dp, color = Blue03, shape = RoundedCornerShape(16.dp))
+                    .background(White)
             ) {
-                Spacer(modifier = Modifier.height(4.dp))
-                Box(
+                Column(
                     modifier = Modifier
                         .fillMaxSize()
-                        .padding(horizontal = MMHorizontalSpacing)
-                        .clip(RoundedCornerShape(16.dp))
-                        .border(width = 1.dp, color = Blue03, shape = RoundedCornerShape(16.dp))
                         .background(White)
+                        .padding(vertical = 28.dp, horizontal = 16.dp)
                 ) {
-                    Column(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .background(White)
-                            .padding(vertical = 28.dp, horizontal = 16.dp)
-                    ) {
-                        if (state.useEditMode) {
-                            MDSTextField(
-                                modifier = Modifier.fillMaxWidth(),
-                                value = state.storeNameValue,
-                                onValueChange = viewModel::onChangeStoreNameValue,
-                                title = withRequiredMark("수입·지출 출처"),
-                                placeholder = "",
-                                isFilled = false,
-                                isError = state.isStoreNameError,
-                                helperText = "20자 이내로 입력해주세요",
-                                maxCount = 20,
-                                icon = MDSTextFieldIcons.Clear,
-                                singleLine = true,
-                                onIconClick = { viewModel.onChangeStoreNameValue(TextFieldValue()) },
-                                keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
-                            )
-                        } else {
-                            Text(
-                                text = "수입·지출 출처",
-                                style = Body2,
-                                color = Gray06
-                            )
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = state.ledgerTransactionDetail?.storeInfo.orEmpty(),
-                                style = Body3,
-                                color = Gray10
-                            )
-                        }
-                        Box(
-                            modifier = Modifier
-                                .padding(vertical = 20.dp)
-                                .fillMaxWidth()
-                                .height(1.dp)
-                                .background(Gray03, shape = DottedShape(8.dp))
-                        )
-                        if (state.useEditMode) {
-                            MDSTextField(
-                                modifier = Modifier.fillMaxWidth(),
-                                value = state.totalPriceValue,
-                                onValueChange = viewModel::onChangeTotalPriceValue,
-                                title = withRequiredMark("${state.fundTypeText} 금액"),
-                                placeholder = "",
-                                isFilled = false,
-                                isError = state.isTotalPriceError,
-                                helperText = "999,999,999원 이내로 입력해주세요",
-                                onIconClick = { viewModel.onChangeTotalPriceValue(TextFieldValue()) },
-                                singleLine = true,
-                                icon = MDSTextFieldIcons.Clear,
-                                visualTransformation = PriceVisualTransformation(type = state.priceType),
-                                keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
-                                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
-                            )
-                        } else {
-                            Text(
-                                text = "${state.fundTypeText} 금액",
-                                style = Body2,
-                                color = Gray06
-                            )
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = "${state.priceType.symbol}${state.totalPrice}원",
-                                style = Body3,
-                                color = Gray10
-                            )
-                        }
-                        Box(
-                            modifier = Modifier
-                                .padding(vertical = 20.dp)
-                                .fillMaxWidth()
-                                .height(1.dp)
-                                .background(Gray03, shape = DottedShape(8.dp))
+                    if (state.useEditMode) {
+                        MDSTextField(
+                            modifier = Modifier.fillMaxWidth(),
+                            value = state.storeNameValue,
+                            onValueChange = viewModel::onChangeStoreNameValue,
+                            title = withRequiredMark("수입·지출 출처"),
+                            placeholder = "",
+                            isFilled = false,
+                            isError = state.isStoreNameError,
+                            helperText = "20자 이내로 입력해주세요",
+                            maxCount = 20,
+                            icon = MDSTextFieldIcons.Clear,
+                            singleLine = true,
+                            onIconClick = { viewModel.onChangeStoreNameValue(TextFieldValue()) },
+                            keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
                         )
-                        if (state.useEditMode) {
-                            MDSTextField(
-                                modifier = Modifier.fillMaxWidth(),
-                                value = state.paymentDateValue,
-                                onValueChange = viewModel::onChangePaymentDateValue,
-                                title = withRequiredMark("날짜"),
-                                placeholder = "2024/01/01",
-                                isFilled = false,
-                                isError = state.isPaymentDateError,
-                                helperText = "올바른 날짜를 입력해주세요",
-                                onIconClick = { viewModel.onChangePaymentDateValue(TextFieldValue()) },
-                                singleLine = true,
-                                icon = MDSTextFieldIcons.Clear,
-                                visualTransformation = DateVisualTransformation(),
-                                keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
-                                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
-                            )
-                        } else {
-                            Text(
-                                text = "날짜",
-                                style = Body2,
-                                color = Gray06
-                            )
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = state.formattedDate,
-                                style = Body3,
-                                color = Gray10
-                            )
-                        }
-                        Box(
-                            modifier = Modifier
-                                .padding(vertical = 20.dp)
-                                .fillMaxWidth()
-                                .height(1.dp)
-                                .background(Gray03, shape = DottedShape(8.dp))
+                    } else {
+                        Text(
+                            text = "수입·지출 출처",
+                            style = Body2,
+                            color = Gray06
                         )
-                        if (state.useEditMode) {
-                            MDSTextField(
-                                modifier = Modifier.fillMaxWidth(),
-                                value = state.paymentTimeValue,
-                                onValueChange = viewModel::onChangePaymentTimeValue,
-                                title = withRequiredMark("시간"),
-                                placeholder = "00:00:00",
-                                isFilled = false,
-                                isError = state.isPaymentTimeError,
-                                helperText = "올바른 시간을 입력해주세요",
-                                onIconClick = { viewModel.onChangePaymentTimeValue(TextFieldValue()) },
-                                singleLine = true,
-                                icon = MDSTextFieldIcons.Clear,
-                                visualTransformation = TimeVisualTransformation(),
-                                keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
-                                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
-                            )
-                        } else {
-                            Text(
-                                text = "시간",
-                                style = Body2,
-                                color = Gray06
-                            )
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = state.formattedTime,
-                                style = Body3,
-                                color = Gray10
-                            )
-                        }
-                        Box(
-                            modifier = Modifier
-                                .padding(vertical = 20.dp)
-                                .fillMaxWidth()
-                                .height(1.dp)
-                                .background(Gray03, shape = DottedShape(8.dp))
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = state.ledgerTransactionDetail?.storeInfo.orEmpty(),
+                            style = Body3,
+                            color = Gray10
                         )
-                        if (state.useEditMode) {
-                            MDSTextField(
-                                modifier = Modifier.fillMaxWidth(),
-                                value = state.memoValue,
-                                onValueChange = { viewModel.onChangeMemoValue(it) },
-                                title = "메모",
-                                placeholder = "",
-                                isFilled = false,
-                                isError = state.isMemoError,
-                                helperText = "300자 이내로 입력해주세요",
-                                maxCount = 300,
-                                singleLine = false,
-                                icon = MDSTextFieldIcons.Clear,
-                                onIconClick = { viewModel.onChangeMemoValue(TextFieldValue()) },
-                                keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() })
-                            )
-                        } else {
-                            Text(
-                                text = "메모",
-                                style = Body2,
-                                color = Gray06
-                            )
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = state.ledgerTransactionDetail?.description.orEmpty(),
-                                style = Body3,
-                                color = Gray10
-                            )
-                        }
-                        Box(
-                            modifier = Modifier
-                                .padding(vertical = 20.dp)
-                                .fillMaxWidth()
-                                .height(1.dp)
-                                .background(Gray03, shape = DottedShape(8.dp))
+                    }
+                    Box(
+                        modifier = Modifier
+                            .padding(vertical = 20.dp)
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(Gray03, shape = DottedShape(8.dp))
+                    )
+                    if (state.useEditMode) {
+                        MDSTextField(
+                            modifier = Modifier.fillMaxWidth(),
+                            value = state.totalPriceValue,
+                            onValueChange = viewModel::onChangeTotalPriceValue,
+                            title = withRequiredMark("${state.fundTypeText} 금액"),
+                            placeholder = "",
+                            isFilled = false,
+                            isError = state.isTotalPriceError,
+                            helperText = "999,999,999원 이내로 입력해주세요",
+                            onIconClick = { viewModel.onChangeTotalPriceValue(TextFieldValue()) },
+                            singleLine = true,
+                            icon = MDSTextFieldIcons.Clear,
+                            visualTransformation = PriceVisualTransformation(type = state.priceType),
+                            keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
+                            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
                         )
+                    } else {
                         Text(
-                            text = "영수증 (최대12장)",
+                            text = "${state.fundTypeText} 금액",
                             style = Body2,
                             color = Gray06
                         )
                         Spacer(modifier = Modifier.height(8.dp))
-                        LazyVerticalGrid(
-                            modifier = modifier
-                                .fillMaxSize()
-                                .heightIn(max = 504.dp)
-                                .background(White),
-                            columns = GridCells.Fixed(3),
-                            verticalArrangement = Arrangement.spacedBy(8.dp),
-                            horizontalArrangement = Arrangement.spacedBy(10.dp)
-                        ) {
-                            val showAddReceipt = state.useEditMode && state.receiptList.size < 12
-                            if (showAddReceipt) {
-                                item {
-                                    Box(
-                                        modifier = Modifier
-                                            .height(120.dp)
-                                            .clip(RoundedCornerShape(8.dp))
-                                            .background(Blue01)
-                                            .noRippleClickable {
-                                                viewModel.onChangeImageType(isReceipt = true)
-                                            },
-                                        contentAlignment = Alignment.Center
-                                    ) {
-                                        Icon(
-                                            painter = painterResource(id = R.drawable.ic_plus_outline),
-                                            contentDescription = null,
-                                            tint = Blue04
-                                        )
-                                    }
-                                }
-                            }
-                            itemsIndexed(items = state.receiptList) { index, item ->
-                                Box(
-                                    modifier = Modifier
-                                        .height(120.dp)
-                                        .clip(RoundedCornerShape(8.dp))
-                                ) {
-                                    GlideImage(
-                                        modifier = Modifier.fillMaxSize(),
-                                        model = item,
-                                        contentDescription = null,
-                                        contentScale = ContentScale.FillWidth
-                                    )
-                                    if (state.useEditMode) {
-                                        Icon(
-                                            modifier = Modifier
-                                                .align(Alignment.TopEnd)
-                                                .noRippleClickable {
-                                                    viewModel.onClickRemoveReceipt(item)
-                                                }
-                                                .padding(5.dp),
-                                            painter = painterResource(id = R.drawable.ic_close_filled),
-                                            contentDescription = null,
-                                            tint = Color.Unspecified
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                        Box(
-                            modifier = Modifier
-                                .padding(vertical = 20.dp)
-                                .fillMaxWidth()
-                                .height(1.dp)
-                                .background(Gray03, shape = DottedShape(8.dp))
+                        Text(
+                            text = "${state.priceType.symbol}${state.totalPrice}원",
+                            style = Body3,
+                            color = Gray10
+                        )
+                    }
+                    Box(
+                        modifier = Modifier
+                            .padding(vertical = 20.dp)
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(Gray03, shape = DottedShape(8.dp))
+                    )
+                    if (state.useEditMode) {
+                        MDSTextField(
+                            modifier = Modifier.fillMaxWidth(),
+                            value = state.paymentDateValue,
+                            onValueChange = viewModel::onChangePaymentDateValue,
+                            title = withRequiredMark("날짜"),
+                            placeholder = "2024/01/01",
+                            isFilled = false,
+                            isError = state.isPaymentDateError,
+                            helperText = "올바른 날짜를 입력해주세요",
+                            onIconClick = { viewModel.onChangePaymentDateValue(TextFieldValue()) },
+                            singleLine = true,
+                            icon = MDSTextFieldIcons.Clear,
+                            visualTransformation = DateVisualTransformation(),
+                            keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
+                            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
                         )
+                    } else {
                         Text(
-                            text = "증빙자료 (최대12장)",
+                            text = "날짜",
                             style = Body2,
                             color = Gray06
                         )
                         Spacer(modifier = Modifier.height(8.dp))
-                        LazyVerticalGrid(
-                            modifier = modifier
-                                .fillMaxSize()
-                                .heightIn(max = 504.dp)
-                                .background(White),
-                            columns = GridCells.Fixed(3),
-                            verticalArrangement = Arrangement.spacedBy(8.dp),
-                            horizontalArrangement = Arrangement.spacedBy(10.dp)
-                        ) {
-                            val showAddDocument = state.useEditMode && state.documentList.size < 12
-                            if (showAddDocument) {
-                                item {
-                                    Box(
-                                        modifier = Modifier
-                                            .height(120.dp)
-                                            .clip(RoundedCornerShape(8.dp))
-                                            .background(Blue01)
-                                            .noRippleClickable {
-                                                viewModel.onChangeImageType(isReceipt = false)
-                                            },
-                                        contentAlignment = Alignment.Center
-                                    ) {
-                                        Icon(
-                                            painter = painterResource(id = R.drawable.ic_plus_outline),
-                                            contentDescription = null,
-                                            tint = Blue04
-                                        )
-                                    }
-                                }
-                            }
-                            itemsIndexed(items = state.documentList) { index, item ->
-                                Box(
-                                    modifier = Modifier
-                                        .height(120.dp)
-                                        .clip(RoundedCornerShape(8.dp))
-                                ) {
-                                    GlideImage(
-                                        modifier = Modifier.fillMaxSize(),
-                                        model = item,
-                                        contentDescription = null,
-                                        contentScale = ContentScale.FillWidth
-                                    )
-                                    if (state.useEditMode) {
-                                        Icon(
-                                            modifier = Modifier
-                                                .align(Alignment.TopEnd)
-                                                .noRippleClickable {
-                                                    viewModel.onClickRemoveDocument(item)
-                                                }
-                                                .padding(5.dp),
-                                            painter = painterResource(id = R.drawable.ic_close_filled),
-                                            contentDescription = null,
-                                            tint = Color.Unspecified
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                        Box(
-                            modifier = Modifier
-                                .padding(vertical = 20.dp)
-                                .fillMaxWidth()
-                                .height(1.dp)
-                                .background(Gray03, shape = DottedShape(8.dp))
+                        Text(
+                            text = state.formattedDate,
+                            style = Body3,
+                            color = Gray10
                         )
+                    }
+                    Box(
+                        modifier = Modifier
+                            .padding(vertical = 20.dp)
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(Gray03, shape = DottedShape(8.dp))
+                    )
+                    if (state.useEditMode) {
+                        MDSTextField(
+                            modifier = Modifier.fillMaxWidth(),
+                            value = state.paymentTimeValue,
+                            onValueChange = viewModel::onChangePaymentTimeValue,
+                            title = withRequiredMark("시간"),
+                            placeholder = "00:00:00",
+                            isFilled = false,
+                            isError = state.isPaymentTimeError,
+                            helperText = "올바른 시간을 입력해주세요",
+                            onIconClick = { viewModel.onChangePaymentTimeValue(TextFieldValue()) },
+                            singleLine = true,
+                            icon = MDSTextFieldIcons.Clear,
+                            visualTransformation = TimeVisualTransformation(),
+                            keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
+                            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
+                        )
+                    } else {
                         Text(
-                            text = "작성자",
+                            text = "시간",
                             style = Body2,
                             color = Gray06
                         )
                         Spacer(modifier = Modifier.height(8.dp))
                         Text(
-                            text = state.ledgerTransactionDetail?.authorName.orEmpty(),
+                            text = state.formattedTime,
                             style = Body3,
                             color = Gray10
                         )
                     }
-                }
-                if (state.isStaff) {
+                    Box(
+                        modifier = Modifier
+                            .padding(vertical = 20.dp)
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(Gray03, shape = DottedShape(8.dp))
+                    )
                     if (state.useEditMode) {
-                        MDSButton(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(vertical = 12.dp, horizontal = 20.dp),
-                            text = "완료하기",
-                            enabled = state.enabledEdit,
-                            size = MDSButtonSize.LARGE,
-                            type = MDSButtonType.PRIMARY,
-                            onClick = { viewModel.eventEmit(LedgerDetailSideEffect.LedgerDetailEditDone) }
+                        MDSTextField(
+                            modifier = Modifier.fillMaxWidth(),
+                            value = state.memoValue,
+                            onValueChange = { viewModel.onChangeMemoValue(it) },
+                            title = "메모",
+                            placeholder = "",
+                            isFilled = false,
+                            isError = state.isMemoError,
+                            helperText = "300자 이내로 입력해주세요",
+                            maxCount = 300,
+                            singleLine = false,
+                            icon = MDSTextFieldIcons.Clear,
+                            onIconClick = { viewModel.onChangeMemoValue(TextFieldValue()) },
+                            keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() })
                         )
                     } else {
-                        MDSButton(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(vertical = 12.dp, horizontal = 20.dp),
-                            text = "수정하기",
-                            size = MDSButtonSize.LARGE,
-                            type = MDSButtonType.PRIMARY,
-                            onClick = { viewModel.eventEmit(LedgerDetailSideEffect.LedgerDetailEdit) }
+                        Text(
+                            text = "메모",
+                            style = Body2,
+                            color = Gray06
                         )
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = state.ledgerTransactionDetail?.description.orEmpty(),
+                            style = Body3,
+                            color = Gray10
+                        )
+                    }
+                    Box(
+                        modifier = Modifier
+                            .padding(vertical = 20.dp)
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(Gray03, shape = DottedShape(8.dp))
+                    )
+                    Text(
+                        text = "사진 첨부 (최대12장)",
+                        style = Body2,
+                        color = Gray06
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    LazyVerticalGrid(
+                        modifier = modifier
+                            .fillMaxSize()
+                            .heightIn(max = 504.dp)
+                            .background(White),
+                        columns = GridCells.Fixed(3),
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                        horizontalArrangement = Arrangement.spacedBy(10.dp)
+                    ) {
+                        val showAddDocument = state.useEditMode && state.documentList.size < 12
+                        if (showAddDocument) {
+                            item {
+                                Box(
+                                    modifier = Modifier
+                                        .height(120.dp)
+                                        .clip(RoundedCornerShape(8.dp))
+                                        .background(Blue01)
+                                        .noRippleClickable(viewModel::onClickOpenImagePicker),
+                                    contentAlignment = Alignment.Center
+                                ) {
+                                    Icon(
+                                        painter = painterResource(id = R.drawable.ic_plus_outline),
+                                        contentDescription = null,
+                                        tint = Blue04
+                                    )
+                                }
+                            }
+                        }
+                        itemsIndexed(items = state.documentList) { index, item ->
+                            Box(
+                                modifier = Modifier
+                                    .height(120.dp)
+                                    .clip(RoundedCornerShape(8.dp))
+                            ) {
+                                GlideImage(
+                                    modifier = Modifier.fillMaxSize(),
+                                    model = item,
+                                    contentDescription = null,
+                                    contentScale = ContentScale.FillWidth
+                                )
+                                if (state.useEditMode) {
+                                    Icon(
+                                        modifier = Modifier
+                                            .align(Alignment.TopEnd)
+                                            .noRippleClickable {
+                                                viewModel.onClickRemoveDocument(item)
+                                            }
+                                            .padding(5.dp),
+                                        painter = painterResource(id = R.drawable.ic_close_filled),
+                                        contentDescription = null,
+                                        tint = Color.Unspecified
+                                    )
+                                }
+                            }
+                        }
                     }
+                    Box(
+                        modifier = Modifier
+                            .padding(vertical = 20.dp)
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(Gray03, shape = DottedShape(8.dp))
+                    )
+                    Text(
+                        text = "작성자",
+                        style = Body2,
+                        color = Gray06
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Text(
+                        text = state.ledgerTransactionDetail?.authorName.orEmpty(),
+                        style = Body3,
+                        color = Gray10
+                    )
                 }
             }
+            Spacer(modifier = Modifier.height(20.dp))
+            if (state.isStaff) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(White)
+                        .padding(horizontal = MMHorizontalSpacing),
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    Spacer(modifier = Modifier.height(20.dp))
+                    MDSButton(
+                        modifier = Modifier.fillMaxWidth(),
+                        text = "수정하기",
+                        enabled = state.enabledEdit,
+                        size = MDSButtonSize.LARGE,
+                        type = MDSButtonType.PRIMARY,
+                        onClick = viewModel::onClickEditButton
+                    )
+                    Spacer(modifier = Modifier.height(12.dp))
+                }
+            }
+        }
+        if (state.isLoading) {
+            LoadingScreen(modifier = Modifier.fillMaxSize())
         }
     }
 }
@@ -572,6 +498,5 @@ fun LedgerDetailScreenPreview() {
     LedgerDetailScreen(
         ledgerTransactionId = 0,
         navigateToLedger = {},
-        popBackStack = {}
     )
 }
\ No newline at end of file
diff --git a/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailState.kt b/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailState.kt
index 43c1771a..cfb27339 100644
--- a/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailState.kt
+++ b/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailState.kt
@@ -27,10 +27,7 @@ data class LedgerDetailState(
     val isPaymentTimeError: Boolean = false,
     val isMemoError: Boolean = false,
     val ledgerTransactionDetail: LedgerTransactionDetailResponse? = null,
-    val receiptList: List<String> = emptyList(),
     val documentList: List<String> = emptyList(),
-    val isReceipt: Boolean? = null,
-    val receiptIdList: List<Int> = emptyList(),
     val documentIdList: List<Int> = emptyList(),
     val showConfirmModal: Boolean = false,
     val showErrorDialog: Boolean = false,
diff --git a/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailViewModel.kt b/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailViewModel.kt
index 3c6053b2..1f4e0157 100644
--- a/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailViewModel.kt
+++ b/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailViewModel.kt
@@ -12,19 +12,17 @@ import com.moneymong.moneymong.common.ui.validateValue
 import com.moneymong.moneymong.domain.usecase.ledgerdetail.FetchLedgerTransactionDetailUseCase
 import com.moneymong.moneymong.domain.usecase.ledgerdetail.DeleteLedgerDetailUseCase
 import com.moneymong.moneymong.domain.usecase.ledgerdetail.DeleteLedgerDocumentTransactionUseCase
-import com.moneymong.moneymong.domain.usecase.ledgerdetail.DeleteLedgerReceiptTransactionUseCase
 import com.moneymong.moneymong.domain.usecase.ledgerdetail.PostLedgerDocumentTransactionUseCase
-import com.moneymong.moneymong.domain.usecase.ledgerdetail.PostLedgerReceiptTransactionUseCase
 import com.moneymong.moneymong.domain.usecase.ledgerdetail.UpdateLedgerTransactionDetailUseCase
 import com.moneymong.moneymong.domain.usecase.ocr.PostFileUploadUseCase
 import com.moneymong.moneymong.ledgerdetail.navigation.LedgerDetailArgs
 import com.moneymong.moneymong.model.ledgerdetail.LedgerDocumentRequest
-import com.moneymong.moneymong.model.ledgerdetail.LedgerReceiptRequest
 import com.moneymong.moneymong.model.ledgerdetail.LedgerTransactionDetailRequest
 import com.moneymong.moneymong.model.ledgerdetail.LedgerTransactionDetailResponse
 import com.moneymong.moneymong.model.ocr.FileUploadRequest
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.delay
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.annotation.OrbitExperimental
 import org.orbitmvi.orbit.syntax.simple.blockingIntent
 import org.orbitmvi.orbit.syntax.simple.intent
@@ -39,9 +37,7 @@ class LedgerDetailViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val fetchLedgerTransactionDetailUseCase: FetchLedgerTransactionDetailUseCase,
     private val updateLedgerTransactionDetailUseCase: UpdateLedgerTransactionDetailUseCase,
-    private val postLedgerReceiptTransactionUseCase: PostLedgerReceiptTransactionUseCase,
     private val postLedgerDocumentTransactionUseCase: PostLedgerDocumentTransactionUseCase,
-    private val deleteLedgerReceiptTransactionUseCase: DeleteLedgerReceiptTransactionUseCase,
     private val deleteLedgerDocumentTransactionUseCase: DeleteLedgerDocumentTransactionUseCase,
     private val postFileUploadUseCase: PostFileUploadUseCase,
     private val deleteLedgerDetailUseCase: DeleteLedgerDetailUseCase
@@ -52,11 +48,18 @@ class LedgerDetailViewModel @Inject constructor(
     }
 
     fun ledgerTransactionEdit(detailId: Int) = intent {
-        postLedgerReceiptTransaction(detailId)
-        deleteLedgerReceiptTransaction(detailId)
-        postLedgerDocumentTransaction(detailId)
-        deleteLedgerDocumentTransaction(detailId)
+        reduce { state.copy(isLoading = true) }
+
+        coroutineScope {
+            launch { postLedgerDocumentTransaction(detailId) }
+            launch { deleteLedgerDocumentTransaction(detailId) }
+        }.join()
+
         updateLedgerTransactionDetail(detailId)
+
+        reduce { state.copy(isLoading = false) }
+
+        fetchLedgerTransactionDetail(detailId)
     }
 
     fun fetchLedgerTransactionDetail(detailId: Int) = intent {
@@ -71,8 +74,6 @@ class LedgerDetailViewModel @Inject constructor(
     }
 
     fun updateLedgerTransactionDetail(detailId: Int) = intent {
-        reduce { state.copy(isLoading = true) }
-        delay(1000) // 사진 수정 내용이 DB 반영되기 까지 걸리는 시간을 대응하기 위해 delay 설정
         val request = LedgerTransactionDetailRequest(
             storeInfo = state.storeNameValue.text,
             amount = state.totalPriceValue.text.toInt(),
@@ -85,28 +86,11 @@ class LedgerDetailViewModel @Inject constructor(
                 initTextValue(it)
             }.onFailure {
                 showErrorDialog(it.message)
-            }.also { reduce { state.copy(isLoading = false) } }
-    }
-
-    fun postLedgerReceiptTransaction(detailId: Int) = intent {
-        if (state.receiptList.isNotEmpty()) {
-            reduce { state.copy(isLoading = true) }
-            val mapToOriginalUrl =
-                state.ledgerTransactionDetail?.receiptImageUrls?.map { it.receiptImageUrl }
-                    .orEmpty()
-            val request = LedgerReceiptRequest(
-                receiptImageUrls = state.receiptList - mapToOriginalUrl.toSet()
-            )
-            postLedgerReceiptTransactionUseCase(detailId, request)
-                .onFailure {
-                    showErrorDialog(it.message)
-                }.also { reduce { state.copy(isLoading = false) } }
-        }
+            }
     }
 
     fun postLedgerDocumentTransaction(detailId: Int) = intent {
         if (state.documentList.isNotEmpty()) {
-            reduce { state.copy(isLoading = true) }
             val mapToOriginalUrl =
                 state.ledgerTransactionDetail?.documentImageUrls?.map { it.documentImageUrl }
                     .orEmpty()
@@ -116,42 +100,28 @@ class LedgerDetailViewModel @Inject constructor(
             postLedgerDocumentTransactionUseCase(detailId, request)
                 .onFailure {
                     showErrorDialog(it.message)
-                }.also { reduce { state.copy(isLoading = false) } }
-        }
-    }
-
-    fun deleteLedgerReceiptTransaction(detailId: Int) = intent {
-        if (state.receiptIdList.isNotEmpty()) {
-            reduce { state.copy(isLoading = true) }
-            state.receiptIdList.forEach { receiptId ->
-                deleteLedgerReceiptTransactionUseCase(detailId, receiptId)
-                    .onFailure {
-                        showErrorDialog(it.message)
-                    }.also { reduce { state.copy(isLoading = false) } }
-            }
+                }
         }
     }
 
     fun deleteLedgerDocumentTransaction(detailId: Int) = intent {
         if (state.documentIdList.isNotEmpty()) {
-            reduce { state.copy(isLoading = true) }
             state.documentIdList.forEach { documentId ->
                 deleteLedgerDocumentTransactionUseCase(detailId, documentId)
                     .onFailure {
                         showErrorDialog(it.message)
-                    }.also { reduce { state.copy(isLoading = false) } }
+                    }
             }
         }
     }
 
     fun deleteLedgerDetail(detailId: Int) = intent {
-        reduce { state.copy(isLoading = true) }
         deleteLedgerDetailUseCase(detailId)
             .onSuccess {
                 postSideEffect(LedgerDetailSideEffect.LedgerDetailNavigateToLedger)
             }.onFailure {
                 showErrorDialog(it.message)
-            }.also { reduce { state.copy(isLoading = false) } }
+            }
     }
 
     fun postS3URLImage(imageFile: File?) = intent {
@@ -161,49 +131,16 @@ class LedgerDetailViewModel @Inject constructor(
                 val file = FileUploadRequest(it.toMultipart(), "ledgerDetail")
                 postFileUploadUseCase(file)
                     .onSuccess { response ->
-                        state.isReceipt?.let { isReceipt ->
-                            if (isReceipt) {
-                                reduce { state.copy(receiptList = state.receiptList + response.path) }
-                            } else {
-                                reduce { state.copy(documentList = state.documentList + response.path) }
-                            }
-                        }
+                        reduce { state.copy(documentList = state.documentList + response.path) }
                     }.onFailure {
                         showErrorDialog(it.message)
                     }.also {
-                        reduce {
-                            state.copy(
-                                isLoading = false,
-                                isReceipt = null
-                            )
-                        }
+                        reduce { state.copy(isLoading = false) }
                     }
             }
         }
     }
 
-    fun onClickRemoveReceipt(receiptImage: String) = intent {
-        state.ledgerTransactionDetail?.let {
-            val receiptId = it.receiptImageUrls.find { it.receiptImageUrl == receiptImage }?.id ?: 0
-            val isOriginalReceipt =
-                it.receiptImageUrls.map { it.receiptImageUrl }.contains(receiptImage)
-            if (isOriginalReceipt) {
-                reduce {
-                    state.copy(
-                        receiptList = state.receiptList - receiptImage,
-                        receiptIdList = state.receiptIdList + receiptId
-                    )
-                }
-            } else {
-                reduce {
-                    state.copy(
-                        receiptList = state.receiptList - receiptImage
-                    )
-                }
-            }
-        }
-    }
-
     fun onClickRemoveDocument(documentImage: String) = intent {
         state.ledgerTransactionDetail?.let {
             val documentId =
@@ -227,7 +164,17 @@ class LedgerDetailViewModel @Inject constructor(
         }
     }
 
-    private fun initTextValue(ledgerTransactionDetail: LedgerTransactionDetailResponse) = intent {
+    fun onClickEditButton() = intent {
+        if (state.useEditMode) {
+            eventEmit(LedgerDetailSideEffect.LedgerDetailEditDone)
+        } else {
+            eventEmit(LedgerDetailSideEffect.LedgerDetailEdit)
+        }
+    }
+
+    fun onClickOpenImagePicker() = eventEmit(LedgerDetailSideEffect.LedgerDetailOpenImagePicker)
+
+    private fun initTextValue(ledgerTransactionDetail: LedgerTransactionDetailResponse) = blockingIntent {
         reduce {
             state.copy(
                 storeNameValue = state.storeNameValue.copy(text = ledgerTransactionDetail.storeInfo),
@@ -243,9 +190,7 @@ class LedgerDetailViewModel @Inject constructor(
                     )
                 ),
                 memoValue = state.memoValue.copy(text = ledgerTransactionDetail.description),
-                receiptList = ledgerTransactionDetail.receiptImageUrls.map { it.receiptImageUrl },
                 documentList = ledgerTransactionDetail.documentImageUrls.map { it.documentImageUrl },
-                receiptIdList = emptyList(),
                 documentIdList = emptyList()
             )
         }
@@ -315,11 +260,6 @@ class LedgerDetailViewModel @Inject constructor(
         reduce { state.copy(useEditMode = useEditMode) }
     }
 
-    fun onChangeImageType(isReceipt: Boolean) = intent {
-        reduce { state.copy(isReceipt = isReceipt) }
-        postSideEffect(LedgerDetailSideEffect.LedgerDetailOpenImagePicker)
-    }
-
     fun onChangeVisibleConfirmModal(visible: Boolean) = intent {
         reduce { state.copy(showConfirmModal = visible) }
     }
diff --git a/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/navigation/LedgerDetailNavigation.kt b/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/navigation/LedgerDetailNavigation.kt
index 216cee12..a75cd3df 100644
--- a/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/navigation/LedgerDetailNavigation.kt
+++ b/feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/navigation/LedgerDetailNavigation.kt
@@ -12,7 +12,6 @@ import com.moneymong.moneymong.ledgerdetail.LedgerDetailScreen
 const val LEDGER_TRANSACTION_ID = "ledgerTransactionId"
 const val LEDGER_DETAIL_IS_STAFF = "LedgerDetailIsStaff"
 const val ledgerDetailRoute = "ledgerDetail_route/{${LEDGER_TRANSACTION_ID}}/{${LEDGER_DETAIL_IS_STAFF}}"
-//const val ledgerDetailRouteWithArgs = "${ledgerDetailRoute}/{${LEDGER_DETAIL_IS_STAFF}}"
 
 fun NavController.navigateLedgerDetail(
     navOptions: NavOptions? = null,
@@ -23,8 +22,7 @@ fun NavController.navigateLedgerDetail(
 }
 
 fun NavGraphBuilder.ledgerDetailScreen(
-    navigateToLedger: (ledgerPostSuccess: Boolean) -> Unit,
-    popBackStack: () -> Unit
+    navigateToLedger: () -> Unit,
 ) {
     composable(
         route = ledgerDetailRoute,
@@ -40,7 +38,6 @@ fun NavGraphBuilder.ledgerDetailScreen(
         LedgerDetailScreen(
             ledgerTransactionId = ledgerTransactionId,
             navigateToLedger = navigateToLedger,
-            popBackStack = popBackStack
         )
     }
 }
diff --git a/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualScreen.kt b/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualScreen.kt
index 28e1f910..3666a4db 100644
--- a/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualScreen.kt
+++ b/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualScreen.kt
@@ -71,12 +71,12 @@ import com.moneymong.moneymong.design_system.component.textfield.visualtransform
 import com.moneymong.moneymong.design_system.component.textfield.visualtransformation.TimeVisualTransformation
 import com.moneymong.moneymong.design_system.error.ErrorDialog
 import com.moneymong.moneymong.design_system.theme.Blue03
-import com.moneymong.moneymong.design_system.theme.Blue04
 import com.moneymong.moneymong.design_system.theme.Body2
 import com.moneymong.moneymong.design_system.theme.Body3
 import com.moneymong.moneymong.design_system.theme.Gray06
 import com.moneymong.moneymong.design_system.theme.Gray10
 import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
+import com.moneymong.moneymong.design_system.theme.Red03
 import com.moneymong.moneymong.design_system.theme.White
 import com.moneymong.moneymong.ledgermanual.view.LedgerManualTopbarView
 import com.moneymong.moneymong.model.ledger.FundType
@@ -125,7 +125,7 @@ fun LedgerManualScreen(
             is LedgerManualSideEffect.LegerManualHidePopBackStackModal -> {
                 viewModel.visiblePopBackStackModal(false)
                 if (it.navigate) {
-                    navigateToLedger(false)
+                    popBackStack()
                 }
             }
 
@@ -235,12 +235,7 @@ fun LedgerManualScreen(
                 )
                 Spacer(modifier = Modifier.height(24.dp))
                 Text(
-                    text = buildAnnotatedString {
-                        append("거래 유형")
-                        withStyle(SpanStyle(color = Gray06)) {
-                            append("*")
-                        }
-                    },
+                    text = withRequiredMark("거래 유형"),
                     style = Body2,
                     color = Gray06
                 )
@@ -321,77 +316,7 @@ fun LedgerManualScreen(
                 )
                 Spacer(modifier = Modifier.height(24.dp))
                 Text(
-                    text = buildAnnotatedString {
-                        append("영수증 (최대 12장)\n")
-                        withStyle(SpanStyle(color = Blue04)) {
-                            append("*지출일 경우 영수증을 꼭 제출해주세요")
-                        }
-                    },
-                    style = Body2,
-                    color = Gray06
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-                LazyVerticalGrid(
-                    modifier = modifier
-                        .fillMaxSize()
-                        .heightIn(max = 504.dp)
-                        .background(White),
-                    columns = GridCells.Fixed(3),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                    horizontalArrangement = Arrangement.spacedBy(10.dp)
-                ) {
-                    if (state.receiptList.size < 12) {
-                        item {
-                            Box(
-                                modifier = Modifier
-                                    .height(120.dp)
-                                    .clip(RoundedCornerShape(8.dp))
-                                    .border(
-                                        width = 1.dp,
-                                        color = Blue03,
-                                        shape = RoundedCornerShape(8.dp)
-                                    )
-                                    .background(White)
-                                    .noRippleClickable {
-                                        viewModel.onChangeImageType(true)
-                                    },
-                                contentAlignment = Alignment.Center
-                            ) {
-                                Icon(
-                                    painter = painterResource(id = drawable.ic_plus_filled),
-                                    contentDescription = null,
-                                    tint = Color.Unspecified
-                                )
-                            }
-                        }
-                    }
-                    itemsIndexed(items = state.receiptList) { index, item ->
-                        Box(
-                            modifier = Modifier
-                                .height(120.dp)
-                                .clip(RoundedCornerShape(8.dp))
-                        ) {
-                            GlideImage(
-                                modifier = Modifier.fillMaxSize(),
-                                model = Uri.parse(item),
-                                contentDescription = null,
-                                contentScale = ContentScale.FillWidth
-                            )
-                            Icon(
-                                modifier = Modifier
-                                    .align(Alignment.TopEnd)
-                                    .noRippleClickable { viewModel.removeReceiptImage(item) }
-                                    .padding(5.dp),
-                                painter = painterResource(id = drawable.ic_close_filled),
-                                contentDescription = null,
-                                tint = Color.Unspecified
-                            )
-                        }
-                    }
-                }
-                Spacer(modifier = Modifier.height(24.dp))
-                Text(
-                    text = "증빙 자료 (최대 12장)",
+                    text = "사진 첨부 (최대 12장)",
                     style = Body2,
                     color = Gray06
                 )
@@ -409,7 +334,7 @@ fun LedgerManualScreen(
                         item {
                             Box(
                                 modifier = Modifier
-                                    .height(120.dp)
+                                    .height(140.dp)
                                     .clip(RoundedCornerShape(8.dp))
                                     .border(
                                         width = 1.dp,
@@ -418,7 +343,7 @@ fun LedgerManualScreen(
                                     )
                                     .background(White)
                                     .noRippleClickable {
-                                        viewModel.onChangeImageType(false)
+                                        viewModel.onOpenImagePicker()
                                     },
                                 contentAlignment = Alignment.Center
                             ) {
@@ -433,7 +358,7 @@ fun LedgerManualScreen(
                     itemsIndexed(items = state.documentList) { index, item ->
                         Box(
                             modifier = Modifier
-                                .height(120.dp)
+                                .height(140.dp)
                                 .clip(RoundedCornerShape(8.dp))
                         ) {
                             GlideImage(
diff --git a/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualState.kt b/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualState.kt
index 65e240be..7b4725ee 100644
--- a/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualState.kt
+++ b/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualState.kt
@@ -17,14 +17,12 @@ data class LedgerManualState(
     val paymentTimeValue: TextFieldValue = TextFieldValue(),
     val memoValue: TextFieldValue = TextFieldValue(),
     val fundType: FundType = FundType.NONE,
-    val receiptList: List<String> = emptyList(),
     val documentList: List<String> = emptyList(),
     val isStoreNameError: Boolean = false,
     val isTotalPriceError: Boolean = false,
     val isPaymentDateError: Boolean = false,
     val isPaymentTimeError: Boolean = false,
     val isMemoError: Boolean = false,
-    val isReceipt: Boolean? = null,
     val showPopBackStackModal: Boolean = false,
     val showErrorDialog: Boolean = false,
     val errorMessage: String = ""
diff --git a/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualViewModel.kt b/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualViewModel.kt
index 5eae14a7..b99ee70e 100644
--- a/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualViewModel.kt
+++ b/feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualViewModel.kt
@@ -55,8 +55,7 @@ class LedgerManualViewModel @Inject constructor(
                 amount = state.totalPriceValue.text.toInt(),
                 description = state.memoValue.text.ifEmpty { "내용 없음" },
                 paymentDate = state.postPaymentDate,
-                receiptImageUrls = state.receiptList,
-                documentImageUrls = state.documentList
+                documentImageUrls = state.documentList,
             )
             postLedgerTransactionUseCase(state.agencyId, ledgerTransactionRequest)
                 .onSuccess {
@@ -79,20 +78,13 @@ class LedgerManualViewModel @Inject constructor(
                 val file = FileUploadRequest(it.toMultipart(), "ledgerManual")
                 postFileUploadUseCase(file)
                     .onSuccess { response ->
-                        state.isReceipt?.let { isReceipt ->
-                            if (isReceipt) {
-                                reduce { state.copy(receiptList = state.receiptList + response.path) }
-                            } else {
-                                reduce { state.copy(documentList = state.documentList + response.path) }
-                            }
-                        }
+                        reduce { state.copy(documentList = state.documentList + response.path) }
                     }.onFailure {
-                        // TODO
+                        // FIXME : 정책 필요
                     }.also {
                         reduce {
                             state.copy(
                                 isLoading = false,
-                                isReceipt = null
                             )
                         }
                     }
@@ -161,8 +153,7 @@ class LedgerManualViewModel @Inject constructor(
         }
     }
 
-    fun onChangeImageType(isReceipt: Boolean) = intent {
-        reduce { state.copy(isReceipt = isReceipt) }
+    fun onOpenImagePicker() = intent {
         postSideEffect(LedgerManualSideEffect.LedgerManualOpenImagePicker)
     }
 
@@ -178,10 +169,6 @@ class LedgerManualViewModel @Inject constructor(
         reduce { state.copy(showPopBackStackModal = visible) }
     }
 
-    fun removeReceiptImage(image: String) = intent {
-        reduce { state.copy(receiptList = state.receiptList - image) }
-    }
-
     fun removeDocumentImage(image: String) = intent {
         reduce { state.copy(documentList = state.documentList - image) }
     }
diff --git a/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongScreen.kt b/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongScreen.kt
index 7eecaeb5..b2d19854 100644
--- a/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongScreen.kt
+++ b/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongScreen.kt
@@ -100,7 +100,6 @@ fun MyMongScreen(
             errorMessage = state.infoErrorMessage,
             name = state.name,
             email = state.email,
-            university = state.university,
             getInfo = viewModel::getInfo
         )
         Spacer(modifier = Modifier.height(16.dp))
diff --git a/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongState.kt b/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongState.kt
index 5c0e37e1..6b49e415 100644
--- a/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongState.kt
+++ b/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongState.kt
@@ -5,7 +5,6 @@ import com.moneymong.moneymong.common.base.State
 data class MyMongState(
     val name: String = "",
     val email: String = "",
-    val university: String = "",
     val infoErrorMessage: String = "",
     val logoutErrorMessage: String = "",
     val isInfoLoading: Boolean = true,
diff --git a/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongViewModel.kt b/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongViewModel.kt
index 3d10ad2a..e3beeab0 100644
--- a/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongViewModel.kt
+++ b/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongViewModel.kt
@@ -52,7 +52,6 @@ class MyMongViewModel @Inject constructor(
                     state.copy(
                         name = it.name,
                         email = it.email,
-                        university = it.university.orEmpty(),
                     )
                 }
             }.onFailure {
diff --git a/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/view/MyMongInfoView.kt b/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/view/MyMongInfoView.kt
index 01721d10..60757770 100644
--- a/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/view/MyMongInfoView.kt
+++ b/feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/view/MyMongInfoView.kt
@@ -1,17 +1,12 @@
 package com.moneymong.moneymong.feature.mymong.main.view
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 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.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -25,14 +20,9 @@ import com.moneymong.moneymong.design_system.component.indicator.LoadingItem
 import com.moneymong.moneymong.design_system.error.ErrorItem
 import com.moneymong.moneymong.design_system.theme.Blue04
 import com.moneymong.moneymong.design_system.theme.Body2
-import com.moneymong.moneymong.design_system.theme.Body3
-import com.moneymong.moneymong.design_system.theme.Body4
-import com.moneymong.moneymong.design_system.theme.Gray07
 import com.moneymong.moneymong.design_system.theme.Gray08
 import com.moneymong.moneymong.design_system.theme.Gray10
 import com.moneymong.moneymong.design_system.theme.Heading1
-import com.moneymong.moneymong.design_system.theme.White
-import com.moneymong.moneymong.feature.mymong.main.util.myMongRoundRectShadow
 
 @Composable
 internal fun MyMongInfoView(
@@ -42,7 +32,6 @@ internal fun MyMongInfoView(
     errorMessage: String,
     name: String,
     email: String,
-    university: String,
     getInfo: () -> Unit
 ) {
     Box(
@@ -64,8 +53,6 @@ internal fun MyMongInfoView(
                 name = name,
                 email = email
             )
-            Spacer(modifier = Modifier.height(20.dp))
-            UniversityInfo(university = university)
         }
     }
 }
@@ -114,45 +101,4 @@ private fun Profile(
             }
         }
     }
-}
-
-
-@Composable
-fun UniversityInfo(
-    university: String
-) {
-
-    val universityInfoText = university.ifEmpty { "정보 없음" }
-
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .myMongRoundRectShadow()
-            .background(color = White, shape = RoundedCornerShape(12.dp))
-            .padding(vertical = 20.dp, horizontal = 16.dp)
-    ) {
-        Column {
-            Text(
-                text = "학교정보",
-                color = Gray07,
-                style = Body3
-            )
-            Spacer(modifier = Modifier.height(6.dp))
-            Row(
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Image(
-                    modifier = Modifier.size(24.dp),
-                    painter = painterResource(id = R.drawable.img_university),
-                    contentDescription = "school icon"
-                )
-                Spacer(modifier = Modifier.width(8.dp))
-                Text(
-                    text = universityInfoText,
-                    color = Gray08,
-                    style = Body4
-                )
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/feature/ocr-detail/src/main/java/com/moneymong/moneymong/ocr_detail/OCRDetailViewModel.kt b/feature/ocr-detail/src/main/java/com/moneymong/moneymong/ocr_detail/OCRDetailViewModel.kt
index b987fca8..a5ed714e 100644
--- a/feature/ocr-detail/src/main/java/com/moneymong/moneymong/ocr_detail/OCRDetailViewModel.kt
+++ b/feature/ocr-detail/src/main/java/com/moneymong/moneymong/ocr_detail/OCRDetailViewModel.kt
@@ -102,7 +102,6 @@ class OCRDetailViewModel @Inject constructor(
                 amount = state.totalPriceValue.text.replace(".", "").toInt(),
                 description = state.memoValue.text,
                 paymentDate = state.postPaymentDate,
-                receiptImageUrls = state.receiptImageUrls,
                 documentImageUrls = documentImageUrls.ifEmpty {
                     emptyList()
                 }
diff --git a/feature/ocr-result/src/main/java/com/moneymong/moneymong/ocr_result/OCRResultViewModel.kt b/feature/ocr-result/src/main/java/com/moneymong/moneymong/ocr_result/OCRResultViewModel.kt
index b7e9c027..c1f7d5da 100644
--- a/feature/ocr-result/src/main/java/com/moneymong/moneymong/ocr_result/OCRResultViewModel.kt
+++ b/feature/ocr-result/src/main/java/com/moneymong/moneymong/ocr_result/OCRResultViewModel.kt
@@ -50,7 +50,7 @@ class OCRResultViewModel @Inject constructor(
                 amount = state.receipt?.totalPrice?.price?.formatted?.value.orEmpty().toInt(),
                 description = state.memo,
                 paymentDate = state.postPaymentDate,
-                receiptImageUrls = listOf(s3Url)
+                documentImageUrls = listOf(s3Url)
             )
             postLedgerTransactionUseCase(state.agencyId, ledgerTransactionRequest)
                 .onSuccess {
diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/LoginScreen.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/LoginScreen.kt
index d80b937b..de53caa8 100644
--- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/LoginScreen.kt
+++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/LoginScreen.kt
@@ -1,47 +1,45 @@
 package com.moneymong.moneymong.feature.sign
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 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.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.moneymong.moneymong.design_system.R
 import com.moneymong.moneymong.design_system.error.ErrorScreen
-import com.moneymong.moneymong.design_system.theme.Blue04
+import com.moneymong.moneymong.design_system.theme.Gray01
 import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
 import com.moneymong.moneymong.feature.sign.util.KakaoLogin
 import com.moneymong.moneymong.feature.sign.view.KakaoLoginView
-import com.moneymong.moneymong.feature.sign.view.TitleView
+import com.moneymong.moneymong.feature.sign.view.SignUpOnboardingCarouselView
 import com.moneymong.moneymong.feature.sign.viewmodel.LoginViewModel
 import org.orbitmvi.orbit.compose.collectAsState
 
 @Composable
 fun LoginScreen(
-    navigateToSignup: () -> Unit,
     navigateToLedger: () -> Unit,
     navigateToLogin: () -> Unit,
+    navigateToAgencyRegister: () -> Unit,
     viewModel: LoginViewModel = hiltViewModel()
 ) {
     val state = viewModel.collectAsState().value
     val context = LocalContext.current
 
-    LaunchedEffect(key1 = state.isSchoolInfoProvided) {
-        if (state.isSchoolInfoProvided == true) {
-            navigateToLedger()
-        } else if (state.isSchoolInfoProvided == false) {
-            navigateToSignup()
-            viewModel.isSchoolInfoProvidedChanged(null)
+    LaunchedEffect(state.hasAnyAgency) {
+        state.hasAnyAgency?.let {
+            if (it) {
+                navigateToLedger()
+            } else {
+                navigateToAgencyRegister()
+            }
         }
     }
 
@@ -53,50 +51,33 @@ fun LoginScreen(
         }
     }
 
-    if (state.visibleError == true) {
+    if (state.visibleError) {
         ErrorScreen(
             modifier = Modifier.fillMaxSize(),
             message = state.errorMessage,
             onRetry = { viewModel.visibleErrorChanged(false) }
         )
-    } else if (state.visibleError == false) {
+    } else {
         Column(
             modifier = Modifier
                 .fillMaxSize()
-                .background(color = Blue04)
-                .padding(start = MMHorizontalSpacing, end = MMHorizontalSpacing, bottom = 28.dp)
+                .background(color = Gray01)
+                .padding(start = MMHorizontalSpacing, end = MMHorizontalSpacing, bottom = 28.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            Column(
-                modifier = Modifier
-                    .weight(1f),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center
-            ) {
-                Image(
-                    modifier = Modifier.size(320.dp, 162.dp),
-                    painter = painterResource(id = R.drawable.img_login_mymong),
-                    contentDescription = null
-                )
-                TitleView("교내 회계관리를 편리하게", "수기 기록은 이제 그만! 간단하게 기록해요.")
-            }
-
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth(),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Bottom
-            ) {
-                KakaoLoginView(
-                    modifier = Modifier.fillMaxWidth(),
-                    loginByKaKao = {
-                        KakaoLogin(
-                            context = context,
-                            onSuccess = viewModel::onKakaoLoginSuccess,
-                            onFailure = viewModel::onKakaoLoginFailure
-                        )
-                    }
-                )
-            }
+            Spacer(Modifier.height(36.dp))
+            SignUpOnboardingCarouselView()
+            Spacer(Modifier.weight(1f))
+            KakaoLoginView(
+                modifier = Modifier.fillMaxWidth(),
+                loginByKaKao = {
+                    KakaoLogin(
+                        context = context,
+                        onSuccess = viewModel::onKakaoLoginSuccess,
+                        onFailure = viewModel::onKakaoLoginFailure
+                    )
+                }
+            )
         }
     }
 }
diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/dto/CarouselData.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/dto/CarouselData.kt
new file mode 100644
index 00000000..0a2e0cf5
--- /dev/null
+++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/dto/CarouselData.kt
@@ -0,0 +1,7 @@
+package com.moneymong.moneymong.feature.sign.dto
+
+data class CarouselData(
+    val title: String,
+    val description: String,
+    val imageRes: Int
+)
diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/navigation/LoginNavigation.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/navigation/LoginNavigation.kt
index a2d13888..cc54f351 100644
--- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/navigation/LoginNavigation.kt
+++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/navigation/LoginNavigation.kt
@@ -18,15 +18,15 @@ fun NavController.navigateLogin(
 }
 
 fun NavGraphBuilder.loginScreen(
-    navigateToSignUp: () -> Unit,
     navigateToLedger: () -> Unit,
-    navigateToLogin: () -> Unit
+    navigateToLogin: () -> Unit,
+    navigateToAgencyRegister: () -> Unit,
 ) {
     composable(route = loginRoute) {
         LoginScreen(
-            navigateToSignup = navigateToSignUp,
             navigateToLedger = navigateToLedger,
-            navigateToLogin = navigateToLogin
+            navigateToLogin = navigateToLogin,
+            navigateToAgencyRegister = navigateToAgencyRegister,
         )
     }
 }
diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/state/LoginState.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/state/LoginState.kt
index ede8c01d..8f6abf49 100644
--- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/state/LoginState.kt
+++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/state/LoginState.kt
@@ -4,7 +4,7 @@ import com.moneymong.moneymong.common.base.State
 
 data class LoginState(
     val isClickable: Boolean = false,
-    val isSchoolInfoProvided: Boolean? = null,
+    val hasAnyAgency: Boolean? = null,
     val isLoginRequired: Boolean? = null,
     val visibleError : Boolean = false,
     val errorMessage : String = ""
diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpOnboardingCarouselView.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpOnboardingCarouselView.kt
new file mode 100644
index 00000000..99aaed7e
--- /dev/null
+++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/view/SignUpOnboardingCarouselView.kt
@@ -0,0 +1,160 @@
+package com.moneymong.moneymong.feature.sign.view
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.LocalOverscrollConfiguration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+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.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.moneymong.moneymong.design_system.R
+import com.moneymong.moneymong.design_system.theme.Blue04
+import com.moneymong.moneymong.design_system.theme.Body2
+import com.moneymong.moneymong.design_system.theme.Gray03
+import com.moneymong.moneymong.design_system.theme.Gray08
+import com.moneymong.moneymong.design_system.theme.Heading4
+import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
+import com.moneymong.moneymong.feature.sign.dto.CarouselData
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun SignUpOnboardingCarouselView(
+    modifier: Modifier = Modifier,
+) {
+
+    Column(
+        modifier = modifier.fillMaxWidth(),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        val pagerState = rememberPagerState(pageCount = { Int.MAX_VALUE })
+
+        LaunchedEffect(pagerState) {
+            var initPage = Int.MAX_VALUE / 2
+            while (initPage % ONBOARDING_CAROUSEL_DATA_LIST.size != 0) {
+                initPage++
+            }
+
+            pagerState.scrollToPage(initPage)
+        }
+
+        CompositionLocalProvider(LocalOverscrollConfiguration provides null) {
+            HorizontalPager(
+                state = pagerState,
+            ) { pageIndex ->
+                val actualIndex = pageIndex % ONBOARDING_CAROUSEL_DATA_LIST.size
+                val carouselData = ONBOARDING_CAROUSEL_DATA_LIST[actualIndex]
+
+                SignUpOnboardingCarouselItem(carouselData = carouselData)
+            }
+        }
+        SignUpOnboardingDotIndicator(
+            pageCount = ONBOARDING_CAROUSEL_DATA_LIST.size,
+            currentIndex = pagerState.currentPage % ONBOARDING_CAROUSEL_DATA_LIST.size,
+        )
+    }
+}
+
+@Composable
+fun SignUpOnboardingCarouselItem(
+    modifier: Modifier = Modifier,
+    carouselData: CarouselData,
+) {
+    Column(
+        modifier = modifier.fillMaxWidth(),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Spacer(Modifier.height(14.dp))
+        Text(
+            text = carouselData.title,
+            style = Body2,
+            color = Blue04,
+        )
+        Spacer(Modifier.height(4.dp))
+        Text(
+            text = carouselData.description,
+            style = Heading4,
+            color = Gray08,
+        )
+        Spacer(Modifier.height(14.dp))
+        Image(
+            modifier = Modifier
+                .fillMaxWidth(),
+            contentScale = ContentScale.FillWidth,
+            painter = painterResource(id = carouselData.imageRes),
+            contentDescription = null
+        )
+    }
+}
+
+@Composable
+fun SignUpOnboardingDotIndicator(
+    modifier: Modifier = Modifier,
+    pageCount: Int,
+    currentIndex: Int,
+) {
+    Row(
+        modifier = modifier.padding(vertical = 20.dp, horizontal = MMHorizontalSpacing),
+        horizontalArrangement = Arrangement.spacedBy(6.dp),
+    ) {
+        repeat(pageCount) { index ->
+            val isSelected = index == currentIndex
+            val dotColor by animateColorAsState(
+                targetValue = if (isSelected) Blue04 else Gray03,
+                label = "DotColor"
+            )
+            Box(
+                modifier = Modifier
+                    .size(6.dp)
+                    .background(
+                        color = dotColor,
+                        shape = CircleShape,
+                    )
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun SignUpOnboardingCarouselPreview() {
+    SignUpOnboardingCarouselView()
+}
+
+private val ONBOARDING_CAROUSEL_DATA_LIST = listOf(
+    CarouselData(
+        title = "장부 기록",
+        description = "장부 기록을 가볍게 시작해보세요",
+        imageRes = R.drawable.img_login_onboarding1,
+    ),
+    CarouselData(
+        title = "장부 추가",
+        description = "필요한 만큼 장부를 여러개 만들 수 있어요",
+        imageRes = R.drawable.img_login_onboarding2,
+    ),
+    CarouselData(
+        title = "친구 초대",
+        description = "장부를 친구와 함께 관리할 수 있어요",
+        imageRes = R.drawable.img_login_onboarding3,
+    ),
+)
\ No newline at end of file
diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/LoginViewModel.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/LoginViewModel.kt
index 6a777e2e..2a52abda 100644
--- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/LoginViewModel.kt
+++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/LoginViewModel.kt
@@ -1,64 +1,30 @@
 package com.moneymong.moneymong.feature.sign.viewmodel
 
-import android.util.Log
-import com.kakao.sdk.common.KakaoSdk
+import androidx.lifecycle.viewModelScope
 import com.moneymong.moneymong.common.base.BaseViewModel
+import com.moneymong.moneymong.domain.usecase.agency.FetchMyAgencyListUseCase
 import com.moneymong.moneymong.domain.usecase.token.PostAccessTokenUseCase
-import com.moneymong.moneymong.domain.usecase.token.TokenUseCase
 import com.moneymong.moneymong.feature.sign.sideeffect.LoginSideEffect
 import com.moneymong.moneymong.feature.sign.state.LoginState
 import com.moneymong.moneymong.model.sign.LoginType
 import com.moneymong.moneymong.network.util.TokenCallback
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.syntax.simple.intent
 import org.orbitmvi.orbit.syntax.simple.reduce
 import javax.inject.Inject
 
 @HiltViewModel
 class LoginViewModel @Inject constructor(
-    private val tokenUseCase: TokenUseCase,
-    private val postAccessTokenUseCase: PostAccessTokenUseCase
+    private val postAccessTokenUseCase: PostAccessTokenUseCase,
+    private val fetchMyAgencyListUseCase: FetchMyAgencyListUseCase,
 ) : BaseViewModel<LoginState, LoginSideEffect>(LoginState()), TokenCallback {
 
     fun onKakaoLoginSuccess(accessToken: String) = intent {
         postAccessTokenUseCase(type = LoginType.KAKAO, accessToken = accessToken).onSuccess {
-            getSchoolInfo()
-        }.onFailure {
-            reduce {
-                state.copy(
-                    visibleError = true,
-                    errorMessage = "문제가 발생했습니다.\n다시 시도해주세요"
-                )
-            }
-        }
-    }
-
-    fun onKakaoLoginFailure(throwable: Throwable) = intent {
-        reduce {
-            state.copy(
-                visibleError = true,
-                errorMessage = "문제가 발생했습니다.\n다시 시도해주세요"
-            )
-        }
-    }
-
-
-    private fun getSchoolInfo() = intent {
-        tokenUseCase.getSchoolInfo().onSuccess { result ->
-            if (result) {
-                reduce {
-                    state.copy(
-                        isSchoolInfoProvided = true
-                    )
-                }
-            } else {
-                reduce {
-                    state.copy(
-                        isSchoolInfoProvided = false
-                    )
-                }
-            }
+            checkAgencyExists()
         }.onFailure {
+            visibleErrorChanged(isVisibleError = true)
             reduce {
                 state.copy(
                     visibleError = true,
@@ -68,6 +34,7 @@ class LoginViewModel @Inject constructor(
         }
     }
 
+    fun onKakaoLoginFailure(throwable: Throwable) = visibleErrorChanged(isVisibleError = true)
 
     override suspend fun onTokenFailure() {
         intent {
@@ -79,6 +46,16 @@ class LoginViewModel @Inject constructor(
         }
     }
 
+    private fun checkAgencyExists() = viewModelScope.launch {
+        fetchMyAgencyListUseCase()
+            .onSuccess {
+                val hasAnyAgency = it.isNotEmpty()
+                intent { reduce { state.copy(hasAnyAgency = hasAnyAgency) } }
+            }.onFailure {
+                visibleErrorChanged(true)
+            }
+    }
+
     fun isLoginRequiredChanged(boolean: Boolean) = intent {
         reduce {
             state.copy(
@@ -91,14 +68,7 @@ class LoginViewModel @Inject constructor(
         reduce {
             state.copy(
                 visibleError = isVisibleError,
-            )
-        }
-    }
-
-    fun isSchoolInfoProvidedChanged(isSchoolInfoProvided: Boolean?) = intent {
-        reduce {
-            state.copy(
-                isSchoolInfoProvided = isSchoolInfoProvided
+                errorMessage = "문제가 발생했습니다.\n다시 시도해주세요",
             )
         }
     }
diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SplashViewModel.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SplashViewModel.kt
index 1c0e0098..3ce6349c 100644
--- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SplashViewModel.kt
+++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SplashViewModel.kt
@@ -29,7 +29,7 @@ class SplashViewModel @Inject constructor(
         tokenUseCase.getDataStoreInfo()
             .onSuccess {
                 Log.d("Splash", "${it.accessToken}, ${it.schoolInfoProvided}")
-                if (it.accessToken.isNotEmpty() && it.schoolInfoProvided) {
+                if (it.accessToken.isNotEmpty()) {
                     reduce {
                         state.copy(
                             isTokenValid = true