diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ddaf412..54fdf3b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,9 @@
         android:theme="@style/Theme.Ecommerce_serang"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.profile.mystore.StoreOnReviewActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.profile.mystore.review.ReviewActivity"
             android:exported="false" />
@@ -51,7 +54,7 @@
             android:name=".ui.product.storeDetail.StoreDetailActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.auth.RegisterStoreActivity"
+            android:name=".ui.profile.mystore.RegisterStoreActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
         <activity
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt
index 25b7a0f..bf15129 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt
@@ -16,15 +16,18 @@ import com.alya.ecommerce_serang.BuildConfig.BASE_URL
 import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.dto.UserProfile
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
+import com.alya.ecommerce_serang.data.repository.MyStoreRepository
 import com.alya.ecommerce_serang.data.repository.UserRepository
 import com.alya.ecommerce_serang.databinding.FragmentProfileBinding
 import com.alya.ecommerce_serang.ui.auth.LoginActivity
-import com.alya.ecommerce_serang.ui.auth.RegisterStoreActivity
+import com.alya.ecommerce_serang.ui.profile.mystore.RegisterStoreActivity
 import com.alya.ecommerce_serang.ui.order.address.AddressActivity
 import com.alya.ecommerce_serang.ui.order.history.HistoryActivity
 import com.alya.ecommerce_serang.ui.profile.mystore.MyStoreActivity
+import com.alya.ecommerce_serang.ui.profile.mystore.StoreOnReviewActivity
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
 import com.alya.ecommerce_serang.utils.SessionManager
+import com.alya.ecommerce_serang.utils.viewmodel.MyStoreViewModel
 import com.alya.ecommerce_serang.utils.viewmodel.ProfileViewModel
 import com.bumptech.glide.Glide
 import kotlinx.coroutines.delay
@@ -44,6 +47,14 @@ class ProfileFragment : Fragment() {
         }
     }
 
+    private val myStoreViewModel: MyStoreViewModel by viewModels {
+        BaseViewModelFactory {
+            val apiService = ApiConfig.getApiService(sessionManager)
+            val myStoreRepository = MyStoreRepository(apiService)
+            MyStoreViewModel(myStoreRepository)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         sessionManager = SessionManager(requireContext())
@@ -59,26 +70,32 @@ class ProfileFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         observeUserProfile()
+
         viewModel.loadUserProfile()
         viewModel.checkStoreUser()
 
-
+        val hasStore = viewModel.checkStore.value
+        Log.d("Profile Fragment", "Check store $hasStore")
+        binding.tvBukaToko.text = if (hasStore == true) "Toko Saya" else "Buka Toko"
 
         binding.cardBukaToko.setOnClickListener{
-            val hasStore = viewModel.checkStore.value
-
-            Log.d("Profile Fragment", "Check store $hasStore")
-
-            if (hasStore == true){
-                binding.tvBukaToko.text = "Lihat Toko Saya"
-                val intentBuka = Intent(requireContext(), MyStoreActivity::class.java)
-                startActivity(intentBuka)
-            } else {
-                binding.tvBukaToko.text = "Buka Toko"
-                val intentBuka = Intent(requireContext(), RegisterStoreActivity::class.java)
-                startActivity(intentBuka)
-            }
+//            if (hasStore == true) startActivity(Intent(requireContext(), MyStoreActivity::class.java))
+//            else startActivity(Intent(requireContext(), RegisterStoreActivity::class.java))
+            if (viewModel.checkStore.value == true) {
+                myStoreViewModel.loadMyStore()
+                myStoreViewModel.myStoreProfile.observe(viewLifecycleOwner) { store ->
+                    store?.let {
+                        when (store.storeStatus) {
+                            "active" -> startActivity(Intent(requireContext(), MyStoreActivity::class.java))
+                            else -> startActivity(Intent(requireContext(), StoreOnReviewActivity::class.java))
+                        }
+                    } ?: run {
+                        Toast.makeText(requireContext(), "Gagal memuat data toko", Toast.LENGTH_SHORT).show()
+                    }
+                }
+            } else startActivity(Intent(requireContext(), RegisterStoreActivity::class.java))
         }
 
         binding.btnDetailProfile.setOnClickListener{
@@ -96,15 +113,14 @@ class ProfileFragment : Fragment() {
             startActivity(intent)
         }
 
-        binding.cardLogout.setOnClickListener({
+        binding.cardLogout.setOnClickListener{
             logout()
+        }
 
-        })
-
-        binding.cardAddress.setOnClickListener({
+        binding.cardAddress.setOnClickListener{
             val intent = Intent(requireContext(), AddressActivity::class.java)
             startActivity(intent)
-        })
+        }
     }
 
     private fun observeUserProfile() {
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/auth/RegisterStoreActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/RegisterStoreActivity.kt
similarity index 88%
rename from app/src/main/java/com/alya/ecommerce_serang/ui/auth/RegisterStoreActivity.kt
rename to app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/RegisterStoreActivity.kt
index 32e36b5..a383441 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/auth/RegisterStoreActivity.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/RegisterStoreActivity.kt
@@ -1,7 +1,6 @@
-package com.alya.ecommerce_serang.ui.auth
+package com.alya.ecommerce_serang.ui.profile.mystore
 
 import android.Manifest
-import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
@@ -26,6 +25,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
+import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.response.auth.StoreTypesItem
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
 import com.alya.ecommerce_serang.data.repository.Result
@@ -35,6 +35,9 @@ import com.alya.ecommerce_serang.ui.order.address.CityAdapter
 import com.alya.ecommerce_serang.ui.order.address.ProvinceAdapter
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
 import com.alya.ecommerce_serang.utils.SessionManager
+import com.alya.ecommerce_serang.utils.viewmodel.RegisterStoreViewModel
+import androidx.core.graphics.drawable.toDrawable
+import androidx.core.widget.ImageViewCompat
 
 class RegisterStoreActivity : AppCompatActivity() {
 
@@ -48,15 +51,13 @@ class RegisterStoreActivity : AppCompatActivity() {
     private val PICK_KTP_REQUEST = 1002
     private val PICK_NPWP_REQUEST = 1003
     private val PICK_NIB_REQUEST = 1004
-    private val PICK_PERSETUJUAN_REQUEST = 1005
-    private val PICK_QRIS_REQUEST = 1006
 
     // Location request code
     private val LOCATION_PERMISSION_REQUEST = 2001
 
     private val viewModel: RegisterStoreViewModel by viewModels {
         BaseViewModelFactory {
-            val apiService = ApiConfig.getApiService(sessionManager)
+            val apiService = ApiConfig.Companion.getApiService(sessionManager)
             val orderRepository = UserRepository(apiService)
             RegisterStoreViewModel(orderRepository)
         }
@@ -84,6 +85,8 @@ class RegisterStoreActivity : AppCompatActivity() {
             windowInsets
         }
 
+        setupHeader()
+
         provinceAdapter = ProvinceAdapter(this)
         cityAdapter = CityAdapter(this)
         Log.d(TAG, "onCreate: Adapters initialized")
@@ -114,6 +117,9 @@ class RegisterStoreActivity : AppCompatActivity() {
         Log.d(TAG, "onCreate: Fetching provinces from API")
         viewModel.getProvinces()
 
+        viewModel.provinceId.observe(this) { validateRequiredFields() }
+        viewModel.cityId.observe(this) { validateRequiredFields() }
+        viewModel.storeTypeId.observe(this) { validateRequiredFields() }
 
         // Setup register button
         binding.btnRegister.setOnClickListener {
@@ -130,6 +136,45 @@ class RegisterStoreActivity : AppCompatActivity() {
         Log.d(TAG, "onCreate: RegisterStoreActivity setup completed")
     }
 
+    private fun setupHeader() {
+        binding.header.main.background = ContextCompat.getColor(this, R.color.blue_500).toDrawable()
+        binding.header.headerTitle.visibility = View.GONE
+        binding.header.headerLeftIcon.setColorFilter(
+            ContextCompat.getColor(this, R.color.white),
+            android.graphics.PorterDuff.Mode.SRC_IN
+        )
+        binding.header.headerLeftIcon.setOnClickListener {
+            onBackPressedDispatcher.onBackPressed()
+            finish()
+        }
+    }
+
+    private fun validateRequiredFields() {
+        val isFormValid = !viewModel.storeName.value.isNullOrBlank() &&
+                !viewModel.street.value.isNullOrBlank() &&
+                (viewModel.postalCode.value ?: 0) > 0 &&
+                !viewModel.subdistrict.value.isNullOrBlank() &&
+                !viewModel.bankName.value.isNullOrBlank() &&
+                (viewModel.bankNumber.value ?: 0) > 0 &&
+                (viewModel.provinceId.value ?: 0) > 0 &&
+                (viewModel.cityId.value ?: 0) > 0 &&
+                (viewModel.storeTypeId.value ?: 0) > 0 &&
+                viewModel.ktpUri != null &&
+                viewModel.nibUri != null &&
+                viewModel.npwpUri != null &&
+                viewModel.selectedCouriers.isNotEmpty()
+
+        binding.btnRegister.isEnabled = isFormValid
+
+        if (isFormValid) {
+            binding.btnRegister.setBackgroundResource(R.drawable.bg_button_active)
+            binding.btnRegister.setTextColor(ContextCompat.getColor(this, R.color.white))
+        } else {
+            binding.btnRegister.setBackgroundResource(R.drawable.bg_button_disabled)
+            binding.btnRegister.setTextColor(ContextCompat.getColor(this, R.color.black_300))
+        }
+    }
+
     private fun setupObservers() {
         Log.d(TAG, "setupObservers: Setting up LiveData observers")
 
@@ -138,12 +183,12 @@ class RegisterStoreActivity : AppCompatActivity() {
             when (state) {
                 is Result.Loading -> {
                     Log.d(TAG, "setupObservers: Loading provinces...")
-                    binding.provinceProgressBar?.visibility = View.VISIBLE
+                    binding.provinceProgressBar.visibility = View.VISIBLE
                     binding.spinnerProvince.isEnabled = false
                 }
                 is Result.Success -> {
                     Log.d(TAG, "setupObservers: Provinces loaded successfully: ${state.data.size} provinces")
-                    binding.provinceProgressBar?.visibility = View.GONE
+                    binding.provinceProgressBar.visibility = View.GONE
                     binding.spinnerProvince.isEnabled = true
 
                     // Update adapter with data
@@ -151,7 +196,7 @@ class RegisterStoreActivity : AppCompatActivity() {
                 }
                 is Result.Error -> {
                     Log.e(TAG, "setupObservers: Error loading provinces: ${state.exception.message}")
-                    binding.provinceProgressBar?.visibility = View.GONE
+                    binding.provinceProgressBar.visibility = View.GONE
                     binding.spinnerProvince.isEnabled = true
                 }
             }
@@ -162,12 +207,12 @@ class RegisterStoreActivity : AppCompatActivity() {
             when (state) {
                 is Result.Loading -> {
                     Log.d(TAG, "setupObservers: Loading cities...")
-                    binding.cityProgressBar?.visibility = View.VISIBLE
+                    binding.cityProgressBar.visibility = View.VISIBLE
                     binding.spinnerCity.isEnabled = false
                 }
                 is Result.Success -> {
                     Log.d(TAG, "setupObservers: Cities loaded successfully: ${state.data.size} cities")
-                    binding.cityProgressBar?.visibility = View.GONE
+                    binding.cityProgressBar.visibility = View.GONE
                     binding.spinnerCity.isEnabled = true
 
                     // Update adapter with data
@@ -175,7 +220,7 @@ class RegisterStoreActivity : AppCompatActivity() {
                 }
                 is Result.Error -> {
                     Log.e(TAG, "setupObservers: Error loading cities: ${state.exception.message}")
-                    binding.cityProgressBar?.visibility = View.GONE
+                    binding.cityProgressBar.visibility = View.GONE
                     binding.spinnerCity.isEnabled = true
                 }
             }
@@ -214,11 +259,11 @@ class RegisterStoreActivity : AppCompatActivity() {
                 Log.d(TAG, "setupStoreTypesObserver: Loading store types...")
                 // Show loading indicator for store types spinner
                 binding.spinnerStoreType.isEnabled = false
-                binding.storeTypeProgressBar?.visibility = View.VISIBLE
+                binding.storeTypeProgressBar.visibility = View.VISIBLE
             } else {
                 Log.d(TAG, "setupStoreTypesObserver: Store types loading completed")
                 binding.spinnerStoreType.isEnabled = true
-                binding.storeTypeProgressBar?.visibility = View.GONE
+                binding.storeTypeProgressBar.visibility = View.GONE
             }
         }
 
@@ -309,7 +354,7 @@ class RegisterStoreActivity : AppCompatActivity() {
         }
 
         // Hide progress bar after setup
-        binding.storeTypeProgressBar?.visibility = View.GONE
+        binding.storeTypeProgressBar.visibility = View.GONE
         Log.d(TAG, "setupStoreTypeSpinner: Store type spinner setup completed")
     }
 
@@ -398,23 +443,11 @@ class RegisterStoreActivity : AppCompatActivity() {
         }
 
         // NPWP
-        binding.containerNpwp?.setOnClickListener {
+        binding.containerNpwp.setOnClickListener {
             Log.d(TAG, "NPWP container clicked, picking image")
             pickImage(PICK_NPWP_REQUEST)
         }
 
-        // SPPIRT
-        binding.containerSppirt.setOnClickListener {
-            Log.d(TAG, "SPPIRT container clicked, picking document")
-            pickDocument(PICK_PERSETUJUAN_REQUEST)
-        }
-
-        // Halal
-        binding.containerHalal.setOnClickListener {
-            Log.d(TAG, "Halal container clicked, picking document")
-            pickDocument(PICK_QRIS_REQUEST)
-        }
-
         Log.d(TAG, "setupDocumentUploads: Document upload buttons setup completed")
     }
 
@@ -442,16 +475,16 @@ class RegisterStoreActivity : AppCompatActivity() {
             handleCourierSelection("jne", isChecked)
         }
 
-        binding.checkboxJnt.setOnCheckedChangeListener { _, isChecked ->
-            Log.d(TAG, "JNT checkbox ${if (isChecked) "checked" else "unchecked"}")
-            handleCourierSelection("tiki", isChecked)
-        }
-
         binding.checkboxPos.setOnCheckedChangeListener { _, isChecked ->
             Log.d(TAG, "POS checkbox ${if (isChecked) "checked" else "unchecked"}")
             handleCourierSelection("pos", isChecked)
         }
 
+        binding.checkboxTiki.setOnCheckedChangeListener { _, isChecked ->
+            Log.d(TAG, "TIKI checkbox ${if (isChecked) "checked" else "unchecked"}")
+            handleCourierSelection("tiki", isChecked)
+        }
+
         Log.d(TAG, "setupCourierSelection: Courier checkboxes setup completed")
     }
 
@@ -465,6 +498,7 @@ class RegisterStoreActivity : AppCompatActivity() {
             viewModel.selectedCouriers.remove(courier)
             Log.d(TAG, "handleCourierSelection: Removed courier: $courier. Current couriers: ${viewModel.selectedCouriers}")
         }
+        validateRequiredFields()
     }
 
     private fun setupMap() {
@@ -516,6 +550,7 @@ class RegisterStoreActivity : AppCompatActivity() {
             override fun afterTextChanged(s: Editable?) {
                 viewModel.storeName.value = s.toString()
                 Log.d(TAG, "Store name updated: ${s.toString()}")
+                validateRequiredFields()
             }
         })
 
@@ -534,6 +569,7 @@ class RegisterStoreActivity : AppCompatActivity() {
             override fun afterTextChanged(s: Editable?) {
                 viewModel.street.value = s.toString()
                 Log.d(TAG, "Street address updated: ${s.toString()}")
+                validateRequiredFields()
             }
         })
 
@@ -547,6 +583,7 @@ class RegisterStoreActivity : AppCompatActivity() {
                 } catch (e: NumberFormatException) {
                     // Handle invalid input
                     Log.e(TAG, "Invalid postal code input: ${s.toString()}, error: $e")
+                    validateRequiredFields()
                 }
             }
         })
@@ -578,6 +615,7 @@ class RegisterStoreActivity : AppCompatActivity() {
                     viewModel.bankNumber.value = 0 // or 0
                     Log.d(TAG, "Bank number set to default: 0")
                 }
+                validateRequiredFields()
             }
         })
 
@@ -587,6 +625,7 @@ class RegisterStoreActivity : AppCompatActivity() {
             override fun afterTextChanged(s: Editable?) {
                 viewModel.subdistrict.value = s.toString()
                 Log.d(TAG, "Subdistrict updated: ${s.toString()}")
+                validateRequiredFields()
             }
         })
 
@@ -596,6 +635,7 @@ class RegisterStoreActivity : AppCompatActivity() {
             override fun afterTextChanged(s: Editable?) {
                 viewModel.bankName.value = s.toString()
                 Log.d(TAG, "Bank name updated: ${s.toString()}")
+                validateRequiredFields()
             }
         })
 
@@ -605,7 +645,7 @@ class RegisterStoreActivity : AppCompatActivity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         Log.d(TAG, "onActivityResult: Request code: $requestCode, Result code: $resultCode")
-        if (resultCode == Activity.RESULT_OK && data != null) {
+        if (resultCode == RESULT_OK && data != null) {
             val uri = data.data
             Log.d(TAG, "onActivityResult: URI received: $uri")
             when (requestCode) {
@@ -618,26 +658,19 @@ class RegisterStoreActivity : AppCompatActivity() {
                     Log.d(TAG, "KTP image selected")
                     viewModel.ktpUri = uri
                     updateImagePreview(uri, binding.imgKtp, binding.layoutUploadKtp)
+                    validateRequiredFields()
                 }
                 PICK_NPWP_REQUEST -> {
                     Log.d(TAG, "NPWP document selected")
                     viewModel.npwpUri = uri
                     updateDocumentPreview(binding.layoutUploadNpwp)
+                    validateRequiredFields()
                 }
                 PICK_NIB_REQUEST -> {
                     Log.d(TAG, "NIB document selected")
                     viewModel.nibUri = uri
                     updateDocumentPreview(binding.layoutUploadNib)
-                }
-                PICK_PERSETUJUAN_REQUEST -> {
-                    Log.d(TAG, "SPPIRT document selected")
-                    viewModel.persetujuanUri = uri
-                    updateDocumentPreview(binding.layoutUploadSppirt)
-                }
-                PICK_QRIS_REQUEST -> {
-                    Log.d(TAG, "Halal document selected")
-                    viewModel.qrisUri = uri
-                    updateDocumentPreview(binding.layoutUploadHalal)
+                    validateRequiredFields()
                 }
                 else -> {
                     Log.w(TAG, "Unknown request code: $requestCode")
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/StoreOnReviewActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/StoreOnReviewActivity.kt
new file mode 100644
index 0000000..338e5a5
--- /dev/null
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/StoreOnReviewActivity.kt
@@ -0,0 +1,25 @@
+package com.alya.ecommerce_serang.ui.profile.mystore
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.alya.ecommerce_serang.R
+import com.alya.ecommerce_serang.databinding.ActivityStoreOnReviewBinding
+
+class StoreOnReviewActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityStoreOnReviewBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityStoreOnReviewBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.header.headerTitle.text = "Verifikasi Pengajuan Toko"
+        binding.header.headerLeftIcon.setOnClickListener {
+            onBackPressedDispatcher.onBackPressed()
+            finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/auth/RegisterStoreViewModel.kt b/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/RegisterStoreViewModel.kt
similarity index 96%
rename from app/src/main/java/com/alya/ecommerce_serang/ui/auth/RegisterStoreViewModel.kt
rename to app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/RegisterStoreViewModel.kt
index b29fa41..ae9b8f4 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/auth/RegisterStoreViewModel.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/RegisterStoreViewModel.kt
@@ -1,4 +1,4 @@
-package com.alya.ecommerce_serang.ui.auth
+package com.alya.ecommerce_serang.utils.viewmodel
 
 import android.content.Context
 import android.net.Uri
@@ -21,8 +21,8 @@ class RegisterStoreViewModel(
 ) : ViewModel() {
 
     // LiveData for UI state
-    private val _registerState = MutableLiveData<com.alya.ecommerce_serang.data.repository.Result<RegisterStoreResponse>>()
-    val registerState: LiveData<com.alya.ecommerce_serang.data.repository.Result<RegisterStoreResponse>> = _registerState
+    private val _registerState = MutableLiveData<Result<RegisterStoreResponse>>()
+    val registerState: LiveData<Result<RegisterStoreResponse>> = _registerState
 
     private val _storeTypes = MutableLiveData<List<StoreTypesItem>>()
     val storeTypes: LiveData<List<StoreTypesItem>> = _storeTypes
@@ -141,7 +141,7 @@ class RegisterStoreViewModel(
 
                 _registerState.value = result
             } catch (e: Exception) {
-                _registerState.value = com.alya.ecommerce_serang.data.repository.Result.Error(e)
+                _registerState.value = Result.Error(e)
             }
         }
     }
diff --git a/app/src/main/res/drawable/ic_under_review.png b/app/src/main/res/drawable/ic_under_review.png
new file mode 100644
index 0000000..973390b
Binary files /dev/null and b/app/src/main/res/drawable/ic_under_review.png differ
diff --git a/app/src/main/res/layout/activity_register_store.xml b/app/src/main/res/layout/activity_register_store.xml
index 2ac26d7..7f2a7cf 100644
--- a/app/src/main/res/layout/activity_register_store.xml
+++ b/app/src/main/res/layout/activity_register_store.xml
@@ -6,7 +6,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.auth.RegisterStoreActivity">
+    tools:context=".ui.profile.mystore.RegisterStoreActivity">
+
+    <include
+        android:id="@+id/header"
+        layout="@layout/header" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -16,22 +20,20 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#334583"
+            android:background="@color/blue_500"
             android:padding="16dp"
             android:text="Buka Toko"
-            android:textColor="@android:color/white"
-            android:textSize="20sp"
-            android:fontFamily="@font/dmsans_medium" />
+            android:textColor="@color/white"
+            style="@style/headline_large" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#334583"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
+            android:background="@color/blue_500"
+            android:paddingHorizontal="16dp"
             android:paddingBottom="16dp"
-            android:text="Mohon untuk melengkapi formulir pendaftaran ini agar dapat mengakses fitur penjual pada aplikasi."
-            android:textColor="@android:color/white" />
+            android:text="@string/buka_toko_desc"
+            android:textColor="@color/white" />
     </LinearLayout>
 
     <!-- Main content in ScrollView -->
@@ -46,510 +48,874 @@
             android:orientation="vertical"
             android:padding="16dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="* Wajib diisi"
-                android:textColor="#777777" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="1. Nama Toko *"
-                android:textColor="@android:color/black" />
-
-            <EditText
-                android:id="@+id/et_store_name"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background"
-                android:hint="Isi jawaban Anda di sini"
-                android:inputType="text"
-                android:padding="12dp" />
+                android:orientation="horizontal">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="2. Deskripsi Toko"
-                android:textColor="@android:color/black" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="*"
+                    style="@style/body_small"
+                    android:textColor="@color/red_required"/>
 
-            <EditText
-                android:id="@+id/et_store_description"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background"
-                android:gravity="top"
-                android:hint="Isi jawaban Anda di sini"
-                android:inputType="textMultiLine"
-                android:padding="12dp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Wajib diisi"
+                    android:layout_marginStart="4dp"
+                    style="@style/body_small"/>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="3. Jenis UMKM *"
-                android:textColor="@android:color/black" />
+            </LinearLayout>
 
-            <Spinner
-                android:id="@+id/spinner_store_type"
+            <!-- Nama Toko -->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/btn_dropdown"
-                android:hint="Pilih jawaban Anda di sini"
-                android:padding="12dp" />
+                android:orientation="vertical"
+                android:layout_marginVertical="24dp">
 
-            <ProgressBar
-                android:id="@+id/storeTypeProgressBar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="4dp"
-                android:visibility="gone" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="4. Provinsi *"
-                android:textColor="@android:color/black" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="1. Nama Toko"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
 
-            <Spinner
-                android:id="@+id/spinner_province"
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/et_store_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_text_field"
+                    android:hint="Isi nama toko Anda di sini"
+                    android:padding="8dp"
+                    style="@style/body_small"
+                    android:layout_marginTop="10dp"/>
+
+            </LinearLayout>
+
+            <!-- Deskripsi Toko -->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/btn_dropdown"
-                android:hint="Pilih jawaban Anda di sini"
-                android:padding="12dp" />
-            <ProgressBar
-                android:id="@+id/provinceProgressBar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="4dp"
-                android:visibility="gone" />
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="5. Kabupaten/Kota *"
-                android:textColor="@android:color/black" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2. Deskripsi Toko"
+                    style="@style/body_medium"
+                    android:layout_marginEnd="4dp"/>
 
+                <EditText
+                    android:id="@+id/et_store_description"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:background="@drawable/bg_text_field"
+                    android:hint="Isi deskripsi toko Anda di sini"
+                    android:padding="8dp"
+                    style="@style/body_small"
+                    android:inputType="text|textMultiLine"
+                    android:gravity="top"
+                    android:layout_marginTop="10dp"/>
 
-            <Spinner
-                android:id="@+id/spinner_city"
+            </LinearLayout>
+
+            <!-- Jenis UMKM -->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/btn_dropdown"
-                android:hint="Pilih jawaban Anda di sini"
-                android:padding="12dp" />
-            <ProgressBar
-                android:id="@+id/cityProgressBar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="4dp"
-                android:visibility="gone" />
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="6. Kecamatan *"
-                android:textColor="@android:color/black" />
+                <!-- Label Jenis UMKM -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-            <EditText
-                android:id="@+id/et_subdistrict"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="3. Jenis UMKM"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <!-- Spinner Dropdown dengan Chevron -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:background="@drawable/bg_text_field"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="10dp">
+
+                    <Spinner
+                        android:id="@+id/spinner_store_type"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:padding="8dp"
+                        style="@style/body_small"
+                        android:background="@null"/>
+
+                    <ProgressBar
+                        android:id="@+id/store_type_progress_bar"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:padding="4dp"
+                        android:visibility="gone"/>
+
+                    <!-- Chevron Down Icon -->
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:src="@drawable/ic_down"
+                        android:layout_marginEnd="8dp"
+                        android:contentDescription="Chevron Down" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- Provinsi -->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background"
-                android:hint="Isi jawaban Anda di sini"
-                android:inputType="text"
-                android:padding="12dp" />
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="7. Jalan *"
-                android:textColor="@android:color/black" />
+                <!-- Label Provinsi -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-            <EditText
-                android:id="@+id/et_street"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="4. Provinsi"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <!-- Spinner Dropdown dengan Chevron -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:background="@drawable/bg_text_field"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="10dp">
+
+                    <Spinner
+                        android:id="@+id/spinner_province"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:padding="8dp"
+                        style="@style/body_small"
+                        android:background="@null"/>
+
+                    <ProgressBar
+                        android:id="@+id/province_progress_bar"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:padding="4dp"
+                        android:visibility="gone"/>
+
+                    <!-- Chevron Down Icon -->
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:src="@drawable/ic_down"
+                        android:layout_marginEnd="8dp"
+                        android:contentDescription="Chevron Down" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- Kabupaten/Kota -->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background"
-                android:hint="Isi jawaban Anda di sini"
-                android:inputType="text"
-                android:padding="12dp" />
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="8. Kode Pos *"
-                android:textColor="@android:color/black" />
+                <!-- Label Kabupaten/Kota -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-            <EditText
-                android:id="@+id/et_postal_code"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="5. Kabupaten/Kota"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <!-- Spinner Dropdown dengan Chevron -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:background="@drawable/bg_text_field"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="10dp">
+
+                    <Spinner
+                        android:id="@+id/spinner_city"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:padding="8dp"
+                        style="@style/body_small"
+                        android:background="@null"/>
+
+                    <ProgressBar
+                        android:id="@+id/city_progress_bar"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:padding="4dp"
+                        android:visibility="gone"/>
+
+                    <!-- Chevron Down Icon -->
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:src="@drawable/ic_down"
+                        android:layout_marginEnd="8dp"
+                        android:contentDescription="Chevron Down" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- Kecamatan -->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background"
-                android:hint="Isi jawaban Anda di sini"
-                android:inputType="number"
-                android:padding="12dp" />
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="9. Detail Alamat"
-                android:textColor="@android:color/black" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-            <EditText
-                android:id="@+id/et_address_detail"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background"
-                android:gravity="top"
-                android:hint="Isi jawaban Anda di sini"
-                android:inputType="textMultiLine"
-                android:padding="12dp" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="6. Kecamatan"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="10. Bank *"
-                android:textColor="@android:color/black" />
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
 
-            <EditText
-                android:id="@+id/et_bank_name"
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/et_subdistrict"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_text_field"
+                    android:hint="Isi kecamatan tempat toko Anda di sini"
+                    android:padding="8dp"
+                    style="@style/body_small"
+                    android:layout_marginTop="10dp"/>
+
+            </LinearLayout>
+
+            <!-- Jalan -->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background"
-                android:hint="Isi jawaban Anda di sini"
-                android:inputType="text"
-                android:padding="12dp" />
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="11. Nomor Rekening *"
-                android:textColor="@android:color/black" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-            <EditText
-                android:id="@+id/et_bank_number"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="7. Jalan"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/et_street"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_text_field"
+                    android:hint="Isi jalan tempat toko Anda di sini"
+                    android:padding="8dp"
+                    style="@style/body_small"
+                    android:layout_marginTop="10dp"/>
+
+            </LinearLayout>
+
+            <!-- Kode Pos -->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background"
-                android:hint="Isi jawaban Anda di sini"
-                android:inputType="number"
-                android:padding="12dp" />
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
 
-            <TextView
-                android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="8. Kode Pos"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/et_postal_code"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_text_field"
+                    android:hint="Isi kode pos tempat toko Anda di sini"
+                    android:padding="8dp"
+                    style="@style/body_small"
+                    android:layout_marginTop="10dp"
+                    android:inputType="number"/>
+
+            </LinearLayout>
+
+            <!-- Detail Alamat Toko -->
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="12. Pilih Kurir *"
-                android:textColor="@android:color/black" />
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="9. Detail Alamat"
+                    style="@style/body_medium"
+                    android:layout_marginEnd="4dp"/>
+
+                <EditText
+                    android:id="@+id/et_address_detail"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:background="@drawable/bg_text_field"
+                    android:hint="Isi detail alamat toko Anda di sini"
+                    android:padding="8dp"
+                    style="@style/body_small"
+                    android:inputType="text|textMultiLine"
+                    android:gravity="top"
+                    android:layout_marginTop="10dp"/>
+
+            </LinearLayout>
+
+            <!-- Bank -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="10. Bank"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/et_bank_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_text_field"
+                    android:hint="Isi nama bank untuk toko Anda di sini"
+                    android:padding="8dp"
+                    style="@style/body_small"
+                    android:layout_marginTop="10dp"/>
+
+            </LinearLayout>
+
+            <!-- Nomor Rekening -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="11. Nomor Rekening"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/et_bank_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_text_field"
+                    android:hint="Isi nomor rekening bank Anda di sini"
+                    android:padding="8dp"
+                    style="@style/body_small"
+                    android:layout_marginTop="10dp"
+                    android:inputType="number"/>
+
+            </LinearLayout>
+
+            <!-- Kurir -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="12. Pilih Kurir Pengiriman"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <CheckBox
+                        android:id="@+id/checkbox_jne"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="JNE" />
+
+                    <CheckBox
+                        android:id="@+id/checkbox_pos"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:text="POS Indonesia" />
+
+                    <CheckBox
+                        android:id="@+id/checkbox_tiki"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:text="TIKI" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- Foto Profil Toko -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="13. Foto Profil Toko"
+                    style="@style/body_medium"
+                    android:layout_marginEnd="4dp"/>
+
+                <FrameLayout
+                    android:id="@+id/container_store_img"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@android:drawable/editbox_background">
+
+                    <ImageView
+                        android:id="@+id/img_store"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerInside"
+                        android:visibility="gone" />
+
+                    <LinearLayout
+                        android:id="@+id/layout_upload_store_img"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:src="@android:drawable/ic_menu_upload" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:text="Unggah dokumen Anda di sini"
+                            android:textColor="#777777" />
+                    </LinearLayout>
+                </FrameLayout>
+
+            </LinearLayout>
+
+            <!-- KTP -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="14. Dokumen KTP"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/container_ktp"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@android:drawable/editbox_background">
+
+                    <ImageView
+                        android:id="@+id/img_ktp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerInside"
+                        android:visibility="gone" />
+
+                    <LinearLayout
+                        android:id="@+id/layout_upload_ktp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:src="@android:drawable/ic_menu_upload" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:text="Unggah dokumen Anda di sini"
+                            android:textColor="#777777" />
+                    </LinearLayout>
+                </FrameLayout>
+
+            </LinearLayout>
+
+            <!-- NIB -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="15. Dokumen NIB"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/container_nib"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:layout_marginTop="8dp"
+                    android:background="@android:drawable/editbox_background">
+
+                    <ImageView
+                        android:id="@+id/img_nib"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerInside"
+                        android:visibility="gone" />
+
+                    <LinearLayout
+                        android:id="@+id/layout_upload_nib"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:src="@android:drawable/ic_menu_upload" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:text="Unggah dokumen Anda di sini"
+                            android:textColor="#777777" />
+                    </LinearLayout>
+                </FrameLayout>
+
+            </LinearLayout>
+
+            <!-- NPWP -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="16. Dokumen NPWP"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/container_npwp"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:layout_marginTop="8dp"
+                    android:background="@android:drawable/editbox_background">
+
+                    <ImageView
+                        android:id="@+id/img_npwp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerInside"
+                        android:visibility="gone" />
+
+                    <LinearLayout
+                        android:id="@+id/layout_upload_npwp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:src="@android:drawable/ic_menu_upload" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:text="Unggah dokumen Anda di sini"
+                            android:textColor="#777777" />
+                    </LinearLayout>
+                </FrameLayout>
+
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <CheckBox
-                    android:id="@+id/checkbox_jne"
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="JNE" />
+                    android:text="17. Pilih Titik Lokasi Usaha"
+                    style="@style/body_medium"
+                    android:layout_marginEnd="4dp"/>
 
-                <CheckBox
-                    android:id="@+id/checkbox_jnt"
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:text="J&amp;T" />
+                    android:layout_weight="1"
+                    android:text="*"
+                    style="@style/body_medium"
+                    android:textColor="@color/red_required"
+                    android:layout_gravity="end"/>
 
-                <CheckBox
-                    android:id="@+id/checkbox_pos"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:text="POS" />
             </LinearLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="13. Foto Profil Toko"
-                android:textColor="@android:color/black" />
-
-            <FrameLayout
-                android:id="@+id/container_store_img"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background">
-
-                <ImageView
-                    android:id="@+id/img_store"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:visibility="gone" />
-
-                <LinearLayout
-                    android:id="@+id/layout_upload_store_img"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:src="@android:drawable/ic_menu_upload" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="Unggah dokumen Anda di sini"
-                        android:textColor="#777777" />
-                </LinearLayout>
-            </FrameLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="14. Dokumen KTP *"
-                android:textColor="@android:color/black" />
-
-            <FrameLayout
-                android:id="@+id/container_ktp"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background">
-
-                <ImageView
-                    android:id="@+id/img_ktp"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:visibility="gone" />
-
-                <LinearLayout
-                    android:id="@+id/layout_upload_ktp"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:src="@android:drawable/ic_menu_upload" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="Unggah dokumen Anda di sini"
-                        android:textColor="#777777" />
-                </LinearLayout>
-            </FrameLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="15. Dokumen NIB *"
-                android:textColor="@android:color/black" />
-
-            <FrameLayout
-                android:id="@+id/container_nib"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background">
-
-                <ImageView
-                    android:id="@+id/img_nib"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:visibility="gone" />
-
-                <LinearLayout
-                    android:id="@+id/layout_upload_nib"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:src="@android:drawable/ic_menu_upload" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="Unggah dokumen Anda di sini"
-                        android:textColor="#777777" />
-                </LinearLayout>
-            </FrameLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="16. Dokumen NPWP *"
-                android:textColor="@android:color/black" />
-
-            <FrameLayout
-                android:id="@+id/container_npwp"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background">
-
-                <ImageView
-                    android:id="@+id/img_npwp"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:visibility="gone" />
-
-                <LinearLayout
-                    android:id="@+id/layout_upload_npwp"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:src="@android:drawable/ic_menu_upload" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="Unggah dokumen Anda di sini"
-                        android:textColor="#777777" />
-                </LinearLayout>
-            </FrameLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="16. Dokumen SPPIRT"
-                android:textColor="@android:color/black" />
-
-            <FrameLayout
-                android:id="@+id/container_sppirt"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background">
-
-                <ImageView
-                    android:id="@+id/img_sppirt"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:visibility="gone" />
-
-                <LinearLayout
-                    android:id="@+id/layout_upload_sppirt"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:src="@android:drawable/ic_menu_upload" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="Unggah dokumen Anda di sini"
-                        android:textColor="#777777" />
-                </LinearLayout>
-            </FrameLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="17. Dokumen Sertifikat Halal"
-                android:textColor="@android:color/black" />
-
-            <FrameLayout
-                android:id="@+id/container_halal"
-                android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginTop="8dp"
-                android:background="@android:drawable/editbox_background">
-
-                <ImageView
-                    android:id="@+id/img_halal"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerInside"
-                    android:visibility="gone" />
-
-                <LinearLayout
-                    android:id="@+id/layout_upload_halal"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:src="@android:drawable/ic_menu_upload" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="Unggah dokumen Anda di sini"
-                        android:textColor="#777777" />
-                </LinearLayout>
-            </FrameLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="18. Pilih Titik Lokasi Usaha *"
-                android:textColor="@android:color/black" />
-
             <FrameLayout
                 android:id="@+id/map_container"
                 android:layout_width="match_parent"
@@ -566,15 +932,11 @@
 
             <Button
                 android:id="@+id/btn_register"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/button.large.disabled.long"
+                android:enabled="false"
                 android:layout_marginTop="24dp"
                 android:layout_marginBottom="16dp"
-                android:background="@color/blue_500"
-                android:fontFamily="@font/dmsans_medium"
-                android:text="Daftar"
-                android:textColor="@android:color/white" />
+                android:text="Daftar" />
         </LinearLayout>
     </ScrollView>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_store_on_review.xml b/app/src/main/res/layout/activity_store_on_review.xml
new file mode 100644
index 0000000..bcb2910
--- /dev/null
+++ b/app/src/main/res/layout/activity_store_on_review.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.profile.mystore.StoreOnReviewActivity"
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
+
+    <include
+        android:id="@+id/header"
+        layout="@layout/header" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:padding="16dp">
+
+        <ImageView
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:src="@drawable/ic_under_review"
+            app:tint="@color/blue_500"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Pengajuan toko Anda masih dalam tahap verifikasi oleh Admin"
+            style="@style/body_large"
+            android:fontFamily="@font/dmsans_extrabold"
+            android:textAlignment="center" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/header.xml b/app/src/main/res/layout/header.xml
index 57d2c45..73ec866 100644
--- a/app/src/main/res/layout/header.xml
+++ b/app/src/main/res/layout/header.xml
@@ -11,14 +11,15 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white">
+        android:background="@null">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:contentInsetStart="0dp"
-            app:contentInsetStartWithNavigation="0dp">
+            app:contentInsetStartWithNavigation="0dp"
+            android:background="@null">
 
             <ImageView
                 android:id="@+id/header_left_icon"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 136d62b..edb487e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -145,6 +145,7 @@
     <string name="disconnected_reconnecting">Disconnected. Reconnecting...</string>
     <string name="connection_error">Connection error: %1$s</string>
     <string name="typing">User is typing...</string>
+    <string name="buka_toko_desc">Mohon untuk melengkapi formulir pendaftaran ini agar dapat mengakses fitur penjual pada aplikasi.</string>
 
 
 </resources>
\ No newline at end of file