diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
index 6950612..7260ac6 100644
--- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
+++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
@@ -59,6 +59,11 @@ class StepThreeBajajFDFragment : BaseFragment() {
     private var selectedImage: String? = ""
     private var checkPANUploadFile: Boolean? = false
     private var checkPhotoUploadFile: Boolean? = false
+    private var actionType: AccountCaptureType? = null
+
+    enum class AccountCaptureType {
+        MAIN_PAN_UPLOAD,MAIN_PHOTO_UPLOAD,FIRST_UPLOAD,SECOND_UPLOAD
+    }
 
     private val requestPermission = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
@@ -70,7 +75,6 @@ class StepThreeBajajFDFragment : BaseFragment() {
         }
     }
 
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -123,24 +127,28 @@ class StepThreeBajajFDFragment : BaseFragment() {
         binding.btnPANUpload.setOnClickListener {
             checkPANUploadFile = true
             checkPhotoUploadFile = false
+            actionType = AccountCaptureType.MAIN_PAN_UPLOAD
             selectImage("PAN")
         }
 
         binding.btnPhotoUpload.setOnClickListener {
             checkPhotoUploadFile = true
             checkPANUploadFile = false
+            actionType = AccountCaptureType.MAIN_PHOTO_UPLOAD
             selectImage("Photograph")
         }
 
         binding.btnAadhaarFrontUpload.setOnClickListener {
             checkPANUploadFile = false
             checkPhotoUploadFile = false
+            actionType = AccountCaptureType.FIRST_UPLOAD
             selectImage(binding.spDocType.text.toString())
         }
 
         binding.btnAadhaarBackUpload.setOnClickListener {
             checkPANUploadFile = false
             checkPhotoUploadFile = false
+            actionType = AccountCaptureType.SECOND_UPLOAD
             selectImage(binding.spDocType.text.toString())
         }
 
@@ -148,7 +156,7 @@ class StepThreeBajajFDFragment : BaseFragment() {
             AdapterView.OnItemClickListener { parent, _, position, _ ->
 
                 val getCodes: GetCodes = parent.getItemAtPosition(position) as GetCodes
-                when (getCodes.Value) {
+                when (getCodes.Label) {
                     resources.getString(R.string.aadhar) ->
                         setAadhaarUploadLayout()
                     else -> {
@@ -257,6 +265,14 @@ class StepThreeBajajFDFragment : BaseFragment() {
         } else {
             selectedImage?.let { mapImage.put(it, front) }
         }
+        when(actionType){
+            AccountCaptureType.MAIN_PAN_UPLOAD -> binding.ivPan.visibility = View.VISIBLE
+            AccountCaptureType.MAIN_PHOTO_UPLOAD -> binding.ivPhotograph.visibility = View.VISIBLE
+            AccountCaptureType.FIRST_UPLOAD -> binding.ivAadharFront.visibility = View.VISIBLE
+            else ->{
+                binding.ivAadharBack.visibility = View.VISIBLE
+            }
+        }
     }
 
     private fun encodedFileToBase64(fileName: File?) {
@@ -465,6 +481,25 @@ class StepThreeBajajFDFragment : BaseFragment() {
 
 
     private fun validate(): Boolean {
+        if (binding.spDocType.text.equals(R.string.aadhar) && mapImage.size < 3) {
+            Common.showDialogValidation(
+                activity as BajajFdMainActivity,
+                "Upload Aadhaar Images"
+            )
+            return false
+        } else if (!binding.spDocType.text.equals(R.string.aadhar) && mapImage.size == 3) {
+            Common.showDialogValidation(
+                activity as BajajFdMainActivity,
+                "Upload Aadhaar Images"
+            )
+            return false
+        } else if (mapImage.size < 3) {
+            Common.showDialogValidation(
+                activity as BajajFdMainActivity,
+                "Upload All Images"
+            )
+            return false
+        }
         return true
     }
 
@@ -500,5 +535,4 @@ class StepThreeBajajFDFragment : BaseFragment() {
     fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) {
         uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_check_24.xml b/app/src/main/res/drawable/ic_baseline_check_24.xml
new file mode 100644
index 0000000..eb14651
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_check_24.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24dp" android:tint="#64F50E"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bajajfd_step_three.xml b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
index 8886248..9467bfd 100644
--- a/app/src/main/res/layout/fragment_bajajfd_step_three.xml
+++ b/app/src/main/res/layout/fragment_bajajfd_step_three.xml
@@ -114,6 +114,20 @@
                     app:layout_constraintTop_toBottomOf="@+id/tvUploadKYCDocument"
                     tools:ignore="DuplicateSpeakableTextCheck" />
 
+                <ImageView
+                    android:id="@+id/ivPan"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="7dp"
+                    android:background="@drawable/ic_baseline_check_24"
+                    android:visibility="invisible"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnPANUpload"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.384"
+                    app:layout_constraintStart_toEndOf="@+id/btnPANUpload"
+                    app:layout_constraintTop_toTopOf="@+id/btnPANUpload"
+                    app:layout_constraintVertical_bias="0.333" />
+
                 <TextView
                     android:id="@+id/tvPhotoUpload"
                     style="@style/regularStyle"
@@ -146,6 +160,20 @@
                     app:layout_constraintStart_toEndOf="@+id/tvPhotoUpload"
                     app:layout_constraintTop_toBottomOf="@+id/btnPANUpload" />
 
+                <ImageView
+                    android:id="@+id/ivPhotograph"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="7dp"
+                    android:visibility="invisible"
+                    android:background="@drawable/ic_baseline_check_24"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnPhotoUpload"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.384"
+                    app:layout_constraintStart_toEndOf="@+id/btnPhotoUpload"
+                    app:layout_constraintTop_toTopOf="@+id/btnPhotoUpload"
+                    app:layout_constraintVertical_bias="0.333" />
+
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/spAddressType"
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -191,6 +219,7 @@
                     android:layout_height="@dimen/margin_48"
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="12dp"
+                    android:layout_marginEnd="28dp"
                     android:backgroundTint="@color/greyColor4"
                     android:paddingLeft="@dimen/margin_30"
                     android:paddingRight="@dimen/margin_30"
@@ -201,6 +230,20 @@
                     app:layout_constraintTop_toBottomOf="@+id/spAddressType"
                     tools:ignore="DuplicateSpeakableTextCheck" />
 
+                <ImageView
+                    android:id="@+id/ivAadharFront"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="7dp"
+                    android:background="@drawable/ic_baseline_check_24"
+                    android:visibility="invisible"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarFrontUpload"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.38"
+                    app:layout_constraintStart_toEndOf="@+id/btnAadhaarFrontUpload"
+                    app:layout_constraintTop_toTopOf="@+id/btnAadhaarFrontUpload"
+                    app:layout_constraintVertical_bias="0.333" />
+
                 <Button
                     android:id="@+id/btnAadhaarBackUpload"
                     android:layout_width="wrap_content"
@@ -220,6 +263,20 @@
                     app:layout_constraintTop_toBottomOf="@+id/btnAadhaarFrontUpload"
                     app:layout_constraintVertical_bias="0.0" />
 
+                <ImageView
+                    android:id="@+id/ivAadharBack"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="7dp"
+                    android:background="@drawable/ic_baseline_check_24"
+                    android:visibility="invisible"
+                    app:layout_constraintBottom_toBottomOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.38"
+                    app:layout_constraintStart_toEndOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintTop_toTopOf="@+id/btnAadhaarBackUpload"
+                    app:layout_constraintVertical_bias="0.333" />
+
                 <TextView
                     android:id="@+id/tvAadhaarBack"
                     style="@style/regularStyle"
@@ -235,16 +292,6 @@
                     app:layout_constraintTop_toTopOf="@+id/btnAadhaarBackUpload"
                     app:layout_constraintVertical_bias="0.406" />
 
-                <ImageView
-                    android:id="@+id/iv"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    android:background="@drawable/bajaj_logo"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/btnAadhaarBackUpload" />
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </com.google.android.material.card.MaterialCardView>