diff --git a/.talismanrc b/.talismanrc
index 765d287d41..638ed3f33a 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -1,8 +1,8 @@
 fileignoreconfig:
   - filename: package.json
-    checksum: 4770aabfda162fbc0b9a8c53d7dee483ce29b82c6cd3e17e81e3e628d93dbadc
+    checksum: 730263252adbe53cde58fb0b6988e519e766fe0f89a7b8cd261a1e5e5e598328
   - filename: package-lock.json
-    checksum: 8f9e6bdd4cc0fcbd979455d97d6313e60dda3da1771bef471e53d4efaac9f24d
+    checksum: 4e09116d21aa8def35ffe234dabec6abc668f15183e172764df2216adb0d2ca1
   - filename: lib/jsonld-signatures/suites/ed255192018/ed25519.ts
     checksum: 493b6e31144116cb612c24d98b97d8adcad5609c0a52c865a6847ced0a0ddc3a
   - filename: components/PasscodeVerify.tsx
@@ -24,7 +24,7 @@ fileignoreconfig:
   - filename: screens/BiometricScreenController.ts
     checksum: 4a424adbd2d2404c9d968c54607885af643a07e09acc4a2d37c6e7a7952c4945
   - filename: screens/Home/IntroSlidersScreen.tsx
-    checksum: af4a7e2d04b1141b7c32acfabeb3213a32eaca2a8e8f61e6958b6c97219dce57
+    checksum: 33cead03c9cf1bc5b984c7ecb81b5b5966527c712303e913c3e044fec6ee8188
   - filename: machines/issuersMachine.ts
     checksum: 742b8ff561dca61be08ab0b9aef3997ad5d043df298a84c17349dc0206ddcee6
   - filename: machines/issuersMachine.typegen.ts
@@ -36,11 +36,9 @@ fileignoreconfig:
   - filename: shared/telemetry/TelemetryUtils.js
     checksum: ffe9aac2dcc590b98b0d588885c088eff189504ade653a77f74b67312bfd27ad
   - filename: shared/fileStorage.ts
-    checksum: 451e8873a635d955fe426d9a5fcf191f2d4fd74984a1a4518760e2d10e9e1817
+    checksum: 2ba2721d9722cd9420ae26762316230f7dab1a0be45820cbda4d0ecae0edf957
   - filename: screens/Issuers/IssuersScreen.tsx
     checksum: 9c53e3770dbefe26e0de67ee4b7d5cc9c52d9823cbb136a1a5104dcb0a101071
-  - filename: ios/Podfile.lock
-    checksum: c9bb3501f86e3ac35c7522ed1028b0fa726723c86d395bb159d5f96a21e50159
   - filename: shared/commonUtil.ts
     checksum: 4a53bb615f2ea0fbf687bd7027c4c246e819dd88bc273941ed611e763d9d2356
   - filename: screens/Home/MyVcs/GetIdInputModal.tsx
@@ -78,7 +76,7 @@ fileignoreconfig:
   - filename: assets/fingerprint_icon.svg
     checksum: b2d3a50ca1336f60123d96a8cc8ea663c3316ed2d8c31833bce7e393ca51695b
   - filename: machines/store.ts
-    checksum: 9970da0ea685018a90f7306fb88945d135dd019439099dd56b6109d915a8a24f
+    checksum: 7d0b9c3ed111cd299145a963dc8751f54802cdd7afd4b4e645412ad639594889
   - filename: assets/Flip_Camera_Icon.svg
     checksum: 736b5a7ddb86bd4376229ce198dbf8a663e7ac89fc3311bd4f19afd4a2b36ffd
   - filename: assets/Finger_Print_Icon.svg
@@ -116,13 +114,13 @@ fileignoreconfig:
   - filename: .github/workflows/android-custom-build.yml
     checksum: 4d155c6e5468effb0b82e62f6878f2bd7ff7e7c9540e16bdd28cb81b80672ac3
   - filename: .github/workflows/push-triggers.yml
-    checksum: 4a031b46646aa982c8f40e4c7fe0bd3e05a76a6af1ff1c2de7350ba6ebf9a839 
+    checksum: 4a031b46646aa982c8f40e4c7fe0bd3e05a76a6af1ff1c2de7350ba6ebf9a839
   - filename: components/VC/Views/VCCardViewContent.tsx
     checksum: 02655ff3d7f8a8ea4f3664485f98c961802c598242ec44408594a2ddb721fa5e
   - filename: screens/Settings/BackupController.tsx
     checksum: 4a031b46646aa982c8f40e4c7fe0bd3e05a76a6af1ff1c2de7350ba6ebf9a839
   - filename: machines/backupRestore.typegen.ts
-    checksum: 67925a7ee485ab3ba4c6345340ad6598746717984c0506f1ced1716fb68b5aa4
+    checksum: ac9c154060c7c1adb3392ac8c78a42cae5ca3faea3b4b0166dd00d4ca38b290d
   - filename: machines/settings.typegen.ts
     checksum: e4ae05822f1b1c23f3f70d03dd46fd8f29ba6b52d40f2f24c121f536fbb5f2c4
   - filename: .env
@@ -140,17 +138,11 @@ fileignoreconfig:
   - filename: ios/fastlane/Fastfile
     checksum: a4e3772dc67a07ecbcfc58be0d6d4f7fa799cec7ac25bd269ac29459c8669ca4
   - filename: shared/storage.ts
-    checksum: 5b503c02ccb57b7576fb2b038a3e9a59f425a67311d624169bb4bd69721542e4
+    checksum: c83024929b59f76cce188dbe09eb3af1803d3a08f867feb7478137ddabc3bfdc
   - filename: injitest/src/test/java/iosTestCases/CredentialRegistryTest.java
     checksum: b0808e0c511412cde21fd169a9bbeaf3b77cb48f25418e12d341cc3ce1df5898
-  - filename: machines/backupAndRestore/backupAndRestore.ts
-    checksum: 846117cf13554ffde8544200ca597ceb820363c87bfbe57cffaedadc168b49ce
   - filename: machines/backupAndRestore/backupAndRestore.typegen.ts
     checksum: 509b9660553990841883c54f8986971f21c7315e7450c455bba2766738c58bee
-  - filename: machines/backupAndRestore/backup.ts
-    checksum: 73f68c5f37a763d98fa8422229a262e049260187ea10590f1a5f538f54d17371
-  - filename: machines/backupAndRestore/backup.typegen.ts
-    checksum: 5d0ff5ea1361c4f1184699e5c96615940366a048c2edf5881ed9c86d824c722b
   - filename: components/BackupAndRestoreAllScreenBanner.tsx
     checksum: 2c98e7e83959c9dac4dd12da32f81483c3d334bd05e279637cf465475fbf54b8
     checksum: f26489ce4ac607884437ad06c3117cc34d6cbcbcd3dd5719790fbe01a0853ee5
@@ -168,8 +160,6 @@ fileignoreconfig:
     checksum: a03c5fa839d761f7bf5bbf0ea9bbd48da57116430a99e1d22f0e7184435d468c
   - filename: locales/fil.json
     checksum: 29193fd3b14b7332bf7a485f659197002f29a58af88ed0653cae262e7254c84d
-  - filename: screens/Home/IntroSlidersScreen.tsx
-    checksum: af4a7e2d04b1141b7c32acfabeb3213a32eaca2a8e8f61e6958b6c97219dce57 
   - filename: screens/Home/MyVcs/GetIdInputModal.tsx
     checksum: 067664e19817d3aba98b0cfa68ef57a04958a982ee23b96b612e4bf466a73890
   - filename: screens/PasscodeScreen.tsx
@@ -177,20 +167,34 @@ fileignoreconfig:
   - filename: screens/Home/MyVcs/IdInputModal.tsx
     checksum: b735aedc84164d03c199fe89ccbf9df58f8997bfb4f60e7058a22bfe952fda3e
   - filename: .github/workflows/ui-automation.yml
-    checksum: 0b26a5dcb7524ba15d6aaeaf04f2ef94be9d25ef702d9072d6628bcd58e50f36 
+    checksum: 0b26a5dcb7524ba15d6aaeaf04f2ef94be9d25ef702d9072d6628bcd58e50f36
   - filename: components/BannerNotificationContainer.tsx
-    checksum: a98ff1a0dd96d3ead4b8191320be8b0c7a558cda6b0de39f1c62aaa8efef9fb8  
+    checksum: a98ff1a0dd96d3ead4b8191320be8b0c7a558cda6b0de39f1c62aaa8efef9fb8
   - filename: components/HelpScreen.tsx
     checksum: bbc69143bd37d065bba3800396301db5a0318e8b7ba51ecd49142dda68783a01  
   - filename: machines/backupRestore.ts
-    checksum: 8fa9d8b430e2c2c632dfed0d701d375ac3d436a198a9c7acde93ec6507764550
-  - filename: machines/backupAndRestore/backupAndRestoreSetup.ts
-    checksum: 75b07071aef4278f40f16861232b922e5ee8594efc9467984b072966fa7793b8
-  - filename: machines/backupAndRestore/backupAndRestoreSetup.typegen.ts
-    checksum: 76e81749435d83e4cd222ebb91245d1c6baaab7814d9e7899298ca8ca55c97fb
+    checksum: bbc69143bd37d065bba3800396301db5a0318e8b7ba51ecd49142dda68783a01
+  - filename: injitest/README.md
+    checksum: 82974a6b9363512472272245e9b433f92e63377e58ba306980876b745181a09c
+  - filename: shared/VCMetadata.ts
+    checksum: e93f988415bf91064e2cf5fbc09ff6c7226798baa5da721fa0715d5d0d6afddf
+  - filename: machines/backupRestore.ts
+    checksum: 8f8725bb55dbc98083f819c74754a8eac258d15038e391a16ca1ab55a53d61f3
+  - filename: machines/backupRestore.typegen.ts
+    checksum: 85e92ddec56da8dcdd28b5a29dfabd88dd0435e619f822488bc4e19b83872289
+  - filename: ios/Podfile.lock
+    checksum: 369fecac06b3c087b272e7920aa5ffe6734f261ae0af0c376a92ebf5c11415d4
+  - filename: screens/Home/MyVcsTab.tsx
+    checksum: 8133e2fefddfd0207eb7207b660d317f9a6acafbab6a65762d29ea86e33787cb
+  - filename: components/BackupAndRestoreBannerNotification.tsx
+    checksum: 7bb544ecd2f691f8cef916d0463106ec67645253107dd407236ce3a81f4e9ba7
   - filename: machines/backupAndRestore/backup.ts
-    checksum: 6eb330e43afe02fe6ccfd89d6cc82863a3aa95431575ba420bdcd763c27b7892
+    checksum: a0c667ee882689056a8867f7a6d2d510546c4dcb792024112b28db24e21cc884
+  - filename: machines/backupAndRestore/backup.typegen.ts
+    checksum: acf45ed52679db29a23fa7d9e8307df5f4caa404eee49b742b6a5136ff647ffa
   - filename: machines/backupAndRestore/backupAndRestoreSetup.ts
-    checksum: 397f2076504f851a981b0deff6eeac30041c775ee1c57b51e328fc09d52ef43e
+    checksum: c21559a531b6c62013dc0d932e0e2666cf9bd1ea62e7681240e4983406c96732
+  - filename: machines/backupAndRestore/backupAndRestoreSetup.typegen.ts
+    checksum: 3d8b4183f386c73092a271db77434370260dbe1c91fc4193cb21a81f3b548cda
     version: ""
 
diff --git a/assets/Gdrive_Logo.svg b/assets/Gdrive_Logo.svg
new file mode 100644
index 0000000000..798cae040f
--- /dev/null
+++ b/assets/Gdrive_Logo.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="135.883" height="29.485" viewBox="0 0 135.883 29.485">
+  <g id="Group_58198" data-name="Group 58198" transform="translate(-125.142 -365.686)">
+    <path id="Path_155718" fill="#000" data-name="Path 155718" d="M9.719-1.492A3.465,3.465,0,0,1,8.105-.254,6.517,6.517,0,0,1,5.7.156,4.674,4.674,0,0,1,3.227-.5,4.346,4.346,0,0,1,1.559-2.352,6.408,6.408,0,0,1,.953-5.141v-.992a5.982,5.982,0,0,1,1.2-3.984,4.179,4.179,0,0,1,3.371-1.414,4.316,4.316,0,0,1,2.867.91A3.965,3.965,0,0,1,9.719-8.039h-1.5A2.478,2.478,0,0,0,5.531-10.3,2.656,2.656,0,0,0,3.246-9.238a5.165,5.165,0,0,0-.785,3.066v.93A4.841,4.841,0,0,0,3.336-2.2,2.837,2.837,0,0,0,5.7-1.07,5.217,5.217,0,0,0,7.18-1.258a2.282,2.282,0,0,0,1.047-.633V-4.445H5.594V-5.664H9.719ZM11.609-4.3A4.993,4.993,0,0,1,12.1-6.539,3.643,3.643,0,0,1,13.457-8.07a3.7,3.7,0,0,1,1.988-.539,3.565,3.565,0,0,1,2.793,1.2A4.6,4.6,0,0,1,19.3-4.234v.1a5.036,5.036,0,0,1-.473,2.215A3.589,3.589,0,0,1,17.48-.391a3.743,3.743,0,0,1-2.02.547,3.556,3.556,0,0,1-2.785-1.2A4.575,4.575,0,0,1,11.609-4.2Zm1.453.172a3.616,3.616,0,0,0,.652,2.258,2.088,2.088,0,0,0,1.746.852,2.075,2.075,0,0,0,1.75-.863A3.955,3.955,0,0,0,17.859-4.3a3.61,3.61,0,0,0-.66-2.254,2.1,2.1,0,0,0-1.754-.863,2.075,2.075,0,0,0-1.727.852A3.925,3.925,0,0,0,13.063-4.133ZM20.734-4.3a4.993,4.993,0,0,1,.488-2.234A3.643,3.643,0,0,1,22.582-8.07a3.7,3.7,0,0,1,1.988-.539,3.565,3.565,0,0,1,2.793,1.2,4.6,4.6,0,0,1,1.066,3.18v.1a5.036,5.036,0,0,1-.473,2.215A3.589,3.589,0,0,1,26.605-.391a3.743,3.743,0,0,1-2.02.547,3.556,3.556,0,0,1-2.785-1.2A4.575,4.575,0,0,1,20.734-4.2Zm1.453.172a3.616,3.616,0,0,0,.652,2.258,2.088,2.088,0,0,0,1.746.852,2.075,2.075,0,0,0,1.75-.863A3.955,3.955,0,0,0,26.984-4.3a3.61,3.61,0,0,0-.66-2.254,2.1,2.1,0,0,0-1.754-.863,2.075,2.075,0,0,0-1.727.852A3.925,3.925,0,0,0,22.188-4.133ZM29.9-4.3a4.968,4.968,0,0,1,.914-3.145,2.923,2.923,0,0,1,2.422-1.168,2.908,2.908,0,0,1,2.414,1.094l.07-.937h1.32V-.2a3.439,3.439,0,0,1-.973,2.586,3.589,3.589,0,0,1-2.613.945,4.348,4.348,0,0,1-1.789-.391,3.08,3.08,0,0,1-1.336-1.07L31.078,1a2.826,2.826,0,0,0,2.273,1.148A2.214,2.214,0,0,0,35,1.555a2.269,2.269,0,0,0,.59-1.672V-.844a2.971,2.971,0,0,1-2.367,1,2.887,2.887,0,0,1-2.4-1.2A5.224,5.224,0,0,1,29.9-4.3Zm1.453.164a3.79,3.79,0,0,0,.586,2.246,1.9,1.9,0,0,0,1.641.816,2.117,2.117,0,0,0,2.008-1.242V-6.172a2.142,2.142,0,0,0-1.992-1.211,1.921,1.921,0,0,0-1.648.82A4.128,4.128,0,0,0,31.352-4.133ZM40.789,0H39.344V-12h1.445Zm5.82.156a3.693,3.693,0,0,1-2.8-1.129,4.19,4.19,0,0,1-1.078-3.02v-.266a5.073,5.073,0,0,1,.48-2.246,3.748,3.748,0,0,1,1.344-1.547,3.378,3.378,0,0,1,1.871-.559,3.166,3.166,0,0,1,2.563,1.086,4.7,4.7,0,0,1,.914,3.109v.6H44.18a3,3,0,0,0,.73,2.02,2.3,2.3,0,0,0,1.777.77,2.517,2.517,0,0,0,1.3-.312,3.259,3.259,0,0,0,.93-.828l.883.688A3.55,3.55,0,0,1,46.609.156Zm-.18-7.578a1.928,1.928,0,0,0-1.469.637A3.1,3.1,0,0,0,44.227-5h4.234v-.109a2.753,2.753,0,0,0-.594-1.707A1.815,1.815,0,0,0,46.43-7.422ZM55.766,0V-11.375h3.211a5.169,5.169,0,0,1,2.625.656,4.438,4.438,0,0,1,1.762,1.867,6.078,6.078,0,0,1,.629,2.781v.727a6.1,6.1,0,0,1-.621,2.82A4.369,4.369,0,0,1,61.6-.664,5.5,5.5,0,0,1,58.914,0Zm1.5-10.141v8.914h1.578a3.435,3.435,0,0,0,2.7-1.078,4.452,4.452,0,0,0,.965-3.07v-.664a4.522,4.522,0,0,0-.91-3.012,3.24,3.24,0,0,0-2.582-1.09ZM70.117-7.156a4.331,4.331,0,0,0-.711-.055A1.9,1.9,0,0,0,67.477-6V0H66.031V-8.453h1.406l.023.977a2.251,2.251,0,0,1,2.016-1.133,1.477,1.477,0,0,1,.641.109ZM73.016,0H71.57V-8.453h1.445ZM71.453-10.7a.863.863,0,0,1,.215-.594.807.807,0,0,1,.637-.242.819.819,0,0,1,.641.242.854.854,0,0,1,.219.594.826.826,0,0,1-.219.586.834.834,0,0,1-.641.234.821.821,0,0,1-.637-.234A.834.834,0,0,1,71.453-10.7Zm6.664,8.734,2.094-6.492h1.477L78.656,0h-1.1L74.492-8.453h1.477ZM86.586.156a3.693,3.693,0,0,1-2.8-1.129,4.19,4.19,0,0,1-1.078-3.02v-.266a5.073,5.073,0,0,1,.48-2.246,3.748,3.748,0,0,1,1.344-1.547,3.378,3.378,0,0,1,1.871-.559,3.166,3.166,0,0,1,2.563,1.086,4.7,4.7,0,0,1,.914,3.109v.6H84.156a3,3,0,0,0,.73,2.02,2.3,2.3,0,0,0,1.777.77,2.517,2.517,0,0,0,1.3-.312,3.259,3.259,0,0,0,.93-.828l.883.688A3.55,3.55,0,0,1,86.586.156Zm-.18-7.578a1.928,1.928,0,0,0-1.469.637A3.1,3.1,0,0,0,84.2-5h4.234v-.109a2.753,2.753,0,0,0-.594-1.707A1.815,1.815,0,0,0,86.406-7.422Z" transform="translate(171.142 385.429)"/>
+    <g id="Google_Drive_icon__2020_" data-name="Google_Drive_icon_(2020)" transform="translate(125.142 365.686)">
+      <path id="Path_155709" data-name="Path 155709" d="M2.495,25.27,3.95,27.784A3.432,3.432,0,0,0,5.2,29.031l5.2-9H0a3.424,3.424,0,0,0,.454,1.7Z" fill="#0066da"/>
+      <path id="Path_155710" data-name="Path 155710" d="M16.5,9.45l-5.2-9A3.432,3.432,0,0,0,10.055,1.7L.454,18.333A3.425,3.425,0,0,0,0,20.034H10.4Z" fill="#00ac47"/>
+      <path id="Path_155711" data-name="Path 155711" d="M27.8,29.031a3.432,3.432,0,0,0,1.247-1.247l.6-1.04,2.892-5.009a3.424,3.424,0,0,0,.454-1.7H22.6l2.212,4.347Z" fill="#ea4335"/>
+      <path id="Path_155712" data-name="Path 155712" d="M16.5,9.45l5.2-9A3.323,3.323,0,0,0,20,0H13a3.519,3.519,0,0,0-1.7.454Z" fill="#00832d"/>
+      <path id="Path_155713" data-name="Path 155713" d="M22.6,20.034H10.4l-5.2,9a3.323,3.323,0,0,0,1.7.454H26.1a3.519,3.519,0,0,0,1.7-.454Z" fill="#2684fc"/>
+      <path id="Path_155714" data-name="Path 155714" d="M27.746,10.017,22.945,1.7A3.432,3.432,0,0,0,21.7.454l-5.2,9,6.1,10.584H32.981a3.424,3.424,0,0,0-.454-1.7Z" fill="#ffba00"/>
+    </g>
+  </g>
+</svg>
diff --git a/assets/Icloud-Logo.svg b/assets/Icloud-Logo.svg
new file mode 100644
index 0000000000..2711051ff4
--- /dev/null
+++ b/assets/Icloud-Logo.svg
@@ -0,0 +1,43 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="137.755" height="33.337" viewBox="0 0 137.755 33.337">
+  <defs>
+    <linearGradient id="linear-gradient" y1="0.5" x2="1" y2="0.5" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#95dcf6"/>
+      <stop offset="1" stop-color="#507eff"/>
+    </linearGradient>
+    <radialGradient id="radial-gradient" cx="0.514" cy="0.984" r="0.638" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#009ada"/>
+      <stop offset="1" stop-color="#1e88e5" stop-opacity="0"/>
+    </radialGradient>
+    <linearGradient id="linear-gradient-2" x1="0.047" y1="0.026" x2="0.953" y2="-0.396" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#fff" stop-opacity="0.059"/>
+      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-3" x1="0.86" y1="0.143" x2="0.134" y2="-0.349" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#fff" stop-opacity="0"/>
+      <stop offset="1" stop-color="#fff" stop-opacity="0.059"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-4" x1="0.5" y1="1.23" x2="0.5" y2="0.23" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#00accd" stop-opacity="0.2"/>
+      <stop offset="0.127" stop-color="#1ab4d2" stop-opacity="0.173"/>
+      <stop offset="0.4" stop-color="#5ccadf" stop-opacity="0.122"/>
+      <stop offset="0.793" stop-color="#c5ecf4" stop-opacity="0.043"/>
+      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-5" x1="0.102" y1="0.71" x2="0.962" y2="0.108" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#fff" stop-opacity="0.102"/>
+      <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+  <g id="Group_58211" data-name="Group 58211" transform="translate(-120 -449.681)">
+    <g id="iconfinder_logo_brand_brands_logos_icloud_2993684" transform="translate(64 326.981)">
+      <path id="Path_155715" data-name="Path 155715" d="M98.7,136.613v-.375a13.536,13.536,0,0,0-25.375-6.562,7.784,7.784,0,0,0-11.038,6.412,10.391,10.391,0,0,0,4.125,19.938H96.1a9.877,9.877,0,0,0,2.6-19.412Z" transform="translate(0)" fill="url(#linear-gradient)"/>
+      <path id="Path_155716" data-name="Path 155716" d="M98.7,136.613v-.375a13.536,13.536,0,0,0-25.375-6.562,7.784,7.784,0,0,0-11.038,6.412,10.391,10.391,0,0,0,4.125,19.938H96.1a9.877,9.877,0,0,0,2.6-19.412Z" transform="translate(0)" fill="url(#radial-gradient)"/>
+      <circle id="Ellipse_1234" data-name="Ellipse 1234" cx="9.9" cy="9.9" r="9.9" transform="translate(86.2 136.238)" fill="url(#linear-gradient-2)"/>
+      <circle id="Ellipse_1235" data-name="Ellipse 1235" cx="10.413" cy="10.413" r="10.413" transform="translate(56 135.2)" fill="url(#linear-gradient-3)"/>
+      <circle id="Ellipse_1236" data-name="Ellipse 1236" cx="8" cy="8" r="8" transform="translate(62 129.019)" fill="#56c7da" opacity="0.2"/>
+      <circle id="Ellipse_1237" data-name="Ellipse 1237" cx="13.538" cy="13.538" r="13.538" transform="translate(71.625 122.7)" fill="url(#linear-gradient-4)"/>
+      <path id="Path_155717" data-name="Path 155717" d="M98.7,136.613v-.375a13.536,13.536,0,0,0-25.375-6.562,7.784,7.784,0,0,0-11.038,6.412,10.391,10.391,0,0,0,4.125,19.938H96.1a9.877,9.877,0,0,0,2.6-19.412Z" transform="translate(0)" fill="url(#linear-gradient-5)"/>
+    </g>
+    <path id="Path_155719" fill="#000" data-name="Path 155719" d="M2-16.136h2.77V0H2Zm0-6.1h2.77v3.088H2Zm16.62-.605a9.112,9.112,0,0,1,6.554,2.225,7.858,7.858,0,0,1,2.588,5.056H24.824a6.111,6.111,0,0,0-1.99-3.406,6.309,6.309,0,0,0-4.185-1.256,6.711,6.711,0,0,0-5.305,2.308q-2.021,2.308-2.021,7.076A10.278,10.278,0,0,0,13.146-4.5a6.373,6.373,0,0,0,5.442,2.429,5.749,5.749,0,0,0,5.071-2.558,9.729,9.729,0,0,0,1.377-3.542h2.937a10.034,10.034,0,0,1-2.6,5.888A9.264,9.264,0,0,1,18.225.575a9.43,9.43,0,0,1-6.509-2.346Q8.25-4.874,8.25-11.353a12.24,12.24,0,0,1,2.6-8.068A9.51,9.51,0,0,1,18.618-22.841Zm12.73.605h2.725V0H31.348ZM44.593-1.756a3.758,3.758,0,0,0,3.716-2.051,10.218,10.218,0,0,0,1.007-4.564,8.126,8.126,0,0,0-.727-3.693,4.087,4.087,0,0,0-3.966-2.24A3.911,3.911,0,0,0,40.99-12.4a8.84,8.84,0,0,0-1.135,4.6A7.69,7.69,0,0,0,40.99-3.481,4,4,0,0,0,44.593-1.756ZM44.7-16.681A7.341,7.341,0,0,1,50-14.592q2.165,2.089,2.165,6.146a10.544,10.544,0,0,1-1.907,6.479Q48.347.59,44.335.59a6.682,6.682,0,0,1-5.313-2.263A8.938,8.938,0,0,1,37.055-7.75a9.67,9.67,0,0,1,2.074-6.509A6.96,6.96,0,0,1,44.7-16.681Zm13.426.469V-5.449a4.538,4.538,0,0,0,.394,2.028,2.746,2.746,0,0,0,2.709,1.453A3.83,3.83,0,0,0,65.1-4.511a10.089,10.089,0,0,0,.56-3.739v-7.962h2.725V0H65.814l.03-2.392A5.5,5.5,0,0,1,64.528-.833,5.8,5.8,0,0,1,60.744.439q-3.466,0-4.723-2.316a6.9,6.9,0,0,1-.681-3.315v-11.02ZM74.367-7.917a8.036,8.036,0,0,0,1.1,4.359A3.872,3.872,0,0,0,79.014-1.8a3.731,3.731,0,0,0,3.111-1.627A7.685,7.685,0,0,0,83.343-8.1a6.905,6.905,0,0,0-1.256-4.549,3.919,3.919,0,0,0-3.1-1.476,4.1,4.1,0,0,0-3.338,1.574A7.21,7.21,0,0,0,74.367-7.917Zm4.1-8.583a5.768,5.768,0,0,1,3.118.787,7.324,7.324,0,0,1,1.65,1.589v-8.189h2.619V0H83.4V-2.255A5.9,5.9,0,0,1,81.148-.091a6.456,6.456,0,0,1-2.982.666A6.039,6.039,0,0,1,73.474-1.7a8.907,8.907,0,0,1-1.983-6.062A10.465,10.465,0,0,1,73.3-13.9,5.922,5.922,0,0,1,78.469-16.5Z" transform="translate(171.399 479)"/>
+  </g>
+</svg>
diff --git a/assets/Mosip_Logo1.svg b/assets/Mosip_Logo1.svg
index a87e015c57..4176bb94f6 100644
--- a/assets/Mosip_Logo1.svg
+++ b/assets/Mosip_Logo1.svg
@@ -1,97 +1,148 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="160.441" height="173.276" viewBox="0 0 160.441 173.276">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="564" height="564" viewBox="0 0 564 564">
   <defs>
     <clipPath id="clip-path">
-      <path id="Path_155566" data-name="Path 155566" d="M294.259,160.244a10.053,10.053,0,0,1-1.912,3.7c-1.912,2.3-4.78,3.559-7.607,4.515a2.22,2.22,0,0,0-.915.488,2.325,2.325,0,0,0-.427,1.485,8.959,8.959,0,0,1-1.729,4.841,5.548,5.548,0,0,1-4.515,2.2,9.334,9.334,0,0,1-2.319-.529,80.74,80.74,0,0,0-16.353-2.685c-3.336-.285-6.733-.508-9.8-1.831-2.766-1.2-6.244-4.027-6-7.343.285-3.905-.122-7.953,1.139-11.756a17.311,17.311,0,0,1,1.342-2.929,58.419,58.419,0,1,0,49.1,9.845Zm-34.9,76.743a29.961,29.961,0,1,1,29.961-29.961A29.961,29.961,0,0,1,259.355,236.987Z" transform="translate(-201 -150.4)"/>
+      <path id="Path_155571" data-name="Path 155571" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-267.7 -336.6)"/>
+    </clipPath>
+    <clipPath id="clip-path-2">
+      <path id="Path_155572" data-name="Path 155572" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-57.6 -223.7)"/>
+    </clipPath>
+    <clipPath id="clip-path-3">
+      <path id="Path_155573" data-name="Path 155573" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-95.9 -287.1)"/>
+    </clipPath>
+    <clipPath id="clip-path-4">
+      <path id="Path_155574" data-name="Path 155574" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(0 -138.8)"/>
+    </clipPath>
+    <clipPath id="clip-path-5">
+      <path id="Path_155575" data-name="Path 155575" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-142 -105.8)"/>
+    </clipPath>
+    <clipPath id="clip-path-6">
+      <path id="Path_155576" data-name="Path 155576" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-123.8 -29.4)"/>
+    </clipPath>
+    <clipPath id="clip-path-7">
+      <path id="Path_155577" data-name="Path 155577" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-393.1 -138.5)"/>
+    </clipPath>
+    <clipPath id="clip-path-8">
+      <path id="Path_155578" data-name="Path 155578" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-400.7 -211.4)"/>
+    </clipPath>
+    <clipPath id="clip-path-9">
+      <path id="Path_155579" data-name="Path 155579" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-302.1 -124.4)"/>
+    </clipPath>
+    <clipPath id="clip-path-10">
+      <path id="Path_155580" data-name="Path 155580" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-248 -64)"/>
+    </clipPath>
+    <clipPath id="clip-path-11">
+      <path id="Path_155581" data-name="Path 155581" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-134.5 -410.9)"/>
+    </clipPath>
+    <clipPath id="clip-path-12">
+      <path id="Path_155582" data-name="Path 155582" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-21.7 -323.3)"/>
+    </clipPath>
+    <clipPath id="clip-path-13">
+      <path id="Path_155583" data-name="Path 155583" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-205.2 -410.4)"/>
+    </clipPath>
+    <clipPath id="clip-path-14">
+      <path id="Path_155584" data-name="Path 155584" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-389 -331.3)"/>
+    </clipPath>
+    <clipPath id="clip-path-15">
+      <path id="Path_155585" data-name="Path 155585" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-477.9 -273.1)"/>
     </clipPath>
     <clipPath id="clip-path-16">
-      <path id="Path_155581" data-name="Path 155581" d="M259.276,141.8a58.376,58.376,0,1,0,58.376,58.376A58.377,58.377,0,0,0,259.276,141.8Zm0,88.336a29.961,29.961,0,1,1,29.961-29.961A29.961,29.961,0,0,1,259.276,230.136Z" transform="translate(-200.9 -141.8)"/>
+      <path id="Path_155586" data-name="Path 155586" d="M270.1,60.1c-128,0-231.8,103.8-231.8,231.8S142,523.7,270.1,523.7,501.9,419.9,501.9,291.9,398.1,60.1,270.1,60.1Zm0,350.8a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-246.7 -140.4)"/>
+    </clipPath>
+    <clipPath id="clip-path-17">
+      <path id="Path_155587" data-name="Path 155587" d="M270.1,60.1c-128,0-231.8,103.8-231.8,231.8S142,523.7,270.1,523.7,501.9,419.9,501.9,291.9,398.1,60.1,270.1,60.1Zm0,350.8a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-303.6 -129.2)"/>
+    </clipPath>
+    <clipPath id="clip-path-18">
+      <path id="Path_155588" data-name="Path 155588" d="M270.1,60.1c-128,0-231.8,103.8-231.8,231.8S142,523.7,270.1,523.7,501.9,419.9,501.9,291.9,398.1,60.1,270.1,60.1Zm0,350.8a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-308.6 -110.6)"/>
+    </clipPath>
+    <clipPath id="clip-path-19">
+      <path id="Path_155589" data-name="Path 155589" d="M270.1,60.1c-128,0-231.8,103.8-231.8,231.8S142,523.7,270.1,523.7,501.9,419.9,501.9,291.9,398.1,60.1,270.1,60.1Zm0,350.8a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-250.8 -75)"/>
+    </clipPath>
+    <clipPath id="clip-path-20">
+      <path id="Path_155590" data-name="Path 155590" d="M270.1,60.1c-128,0-231.8,103.8-231.8,231.8S142,523.7,270.1,523.7,501.9,419.9,501.9,291.9,398.1,60.1,270.1,60.1Zm0,350.8a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-141.5 -106.8)"/>
+    </clipPath>
+    <clipPath id="clip-path-21">
+      <path id="Path_155591" data-name="Path 155591" d="M270.1,60.1c-128,0-231.8,103.8-231.8,231.8S142,523.7,270.1,523.7,501.9,419.9,501.9,291.9,398.1,60.1,270.1,60.1Zm0,350.8a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" transform="translate(-123.4 -30.4)"/>
+    </clipPath>
+    <clipPath id="clip-MOSIP_Logo">
+      <rect width="564" height="564"/>
     </clipPath>
   </defs>
-  <g id="MOSIP_Vertical_Black" data-name="MOSIP Vertical Black" transform="translate(-93.5 -115)">
-    <g id="Group_57516" data-name="Group 57516" transform="translate(93.5 258.112)">
-      <g id="Group_57515" data-name="Group 57515" transform="translate(0 0)">
-        <g id="Group_57514" data-name="Group 57514">
-          <path id="Path_155560" data-name="Path 155560" d="M120.023,850.167l-.041-17.492L111.4,847.1h-3.031l-8.543-14.035v17.126H93.5V821h5.573L110,839.123,120.735,821h5.532l.081,29.147h-6.326Z" transform="translate(-93.5 -820.512)" fill="#000"/>
-          <path id="Path_155561" data-name="Path 155561" d="M312.37,846.791a15.149,15.149,0,0,1-5.716-20.848,14.453,14.453,0,0,1,5.716-5.39,17.043,17.043,0,0,1,8.177-1.953,16.849,16.849,0,0,1,8.156,1.953,14.875,14.875,0,0,1,5.716,5.39,14.857,14.857,0,0,1-5.716,20.848,18.053,18.053,0,0,1-16.333,0Zm12.855-4.983a8.552,8.552,0,0,0,3.275-3.315,10.522,10.522,0,0,0,0-9.682,8.552,8.552,0,0,0-3.275-3.315,9.785,9.785,0,0,0-9.316,0,8.552,8.552,0,0,0-3.275,3.315,10.523,10.523,0,0,0,0,9.682,8.417,8.417,0,0,0,3.275,3.315,9.221,9.221,0,0,0,4.658,1.18A9.071,9.071,0,0,0,325.225,841.808Z" transform="translate(-261.662 -818.6)" fill="#000"/>
-          <path id="Path_155562" data-name="Path 155562" d="M504.887,847.808a15.787,15.787,0,0,1-5.187-2.441l2.3-5.085a15.724,15.724,0,0,0,4.454,2.217,16.937,16.937,0,0,0,5.166.834,8.265,8.265,0,0,0,4.251-.854,2.59,2.59,0,0,0,1.383-2.278,2.166,2.166,0,0,0-.814-1.729,5.912,5.912,0,0,0-2.075-1.1c-.834-.264-1.993-.59-3.437-.915a46.771,46.771,0,0,1-5.451-1.587,8.9,8.9,0,0,1-3.641-2.542,6.835,6.835,0,0,1-1.526-4.658,8.1,8.1,0,0,1,1.383-4.6,9.24,9.24,0,0,1,4.149-3.275,16.817,16.817,0,0,1,6.773-1.2,22.228,22.228,0,0,1,5.451.671,16.1,16.1,0,0,1,4.658,1.912l-2.075,5.126a16.268,16.268,0,0,0-8.075-2.3,7.62,7.62,0,0,0-4.19.915,2.833,2.833,0,0,0-1.363,2.42,2.388,2.388,0,0,0,1.566,2.237,25.27,25.27,0,0,0,4.76,1.444,46.768,46.768,0,0,1,5.451,1.586,9.008,9.008,0,0,1,3.641,2.5,6.691,6.691,0,0,1,1.526,4.617,7.884,7.884,0,0,1-1.4,4.556,9.364,9.364,0,0,1-4.19,3.275,16.918,16.918,0,0,1-6.794,1.2A24.516,24.516,0,0,1,504.887,847.808Z" transform="translate(-417.079 -818.6)" fill="#000"/>
-          <path id="Path_155563" data-name="Path 155563" d="M666.2,821h6.753v29.147H666.2Z" transform="translate(-549.713 -820.512)" fill="#000"/>
-          <path id="Path_155564" data-name="Path 155564" d="M777.343,822.3a9.917,9.917,0,0,1,4.393,3.661,10.187,10.187,0,0,1,1.546,5.614,10,10,0,0,1-1.546,5.594,9.768,9.768,0,0,1-4.393,3.661,16.367,16.367,0,0,1-6.732,1.261h-5.878v8.034H758V821h12.611A16.357,16.357,0,0,1,777.343,822.3Zm-2.481,13.018a5.207,5.207,0,0,0,0-7.485,7.1,7.1,0,0,0-4.617-1.3h-5.492v10.129h5.492A7.34,7.34,0,0,0,774.862,835.319Z" transform="translate(-622.841 -820.512)" fill="#000"/>
-        </g>
-      </g>
-    </g>
-    <g id="Group_57541" data-name="Group 57541" transform="translate(115.345 115)">
-      <g id="Group_57533" data-name="Group 57533" transform="translate(0.02 0)">
-        <g id="Group_57532" data-name="Group 57532" transform="translate(0 7.2)">
-          <path id="Path_155565" data-name="Path 155565" d="M294.259,160.244a10.053,10.053,0,0,1-1.912,3.7c-1.912,2.3-4.78,3.559-7.607,4.515a2.22,2.22,0,0,0-.915.488,2.325,2.325,0,0,0-.427,1.485,8.959,8.959,0,0,1-1.729,4.841,5.548,5.548,0,0,1-4.515,2.2,9.334,9.334,0,0,1-2.319-.529,80.74,80.74,0,0,0-16.353-2.685c-3.336-.285-6.733-.508-9.8-1.831-2.766-1.2-6.244-4.027-6-7.343.285-3.905-.122-7.953,1.139-11.756a17.311,17.311,0,0,1,1.342-2.929,58.419,58.419,0,1,0,49.1,9.845Zm-34.9,76.743a29.961,29.961,0,1,1,29.961-29.961A29.961,29.961,0,0,1,259.355,236.987Z" transform="translate(-201 -150.4)" fill="#fec401"/>
-          <g id="Group_57517" data-name="Group 57517" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1138" data-name="Ellipse 1138" cx="23.269" cy="23.269" r="23.269" transform="translate(57.745 67.874)" fill="#01a2fd"/>
-          </g>
-          <g id="Group_57518" data-name="Group 57518" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1139" data-name="Ellipse 1139" cx="9.519" cy="9.519" r="9.519" transform="translate(4.841 39.46)" fill="#f97707"/>
-          </g>
-          <g id="Group_57519" data-name="Group 57519" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1140" data-name="Ellipse 1140" cx="17.269" cy="17.269" r="17.269" transform="translate(14.502 55.426)" fill="#01a2fd"/>
-          </g>
-          <g id="Group_57520" data-name="Group 57520" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1141" data-name="Ellipse 1141" cx="17.269" cy="17.269" r="17.269" transform="translate(-9.641 18.082)" fill="#014daf"/>
-          </g>
-          <g id="Group_57521" data-name="Group 57521" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1142" data-name="Ellipse 1142" cx="14.116" cy="14.116" r="14.116" transform="translate(26.076 9.763)" fill="#f97707"/>
-          </g>
-          <g id="Group_57522" data-name="Group 57522" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1143" data-name="Ellipse 1143" cx="13.974" cy="13.974" r="13.974" transform="translate(21.54 -9.458)" fill="#01a2fd"/>
-          </g>
-          <g id="Group_57523" data-name="Group 57523" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1144" data-name="Ellipse 1144" cx="14.116" cy="14.116" r="14.116" transform="translate(89.313 18.001)" fill="#f97707"/>
-          </g>
-          <g id="Group_57524" data-name="Group 57524" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1145" data-name="Ellipse 1145" cx="9.356" cy="9.356" r="9.356" transform="translate(91.225 36.327)" fill="#01a2fd"/>
+  <g id="MOSIP_Logo" clip-path="url(#clip-MOSIP_Logo)">
+    <g id="MOSIP_Horizontal_Black" data-name="MOSIP Horizontal Black" transform="translate(11.8 0.6)">
+      <g id="Group_57572" data-name="Group 57572">
+        <g id="Group_57564" data-name="Group 57564">
+          <g id="Group_57563" data-name="Group 57563">
+            <path id="Path_155570" data-name="Path 155570" d="M408.7,106.1a39.7,39.7,0,0,1-7.6,14.7c-7.6,9.1-18.9,14.1-30.2,17.9a8.723,8.723,0,0,0-3.7,1.9c-1.4,1.5-1.6,3.8-1.7,5.9-.5,6.9-2.6,13.8-6.9,19.3-4.3,5.4-11,9.1-17.9,8.7a42.252,42.252,0,0,1-9.2-2.1c-21.1-6.3-43.1-8.8-65-10.6-13.2-1.1-26.8-2-39-7.3-11-4.7-24.8-16-23.8-29.2,1.1-15.5-.5-31.6,4.5-46.7A67.673,67.673,0,0,1,213.5,67C112.9,92.3,38.2,183.4,38.2,291.9c0,128,103.8,231.8,231.8,231.8S501.8,419.9,501.8,291.9C501.9,215.9,465.2,148.4,408.7,106.1ZM270.1,410.9a119,119,0,1,1,119-119A119.028,119.028,0,0,1,270.1,410.9Z" fill="#fec401"/>
+            <g id="Group_57548" data-name="Group 57548" transform="translate(267.7 336.6)" clip-path="url(#clip-path)">
+              <circle id="Ellipse_1146" data-name="Ellipse 1146" cx="92.4" cy="92.4" r="92.4" fill="#01a2fd"/>
+            </g>
+            <g id="Group_57549" data-name="Group 57549" transform="translate(57.6 223.7)" clip-path="url(#clip-path-2)">
+              <circle id="Ellipse_1147" data-name="Ellipse 1147" cx="37.8" cy="37.8" r="37.8" fill="#f97707"/>
+            </g>
+            <g id="Group_57550" data-name="Group 57550" transform="translate(95.9 287.1)" clip-path="url(#clip-path-3)">
+              <circle id="Ellipse_1148" data-name="Ellipse 1148" cx="68.6" cy="68.6" r="68.6" fill="#01a2fd"/>
+            </g>
+            <g id="Group_57551" data-name="Group 57551" transform="translate(0 138.8)" clip-path="url(#clip-path-4)">
+              <circle id="Ellipse_1149" data-name="Ellipse 1149" cx="68.6" cy="68.6" r="68.6" fill="#014daf"/>
+            </g>
+            <g id="Group_57552" data-name="Group 57552" transform="translate(142 105.8)" clip-path="url(#clip-path-5)">
+              <circle id="Ellipse_1150" data-name="Ellipse 1150" cx="56" cy="56" r="56" fill="#f97707"/>
+            </g>
+            <g id="Group_57553" data-name="Group 57553" transform="translate(123.8 29.4)" clip-path="url(#clip-path-6)">
+              <circle id="Ellipse_1151" data-name="Ellipse 1151" cx="55.5" cy="55.5" r="55.5" fill="#01a2fd"/>
+            </g>
+            <g id="Group_57554" data-name="Group 57554" transform="translate(393.1 138.5)" clip-path="url(#clip-path-7)">
+              <circle id="Ellipse_1152" data-name="Ellipse 1152" cx="56" cy="56" r="56" fill="#f97707"/>
+            </g>
+            <g id="Group_57555" data-name="Group 57555" transform="translate(400.7 211.4)" clip-path="url(#clip-path-8)">
+              <circle id="Ellipse_1153" data-name="Ellipse 1153" cx="37.1" cy="37.1" r="37.1" fill="#01a2fd"/>
+            </g>
+            <g id="Group_57556" data-name="Group 57556" transform="translate(302.1 124.4)" clip-path="url(#clip-path-9)">
+              <circle id="Ellipse_1154" data-name="Ellipse 1154" cx="37.1" cy="37.1" r="37.1" fill="#014daf"/>
+            </g>
+            <g id="Group_57557" data-name="Group 57557" transform="translate(248 64)" clip-path="url(#clip-path-10)">
+              <circle id="Ellipse_1155" data-name="Ellipse 1155" cx="26.5" cy="26.5" r="26.5" fill="#014daf"/>
+            </g>
+            <g id="Group_57558" data-name="Group 57558" transform="translate(134.5 410.9)" clip-path="url(#clip-path-11)">
+              <circle id="Ellipse_1156" data-name="Ellipse 1156" cx="56" cy="56" r="56" fill="#f97707"/>
+            </g>
+            <g id="Group_57559" data-name="Group 57559" transform="translate(21.7 323.3)" clip-path="url(#clip-path-12)">
+              <circle id="Ellipse_1157" data-name="Ellipse 1157" cx="41.4" cy="41.4" r="41.4" fill="#014daf"/>
+            </g>
+            <g id="Group_57560" data-name="Group 57560" transform="translate(205.2 410.4)" clip-path="url(#clip-path-13)">
+              <circle id="Ellipse_1158" data-name="Ellipse 1158" cx="75.5" cy="75.5" r="75.5" fill="#014daf"/>
+            </g>
+            <g id="Group_57561" data-name="Group 57561" transform="translate(389 331.3)" clip-path="url(#clip-path-14)">
+              <circle id="Ellipse_1159" data-name="Ellipse 1159" cx="37.8" cy="37.8" r="37.8" fill="#014daf"/>
+            </g>
+            <g id="Group_57562" data-name="Group 57562" transform="translate(477.9 273.1)" clip-path="url(#clip-path-15)">
+              <circle id="Ellipse_1160" data-name="Ellipse 1160" cx="37.8" cy="37.8" r="37.8" fill="#f97707"/>
+            </g>
           </g>
-          <g id="Group_57525" data-name="Group 57525" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1146" data-name="Ellipse 1146" cx="9.356" cy="9.356" r="9.356" transform="translate(66.41 14.441)" fill="#014daf"/>
-          </g>
-          <g id="Group_57526" data-name="Group 57526" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1147" data-name="Ellipse 1147" cx="6.672" cy="6.672" r="6.672" transform="translate(52.803 -0.753)" fill="#014daf"/>
+          <circle id="Ellipse_1161" data-name="Ellipse 1161" cx="20.3" cy="20.3" r="20.3" transform="translate(322 54.7)" fill="#f97707"/>
+          <circle id="Ellipse_1162" data-name="Ellipse 1162" cx="12.1" cy="12.1" r="12.1" transform="translate(284.3 38.4)" fill="#fec401"/>
+          <circle id="Ellipse_1163" data-name="Ellipse 1163" cx="20.3" cy="20.3" r="20.3" transform="translate(372.3 98.5)" fill="#014daf"/>
+        </g>
+        <g id="Group_57571" data-name="Group 57571">
+          <g id="Group_57565" data-name="Group 57565" transform="translate(246.7 140.4)" clip-path="url(#clip-path-16)">
+            <circle id="Ellipse_1164" data-name="Ellipse 1164" cx="32.6" cy="32.6" r="32.6" fill="#fec401"/>
           </g>
-          <g id="Group_57527" data-name="Group 57527" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1148" data-name="Ellipse 1148" cx="14.116" cy="14.116" r="14.116" transform="translate(24.205 86.587)" fill="#f97707"/>
+          <g id="Group_57566" data-name="Group 57566" transform="translate(303.6 129.2)" clip-path="url(#clip-path-17)">
+            <circle id="Ellipse_1165" data-name="Ellipse 1165" cx="42.1" cy="42.1" r="42.1" fill="#01a2fd"/>
           </g>
-          <g id="Group_57528" data-name="Group 57528" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1149" data-name="Ellipse 1149" cx="10.434" cy="10.434" r="10.434" transform="translate(-4.19 64.518)" fill="#014daf"/>
+          <g id="Group_57567" data-name="Group 57567" transform="translate(308.6 110.6)" clip-path="url(#clip-path-18)">
+            <circle id="Ellipse_1166" data-name="Ellipse 1166" cx="20.3" cy="20.3" r="20.3" fill="#fec401"/>
           </g>
-          <g id="Group_57529" data-name="Group 57529" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1150" data-name="Ellipse 1150" cx="18.998" cy="18.998" r="18.998" transform="translate(42.043 86.465)" fill="#014daf"/>
+          <g id="Group_57568" data-name="Group 57568" transform="translate(250.8 75)" clip-path="url(#clip-path-19)">
+            <circle id="Ellipse_1167" data-name="Ellipse 1167" cx="26.1" cy="26.1" r="26.1" fill="#014daf"/>
           </g>
-          <g id="Group_57530" data-name="Group 57530" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1151" data-name="Ellipse 1151" cx="9.519" cy="9.519" r="9.519" transform="translate(88.316 66.532)" fill="#014daf"/>
+          <g id="Group_57569" data-name="Group 57569" transform="translate(141.5 106.8)" clip-path="url(#clip-path-20)">
+            <circle id="Ellipse_1168" data-name="Ellipse 1168" cx="56" cy="56" r="56" fill="#f97707"/>
           </g>
-          <g id="Group_57531" data-name="Group 57531" transform="translate(0 0)" clip-path="url(#clip-path)">
-            <circle id="Ellipse_1152" data-name="Ellipse 1152" cx="9.519" cy="9.519" r="9.519" transform="translate(110.69 51.908)" fill="#f97707"/>
+          <g id="Group_57570" data-name="Group 57570" transform="translate(123.4 30.4)" clip-path="url(#clip-path-21)">
+            <circle id="Ellipse_1169" data-name="Ellipse 1169" cx="55.5" cy="55.5" r="55.5" fill="#01a2fd"/>
           </g>
         </g>
-        <circle id="Ellipse_1153" data-name="Ellipse 1153" cx="5.126" cy="5.126" r="5.126" transform="translate(71.414 4.088)" fill="#f97707"/>
-        <circle id="Ellipse_1154" data-name="Ellipse 1154" cx="3.051" cy="3.051" r="3.051" transform="translate(61.935)" fill="#fec401"/>
-        <circle id="Ellipse_1155" data-name="Ellipse 1155" cx="5.126" cy="5.126" r="5.126" transform="translate(84.065 15.113)" fill="#014daf"/>
-      </g>
-      <g id="Group_57540" data-name="Group 57540" transform="translate(0 5.451)">
-        <g id="Group_57534" data-name="Group 57534" clip-path="url(#clip-path-16)">
-          <circle id="Ellipse_1156" data-name="Ellipse 1156" cx="8.197" cy="8.197" r="8.197" transform="translate(52.497 20.218)" fill="#fec401"/>
-        </g>
-        <g id="Group_57535" data-name="Group 57535" clip-path="url(#clip-path-16)">
-          <circle id="Ellipse_1157" data-name="Ellipse 1157" cx="10.597" cy="10.597" r="10.597" transform="translate(66.817 17.411)" fill="#01a2fd"/>
-        </g>
-        <g id="Group_57536" data-name="Group 57536" clip-path="url(#clip-path-16)">
-          <circle id="Ellipse_1158" data-name="Ellipse 1158" cx="5.126" cy="5.126" r="5.126" transform="translate(68.057 12.712)" fill="#fec401"/>
-        </g>
-        <g id="Group_57537" data-name="Group 57537" clip-path="url(#clip-path-16)">
-          <circle id="Ellipse_1159" data-name="Ellipse 1159" cx="6.59" cy="6.59" r="6.59" transform="translate(53.514 3.763)" fill="#014daf"/>
-        </g>
-        <g id="Group_57538" data-name="Group 57538" clip-path="url(#clip-path-16)">
-          <circle id="Ellipse_1160" data-name="Ellipse 1160" cx="14.116" cy="14.116" r="14.116" transform="translate(25.994 11.756)" fill="#f97707"/>
-        </g>
-        <g id="Group_57539" data-name="Group 57539" clip-path="url(#clip-path-16)">
-          <circle id="Ellipse_1161" data-name="Ellipse 1161" cx="13.974" cy="13.974" r="13.974" transform="translate(21.438 -7.465)" fill="#01a2fd"/>
-        </g>
       </g>
     </g>
   </g>
diff --git a/components/AccountInformation.tsx b/components/AccountInformation.tsx
index 38f196dfbd..8ab009d29b 100644
--- a/components/AccountInformation.tsx
+++ b/components/AccountInformation.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {Image} from 'react-native';
 import {Column, Row, Text} from './ui';
 import {Theme} from './ui/styleUtils';
-import {ProfileInfo} from '../shared/googleCloudUtils';
+import {ProfileInfo} from '../shared/CloudBackupAndRestoreUtils';
 import {useTranslation} from 'react-i18next';
 import testIDProps from '../shared/commonUtil';
 
diff --git a/components/BackupAndRestoreBannerNotification.tsx b/components/BackupAndRestoreBannerNotification.tsx
index 51d4bfa4e7..a44b085f1e 100644
--- a/components/BackupAndRestoreBannerNotification.tsx
+++ b/components/BackupAndRestoreBannerNotification.tsx
@@ -20,8 +20,8 @@ export const BackupAndRestoreBannerNotification: React.FC = () => {
         type="error"
         message={translation}
         onClosePress={backUpController.DISMISS}
-        key={`backupFailure-${backUpController.backupErrorReason}`}
-        testId={`backupFailure-${backUpController.backupErrorReason}`}
+        key={`backupFailure-${backUpController.backupErrorReason}Popup`}
+        testId={`backupFailure-${backUpController.backupErrorReason}Popup`}
       />
     );
   }
@@ -34,10 +34,10 @@ export const BackupAndRestoreBannerNotification: React.FC = () => {
     return (
       <BannerNotification
         type="error"
-        key={`restoreFailure-${restoreController.restoreErrorReason}`}
+        key={`restoreFailure-${restoreController.restoreErrorReason}Popup`}
         message={translation}
         onClosePress={restoreController.DISMISS}
-        testId={`restoreFailure-${restoreController.restoreErrorReason}`}
+        testId={`restoreFailure-${restoreController.restoreErrorReason}Popup`}
       />
     );
   }
@@ -49,27 +49,23 @@ export const BackupAndRestoreBannerNotification: React.FC = () => {
           type="success"
           message={t('backupSuccessful')}
           onClosePress={backUpController.DISMISS}
-          key={'dataBackupSuccess'}
-          testId={'dataBackupSuccess'}
+          key={'dataBackupSuccessPopup'}
+          testId={'dataBackupSuccessPopup'}
         />
       )}
 
-      {backUpController.isBackingUpFailure &&
-        !backUpController.isCheckingDataForBackup &&
-        backupFailure()}
+      {backUpController.isBackingUpFailure && backupFailure()}
 
       {restoreController.isBackUpRestoreSuccess && (
         <BannerNotification
           type="success"
           message={t('restoreSuccessful')}
           onClosePress={restoreController.DISMISS}
-          key={'restoreBackupSuccess'}
-          testId={'restoreBackupSuccess'}
+          key={'restoreBackupSuccessPopup'}
+          testId={'restoreBackupSuccessPopup'}
         />
       )}
-      {restoreController.isBackUpRestoreFailure &&
-        !restoreController.isCheckStorageAvailibility &&
-        restoreFailure()}
+      {restoreController.isBackUpRestoreFailure && restoreFailure()}
     </>
   );
 };
diff --git a/components/BannerNotification.tsx b/components/BannerNotification.tsx
index f653ff69de..d46cd7b7f2 100644
--- a/components/BannerNotification.tsx
+++ b/components/BannerNotification.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Pressable} from 'react-native';
+import {Pressable, View} from 'react-native';
 import {Column, Row, Text} from './ui';
 import {Theme} from './ui/styleUtils';
 import {Icon} from 'react-native-elements';
@@ -7,26 +7,28 @@ import testIDProps from '../shared/commonUtil';
 
 export const BannerNotification: React.FC<BannerNotificationProps> = props => {
   return (
-    <Row
-      {...testIDProps(props.testId)}
-      style={[Theme.BannerStyles.container, Theme.BannerStyles[props.type]]}>
-      <Column fill>
-        <Text
-          color={Theme.Colors.whiteText}
-          weight="semibold"
-          style={Theme.BannerStyles.text}>
-          {props.message}
-        </Text>
-      </Column>
-      <Column>
-        <Pressable
-          style={Theme.BannerStyles.dismiss}
-          {...testIDProps('close')}
-          onPress={props.onClosePress}>
-          <Icon name="close" color={Theme.Colors.whiteText} size={19} />
-        </Pressable>
-      </Column>
-    </Row>
+    <View {...testIDProps(props.testId)}>
+      <Row
+        style={[Theme.BannerStyles.container, Theme.BannerStyles[props.type]]}>
+        <Column fill>
+          <Text
+            testID={`${props.testId}Text`}
+            color={Theme.Colors.whiteText}
+            weight="semibold"
+            style={Theme.BannerStyles.text}>
+            {props.message}
+          </Text>
+        </Column>
+        <Column>
+          <Pressable
+            style={Theme.BannerStyles.dismiss}
+            {...testIDProps('close')}
+            onPress={props.onClosePress}>
+            <Icon name="close" color={Theme.Colors.whiteText} size={19} />
+          </Pressable>
+        </Column>
+      </Row>
+    </View>
   );
 };
 
diff --git a/components/HelpScreen.tsx b/components/HelpScreen.tsx
index 70a51cff34..d8e25edfd3 100644
--- a/components/HelpScreen.tsx
+++ b/components/HelpScreen.tsx
@@ -25,9 +25,10 @@ export const HelpScreen: React.FC<HelpScreenProps> = props => {
         if (listingRef?.current != null) {
           listingRef.current.scrollToIndex({
             index: 15,
+            animated: true,
           });
         }
-      }, 3000);
+      }, 2000);
     }
   }, [showHelpPage]);
 
@@ -288,6 +289,15 @@ export const HelpScreen: React.FC<HelpScreenProps> = props => {
                 </View>
               )}
               data={[...InjiFaqMap, ...BackupFaqMap]}
+              onScrollToIndexFailed={info => {
+                const wait = new Promise(resolve => setTimeout(resolve, 500));
+                wait.then(() => {
+                  listingRef.current?.scrollToIndex({
+                    index: info.index,
+                    animated: true,
+                  });
+                });
+              }}
             />
           </Column>
         </SafeAreaView>
diff --git a/components/VC/MosipVCItem/MosipVCItemContent.tsx b/components/VC/MosipVCItem/MosipVCItemContent.tsx
index d3214d4efd..73a96e55ca 100644
--- a/components/VC/MosipVCItem/MosipVCItemContent.tsx
+++ b/components/VC/MosipVCItem/MosipVCItemContent.tsx
@@ -7,7 +7,7 @@ import VerifiedIcon from '../../VerifiedIcon';
 import {Column, Row, Text} from '../../ui';
 import {Theme} from '../../ui/styleUtils';
 import {CheckBox, Icon} from 'react-native-elements';
-import {getMaskedText} from '../../../shared/commonUtil';
+import testIDProps, {getMaskedText} from '../../../shared/commonUtil';
 import {logoType} from '../../../machines/issuersMachine';
 import {SvgImage} from '../../ui/svg';
 
@@ -89,7 +89,7 @@ const getIssuerLogo = (isOpenId4VCI: boolean, issuerLogo: logoType) => {
   if (isOpenId4VCI) {
     return (
       <Image
-        testID="esignetLogo"
+        {...testIDProps('esignetLogo')}
         src={issuerLogo?.url}
         alt={issuerLogo?.alt_text}
         style={Theme.Styles.issuerLogo}
diff --git a/components/VC/MosipVCItem/MosipVCItemDetails.tsx b/components/VC/MosipVCItem/MosipVCItemDetails.tsx
index b914d7a6b8..6e7f42f0df 100644
--- a/components/VC/MosipVCItem/MosipVCItemDetails.tsx
+++ b/components/VC/MosipVCItem/MosipVCItemDetails.tsx
@@ -1,13 +1,11 @@
-import {format, formatDistanceToNow, parse} from 'date-fns';
+import {format, parse} from 'date-fns';
 import React from 'react';
-import * as DateFnsLocale from 'date-fns/locale';
 import {useTranslation} from 'react-i18next';
 import {Dimensions, Image, ImageBackground, View} from 'react-native';
 import {Icon} from 'react-native-elements';
 import {CredentialSubject, VC} from '../../../types/VC/ExistingMosipVC/vc';
 import {Button, Column, Row, Text} from '../../ui';
 import {Theme} from '../../ui/styleUtils';
-import {TextItem} from '../../ui/TextItem';
 import VerifiedIcon from '../../VerifiedIcon';
 import {getLocalizedField} from '../../../i18n';
 import {CREDENTIAL_REGISTRY_EDIT} from 'react-native-dotenv';
@@ -15,7 +13,6 @@ import {QrCodeOverlay} from '../../QrCodeOverlay';
 import {VCMetadata} from '../../../shared/VCMetadata';
 import {
   VcIdType,
-  VCSharingReason,
   VerifiableCredential,
   VerifiablePresentation,
 } from '../../../types/VC/EsignetMosipVC/vc';
@@ -246,7 +243,7 @@ export const MosipVCItemDetails: React.FC<
                       justifyContent: 'flex-start',
                       alignItems: 'center',
                     }}>
-                    {props.vc?.isVerified && <VerifiedIcon />}
+                    {props.vc && <VerifiedIcon />}
                     <Text
                       testID="valid"
                       style={{maxWidth: 80}}
@@ -352,28 +349,6 @@ export const MosipVCItemDetails: React.FC<
         </Column>
       </ImageBackground>
 
-      {props.vc?.reason?.length > 0 && (
-        <Text
-          testID="reasonForSharingTitle"
-          margin="24 24 16 24"
-          weight="semibold">
-          {t('reasonForSharing')}
-        </Text>
-      )}
-
-      {props.vc?.reason?.map((reason, index) => (
-        <TextItem
-          testID="reason"
-          key={index}
-          divider
-          label={formatDistanceToNow(reason.timestamp, {
-            addSuffix: true,
-            locale: DateFnsLocale[i18n.language],
-          })}
-          text={reason.message}
-        />
-      ))}
-
       {props.activeTab !== 1 ? (
         props.isBindingPending ? (
           <Column style={Theme.Styles.openCardBgContainer} padding="10">
@@ -477,7 +452,6 @@ export interface EsignetVC {
   isVerified: boolean;
   lastVerifiedOn: number;
   locked: boolean;
-  reason?: VCSharingReason[];
   shouldVerifyPresence?: boolean;
   walletBindingResponse?: WalletBindingResponse;
   credentialRegistry: string;
diff --git a/components/VC/VcDetailsContainer.tsx b/components/VC/VcDetailsContainer.tsx
index b9d56ec59b..d45c67a46e 100644
--- a/components/VC/VcDetailsContainer.tsx
+++ b/components/VC/VcDetailsContainer.tsx
@@ -10,7 +10,10 @@ import {Issuers} from '../../shared/openId4VCI/Utils';
 export const VcDetailsContainer: React.FC<
   ExistingMosipVCItemDetailsProps | EsignetMosipVCItemDetailsProps
 > = props => {
-  if (props.vc.vcMetadata.issuer === Issuers.Sunbird)
-    return <VCDetailView {...props} />;
-  return <MosipVCItemDetails {...props} />;
+  if (
+    props.vc.vcMetadata.issuer === Issuers.Mosip ||
+    props.vc.vcMetadata.issuer === Issuers.ESignet
+  )
+    return <MosipVCItemDetails {...props} />;
+  return <VCDetailView {...props} />;
 };
diff --git a/components/VC/VcItemContainer.tsx b/components/VC/VcItemContainer.tsx
index 6e14e2c53f..b81a5f6a1c 100644
--- a/components/VC/VcItemContainer.tsx
+++ b/components/VC/VcItemContainer.tsx
@@ -10,7 +10,10 @@ import {Issuers} from '../../shared/openId4VCI/Utils';
 export const VcItemContainer: React.FC<
   ExistingMosipVCItemProps | EsignetMosipVCItemProps
 > = props => {
-  if (props.vcMetadata.issuer === Issuers.Sunbird)
-    return <VCCardView {...props} />;
-  return <MosipVCItem {...props} />;
+  if (
+    props.vcMetadata.issuer === Issuers.Mosip ||
+    props.vcMetadata.issuer === Issuers.ESignet
+  )
+    return <MosipVCItem {...props} />;
+  return <VCCardView {...props} />;
 };
diff --git a/components/VC/Views/VCDetailView.tsx b/components/VC/Views/VCDetailView.tsx
index a9d46ee1b9..6c366518da 100644
--- a/components/VC/Views/VCDetailView.tsx
+++ b/components/VC/Views/VCDetailView.tsx
@@ -1,18 +1,14 @@
-import {formatDistanceToNow} from 'date-fns';
 import React, {useEffect, useState} from 'react';
-import * as DateFnsLocale from 'date-fns/locale';
 import {useTranslation} from 'react-i18next';
 import {Image, ImageBackground} from 'react-native';
 import {Icon} from 'react-native-elements';
 import {VC} from '../../../types/VC/ExistingMosipVC/vc';
 import {Button, Column, Row, Text} from '../../ui';
 import {Theme} from '../../ui/styleUtils';
-import {TextItem} from '../../ui/TextItem';
 import {QrCodeOverlay} from '../../QrCodeOverlay';
 import {VCMetadata} from '../../../shared/VCMetadata';
 import {
   VcIdType,
-  VCSharingReason,
   VerifiableCredential,
   VerifiablePresentation,
 } from '../../../types/VC/EsignetMosipVC/vc';
@@ -126,28 +122,6 @@ export const VCDetailView: React.FC<
         </Row>
       </ImageBackground>
 
-      {props.vc?.reason?.length > 0 && (
-        <Text
-          testID="reasonForSharingTitle"
-          margin="24 24 16 24"
-          weight="semibold">
-          {t('reasonForSharing')}
-        </Text>
-      )}
-
-      {props.vc?.reason?.map((reason, index) => (
-        <TextItem
-          testID="reason"
-          key={index}
-          divider
-          label={formatDistanceToNow(reason.timestamp, {
-            addSuffix: true,
-            locale: DateFnsLocale[i18n.language],
-          })}
-          text={reason.message}
-        />
-      ))}
-
       {props.activeTab !== 1 ? (
         props.isBindingPending &&
         isActivationNeeded(props.vc.vcMetadata.issuer) ? (
@@ -246,7 +220,6 @@ export interface EsignetVC {
   isVerified: boolean;
   lastVerifiedOn: number;
   locked: boolean;
-  reason?: VCSharingReason[];
   shouldVerifyPresence?: boolean;
   walletBindingResponse?: WalletBindingResponse;
   credentialRegistry: string;
diff --git a/components/VC/common/VCUtils.tsx b/components/VC/common/VCUtils.tsx
index c894ae7d90..9fad5e4963 100644
--- a/components/VC/common/VCUtils.tsx
+++ b/components/VC/common/VCUtils.tsx
@@ -59,7 +59,7 @@ export const getFieldValue = (
       );
     default: {
       const fieldValue = verifiableCredential?.credentialSubject[field];
-      if (Array.isArray(fieldValue) && typeof fieldValue[0] != Object) {
+      if (Array.isArray(fieldValue) && typeof fieldValue[0] != 'object') {
         return fieldValue;
       }
       return getLocalizedField(fieldValue);
diff --git a/components/openId4VCI/Issuer.tsx b/components/openId4VCI/Issuer.tsx
index 96db4c0c48..5978085e67 100644
--- a/components/openId4VCI/Issuer.tsx
+++ b/components/openId4VCI/Issuer.tsx
@@ -9,6 +9,7 @@ import {SvgImage} from '../ui/svg';
 export const Issuer: React.FC<IssuerProps> = (props: IssuerProps) => {
   return (
     <Pressable
+      accessible={false}
       {...testIDProps(`issuer-${props.testID}`)}
       onPress={props.onPress}
       style={({pressed}) =>
diff --git a/components/ui/Button.tsx b/components/ui/Button.tsx
index df04603336..176502e54f 100644
--- a/components/ui/Button.tsx
+++ b/components/ui/Button.tsx
@@ -14,11 +14,16 @@ export const Button: React.FC<ButtonProps> = props => {
   const buttonStyle: StyleProp<ViewStyle> = [
     props.fill ? Theme.ButtonStyles.fill : null,
     Theme.ButtonStyles[type],
+    props.disabled && props.type === 'outline'
+      ? Theme.ButtonStyles.disabledOutlineButton
+      : null,
     {width: props.width ?? '100%'},
   ];
   const containerStyle: StyleProp<ViewStyle> = [
     !(type === 'gradient') ? Theme.ButtonStyles.container : null,
-    props.disabled ? Theme.ButtonStyles.disabled : null,
+    props.disabled && props.type !== 'outline'
+      ? Theme.ButtonStyles.disabled
+      : null,
     props.margin ? Theme.spacing('margin', props.margin) : null,
     type === 'gradient'
       ? props.isVcThere
@@ -53,6 +58,8 @@ export const Button: React.FC<ButtonProps> = props => {
               ? Theme.Colors.whiteText
               : type === 'plain'
               ? Theme.Colors.plainText
+              : type === 'outline' && props.disabled
+              ? Theme.Colors.textLabel
               : Theme.Colors.AddIdBtnTxt
           }>
           {props.title}
diff --git a/components/ui/Loader.tsx b/components/ui/Loader.tsx
index 6b5b667d2e..be864544db 100644
--- a/components/ui/Loader.tsx
+++ b/components/ui/Loader.tsx
@@ -24,7 +24,7 @@ export const Loader: React.FC<LoaderProps> = props => {
         crossAlign="center"
         fill>
         <Column margin="24 0" align="space-around">
-          <LoaderAnimation />
+          <LoaderAnimation testID={'loader'} />
         </Column>
         {(props.isHintVisible || props.onCancel) && (
           <Column style={Theme.SelectVcOverlayStyles.timeoutHintContainer}>
diff --git a/components/ui/LoaderAnimation.tsx b/components/ui/LoaderAnimation.tsx
index 2d188da2ec..cda9605fac 100644
--- a/components/ui/LoaderAnimation.tsx
+++ b/components/ui/LoaderAnimation.tsx
@@ -5,11 +5,14 @@ import {Theme} from './styleUtils';
 import testIDProps from '../../shared/commonUtil';
 import {SvgImage} from './svg';
 
-export const LoaderAnimation: React.FC<LoaderAnimationProps> = ({showLogo}) => {
+export const LoaderAnimation: React.FC<LoaderAnimationProps> = ({
+  showLogo,
+  testID,
+}) => {
   return (
     <Fragment>
       {showLogo && SvgImage.ProgressIcon()}
-      <View {...testIDProps('threeDotsLoader')}>
+      <View {...testIDProps(`${testID}-threeDotsLoader`)}>
         <Spinner
           type="ThreeBounce"
           color={Theme.Colors.Loading}
@@ -26,4 +29,5 @@ LoaderAnimation.defaultProps = {
 
 interface LoaderAnimationProps {
   showLogo?: boolean;
+  testID: string;
 }
diff --git a/components/ui/svg.tsx b/components/ui/svg.tsx
index 6660935a07..06f37ccca4 100644
--- a/components/ui/svg.tsx
+++ b/components/ui/svg.tsx
@@ -23,7 +23,9 @@ import SuccessLogo from '../../assets/Success_Message_Icon1.svg';
 import NoInternetConnection from '../../assets/No_Internet_Connection.svg';
 import SomethingWentWrong from '../../assets/Something_Went_Wrong.svg';
 import MagnifierZoom from '../../assets/Magnifier_Zoom.svg';
-import GoogleDriveIcon from '../../assets/google-drive-28.svg';
+import GoogleDriveIcon from '../../assets/Gdrive_Logo.svg';
+import GoogleDriveIconSmall from '../../assets/google-drive-28.svg';
+import ICloudLogo from '../../assets/Icloud-Logo.svg';
 import {displayType} from '../../machines/issuersMachine';
 import {IssuerProps} from '../openId4VCI/Issuer';
 import Backup from '../../assets/Backup.svg';
@@ -98,7 +100,7 @@ export class SvgImage {
   }
 
   static InjiSmallLogo() {
-    return <InjiSmallLogo />;
+    return <InjiSmallLogo {...testIDProps('injiSmallLogo')} />;
   }
 
   static ProgressIcon() {
@@ -288,6 +290,25 @@ export class SvgImage {
       />
     );
   }
+
+  static GoogleDriveIconSmall(width, height) {
+    return (
+      <GoogleDriveIconSmall
+        width={width}
+        height={height}
+        {...testIDProps('googleDriveIconSmall')}
+      />
+    );
+  }
+  static ICloudIcon(width, height) {
+    return (
+      <ICloudLogo
+        width={width}
+        height={height}
+        {...testIDProps('iCloudIcon')}
+      />
+    );
+  }
 }
 
 function getIssuerLogo(props: displayType) {
diff --git a/components/ui/themes/DefaultTheme.ts b/components/ui/themes/DefaultTheme.ts
index 839951935b..bb02a82201 100644
--- a/components/ui/themes/DefaultTheme.ts
+++ b/components/ui/themes/DefaultTheme.ts
@@ -370,8 +370,8 @@ export const DefaultTheme = {
       height: 173.276,
     },
     logo: {
-      height: 40,
-      width: 40,
+      height: 65,
+      width: 65,
     },
     issuerLogo: {
       resizeMode: 'contain',
@@ -379,8 +379,8 @@ export const DefaultTheme = {
       height: 60,
     },
     vcDetailsLogo: {
-      height: 50,
-      width: 50,
+      height: 65,
+      width: 65,
     },
     homeCloseCardDetailsHeader: {
       flex: 1,
@@ -431,7 +431,6 @@ export const DefaultTheme = {
       height: 36,
       borderRadius: 10,
       backgroundColor: Colors.LightOrange,
-      justifyContent: 'center',
     },
     cameraFlipIcon: {
       height: 42,
@@ -490,6 +489,10 @@ export const DefaultTheme = {
       paddingVertical: 9,
       justifyContent: 'space-between',
     },
+    iconContainer: {
+      flexDirection: 'row',
+      alignItems: 'flex-end',
+    },
     scannerContainer: {
       borderRadius: 24,
       alignSelf: 'center',
@@ -663,29 +666,13 @@ export const DefaultTheme = {
       backgroundColor: Colors.Orange,
       paddingHorizontal: 5,
       paddingVertical: 4,
+      maxHeight: 20,
+      marginTop: 10,
       borderRadius: 4,
       fontSize: 10,
       fontFamily: 'Inter_700Bold',
       lineHeight: 12,
     },
-    scanLayoutHeaderContainer: {
-      flex: 1,
-      flexDirection: 'row',
-      marginLeft: I18nManager.isRTL ? 40 : 15,
-      marginTop: 15,
-    },
-    scanLayoutHeaderTitle: {
-      fontSize: 26,
-      fontFamily: 'Inter_600SemiBold',
-      paddingTop: 20,
-      paddingBottom: 10,
-    },
-    sendVcHeaderContainer: {
-      flex: 1,
-      flexDirection: 'row',
-      marginLeft: I18nManager.isRTL ? 50 : 0,
-      marginTop: 15,
-    },
   }),
   BannerStyles: StyleSheet.create({
     container: {
@@ -964,6 +951,11 @@ export const DefaultTheme = {
       backgroundColor: Colors.Transparent,
       borderColor: Colors.Orange,
     },
+    disabledOutlineButton: {
+      backgroundColor: Colors.Transparent,
+      color: Colors.Grey,
+      borderColor: Colors.Grey,
+    },
     container: {
       height: 45,
       flexDirection: 'row',
diff --git a/components/ui/themes/PurpleTheme.ts b/components/ui/themes/PurpleTheme.ts
index 8ab1c1dd64..39a94171be 100644
--- a/components/ui/themes/PurpleTheme.ts
+++ b/components/ui/themes/PurpleTheme.ts
@@ -375,8 +375,8 @@ export const PurpleTheme = {
       height: 173.276,
     },
     logo: {
-      width: 40,
-      height: 40,
+      height: 65,
+      width: 65,
     },
     issuerLogo: {
       resizeMode: 'contain',
@@ -384,8 +384,8 @@ export const PurpleTheme = {
       height: 60,
     },
     vcDetailsLogo: {
-      width: 50,
-      height: 50,
+      height: 65,
+      width: 65,
     },
     homeCloseCardDetailsHeader: {
       flex: 1,
@@ -436,7 +436,6 @@ export const PurpleTheme = {
       height: 36,
       borderRadius: 10,
       backgroundColor: Colors.LightPurple,
-      justifyContent: 'center',
     },
     cameraFlipIcon: {
       width: 42,
@@ -494,6 +493,10 @@ export const PurpleTheme = {
       paddingVertical: 9,
       justifyContent: 'space-between',
     },
+    iconContainer: {
+      flexDirection: 'row',
+      alignItems: 'flex-end',
+    },
     scannerContainer: {
       borderRadius: 24,
       alignSelf: 'center',
@@ -667,29 +670,13 @@ export const PurpleTheme = {
       backgroundColor: Colors.Purple,
       paddingHorizontal: 5,
       paddingVertical: 4,
+      maxHeight: 20,
+      marginTop: 10,
       borderRadius: 4,
       fontSize: 10,
       fontFamily: 'Inter_700Bold',
       lineHeight: 12,
     },
-    scanLayoutHeaderContainer: {
-      flex: 1,
-      flexDirection: 'row',
-      marginLeft: I18nManager.isRTL ? 40 : 15,
-      marginTop: 15,
-    },
-    scanLayoutHeaderTitle: {
-      fontSize: 26,
-      fontFamily: 'Inter_600SemiBold',
-      paddingTop: 20,
-      paddingBottom: 10,
-    },
-    sendVcHeaderContainer: {
-      flex: 1,
-      flexDirection: 'row',
-      marginLeft: I18nManager.isRTL ? 50 : 0,
-      marginTop: 15,
-    },
   }),
   BannerStyles: StyleSheet.create({
     container: {
@@ -968,6 +955,11 @@ export const PurpleTheme = {
       backgroundColor: Colors.Transparent,
       borderColor: Colors.Purple,
     },
+    disabledOutlineButton: {
+      backgroundColor: Colors.Transparent,
+      color: Colors.Grey,
+      borderColor: Colors.Grey,
+    },
     container: {
       height: 45,
       flexDirection: 'row',
diff --git a/i18n.ts b/i18n.ts
index 5758b50f3b..9345687fda 100644
--- a/i18n.ts
+++ b/i18n.ts
@@ -75,12 +75,20 @@ export function getValueForCurrentLanguage(
       ? valueForCurrentLanguage[0].value
       : localizedData[0]?.value;
   } else {
-    const localizedDataObject = localizedData as {[key: string]: string};
+    return localizedData?.value;
+  }
+}
 
-    return localizedDataObject.hasOwnProperty(currentLanguageCode)
+export function getClientNameForCurrentLanguage(
+    localizedData: Object,
+    defaultLanguage = '@none',
+) {
+  const currentLanguage = i18next.language;
+  const currentLanguageCode = languageCodeMap[currentLanguage];
+  const localizedDataObject = localizedData as {[key: string]: string};
+  return localizedDataObject.hasOwnProperty(currentLanguageCode)
       ? localizedDataObject[currentLanguageCode]
       : localizedDataObject[defaultLanguage];
-  }
 }
 
 // This method gets the value from iso-639-3 package, which contains key value pairs of three letter language codes[key] and two letter langugae code[value]. These values are according to iso standards.
diff --git a/ios/Inji.xcodeproj/project.pbxproj b/ios/Inji.xcodeproj/project.pbxproj
index 8232584342..a7676ba24e 100644
--- a/ios/Inji.xcodeproj/project.pbxproj
+++ b/ios/Inji.xcodeproj/project.pbxproj
@@ -350,7 +350,7 @@
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = LD7H4CQ5P9;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = V2ABX7953Z;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -363,17 +363,17 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.10.0;
+				MARKETING_VERSION = 0.11.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
-				PRODUCT_BUNDLE_IDENTIFIER = io.mosip.inji.mobileid;
+				PRODUCT_BUNDLE_IDENTIFIER = io.mosip.inji.wallet.mobileid;
 				PRODUCT_NAME = Inji;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.mosip.inji.mobileid";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.mosip.inji.wallet.mobileid";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -392,7 +392,7 @@
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = LD7H4CQ5P9;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = V2ABX7953Z;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = Inji/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -400,17 +400,17 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.10.0;
+				MARKETING_VERSION = 0.11.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
-				PRODUCT_BUNDLE_IDENTIFIER = io.mosip.inji.mobileid;
+				PRODUCT_BUNDLE_IDENTIFIER = io.mosip.inji.wallet.mobileid;
 				PRODUCT_NAME = Inji;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.mosip.inji.mobileid";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.mosip.inji.wallet.mobileid";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -508,7 +508,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
diff --git a/ios/Inji/Inji.entitlements b/ios/Inji/Inji.entitlements
index 018a6e20cc..ffe610be5c 100644
--- a/ios/Inji/Inji.entitlements
+++ b/ios/Inji/Inji.entitlements
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>aps-environment</key>
-    <string>development</string>
-  </dict>
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array>
+		<string>iCloud.io.mosip.inji.wallet.mobileid</string>
+	</array>
+	<key>com.apple.developer.icloud-services</key>
+	<array>
+		<string>CloudDocuments</string>
+	</array>
+	<key>com.apple.developer.ubiquity-container-identifiers</key>
+	<array>
+		<string>iCloud.io.mosip.inji.wallet.mobileid</string>
+	</array>
+</dict>
 </plist>
\ No newline at end of file
diff --git a/ios/Inji/InjiDebug.entitlements b/ios/Inji/InjiDebug.entitlements
new file mode 100644
index 0000000000..903def2af5
--- /dev/null
+++ b/ios/Inji/InjiDebug.entitlements
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>
diff --git a/ios/Podfile b/ios/Podfile
index e683ce3b1d..51fa0fecb7 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -9,7 +9,7 @@ ENV['RCT_NEW_ARCH_ENABLED'] = podfile_properties['newArchEnabled'] == 'true' ? '
 ENV['EX_DEV_CLIENT_NETWORK_INSPECTOR'] = '1' if podfile_properties['EX_DEV_CLIENT_NETWORK_INSPECTOR'] == 'true'
 
 platform :ios, podfile_properties['ios.deploymentTarget'] || '13.0'
-install! 'cocoapods',
+install! 'cocoapods', 
   :deterministic_uuids => false
 
 prepare_react_native_project!
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index a592ea8ca6..dcc3f6248f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -366,7 +366,7 @@ PODS:
   - react-native-app-auth (7.0.0):
     - AppAuth (~> 1.6)
     - React-Core
-  - react-native-cloud-storage (1.2.2):
+  - react-native-cloud-storage (1.3.0):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - react-native-location (2.5.0):
@@ -512,7 +512,7 @@ PODS:
   - RNZipArchive/Core (6.1.0):
     - React-Core
     - SSZipArchive (~> 2.2)
-  - secure-keystore (0.1.6):
+  - secure-keystore (0.1.7):
     - React-Core
   - SSZipArchive (2.4.3)
   - TensorFlowLiteC (2.12.0):
@@ -891,7 +891,7 @@ SPEC CHECKSUMS:
   React-jsinspector: c712f9e3bb9ba4122d6b82b4f906448b8a281580
   React-logger: 342f358b8decfbf8f272367f4eacf4b6154061be
   react-native-app-auth: 1d12b6874a24152715a381d8e9149398ce7c2c95
-  react-native-cloud-storage: 3af86738f814201ddaede5ce2b01b90e6eca867b
+  react-native-cloud-storage: d16e1647fc5f13d6b5763f7aea241de94e7991e0
   react-native-location: 5a40ec1cc6abf2f6d94df979f98ec76c3a415681
   react-native-mmkv-storage: cfb6854594cfdc5f7383a9e464bb025417d1721c
   react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
@@ -928,7 +928,7 @@ SPEC CHECKSUMS:
   RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef
   RNSVG: 07dbd870b0dcdecc99b3a202fa37c8ca163caec2
   RNZipArchive: ef9451b849c45a29509bf44e65b788829ab07801
-  secure-keystore: 78bf735f42b9d19418568dadbb92712c19a5812e
+  secure-keystore: 3bc262bc91c5fbcfea92a8d0fd59c1b8b8ababee
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   TensorFlowLiteC: 20785a69299185a379ba9852b6625f00afd7984a
   TensorFlowLiteObjC: 9a46a29a76661c513172cfffd3bf712b11ef25c3
@@ -936,6 +936,6 @@ SPEC CHECKSUMS:
   Yoga: 065f0b74dba4832d6e328238de46eb72c5de9556
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 29c42cb9af8ba23b2d37099ac19ee8a8d286004a
+PODFILE CHECKSUM: 90dfa5dbb6ca0103a4e49014140523aff5458f68
 
 COCOAPODS: 1.15.2
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 30b5098ac5..34d4f995ac 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -29,7 +29,7 @@ def generate_app_bundle_id()
   case flavor
   when "residentapp"
     # the old app flavor
-    return "io.mosip.inji.mobileid"
+    return "io.mosip.inji.wallet.mobileid"
   when "inji"
     # io.mosip.inji is not available in iOS
     return "io.mosip.inji.wallet"
@@ -57,7 +57,7 @@ def generate_app_name()
   flavor = APP_FLAVOR
   case flavor
   when "residentapp"
-    return "Inji"
+    return "MOSIP INJI APP"
   when "inji"
     return "Inji Wallet"
   when "collab"
@@ -123,7 +123,7 @@ platform :ios do
       workspace: "Inji.xcworkspace",
       scheme: "Inji",
       export_method: "app-store",
-      
+
       export_options: {
         provisioningProfiles: {
           "#{generate_app_bundle_id}" => "match AppStore #{generate_app_bundle_id}"
@@ -132,9 +132,9 @@ platform :ios do
     )
 
     delete_temp_keychain(keychain_name)
-  
+
   end
-  
+
   lane :beta do
     keychain_name = TEMP_KEYCHAIN_USER
     keychain_password = TEMP_KEYCHAIN_PASSWORD
@@ -169,8 +169,8 @@ platform :ios do
       plist_path: "Inji/Info.plist"
     )
     # replace bundle ID
-    s = "s/mobileid/#{map_flavour_tosuffix}/g"
-    sh("sed -i '' -e #{s} ../Inji.xcodeproj/project.pbxproj")
+    # s = "s/mobileid/#{map_flavour_tosuffix}/g"
+    # sh("sed -i '' -e #{s} ../Inji.xcodeproj/project.pbxproj")
 
     # replace Product name
     p = "s|PRODUCT_NAME = Inji|PRODUCT_NAME = \"#{generate_app_name}\"|"
@@ -203,7 +203,7 @@ platform :ios do
       workspace: "Inji.xcworkspace",
       scheme: "Inji",
       export_method: "app-store",
-      
+
       export_options: {
         provisioningProfiles: {
           "#{generate_app_bundle_id}" => "match AppStore #{generate_app_bundle_id}"
@@ -226,7 +226,7 @@ platform :ios do
       },
        skip_waiting_for_build_processing: false,
        distribute_external: true,
-       submit_beta_review: false,  
+       submit_beta_review: false,
        groups: ["#{TESTFLIGHT_INTERNAL_TESTERS_GROUP}"],
     )
 
@@ -245,14 +245,14 @@ platform :ios do
     sh("cp -R '#{app_path}' '#{output_directory}'")
 
     slack(
-      message: "#{generate_app_name} #{version} (#{current_build_number}) is uploaded to testflight.", 
+      message: "#{generate_app_name} #{version} (#{current_build_number}) is uploaded to testflight.",
       success: true,
       slack_url: "#{SLACK_URL}",
       default_payloads: [:git_branch, :last_git_commit]
     )
 
   end
-  
+
   lane :ios_app_build do
 
     archive_path = gym(
diff --git a/locales/ara.json b/locales/ara.json
index 9571463fe6..dcf9d355f0 100644
--- a/locales/ara.json
+++ b/locales/ara.json
@@ -60,6 +60,8 @@
     "qrCodeHeader": "رمز الاستجابة السريعة",
     "nationalCard": "البطاقة الوطنية",
     "insuranceCard": "بطاقة التأمين",
+    "beneficiaryCard": "بطاقة المستفيد",
+    "socialRegistryCard": "بطاقة السجل الاجتماعي",
     "uin": "UIN",
     "vid": "VID",
     "enableVerification": "تفعيل",
@@ -363,6 +365,12 @@
       "downloadLimitExpires": {
         "title": "الخطأ تحميل",
         "message": "حدثت مشكلة أثناء تنزيل البطاقات التالية. حاول مرة اخرى"
+      },
+      "verificationFailed": {
+        "title" : "حدث خطأ!",
+        "goBackButton": "عُد",
+        "technicalError": "بسبب خطأ فني، لم نتمكن من تنزيل البطاقة.",
+        "networkError": "بسبب عدم استقرار الاتصال بالإنترنت، لم نتمكن من تنزيل البطاقة. الرجاء التحقق من اتصال الانترنت الخاص بك."
       }
     }
   },
@@ -634,7 +642,7 @@
     "errors": {
       "permissionDenied": {
         "title": "الأذونات المطلوبة",
-        "message": "لمتابعة النسخ الاحتياطي للبيانات، اسمح بالوصول إلى Google Drive. اضغط على \" السماح بالوصول \" لإنهاء الإعداد، أو اضغط على \" ليس الآن \" للعودة إلى الإعدادات.",
+        "message": "لمتابعة النسخ الاحتياطي للبيانات، اسمح بالوصول إلى {{driveName}}. اضغط على \" السماح بالوصول \" لإنهاء الإعداد، أو اضغط على \" ليس الآن \" للعودة إلى الإعدادات.",
         "actions": {
           "allowAccess": "السماح بالمرور",
           "notNow": "ليس الآن"
@@ -651,6 +659,7 @@
     "backupFailure": {
       "networkError": "بسبب عدم استقرار الاتصال بالإنترنت، لم نتمكن من إجراء النسخ الاحتياطي للبيانات. الرجاء معاودة المحاولة في وقت لاحق.",
       "technicalError": "بسبب خطأ فني، لم نتمكن من إجراء النسخ الاحتياطي للبيانات. الرجاء معاودة المحاولة في وقت لاحق.",
+      "iCloudSignInError": "نأسف لعدم إمكانية إكمال النسخ الاحتياطي للبيانات. ",
       "noDataForBackup": "عذرًا، ولكن لا توجد بيانات متاحة لإجراء نسخ احتياطي في الوقت الحالي.",
       "storageLimitReached": "يتعذر علينا إكمال عملية النسخ الاحتياطي نظرًا لعدم توفر مساحة تخزين كافية على جهازك. يرجى تحرير مساحة عن طريق حذف الملفات أو التطبيقات غير الضرورية، ثم حاول مرة أخرى."
     },
@@ -663,7 +672,7 @@
   },
   "AccountSelection": {
     "backupProcessInfo": "أنت على بعد خطوات قليلة من إجراء نسخ احتياطي لبياناتك",
-    "cloudInfo": "To initiate the data backup, please tap on the “Proceed” button to link your Google Drive with Inji.",
+    "cloudInfo": "To initiate the data backup, please tap on the “Proceed” button to link your {{driveName}} with Inji.",
     "googleDriveTitle": "جوجل درايف",
     "loadingSubtitle": "تحميل...",
     "proceed": "يتابع",
@@ -675,13 +684,13 @@
     "backupProgressState": "جاري النسخ الاحتياطي...",
     "lastBackupDetails": "تفاصيل النسخ الاحتياطي الأخير",
     "backupInProgress": "لا يزال بإمكانك استخدام التطبيق أثناء إجراء النسخ الاحتياطي للبيانات. سيؤدي إغلاق التطبيق إلى إنهاء عملية النسخ الاحتياطي للبيانات.",
-    "noBackup": "قم بعمل نسخة احتياطية لبياناتك على Google Drive. يمكنك استعادتها عند إعادة تثبيت INJI.",
+    "noBackup": "قم بعمل نسخة احتياطية لبياناتك على {{driveName}}. يمكنك استعادتها عند إعادة تثبيت INJI.",
     "storage": "سيتم تخزين النسخة الاحتياطية في Google Drive المرتبط بحساب Gmail الذي اخترته.",
     "backup": "دعم",
     "size": "مقاس:",
     "restore": "يعيد",
     "restoreInProgress": "نحن نقوم باستعادة بياناتك، يرجى عدم إغلاق التطبيق. يمكنك الاستمرار في استخدام التطبيق.",
-    "restoreInfo": "استعادة بياناتك من Google Drive",
+    "restoreInfo": "استعادة بياناتك من {{driveName}}",
     "driveSettings": "إعدادات جوجل درايف",
     "successBanner": "تمت عملية النسخ الاحتياطي الخاصة بك بنجاح!",
     "backupFailed": "فشل النسخ الاحتياطي",
@@ -715,6 +724,7 @@
     "editLabel": "يحرر {{label}}",
     "tryAgain": "حاول مجددا",
     "ignore": "يتجاهل",
+    "goBack": "عُد",
     "camera": {
       "errors": {
         "missingPermission": "يستخدم هذا التطبيق الكاميرا لمسح رمز الاستجابة السريعة لجهاز آخر."
diff --git a/locales/en.json b/locales/en.json
index 18e2bd2419..162946378e 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -60,6 +60,8 @@
     "qrCodeHeader": "QR Code",
     "nationalCard": "National Card",
     "insuranceCard": "Insurance Card",
+    "beneficiaryCard": "Beneficiary Card",
+    "socialRegistryCard": "Social Registry Card",
     "uin": "UIN",
     "vid": "VID",
     "enableVerification": "Activate",
@@ -364,6 +366,12 @@
       "downloadLimitExpires": {
         "title": "Download Error",
         "message": "There was an issue downloading following cards. Please try again"
+      },
+      "verificationFailed": {
+        "title" : "An Error Occurred!",
+        "goBackButton": "Go Back",
+        "technicalError": "Due to Technical Error, we were unable to download the card.",
+        "networkError": "Due to unstable internet connection, we were unable to download the card. Please check your internet connection."
       }
     }
   },
@@ -638,7 +646,7 @@
     "errors": {
       "permissionDenied": {
         "title": "Permissions required",
-        "message": "To continue with the data backup, allow access to your Google Drive. Tap \"Allow Access\" to finish setup, or tap \"Not Now\" to return to Settings.",
+        "message": "To continue with the data backup, allow access to your {{driveName}}. Tap \"Allow Access\" to finish setup, or tap \"Not Now\" to return to Settings.",
         "actions": {
           "allowAccess": "Allow Access",
           "notNow": "Not Now"
@@ -655,6 +663,7 @@
     "backupFailure": {
       "networkError": "Due to unstable internet connection, we were unable to perform data backup. Please try again later.",
       "technicalError": "Due to technical error, we were unable to perform data backup. Please try again later.",
+      "iCloudSignInError": "We're sorry that data backup couldn't be completed. Please ensure that you have logged into your Apple account and iCloud access is enabled for the app.",
       "noDataForBackup": "We're sorry, but there is no data available to back up at the moment.",
       "storageLimitReached": "We're unable to complete the backup process due to insufficient storage space on your device. Please free up space by deleting unnecessary files or apps, and try again."
     },
@@ -667,7 +676,7 @@
   },
   "AccountSelection": {
     "backupProcessInfo": "You’re just a few steps away from backing up your data",
-    "cloudInfo": "To initiate the data backup, please tap on the “Proceed” button to link your Google Drive with Inji.",
+    "cloudInfo": "To initiate the data backup, please tap on the “Proceed” button to link your {{driveName}} with Inji.",
     "googleDriveTitle": "Google Drive",
     "loadingSubtitle": "Loading...",
     "proceed": "Proceed",
@@ -679,13 +688,13 @@
     "backupProgressState": "Backup in progress...",
     "lastBackupDetails": "Last Backup Details",
     "backupInProgress": "You can still use the application while data backup is in progress. Closing the app will terminate the data backup process.",
-    "noBackup": "Backup your Data to Google Drive. You can restore them when you reinstall INJI.",
+    "noBackup": "Backup your Data to {{driveName}}. You can restore them when you reinstall INJI.",
     "storage": "The backup will be stored in the Google Drive associated to your chosen gmail account.",
     "backup": "Backup",
     "size": "Size: ",
     "restore": "Restore",
     "restoreInProgress": "We're restoring your data, please do not close the application. You may continue using the application.",
-    "restoreInfo": "Restore your data from Google Drive",
+    "restoreInfo": "Restore your data from {{driveName}}",
     "driveSettings": "Google Drive Settings",
     "successBanner": "Your backup was successful!",
     "backupFailed": "Backup Failed",
diff --git a/locales/fil.json b/locales/fil.json
index a7699ea719..760668f521 100644
--- a/locales/fil.json
+++ b/locales/fil.json
@@ -59,6 +59,8 @@
     "qrCodeHeader": "QR Code",
     "nationalCard": "Pambansang Kard",
     "insuranceCard": "Insurance Card",
+    "beneficiaryCard": "Benepisyaryo Card",
+    "socialRegistryCard": "Social Registry Card",
     "uin": "UIN",
     "vid": "VID",
     "enableVerification": "I-activate",
@@ -362,6 +364,12 @@
       "downloadLimitExpires": {
         "title": "Error sa Pag-download",
         "message": "Nagkaroon ng isyu sa pag-download ng mga sumusunod na card. Pakisubukang muli"
+      },
+      "verificationFailed": {
+        "title" : "May pagkakamaling naganap!",
+        "goBackButton": "Bumalik ka",
+        "technicalError": "Dahil sa Technical Error, hindi namin na-download ang card.",
+        "networkError": "Dahil sa hindi matatag na koneksyon sa internet, hindi namin na-download ang card. Pakisuri ang iyong koneksyon sa internet."
       }
     }
   },
@@ -637,7 +645,7 @@
     "errors": {
       "permissionDenied": {
         "title": "Kinakailangan ang mga Pahintulot",
-        "message": "Upang magpatuloy sa pag-backup ng data, payagan ang pag-access sa iyong Google Drive. I-tap ang \"Allow Access\" para tapusin ang pag-setup, o i-tap ang \"Not Now\" para bumalik sa Settings.",
+        "message": "Upang magpatuloy sa pag-backup ng data, payagan ang pag-access sa iyong {{driveName}}. I-tap ang \"Allow Access\" para tapusin ang pag-setup, o i-tap ang \"Not Now\" para bumalik sa Settings.",
         "actions": {
           "allowAccess": "Payagan ang Access",
           "notNow": "Hindi ngayon"
@@ -654,6 +662,7 @@
     "backupFailure": {
       "networkError": "Dahil sa hindi matatag na koneksyon sa internet, hindi kami nakapagsagawa ng pag-backup ng data. Subukang muli mamaya.",
       "technicalError": "Dahil sa Technical Error, hindi namin nagawang magsagawa ng pag-backup ng data. Subukang muli mamaya.",
+      "iCloudSignInError": "Ikinalulungkot namin na hindi makumpleto ang pag-backup ng data. ",
       "noDataForBackup": "Ikinalulungkot namin, ngunit walang data na magagamit upang i-back up sa ngayon.",
       "storageLimitReached": "Hindi namin makumpleto ang proseso ng pag-backup dahil sa hindi sapat na espasyo sa storage sa iyong device. Mangyaring magbakante ng espasyo sa pamamagitan ng pagtanggal ng mga hindi kinakailangang file o app, at subukang muli."
     },
@@ -666,7 +675,7 @@
   },
   "AccountSelection": {
     "backupProcessInfo": "Ilang hakbang ka na lang mula sa pag-back up ng iyong data",
-    "cloudInfo": "Upang simulan ang pag-backup ng data, mangyaring mag-tap sa button na `Magpatuloy` upang i-link ang iyong Google Drive sa Inji.",
+    "cloudInfo": "Upang simulan ang pag-backup ng data, mangyaring mag-tap sa button na `Magpatuloy` upang i-link ang iyong {{driveName}} sa Inji.",
     "googleDriveTitle": "Google Drive",
     "loadingSubtitle": "Naglo-load...",
     "proceed": "Magpatuloy",
@@ -678,13 +687,13 @@
     "backupProgressState": "Isinasagawa ang pag-backup...",
     "lastBackupDetails": "Mga Detalye ng Huling Backup",
     "backupInProgress": "Maaari mo pa ring gamitin ang application habang isinasagawa ang pag-backup ng data. Ang pagsasara ng app ay magwawakas sa proseso ng pag-backup ng data.",
-    "noBackup": "I-backup ang iyong Data sa Google Drive. Maaari mong ibalik ang mga ito kapag na-install mong muli ang INJI.",
+    "noBackup": "I-backup ang iyong Data sa {{driveName}}. Maaari mong ibalik ang mga ito kapag na-install mong muli ang INJI.",
     "storage": "Ang backup ay maiimbak sa Google Drive na nauugnay sa iyong napiling gmail account.",
     "backup": "Backup",
     "size": "Size: ",
     "restore": "Ibalik",
     "restoreInProgress": "Ibinabalik namin ang iyong data, mangyaring huwag isara ang application. Maaari mong ipagpatuloy ang paggamit ng application.",
-    "restoreInfo": "Ibalik ang iyong data mula sa Google Drive",
+    "restoreInfo": "I-restore ang iyong data mula sa {{driveName}}",
     "driveSettings": "Mga Setting ng Google Drive",
     "successBanner": "Ang iyong backup ay matagumpay!",
     "backupFailed": "Nabigo ang pag-backup",
@@ -717,6 +726,7 @@
     "dismiss": "Dismissed",
     "editLabel": "Palitan ang {{label}}",
     "tryAgain": "Subukan muli",
+    "goBack": "Bumalik ka",
     "camera": {
       "errors": {
         "missingPermission": "Ginagamit ng app na ito ang camera upang i-scan ang QR code ng isa pang device."
diff --git a/locales/hin.json b/locales/hin.json
index 757096a8c5..04554e7dcd 100644
--- a/locales/hin.json
+++ b/locales/hin.json
@@ -60,6 +60,8 @@
     "qrCodeHeader": "क्यू आर संहिता",
     "nationalCard": "राष्ट्रीय कार्ड",
     "insuranceCard": "बीमा कार्ड",
+    "beneficiaryCard": "लाभार्थी कार्ड",
+    "socialRegistryCard": "सामाजिक रजिस्ट्री कार्ड",
     "uin": "UIN",
     "vid": "VID",
     "enableVerification": "सक्रिय",
@@ -361,6 +363,12 @@
       "downloadLimitExpires": {
         "title": "डाउनलोड त्रुटि",
         "message": "निम्नलिखित कार्ड डाउनलोड करने में एक समस्या थी। कृपया पुन: प्रयास करें"
+      },
+      "verificationFailed": {
+        "title" : "एक त्रुटि पाई गई!",
+        "goBackButton": "वापस जाओ",
+        "technicalError": "तकनीकी त्रुटि के कारण, हम कार्ड डाउनलोड करने में असमर्थ रहे।",
+        "networkError": "अस्थिर इंटरनेट कनेक्शन के कारण, हम कार्ड डाउनलोड करने में असमर्थ थे। कृपया अपने इंटरनेट कनेक्शन की जाँच करें।"
       }
     }
   },
@@ -634,7 +642,7 @@
     "errors": {
       "permissionDenied": {
         "title": "अनुमतियाँ आवश्यक हैं",
-        "message": "डेटा बैकअप जारी रखने के लिए, अपने Google ड्राइव तक पहुंच की अनुमति दें। सेटअप पूरा करने के लिए \"एक्सेस की अनुमति दें\" पर टैप करें, या सेटिंग्स पर लौटने के लिए \"अभी नहीं\" पर टैप करें।",
+        "message": "डेटा बैकअप जारी रखने के लिए, अपने {{driveName}} तक पहुंच की अनुमति दें। सेटअप पूरा करने के लिए \"एक्सेस की अनुमति दें\" पर टैप करें, या सेटिंग्स पर लौटने के लिए \"अभी नहीं\" पर टैप करें।",
         "actions": {
           "allowAccess": "उपयोग की अनुमति दें",
           "notNow": "अभी नहीं"
@@ -651,6 +659,7 @@
     "backupFailure": {
       "networkError": "अस्थिर इंटरनेट कनेक्शन के कारण, हम डेटा बैकअप करने में असमर्थ थे। कृपया बाद में पुन: प्रयास करें।",
       "technicalError": "तकनीकी त्रुटि के कारण, हम डेटा बैकअप करने में असमर्थ थे। कृपया बाद में पुन: प्रयास करें।",
+      "iCloudSignInError": "हमें खेद है कि डेटा बैकअप पूरा नहीं किया जा सका. ",
       "noDataForBackup": "हमें खेद है, लेकिन इस समय बैकअप के लिए कोई डेटा उपलब्ध नहीं है।",
       "storageLimitReached": "आपके डिवाइस पर अपर्याप्त संग्रहण स्थान के कारण हम बैकअप प्रक्रिया पूरी करने में असमर्थ हैं। कृपया अनावश्यक फ़ाइलें या ऐप्स हटाकर स्थान खाली करें और पुनः प्रयास करें।"
     },
@@ -663,7 +672,7 @@
   },
   "AccountSelection": {
     "backupProcessInfo": "आप अपने डेटा का बैकअप लेने से बस कुछ ही कदम दूर हैं",
-    "cloudInfo": "डेटा बैकअप शुरू करने के लिए, कृपया अपने Google ड्राइव को Inji से लिंक करने के लिए `आगे बढ़ें` बटन पर टैप करें।",
+    "cloudInfo": "डेटा बैकअप शुरू करने के लिए, कृपया अपने {{driveName}} को Inji से लिंक करने के लिए `आगे बढ़ें` बटन पर टैप करें।",
     "googleDriveTitle": "गूगल हाँकना",
     "loadingSubtitle": "लोड हो रहा है...",
     "proceed": "आगे बढ़ना",
@@ -675,13 +684,13 @@
     "backupProgressState": "बैकअप प्रगति पर है...",
     "lastBackupDetails": "अंतिम बैकअप विवरण",
     "backupInProgress": "जब डेटा बैकअप चल रहा हो तब भी आप एप्लिकेशन का उपयोग कर सकते हैं। ऐप बंद करने से डेटा बैकअप प्रक्रिया समाप्त हो जाएगी।",
-    "noBackup": "अपने डेटा का Google ड्राइव पर बैकअप लें। INJI को पुनः इंस्टॉल करने पर आप उन्हें पुनर्स्थापित कर सकते हैं।",
+    "noBackup": "अपने डेटा का {{driveName}} पर बैकअप लें। INJI को पुनः इंस्टॉल करने पर आप उन्हें पुनर्स्थापित कर सकते हैं।",
     "storage": "बैकअप आपके चुने हुए जीमेल खाते से जुड़े Google ड्राइव में संग्रहीत किया जाएगा।",
     "backup": "बैकअप",
     "size": "आकार: ",
     "restore": "पुनर्स्थापित करें",
     "restoreInProgress": "हम आपका डेटा पुनर्स्थापित कर रहे हैं, कृपया एप्लिकेशन बंद न करें। आप एप्लिकेशन का उपयोग जारी रख सकते हैं.",
-    "restoreInfo": "Google ड्राइव से अपना डेटा पुनर्स्थापित करें",
+    "restoreInfo": "{{driveName}} से अपना डेटा पुनर्स्थापित करें",
     "driveSettings": "Google ड्राइव सेटिंग्स",
     "successBanner": "आपका बैकअप सफल रहा!",
     "backupFailed": "बैकअप विफल",
@@ -713,6 +722,7 @@
     "dismiss": "नकार देना",
     "editLabel": "संपादित करें {{label}}",
     "tryAgain": "पुनः प्रयास करें",
+    "goBack": "वापस जाओ",
     "camera": {
       "errors": {
         "missingPermission": "यह ऐप दूसरे डिवाइस के क्यूआर कोड को स्कैन करने के लिए कैमरे का इस्तेमाल करता है."
diff --git a/locales/kan.json b/locales/kan.json
index 84bf17b90d..660b1d9ec7 100644
--- a/locales/kan.json
+++ b/locales/kan.json
@@ -60,6 +60,8 @@
     "qrCodeHeader": "QR ಕೋಡ್",
     "nationalCard": "ರಾಷ್ಟ್ರೀಯ ಕಾರ್ಡ್",
     "insuranceCard": "ವಿಮಾ ಕಾರ್ಡ್",
+    "beneficiaryCard": "ಫಲಾನುಭವಿ ಕಾರ್ಡ್",
+    "socialRegistryCard": "ಸಾಮಾಜಿಕ ನೋಂದಣಿ ಕಾರ್ಡ್",
     "uin": "UIN",
     "vid": "VID",
     "enableVerification": "ಸಕ್ರಿಯಗೊಳಿಸಿ",
@@ -353,6 +355,12 @@
       "downloadLimitExpires": {
         "title": "ಡೌನ್‌ಲೋಡ್ ದೋಷ",
         "message": "ಕೆಳಗಿನ ಕಾರ್ಡ್‌ಗಳನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ ಕಂಡುಬಂದಿದೆ. ದಯವಿಟ್ಟು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"
+      },
+      "verificationFailed": {
+        "title" : "ಒಂದು ತಪ್ಪು ನಡೆದಿದೆ!",
+        "goBackButton": "ಹಿಂದೆ ಹೋಗು",
+        "technicalError": "ತಾಂತ್ರಿಕ ದೋಷ ಕಾರಣ, ನಮಗೆ ಕಾರ್ಡ್ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.",
+        "networkError": "ಅಸ್ಥಿರ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕದ ಕಾರಣ, ನಮಗೆ ಕಾರ್ಡ್ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಿ."
       }
     }
   },
@@ -626,7 +634,7 @@
     "errors": {
       "permissionDenied": {
         "title": "ಅನುಮತಿಗಳು ಅಗತ್ಯವಿದೆ",
-        "message": "ಡೇಟಾ ಬ್ಯಾಕಪ್‌ನೊಂದಿಗೆ ಮುಂದುವರಿಯಲು, ನಿಮ್ಮ Google ಡ್ರೈವ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ. ಸೆಟಪ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು \"ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸು\" ಟ್ಯಾಪ್ ಮಾಡಿ ಅಥವಾ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹಿಂತಿರುಗಲು \"ಈಗ ಅಲ್ಲ\" ಟ್ಯಾಪ್ ಮಾಡಿ.",
+        "message": "ಡೇಟಾ ಬ್ಯಾಕಪ್‌ನೊಂದಿಗೆ ಮುಂದುವರಿಯಲು, ನಿಮ್ಮ {{driveName}} ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ. ಸೆಟಪ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು \"ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸು\" ಟ್ಯಾಪ್ ಮಾಡಿ ಅಥವಾ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಹಿಂತಿರುಗಲು \"ಈಗ ಅಲ್ಲ\" ಟ್ಯಾಪ್ ಮಾಡಿ.",
         "actions": {
           "allowAccess": "ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ",
           "notNow": "ಈಗ ಸಾಧ್ಯವಿಲ್ಲ"
@@ -643,6 +651,7 @@
     "backupFailure": {
       "networkError": "ಅಸ್ಥಿರ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕದಿಂದಾಗಿ, ನಮಗೆ ಡೇಟಾ ಬ್ಯಾಕಪ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.",
       "technicalError": "ತಾಂತ್ರಿಕ ದೋಷದಿಂದಾಗಿ, ಡೇಟಾ ಬ್ಯಾಕಪ್ ಮಾಡಲು ನಮಗೆ ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.",
+      "iCloudSignInError": "ಡೇಟಾ ಬ್ಯಾಕಪ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಲಾಗಲಿಲ್ಲ ಎಂದು ನಾವು ವಿಷಾದಿಸುತ್ತೇವೆ. ",
       "noDataForBackup": "ನಮ್ಮನ್ನು ಕ್ಷಮಿಸಿ, ಆದರೆ ಸದ್ಯಕ್ಕೆ ಬ್ಯಾಕಪ್ ಮಾಡಲು ಯಾವುದೇ ಡೇಟಾ ಲಭ್ಯವಿಲ್ಲ.",
       "storageLimitReached": "ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಸಾಕಷ್ಟು ಸಂಗ್ರಹಣೆ ಸ್ಥಳಾವಕಾಶವಿಲ್ಲದ ಕಾರಣ ಬ್ಯಾಕಪ್ ಪ್ರಕ್ರಿಯೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ನಮಗೆ ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ದಯವಿಟ್ಟು ಅನಗತ್ಯ ಫೈಲ್‌ಗಳು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಳಿಸುವ ಮೂಲಕ ಜಾಗವನ್ನು ಮುಕ್ತಗೊಳಿಸಿ ಮತ್ತು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."
     },
@@ -655,7 +664,7 @@
   },
   "AccountSelection": {
     "backupProcessInfo": "ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಲು ನೀವು ಕೆಲವೇ ಹಂತಗಳ ದೂರದಲ್ಲಿರುವಿರಿ",
-    "cloudInfo": "ಡೇಟಾ ಬ್ಯಾಕಪ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲು, Inji ಜೊತೆಗೆ ನಿಮ್ಮ Google ಡ್ರೈವ್ ಅನ್ನು ಲಿಂಕ್ ಮಾಡಲು `ಮುಂದುವರಿಯಿರಿ` ಬಟನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ.",
+    "cloudInfo": "ಡೇಟಾ ಬ್ಯಾಕಪ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲು, Inji ಜೊತೆಗೆ ನಿಮ್ಮ {{driveName}} ಅನ್ನು ಲಿಂಕ್ ಮಾಡಲು `ಮುಂದುವರಿಯಿರಿ` ಬಟನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ.",
     "googleDriveTitle": "ಗೂಗಲ್ ಡ್ರೈವ್",
     "loadingSubtitle": "ಲೋಡ್ ಆಗುತ್ತಿದೆ...",
     "proceed": "ಮುಂದುವರೆಯಲು",
@@ -667,13 +676,13 @@
     "backupProgressState": "ಬ್ಯಾಕಪ್ ಪ್ರಗತಿಯಲ್ಲಿದೆ...",
     "lastBackupDetails": "ಕೊನೆಯ ಬ್ಯಾಕಪ್ ವಿವರಗಳು",
     "backupInProgress": "ಡೇಟಾ ಬ್ಯಾಕಪ್ ಪ್ರಗತಿಯಲ್ಲಿರುವಾಗಲೂ ನೀವು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಬಳಸಬಹುದು. ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಮುಚ್ಚುವುದರಿಂದ ಡೇಟಾ ಬ್ಯಾಕಪ್ ಪ್ರಕ್ರಿಯೆಯನ್ನು ಕೊನೆಗೊಳಿಸುತ್ತದೆ.",
-    "noBackup": "Google ಡ್ರೈವ್‌ಗೆ ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ. ನೀವು INJI ಅನ್ನು ಮರುಸ್ಥಾಪಿಸಿದಾಗ ನೀವು ಅವುಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಬಹುದು.",
+    "noBackup": "{{driveName}} ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ. ನೀವು INJI ಅನ್ನು ಮರುಸ್ಥಾಪಿಸಿದಾಗ ನೀವು ಅವುಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಬಹುದು.",
     "storage": "ನಿಮ್ಮ ಆಯ್ಕೆಮಾಡಿದ gmail ಖಾತೆಗೆ ಸಂಯೋಜಿತವಾಗಿರುವ Google ಡ್ರೈವ್‌ನಲ್ಲಿ ಬ್ಯಾಕಪ್ ಅನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುತ್ತದೆ.",
     "backup": "ಬ್ಯಾಕಪ್",
     "size": "ಗಾತ್ರ: ",
     "restore": "ಮರುಸ್ಥಾಪಿಸು",
     "restoreInProgress": "ನಾವು ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಮರುಸ್ಥಾಪಿಸುತ್ತಿದ್ದೇವೆ, ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಮುಚ್ಚಬೇಡಿ. ನೀವು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಬಳಸುವುದನ್ನು ಮುಂದುವರಿಸಬಹುದು.",
-    "restoreInfo": "Google ಡ್ರೈವ್‌ನಿಂದ ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಮರುಸ್ಥಾಪಿಸಿ",
+    "restoreInfo": "{{driveName}} ನಿಂದ ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಮರುಸ್ಥಾಪಿಸಿ",
     "driveSettings": "Google Drive Settings",
     "successBanner": "ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಯಶಸ್ವಿಯಾಗಿದೆ!",
     "backupFailed": "ಬ್ಯಾಕಪ್ ವಿಫಲವಾಗಿದೆ",
@@ -707,6 +716,7 @@
     "editLabel": "ಸಂಪಾದಿಸು {{label}}",
     "tryAgain": "ಮತ್ತೆ ಪ್ರಯತ್ನಿಸು",
     "ignore": "ನಿರ್ಲಕ್ಷಿಸಿ",
+    "goBack": "ಹಿಂದೆ ಹೋಗು",
     "camera": {
       "errors": {
         "missingPermission": "ಮತ್ತೊಂದು ಸಾಧನದ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಈ ಅಪ್ಲಿಕೇಶನ್ ಕ್ಯಾಮರಾವನ್ನು ಬಳಸುತ್ತದೆ."
diff --git a/locales/spa.json b/locales/spa.json
index 1f8dbd9747..d67d150e5a 100644
--- a/locales/spa.json
+++ b/locales/spa.json
@@ -333,6 +333,12 @@
       "downloadLimitExpires": {
         "title": "Error de descarga",
         "message": "Hubo un problema al descargar las siguientes tarjetas. "
+      },
+      "verificationFailed": {
+        "title" : "¡Ocurrió un error!",
+        "goBackButton": "Regresa",
+        "technicalError": "Debido a un Error técnico, no pudimos descargar la tarjeta.",
+        "networkError": "Debido a una conexión a Internet inestable, no pudimos descargar la tarjeta. Por favor revise su conexion a internet."
       }
     }
   },
@@ -604,7 +610,7 @@
     "errors": {
       "permissionDenied": {
         "title": "Permisos requeridos",
-        "message": "Para continuar con la copia de seguridad de los datos, permita el acceso a su Google Drive. Toque \"Permitir acceso\" para finalizar la configuración o toque \"Ahora no\" para regresar a Configuración.",
+        "message": "Para continuar con la copia de seguridad de los datos, permita el acceso a su {{driveName}}. Toque \"Permitir acceso\" para finalizar la configuración o toque \"Ahora no\" para regresar a Configuración.",
         "actions": {
           "allowAccess": "Permitir el acceso",
           "notNow": "Ahora no"
@@ -621,6 +627,7 @@
     "backupFailure": {
       "networkError": "Debido a una conexión a Internet inestable, no pudimos realizar una copia de seguridad de los datos. Por favor, inténtelo de nuevo más tarde.",
       "technicalError": "Debido a un error técnico, no pudimos realizar una copia de seguridad de los datos. Por favor, inténtelo de nuevo más tarde.",
+      "iCloudSignInError": "Lamentamos que no se haya podido completar la copia de seguridad de los datos. ",
       "noDataForBackup": "Lo sentimos, pero no hay datos disponibles para realizar una copia de seguridad en este momento.",
       "storageLimitReached": "No podemos completar el proceso de copia de seguridad debido a que no hay suficiente espacio de almacenamiento en su dispositivo. Libere espacio eliminando archivos o aplicaciones innecesarios y vuelva a intentarlo."
     },
@@ -633,7 +640,7 @@
   },
   "AccountSelection": {
     "backupProcessInfo": "Estás a solo unos pasos de hacer una copia de seguridad de tus datos",
-    "cloudInfo": "Para iniciar la copia de seguridad de los datos, toque el botón `Continuar` para vincular su Google Drive con Inji.",
+    "cloudInfo": "Para iniciar la copia de seguridad de los datos, toque el botón `Continuar` para vincular su {{driveName}} con Inji.",
     "googleDriveTitle": "Google Drive",
     "loadingSubtitle": "Cargando...",
     "proceed": "Proceder",
@@ -645,13 +652,13 @@
     "backupProgressState": "Copia de seguridad en progreso...",
     "lastBackupDetails": "Detalles de la última copia de seguridad",
     "backupInProgress": "Aún puedes usar la aplicación mientras se realiza la copia de seguridad de los datos. Cerrar la aplicación finalizará el proceso de copia de seguridad de los datos.",
-    "noBackup": "Haga una copia de seguridad de sus datos en Google Drive. Puede restaurarlos cuando reinstale INJI.",
+    "noBackup": "Haga una copia de seguridad de sus datos en {{driveName}}. Puede restaurarlos cuando reinstale INJI.",
     "storage": "La copia de seguridad se almacenará en Google Drive asociado a su cuenta de Gmail elegida.",
     "backup": "Copia de seguridad",
     "size": "Tamaño: ",
     "restore": "Restaurar",
     "restoreInProgress": "Estamos restaurando sus datos, no cierre la aplicación. Puede continuar usando la aplicación.",
-    "restoreInfo": "Restaura tus datos desde Google Drive",
+    "restoreInfo": "Restaura tus datos desde {{driveName}}",
     "driveSettings": "Configuración de Google Drive",
     "successBanner": "¡Su copia de seguridad fue exitosa!",
     "backupFailed": "Copia de seguridad fallida",
@@ -671,6 +678,7 @@
     "editLabel": "Editar {{label}}",
     "tryAgain": "Intentar otra vez",
     "ignore": "Ignorar",
+    "goBack": "Regresa",
     "camera": {
       "errors": {
         "missingPermission": "Esta aplicación utiliza la cámara para escanear el código QR de otro dispositivo."
diff --git a/locales/tam.json b/locales/tam.json
index f5555bc909..0a3ac7bca5 100644
--- a/locales/tam.json
+++ b/locales/tam.json
@@ -60,6 +60,8 @@
     "qrCodeHeader": "க்யு ஆர் குறியீடு",
     "nationalCard": "தேசிய அட்டை",
     "insuranceCard": "காப்பீட்டு அட்டை",
+    "beneficiaryCard": "பயனாளி அட்டை",
+    "socialRegistryCard": "சமூக பதிவு அட்டை",
     "uin": "UIN",
     "vid": "VID",
     "enableVerification": "செயல்படுத்த",
@@ -359,6 +361,12 @@
       "downloadLimitExpires": {
         "title": "பதிவிறக்கப் பிழை",
         "message": "பின்வரும் கார்டுகளைப் பதிவிறக்குவதில் சிக்கல் ஏற்பட்டது. தயவு செய்து மீண்டும் முயற்சிக்கவும்"
+      },
+      "verificationFailed": {
+        "title" : "ஒரு பிழை ஏற்பட்டது!",
+        "goBackButton": "திரும்பி செல்",
+        "technicalError": "தொழில்நுட்பப் பிழை காரணமாக, எங்களால் கார்டைப் பதிவிறக்க முடியவில்லை.",
+        "networkError": "நிலையற்ற இணைய இணைப்பு காரணமாக, எங்களால் கார்டைப் பதிவிறக்க முடியவில்லை. உங்கள் இணைய இணைப்பைச் சரிபார்க்கவும்."
       }
     }
   },
@@ -632,7 +640,7 @@
     "errors": {
       "permissionDenied": {
         "title": "அனுமதிகள் தேவை",
-        "message": "தரவு காப்புப்பிரதியைத் தொடர, உங்கள் Google இயக்ககத்தை அணுக அனுமதிக்கவும். அமைவை முடிக்க \"அணுகலை அனுமதி\" என்பதைத் தட்டவும் அல்லது அமைப்புகளுக்குத் திரும்ப \"இப்போது இல்லை\" என்பதைத் தட்டவும்.",
+        "message": "தரவு காப்புப்பிரதியைத் தொடர, உங்கள் {{driveName}} அணுக அனுமதிக்கவும். அமைவை முடிக்க \"அணுகலை அனுமதி\" என்பதைத் தட்டவும் அல்லது அமைப்புகளுக்குத் திரும்ப \"இப்போது இல்லை\" என்பதைத் தட்டவும்.",
         "actions": {
           "allowAccess": "அணுகலை அனுமதிக்கவும்",
           "notNow": "இப்போது இல்லை"
@@ -649,6 +657,7 @@
     "backupFailure": {
       "networkError": "நிலையற்ற இணைய இணைப்பு காரணமாக, தரவு காப்புப் பிரதி எடுக்க முடியவில்லை. பிறகு முயற்சிக்கவும்.",
       "technicalError": "தொழில்நுட்பப் பிழை காரணமாக, தரவு காப்புப் பிரதி எடுக்க முடியவில்லை. பிறகு முயற்சிக்கவும்.",
+      "iCloudSignInError": "தரவு காப்புப்பிரதியை முடிக்க முடியவில்லை என்பதற்கு வருந்துகிறோம்.",
       "noDataForBackup": "மன்னிக்கவும், தற்போது காப்புப் பிரதி எடுக்க தரவு எதுவும் இல்லை.",
       "storageLimitReached": "உங்கள் சாதனத்தில் போதுமான சேமிப்பிடம் இல்லாததால், காப்புப் பிரதி செயல்முறையை எங்களால் முடிக்க முடியவில்லை. தேவையற்ற கோப்புகள் அல்லது பயன்பாடுகளை நீக்கி இடத்தை காலி செய்து, மீண்டும் முயற்சிக்கவும்."
     },
@@ -661,7 +670,7 @@
   },
   "AccountSelection": {
     "backupProcessInfo": "உங்கள் தரவை காப்புப் பிரதி எடுக்க இன்னும் சில படிகள் உள்ளன",
-    "cloudInfo": "தரவு காப்புப்பிரதியைத் தொடங்க, உங்கள் கூகிள் இயக்ககத்தை Inji உடன் இணைக்க, `தொடரவும்' பொத்தானைத் தட்டவும்.",
+    "cloudInfo": "தரவு காப்புப்பிரதியைத் தொடங்க, உங்கள் {{driveName}} Inji உடன் இணைக்க, `தொடரவும்' பொத்தானைத் தட்டவும்.",
     "googleDriveTitle": "கூகிள் இயக்ககம்",
     "loadingSubtitle": "ஏற்றுகிறது...",
     "proceed": "தொடரவும்",
@@ -673,13 +682,13 @@
     "backupProgressState": "காப்புப்பிரதி செயலில் உள்ளது...",
     "lastBackupDetails": "கடைசி காப்பு விவரங்கள்",
     "backupInProgress": "தரவு காப்புப்பிரதி செயலில் இருக்கும்போது நீங்கள் பயன்பாட்டைப் பயன்படுத்தலாம். பயன்பாட்டை மூடுவது தரவு காப்புப்பிரதி செயல்முறையை நிறுத்தும்.",
-    "noBackup": "உங்கள் தரவை Google இயக்ககத்தில் காப்புப் பிரதி எடுக்கவும். நீங்கள் INJI ஐ மீண்டும் நிறுவும் போது அவற்றை மீட்டெடுக்கலாம்.",
+    "noBackup": "உங்கள் தரவை {{driveName}} காப்புப் பிரதி எடுக்கவும். நீங்கள் INJI ஐ மீண்டும் நிறுவும் போது அவற்றை மீட்டெடுக்கலாம்.",
     "storage": "நீங்கள் தேர்ந்தெடுத்த ஜிமெயில் கணக்குடன் தொடர்புடைய Google இயக்ககத்தில் காப்புப்பிரதி சேமிக்கப்படும்.",
     "backup": "காப்புப்பிரதி",
     "size": "அளவு: ",
     "restore": "மீட்டமை",
     "restoreInProgress": "உங்கள் தரவை மீட்டெடுக்கிறோம், பயன்பாட்டை மூட வேண்டாம். நீங்கள் பயன்பாட்டை தொடர்ந்து பயன்படுத்தலாம்.",
-    "restoreInfo": "Google இயக்ககத்திலிருந்து உங்கள் தரவை மீட்டெடுக்கவும்",
+    "restoreInfo": "{{driveName}} இலிருந்து உங்கள் தரவை மீட்டமைக்கவும்",
     "driveSettings": "Google இயக்கக அமைப்புகள்",
     "successBanner": "உங்கள் காப்புப்பிரதி வெற்றிகரமாக இருந்தது!",
     "backupFailed": "காப்புப்பிரதி தோல்வியடைந்தது",
@@ -713,6 +722,7 @@
     "editLabel": "திருத்து {{label}}",
     "tryAgain": "மீண்டும் முயற்சி செய்",
     "ignore": "புறக்கணிக்க",
+    "goBack": "திரும்பி செல்",
     "camera": {
       "errors": {
         "missingPermission": "இந்தப் பயன்பாடு மற்றொரு சாதனத்தின் QR குறியீட்டை ஸ்கேன் செய்ய கேமராவைப் பயன்படுத்துகிறது."
diff --git a/machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.ts b/machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.ts
index 315a04db31..887d957d89 100644
--- a/machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.ts
+++ b/machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.ts
@@ -35,7 +35,9 @@ import {TelemetryConstants} from '../../../shared/telemetry/TelemetryConstants';
 
 import {API_URLS} from '../../../shared/api';
 import {BackupEvents} from '../../backupAndRestore/backup';
-import Cloud, {isSignedInResult} from '../../../shared/googleCloudUtils';
+import Cloud, {
+  isSignedInResult,
+} from '../../../shared/CloudBackupAndRestoreUtils';
 
 const model = createModel(
   {
@@ -68,7 +70,6 @@ const model = createModel(
       POLL: () => ({}),
       DOWNLOAD_READY: () => ({}),
       GET_VC_RESPONSE: (vc: VC) => ({vc}),
-      VERIFY: () => ({}),
       LOCK_VC: () => ({}),
       RESEND_OTP: () => ({}),
       INPUT_OTP: (otp: string) => ({otp}),
diff --git a/machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts b/machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts
index 896396b451..3dfa361655 100644
--- a/machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts
+++ b/machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts
@@ -13,6 +13,11 @@ export interface Typegen0 {
       data: unknown;
       __tip: 'See the XState TS docs to learn how to strongly type this.';
     };
+    'done.invoke.vc-item-openid4vci.kebabPopUp.triggerAutoBackup:invocation[0]': {
+      type: 'done.invoke.vc-item-openid4vci.kebabPopUp.triggerAutoBackup:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
     'done.invoke.vc-item-openid4vci.requestingBindingOtp:invocation[0]': {
       type: 'done.invoke.vc-item-openid4vci.requestingBindingOtp:invocation[0]';
       data: unknown;
@@ -48,6 +53,7 @@ export interface Typegen0 {
   invokeSrcNameMap: {
     addWalletBindnigId: 'done.invoke.vc-item-openid4vci.addingWalletBindingId:invocation[0]';
     generateKeyPair: 'done.invoke.vc-item-openid4vci.addKeyPair:invocation[0]';
+    isUserSignedAlready: 'done.invoke.vc-item-openid4vci.kebabPopUp.triggerAutoBackup:invocation[0]';
     requestBindingOtp:
       | 'done.invoke.vc-item-openid4vci.acceptingBindingOtp.resendOTP:invocation[0]'
       | 'done.invoke.vc-item-openid4vci.requestingBindingOtp:invocation[0]';
@@ -64,7 +70,7 @@ export interface Typegen0 {
       | 'DISMISS'
       | 'done.invoke.vc-item-openid4vci.requestingBindingOtp:invocation[0]';
     clearTransactionId: 'DISMISS';
-    logVCremoved: 'STORE_RESPONSE';
+    logVCremoved: 'done.invoke.vc-item-openid4vci.kebabPopUp.triggerAutoBackup:invocation[0]';
     logWalletBindingFailure:
       | 'error.platform.vc-item-openid4vci.addKeyPair:invocation[0]'
       | 'error.platform.vc-item-openid4vci.addingWalletBindingId:invocation[0]'
@@ -74,7 +80,7 @@ export interface Typegen0 {
       | 'done.invoke.vc-item-openid4vci.addingWalletBindingId:invocation[0]'
       | 'done.invoke.vc-item-openid4vci.updatingPrivateKey:invocation[0]';
     removeVcItem: 'CONFIRM';
-    removedVc: 'STORE_RESPONSE';
+    removedVc: 'done.invoke.vc-item-openid4vci.kebabPopUp.triggerAutoBackup:invocation[0]';
     requestStoredContext: 'GET_VC_RESPONSE' | 'REFRESH';
     requestVcContext: 'DISMISS' | 'xstate.init';
     sendActivationFailedEndEvent:
@@ -84,6 +90,7 @@ export interface Typegen0 {
     sendActivationSuccessEvent:
       | 'done.invoke.vc-item-openid4vci.addingWalletBindingId:invocation[0]'
       | 'done.invoke.vc-item-openid4vci.updatingPrivateKey:invocation[0]';
+    sendBackupEvent: 'done.invoke.vc-item-openid4vci.kebabPopUp.triggerAutoBackup:invocation[0]';
     sendVcUpdated: 'PIN_CARD';
     sendWalletBindingSuccess: 'SHOW_BINDING_STATUS';
     setContext: 'GET_VC_RESPONSE' | 'STORE_RESPONSE';
@@ -129,10 +136,12 @@ export interface Typegen0 {
     isCustomSecureKeystore:
       | 'done.invoke.vc-item-openid4vci.addKeyPair:invocation[0]'
       | 'done.invoke.vc-item-openid4vci.addingWalletBindingId:invocation[0]';
+    isSignedIn: 'done.invoke.vc-item-openid4vci.kebabPopUp.triggerAutoBackup:invocation[0]';
   };
   eventsCausingServices: {
     addWalletBindnigId: 'done.invoke.vc-item-openid4vci.addKeyPair:invocation[0]';
     generateKeyPair: 'INPUT_OTP';
+    isUserSignedAlready: 'STORE_RESPONSE';
     requestBindingOtp: 'CONFIRM' | 'RESEND_OTP';
     updatePrivateKey: 'done.invoke.vc-item-openid4vci.addingWalletBindingId:invocation[0]';
   };
@@ -150,6 +159,7 @@ export interface Typegen0 {
     | 'kebabPopUp.removeWallet'
     | 'kebabPopUp.removingVc'
     | 'kebabPopUp.showActivities'
+    | 'kebabPopUp.triggerAutoBackup'
     | 'pinCard'
     | 'requestingBindingOtp'
     | 'showBindingWarning'
@@ -158,7 +168,12 @@ export interface Typegen0 {
     | 'updatingPrivateKey'
     | {
         acceptingBindingOtp?: 'idle' | 'resendOTP';
-        kebabPopUp?: 'idle' | 'removeWallet' | 'removingVc' | 'showActivities';
+        kebabPopUp?:
+          | 'idle'
+          | 'removeWallet'
+          | 'removingVc'
+          | 'showActivities'
+          | 'triggerAutoBackup';
       };
   tags: never;
 }
diff --git a/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.ts b/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.ts
index 36684940f2..741c01128c 100644
--- a/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.ts
+++ b/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.ts
@@ -42,7 +42,9 @@ import {TelemetryConstants} from '../../../shared/telemetry/TelemetryConstants';
 
 import {API_URLS} from '../../../shared/api';
 import {BackupEvents} from '../../backupAndRestore/backup';
-import Cloud, {isSignedInResult} from '../../../shared/googleCloudUtils';
+import Cloud, {
+  isSignedInResult,
+} from '../../../shared/CloudBackupAndRestoreUtils';
 
 const model = createModel(
   {
@@ -54,9 +56,7 @@ const model = createModel(
     generatedOn: new Date() as Date,
     credential: null as DecodedCredential,
     verifiableCredential: null as VerifiableCredential,
-    storeVerifiableCredential: null as VerifiableCredential,
     requestId: '',
-    isVerified: false,
     lastVerifiedOn: null,
     locked: false,
     otp: '',
@@ -75,6 +75,7 @@ const model = createModel(
     privateKey: '',
     isMachineInKebabPopupState: false,
     bindingAuthFailedMessage: '' as string,
+    verificationErrorMessage: '',
   },
   {
     events: {
@@ -88,7 +89,6 @@ const model = createModel(
       DOWNLOAD_READY: () => ({}),
       FAILED: () => ({}),
       GET_VC_RESPONSE: (vc: VC) => ({vc}),
-      VERIFY: () => ({}),
       LOCK_VC: () => ({}),
       INPUT_OTP: (otp: string) => ({otp}),
       RESEND_OTP: () => ({}),
@@ -143,7 +143,7 @@ export const ExistingMosipVCItemMachine =
               {
                 actions: 'setCredential',
                 cond: 'hasCredential',
-                target: 'checkingVerificationStatus',
+                target: '#vc-item.idle',
               },
               {
                 target: 'checkingStore',
@@ -159,7 +159,7 @@ export const ExistingMosipVCItemMachine =
               {
                 actions: ['setCredential', 'updateVc'],
                 cond: 'hasCredential',
-                target: 'checkingVerificationStatus',
+                target: '#vc-item.idle',
               },
               {
                 actions: 'addVcToInProgressDownloads',
@@ -167,7 +167,7 @@ export const ExistingMosipVCItemMachine =
               },
             ],
             TAMPERED_VC: {
-              actions: ['sendTamperedVc', 'removeTamperedVcItem'],
+              actions: 'sendTamperedVc',
             },
           },
         },
@@ -237,37 +237,8 @@ export const ExistingMosipVCItemMachine =
                   },
                 ],
                 CREDENTIAL_DOWNLOADED: {
-                  actions: ['setStoreVerifiableCredential', 'storeContext'],
-                },
-                STORE_RESPONSE: {
-                  actions: [
-                    'setVerifiableCredential',
-                    'updateVc',
-                    'logDownloaded',
-                    'sendTelemetryEvents',
-                    'removeVcFromInProgressDownloads',
-                  ],
-                  target: '.triggerAutoBackupForVcDownload',
-                },
-                STORE_ERROR: {
-                  target: '#vc-item.checkingServerData.savingFailed',
-                },
-              },
-              states: {
-                triggerAutoBackupForVcDownload: {
-                  invoke: {
-                    src: 'isUserSignedAlready',
-                    onDone: [
-                      {
-                        cond: 'isSignedIn',
-                        actions: ['sendBackupEvent'],
-                        target: '#vc-item.checkingVerificationStatus',
-                      },
-                      {
-                        target: '#vc-item.checkingVerificationStatus',
-                      },
-                    ],
-                  },
+                  actions: 'setCredential',
+                  target: '#vc-item.verifyingCredential',
                 },
               },
             },
@@ -290,9 +261,6 @@ export const ExistingMosipVCItemMachine =
         idle: {
           entry: ['clearTransactionId', 'clearOtp'],
           on: {
-            VERIFY: {
-              target: 'verifyingCredential',
-            },
             LOCK_VC: {
               target: 'requestingOtp',
             },
@@ -409,30 +377,59 @@ export const ExistingMosipVCItemMachine =
             src: 'verifyCredential',
             onDone: [
               {
-                actions: ['markVcValid', 'storeContext', 'updateVc'],
-                target: 'idle',
+                actions: ['storeContext'],
               },
             ],
             onError: [
               {
-                actions: log((_, event) => (event.data as Error).message),
-                target: 'idle',
+                //To-Do Handle Error Scenarios
+                actions: ['updateVerificationErrorMessage'],
+                target: 'handleVCVerificationFailure',
               },
             ],
           },
-        },
-        checkingVerificationStatus: {
-          description:
-            'Check if VC verification is still valid. VCs stored on the device must be re-checked once every [N] time has passed.',
-          always: [
-            {
-              cond: 'isVcValid',
-              target: 'idle',
+          initial: 'idle',
+          on: {
+            STORE_RESPONSE: {
+              actions: [
+                'updateVc',
+                'logDownloaded',
+                'sendTelemetryEvents',
+                'removeVcFromInProgressDownloads',
+              ],
+              target: '.triggerAutoBackupForVcDownload',
             },
-            {
-              target: 'verifyingCredential',
+            STORE_ERROR: {
+              target: '#vc-item.checkingServerData.savingFailed',
             },
-          ],
+          },
+          states: {
+            idle: {},
+            triggerAutoBackupForVcDownload: {
+              invoke: {
+                src: 'isUserSignedAlready',
+                onDone: [
+                  {
+                    cond: 'isSignedIn',
+                    actions: ['sendBackupEvent'],
+                    target: '#vc-item.idle',
+                  },
+                  {
+                    target: '#vc-item.idle',
+                  },
+                ],
+              },
+            },
+          },
+        },
+
+        handleVCVerificationFailure: {
+          entry: ['removeVcMetaDataFromStorage'],
+          on: {
+            STORE_RESPONSE: {
+              actions: ['sendVerificationError'],
+            },
+          },
         },
         invalid: {
           states: {
@@ -709,9 +706,9 @@ export const ExistingMosipVCItemMachine =
               },
               {
                 target: 'updatingPrivateKey',
-                /*The walletBindingResponse is used for conditional rendering in wallet binding. 
-                However, it wrongly considers activation as successful even when there's an error 
-                in updatingPrivateKey state. So created a temporary context variable to store the binding 
+                /*The walletBindingResponse is used for conditional rendering in wallet binding.
+                However, it wrongly considers activation as successful even when there's an error
+                in updatingPrivateKey state. So created a temporary context variable to store the binding
                 response and use it in updatingPrivateKey state*/
                 actions: 'setTempWalletBindingResponse',
               },
@@ -771,29 +768,6 @@ export const ExistingMosipVCItemMachine =
     },
     {
       actions: {
-        setVerifiableCredential: assign(context => {
-          return {
-            ...context,
-            verifiableCredential: {
-              ...context.storeVerifiableCredential,
-            },
-            storeVerifiableCredential: null,
-            vcMetadata: context.vcMetadata,
-          };
-        }),
-
-        setStoreVerifiableCredential: model.assign((context, event) => {
-          return {
-            ...context,
-            ...event.vc,
-            storeVerifiableCredential: {
-              ...event.vc.verifiableCredential,
-            },
-            verifiableCredential: null,
-            vcMetadata: context.vcMetadata,
-          };
-        }),
-
         removeVcMetaDataFromStorage: send(
           context => {
             return StoreEvents.REMOVE_VC_METADATA(
@@ -830,6 +804,24 @@ export const ExistingMosipVCItemMachine =
           },
         ),
 
+        sendVerificationError: send(
+          (context, event) => {
+            return {
+              type: 'VERIFY_VC_FAILED',
+              errorMessage: context.verificationErrorMessage,
+              vcMetadata: context.vcMetadata,
+            };
+          },
+          {
+            to: context => context.serviceRefs.vc,
+          },
+        ),
+
+        updateVerificationErrorMessage: assign({
+          verificationErrorMessage: (context, event) =>
+            (event.data as Error).message,
+        }),
+
         setWalletBindingError: assign({
           walletBindingError: () => {
             const errorMessage = i18n.t(`errors.genericError`, {
@@ -987,10 +979,10 @@ export const ExistingMosipVCItemMachine =
         ),
 
         removeVcFromInProgressDownloads: send(
-          (_context, event) => {
+          context => {
             return {
               type: 'REMOVE_VC_FROM_IN_PROGRESS_DOWNLOADS',
-              requestId: event.response.requestId,
+              vcMetadata: context.vcMetadata,
             };
           },
           {
@@ -1095,7 +1087,6 @@ export const ExistingMosipVCItemMachine =
               return {
                 ...context,
                 ...event.vc,
-                vcMetadata: context.vcMetadata,
               };
           }
         }),
@@ -1176,14 +1167,6 @@ export const ExistingMosipVCItemMachine =
           },
         ),
 
-        markVcValid: assign(context => {
-          return {
-            ...context,
-            isVerified: true,
-            lastVerifiedOn: Date.now(),
-          };
-        }),
-
         setTransactionId: assign({
           transactionId: () => String(new Date().valueOf()).substring(3, 13),
         }),
@@ -1231,16 +1214,6 @@ export const ExistingMosipVCItemMachine =
           {to: context => context.serviceRefs.store},
         ),
 
-        removeTamperedVcItem: send(
-          _context => {
-            return StoreEvents.REMOVE(
-              MY_VCS_STORE_KEY,
-              _context.vcMetadata.getVcKey(),
-            );
-          },
-          {to: context => context.serviceRefs.store},
-        ),
-
         logVCremoved: send(
           (context, _) =>
             ActivityLogEvents.LOG_ACTIVITY({
@@ -1422,7 +1395,6 @@ export const ExistingMosipVCItemMachine =
                   id: context.vcMetadata.id,
                   idType: context.vcMetadata.idType,
                   requestId: context.vcMetadata.requestId,
-                  isVerified: false,
                   lastVerifiedOn: null,
                   locked: context.locked,
                   walletBindingResponse: null,
@@ -1436,7 +1408,14 @@ export const ExistingMosipVCItemMachine =
         },
 
         verifyCredential: async context => {
-          return verifyCredential(context.verifiableCredential);
+          if (context.verifiableCredential) {
+            const verificationResult = await verifyCredential(
+              context.verifiableCredential,
+            );
+            if (!verificationResult.isVerified) {
+              throw new Error(verificationResult.errorMessage);
+            }
+          }
         },
 
         requestOtp: async context => {
@@ -1520,10 +1499,6 @@ export const ExistingMosipVCItemMachine =
           return _context.downloadCounter <= _context.maxDownloadCount;
         },
 
-        isVcValid: context => {
-          return context.isVerified;
-        },
-
         isCustomSecureKeystore: () => isHardwareKeystoreExists,
       },
     },
diff --git a/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts b/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
index 097434ec1c..40ca7ade7b 100644
--- a/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
+++ b/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
@@ -34,6 +34,11 @@ export interface Typegen0 {
       data: unknown;
       __tip: 'See the XState TS docs to learn how to strongly type this.';
     };
+    'done.invoke.vc-item.kebabPopUp.removingVc.triggerAutoBackup:invocation[0]': {
+      type: 'done.invoke.vc-item.kebabPopUp.removingVc.triggerAutoBackup:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
     'done.invoke.vc-item.requestingBindingOtp:invocation[0]': {
       type: 'done.invoke.vc-item.requestingBindingOtp:invocation[0]';
       data: unknown;
@@ -59,6 +64,11 @@ export interface Typegen0 {
       data: unknown;
       __tip: 'See the XState TS docs to learn how to strongly type this.';
     };
+    'done.invoke.vc-item.verifyingCredential.triggerAutoBackupForVcDownload:invocation[0]': {
+      type: 'done.invoke.vc-item.verifyingCredential.triggerAutoBackupForVcDownload:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
     'done.invoke.vc-item.verifyingCredential:invocation[0]': {
       type: 'done.invoke.vc-item.verifyingCredential:invocation[0]';
       data: unknown;
@@ -116,6 +126,9 @@ export interface Typegen0 {
     checkStatus: 'done.invoke.checkStatus';
     downloadCredential: 'done.invoke.downloadCredential';
     generateKeyPair: 'done.invoke.vc-item.addKeyPair:invocation[0]';
+    isUserSignedAlready:
+      | 'done.invoke.vc-item.kebabPopUp.removingVc.triggerAutoBackup:invocation[0]'
+      | 'done.invoke.vc-item.verifyingCredential.triggerAutoBackupForVcDownload:invocation[0]';
     loadDownloadLimitConfig: 'done.invoke.vc-item.checkingServerData.loadDownloadLimitConfig:invocation[0]';
     requestBindingOtp:
       | 'done.invoke.vc-item.acceptingBindingOtp.resendOTP:invocation[0]'
@@ -140,29 +153,29 @@ export interface Typegen0 {
       | ''
       | 'CANCEL'
       | 'DISMISS'
+      | 'GET_VC_RESPONSE'
       | 'REVOKE_VC'
       | 'SHOW_BINDING_STATUS'
       | 'STORE_RESPONSE'
       | 'done.invoke.vc-item.requestingBindingOtp:invocation[0]'
       | 'done.invoke.vc-item.requestingOtp:invocation[0]'
-      | 'done.invoke.vc-item.verifyingCredential:invocation[0]'
+      | 'done.invoke.vc-item.verifyingCredential.triggerAutoBackupForVcDownload:invocation[0]'
       | 'error.platform.vc-item.requestingLock:invocation[0]'
-      | 'error.platform.vc-item.requestingRevoke:invocation[0]'
-      | 'error.platform.vc-item.verifyingCredential:invocation[0]';
+      | 'error.platform.vc-item.requestingRevoke:invocation[0]';
     clearTransactionId:
       | ''
       | 'CANCEL'
       | 'DISMISS'
+      | 'GET_VC_RESPONSE'
       | 'SHOW_BINDING_STATUS'
       | 'STORE_RESPONSE'
-      | 'done.invoke.vc-item.verifyingCredential:invocation[0]'
-      | 'error.platform.vc-item.verifyingCredential:invocation[0]';
+      | 'done.invoke.vc-item.verifyingCredential.triggerAutoBackupForVcDownload:invocation[0]';
     incrementDownloadCounter:
       | 'POLL'
       | 'done.invoke.vc-item.checkingServerData.loadDownloadLimitConfig:invocation[0]';
     logDownloaded: 'STORE_RESPONSE';
     logRevoked: 'STORE_RESPONSE';
-    logVCremoved: 'STORE_RESPONSE';
+    logVCremoved: 'done.invoke.vc-item.kebabPopUp.removingVc.triggerAutoBackup:invocation[0]';
     logWalletBindingFailure:
       | 'error.platform.vc-item.addKeyPair:invocation[0]'
       | 'error.platform.vc-item.addingWalletBindingId:invocation[0]'
@@ -171,12 +184,12 @@ export interface Typegen0 {
     logWalletBindingSuccess:
       | 'done.invoke.vc-item.addingWalletBindingId:invocation[0]'
       | 'done.invoke.vc-item.updatingPrivateKey:invocation[0]';
-    markVcValid: 'done.invoke.vc-item.verifyingCredential:invocation[0]';
-    refreshMyVcs: 'STORE_RESPONSE';
-    removeTamperedVcItem: 'TAMPERED_VC';
+    refreshMyVcs: 'done.invoke.vc-item.kebabPopUp.removingVc.triggerAutoBackup:invocation[0]';
     removeVcFromInProgressDownloads: 'STORE_RESPONSE';
     removeVcItem: 'CONFIRM';
-    removeVcMetaDataFromStorage: 'STORE_ERROR';
+    removeVcMetaDataFromStorage:
+      | 'STORE_ERROR'
+      | 'error.platform.vc-item.verifyingCredential:invocation[0]';
     removeVcMetaDataFromVcMachine: 'DISMISS';
     requestStoredContext: 'GET_VC_RESPONSE' | 'REFRESH';
     requestVcContext: 'DISMISS' | 'xstate.init';
@@ -188,14 +201,21 @@ export interface Typegen0 {
     sendActivationSuccessEvent:
       | 'done.invoke.vc-item.addingWalletBindingId:invocation[0]'
       | 'done.invoke.vc-item.updatingPrivateKey:invocation[0]';
+    sendBackupEvent:
+      | 'done.invoke.vc-item.kebabPopUp.removingVc.triggerAutoBackup:invocation[0]'
+      | 'done.invoke.vc-item.verifyingCredential.triggerAutoBackupForVcDownload:invocation[0]';
     sendDownloadLimitExpire:
       | 'FAILED'
       | 'error.platform.vc-item.checkingServerData.verifyingDownloadLimitExpiry:invocation[0]';
     sendTamperedVc: 'TAMPERED_VC';
     sendTelemetryEvents: 'STORE_RESPONSE';
     sendVcUpdated: 'PIN_CARD';
+    sendVerificationError: 'STORE_RESPONSE';
     sendWalletBindingSuccess: 'SHOW_BINDING_STATUS';
-    setCredential: 'GET_VC_RESPONSE' | 'STORE_RESPONSE';
+    setCredential:
+      | 'CREDENTIAL_DOWNLOADED'
+      | 'GET_VC_RESPONSE'
+      | 'STORE_RESPONSE';
     setDownloadInterval: 'done.invoke.vc-item.checkingServerData.loadDownloadLimitConfig:invocation[0]';
     setLock: 'done.invoke.vc-item.requestingLock:invocation[0]';
     setMaxDownloadCount: 'done.invoke.vc-item.checkingServerData.loadDownloadLimitConfig:invocation[0]';
@@ -207,7 +227,6 @@ export interface Typegen0 {
     setPrivateKey: 'done.invoke.vc-item.addKeyPair:invocation[0]';
     setPublicKey: 'done.invoke.vc-item.addKeyPair:invocation[0]';
     setRevoke: 'done.invoke.vc-item.requestingRevoke:invocation[0]';
-    setStoreVerifiableCredential: 'CREDENTIAL_DOWNLOADED';
     setTempWalletBindingResponse: 'done.invoke.vc-item.addingWalletBindingId:invocation[0]';
     setThumbprintForWalletBindingId:
       | 'done.invoke.vc-item.addingWalletBindingId:invocation[0]'
@@ -220,7 +239,6 @@ export interface Typegen0 {
       | 'error.platform.vc-item.requestingRevoke:invocation[0]';
     setVcKey: 'REMOVE';
     setVcMetadata: 'UPDATE_VC_METADATA';
-    setVerifiableCredential: 'STORE_RESPONSE';
     setWalletBindingError:
       | 'error.platform.vc-item.acceptingBindingOtp.resendOTP:invocation[0]'
       | 'error.platform.vc-item.addKeyPair:invocation[0]'
@@ -235,7 +253,6 @@ export interface Typegen0 {
       | 'done.invoke.vc-item.addingWalletBindingId:invocation[0]'
       | 'done.invoke.vc-item.updatingPrivateKey:invocation[0]';
     storeContext:
-      | 'CREDENTIAL_DOWNLOADED'
       | 'done.invoke.vc-item.addingWalletBindingId:invocation[0]'
       | 'done.invoke.vc-item.updatingPrivateKey:invocation[0]'
       | 'done.invoke.vc-item.verifyingCredential:invocation[0]';
@@ -246,8 +263,8 @@ export interface Typegen0 {
     updateVc:
       | 'STORE_RESPONSE'
       | 'done.invoke.vc-item.addingWalletBindingId:invocation[0]'
-      | 'done.invoke.vc-item.updatingPrivateKey:invocation[0]'
-      | 'done.invoke.vc-item.verifyingCredential:invocation[0]';
+      | 'done.invoke.vc-item.updatingPrivateKey:invocation[0]';
+    updateVerificationErrorMessage: 'error.platform.vc-item.verifyingCredential:invocation[0]';
   };
   eventsCausingDelays: {};
   eventsCausingGuards: {
@@ -256,7 +273,9 @@ export interface Typegen0 {
       | 'done.invoke.vc-item.addKeyPair:invocation[0]'
       | 'done.invoke.vc-item.addingWalletBindingId:invocation[0]';
     isDownloadAllowed: 'POLL';
-    isVcValid: '';
+    isSignedIn:
+      | 'done.invoke.vc-item.kebabPopUp.removingVc.triggerAutoBackup:invocation[0]'
+      | 'done.invoke.vc-item.verifyingCredential.triggerAutoBackupForVcDownload:invocation[0]';
   };
   eventsCausingServices: {
     addWalletBindnigId: 'done.invoke.vc-item.addKeyPair:invocation[0]';
@@ -266,13 +285,14 @@ export interface Typegen0 {
     checkStatus: 'done.invoke.vc-item.checkingServerData.verifyingDownloadLimitExpiry:invocation[0]';
     downloadCredential: 'DOWNLOAD_READY';
     generateKeyPair: 'INPUT_OTP';
-    loadDownloadLimitConfig: 'STORE_RESPONSE';
+    isUserSignedAlready: 'STORE_RESPONSE';
+    loadDownloadLimitConfig: 'STORE_ERROR' | 'STORE_RESPONSE';
     requestBindingOtp: 'CONFIRM' | 'RESEND_OTP';
     requestLock: 'INPUT_OTP';
     requestOtp: 'LOCK_VC' | 'RESEND_OTP';
     requestRevoke: 'INPUT_OTP';
     updatePrivateKey: 'done.invoke.vc-item.addingWalletBindingId:invocation[0]';
-    verifyCredential: '' | 'VERIFY';
+    verifyCredential: 'CREDENTIAL_DOWNLOADED';
   };
   matchesStates:
     | 'acceptingBindingOtp'
@@ -294,7 +314,7 @@ export interface Typegen0 {
     | 'checkingServerData.verifyingDownloadLimitExpiry'
     | 'checkingStore'
     | 'checkingVc'
-    | 'checkingVerificationStatus'
+    | 'handleVCVerificationFailure'
     | 'idle'
     | 'invalid'
     | 'invalid.backend'
@@ -303,6 +323,7 @@ export interface Typegen0 {
     | 'kebabPopUp.idle'
     | 'kebabPopUp.removeWallet'
     | 'kebabPopUp.removingVc'
+    | 'kebabPopUp.removingVc.triggerAutoBackup'
     | 'kebabPopUp.showActivities'
     | 'lockingVc'
     | 'loggingRevoke'
@@ -317,6 +338,8 @@ export interface Typegen0 {
     | 'updatingContextVariables'
     | 'updatingPrivateKey'
     | 'verifyingCredential'
+    | 'verifyingCredential.idle'
+    | 'verifyingCredential.triggerAutoBackupForVcDownload'
     | {
         acceptingBindingOtp?: 'idle' | 'resendOTP';
         acceptingOtpInput?: 'idle' | 'resendOTP';
@@ -328,7 +351,13 @@ export interface Typegen0 {
           | 'verifyingDownloadLimitExpiry'
           | {savingFailed?: 'idle' | 'viewingVc'};
         invalid?: 'backend' | 'otp';
-        kebabPopUp?: 'idle' | 'removeWallet' | 'removingVc' | 'showActivities';
+        kebabPopUp?:
+          | 'idle'
+          | 'removeWallet'
+          | 'removingVc'
+          | 'showActivities'
+          | {removingVc?: 'triggerAutoBackup'};
+        verifyingCredential?: 'idle' | 'triggerAutoBackupForVcDownload';
       };
   tags: never;
 }
diff --git a/machines/VCItemMachine/vc.ts b/machines/VCItemMachine/vc.ts
index 86f9388be2..14ada4feda 100644
--- a/machines/VCItemMachine/vc.ts
+++ b/machines/VCItemMachine/vc.ts
@@ -11,7 +11,7 @@ import {Protocols} from '../../shared/openId4VCI/Utils';
 import {EsignetMosipVCItemEvents} from './EsignetMosipVCItem/EsignetMosipVCItemMachine';
 import {ActivityLogEvents} from '../activityLog';
 import {ActivityLog} from '../../components/ActivityLogEvent';
-import Cloud, {isSignedInResult} from '../../shared/googleCloudUtils';
+import Cloud, {isSignedInResult} from '../../shared/CloudBackupAndRestoreUtils';
 import {BackupEvents} from '../backupAndRestore/backup';
 
 const model = createModel(
@@ -25,6 +25,7 @@ const model = createModel(
     walletBindingSuccess: false,
     tamperedVcs: [] as VCMetadata[],
     downloadingFailedVcs: [] as VCMetadata[],
+    verificationErrorMessage: '' as string,
   },
   {
     events: {
@@ -35,7 +36,6 @@ const model = createModel(
       VC_ADDED: (vcMetadata: VCMetadata) => ({vcMetadata}),
       REMOVE_VC_FROM_CONTEXT: (vcMetadata: VCMetadata) => ({vcMetadata}),
       VC_METADATA_UPDATED: (vcMetadata: VCMetadata) => ({vcMetadata}),
-      VC_RECEIVED: (vcMetadata: VCMetadata) => ({vcMetadata}),
       VC_DOWNLOADED: (vc: VC) => ({vc}),
       VC_DOWNLOADED_FROM_OPENID4VCI: (vc: VC, vcMetadata: VCMetadata) => ({
         vc,
@@ -48,14 +48,20 @@ const model = createModel(
       WALLET_BINDING_SUCCESS: () => ({}),
       RESET_WALLET_BINDING_SUCCESS: () => ({}),
       ADD_VC_TO_IN_PROGRESS_DOWNLOADS: (requestId: string) => ({requestId}),
-      REMOVE_VC_FROM_IN_PROGRESS_DOWNLOADS: (requestId: string) => ({
-        requestId,
+      REMOVE_VC_FROM_IN_PROGRESS_DOWNLOADS: (vcMetadata: VCMetadata) => ({
+        vcMetadata,
       }),
       RESET_ARE_ALL_VCS_DOWNLOADED: () => ({}),
       TAMPERED_VC: (VC: VCMetadata) => ({VC}),
       REMOVE_TAMPERED_VCS: () => ({}),
       DOWNLOAD_LIMIT_EXPIRED: (vcMetadata: VCMetadata) => ({vcMetadata}),
       DELETE_VC: () => ({}),
+      VERIFY_VC_FAILED: (errorMessage: string, vcMetadata?: VCMetadata) => ({
+        errorMessage,
+        vcMetadata,
+      }),
+      RESET_VERIFY_ERROR: () => ({}),
+      REFRESH_VCS_METADATA: () => ({}),
     },
   },
 );
@@ -136,13 +142,7 @@ export const vcMachine =
             receivedVcs: {
               initial: 'idle',
               states: {
-                idle: {
-                  on: {
-                    REFRESH_RECEIVED_VCS: {
-                      target: 'refreshing',
-                    },
-                  },
-                },
+                idle: {},
                 refreshing: {
                   entry: 'loadReceivedVcs',
                   on: {
@@ -156,9 +156,6 @@ export const vcMachine =
             },
           },
           on: {
-            GET_RECEIVED_VCS: {
-              actions: 'getReceivedVcsResponse',
-            },
             GET_VC_ITEM: {
               actions: 'getVcItemResponse',
             },
@@ -189,11 +186,9 @@ export const vcMachine =
             RESET_WALLET_BINDING_SUCCESS: {
               actions: 'resetWalletBindingSuccess',
             },
-            VC_RECEIVED: [
-              {
-                actions: 'prependToReceivedVcs',
-              },
-            ],
+            REFRESH_RECEIVED_VCS: {
+              target: '#vc.ready.receivedVcs.refreshing',
+            },
             TAMPERED_VC: {
               actions: 'setTamperedVcs',
               target: 'tamperedVCs',
@@ -208,6 +203,16 @@ export const vcMachine =
             DELETE_VC: {
               target: 'deletingFailedVcs',
             },
+            VERIFY_VC_FAILED: {
+              actions: [
+                'removeVcFromInProgressDownlods',
+                'setVerificationErrorMessage',
+              ],
+              target: '#vc.ready.myVcs.refreshing',
+            },
+            RESET_VERIFY_ERROR: {
+              actions: 'resetVerificationErrorMessage',
+            },
           },
         },
         tamperedVCs: {
@@ -223,20 +228,23 @@ export const vcMachine =
                 onDone: [
                   {
                     cond: 'isSignedIn',
-                    actions: [
-                      'sendBackupEvent',
-                      'removeTamperedVcs',
-                      'logTamperedVCsremoved',
-                    ],
-                    target: '#vc.ready.myVcs.refreshing',
+                    actions: 'sendBackupEvent',
+                    target: 'refreshVcsMetadata',
                   },
                   {
-                    actions: ['removeTamperedVcs', 'logTamperedVCsremoved'],
-                    target: '#vc.ready.myVcs.refreshing',
+                    target: 'refreshVcsMetadata',
                   },
                 ],
               },
             },
+            refreshVcsMetadata: {
+              entry: ['logTamperedVCsremoved', send('REFRESH_VCS_METADATA')],
+              on: {
+                REFRESH_VCS_METADATA: {
+                  target: '#vc.init',
+                },
+              },
+            },
           },
         },
         deletingFailedVcs: {
@@ -304,6 +312,14 @@ export const vcMachine =
           ],
         }),
 
+        setVerificationErrorMessage: model.assign({
+          verificationErrorMessage: (context, event) => event.errorMessage,
+        }),
+
+        resetVerificationErrorMessage: model.assign({
+          verificationErrorMessage: (_context, event) => '',
+        }),
+
         resetDownloadFailedVcs: model.assign({
           downloadingFailedVcs: (context, event) => [],
         }),
@@ -325,14 +341,15 @@ export const vcMachine =
 
         removeVcFromInProgressDownlods: model.assign({
           inProgressVcDownloads: (context, event) => {
-            let paresedInProgressList: Set<string> =
+            let updatedInProgressList: Set<string> =
               context.inProgressVcDownloads;
-            const removeVcRequestID =
-              event.type === 'REMOVE_VC_FROM_IN_PROGRESS_DOWNLOADS'
-                ? event.requestId
-                : event.vcMetadata.requestId;
-            paresedInProgressList.delete(removeVcRequestID);
-            return paresedInProgressList;
+            if (!event.vcMetadata) {
+              return updatedInProgressList;
+            }
+            const removeVcRequestID = event.vcMetadata.requestId;
+            updatedInProgressList.delete(removeVcRequestID);
+
+            return updatedInProgressList;
           },
           areAllVcsDownloaded: context => {
             if (context.inProgressVcDownloads.size == 0) {
@@ -390,13 +407,6 @@ export const vcMachine =
           },
         ),
 
-        removeTamperedVcs: model.assign({
-          myVcs: (context, event) =>
-            context.myVcs.filter(
-              value => !context.tamperedVcs.some(item => item?.equals(value)),
-            ),
-        }),
-
         logTamperedVCsremoved: send(
           context =>
             ActivityLogEvents.LOG_ACTIVITY(ActivityLog.logTamperedVCs()),
@@ -417,22 +427,11 @@ export const vcMachine =
         resetWalletBindingSuccess: model.assign({
           walletBindingSuccess: false,
         }),
-
-        prependToReceivedVcs: model.assign({
-          receivedVcs: (context, event) => [
-            event.vcMetadata,
-            ...context.receivedVcs,
-          ],
-        }),
       },
 
       guards: {
         isSignedIn: (_context, event) =>
           (event.data as isSignedInResult).isSignedIn,
-        hasExistingReceivedVc: (context, event) =>
-          context.receivedVcs.find(vcMetadata =>
-            vcMetadata.equals(event.vcMetadata),
-          ) != null,
       },
 
       services: {
@@ -530,3 +529,7 @@ export function selectIsTampered(state: State) {
 export function selectDownloadingFailedVcs(state: State) {
   return state.context.downloadingFailedVcs;
 }
+
+export function selectVerificationErrorMessage(state: State) {
+  return state.context.verificationErrorMessage;
+}
diff --git a/machines/VCItemMachine/vc.typegen.ts b/machines/VCItemMachine/vc.typegen.ts
index c570831fef..f4889c6717 100644
--- a/machines/VCItemMachine/vc.typegen.ts
+++ b/machines/VCItemMachine/vc.typegen.ts
@@ -3,9 +3,16 @@
 export interface Typegen0 {
   '@@xstate/typegen': true;
   internalEvents: {
+    'done.invoke.vc.tamperedVCs.triggerAutoBackupForTamperedVcDeletion:invocation[0]': {
+      type: 'done.invoke.vc.tamperedVCs.triggerAutoBackupForTamperedVcDeletion:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
     'xstate.init': {type: 'xstate.init'};
   };
-  invokeSrcNameMap: {};
+  invokeSrcNameMap: {
+    isUserSignedAlready: 'done.invoke.vc.tamperedVCs.triggerAutoBackupForTamperedVcDeletion:invocation[0]';
+  };
   missingImplementations: {
     actions: never;
     delays: never;
@@ -14,28 +21,29 @@ export interface Typegen0 {
   };
   eventsCausingActions: {
     addVcToInProgressDownloads: 'ADD_VC_TO_IN_PROGRESS_DOWNLOADS';
-    getReceivedVcsResponse: 'GET_RECEIVED_VCS';
     getVcItemResponse: 'GET_VC_ITEM';
     loadMyVcs:
       | 'DOWNLOAD_LIMIT_EXPIRED'
       | 'REFRESH_MY_VCS'
-      | 'REMOVE_TAMPERED_VCS'
+      | 'REFRESH_VCS_METADATA'
       | 'STORE_RESPONSE'
+      | 'VERIFY_VC_FAILED'
       | 'xstate.init';
     loadReceivedVcs: 'REFRESH_RECEIVED_VCS' | 'STORE_RESPONSE';
-    logTamperedVCsremoved: 'REMOVE_TAMPERED_VCS';
+    logTamperedVCsremoved: 'done.invoke.vc.tamperedVCs.triggerAutoBackupForTamperedVcDeletion:invocation[0]';
     prependToMyVcs: 'VC_ADDED';
-    prependToReceivedVcs: 'VC_RECEIVED';
     removeDownloadFailedVcsFromStorage: 'DELETE_VC';
     removeDownloadingFailedVcsFromMyVcs: 'STORE_RESPONSE';
-    removeTamperedVcs: 'REMOVE_TAMPERED_VCS';
     removeVcFromInProgressDownlods:
       | 'DOWNLOAD_LIMIT_EXPIRED'
-      | 'REMOVE_VC_FROM_IN_PROGRESS_DOWNLOADS';
+      | 'REMOVE_VC_FROM_IN_PROGRESS_DOWNLOADS'
+      | 'VERIFY_VC_FAILED';
     removeVcFromMyVcs: 'REMOVE_VC_FROM_CONTEXT';
     resetAreAllVcsDownloaded: 'RESET_ARE_ALL_VCS_DOWNLOADED';
     resetDownloadFailedVcs: 'STORE_RESPONSE';
+    resetVerificationErrorMessage: 'RESET_VERIFY_ERROR';
     resetWalletBindingSuccess: 'RESET_WALLET_BINDING_SUCCESS';
+    sendBackupEvent: 'done.invoke.vc.tamperedVCs.triggerAutoBackupForTamperedVcDeletion:invocation[0]';
     setDownloadedVCFromOpenId4VCI: 'VC_DOWNLOADED_FROM_OPENID4VCI';
     setDownloadedVc: 'VC_DOWNLOADED';
     setDownloadingFailedVcs: 'DOWNLOAD_LIMIT_EXPIRED';
@@ -43,12 +51,17 @@ export interface Typegen0 {
     setReceivedVcs: 'STORE_RESPONSE';
     setTamperedVcs: 'TAMPERED_VC';
     setUpdatedVcMetadatas: 'VC_METADATA_UPDATED';
+    setVerificationErrorMessage: 'VERIFY_VC_FAILED';
     setWalletBindingSuccess: 'WALLET_BINDING_SUCCESS';
     updateMyVcs: 'VC_METADATA_UPDATED';
   };
   eventsCausingDelays: {};
-  eventsCausingGuards: {};
-  eventsCausingServices: {};
+  eventsCausingGuards: {
+    isSignedIn: 'done.invoke.vc.tamperedVCs.triggerAutoBackupForTamperedVcDeletion:invocation[0]';
+  };
+  eventsCausingServices: {
+    isUserSignedAlready: 'REMOVE_TAMPERED_VCS';
+  };
   matchesStates:
     | 'deletingFailedVcs'
     | 'init'
@@ -62,6 +75,8 @@ export interface Typegen0 {
     | 'ready.receivedVcs.idle'
     | 'ready.receivedVcs.refreshing'
     | 'tamperedVCs'
+    | 'tamperedVCs.refreshVcsMetadata'
+    | 'tamperedVCs.triggerAutoBackupForTamperedVcDeletion'
     | {
         init?: 'myVcs' | 'receivedVcs';
         ready?:
@@ -71,6 +86,9 @@ export interface Typegen0 {
               myVcs?: 'idle' | 'refreshing';
               receivedVcs?: 'idle' | 'refreshing';
             };
+        tamperedVCs?:
+          | 'refreshVcsMetadata'
+          | 'triggerAutoBackupForTamperedVcDeletion';
       };
   tags: never;
 }
diff --git a/machines/app.ts b/machines/app.ts
index b635788ba4..d1f9d5c10a 100644
--- a/machines/app.ts
+++ b/machines/app.ts
@@ -29,7 +29,7 @@ import {backupMachine, createBackupMachine} from './backupAndRestore/backup';
 import {
   backupRestoreMachine,
   createBackupRestoreMachine,
-} from './backupRestore';
+} from './backupAndRestore/backupRestore';
 
 const model = createModel(
   {
diff --git a/machines/backupAndRestore/backup.ts b/machines/backupAndRestore/backup.ts
index 292c17aee3..a35ae5d45b 100644
--- a/machines/backupAndRestore/backup.ts
+++ b/machines/backupAndRestore/backup.ts
@@ -2,17 +2,20 @@ import {EventFrom, StateFrom, send} from 'xstate';
 import {createModel} from 'xstate/lib/model';
 import {AppServices} from '../../shared/GlobalContext';
 import {
+  IOS_SIGNIN_FAILED,
   LAST_BACKUP_DETAILS,
   MY_VCS_STORE_KEY,
   NETWORK_REQUEST_FAILED,
   TECHNICAL_ERROR,
   UPLOAD_MAX_RETRY,
+  isIOS,
 } from '../../shared/constants';
 import {
+  cleanupLocalBackups,
   compressAndRemoveFile,
   writeToBackupFile,
 } from '../../shared/fileStorage';
-import Cloud from '../../shared/googleCloudUtils';
+import Cloud from '../../shared/CloudBackupAndRestoreUtils';
 import {isMinimumLimitForBackupReached} from '../../shared/storage';
 import {TelemetryConstants} from '../../shared/telemetry/TelemetryConstants';
 import {
@@ -39,8 +42,6 @@ const model = createModel(
   {
     events: {
       DATA_BACKUP: (isAutoBackUp: boolean) => ({isAutoBackUp}),
-      OK: () => ({}),
-      FETCH_DATA: () => ({}),
       DISMISS: () => ({}),
       LAST_BACKUP_DETAILS: () => ({}),
       STORE_RESPONSE: (response: unknown) => ({response}),
@@ -68,13 +69,18 @@ export const backupMachine = model.createMachine(
         actions: ['setIsAutoBackup'],
         target: 'backingUp',
       },
-      LAST_BACKUP_DETAILS: {
-        target: 'fetchLastBackupDetails',
-      },
+      LAST_BACKUP_DETAILS: [
+        {
+          cond: 'isIOS',
+          target: 'fetchLastBackupDetails.checkCloud',
+        },
+        {target: 'fetchLastBackupDetails.checkStore'},
+      ],
     },
     states: {
       init: {},
       fetchLastBackupDetails: {
+        entry: ['unsetLastBackupDetails', 'setIsLoading'],
         initial: 'checkStore',
         states: {
           checkStore: {
@@ -173,11 +179,11 @@ export const backupMachine = model.createMachine(
               STORE_ERROR: [
                 {
                   cond: 'checkIfAutoBackup',
-                  actions: ['setBackUpNotPossible'],
+                  actions: ['setBackupErrorReason'],
                   target: 'silentFailure',
                 },
                 {
-                  actions: ['setBackUpNotPossible'],
+                  actions: ['setBackupErrorReason'],
                   target: 'failure',
                 },
               ],
@@ -242,31 +248,27 @@ export const backupMachine = model.createMachine(
             },
           },
           success: {
-            entry: 'sendDataBackupSuccessEvent',
+            entry: [
+              'unsetShowBackupInProgress',
+              'sendDataBackupSuccessEvent',
+              'cleanupFiles',
+            ],
           },
           silentSuccess: {
-            entry: 'sendDataBackupSuccessEvent',
+            entry: ['sendDataBackupSuccessEvent', 'cleanupFiles'],
           },
           failure: {
             entry: [
+              'unsetShowBackupInProgress',
               'sendDataBackupFailureEvent',
-              (ctx, event) => console.log('failure state ', event),
+              'cleanupFiles',
             ],
           },
           silentFailure: {
-            entry: [
-              'sendDataBackupFailureEvent',
-              (ctx, event) => console.log('failure state ', event),
-            ],
+            entry: ['sendDataBackupFailureEvent', 'cleanupFiles'],
           },
         },
         on: {
-          FETCH_DATA: {
-            target: '.checkStorageAvailability',
-          },
-          OK: {
-            target: '.idle',
-          },
           DISMISS: {
             target: 'init',
           },
@@ -276,12 +278,12 @@ export const backupMachine = model.createMachine(
   },
   {
     actions: {
-      setIsLoading: model.assign({
-        isLoading: true,
-      }),
       unsetIsLoading: model.assign({
         isLoading: false,
       }),
+      setIsLoading: model.assign({
+        isLoading: true,
+      }),
       setDataFromStorage: model.assign({
         dataFromStorage: (_context, event) => {
           return event.response;
@@ -328,6 +330,12 @@ export const backupMachine = model.createMachine(
           lastBackupDetails: lastBackupDetails,
         };
       }),
+      unsetLastBackupDetails: model.assign((context, event) => {
+        return {
+          ...context,
+          lastBackupDetails: null,
+        };
+      }),
 
       storeLastBackupDetails: send(
         context => {
@@ -359,8 +367,9 @@ export const backupMachine = model.createMachine(
           const reasons = {
             [TECHNICAL_ERROR]: 'technicalError',
             [NETWORK_REQUEST_FAILED]: 'networkError',
+            [IOS_SIGNIN_FAILED]: 'iCloudSignInError',
           };
-          return reasons[event.data.error] || reasons[TECHNICAL_ERROR];
+          return reasons[event.data?.error] || reasons[TECHNICAL_ERROR];
         },
       }),
 
@@ -384,6 +393,9 @@ export const backupMachine = model.createMachine(
           ),
         );
       },
+      cleanupFiles: () => {
+        cleanupLocalBackups();
+      },
 
       sendDataBackupFailureEvent: () => {
         sendEndEvent(
@@ -437,8 +449,9 @@ export const backupMachine = model.createMachine(
         return context.isAutoBackUp;
       },
       isVCFound: (_context, event) => {
-        return event.response && event.response.length > 0;
+        return !!(event.response && (event.response as object[]).length > 0);
       },
+      isIOS: () => isIOS() || false,
       isDataAvailableInStorage: (_context, event) => {
         return event.response != null;
       },
@@ -461,21 +474,12 @@ export function selectIsBackupInprogress(state: State) {
     !state.matches('backingUp.silentFailure')
   );
 }
-export function selectIsBackingUp(state: State) {
-  return state.matches('backingUp');
-}
 export function selectIsLoading(state: State) {
   return state.context.isLoading;
 }
 export function selectIsBackingUpSuccess(state: State) {
   return state.matches('backingUp.success');
 }
-export function selectIsFetchingLastBackupDetails(state: State) {
-  return state.matches('fetchLastBackupDetails');
-}
-export function selectIsCheckingDataAvailabilityForBackup(state: State) {
-  return state.matches('backingUp.checkDataAvailabilityForBackup');
-}
 export function selectIsBackingUpFailure(state: State) {
   return state.matches('backingUp.failure');
 }
diff --git a/machines/backupAndRestore/backup.typegen.ts b/machines/backupAndRestore/backup.typegen.ts
index 80dc19b875..1a3bbc9ce8 100644
--- a/machines/backupAndRestore/backup.typegen.ts
+++ b/machines/backupAndRestore/backup.typegen.ts
@@ -1,66 +1,163 @@
+// This file was automatically generated. Edits will be overwritten
 
-  // This file was automatically generated. Edits will be overwritten
-
-  export interface Typegen0 {
-        '@@xstate/typegen': true;
-        internalEvents: {
-          "done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]": { type: "done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
-"done.invoke.backup.backingUp.uploadBackupFile:invocation[0]": { type: "done.invoke.backup.backingUp.uploadBackupFile:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
-"done.invoke.backup.backingUp.zipBackupFile:invocation[0]": { type: "done.invoke.backup.backingUp.zipBackupFile:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
-"done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]": { type: "done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
-"error.platform.backup.backingUp.checkStorageAvailability:invocation[0]": { type: "error.platform.backup.backingUp.checkStorageAvailability:invocation[0]"; data: unknown };
-"error.platform.backup.backingUp.uploadBackupFile:invocation[0]": { type: "error.platform.backup.backingUp.uploadBackupFile:invocation[0]"; data: unknown };
-"error.platform.backup.backingUp.zipBackupFile:invocation[0]": { type: "error.platform.backup.backingUp.zipBackupFile:invocation[0]"; data: unknown };
-"error.platform.backup.fetchLastBackupDetails.checkCloud:invocation[0]": { type: "error.platform.backup.fetchLastBackupDetails.checkCloud:invocation[0]"; data: unknown };
-"xstate.init": { type: "xstate.init" };
-        };
-        invokeSrcNameMap: {
-          "checkStorageAvailability": "done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]";
-"getLastBackupDetailsFromCloud": "done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]";
-"uploadBackupFile": "done.invoke.backup.backingUp.uploadBackupFile:invocation[0]";
-"writeDataToFile": "done.invoke.backup.backingUp.writeDataToFile:invocation[0]";
-"zipBackupFile": "done.invoke.backup.backingUp.zipBackupFile:invocation[0]";
-        };
-        missingImplementations: {
-          actions: never;
-          delays: never;
-          guards: never;
-          services: never;
-        };
-        eventsCausingActions: {
-          "extractLastBackupDetails": "done.invoke.backup.backingUp.uploadBackupFile:invocation[0]";
-"fetchAllDataFromDB": "done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]";
-"getLastBackupDetailsFromStore": "LAST_BACKUP_DETAILS";
-"loadVcs": "DATA_BACKUP";
-"sendDataBackupFailureEvent": "STORE_ERROR" | "STORE_RESPONSE" | "done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]" | "error.platform.backup.backingUp.checkStorageAvailability:invocation[0]" | "error.platform.backup.backingUp.uploadBackupFile:invocation[0]" | "error.platform.backup.backingUp.zipBackupFile:invocation[0]";
-"sendDataBackupStartEvent": "DATA_BACKUP";
-"sendDataBackupSuccessEvent": "STORE_RESPONSE";
-"setBackUpNotPossible": "STORE_ERROR" | "STORE_RESPONSE" | "error.platform.backup.backingUp.checkStorageAvailability:invocation[0]";
-"setBackupErrorReason": "error.platform.backup.backingUp.uploadBackupFile:invocation[0]";
-"setDataFromStorage": "STORE_RESPONSE";
-"setErrorReasonAsStorageLimitReached": "done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]";
-"setFileName": "FILE_NAME";
-"setLastBackupDetails": "STORE_RESPONSE" | "done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]";
-"storeLastBackupDetails": "STORE_RESPONSE" | "done.invoke.backup.backingUp.uploadBackupFile:invocation[0]";
-"unsetIsLoading": "STORE_RESPONSE" | "done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]" | "error.platform.backup.fetchLastBackupDetails.checkCloud:invocation[0]";
-        };
-        eventsCausingDelays: {
-          
-        };
-        eventsCausingGuards: {
-          "isDataAvailableInStorage": "STORE_RESPONSE";
-"isMinimumStorageRequiredForBackupReached": "done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]";
-"isVCFound": "STORE_RESPONSE";
-        };
-        eventsCausingServices: {
-          "checkStorageAvailability": "FETCH_DATA" | "STORE_RESPONSE";
-"getLastBackupDetailsFromCloud": "STORE_ERROR" | "STORE_RESPONSE";
-"uploadBackupFile": "done.invoke.backup.backingUp.zipBackupFile:invocation[0]";
-"writeDataToFile": "STORE_RESPONSE";
-"zipBackupFile": "FILE_NAME";
-        };
-        matchesStates: "backingUp" | "backingUp.checkDataAvailabilityForBackup" | "backingUp.checkStorageAvailability" | "backingUp.failure" | "backingUp.fetchDataFromDB" | "backingUp.idle" | "backingUp.success" | "backingUp.uploadBackupFile" | "backingUp.writeDataToFile" | "backingUp.zipBackupFile" | "fetchLastBackupDetails" | "fetchLastBackupDetails.checkCloud" | "fetchLastBackupDetails.checkStore" | "init" | { "backingUp"?: "checkDataAvailabilityForBackup" | "checkStorageAvailability" | "failure" | "fetchDataFromDB" | "idle" | "success" | "uploadBackupFile" | "writeDataToFile" | "zipBackupFile";
-"fetchLastBackupDetails"?: "checkCloud" | "checkStore"; };
-        tags: never;
-      }
-  
\ No newline at end of file
+export interface Typegen0 {
+  '@@xstate/typegen': true;
+  internalEvents: {
+    'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]': {
+      type: 'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
+    'done.invoke.backup.backingUp.uploadBackupFile:invocation[0]': {
+      type: 'done.invoke.backup.backingUp.uploadBackupFile:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
+    'done.invoke.backup.backingUp.zipBackupFile:invocation[0]': {
+      type: 'done.invoke.backup.backingUp.zipBackupFile:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
+    'done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]': {
+      type: 'done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
+    'error.platform.backup.backingUp.checkStorageAvailability:invocation[0]': {
+      type: 'error.platform.backup.backingUp.checkStorageAvailability:invocation[0]';
+      data: unknown;
+    };
+    'error.platform.backup.backingUp.uploadBackupFile:invocation[0]': {
+      type: 'error.platform.backup.backingUp.uploadBackupFile:invocation[0]';
+      data: unknown;
+    };
+    'error.platform.backup.backingUp.zipBackupFile:invocation[0]': {
+      type: 'error.platform.backup.backingUp.zipBackupFile:invocation[0]';
+      data: unknown;
+    };
+    'error.platform.backup.fetchLastBackupDetails.checkCloud:invocation[0]': {
+      type: 'error.platform.backup.fetchLastBackupDetails.checkCloud:invocation[0]';
+      data: unknown;
+    };
+    'xstate.init': {type: 'xstate.init'};
+  };
+  invokeSrcNameMap: {
+    checkStorageAvailability: 'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]';
+    getLastBackupDetailsFromCloud: 'done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]';
+    uploadBackupFile: 'done.invoke.backup.backingUp.uploadBackupFile:invocation[0]';
+    writeDataToFile: 'done.invoke.backup.backingUp.writeDataToFile:invocation[0]';
+    zipBackupFile: 'done.invoke.backup.backingUp.zipBackupFile:invocation[0]';
+  };
+  missingImplementations: {
+    actions: 'unsetShowBackupInProgress';
+    delays: never;
+    guards: never;
+    services: never;
+  };
+  eventsCausingActions: {
+    cleanupFiles:
+      | 'STORE_ERROR'
+      | 'STORE_RESPONSE'
+      | 'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backup.backingUp.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backup.backingUp.uploadBackupFile:invocation[0]'
+      | 'error.platform.backup.backingUp.zipBackupFile:invocation[0]';
+    extractLastBackupDetails: 'done.invoke.backup.backingUp.uploadBackupFile:invocation[0]';
+    fetchAllDataFromDB: 'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]';
+    getLastBackupDetailsFromStore: 'LAST_BACKUP_DETAILS';
+    loadVcs: 'DATA_BACKUP';
+    sendDataBackupFailureEvent:
+      | 'STORE_ERROR'
+      | 'STORE_RESPONSE'
+      | 'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backup.backingUp.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backup.backingUp.uploadBackupFile:invocation[0]'
+      | 'error.platform.backup.backingUp.zipBackupFile:invocation[0]';
+    sendDataBackupStartEvent: 'DATA_BACKUP';
+    sendDataBackupSuccessEvent: 'STORE_RESPONSE';
+    setBackUpNotPossible:
+      | 'STORE_RESPONSE'
+      | 'error.platform.backup.backingUp.checkStorageAvailability:invocation[0]';
+    setBackupErrorReason:
+      | 'STORE_ERROR'
+      | 'error.platform.backup.backingUp.uploadBackupFile:invocation[0]';
+    setDataFromStorage: 'STORE_RESPONSE';
+    setErrorReasonAsStorageLimitReached: 'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]';
+    setFileName: 'FILE_NAME';
+    setIsAutoBackup: 'DATA_BACKUP';
+    setIsLoading: 'LAST_BACKUP_DETAILS';
+    setLastBackupDetails:
+      | 'STORE_RESPONSE'
+      | 'done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]';
+    storeLastBackupDetails: 'done.invoke.backup.backingUp.uploadBackupFile:invocation[0]';
+    unsetIsLoading:
+      | 'STORE_RESPONSE'
+      | 'done.invoke.backup.fetchLastBackupDetails.checkCloud:invocation[0]'
+      | 'error.platform.backup.fetchLastBackupDetails.checkCloud:invocation[0]';
+    unsetLastBackupDetails: 'LAST_BACKUP_DETAILS';
+    unsetShowBackupInProgress:
+      | 'STORE_ERROR'
+      | 'STORE_RESPONSE'
+      | 'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backup.backingUp.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backup.backingUp.uploadBackupFile:invocation[0]'
+      | 'error.platform.backup.backingUp.zipBackupFile:invocation[0]';
+  };
+  eventsCausingDelays: {};
+  eventsCausingGuards: {
+    checkIfAutoBackup:
+      | 'STORE_ERROR'
+      | 'STORE_RESPONSE'
+      | 'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backup.backingUp.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backup.backingUp.uploadBackupFile:invocation[0]'
+      | 'error.platform.backup.backingUp.zipBackupFile:invocation[0]';
+    isDataAvailableInStorage: 'STORE_RESPONSE';
+    isIOS: 'LAST_BACKUP_DETAILS';
+    isMinimumStorageRequiredForBackupAvailable: 'done.invoke.backup.backingUp.checkStorageAvailability:invocation[0]';
+    isVCFound: 'STORE_RESPONSE';
+  };
+  eventsCausingServices: {
+    checkStorageAvailability: 'STORE_RESPONSE';
+    getLastBackupDetailsFromCloud:
+      | 'LAST_BACKUP_DETAILS'
+      | 'STORE_ERROR'
+      | 'STORE_RESPONSE';
+    uploadBackupFile: 'done.invoke.backup.backingUp.zipBackupFile:invocation[0]';
+    writeDataToFile: 'STORE_RESPONSE';
+    zipBackupFile: 'FILE_NAME';
+  };
+  matchesStates:
+    | 'backingUp'
+    | 'backingUp.checkDataAvailabilityForBackup'
+    | 'backingUp.checkStorageAvailability'
+    | 'backingUp.failure'
+    | 'backingUp.fetchDataFromDB'
+    | 'backingUp.idle'
+    | 'backingUp.silentFailure'
+    | 'backingUp.silentSuccess'
+    | 'backingUp.success'
+    | 'backingUp.uploadBackupFile'
+    | 'backingUp.writeDataToFile'
+    | 'backingUp.zipBackupFile'
+    | 'fetchLastBackupDetails'
+    | 'fetchLastBackupDetails.checkCloud'
+    | 'fetchLastBackupDetails.checkStore'
+    | 'init'
+    | {
+        backingUp?:
+          | 'checkDataAvailabilityForBackup'
+          | 'checkStorageAvailability'
+          | 'failure'
+          | 'fetchDataFromDB'
+          | 'idle'
+          | 'silentFailure'
+          | 'silentSuccess'
+          | 'success'
+          | 'uploadBackupFile'
+          | 'writeDataToFile'
+          | 'zipBackupFile';
+        fetchLastBackupDetails?: 'checkCloud' | 'checkStore';
+      };
+  tags: never;
+}
diff --git a/machines/backupAndRestore/backupAndRestoreSetup.ts b/machines/backupAndRestore/backupAndRestoreSetup.ts
index 099fc99f5d..f180ff28a8 100644
--- a/machines/backupAndRestore/backupAndRestoreSetup.ts
+++ b/machines/backupAndRestore/backupAndRestoreSetup.ts
@@ -1,14 +1,20 @@
-import {EventFrom, StateFrom} from 'xstate';
+import NetInfo from '@react-native-community/netinfo';
+import {EventFrom, StateFrom, send} from 'xstate';
 import {createModel} from 'xstate/lib/model';
 import {AppServices} from '../../shared/GlobalContext';
+import {
+  NETWORK_REQUEST_FAILED,
+  SETTINGS_STORE_KEY,
+  isIOS,
+} from '../../shared/constants';
 import Cloud, {
+  IsIOSResult,
   ProfileInfo,
   SignInResult,
   isSignedInResult,
-} from '../../shared/googleCloudUtils';
-import NetInfo from '@react-native-community/netinfo';
+} from '../../shared/CloudBackupAndRestoreUtils';
 import {ErrorMessage} from '../../shared/openId4VCI/Utils';
-import {NETWORK_REQUEST_FAILED} from '../../shared/constants';
+import {TelemetryConstants} from '../../shared/telemetry/TelemetryConstants';
 import {
   getEndEventData,
   getErrorEventData,
@@ -19,13 +25,17 @@ import {
   sendImpressionEvent,
   sendStartEvent,
 } from '../../shared/telemetry/TelemetryUtils';
-import {TelemetryConstants} from '../../shared/telemetry/TelemetryConstants';
+import {SettingsEvents} from '../settings';
+import {StoreEvents} from '../store';
+import {Linking} from 'react-native';
 
 const model = createModel(
   {
     isLoading: false as boolean,
     profileInfo: undefined as ProfileInfo | undefined,
     errorMessage: '' as string,
+    serviceRefs: {} as AppServices,
+    showConfirmation: false as boolean,
     shouldTriggerAutoBackup: false as boolean,
   },
   {
@@ -34,7 +44,9 @@ const model = createModel(
       PROCEED: () => ({}),
       GO_BACK: () => ({}),
       TRY_AGAIN: () => ({}),
+      OPEN_SETTINGS: () => ({}),
       DISMISS: () => ({}),
+      STORE_RESPONSE: (response: unknown) => ({response}),
     },
   },
 );
@@ -50,21 +62,54 @@ export const backupAndRestoreSetupMachine = model.createMachine(
       context: model.initialContext,
       events: {} as EventFrom<typeof model>,
     },
-    id: 'backupAndRestore',
+    id: 'backupAndRestoreSetup',
     initial: 'init',
     states: {
       init: {
         on: {
           HANDLE_BACKUP_AND_RESTORE: {
             actions: [
-              'sendDataBackupAndRestoreSetupStartEvent',
               'setIsLoading',
               'unsetShouldTriggerAutoBackup',
+              'sendDataBackupAndRestoreSetupStartEvent',
             ],
-            target: 'checkSignIn',
+            target: 'fetchShowConfirmationInfo',
           },
         },
       },
+      fetchShowConfirmationInfo: {
+        /*TODO: Check if this call to store can be replaced by settings machine itself
+         *This would avoid extra read calls to storage
+         */
+        entry: 'fetchShowConfirmationInfo',
+        on: {
+          STORE_RESPONSE: [
+            {
+              cond: 'isConfirmationAlreadyShown',
+              actions: 'setShowConfirmation',
+              target: 'checkSignIn',
+            },
+            {
+              actions: ['unsetIsLoading', 'setShowConfirmation'],
+              target: 'selectCloudAccount',
+            },
+          ],
+        },
+      },
+      selectCloudAccount: {
+        on: {
+          GO_BACK: {
+            actions: 'sendBackupAndRestoreSetupCancelEvent',
+            target: 'init',
+          },
+          PROCEED: [
+            {
+              actions: 'setIsLoading',
+              target: 'checkSignIn',
+            },
+          ],
+        },
+      },
       checkSignIn: {
         invoke: {
           src: 'isUserSignedAlready',
@@ -79,24 +124,38 @@ export const backupAndRestoreSetupMachine = model.createMachine(
               actions: ['unsetIsLoading'],
               target: 'noInternet',
             },
+            //todo: Check flow
+            {
+              cond: 'isNotSignedInIOSAndViaConfirmationFlow',
+              actions: ['unsetIsLoading', 'setErrorReasonAsAccountRequired'],
+              target: '.error',
+            },
+            {
+              cond: 'isNotSignedInIOS',
+              actions: ['unsetIsLoading', 'setErrorReasonAsAccountRequired'],
+              target: '.error',
+            },
             {
               actions: ['unsetIsLoading'],
-              target: 'selectCloudAccount',
+              target: 'signIn',
             },
           ],
         },
-      },
-      selectCloudAccount: {
-        on: {
-          PROCEED: {
-            target: 'checkInternet',
-          },
-          GO_BACK: {
-            actions: 'sendBackupAndRestoreSetupCancelEvent',
-            target: 'init',
+        states: {
+          error: {
+            entry: 'unsetIsLoading',
+            on: {
+              GO_BACK: {
+                actions: 'sendBackupAndRestoreSetupCancelEvent',
+                target: '#backupAndRestoreSetup.init',
+              },
+              OPEN_SETTINGS: {
+                actions: 'openSettings',
+                target: '#backupAndRestoreSetup.init',
+              },
+            },
           },
         },
-        states: {},
       },
       checkInternet: {
         invoke: {
@@ -139,6 +198,12 @@ export const backupAndRestoreSetupMachine = model.createMachine(
               actions: ['setProfileInfo', 'setShouldTriggerAutoBackup'],
               target: 'backupAndRestore',
             },
+            // isIOS not required as we dont reach sign in state itself
+            {
+              cond: 'isIOS',
+              target: 'backupAndRestore',
+            },
+            // What if sign in fails due to n/w error?
             {
               actions: 'sendBackupAndRestoreSetupErrorEvent',
               target: '.error',
@@ -152,15 +217,18 @@ export const backupAndRestoreSetupMachine = model.createMachine(
             on: {
               GO_BACK: {
                 actions: 'sendBackupAndRestoreSetupCancelEvent',
-                target: '#backupAndRestore.init',
+                target: '#backupAndRestoreSetup.init',
               },
-              TRY_AGAIN: '#backupAndRestore.signIn',
+              TRY_AGAIN: '#backupAndRestoreSetup.signIn',
             },
           },
         },
       },
       backupAndRestore: {
-        entry: 'sendBackupAndRestoreSetupSuccessEvent',
+        entry: [
+          'sendBackupAndRestoreSetupSuccessEvent',
+          'setAccountSelectionConfirmationShown',
+        ],
         on: {GO_BACK: 'init'},
       },
     },
@@ -174,7 +242,7 @@ export const backupAndRestoreSetupMachine = model.createMachine(
         isLoading: false,
       }),
       setProfileInfo: model.assign({
-        profileInfo: (_context, event) => event.data.profileInfo,
+        profileInfo: (_context, event) => event.data?.profileInfo,
       }),
       setNoInternet: model.assign({
         errorMessage: () => ErrorMessage.NO_INTERNET,
@@ -221,12 +289,28 @@ export const backupAndRestoreSetupMachine = model.createMachine(
           ),
         );
       },
+      setShowConfirmation: model.assign({
+        showConfirmation: (_context, event) =>
+          !event.response.isAccountSelectionConfirmationShown || false,
+      }),
+      setErrorReasonAsAccountRequired: model.assign({
+        errorMessage: 'noAccountAvailable',
+      }),
+      setAccountSelectionConfirmationShown: send(
+        () => SettingsEvents.SHOWN_ACCOUNT_SELECTION_CONFIRMATION(),
+        {to: context => context.serviceRefs.settings},
+      ),
+      fetchShowConfirmationInfo: send(
+        () => StoreEvents.GET(SETTINGS_STORE_KEY),
+        {to: context => context.serviceRefs.store},
+      ),
       setShouldTriggerAutoBackup: model.assign({
         shouldTriggerAutoBackup: true,
       }),
       unsetShouldTriggerAutoBackup: model.assign({
         shouldTriggerAutoBackup: false,
       }),
+      openSettings: () => Linking.openURL('App-Prefs:CASTLE'),
     },
 
     services: {
@@ -244,8 +328,26 @@ export const backupAndRestoreSetupMachine = model.createMachine(
       isNetworkError: (_, event) => event.data.error === NETWORK_REQUEST_FAILED,
       isSignedIn: (_context, event) =>
         (event.data as isSignedInResult).isSignedIn,
+      isNotSignedInIOS: (_context, event) => {
+        return !(event.data as isSignedInResult).isSignedIn && isIOS();
+      },
+      isNotSignedInIOSAndViaConfirmationFlow: (context, event) => {
+        return (
+          context.showConfirmation &&
+          !(event.data as isSignedInResult).isSignedIn &&
+          isIOS()
+        );
+      },
+      isConfirmationAlreadyShown: (_context, event) => {
+        return (
+          (event.response as Object)['encryptedData'][
+            'isAccountSelectionConfirmationShown'
+          ] || false
+        );
+      },
       isSignInSuccessful: (_context, event) =>
         (event.data as SignInResult).status === Cloud.status.SUCCESS,
+      isIOS: (_context, event) => (event.data as IsIOSResult).isIOS || false,
     },
   },
 );
@@ -253,6 +355,7 @@ export const backupAndRestoreSetupMachine = model.createMachine(
 export function createBackupAndRestoreSetupMachine(serviceRefs: AppServices) {
   return backupAndRestoreSetupMachine.withContext({
     ...backupAndRestoreSetupMachine.context,
+    serviceRefs,
   });
 }
 export function selectIsLoading(state: State) {
@@ -284,7 +387,7 @@ export function selectIsSigningInSuccessful(state: State) {
 }
 
 export function selectIsSigningFailure(state: State) {
-  return state.matches('signIn.error');
+  return state.matches('signIn.error') || state.matches('checkSignIn.error');
 }
 
 type State = StateFrom<typeof backupAndRestoreSetupMachine>;
diff --git a/machines/backupAndRestore/backupAndRestoreSetup.typegen.ts b/machines/backupAndRestore/backupAndRestoreSetup.typegen.ts
index 6c387052ca..138b49f299 100644
--- a/machines/backupAndRestore/backupAndRestoreSetup.typegen.ts
+++ b/machines/backupAndRestore/backupAndRestoreSetup.typegen.ts
@@ -1,50 +1,92 @@
+// This file was automatically generated. Edits will be overwritten
 
-  // This file was automatically generated. Edits will be overwritten
-
-  export interface Typegen0 {
-        '@@xstate/typegen': true;
-        internalEvents: {
-          "done.invoke.backupAndRestore.checkInternet:invocation[0]": { type: "done.invoke.backupAndRestore.checkInternet:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
-"done.invoke.backupAndRestore.checkSignIn:invocation[0]": { type: "done.invoke.backupAndRestore.checkSignIn:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
-"done.invoke.signIn:invocation[0]": { type: "done.invoke.signIn:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
-"xstate.init": { type: "xstate.init" };
-        };
-        invokeSrcNameMap: {
-          "checkInternet": "done.invoke.backupAndRestore.checkInternet:invocation[0]";
-"isUserSignedAlready": "done.invoke.backupAndRestore.checkSignIn:invocation[0]";
-"signIn": "done.invoke.signIn:invocation[0]";
-        };
-        missingImplementations: {
-          actions: "sendBackupAndRestoreSetupCancelEvent" | "sendBackupAndRestoreSetupErrorEvent" | "sendBackupAndRestoreSetupSuccessEvent" | "setShouldTriggerAutoBackup";
-          delays: never;
-          guards: never;
-          services: never;
-        };
-        eventsCausingActions: {
-          "sendBackupAndRestoreSetupCancelEvent": "DISMISS" | "GO_BACK";
-"sendBackupAndRestoreSetupErrorEvent": "done.invoke.signIn:invocation[0]";
-"sendBackupAndRestoreSetupSuccessEvent": "done.invoke.backupAndRestore.checkSignIn:invocation[0]" | "done.invoke.signIn:invocation[0]";
-"setIsLoading": "HANDLE_BACKUP_AND_RESTORE";
-"setNoInternet": "done.invoke.backupAndRestore.checkInternet:invocation[0]";
-"setProfileInfo": "done.invoke.backupAndRestore.checkSignIn:invocation[0]" | "done.invoke.signIn:invocation[0]";
-"setShouldTriggerAutoBackup": "done.invoke.signIn:invocation[0]";
-"unsetIsLoading": "DISMISS" | "done.invoke.backupAndRestore.checkSignIn:invocation[0]";
-        };
-        eventsCausingDelays: {
-          
-        };
-        eventsCausingGuards: {
-          "isInternetConnected": "done.invoke.backupAndRestore.checkInternet:invocation[0]";
-"isNetworkError": "done.invoke.backupAndRestore.checkSignIn:invocation[0]";
-"isSignInSuccessful": "done.invoke.signIn:invocation[0]";
-"isSignedIn": "done.invoke.backupAndRestore.checkSignIn:invocation[0]";
-        };
-        eventsCausingServices: {
-          "checkInternet": "PROCEED" | "TRY_AGAIN";
-"isUserSignedAlready": "HANDLE_BACKUP_AND_RESTORE";
-"signIn": "done.invoke.backupAndRestore.checkInternet:invocation[0]";
-        };
-        matchesStates: "backupAndRestore" | "checkInternet" | "checkSignIn" | "init" | "noInternet" | "selectCloudAccount" | "signIn" | "signIn.error" | "signIn.idle" | { "signIn"?: "error" | "idle"; };
-        tags: never;
-      }
-  
\ No newline at end of file
+export interface Typegen0 {
+  '@@xstate/typegen': true;
+  internalEvents: {
+    'done.invoke.backupAndRestoreSetup.checkInternet:invocation[0]': {
+      type: 'done.invoke.backupAndRestoreSetup.checkInternet:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
+    'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]': {
+      type: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
+    'done.invoke.signIn:invocation[0]': {
+      type: 'done.invoke.signIn:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
+    'xstate.init': {type: 'xstate.init'};
+  };
+  invokeSrcNameMap: {
+    checkInternet: 'done.invoke.backupAndRestoreSetup.checkInternet:invocation[0]';
+    isUserSignedAlready: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
+    signIn: 'done.invoke.signIn:invocation[0]';
+  };
+  missingImplementations: {
+    actions: never;
+    delays: never;
+    guards: never;
+    services: never;
+  };
+  eventsCausingActions: {
+    fetchShowConfirmationInfo: 'HANDLE_BACKUP_AND_RESTORE';
+    openSettings: 'OPEN_SETTINGS';
+    sendBackupAndRestoreSetupCancelEvent: 'DISMISS' | 'GO_BACK';
+    sendBackupAndRestoreSetupErrorEvent: 'done.invoke.signIn:invocation[0]';
+    sendBackupAndRestoreSetupSuccessEvent:
+      | 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]'
+      | 'done.invoke.signIn:invocation[0]';
+    sendDataBackupAndRestoreSetupStartEvent: 'HANDLE_BACKUP_AND_RESTORE';
+    setAccountSelectionConfirmationShown:
+      | 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]'
+      | 'done.invoke.signIn:invocation[0]';
+    setErrorReasonAsAccountRequired: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
+    setIsLoading: 'HANDLE_BACKUP_AND_RESTORE' | 'PROCEED';
+    setNoInternet: 'done.invoke.backupAndRestoreSetup.checkInternet:invocation[0]';
+    setProfileInfo:
+      | 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]'
+      | 'done.invoke.signIn:invocation[0]';
+    setShouldTriggerAutoBackup: 'done.invoke.signIn:invocation[0]';
+    setShowConfirmation: 'STORE_RESPONSE';
+    unsetIsLoading:
+      | 'DISMISS'
+      | 'STORE_RESPONSE'
+      | 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
+    unsetShouldTriggerAutoBackup: 'HANDLE_BACKUP_AND_RESTORE';
+  };
+  eventsCausingDelays: {};
+  eventsCausingGuards: {
+    isConfirmationAlreadyShown: 'STORE_RESPONSE';
+    isIOS: 'done.invoke.signIn:invocation[0]';
+    isInternetConnected: 'done.invoke.backupAndRestoreSetup.checkInternet:invocation[0]';
+    isNetworkError: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
+    isNotSignedInIOS: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
+    isNotSignedInIOSAndViaConfirmationFlow: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
+    isSignInSuccessful: 'done.invoke.signIn:invocation[0]';
+    isSignedIn: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
+  };
+  eventsCausingServices: {
+    checkInternet: 'TRY_AGAIN';
+    isUserSignedAlready: 'PROCEED' | 'STORE_RESPONSE';
+    signIn:
+      | 'done.invoke.backupAndRestoreSetup.checkInternet:invocation[0]'
+      | 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
+  };
+  matchesStates:
+    | 'backupAndRestore'
+    | 'checkInternet'
+    | 'checkSignIn'
+    | 'checkSignIn.error'
+    | 'fetchShowConfirmationInfo'
+    | 'init'
+    | 'noInternet'
+    | 'selectCloudAccount'
+    | 'signIn'
+    | 'signIn.error'
+    | 'signIn.idle'
+    | {checkSignIn?: 'error'; signIn?: 'error' | 'idle'};
+  tags: never;
+}
diff --git a/machines/backupRestore.ts b/machines/backupAndRestore/backupRestore.ts
similarity index 64%
rename from machines/backupRestore.ts
rename to machines/backupAndRestore/backupRestore.ts
index eedb417541..d0e3acd5f3 100644
--- a/machines/backupRestore.ts
+++ b/machines/backupAndRestore/backupRestore.ts
@@ -1,15 +1,15 @@
 import {EventFrom, StateFrom, send} from 'xstate';
 import {createModel} from 'xstate/lib/model';
-import {AppServices} from '../shared/GlobalContext';
+import {AppServices} from '../../shared/GlobalContext';
 import fileStorage, {
-  backupDirectoryPath,
+  cleanupLocalBackups,
   getBackupFilePath,
   unZipAndRemoveFile,
-} from '../shared/fileStorage';
-import Storage from '../shared/storage';
-import {StoreEvents} from './store';
-import Cloud from '../shared/googleCloudUtils';
-import {TelemetryConstants} from '../shared/telemetry/TelemetryConstants';
+} from '../../shared/fileStorage';
+import Storage from '../../shared/storage';
+import {StoreEvents} from '../store';
+import Cloud from '../../shared/CloudBackupAndRestoreUtils';
+import {TelemetryConstants} from '../../shared/telemetry/TelemetryConstants';
 import {
   sendStartEvent,
   getStartEventData,
@@ -17,9 +17,9 @@ import {
   getImpressionEventData,
   sendEndEvent,
   getEndEventData,
-} from '../shared/telemetry/TelemetryUtils';
-import {VcEvents} from './VCItemMachine/vc';
-import {NETWORK_REQUEST_FAILED, TECHNICAL_ERROR} from '../shared/constants';
+} from '../../shared/telemetry/TelemetryUtils';
+import {VcEvents} from '../VCItemMachine/vc';
+import {NETWORK_REQUEST_FAILED, TECHNICAL_ERROR} from '../../shared/constants';
 
 const model = createModel(
   {
@@ -31,12 +31,11 @@ const model = createModel(
   {
     events: {
       BACKUP_RESTORE: () => ({}),
-      EXTRACT_DATA: () => ({}),
+      DOWNLOAD_UNSYNCED_BACKUP_FILES: () => ({}),
       DISMISS: () => ({}),
       STORE_RESPONSE: (response: unknown) => ({response}),
       STORE_ERROR: (error: Error, requester?: string) => ({error, requester}),
       DATA_FROM_FILE: (dataFromBackupFile: {}) => ({dataFromBackupFile}),
-      OK: () => ({}),
     },
   },
 );
@@ -45,6 +44,7 @@ export const BackupRestoreEvents = model.events;
 
 export const backupRestoreMachine = model.createMachine(
   {
+    /** @xstate-layout N4IgpgJg5mDOIC5QCMCGBjA1gVwA4CU4AXAewCcwBiAIQEEBhAaQFUAFAfXwFEBlAFQDy3ANoAGALqJQuErACWROSQB2UkAA9EAFgBMAGhABPRAA4AjADoAzDp0BOUVt0BWAGwB2d1ucBfHwbQsPEJYUgoLXAoAGxJUCEoIFTALOWUANxJMZMCcAmJyZMiwGLiEVIz0VEUVMXFatRl5atUkDUQrUXcLMy07dx1ndzMrMzNRE2cDYwQzHVErC1crdzcTLVce1xMdPwCMXJCw5NSFGgYWDm5+IS561saFJRbQTQRXfSN23W6tNd07KwTOx2My7EA5YL5cIUUIFaj7PCUASMO7SWSPFRqV59KamOxaCx2ZzrKxbdwmUSjExgiF5WHQqFgeFBXCUAAiAEkeABZLk8VEgB7NLHtPomCzrZyiTpDHQmClaXEIYF2CwTdyieyifEdMzuGkIulHCwwo7M3KULgADT4+AYfHYbNofFoAqFTxFyvcSrsJlV6s1Dh1lP1-nBhsOBRNjPNeAs6AAFmAsDwwqgYLQ0qg5FE5MgcwpDAkkil0plshHGdH6UzDfGkym0xmswX87miIYymXKs1am70cLWq9BjpCU5A-0tPMJkrnB01WszK5fvMOlY7AaWZGGTXY7h68nMKnyOmwJns7m24Xi8pjmWshZadvkqa4XXE4fj2RT+fWwWO12FRVE8fZmJI9wDh6Q6ICOY5TvYk7TpMnwzNKqogpqYzOD0zgmFYvhhk+VavhQe4WIkADuyglBAe4AGI5mAdFkCQAC29AxNg8SJLepYZA+RE1tWZp1pR1GxLRhoMVETEsexnEQIBJA9iBEj9k0UEvIgZjYZYZh2DongDPi2x6kqYyUhKojElo672LYgKbgcxExqJJBUTR9GMcxbEcSQXGUGAZAsWQERRFUABm5CsY+lZCSRtYsuR7niXEXkyT58n+Yp5TKcBNRqRIDSQZi0EzLp3QGUZzgmToZkoR4o7OHM8qAnY7yzNShFxcaCVkdgygAF5yLg6VUDxd78RWW4ubudYDcNo1SYxSkqQVdRFRBGmlVpMzAq4FiOB0riiMu2qneZ07WL0rVBroVhaE5kLxa5SULSNY2BcF5BhZF0WxTNL1zW9Q0fctMmrflyh9ptaLbc8bR7e1h22adp1Tg4rhKuYBI6e4J32H6sxmF1eyA71r25NGaXg1QTouuwdH4AI3KMxyAAytyw4KJUI68Oi2c4Fg6PhFKdNOJjeihYw9N0AvvEMFIjDs3Xk1GfV1jRbJVKgfAkNyYCseQRbXNwnC8KwAgAHI8Fz4FwxifOIHKvpqkuc7te4gK4Zd2GHa4mNDCdumuE9Rrq5TcZazresG0bZAm4IZtcPgzP4Opjuei74rmK4HseN7Jg+s4QvuDqtjjHMHShmTzlAyJSUQMUYBEIluRsnIZA3pN5YA3XFPA1TTcya3e4d2QkO9oV9s8-DnoPVolgnUSVjrg4RmKtLgZqt4oxewLp34X4YbKCQTfwK0glHMVc9lQAtFjKEP2Hz4RNEEk35nZW6OZS4LD0PRdCS1snnKwL8qwnCIJ-Qcu1F6agsBqGwfp1yOBBJdeBzUpRTm1HMPOG5Vb9wjoPPA0DNKI16EqJwCw3DEzqkSaywJwH1zfElOQEAZKkJ2ojQyQsdAbC9kuEmzUdKb2mH6IWsxjLkmwavGu4Y1Y7gblTD8jYTzNgvHmf80wHYwO4SsYW-CRgbAmHVYkxcFgbFsIAl2owwEEOegPJRcYxKeVpplPyXFOFOxmLYA6KwQR9C9vwouKFfQSPeLnEWAs5xMMcSwqm70losmkmALxno9TLmFuuAuCoTCuDzj6YE1hth53sr6fopN5GEMUfEuMFAabJMYmksqFdVSOFsuSWw+JLrDEWJqX47VDJlNiUQpx+5o5EF1vrQ2xtmm7T4c1awgIPDTi0EMRwPSLH9L9ArYZ9jw41NIqJZuo9DTjzmYjEYZdFg3UlgHCYy5LqGTVLYXQSx2r6TkVfUZtT9ywGwOgdAcAL46LIa8Uk9gEEeDGAM34WEnldG2LYewRIiRl0qd8w5bc4wRQvNgCgFzwXDGoQHPUlI5gDG8NjeY3R5h0ususykx8fBAA */
     predictableActionArguments: true,
     preserveActionOrder: true,
     tsTypes: {} as import('./backupRestore.typegen').Typegen0,
@@ -60,22 +60,17 @@ export const backupRestoreMachine = model.createMachine(
           target: 'restoreBackup',
         },
       ],
+      DOWNLOAD_UNSYNCED_BACKUP_FILES: {
+        actions: 'downloadUnsyncedBackupFiles',
+      },
     },
     states: {
-      init: {
-        on: {
-          BACKUP_RESTORE: [
-            {
-              target: 'restoreBackup',
-            },
-          ],
-        },
-      },
+      init: {},
       restoreBackup: {
-        initial: 'checkStorageAvailibility',
+        initial: 'checkStorageAvailability',
         states: {
           idle: {},
-          checkStorageAvailibility: {
+          checkStorageAvailability: {
             entry: ['sendDataRestoreStartEvent'],
             invoke: {
               src: 'checkStorageAvailability',
@@ -131,7 +126,8 @@ export const backupRestoreMachine = model.createMachine(
             entry: 'loadDataToMemory',
             on: {
               STORE_RESPONSE: {
-                target: 'deleteBackupDir',
+                actions: 'refreshVCs',
+                target: 'success',
               },
               STORE_ERROR: {
                 actions: 'setRestoreTechnicalError',
@@ -139,38 +135,32 @@ export const backupRestoreMachine = model.createMachine(
               },
             },
           },
-          deleteBackupDir: {
-            invoke: {
-              src: 'deleteBkpDir',
-              onDone: {
-                actions: 'refreshVCs',
-                target: 'success',
-              },
-            },
-          },
           success: {
-            entry: 'sendDataRestoreSuccessEvent',
+            entry: [
+              'unsetShowRestoreInProgress',
+              'sendDataRestoreSuccessEvent',
+              'cleanupFiles',
+            ],
           },
           failure: {
-            entry: 'sendDataRestoreFailureEvent',
+            entry: [
+              'unsetShowRestoreInProgress',
+              'sendDataRestoreFailureEvent',
+              'cleanupFiles',
+            ],
           },
         },
         on: {
-          OK: {
-            target: '.idle',
-          },
           DISMISS: {
             target: 'init',
           },
-          EXTRACT_DATA: {
-            target: '.checkStorageAvailibility',
-          },
         },
       },
     },
   },
   {
     actions: {
+      downloadUnsyncedBackupFiles: () => Cloud.downloadUnSyncedBackupFiles(),
       setRestoreTechnicalError: model.assign({
         errorReason: 'technicalError',
       }),
@@ -181,7 +171,7 @@ export const backupRestoreMachine = model.createMachine(
       setRestoreErrorReason: model.assign({
         errorReason: (_context, event) => {
           const reasons = {
-            'No backup file': 'noBackupFile',
+            [Cloud.NO_BACKUP_FILE]: 'noBackupFile',
             [NETWORK_REQUEST_FAILED]: 'networkError',
             [TECHNICAL_ERROR]: 'technicalError',
           };
@@ -204,6 +194,8 @@ export const backupRestoreMachine = model.createMachine(
           return event.dataFromBackupFile;
         },
       }),
+      cleanupFiles: () => cleanupLocalBackups(),
+
       sendDataRestoreStartEvent: () => {
         sendStartEvent(
           getStartEventData(TelemetryConstants.FlowType.dataRestore),
@@ -239,8 +231,6 @@ export const backupRestoreMachine = model.createMachine(
       checkStorageAvailability: () => async () => {
         return await Storage.isMinimumLimitReached('minStorageRequired');
       },
-      deleteBkpDir: () => async () =>
-        fileStorage.removeItem(backupDirectoryPath),
 
       downloadLatestBackup: () => async () => {
         const backupFileName = await Cloud.downloadLatestBackup();
@@ -254,6 +244,10 @@ export const backupRestoreMachine = model.createMachine(
         return await unZipAndRemoveFile(context.fileName);
       },
       readBackupFile: context => async callback => {
+        // trim extension
+        context.fileName = context.fileName.endsWith('.injibackup')
+          ? context.fileName.split('.injibackup')[0]
+          : context.fileName;
         const dataFromBackupFile = await fileStorage.readFile(
           getBackupFilePath(context.fileName),
         );
@@ -287,10 +281,14 @@ export function selectIsBackUpRestoring(state: State) {
 export function selectIsBackUpRestoreSuccess(state: State) {
   return state.matches('restoreBackup.success');
 }
-export function selectIsCheckStorageAvailibility(state: State) {
-  return state.matches('restoreBackup.checkStorageAvailibility');
-}
 export function selectIsBackUpRestoreFailure(state: State) {
   return state.matches('restoreBackup.failure');
 }
 type State = StateFrom<typeof backupRestoreMachine>;
+
+function getFileNameFromZIPfile(fileName: string): string {
+  if (fileName.endsWith('.zip')) {
+    return fileName.split('.zip')[0] + '.injibackup';
+  }
+  return fileName + '.injiBackup';
+}
diff --git a/machines/backupRestore.typegen.ts b/machines/backupAndRestore/backupRestore.typegen.ts
similarity index 72%
rename from machines/backupRestore.typegen.ts
rename to machines/backupAndRestore/backupRestore.typegen.ts
index 723680ec19..e15384917a 100644
--- a/machines/backupRestore.typegen.ts
+++ b/machines/backupAndRestore/backupRestore.typegen.ts
@@ -3,13 +3,8 @@
 export interface Typegen0 {
   '@@xstate/typegen': true;
   internalEvents: {
-    'done.invoke.backupRestore.restoreBackup.checkStorageAvailibility:invocation[0]': {
-      type: 'done.invoke.backupRestore.restoreBackup.checkStorageAvailibility:invocation[0]';
-      data: unknown;
-      __tip: 'See the XState TS docs to learn how to strongly type this.';
-    };
-    'done.invoke.backupRestore.restoreBackup.deleteBackupDir:invocation[0]': {
-      type: 'done.invoke.backupRestore.restoreBackup.deleteBackupDir:invocation[0]';
+    'done.invoke.backupRestore.restoreBackup.checkStorageAvailability:invocation[0]': {
+      type: 'done.invoke.backupRestore.restoreBackup.checkStorageAvailability:invocation[0]';
       data: unknown;
       __tip: 'See the XState TS docs to learn how to strongly type this.';
     };
@@ -34,28 +29,34 @@ export interface Typegen0 {
     'xstate.init': {type: 'xstate.init'};
   };
   invokeSrcNameMap: {
-    checkStorageAvailability: 'done.invoke.backupRestore.restoreBackup.checkStorageAvailibility:invocation[0]';
-    deleteBkpDir: 'done.invoke.backupRestore.restoreBackup.deleteBackupDir:invocation[0]';
+    checkStorageAvailability: 'done.invoke.backupRestore.restoreBackup.checkStorageAvailability:invocation[0]';
     downloadLatestBackup: 'done.invoke.backupRestore.restoreBackup.downloadBackupFileFromCloud:invocation[0]';
     readBackupFile: 'done.invoke.backupRestore.restoreBackup.readBackupFile:invocation[0]';
     unzipBackupFile: 'done.invoke.backupRestore.restoreBackup.unzipBackupFile:invocation[0]';
   };
   missingImplementations: {
-    actions: never;
+    actions: 'unsetShowRestoreInProgress';
     delays: never;
     guards: never;
     services: never;
   };
   eventsCausingActions: {
+    cleanupFiles:
+      | 'STORE_ERROR'
+      | 'STORE_RESPONSE'
+      | 'done.invoke.backupRestore.restoreBackup.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backupRestore.restoreBackup.downloadBackupFileFromCloud:invocation[0]'
+      | 'error.platform.backupRestore.restoreBackup.unzipBackupFile:invocation[0]';
+    downloadUnsyncedBackupFiles: 'DOWNLOAD_UNSYNCED_BACKUP_FILES';
     loadDataToMemory: 'DATA_FROM_FILE';
-    refreshVCs: 'done.invoke.backupRestore.restoreBackup.deleteBackupDir:invocation[0]';
+    refreshVCs: 'STORE_RESPONSE';
     sendDataRestoreFailureEvent:
       | 'STORE_ERROR'
-      | 'done.invoke.backupRestore.restoreBackup.checkStorageAvailibility:invocation[0]'
+      | 'done.invoke.backupRestore.restoreBackup.checkStorageAvailability:invocation[0]'
       | 'error.platform.backupRestore.restoreBackup.downloadBackupFileFromCloud:invocation[0]'
       | 'error.platform.backupRestore.restoreBackup.unzipBackupFile:invocation[0]';
-    sendDataRestoreStartEvent: 'BACKUP_RESTORE' | 'EXTRACT_DATA';
-    sendDataRestoreSuccessEvent: 'done.invoke.backupRestore.restoreBackup.deleteBackupDir:invocation[0]';
+    sendDataRestoreStartEvent: 'BACKUP_RESTORE';
+    sendDataRestoreSuccessEvent: 'STORE_RESPONSE';
     setBackupFileName: 'done.invoke.backupRestore.restoreBackup.downloadBackupFileFromCloud:invocation[0]';
     setDataFromBackupFile: 'DATA_FROM_FILE';
     setRestoreErrorReason:
@@ -63,24 +64,28 @@ export interface Typegen0 {
       | 'error.platform.backupRestore.restoreBackup.unzipBackupFile:invocation[0]';
     setRestoreTechnicalError:
       | 'STORE_ERROR'
-      | 'done.invoke.backupRestore.restoreBackup.checkStorageAvailibility:invocation[0]';
+      | 'done.invoke.backupRestore.restoreBackup.checkStorageAvailability:invocation[0]';
+    unsetShowRestoreInProgress:
+      | 'STORE_ERROR'
+      | 'STORE_RESPONSE'
+      | 'done.invoke.backupRestore.restoreBackup.checkStorageAvailability:invocation[0]'
+      | 'error.platform.backupRestore.restoreBackup.downloadBackupFileFromCloud:invocation[0]'
+      | 'error.platform.backupRestore.restoreBackup.unzipBackupFile:invocation[0]';
   };
   eventsCausingDelays: {};
   eventsCausingGuards: {
-    isMinimumStorageRequiredForBackupRestorationReached: 'done.invoke.backupRestore.restoreBackup.checkStorageAvailibility:invocation[0]';
+    isMinimumStorageRequiredForBackupRestorationReached: 'done.invoke.backupRestore.restoreBackup.checkStorageAvailability:invocation[0]';
   };
   eventsCausingServices: {
-    checkStorageAvailability: 'BACKUP_RESTORE' | 'EXTRACT_DATA';
-    deleteBkpDir: 'STORE_RESPONSE';
-    downloadLatestBackup: 'done.invoke.backupRestore.restoreBackup.checkStorageAvailibility:invocation[0]';
+    checkStorageAvailability: 'BACKUP_RESTORE';
+    downloadLatestBackup: 'done.invoke.backupRestore.restoreBackup.checkStorageAvailability:invocation[0]';
     readBackupFile: 'done.invoke.backupRestore.restoreBackup.unzipBackupFile:invocation[0]';
     unzipBackupFile: 'done.invoke.backupRestore.restoreBackup.downloadBackupFileFromCloud:invocation[0]';
   };
   matchesStates:
     | 'init'
     | 'restoreBackup'
-    | 'restoreBackup.checkStorageAvailibility'
-    | 'restoreBackup.deleteBackupDir'
+    | 'restoreBackup.checkStorageAvailability'
     | 'restoreBackup.downloadBackupFileFromCloud'
     | 'restoreBackup.failure'
     | 'restoreBackup.idle'
@@ -90,8 +95,7 @@ export interface Typegen0 {
     | 'restoreBackup.unzipBackupFile'
     | {
         restoreBackup?:
-          | 'checkStorageAvailibility'
-          | 'deleteBackupDir'
+          | 'checkStorageAvailability'
           | 'downloadBackupFileFromCloud'
           | 'failure'
           | 'idle'
diff --git a/machines/backupWithEncryption.ts b/machines/backupAndRestore/backupWithEncryption.ts
similarity index 96%
rename from machines/backupWithEncryption.ts
rename to machines/backupAndRestore/backupWithEncryption.ts
index 4a4b71e46b..13c0814d11 100644
--- a/machines/backupWithEncryption.ts
+++ b/machines/backupAndRestore/backupWithEncryption.ts
@@ -1,6 +1,6 @@
 import {DoneInvokeEvent, EventFrom, StateFrom, send} from 'xstate';
 import {createModel} from 'xstate/lib/model';
-import {AppServices} from '../shared/GlobalContext';
+import {AppServices} from '../../shared/GlobalContext';
 import {
   BACKUP_ENC_KEY,
   BACKUP_ENC_KEY_TYPE,
@@ -8,11 +8,11 @@ import {
   BACKUP_ENC_TYPE_VAL_PHONE,
   argon2iConfigForPasswordAndPhoneNumber,
   argon2iSalt,
-} from '../shared/constants';
-import {hashData} from '../shared/commonUtil';
-import {StoreEvents} from './store';
-import Storage from '../shared/storage';
-import {compressData} from '../shared/cryptoutil/cryptoUtil';
+} from '../../shared/constants';
+import {hashData} from '../../shared/commonUtil';
+import {StoreEvents} from '../store';
+import Storage from '../../shared/storage';
+import {compressData} from '../../shared/cryptoutil/cryptoUtil';
 
 const model = createModel(
   {
diff --git a/machines/backupWithEncryption.typegen.ts b/machines/backupAndRestore/backupWithEncryption.typegen.ts
similarity index 100%
rename from machines/backupWithEncryption.typegen.ts
rename to machines/backupAndRestore/backupWithEncryption.typegen.ts
diff --git a/machines/bleShare/request/requestMachine.ts b/machines/bleShare/request/requestMachine.ts
index 3c8b057ee7..c3f6efc9f3 100644
--- a/machines/bleShare/request/requestMachine.ts
+++ b/machines/bleShare/request/requestMachine.ts
@@ -304,8 +304,8 @@ export const requestMachine =
               actions: ['sendVCReceivingDisconnectedEvent'],
             },
             VC_RECEIVED: {
-              target: 'reviewing.accepting',
               actions: 'setIncomingVc',
+              target: 'reviewing.accepting',
             },
           },
         },
@@ -364,44 +364,17 @@ export const requestMachine =
               },
             },
             accepting: {
-              initial: 'requestingReceivedVcs',
+              initial: 'prependingReceivedVcMetadata',
               states: {
-                requestingReceivedVcs: {
-                  entry: 'requestReceivedVcs',
-                  on: {
-                    VC_RESPONSE: [
-                      {
-                        target: 'requestingExistingVc',
-                        cond: 'hasExistingVc',
-                      },
-                      {
-                        target: 'prependingReceivedVc',
-                      },
-                    ],
-                  },
-                },
-                requestingExistingVc: {
-                  entry: 'requestExistingVc',
-                  on: {
-                    STORE_RESPONSE: {
-                      target: 'mergingIncomingVc',
-                    },
-                  },
-                },
-                mergingIncomingVc: {
-                  entry: 'mergeIncomingVc',
-                  on: {
-                    STORE_RESPONSE: {
-                      target: '#request.reviewing.accepted',
-                    },
-                  },
-                },
-                prependingReceivedVc: {
-                  entry: 'prependReceivedVc',
+                prependingReceivedVcMetadata: {
+                  entry: 'prependReceivedVcMetadata',
                   on: {
                     STORE_RESPONSE: {
                       target: 'storingVc',
                     },
+                    STORE_ERROR: {
+                      target: '#request.reviewing.savingFailed',
+                    },
                   },
                 },
                 storingVc: {
@@ -410,14 +383,13 @@ export const requestMachine =
                     STORE_RESPONSE: {
                       target: '#request.reviewing.accepted',
                     },
+                    STORE_ERROR: {
+                      actions: 'removeReceivedVcMetadataFromStorage',
+                      target: '#request.reviewing.savingFailed',
+                    },
                   },
                 },
               },
-              on: {
-                STORE_ERROR: {
-                  target: '#request.reviewing.savingFailed',
-                },
-              },
             },
             accepted: {
               entry: [
@@ -556,10 +528,6 @@ export const requestMachine =
           Linking.openSettings();
         },
 
-        requestReceivedVcs: send(VcEvents.GET_RECEIVED_VCS(), {
-          to: context => context.serviceRefs.vc,
-        }),
-
         setReadyForBluetoothStateCheck: model.assign({
           readyForBluetoothStateCheck: () => true,
         }),
@@ -623,7 +591,7 @@ export const requestMachine =
           },
         }),
 
-        prependReceivedVc: send(
+        prependReceivedVcMetadata: send(
           context => {
             if (context.incomingVc) {
               context.incomingVc.vcMetadata.timestamp = Date.now();
@@ -636,22 +604,11 @@ export const requestMachine =
           {to: context => context.serviceRefs.store},
         ),
 
-        requestExistingVc: send(
-          context =>
-            StoreEvents.GET(VCMetadata.fromVC(context.incomingVc).getVcKey()),
-          {to: context => context.serviceRefs.store},
-        ),
-
-        mergeIncomingVc: send(
-          (context, event) => {
-            const existing = event.response as VC;
-            const updated: VC = {
-              ...existing,
-              reason: existing.reason.concat(context.incomingVc.reason),
-            };
-            return StoreEvents.SET(
-              VCMetadata.fromVC(updated).getVcKey(),
-              updated,
+        removeReceivedVcMetadataFromStorage: send(
+          context => {
+            return StoreEvents.REMOVE_VC_METADATA(
+              RECEIVED_VCS_STORE_KEY,
+              VCMetadata.fromVC(context.incomingVc?.vcMetadata).getVcKey(),
             );
           },
           {to: context => context.serviceRefs.store},
@@ -699,14 +656,9 @@ export const requestMachine =
           {to: context => context.serviceRefs.activityLog},
         ),
 
-        sendVcReceived: send(
-          context => {
-            return VcEvents.VC_RECEIVED(
-              VCMetadata.fromVC(context.incomingVc?.vcMetadata),
-            );
-          },
-          {to: context => context.serviceRefs.vc},
-        ),
+        sendVcReceived: send(VcEvents.REFRESH_RECEIVED_VCS(), {
+          to: context => context.serviceRefs.vc,
+        }),
 
         clearShouldVerifyPresence: assign({
           incomingVc: context => ({
diff --git a/machines/bleShare/request/requestMachine.typegen.ts b/machines/bleShare/request/requestMachine.typegen.ts
index e69de29bb2..6628afbf6c 100644
--- a/machines/bleShare/request/requestMachine.typegen.ts
+++ b/machines/bleShare/request/requestMachine.typegen.ts
@@ -0,0 +1,190 @@
+// This file was automatically generated. Edits will be overwritten
+
+export interface Typegen0 {
+  '@@xstate/typegen': true;
+  internalEvents: {
+    '': {type: ''};
+    'done.invoke.request.checkStorage:invocation[0]': {
+      type: 'done.invoke.request.checkStorage:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
+    'done.invoke.request.reviewing.verifyingVp:invocation[0]': {
+      type: 'done.invoke.request.reviewing.verifyingVp:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
+    'xstate.after(DESTROY_TIMEOUT)#request.clearingConnection': {
+      type: 'xstate.after(DESTROY_TIMEOUT)#request.clearingConnection';
+    };
+    'xstate.after(SHARING_TIMEOUT)#request.waitingForVc.inProgress': {
+      type: 'xstate.after(SHARING_TIMEOUT)#request.waitingForVc.inProgress';
+    };
+    'xstate.init': {type: 'xstate.init'};
+    'xstate.stop': {type: 'xstate.stop'};
+  };
+  invokeSrcNameMap: {
+    advertiseDevice: 'done.invoke.request.waitingForConnection:invocation[0]';
+    checkBluetoothService: 'done.invoke.request.checkingBluetoothService.checking:invocation[0]';
+    checkNearByDevicesPermission: 'done.invoke.request.checkNearbyDevicesPermission.checking:invocation[0]';
+    checkStorageAvailability: 'done.invoke.request.checkStorage:invocation[0]';
+    disconnect:
+      | 'done.invoke.request.clearingConnection:invocation[0]'
+      | 'done.invoke.request.reviewing.navigatingToHistory:invocation[0]'
+      | 'done.invoke.request.reviewing.navigatingToHome:invocation[0]';
+    monitorConnection: 'done.invoke.request:invocation[0]';
+    receiveVc: 'done.invoke.request.waitingForVc:invocation[0]';
+    requestBluetooth: 'done.invoke.request.checkingBluetoothService.requesting:invocation[0]';
+    requestNearByDevicesPermission: 'done.invoke.request.checkNearbyDevicesPermission.requesting:invocation[0]';
+    sendVcResponse:
+      | 'done.invoke.request.reviewing.accepted:invocation[0]'
+      | 'done.invoke.request.reviewing.rejected:invocation[0]'
+      | 'done.invoke.request.reviewing.savingFailed:invocation[0]';
+    verifyVp: 'done.invoke.request.reviewing.verifyingVp:invocation[0]';
+  };
+  missingImplementations: {
+    actions: never;
+    delays: never;
+    guards: never;
+    services: never;
+  };
+  eventsCausingActions: {
+    clearShouldVerifyPresence:
+      | 'ACCEPT'
+      | 'BLE_ERROR'
+      | 'CANCEL'
+      | 'FACE_INVALID'
+      | 'FACE_VALID'
+      | 'REJECT'
+      | 'RESET'
+      | 'SCREEN_BLUR'
+      | 'SCREEN_FOCUS'
+      | 'xstate.stop';
+    logReceived: 'CANCEL' | 'REJECT' | 'STORE_ERROR' | 'STORE_RESPONSE';
+    openAppPermission: 'GOTO_SETTINGS';
+    prependReceivedVcMetadata:
+      | 'ACCEPT'
+      | 'DISMISS'
+      | 'FACE_VALID'
+      | 'VC_RECEIVED'
+      | 'done.invoke.request.reviewing.verifyingVp:invocation[0]';
+    registerLoggers:
+      | 'DISCONNECT'
+      | 'RESET'
+      | 'xstate.after(DESTROY_TIMEOUT)#request.clearingConnection';
+    removeLoggers:
+      | 'DISCONNECT'
+      | 'RESET'
+      | 'SCREEN_BLUR'
+      | 'xstate.after(DESTROY_TIMEOUT)#request.clearingConnection'
+      | 'xstate.init';
+    removeReceivedVcMetadataFromStorage: 'STORE_ERROR';
+    sendBLEConnectionErrorEvent: 'BLE_ERROR';
+    sendVCReceiveFailedEvent: 'FACE_INVALID';
+    sendVCReceiveFlowTimeoutEndEvent: 'CANCEL';
+    sendVCReceiveRejectedEvent: 'CANCEL' | 'REJECT' | 'STORE_ERROR';
+    sendVCReceiveSuccessEvent: 'STORE_RESPONSE';
+    sendVCReceivingDisconnectedEvent: 'DISCONNECT';
+    sendVCReceivingStartEvent: 'CONNECTED';
+    sendVCReceivingTerminatedEvent: 'CANCEL';
+    sendVcReceived: 'STORE_RESPONSE';
+    setBleError: 'BLE_ERROR';
+    setIncomingVc: 'VC_RECEIVED';
+    setOpenID4VpUri: 'ADV_STARTED';
+    setReadyForBluetoothStateCheck: 'NEARBY_ENABLED';
+    setReceiveLogTypeDiscarded: 'CANCEL' | 'REJECT' | 'STORE_ERROR';
+    setReceiveLogTypeRegular: 'ACCEPT' | 'STORE_RESPONSE';
+    setReceiveLogTypeUnverified: 'FACE_INVALID';
+    setReceiveLogTypeVerified: 'FACE_VALID';
+    setReceiverInfo: 'CONNECTED';
+    setSenderInfo: 'CONNECTED';
+    storeVc: 'STORE_RESPONSE';
+  };
+  eventsCausingDelays: {
+    DESTROY_TIMEOUT: '' | 'DISMISS';
+    SHARING_TIMEOUT: 'CONNECTED';
+  };
+  eventsCausingGuards: {
+    isMinimumStorageLimitReached: 'done.invoke.request.checkStorage:invocation[0]';
+  };
+  eventsCausingServices: {
+    advertiseDevice:
+      | 'DISCONNECT'
+      | 'RESET'
+      | 'xstate.after(DESTROY_TIMEOUT)#request.clearingConnection';
+    checkBluetoothService: 'NEARBY_ENABLED';
+    checkNearByDevicesPermission:
+      | 'APP_ACTIVE'
+      | 'RESET'
+      | 'done.invoke.request.checkStorage:invocation[0]';
+    checkStorageAvailability: 'SCREEN_FOCUS';
+    disconnect: '' | 'DISMISS' | 'GO_TO_RECEIVED_VC_TAB';
+    monitorConnection: 'xstate.init';
+    receiveVc: 'CONNECTED';
+    requestBluetooth: 'BLUETOOTH_STATE_DISABLED';
+    requestNearByDevicesPermission: 'NEARBY_DISABLED';
+    sendVcResponse: 'CANCEL' | 'REJECT' | 'STORE_ERROR' | 'STORE_RESPONSE';
+    verifyVp: never;
+  };
+  matchesStates:
+    | 'bluetoothDenied'
+    | 'cancelling'
+    | 'checkNearbyDevicesPermission'
+    | 'checkNearbyDevicesPermission.checking'
+    | 'checkNearbyDevicesPermission.requesting'
+    | 'checkStorage'
+    | 'checkingBluetoothService'
+    | 'checkingBluetoothService.checking'
+    | 'checkingBluetoothService.enabled'
+    | 'checkingBluetoothService.requesting'
+    | 'clearingConnection'
+    | 'disconnected'
+    | 'handlingBleError'
+    | 'inactive'
+    | 'nearByDevicesPermissionDenied'
+    | 'reviewing'
+    | 'reviewing.accepted'
+    | 'reviewing.accepting'
+    | 'reviewing.accepting.prependingReceivedVcMetadata'
+    | 'reviewing.accepting.storingVc'
+    | 'reviewing.displayingIncomingVC'
+    | 'reviewing.idle'
+    | 'reviewing.invalidIdentity'
+    | 'reviewing.navigatingToHistory'
+    | 'reviewing.navigatingToHome'
+    | 'reviewing.navigatingToReceivedCards'
+    | 'reviewing.rejected'
+    | 'reviewing.savingFailed'
+    | 'reviewing.savingFailed.idle'
+    | 'reviewing.savingFailed.viewingVc'
+    | 'reviewing.verifyingIdentity'
+    | 'reviewing.verifyingVp'
+    | 'storageLimitReached'
+    | 'waitingForConnection'
+    | 'waitingForVc'
+    | 'waitingForVc.inProgress'
+    | 'waitingForVc.timeout'
+    | {
+        checkNearbyDevicesPermission?: 'checking' | 'requesting';
+        checkingBluetoothService?: 'checking' | 'enabled' | 'requesting';
+        reviewing?:
+          | 'accepted'
+          | 'accepting'
+          | 'displayingIncomingVC'
+          | 'idle'
+          | 'invalidIdentity'
+          | 'navigatingToHistory'
+          | 'navigatingToHome'
+          | 'navigatingToReceivedCards'
+          | 'rejected'
+          | 'savingFailed'
+          | 'verifyingIdentity'
+          | 'verifyingVp'
+          | {
+              accepting?: 'prependingReceivedVcMetadata' | 'storingVc';
+              savingFailed?: 'idle' | 'viewingVc';
+            };
+        waitingForVc?: 'inProgress' | 'timeout';
+      };
+  tags: never;
+}
diff --git a/machines/bleShare/scan/scanMachine.ts b/machines/bleShare/scan/scanMachine.ts
index 8bf4be1401..982e77bd9e 100644
--- a/machines/bleShare/scan/scanMachine.ts
+++ b/machines/bleShare/scan/scanMachine.ts
@@ -69,7 +69,6 @@ const model = createModel(
     selectedVc: {} as VC,
     bleError: {} as BLEError,
     createdVp: null as VC,
-    reason: '',
     loggers: [] as EmitterSubscription[],
     vcName: '',
     verificationImage: {} as CameraCapturedPicture,
@@ -106,7 +105,6 @@ const model = createModel(
       NEARBY_DISABLED: () => ({}),
       GOTO_SETTINGS: () => ({}),
       START_PERMISSION_CHECK: () => ({}),
-      UPDATE_REASON: (reason: string) => ({reason}),
       LOCATION_ENABLED: () => ({}),
       LOCATION_DISABLED: () => ({}),
       LOCATION_REQUEST: () => ({}),
@@ -493,14 +491,11 @@ export const scanMachine =
         },
         reviewing: {
           entry: ['resetShouldVerifyPresence'],
-          exit: ['clearReason', 'clearCreatedVp'],
+          exit: ['clearCreatedVp'],
           initial: 'selectingVc',
           states: {
             selectingVc: {
               on: {
-                UPDATE_REASON: {
-                  actions: 'setReason',
-                },
                 DISCONNECT: {
                   target: '#scan.disconnected',
                 },
@@ -800,12 +795,6 @@ export const scanMachine =
           bleError: (_context, event) => event.bleError,
         }),
 
-        setReason: model.assign({
-          reason: (_context, event) => event.reason,
-        }),
-
-        clearReason: assign({reason: ''}),
-
         setSelectedVc: assign({
           selectedVc: (context, event) => {
             return {
@@ -1135,11 +1124,6 @@ export const scanMachine =
             ...(vp != null ? vp : context.selectedVc),
           };
 
-          const reason = [];
-          if (context.reason.trim() !== '') {
-            reason.push({message: context.reason, timestamp: Date.now()});
-          }
-
           const statusCallback = (event: WalletDataEvent) => {
             if (event.type === EventTypes.onDataSent) {
               callback({type: 'VC_SENT'});
@@ -1155,7 +1139,6 @@ export const scanMachine =
           wallet.sendData(
             JSON.stringify({
               ...vc,
-              reason,
             }),
           );
           const subscription = subscribe(statusCallback);
diff --git a/machines/bleShare/scan/scanMachine.typegen.ts b/machines/bleShare/scan/scanMachine.typegen.ts
index 8e4b94fee7..e467f2ce8a 100644
--- a/machines/bleShare/scan/scanMachine.typegen.ts
+++ b/machines/bleShare/scan/scanMachine.typegen.ts
@@ -62,15 +62,6 @@ export interface Typegen0 {
       | 'SCREEN_BLUR'
       | 'SCREEN_FOCUS'
       | 'xstate.stop';
-    clearReason:
-      | ''
-      | 'BLE_ERROR'
-      | 'DISCONNECT'
-      | 'DISMISS'
-      | 'RESET'
-      | 'SCREEN_BLUR'
-      | 'SCREEN_FOCUS'
-      | 'xstate.stop';
     clearUri:
       | 'DISCONNECT'
       | 'DISMISS'
@@ -104,7 +95,6 @@ export interface Typegen0 {
     setCreatedVp: 'done.invoke.scan.reviewing.creatingVp:invocation[0]';
     setLinkCode: 'SCAN';
     setReadyForBluetoothStateCheck: 'BLUETOOTH_PERMISSION_ENABLED';
-    setReason: 'UPDATE_REASON';
     setReceiverInfo: 'CONNECTED';
     setSelectedVc: 'SELECT_VC';
     setSenderInfo: 'CONNECTED';
diff --git a/machines/bleShare/scan/selectors.ts b/machines/bleShare/scan/selectors.ts
index 1c175618cf..e1605141c1 100644
--- a/machines/bleShare/scan/selectors.ts
+++ b/machines/bleShare/scan/selectors.ts
@@ -7,10 +7,6 @@ export function selectReceiverInfo(state: State) {
   return state.context.receiverInfo;
 }
 
-export function selectReason(state: State) {
-  return state.context.reason;
-}
-
 export function selectVcName(state: State) {
   return state.context.vcName;
 }
diff --git a/machines/issuersMachine.ts b/machines/issuersMachine.ts
index 904c7447a7..161bbf3725 100644
--- a/machines/issuersMachine.ts
+++ b/machines/issuersMachine.ts
@@ -46,7 +46,7 @@ import {CACHED_API} from '../shared/api';
 import {request} from '../shared/request';
 import {BiometricCancellationError} from '../shared/error/BiometricCancellationError';
 import {VCMetadata} from '../shared/VCMetadata';
-import Cloud, {isSignedInResult} from '../shared/googleCloudUtils';
+import Cloud, {isSignedInResult} from '../shared/CloudBackupAndRestoreUtils';
 
 const model = createModel(
   {
@@ -59,7 +59,7 @@ const model = createModel(
     verifiableCredential: null as VerifiableCredential | null,
     credentialWrapper: {} as CredentialWrapper,
     serviceRefs: {} as AppServices,
-
+    verificationErrorMessage: '',
     publicKey: ``,
     privateKey: ``,
   },
@@ -75,6 +75,7 @@ const model = createModel(
       CANCEL: () => ({}),
       STORE_RESPONSE: (response?: unknown) => ({response}),
       STORE_ERROR: (error: Error, requester?: string) => ({error, requester}),
+      RESET_VERIFY_ERROR: () => ({}),
     },
   },
 );
@@ -361,15 +362,26 @@ export const IssuersMachine = model.createMachine(
           onError: [
             {
               actions: [
-                log((_, event) => (event.data as Error).message),
+                log('Verification Error.'),
+                'resetLoadingReason',
+                'updateVerificationErrorMessage',
                 'sendErrorEndEvent',
               ],
               //TODO: Move to state according to the required flow when verification of VC fails
-              target: 'idle',
+              target: 'handleVCVerificationFailure',
             },
           ],
         },
       },
+
+      handleVCVerificationFailure: {
+        on: {
+          RESET_VERIFY_ERROR: {
+            actions: ['resetVerificationErrorMessage'],
+          },
+        },
+      },
+
       storing: {
         description: 'all the verified credential is stored.',
         entry: [
@@ -583,6 +595,15 @@ export const IssuersMachine = model.createMachine(
           ),
         );
       },
+
+      updateVerificationErrorMessage: assign({
+        verificationErrorMessage: (context, event) =>
+          (event.data as Error).message,
+      }),
+
+      resetVerificationErrorMessage: model.assign({
+        verificationErrorMessage: (_context, event) => '',
+      }),
     },
     services: {
       isUserSignedAlready: () => async () => {
@@ -655,7 +676,12 @@ export const IssuersMachine = model.createMachine(
         ) {
           return true;
         }
-        return verifyCredential(context.verifiableCredential?.credential);
+        const verificationResult = await verifyCredential(
+          context.verifiableCredential?.credential,
+        );
+        if (!verificationResult.isVerified) {
+          throw new Error(verificationResult.errorMessage);
+        }
       },
     },
     guards: {
@@ -736,6 +762,10 @@ export function selectStoring(state: State) {
   return state.matches('storing');
 }
 
+export function selectVerificationErrorMessage(state: State) {
+  return state.context.verificationErrorMessage;
+}
+
 export interface logoType {
   url: string;
   alt_text: string;
diff --git a/machines/issuersMachine.typegen.ts b/machines/issuersMachine.typegen.ts
index 4adbc1ce0c..85215deb4a 100644
--- a/machines/issuersMachine.typegen.ts
+++ b/machines/issuersMachine.typegen.ts
@@ -33,6 +33,11 @@ export interface Typegen0 {
       data: unknown;
       __tip: 'See the XState TS docs to learn how to strongly type this.';
     };
+    'done.invoke.issuersMachine.storing:invocation[0]': {
+      type: 'done.invoke.issuersMachine.storing:invocation[0]';
+      data: unknown;
+      __tip: 'See the XState TS docs to learn how to strongly type this.';
+    };
     'done.invoke.issuersMachine.verifyingCredential:invocation[0]': {
       type: 'done.invoke.issuersMachine.verifyingCredential:invocation[0]';
       data: unknown;
@@ -71,6 +76,7 @@ export interface Typegen0 {
     downloadIssuersList: 'done.invoke.issuersMachine.displayIssuers:invocation[0]';
     generateKeyPair: 'done.invoke.issuersMachine.generateKeyPair:invocation[0]';
     invokeAuthorization: 'done.invoke.issuersMachine.performAuthorization:invocation[0]';
+    isUserSignedAlready: 'done.invoke.issuersMachine.storing:invocation[0]';
     verifyCredential: 'done.invoke.issuersMachine.verifyingCredential:invocation[0]';
   };
   missingImplementations: {
@@ -95,7 +101,10 @@ export interface Typegen0 {
       | 'done.invoke.issuersMachine.displayIssuers:invocation[0]'
       | 'error.platform.issuersMachine.downloadCredentials:invocation[0]'
       | 'error.platform.issuersMachine.downloadIssuerConfig:invocation[0]'
-      | 'error.platform.issuersMachine.performAuthorization:invocation[0]';
+      | 'error.platform.issuersMachine.performAuthorization:invocation[0]'
+      | 'error.platform.issuersMachine.verifyingCredential:invocation[0]';
+    resetVerificationErrorMessage: 'RESET_VERIFY_ERROR';
+    sendBackupEvent: 'done.invoke.issuersMachine.storing:invocation[0]';
     sendErrorEndEvent: 'error.platform.issuersMachine.verifyingCredential:invocation[0]';
     sendImpressionEvent: 'done.invoke.issuersMachine.displayIssuers:invocation[0]';
     sendSuccessEndEvent: 'done.invoke.issuersMachine.verifyingCredential:invocation[0]';
@@ -129,6 +138,7 @@ export interface Typegen0 {
     storeVcsContext: 'done.invoke.issuersMachine.verifyingCredential:invocation[0]';
     storeVerifiableCredentialData: 'done.invoke.issuersMachine.verifyingCredential:invocation[0]';
     storeVerifiableCredentialMeta: 'done.invoke.issuersMachine.verifyingCredential:invocation[0]';
+    updateVerificationErrorMessage: 'error.platform.issuersMachine.verifyingCredential:invocation[0]';
   };
   eventsCausingDelays: {};
   eventsCausingGuards: {
@@ -139,6 +149,7 @@ export interface Typegen0 {
     isInternetConnected: 'done.invoke.checkInternet';
     isOIDCConfigError: 'error.platform.issuersMachine.performAuthorization:invocation[0]';
     isOIDCflowCancelled: 'error.platform.issuersMachine.performAuthorization:invocation[0]';
+    isSignedIn: 'done.invoke.issuersMachine.storing:invocation[0]';
     shouldFetchIssuersAgain: 'TRY_AGAIN';
   };
   eventsCausingServices: {
@@ -150,6 +161,7 @@ export interface Typegen0 {
     downloadIssuersList: 'TRY_AGAIN' | 'xstate.init';
     generateKeyPair: 'CHECK_KEY_PAIR';
     invokeAuthorization: 'done.invoke.checkInternet';
+    isUserSignedAlready: 'done.invoke.issuersMachine.verifyingCredential:invocation[0]';
     verifyCredential: 'done.invoke.issuersMachine.downloadCredentials:invocation[0]';
   };
   matchesStates:
@@ -163,6 +175,7 @@ export interface Typegen0 {
     | 'downloadIssuerConfig'
     | 'error'
     | 'generateKeyPair'
+    | 'handleVCVerificationFailure'
     | 'idle'
     | 'performAuthorization'
     | 'performAuthorization.idle'
diff --git a/machines/settings.ts b/machines/settings.ts
index 424456bbd2..199e230937 100644
--- a/machines/settings.ts
+++ b/machines/settings.ts
@@ -33,6 +33,7 @@ const model = createModel(
     appId: null,
     isBackupAndRestoreExplored: false as boolean,
     hasUserShownWithHardwareKeystoreNotExists: false,
+    isAccountSelectionConfirmationShown: false,
     credentialRegistryResponse: '' as string,
   },
   {
@@ -56,6 +57,7 @@ const model = createModel(
       CANCEL: () => ({}),
       ACCEPT_HARDWARE_SUPPORT_NOT_EXISTS: () => ({}),
       SET_IS_BACKUP_AND_RESTORE_EXPLORED: () => ({}),
+      SHOWN_ACCOUNT_SELECTION_CONFIRMATION: () => ({}),
     },
   },
 );
@@ -129,6 +131,13 @@ export const settingsMachine = model.createMachine(
             ],
             target: 'idle',
           },
+          SHOWN_ACCOUNT_SELECTION_CONFIRMATION: {
+            actions: [
+              'updateIsAccountSelectionConfirmationShown',
+              'storeContext',
+            ],
+            target: 'idle',
+          },
         },
       },
       resetInjiProps: {
@@ -242,6 +251,10 @@ export const settingsMachine = model.createMachine(
         hasUserShownWithHardwareKeystoreNotExists: () => true,
       }),
 
+      updateIsAccountSelectionConfirmationShown: model.assign({
+        isAccountSelectionConfirmationShown: () => true,
+      }),
+
       toggleBiometricUnlock: model.assign({
         isBiometricUnlockEnabled: (_, event) => event.enable,
       }),
@@ -308,6 +321,10 @@ export function selectShowHardwareKeystoreNotExistsAlert(state: State) {
   return !hasShown && !deviceSupports;
 }
 
+export function selectShowAccountSelectionConfirmation(state: State) {
+  return !state.context.isAccountSelectionConfirmationShown;
+}
+
 export function selectVcLabel(state: State) {
   return state.context.vcLabel;
 }
diff --git a/machines/settings.typegen.ts b/machines/settings.typegen.ts
index a4339de0dd..5e19884f98 100644
--- a/machines/settings.typegen.ts
+++ b/machines/settings.typegen.ts
@@ -31,6 +31,7 @@ export interface Typegen0 {
     storeContext:
       | 'ACCEPT_HARDWARE_SUPPORT_NOT_EXISTS'
       | 'SET_IS_BACKUP_AND_RESTORE_EXPLORED'
+      | 'SHOWN_ACCOUNT_SELECTION_CONFIRMATION'
       | 'STORE_RESPONSE'
       | 'TOGGLE_BIOMETRIC_UNLOCK'
       | 'UPDATE_HOST'
@@ -43,6 +44,7 @@ export interface Typegen0 {
     updateCredentialRegistrySuccess: 'done.invoke.settings.resetInjiProps:invocation[0]';
     updateDefaults: 'STORE_RESPONSE';
     updateEsignetHostUrl: 'UPDATE_HOST';
+    updateIsAccountSelectionConfirmationShown: 'SHOWN_ACCOUNT_SELECTION_CONFIRMATION';
     updateName: 'UPDATE_NAME';
     updatePartialDefaults: 'STORE_RESPONSE';
     updateUserShownWithHardwareKeystoreNotExists: 'ACCEPT_HARDWARE_SUPPORT_NOT_EXISTS';
diff --git a/machines/store.ts b/machines/store.ts
index 409f6fb106..b62344827a 100644
--- a/machines/store.ts
+++ b/machines/store.ts
@@ -12,7 +12,12 @@ import {
 import {createModel} from 'xstate/lib/model';
 import {generateSecureRandom} from 'react-native-securerandom';
 import {log} from 'xstate/lib/actions';
-import {isIOS, MY_VCS_STORE_KEY, SETTINGS_STORE_KEY} from '../shared/constants';
+import {
+  isIOS,
+  MY_VCS_STORE_KEY,
+  RECEIVED_VCS_STORE_KEY,
+  SETTINGS_STORE_KEY,
+} from '../shared/constants';
 import SecureKeystore from '@mosip/secure-keystore';
 import {
   AUTH_TIMEOUT,
@@ -31,6 +36,7 @@ import {
   getErrorEventData,
 } from '../shared/telemetry/TelemetryUtils';
 import RNSecureKeyStore from 'react-native-secure-key-store';
+import {Buffer} from 'buffer';
 
 export const keyinvalidatedString =
   'Key Invalidated due to biometric enrollment';
@@ -293,9 +299,11 @@ export const storeMachine =
           const hasSetCredentials = SecureKeystore.hasAlias(ENCRYPTION_ID);
           if (hasSetCredentials) {
             try {
+              const base64EncodedString =
+                Buffer.from('Dummy').toString('base64');
               await SecureKeystore.encryptData(
                 DUMMY_KEY_FOR_BIOMETRIC_ALIAS,
-                'Dummy',
+                base64EncodedString,
               );
             } catch (e) {
               sendErrorEvent(getErrorEventData('ENCRYPTION', '', e));
@@ -463,7 +471,9 @@ export const storeMachine =
                 callback(model.events.BIOMETRIC_CANCELLED(event.requester));
                 sendUpdate();
               } else {
-                console.error(e);
+                console.error(
+                  `Error while performing the operation ${event.type} with storage - ${e}`,
+                );
                 callback(model.events.STORE_ERROR(e, event.requester));
               }
             }
@@ -609,9 +619,13 @@ export async function getItem(
       );
       throw new Error(tamperedErrorMessageString);
     } else {
+      console.debug(
+        `While getting item - ${key} from storage: data value is ${data} so returning the default value`,
+      );
       return defaultValue;
     }
   } catch (e) {
+    console.error(`Exception in getting item for ${key}: ${e}`);
     if (
       e.message.includes(tamperedErrorMessageString) ||
       e.message.includes(keyinvalidatedString) ||
@@ -635,7 +649,6 @@ export async function getItem(
         `Exception in getting item for ${key}: ${e}`,
       ),
     );
-    console.error(`Exception in getting item for ${key}: ${e}`);
     return defaultValue;
   }
 }
@@ -706,7 +719,7 @@ export async function removeItem(
   try {
     if (value === null && VCMetadata.isVCKey(key)) {
       await Storage.removeItem(key);
-      await removeVCMetaData(MY_VCS_STORE_KEY, key, encryptionKey);
+      removeTamperedVcMetaData(key, encryptionKey);
     } else if (key === MY_VCS_STORE_KEY) {
       const data = await Storage.getItem(key, encryptionKey);
       let list: Object[] = [];
@@ -755,6 +768,38 @@ export async function removeVCMetaData(
   }
 }
 
+export async function removeTamperedVcMetaData(
+  key: string,
+  encryptionKey: string,
+) {
+  try {
+    const myVcsMetadata = await Storage.getItem(
+      MY_VCS_STORE_KEY,
+      encryptionKey,
+    );
+    let myVcsDecryptedMetadata: Object[] = [];
+
+    if (myVcsMetadata != null) {
+      const decryptedData = await decryptJson(encryptionKey, myVcsMetadata);
+      myVcsDecryptedMetadata = JSON.parse(decryptedData) as Object[];
+    }
+
+    const isTamperedVcInMyVCs = myVcsDecryptedMetadata?.filter(
+      (vcMetadataObject: Object) => {
+        return new VCMetadata(vcMetadataObject).getVcKey() === key;
+      },
+    ).length;
+    if (isTamperedVcInMyVCs) {
+      await removeVCMetaData(MY_VCS_STORE_KEY, key, encryptionKey);
+    } else {
+      await removeVCMetaData(RECEIVED_VCS_STORE_KEY, key, encryptionKey);
+    }
+  } catch (e) {
+    console.error('error while removing VC item metadata:', e);
+    throw e;
+  }
+}
+
 export async function clear() {
   try {
     console.log('clearing entire storage');
diff --git a/machines/vc.typegen.ts b/machines/vc.typegen.ts
index 5ca4c146ad..21ee26d72d 100644
--- a/machines/vc.typegen.ts
+++ b/machines/vc.typegen.ts
@@ -21,6 +21,7 @@ export interface Typegen0 {
       | 'REFRESH_MY_VCS'
       | 'REMOVE_TAMPERED_VCS'
       | 'STORE_RESPONSE'
+      | 'VERIFY_VC_FAILED'
       | 'xstate.init';
     loadReceivedVcs: 'REFRESH_RECEIVED_VCS' | 'STORE_RESPONSE';
     logTamperedVCsremoved: 'REMOVE_TAMPERED_VCS';
@@ -32,10 +33,12 @@ export interface Typegen0 {
     removeTamperedVcs: 'REMOVE_TAMPERED_VCS';
     removeVcFromInProgressDownlods:
       | 'DOWNLOAD_LIMIT_EXPIRED'
-      | 'REMOVE_VC_FROM_IN_PROGRESS_DOWNLOADS';
+      | 'REMOVE_VC_FROM_IN_PROGRESS_DOWNLOADS'
+      | 'VERIFY_VC_FAILED';
     removeVcFromMyVcs: 'REMOVE_VC_FROM_CONTEXT';
     resetAreAllVcsDownloaded: 'RESET_ARE_ALL_VCS_DOWNLOADED';
     resetDownloadFailedVcs: 'STORE_RESPONSE';
+    resetVerificationErrorMessage: 'RESET_VERIFY_ERROR';
     resetWalletBindingSuccess: 'RESET_WALLET_BINDING_SUCCESS';
     setDownloadedVCFromOpenId4VCI: 'VC_DOWNLOADED_FROM_OPENID4VCI';
     setDownloadedVc: 'VC_DOWNLOADED';
@@ -45,6 +48,7 @@ export interface Typegen0 {
     setTamperedVcs: 'TAMPERED_VC';
     setUpdatedVcMetadatas: 'VC_METADATA_UPDATED';
     setVcUpdate: 'VC_UPDATE';
+    setVerificationErrorMessage: 'VERIFY_VC_FAILED';
     setWalletBindingSuccess: 'WALLET_BINDING_SUCCESS';
     updateMyVcs: 'VC_METADATA_UPDATED';
   };
diff --git a/package-lock.json b/package-lock.json
index 43962122a1..83230e1ea6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@expo-google-fonts/inter": "^0.2.3",
         "@expo/metro-config": "~0.10.0",
         "@iriscan/biometric-sdk-react-native": "0.2.6",
-        "@mosip/secure-keystore": "^0.1.6",
+        "@mosip/secure-keystore": "^0.1.7",
         "@mosip/tuvali": "^0.4.9",
         "@react-native-clipboard/clipboard": "^1.10.0",
         "@react-native-community/netinfo": "9.3.7",
@@ -6144,9 +6144,9 @@
       }
     },
     "node_modules/@mosip/secure-keystore": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@mosip/secure-keystore/-/secure-keystore-0.1.6.tgz",
-      "integrity": "sha512-f7KsofyLXWHPy0Day5ejIXzXYGZxEss8tKOCKICaTOtrtsPEmPVnkOwwkqDgV4B9FZnux0JCUsPTZdUrEHchnA==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/@mosip/secure-keystore/-/secure-keystore-0.1.7.tgz",
+      "integrity": "sha512-Yo9pCj1do8mKkwMkhRVbnf0cqOQaD3EJlMgcM8OyEedvB/dA5qQKJ2nDt7SkA+Rjnl1XHmvv6qAmLD1xuOD8kQ==",
       "peerDependencies": {
         "react": "*",
         "react-native": "*"
@@ -32698,7 +32698,8 @@
     "@iriscan/biometric-sdk-react-native": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/@iriscan/biometric-sdk-react-native/-/biometric-sdk-react-native-0.2.6.tgz",
-      "integrity": "sha512-aA9gQWJ/Nt0KGDlf1vC8oxld3Daw23LlWdBidXyVfxWywm4VApq0nrOP+l2y9TVEWuAQjqdAbKSZ89ZEhetPjQ=="
+      "integrity": "sha512-aA9gQWJ/Nt0KGDlf1vC8oxld3Daw23LlWdBidXyVfxWywm4VApq0nrOP+l2y9TVEWuAQjqdAbKSZ89ZEhetPjQ==",
+      "requires": {}
     },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -33960,9 +33961,9 @@
       }
     },
     "@mosip/secure-keystore": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@mosip/secure-keystore/-/secure-keystore-0.1.6.tgz",
-      "integrity": "sha512-f7KsofyLXWHPy0Day5ejIXzXYGZxEss8tKOCKICaTOtrtsPEmPVnkOwwkqDgV4B9FZnux0JCUsPTZdUrEHchnA==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/@mosip/secure-keystore/-/secure-keystore-0.1.7.tgz",
+      "integrity": "sha512-Yo9pCj1do8mKkwMkhRVbnf0cqOQaD3EJlMgcM8OyEedvB/dA5qQKJ2nDt7SkA+Rjnl1XHmvv6qAmLD1xuOD8kQ==",
       "requires": {}
     },
     "@mosip/tuvali": {
diff --git a/package.json b/package.json
index 76e2989207..a846aeec60 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@expo-google-fonts/inter": "^0.2.3",
     "@expo/metro-config": "~0.10.0",
     "@iriscan/biometric-sdk-react-native": "0.2.6",
-    "@mosip/secure-keystore": "^0.1.6",
+    "@mosip/secure-keystore": "^0.1.7",
     "@mosip/tuvali": "^0.4.9",
     "@react-native-clipboard/clipboard": "^1.10.0",
     "@react-native-community/netinfo": "9.3.7",
diff --git a/routes/main.ts b/routes/main.ts
index 215d1604ee..32335bb38f 100644
--- a/routes/main.ts
+++ b/routes/main.ts
@@ -39,12 +39,8 @@ const history: TabScreen = {
   component: HistoryScreen,
   icon: 'history',
   options: {
-    headerTitleStyle: {
-      fontSize: 26,
-      fontFamily: 'Inter_600SemiBold',
-      marginTop: 15,
-    },
     title: i18n.t('MainLayout:history'),
+    headerRight: null,
   },
 };
 
diff --git a/screens/History/HistoryScreen.tsx b/screens/History/HistoryScreen.tsx
index ed6596e284..11e53943a5 100644
--- a/screens/History/HistoryScreen.tsx
+++ b/screens/History/HistoryScreen.tsx
@@ -5,10 +5,11 @@ import {useTranslation} from 'react-i18next';
 import {Centered, Column, Text} from '../../components/ui';
 import {useHistoryTab} from './HistoryScreenController';
 import {ActivityLogText} from '../../components/ActivityLogText';
+import {MainRouteProps} from '../../routes/main';
 import {Theme} from '../../components/ui/styleUtils';
 import {BannerNotificationContainer} from '../../components/BannerNotificationContainer';
 
-export const HistoryScreen: React.FC = () => {
+export const HistoryScreen: React.FC<MainRouteProps> = () => {
   const {t} = useTranslation('HistoryScreen');
   const controller = useHistoryTab();
 
diff --git a/screens/Home/IntroSlidersScreen.tsx b/screens/Home/IntroSlidersScreen.tsx
index 4d88083581..8f391bd85f 100644
--- a/screens/Home/IntroSlidersScreen.tsx
+++ b/screens/Home/IntroSlidersScreen.tsx
@@ -8,6 +8,7 @@ import {RootRouteProps} from '../../routes';
 import {useWelcomeScreen} from '../WelcomeScreenController';
 import LinearGradient from 'react-native-linear-gradient';
 import {SvgImage} from '../../components/ui/svg';
+import testIDProps from '../../shared/commonUtil';
 
 export const IntroSlidersScreen: React.FC<RootRouteProps> = props => {
   const slider = useRef<AppIntroSlider>();
@@ -61,7 +62,11 @@ export const IntroSlidersScreen: React.FC<RootRouteProps> = props => {
 
             {item.key !== 'five' && (
               <Button
-                testID={isPasscodeSet ? 'back' : 'skip'}
+                testID={
+                  isPasscodeSet
+                    ? `backButton-${item.key}`
+                    : `skipButton-${item.key}`
+                }
                 type="plain"
                 title={isPasscodeSet ? t('back') : t('skip')}
                 onPress={isPasscodeSet ? controller.BACK : controller.NEXT}
@@ -70,25 +75,26 @@ export const IntroSlidersScreen: React.FC<RootRouteProps> = props => {
             )}
           </Row>
           <Image
+            {...testIDProps(`introImage-${item.key}`)}
             source={item.image}
             resizeMode="contain"
             style={{height: Dimensions.get('screen').height * 0.6}}
           />
           <Column
-            testID="introSlide"
+            testID={`introSlide-${item.key}`}
             style={Theme.OnboardingOverlayStyles.bottomContainer}
             crossAlign="center"
             backgroundColor={Theme.Colors.whiteText}
             width={Dimensions.get('screen').width}>
             <Text
-              testID="introTitle"
+              testID={`introTitle-${item.key}`}
               style={{paddingTop: 3}}
               weight="semibold"
               margin="0 0 18 0">
               {item.title}
             </Text>
             <Text
-              testID="introText"
+              testID={`introText-${item.key}`}
               style={{paddingTop: 7}}
               margin="0 0 150 0"
               size="large"
@@ -103,7 +109,7 @@ export const IntroSlidersScreen: React.FC<RootRouteProps> = props => {
 
   const renderNextButton = () => {
     return (
-      <View>
+      <View {...testIDProps('nextButton')}>
         <LinearGradient
           colors={Theme.Colors.gradientBtn}
           style={Theme.Styles.introSliderButton}>
@@ -127,7 +133,7 @@ export const IntroSlidersScreen: React.FC<RootRouteProps> = props => {
           colors={Theme.Colors.gradientBtn}
           style={Theme.Styles.introSliderButton}>
           <Text
-            testID="getStarted"
+            testID={controller.isPasscodeSet() ? 'goBack' : 'getStarted'}
             style={{paddingTop: 3}}
             weight="semibold"
             align="center"
diff --git a/screens/Home/MyVcsTab.tsx b/screens/Home/MyVcsTab.tsx
index f2f6176f20..3b139ab96d 100644
--- a/screens/Home/MyVcsTab.tsx
+++ b/screens/Home/MyVcsTab.tsx
@@ -80,6 +80,13 @@ export const MyVcsTab: React.FC<HomeScreenTabProps> = props => {
   controller.downloadFailedVcs.forEach(vc => {
     failedVCsList.push(`\n${vc.idType}:${vc.id}`);
   });
+
+  const isVerificationFailed = controller.verificationErrorMessage !== '';
+
+  const verificationErrorMessage = t(
+    `errors.verificationFailed.${controller.verificationErrorMessage}`,
+  );
+
   const downloadFailedVcsErrorMessage = `${t(
     'errors.downloadLimitExpires.message',
   )}${failedVCsList}`;
@@ -101,6 +108,7 @@ export const MyVcsTab: React.FC<HomeScreenTabProps> = props => {
               controller.RESET_STORE_VC_ITEM_STATUS();
               clearIndividualId();
             }}
+            key={'downloadingVcPopup'}
             testId={'downloadingVcPopup'}
           />
         )}
@@ -220,6 +228,23 @@ export const MyVcsTab: React.FC<HomeScreenTabProps> = props => {
         minHeight={'auto'}
       />
 
+      {isVerificationFailed && (
+        <Error
+          testID="verificationError"
+          isVisible={isVerificationFailed}
+          isModal={true}
+          alignActionsOnEnd
+          title={t('errors.verificationFailed.title')}
+          message={verificationErrorMessage}
+          image={SvgImage.PermissionDenied()}
+          showClose={false}
+          primaryButtonText="goBack"
+          primaryButtonEvent={controller.RESET_VERIFY_ERROR}
+          primaryButtonTestID="goBack"
+          customStyles={{marginTop: '30%'}}
+        />
+      )}
+
       {controller.isNetworkOff && (
         <Error
           testID="networkOffError"
diff --git a/screens/Home/MyVcsTabController.ts b/screens/Home/MyVcsTabController.ts
index 24e298f696..6abba5bb5c 100644
--- a/screens/Home/MyVcsTabController.ts
+++ b/screens/Home/MyVcsTabController.ts
@@ -10,6 +10,7 @@ import {
   selectInProgressVcDownloads,
   selectIsTampered,
   selectDownloadingFailedVcs,
+  selectVerificationErrorMessage,
 } from '../../machines/VCItemMachine/vc';
 import {
   selectWalletBindingError,
@@ -32,12 +33,19 @@ import {
   SettingsEvents,
 } from '../../machines/settings';
 import {EsignetMosipVCItemMachine} from '../../machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine';
+import {NavigationProp, useNavigation} from '@react-navigation/native';
+import {BOTTOM_TAB_ROUTES} from '../../routes/routesConstants';
+import {HomeRouteProps, MainBottomTabParamList} from '../../routes/main';
+import {RootRouteProps} from '../../routes';
+
+type MyVcsTabNavigation = NavigationProp<RootRouteProps>;
 
 export function useMyVcsTab(props: HomeScreenTabProps) {
   const service = props.service as ActorRefFrom<typeof MyVcsTabMachine>;
   const {appService} = useContext(GlobalContext);
   const vcService = appService.children.get('vc');
   const settingsService = appService.children.get('settings');
+  const navigation = useNavigation<MyVcsTabNavigation>();
 
   return {
     service,
@@ -63,6 +71,10 @@ export function useMyVcsTab(props: HomeScreenTabProps) {
     isTampered: useSelector(vcService, selectIsTampered),
 
     downloadFailedVcs: useSelector(vcService, selectDownloadingFailedVcs),
+    verificationErrorMessage: useSelector(
+      vcService,
+      selectVerificationErrorMessage,
+    ),
 
     SET_STORE_VC_ITEM_STATUS: () =>
       service.send(MyVcsTabEvents.SET_STORE_VC_ITEM_STATUS()),
@@ -99,5 +111,8 @@ export function useMyVcsTab(props: HomeScreenTabProps) {
 
     REMOVE_TAMPERED_VCS: () => vcService?.send(VcEvents.REMOVE_TAMPERED_VCS()),
     DELETE_VC: () => vcService?.send(VcEvents.DELETE_VC()),
+    RESET_VERIFY_ERROR: () => {
+      vcService?.send(VcEvents.RESET_VERIFY_ERROR());
+    },
   };
 }
diff --git a/screens/HomeScreenLayout.tsx b/screens/HomeScreenLayout.tsx
index d4fd07acf7..b93c0b5979 100644
--- a/screens/HomeScreenLayout.tsx
+++ b/screens/HomeScreenLayout.tsx
@@ -13,7 +13,6 @@ import {SettingScreen} from './Settings/SettingScreen';
 import testIDProps from '../shared/commonUtil';
 import {SvgImage} from '../components/ui/svg';
 import {HelpScreen} from '../components/HelpScreen';
-import {I18nManager} from 'react-native';
 
 export const HomeScreenLayout: React.FC<RootRouteProps> = props => {
   const {t} = useTranslation('IssuersScreen');
@@ -43,45 +42,45 @@ export const HomeScreenLayout: React.FC<RootRouteProps> = props => {
     }
   }, [props.navigation, props.route]);
 
-  const screenOptions = (
-    <Row align="space-between">
-      <HelpScreen
-        source={'Inji'}
-        triggerComponent={
-          <Icon
-            {...testIDProps('help')}
-            accessible={true}
-            name="question"
-            type="font-awesome"
-            size={21}
-            style={Theme.Styles.IconContainer}
-            color={Theme.Colors.Icon}
-          />
-        }
-      />
-
-      <SettingScreen
-        triggerComponent={
-          <Icon
-            {...testIDProps('settings')}
-            accessible={true}
-            name="settings"
-            type="simple-line-icon"
-            size={21}
-            style={Theme.Styles.IconContainer}
-            color={Theme.Colors.Icon}
-          />
-        }
-        navigation={props.navigation}
-        route={undefined}
-      />
-    </Row>
-  );
   const HomeScreenOptions = {
-    headerLeft: () => (I18nManager.isRTL ? screenOptions : SvgImage.InjiLogo()),
+    headerLeft: () => {
+      return SvgImage.InjiLogo();
+    },
     headerTitle: '',
-    headerRight: () =>
-      I18nManager.isRTL ? SvgImage.InjiLogo() : screenOptions,
+    headerRight: () => (
+      <Row align="space-between">
+        <HelpScreen
+          source={'Inji'}
+          triggerComponent={
+            <Icon
+              {...testIDProps('help')}
+              accessible={true}
+              name="question"
+              type="font-awesome"
+              size={21}
+              style={Theme.Styles.IconContainer}
+              color={Theme.Colors.Icon}
+            />
+          }
+        />
+
+        <SettingScreen
+          triggerComponent={
+            <Icon
+              {...testIDProps('settings')}
+              accessible={true}
+              name="settings"
+              type="simple-line-icon"
+              size={21}
+              style={Theme.Styles.IconContainer}
+              color={Theme.Colors.Icon}
+            />
+          }
+          navigation={props.navigation}
+          route={undefined}
+        />
+      </Row>
+    ),
   };
 
   return (
diff --git a/screens/Issuers/IssuerScreenController.tsx b/screens/Issuers/IssuerScreenController.tsx
index 3c1988123e..597849c39b 100644
--- a/screens/Issuers/IssuerScreenController.tsx
+++ b/screens/Issuers/IssuerScreenController.tsx
@@ -10,10 +10,12 @@ import {
   selectIssuers,
   selectLoadingReason,
   selectStoring,
+  selectVerificationErrorMessage,
 } from '../../machines/issuersMachine';
 import {ActorRefFrom} from 'xstate';
 import {BOTTOM_TAB_ROUTES} from '../../routes/routesConstants';
 import {logState} from '../../shared/commonUtil';
+import {isAndroid} from '../../shared/constants';
 
 export function useIssuerScreenController({route, navigation}) {
   const service = route.params.service;
@@ -28,6 +30,10 @@ export function useIssuerScreenController({route, navigation}) {
     isIdle: useSelector(service, selectIsIdle),
     loadingReason: useSelector(service, selectLoadingReason),
     isStoring: useSelector(service, selectStoring),
+    verificationErrorMessage: useSelector(
+      service,
+      selectVerificationErrorMessage,
+    ),
 
     CANCEL: () => service.send(IssuerScreenTabEvents.CANCEL()),
     SELECTED_ISSUER: id =>
@@ -38,6 +44,18 @@ export function useIssuerScreenController({route, navigation}) {
       service.send(IssuerScreenTabEvents.DOWNLOAD_ID());
       navigation.navigate(BOTTOM_TAB_ROUTES.home, {screen: 'HomeScreen'});
     },
+    RESET_VERIFY_ERROR: () => {
+      service.send(IssuerScreenTabEvents.RESET_VERIFY_ERROR());
+      if (isAndroid()) {
+        navigation.navigate(BOTTOM_TAB_ROUTES.home, {screen: 'HomeScreen'});
+      } else {
+        setTimeout(
+          () =>
+            navigation.navigate(BOTTOM_TAB_ROUTES.home, {screen: 'HomeScreen'}),
+          0,
+        );
+      }
+    },
   };
 }
 
diff --git a/screens/Issuers/IssuersScreen.tsx b/screens/Issuers/IssuersScreen.tsx
index 8235e54e54..0c34866ade 100644
--- a/screens/Issuers/IssuersScreen.tsx
+++ b/screens/Issuers/IssuersScreen.tsx
@@ -41,6 +41,12 @@ export const IssuersScreen: React.FC<
   const [tapToSearch, setTapToSearch] = useState(false);
   const [clearSearchIcon, setClearSearchIcon] = useState(false);
 
+  const isVerificationFailed = controller.verificationErrorMessage !== '';
+
+  const verificationErrorMessage = t(
+    `MyVcsTab:errors.verificationFailed.${controller.verificationErrorMessage}`,
+  );
+
   useLayoutEffect(() => {
     if (controller.loadingReason || controller.errorMessageType) {
       props.navigation.setOptions({
@@ -134,6 +140,25 @@ export const IssuersScreen: React.FC<
     }
   };
 
+  if (isVerificationFailed) {
+    return (
+      <Error
+        testID="verificationError"
+        isVisible={isVerificationFailed}
+        isModal={true}
+        alignActionsOnEnd
+        title={t('MyVcsTab:errors.verificationFailed.title')}
+        message={verificationErrorMessage}
+        image={SvgImage.PermissionDenied()}
+        showClose={false}
+        primaryButtonText="goBack"
+        primaryButtonEvent={controller.RESET_VERIFY_ERROR}
+        primaryButtonTestID="goBack"
+        customStyles={{marginTop: '30%'}}
+      />
+    );
+  }
+
   if (controller.isBiometricsCancelled) {
     return (
       <MessageOverlay
diff --git a/screens/MainLayout.tsx b/screens/MainLayout.tsx
index 81069fe7f2..b61ed1cffb 100644
--- a/screens/MainLayout.tsx
+++ b/screens/MainLayout.tsx
@@ -3,11 +3,16 @@ import {
   BottomTabNavigationOptions,
   createBottomTabNavigator,
 } from '@react-navigation/bottom-tabs';
+import {Icon} from 'react-native-elements';
 import {RequestRouteProps, RootRouteProps} from '../routes';
 import {mainRoutes, share} from '../routes/main';
 import {Theme} from '../components/ui/styleUtils';
 import {useTranslation} from 'react-i18next';
-import {Column} from '../components/ui';
+import {Column, Row} from '../components/ui';
+import {Image} from 'react-native';
+import {SettingScreen} from './Settings/SettingScreen';
+import {HelpScreen} from '../components/HelpScreen';
+
 import {GlobalContext} from '../shared/GlobalContext';
 import {ScanEvents} from '../machines/bleShare/scan/scanMachine';
 import testIDProps from '../shared/commonUtil';
diff --git a/screens/QrLogin/QrConsent.tsx b/screens/QrLogin/QrConsent.tsx
index 60ca766d1b..66563a0125 100644
--- a/screens/QrLogin/QrConsent.tsx
+++ b/screens/QrLogin/QrConsent.tsx
@@ -8,7 +8,7 @@ import {Icon, ListItem, Switch} from 'react-native-elements';
 import {Modal} from '../../components/ui/Modal';
 import {QrLoginRef} from '../../machines/QrLoginMachine';
 import {ScrollView} from 'react-native';
-import {getLocalizedField} from '../../i18n';
+import {getClientNameForCurrentLanguage} from '../../i18n';
 
 export const QrConsent: React.FC<QrConsentProps> = props => {
   const {t} = useTranslation('QrLogin');
@@ -40,7 +40,7 @@ export const QrConsent: React.FC<QrConsentProps> = props => {
             style={Theme.TextStyles.small}
             weight="bold"
             margin={'10 0 0 0'}>
-            {getLocalizedField(controller.clientName)} {t('access')}
+            {getClientNameForCurrentLanguage(controller.clientName)} {t('access')}
           </Text>
         </Column>
         <ScrollView>
diff --git a/screens/QrLogin/QrLoginSuccessMessage.tsx b/screens/QrLogin/QrLoginSuccessMessage.tsx
index d238c576f8..43c6c360b5 100644
--- a/screens/QrLogin/QrLoginSuccessMessage.tsx
+++ b/screens/QrLogin/QrLoginSuccessMessage.tsx
@@ -7,7 +7,7 @@ import {Centered, Button, Text, Column} from '../../components/ui';
 import {Theme} from '../../components/ui/styleUtils';
 import {useQrLogin} from './QrLoginController';
 import {QrLoginRef} from '../../machines/QrLoginMachine';
-import {getLocalizedField} from '../../i18n';
+import {getClientNameForCurrentLanguage} from '../../i18n';
 
 export const QrLoginSuccess: React.FC<QrLoginSuccessProps> = props => {
   const {t} = useTranslation('QrLogin');
@@ -35,7 +35,7 @@ export const QrLoginSuccess: React.FC<QrLoginSuccessProps> = props => {
             margin="20 0 0 0"
             align="center">
             {t('successMessage')}
-            {getLocalizedField(controller.clientName)}
+            {getClientNameForCurrentLanguage(controller.clientName)}
           </Text>
         </Centered>
         <Column
diff --git a/screens/Request/RequestLayout.tsx b/screens/Request/RequestLayout.tsx
index f9709be86d..55e3cebd36 100644
--- a/screens/Request/RequestLayout.tsx
+++ b/screens/Request/RequestLayout.tsx
@@ -12,9 +12,6 @@ import {REQUEST_ROUTES} from '../../routes/routesConstants';
 import {SquircleIconPopUpModal} from '../../components/ui/SquircleIconPopUpModal';
 import {ProgressingModal} from '../../components/ProgressingModal';
 import {BannerNotificationContainer} from '../../components/BannerNotificationContainer';
-import {Theme} from '../../components/ui/styleUtils';
-import {I18nManager} from 'react-native';
-
 const RequestStack = createNativeStackNavigator();
 
 export const RequestLayout: React.FC = () => {
@@ -44,26 +41,13 @@ export const RequestLayout: React.FC = () => {
             component={ReceiveVcScreen}
             options={{
               title: t('incomingVc'),
-              headerLeft: () =>
-                !I18nManager.isRTL && (
-                  <HeaderBackButton
-                    onPress={() => {
-                      controller.RESET();
-                    }}
-                    style={Theme.Styles.IconContainer}
-                    tintColor={Theme.Colors.Icon}
-                  />
-                ),
-              headerRight: () =>
-                I18nManager.isRTL && (
-                  <HeaderBackButton
-                    onPress={() => {
-                      controller.RESET();
-                    }}
-                    style={Theme.Styles.IconContainer}
-                    tintColor={Theme.Colors.Icon}
-                  />
-                ),
+              headerLeft: () => (
+                <HeaderBackButton
+                  onPress={() => {
+                    controller.RESET();
+                  }}
+                />
+              ),
             }}
           />
         )}
@@ -72,26 +56,6 @@ export const RequestLayout: React.FC = () => {
           component={RequestScreen}
           options={{
             title: t('receiveCard').toUpperCase(),
-            headerRight: () =>
-              I18nManager.isRTL && (
-                <HeaderBackButton
-                  onPress={() => {
-                    controller.GOTO_HOME();
-                  }}
-                  style={Theme.Styles.IconContainer}
-                  tintColor={Theme.Colors.Icon}
-                />
-              ),
-            headerLeft: () =>
-              !I18nManager.isRTL && (
-                <HeaderBackButton
-                  onPress={() => {
-                    controller.GOTO_HOME();
-                  }}
-                  style={Theme.Styles.IconContainer}
-                  tintColor={Theme.Colors.Icon}
-                />
-              ),
           }}
         />
       </RequestStack.Navigator>
diff --git a/screens/Request/RequestLayoutController.ts b/screens/Request/RequestLayoutController.ts
index 68f3562b38..40cf358337 100644
--- a/screens/Request/RequestLayoutController.ts
+++ b/screens/Request/RequestLayoutController.ts
@@ -92,6 +92,5 @@ export function useRequestLayout() {
     isNavigatingToReceivedCards,
     DISMISS: () => requestService.send(RequestEvents.DISMISS()),
     RESET: () => requestService.send(RequestEvents.RESET()),
-    GOTO_HOME: () => navigation.navigate(BOTTOM_TAB_ROUTES.home),
   };
 }
diff --git a/screens/Scan/ScanLayout.tsx b/screens/Scan/ScanLayout.tsx
index 2f28887d8e..73faf953b8 100644
--- a/screens/Scan/ScanLayout.tsx
+++ b/screens/Scan/ScanLayout.tsx
@@ -10,8 +10,6 @@ import {SharingSuccessModal} from './SuccessfullySharedModal';
 import {Theme} from '../../components/ui/styleUtils';
 import {Icon} from 'react-native-elements';
 import {Loader} from '../../components/ui/Loader';
-import {Text} from '../../components/ui';
-import {I18nManager, View} from 'react-native';
 
 const ScanStack = createNativeStackNavigator();
 
@@ -49,31 +47,14 @@ export const ScanLayout: React.FC = () => {
             component={SendVcScreen}
             options={{
               title: t('sharingVc'),
-              headerTitleAlign: 'center',
-              headerTitle: props => (
-                <View style={Theme.Styles.sendVcHeaderContainer}>
-                  <Text style={Theme.Styles.scanLayoutHeaderTitle}>
-                    {props.children}
-                  </Text>
-                </View>
-              ),
               headerBackVisible: false,
-              headerRight: () =>
-                !I18nManager.isRTL && (
-                  <Icon
-                    name="close"
-                    color={Theme.Colors.blackIcon}
-                    onPress={controller.CANCEL}
-                  />
-                ),
-              headerLeft: () =>
-                I18nManager.isRTL && (
-                  <Icon
-                    name="close"
-                    color={Theme.Colors.blackIcon}
-                    onPress={controller.CANCEL}
-                  />
-                ),
+              headerRight: () => (
+                <Icon
+                  name="close"
+                  color={Theme.Colors.blackIcon}
+                  onPress={controller.CANCEL}
+                />
+              ),
             }}
           />
         )}
@@ -81,14 +62,8 @@ export const ScanLayout: React.FC = () => {
           name={SCAN_ROUTES.ScanScreen}
           component={ScanScreen}
           options={{
+            headerTitleStyle: {fontSize: 30, fontFamily: 'Inter_600SemiBold'},
             title: t('MainLayout:share'),
-            headerTitle: props => (
-              <View style={Theme.Styles.scanLayoutHeaderContainer}>
-                <Text style={Theme.Styles.scanLayoutHeaderTitle}>
-                  {props.children}
-                </Text>
-              </View>
-            ),
           }}
         />
       </ScanStack.Navigator>
diff --git a/screens/Scan/ScanScreen.tsx b/screens/Scan/ScanScreen.tsx
index b66c99b0fd..da384c60e8 100644
--- a/screens/Scan/ScanScreen.tsx
+++ b/screens/Scan/ScanScreen.tsx
@@ -8,12 +8,18 @@ import {QrLogin} from '../QrLogin/QrLogin';
 import {useScanScreen} from './ScanScreenController';
 import BluetoothStateManager from 'react-native-bluetooth-state-manager';
 import {Linking} from 'react-native';
+import {useNavigation, NavigationProp} from '@react-navigation/native';
+import {MainBottomTabParamList} from '../../routes/main';
+import {BOTTOM_TAB_ROUTES} from '../../routes/routesConstants';
 import {isIOS} from '../../shared/constants';
 import {BannerNotificationContainer} from '../../components/BannerNotificationContainer';
 
 export const ScanScreen: React.FC = () => {
+  type ScanScreenNavigation = NavigationProp<MainBottomTabParamList>;
+
   const {t} = useTranslation('ScanScreen');
   const controller = useScanScreen();
+  const navigation = useNavigation<ScanScreenNavigation>();
   const [isBluetoothOn, setIsBluetoothOn] = useState(false);
 
   useEffect(() => {
@@ -78,8 +84,7 @@ export const ScanScreen: React.FC = () => {
         <Button
           testID="enableBluetoothButton"
           title={t('enableBluetoothButtonText')}
-          onPress={openSettings}
-        />
+          onPress={openSettings}></Button>
       </Column>
     );
   }
@@ -99,8 +104,7 @@ export const ScanScreen: React.FC = () => {
         <Button
           testID="allowNearbyDevicesPermissionButton"
           title={t('errors.nearbyDevicesPermissionDenied.button')}
-          onPress={openSettings}
-        />
+          onPress={openSettings}></Button>
       </Column>
     );
   }
@@ -172,7 +176,7 @@ export const ScanScreen: React.FC = () => {
           }
           translationPath={'ScanScreen'}
           error="errors.storageLimitReached"
-          onBackdropPress={controller.GOTO_HOME}
+          onBackdropPress={() => navigation.navigate(BOTTOM_TAB_ROUTES.home)}
         />
       )
     );
@@ -193,7 +197,7 @@ export const ScanScreen: React.FC = () => {
               fill
               type="clear"
               title={t('common:cancel')}
-              onPress={controller.GOTO_HOME}
+              onPress={() => navigation.navigate(BOTTOM_TAB_ROUTES.home)}
               margin={[0, 8, 0, 0]}
             />
             <Button
diff --git a/screens/Scan/ScanScreenController.ts b/screens/Scan/ScanScreenController.ts
index 595c5f0226..7a9a9c5c93 100644
--- a/screens/Scan/ScanScreenController.ts
+++ b/screens/Scan/ScanScreenController.ts
@@ -23,9 +23,6 @@ import {
   ScanEvents,
   selectIsMinimumStorageRequiredForAuditEntryLimitReached,
 } from '../../machines/bleShare/scan/scanMachine';
-import {BOTTOM_TAB_ROUTES} from '../../routes/routesConstants';
-import {MainBottomTabParamList} from '../../routes/main';
-import {useNavigation, NavigationProp} from '@react-navigation/native';
 
 export function useScanScreen() {
   const {t} = useTranslation('ScanScreen');
@@ -70,9 +67,7 @@ export function useScanScreen() {
     locationError.message = t('errors.locationDenied.message');
     locationError.button = t('errors.locationDenied.button');
   }
-  type ScanScreenNavigation = NavigationProp<MainBottomTabParamList>;
-  const navigation = useNavigation<ScanScreenNavigation>();
-  const GOTO_HOME = () => navigation.navigate(BOTTOM_TAB_ROUTES.home);
+
   return {
     locationError,
     isEmpty: !shareableVcsMetadata.length,
@@ -95,6 +90,5 @@ export function useScanScreen() {
     START_PERMISSION_CHECK: () =>
       scanService.send(ScanEvents.START_PERMISSION_CHECK()),
     SCAN: (qrCode: string) => scanService.send(ScanEvents.SCAN(qrCode)),
-    GOTO_HOME,
   };
 }
diff --git a/screens/Scan/SendVcScreen.tsx b/screens/Scan/SendVcScreen.tsx
index acd31d8fca..9d8ed8fada 100644
--- a/screens/Scan/SendVcScreen.tsx
+++ b/screens/Scan/SendVcScreen.tsx
@@ -105,8 +105,10 @@ export const SendVcScreen: React.FC = () => {
           backgroundColor={Theme.Colors.whiteBackgroundColor}>
           {!controller.selectedVc.shouldVerifyPresence &&
             controller.selectedVc?.vcMetadata &&
-            VCMetadata.fromVcMetadataString(controller.selectedVc.vcMetadata)
-              .issuer != Issuers.Sunbird && (
+            [Issuers.Mosip, Issuers.ESignet].indexOf(
+              VCMetadata.fromVcMetadataString(controller.selectedVc.vcMetadata)
+                .issuer,
+            ) !== -1 && (
               <Button
                 type="gradient"
                 title={t('acceptRequestAndVerify')}
diff --git a/screens/Scan/SendVcScreenController.ts b/screens/Scan/SendVcScreenController.ts
index 2c8246fde6..4bd98f201c 100644
--- a/screens/Scan/SendVcScreenController.ts
+++ b/screens/Scan/SendVcScreenController.ts
@@ -6,7 +6,6 @@ import {ExistingMosipVCItemMachine} from '../../machines/VCItemMachine/ExistingM
 import {GlobalContext} from '../../shared/GlobalContext';
 import {
   selectIsSelectingVc,
-  selectReason,
   selectReceiverInfo,
   selectSelectedVc,
   selectVcName,
@@ -40,7 +39,6 @@ export function useSendVcScreen() {
       },
 
     receiverInfo: useSelector(scanService, selectReceiverInfo),
-    reason: useSelector(scanService, selectReason),
     vcName: useSelector(scanService, selectVcName),
     shareableVcsMetadata: useSelector(vcService, selectShareableVcsMetadata),
     selectedVc: useSelector(scanService, selectSelectedVc),
@@ -55,8 +53,6 @@ export function useSendVcScreen() {
     VERIFY_AND_ACCEPT_REQUEST: () =>
       scanService.send(ScanEvents.VERIFY_AND_ACCEPT_REQUEST()),
     DISMISS: () => scanService.send(ScanEvents.DISMISS()),
-    UPDATE_REASON: (reason: string) =>
-      scanService.send(ScanEvents.UPDATE_REASON(reason)),
     UPDATE_VC_NAME: (vcName: string) =>
       scanService.send(ScanEvents.UPDATE_VC_NAME(vcName)),
     FACE_VALID: () => scanService.send(ScanEvents.FACE_VALID()),
diff --git a/screens/Scan/SuccessfullySharedModal.tsx b/screens/Scan/SuccessfullySharedModal.tsx
index 3a3c0fa56f..3968de9c56 100644
--- a/screens/Scan/SuccessfullySharedModal.tsx
+++ b/screens/Scan/SuccessfullySharedModal.tsx
@@ -5,7 +5,6 @@ import {Modal} from '../../components/ui/Modal';
 import {Pressable, Dimensions} from 'react-native';
 import {Column, Row, Text} from '../../components/ui';
 import {useScanLayout} from './ScanLayoutController';
-import {useSendVcScreen} from './SendVcScreenController';
 import testIDProps from '../../shared/commonUtil';
 import {SvgImage} from '../../components/ui/svg';
 import {Icon} from 'react-native-elements';
@@ -15,7 +14,6 @@ export const SharingSuccessModal: React.FC<
 > = props => {
   const {t} = useTranslation('ScanScreen');
   const scanLayoutController = useScanLayout();
-  const sendVcScreenController = useSendVcScreen();
 
   return (
     <React.Fragment>
diff --git a/screens/Settings/BackupRestoreController.tsx b/screens/Settings/BackupRestoreController.tsx
index 3e9a30fdc7..63bd26a2f6 100644
--- a/screens/Settings/BackupRestoreController.tsx
+++ b/screens/Settings/BackupRestoreController.tsx
@@ -6,15 +6,12 @@ import {
   selectIsBackUpRestoreFailure,
   selectIsBackUpRestoreSuccess,
   selectErrorReason,
-  selectIsCheckStorageAvailibility,
-} from '../../machines/backupRestore';
+} from '../../machines/backupAndRestore/backupRestore';
 import {GlobalContext} from '../../shared/GlobalContext';
-import {VcEvents} from '../../machines/VCItemMachine/vc';
 
 export function useBackupRestoreScreen() {
   const {appService} = useContext(GlobalContext);
   const backupRestoreService = appService.children.get('backupRestore');
-  const vcService = appService.children.get('vc');
 
   return {
     isBackUpRestoring: useSelector(
@@ -30,22 +27,15 @@ export function useBackupRestoreScreen() {
       backupRestoreService,
       selectIsBackUpRestoreFailure,
     ),
-    isCheckStorageAvailibility: useSelector(
-      backupRestoreService,
-      selectIsCheckStorageAvailibility,
-    ),
+    DOWNLOAD_UNSYNCED_BACKUP_FILES: () =>
+      backupRestoreService?.send(
+        BackupRestoreEvents.DOWNLOAD_UNSYNCED_BACKUP_FILES(),
+      ),
     BACKUP_RESTORE: () => {
       backupRestoreService.send(BackupRestoreEvents.BACKUP_RESTORE());
     },
-    EXTRACT_DATA: () => {
-      backupRestoreService.send(BackupRestoreEvents.EXTRACT_DATA());
-    },
     DISMISS: () => {
       backupRestoreService.send(BackupRestoreEvents.DISMISS());
     },
-    OK: () => {
-      backupRestoreService.send(BackupRestoreEvents.OK());
-      vcService?.send(VcEvents.REFRESH_MY_VCS());
-    },
   };
 }
diff --git a/screens/Settings/DataBackupAndRestore.tsx b/screens/Settings/DataBackupAndRestore.tsx
index 0bc68a6891..c0181c46f4 100644
--- a/screens/Settings/DataBackupAndRestore.tsx
+++ b/screens/Settings/DataBackupAndRestore.tsx
@@ -10,25 +10,49 @@ import {SvgImage} from '../../components/ui/svg';
 import {AccountSelectionConfirmation} from '../backupAndRestore/AccountSelectionConfirmation';
 import {useBackupAndRestoreSetup} from '../backupAndRestore/BackupAndRestoreSetupController';
 import BackupAndRestoreScreen from '../backupAndRestore/BackupAndRestoreScreen';
-import testIDProps from '../../shared/commonUtil';
+import testIDProps, {getDriveName} from '../../shared/commonUtil';
+import {useOverlayVisibleAfterTimeout} from '../../shared/hooks/useOverlayVisibleAfterTimeout';
+import {isAndroid} from '../../shared/constants';
 
 export const DataBackupAndRestore: React.FC = ({} = () => {
   const controller = useBackupAndRestoreSetup();
+  const delay = isAndroid() ? 0 : 1000;
   const {t} = useTranslation('DataBackupScreen');
+  const accountSelectionModalVisible = useOverlayVisibleAfterTimeout(
+    controller.showAccountSelectionConfirmation,
+    delay,
+  );
+  const isLoaderVisible = useOverlayVisibleAfterTimeout(
+    controller.isLoading,
+    delay,
+  );
+  const isSigningInSuccessful = useOverlayVisibleAfterTimeout(
+    controller.isSigningInSuccessful,
+    delay,
+  );
+  const isSigningIn = useOverlayVisibleAfterTimeout(
+    controller.isSigningIn,
+    delay,
+  );
 
   return (
     <React.Fragment>
-      <Pressable onPress={controller.BACKUP_AND_RESTORE}>
+      <Pressable
+        accessible={false}
+        {...testIDProps('dataBackupAndRestore')}
+        onPress={controller.BACKUP_AND_RESTORE}>
         <ListItem topDivider bottomDivider>
           {SvgImage.DataBackupIcon(25, 25)}
           <ListItem.Content>
-            <ListItem.Title style={{paddingTop: 3}}>
+            <ListItem.Title
+              accessible={false}
+              {...testIDProps('dataBackupAndRestoreText')}>
               <Row>
                 <Text
-                  testID="dataBackupAndRestore"
+                  testID="dataBackupAndRestoreText"
                   weight="semibold"
                   color={Theme.Colors.settingsLabel}
-                  style={{paddingRight: 10}}>
+                  style={{paddingRight: 10, paddingTop: 10}}>
                   {t('dataBackupAndRestore')}
                 </Text>
                 {!controller.isBackupAndRestoreExplored && (
@@ -45,7 +69,7 @@ export const DataBackupAndRestore: React.FC = ({} = () => {
           <Icon
             name="chevron-right"
             size={21}
-            {...testIDProps('rightArrowIcon')}
+            {...testIDProps('dataBackupAndRestoreChevronRight')}
             color={Theme.Colors.chevronRightColor}
             style={{marginRight: 15}}
           />
@@ -59,13 +83,17 @@ export const DataBackupAndRestore: React.FC = ({} = () => {
           showClose={false}
           isVisible={controller.isSigningInFailed}
           title={t('errors.permissionDenied.title')}
-          message={t('errors.permissionDenied.message')}
+          message={t('errors.permissionDenied.message', {
+            driveName: getDriveName(),
+          })}
           helpText={t('errors.permissionDenied.helpText')}
           image={SvgImage.PermissionDenied()}
           primaryButtonText={
             'DataBackupScreen:errors.permissionDenied.actions.allowAccess'
           }
-          primaryButtonEvent={controller.TRY_AGAIN}
+          primaryButtonEvent={
+            isAndroid() ? controller.TRY_AGAIN : controller.OPEN_SETTINGS
+          }
           textButtonText={
             'DataBackupScreen:errors.permissionDenied.actions.notNow'
           }
@@ -95,7 +123,7 @@ export const DataBackupAndRestore: React.FC = ({} = () => {
         />
       )}
 
-      {(controller.isSigningIn || controller.isSigningInSuccessful) && (
+      {(isSigningIn || isSigningInSuccessful) && (
         <BackupAndRestoreScreen
           profileInfo={controller.profileInfo}
           onBackPress={controller.GO_BACK}
@@ -103,17 +131,13 @@ export const DataBackupAndRestore: React.FC = ({} = () => {
           shouldTriggerAutoBackup={controller.shouldTriggerAutoBackup}
         />
       )}
-      {controller.isLoading && (
-        <Loader title={t('loadingSubtitle')} isModal></Loader>
-      )}
+      {isLoaderVisible && <Loader title={t('loadingSubtitle')} isModal />}
 
-      {controller.showAccountSelectionConfirmation && (
-        <AccountSelectionConfirmation
-          isVisible={controller.showAccountSelectionConfirmation}
-          onProceed={controller.PROCEED_ACCOUNT_SELECTION}
-          goBack={controller.GO_BACK}
-        />
-      )}
+      <AccountSelectionConfirmation
+        isVisible={accountSelectionModalVisible}
+        onProceed={controller.PROCEED_ACCOUNT_SELECTION}
+        goBack={controller.GO_BACK}
+      />
     </React.Fragment>
   );
 });
diff --git a/screens/Settings/SettingScreen.tsx b/screens/Settings/SettingScreen.tsx
index 07e994be30..a7913a4b85 100644
--- a/screens/Settings/SettingScreen.tsx
+++ b/screens/Settings/SettingScreen.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Platform, Pressable, Image} from 'react-native';
+import {Platform, Pressable} from 'react-native';
 import {Icon, ListItem, Switch} from 'react-native-elements';
 import {Column, Row, Text} from '../../components/ui';
 import {Theme} from '../../components/ui/styleUtils';
@@ -17,7 +17,6 @@ import {ReceivedCards} from './ReceivedCards';
 import testIDProps from '../../shared/commonUtil';
 import {SvgImage} from '../../components/ui/svg';
 import {DataBackupAndRestore} from './DataBackupAndRestore';
-import {isAndroid} from '../../shared/constants';
 import {BannerNotificationContainer} from '../../components/BannerNotificationContainer';
 
 const LanguageSetting: React.FC = () => {
@@ -162,7 +161,7 @@ export const SettingScreen: React.FC<
 
             <AboutInji appId={controller.appId} />
 
-            {isAndroid() && <DataBackupAndRestore />}
+            <DataBackupAndRestore />
 
             {CREDENTIAL_REGISTRY_EDIT === 'true' && (
               <EditableListItem
diff --git a/screens/SetupLanguageScreen.tsx b/screens/SetupLanguageScreen.tsx
index c0a8e12144..a33683d9b3 100644
--- a/screens/SetupLanguageScreen.tsx
+++ b/screens/SetupLanguageScreen.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import i18n, {SUPPORTED_LANGUAGES} from '../i18n';
 import {useTranslation} from 'react-i18next';
 import {SetupPicker} from '../components/ui/SetupPicker';
@@ -9,14 +9,20 @@ import {RootRouteProps} from '../routes';
 import {useWelcomeScreen} from './WelcomeScreenController';
 import {changeLanguage} from '../components/LanguageSelector';
 import {Dimensions} from 'react-native';
+import {useBackupRestoreScreen} from './Settings/BackupRestoreController';
 
 export const SetupLanguageScreen: React.FC<RootRouteProps> = props => {
   const {t} = useTranslation('SetupLanguage');
   const controller = useWelcomeScreen(props);
+  const backupRestoreController = useBackupRestoreScreen();
   const languages = Object.entries(SUPPORTED_LANGUAGES).map(
     ([value, label]) => ({label, value}),
   );
 
+  useEffect(() => {
+    backupRestoreController.DOWNLOAD_UNSYNCED_BACKUP_FILES();
+  }, []);
+
   return (
     <Column style={Theme.SetupLanguageScreenStyle.columnStyle}>
       <Icon
diff --git a/screens/backupAndRestore/AccountSelectionConfirmation.tsx b/screens/backupAndRestore/AccountSelectionConfirmation.tsx
index ee55970e7c..6ea09309a7 100644
--- a/screens/backupAndRestore/AccountSelectionConfirmation.tsx
+++ b/screens/backupAndRestore/AccountSelectionConfirmation.tsx
@@ -8,9 +8,11 @@ import {
   Row,
   Text,
 } from '../../components/ui';
-import {Modal} from '../../components/ui/Modal';
 import {Theme} from '../../components/ui/styleUtils';
 import {SvgImage} from '../../components/ui/svg';
+import {DRIVE_NAME_MATCHER, isAndroid} from '../../shared/constants';
+import {getDriveName} from '../../shared/commonUtil';
+import {Modal} from '../../components/ui/Modal';
 
 export const AccountSelectionConfirmation: React.FC<
   AccountSelectionConfirmationProps
@@ -39,7 +41,7 @@ export const AccountSelectionConfirmation: React.FC<
             color={Theme.Colors.GrayText}
             testID="cloudInfo"
             style={Theme.BackupAndRestoreStyles.cloudInfo}>
-            {t('cloudInfo')}
+            {t('cloudInfo', {driveName: getDriveName()})}
           </Text>
         </Column>
 
@@ -48,12 +50,9 @@ export const AccountSelectionConfirmation: React.FC<
           crossAlign="center"
           style={{paddingHorizontal: 120, paddingTop: 50}}>
           <Row>
-            {SvgImage.GoogleDriveIcon(45, 45)}
-            <Text
-              style={Theme.BackupAndRestoreStyles.cloudLabel}
-              testID="googleDriveTitle">
-              {t('googleDriveTitle')}
-            </Text>
+            {isAndroid()
+              ? SvgImage.GoogleDriveIcon(207, 45)
+              : SvgImage.ICloudIcon(210, 45)}
           </Row>
         </HorizontallyCentered>
 
diff --git a/screens/backupAndRestore/BackupAndRestoreScreen.tsx b/screens/backupAndRestore/BackupAndRestoreScreen.tsx
index 01c257c597..a93b78a17d 100644
--- a/screens/backupAndRestore/BackupAndRestoreScreen.tsx
+++ b/screens/backupAndRestore/BackupAndRestoreScreen.tsx
@@ -9,13 +9,14 @@ import {Modal} from '../../components/ui/Modal';
 import {Timestamp} from '../../components/ui/Timestamp';
 import {Theme} from '../../components/ui/styleUtils';
 import {SvgImage} from '../../components/ui/svg';
-import {ProfileInfo} from '../../shared/googleCloudUtils';
+import {ProfileInfo} from '../../shared/CloudBackupAndRestoreUtils';
 import {useBackupScreen} from './BackupController';
 import {BannerNotificationContainer} from '../../components/BannerNotificationContainer';
 import {useBackupRestoreScreen} from '../Settings/BackupRestoreController';
 import {Icon} from 'react-native-elements';
-import testIDProps from '../../shared/commonUtil';
+import testIDProps, {getDriveName} from '../../shared/commonUtil';
 import {HelpScreen} from '../../components/HelpScreen';
+import {isAndroid, isIOS} from '../../shared/constants';
 
 const BackupAndRestoreScreen: React.FC<BackupAndRestoreProps> = props => {
   const backupController = useBackupScreen();
@@ -24,10 +25,13 @@ const BackupAndRestoreScreen: React.FC<BackupAndRestoreProps> = props => {
   const {t} = useTranslation('BackupAndRestore');
 
   useEffect(() => {
-    if (!props.isLoading && backupController.lastBackupDetails === null) {
+    const shouldFetchlastBackupDetails = isIOS()
+      ? !props.isLoading
+      : !props.isLoading && backupController.lastBackupDetails === null;
+    if (shouldFetchlastBackupDetails) {
       backupController.LAST_BACKUP_DETAILS();
     }
-  }, [props.isLoading, backupController.lastBackupDetails]);
+  }, [props.isLoading]);
 
   useEffect(() => {
     if (
@@ -43,9 +47,17 @@ const BackupAndRestoreScreen: React.FC<BackupAndRestoreProps> = props => {
     props.shouldTriggerAutoBackup,
   ]);
 
-  const Loading = (
+  function handleRestore() {
+    !backupController.isBackupInProgress && restoreController.BACKUP_RESTORE();
+  }
+
+  function handleBackup() {
+    !restoreController.isBackUpRestoring && backupController.DATA_BACKUP(false);
+  }
+
+  const Loading = testID => (
     <Centered fill>
-      <LoaderAnimation showLogo={false} />
+      <LoaderAnimation testID={testID} showLogo={false} />
     </Centered>
   );
 
@@ -102,21 +114,22 @@ const BackupAndRestoreScreen: React.FC<BackupAndRestoreProps> = props => {
             <Text
               testID="noBackup"
               style={Theme.BackupAndRestoreStyles.backupProgressText}>
-              {t('noBackup')}
+              {t('noBackup', {driveName: getDriveName()})}
             </Text>
           )}
         </View>
       </Row>
       <Row style={Theme.BackupAndRestoreStyles.actionOrLoaderContainer}>
         {backupController.isBackupInProgress ? (
-          Loading
+          Loading('backup')
         ) : (
           <Button
             testID="backup"
             type="gradient"
             title={t('backup')}
-            onPress={() => backupController.DATA_BACKUP(false)}
-            styles={{...Theme.MessageOverlayStyles.button, flex: 1}}
+            disabled={restoreController.isBackUpRestoring}
+            onPress={handleBackup}
+            styles={{flex: 1}}
           />
         )}
       </Row>
@@ -127,7 +140,7 @@ const BackupAndRestoreScreen: React.FC<BackupAndRestoreProps> = props => {
     <SectionLayout
       testId="AccountSection"
       headerText={t('driveSettings')}
-      headerIcon={SvgImage.GoogleDriveIcon(28, 25)}>
+      headerIcon={SvgImage.GoogleDriveIconSmall(28, 25)}>
       <View style={{marginBottom: 19}}>
         <Text
           testID="storageInfo"
@@ -159,19 +172,20 @@ const BackupAndRestoreScreen: React.FC<BackupAndRestoreProps> = props => {
             }>
             {restoreController.isBackUpRestoring
               ? t('restoreInProgress')
-              : t('restoreInfo')}
+              : t('restoreInfo', {driveName: getDriveName()})}
           </Text>
         </View>
       </Row>
       <Row style={Theme.BackupAndRestoreStyles.actionOrLoaderContainer}>
         {restoreController.isBackUpRestoring ? (
-          Loading
+          Loading('restore')
         ) : (
           <Button
             testID="restore"
             type="outline"
             title={t('restore')}
-            onPress={restoreController.BACKUP_RESTORE}
+            disabled={backupController.isBackupInProgress}
+            onPress={handleRestore}
             styles={{...Theme.MessageOverlayStyles.button, marginTop: 10}}
           />
         )}
@@ -211,12 +225,12 @@ const BackupAndRestoreScreen: React.FC<BackupAndRestoreProps> = props => {
         }}>
         {props.isLoading || backupController.isLoading ? (
           <Column fill align="center" crossAlign="center">
-            <LoaderAnimation />
+            <LoaderAnimation testID="backupAndRestoreScreen" />
           </Column>
         ) : (
           <ScrollView>
             {LastBackupSection}
-            {AccountSection}
+            {isAndroid() && AccountSection}
             {RestoreSection}
           </ScrollView>
         )}
diff --git a/screens/backupAndRestore/BackupAndRestoreSetupController.ts b/screens/backupAndRestore/BackupAndRestoreSetupController.ts
index 96fff7cd62..2535c1c623 100644
--- a/screens/backupAndRestore/BackupAndRestoreSetupController.ts
+++ b/screens/backupAndRestore/BackupAndRestoreSetupController.ts
@@ -18,18 +18,21 @@ import {selectIsBackUpAndRestoreExplored} from '../../machines/settings';
 import {SettingsEvents} from '../../machines/settings';
 
 export function useBackupAndRestoreSetup() {
+  const {appService} = useContext(GlobalContext);
+  const settingsService = appService.children.get('settings');
+  const storeService = appService.children.get('store');
   const machine = useRef(
     backupAndRestoreSetupMachine.withContext({
       ...backupAndRestoreSetupMachine.context,
+      serviceRefs: {settings: settingsService, store: storeService},
     }),
   );
   const service = useInterpret(machine.current);
-  const {appService} = useContext(GlobalContext);
-  const settingsService = appService.children.get('settings');
   const isBackupAndRestoreExplored = useSelector(
     settingsService,
     selectIsBackUpAndRestoreExplored,
   );
+
   return {
     isLoading: useSelector(service, selectIsLoading),
     profileInfo: useSelector(service, selectProfileInfo),
@@ -51,14 +54,16 @@ export function useBackupAndRestoreSetup() {
         );
       }
     },
-      shouldTriggerAutoBackup: useSelector(
-          service,
-          selectShouldTriggerAutoBackup,
-        ),
+    shouldTriggerAutoBackup: useSelector(
+      service,
+      selectShouldTriggerAutoBackup,
+    ),
     PROCEED_ACCOUNT_SELECTION: () =>
       service.send(BackupAndRestoreSetupEvents.PROCEED()),
     GO_BACK: () => service.send(BackupAndRestoreSetupEvents.GO_BACK()),
     TRY_AGAIN: () => service.send(BackupAndRestoreSetupEvents.TRY_AGAIN()),
+    OPEN_SETTINGS: () =>
+      service.send(BackupAndRestoreSetupEvents.OPEN_SETTINGS()),
     DISMISS: () => service.send(BackupAndRestoreSetupEvents.DISMISS()),
   };
 }
diff --git a/screens/backupAndRestore/BackupController.tsx b/screens/backupAndRestore/BackupController.tsx
index 4a84a1bb7d..3fa6497b59 100644
--- a/screens/backupAndRestore/BackupController.tsx
+++ b/screens/backupAndRestore/BackupController.tsx
@@ -2,15 +2,12 @@ import {useSelector} from '@xstate/react';
 import {useContext} from 'react';
 import {
   BackupEvents,
-  selectIsBackingUp,
   selectIsBackingUpSuccess,
   selectIsBackingUpFailure,
   selectIsBackupInprogress,
   selectBackupErrorReason,
   lastBackupDetails,
   selectIsLoading,
-  selectIsFetchingLastBackupDetails,
-  selectIsCheckingDataAvailabilityForBackup,
 } from '../../machines/backupAndRestore/backup';
 import {GlobalContext} from '../../shared/GlobalContext';
 
@@ -22,45 +19,18 @@ export function useBackupScreen() {
     lastBackupDetails: useSelector(backupService, lastBackupDetails),
     isLoading: useSelector(backupService, selectIsLoading),
     backupErrorReason: useSelector(backupService, selectBackupErrorReason),
-    isBackingUp: useSelector(backupService, selectIsBackingUp),
-    isFetchingLastBackupDetails: useSelector(
-      backupService,
-      selectIsFetchingLastBackupDetails,
-    ),
     isBackingUpSuccess: useSelector(backupService, selectIsBackingUpSuccess),
     isBackingUpFailure: useSelector(backupService, selectIsBackingUpFailure),
     isBackupInProgress: useSelector(backupService, selectIsBackupInprogress),
     DATA_BACKUP: (isAutoBackup: boolean) => {
       backupService.send(BackupEvents.DATA_BACKUP(isAutoBackup));
     },
-    isCheckingDataForBackup: useSelector(
-      backupService,
-      selectIsCheckingDataAvailabilityForBackup,
-    ),
+
     LAST_BACKUP_DETAILS: () => {
       backupService?.send(BackupEvents.LAST_BACKUP_DETAILS());
     },
-    OK: () => {
-      backupService.send(BackupEvents.OK());
-    },
     DISMISS: () => {
       backupService.send(BackupEvents.DISMISS());
     },
-    FETCH_DATA: () => {
-      backupService.send(BackupEvents.FETCH_DATA());
-    },
-    PASSWORD: () => {
-      backupService.send(BackupEvents.PASSWORD());
-    },
-    SET_BASE_ENC_KEY: (key: string) => {
-      backupService.send(BackupEvents.SET_BASE_ENC_KEY(key));
-    },
-    PHONE_NUMBER: () => {
-      backupService.send(BackupEvents.PHONE_NUMBER());
-    },
-    SEND_OTP: () => {
-      backupService.send(BackupEvents.SEND_OTP());
-    },
-    INPUT_OTP: (otp: string) => backupService.send(BackupEvents.INPUT_OTP(otp)),
   };
 }
diff --git a/shared/googleCloudUtils.ts b/shared/CloudBackupAndRestoreUtils.ts
similarity index 60%
rename from shared/googleCloudUtils.ts
rename to shared/CloudBackupAndRestoreUtils.ts
index e6d6589c25..8f2618e4f0 100644
--- a/shared/googleCloudUtils.ts
+++ b/shared/CloudBackupAndRestoreUtils.ts
@@ -6,10 +6,16 @@ import {CloudStorage, CloudStorageScope} from 'react-native-cloud-storage';
 import {GOOGLE_ANDROID_CLIENT_ID} from 'react-native-dotenv';
 import {readFile, writeFile} from 'react-native-fs';
 import {BackupDetails} from '../types/backup-and-restore/backup';
-import {bytesToMB} from './commonUtil';
-import {NETWORK_REQUEST_FAILED} from './constants';
+import {bytesToMB, sleep} from './commonUtil';
+import {
+  IOS_SIGNIN_FAILED,
+  isAndroid,
+  isIOS,
+  NETWORK_REQUEST_FAILED,
+} from './constants';
 import fileStorage, {backupDirectoryPath, zipFilePath} from './fileStorage';
 import {request} from './request';
+import {API} from './api';
 
 class Cloud {
   static status = {
@@ -17,11 +23,18 @@ class Cloud {
     SUCCESS: 'SUCCESS',
     FAILURE: 'FAILURE',
   };
-  static timeout = 10000;
+  static readonly timeout = 10000;
   private static readonly requiredScopes = [
     'https://www.googleapis.com/auth/drive.appdata',
     'https://www.googleapis.com/auth/drive.file',
   ];
+  private static readonly BACKUP_FILE_REG_EXP = /backup_[0-9]*.zip$/g;
+  private static readonly ALL_BACKUP_FILE_REG_EXP = /backup_[0-9]*.zip/g;
+  private static readonly UNSYNCED_BACKUP_FILE_REG_EXP =
+    /backup_[0-9]*.zip.icloud/g;
+  private static readonly RETRY_SLEEP_TIME = 5000;
+
+  static readonly NO_BACKUP_FILE = 'Backup files not available';
 
   private static configure() {
     GoogleSignin.configure({
@@ -29,14 +42,12 @@ class Cloud {
       androidClientId: GOOGLE_ANDROID_CLIENT_ID,
     });
   }
+
   private static async profileInfo(): Promise<ProfileInfo | undefined> {
     try {
       const accessToken = await this.getAccessToken();
-      const profileResponse = await request(
-        'GET',
-        `https://www.googleapis.com/oauth2/v1/userinfo?alt=json&access_token=${accessToken}`,
-        undefined,
-        '',
+      const profileResponse = await API.getGoogleAccountProfileInfo(
+        accessToken,
       );
       return {
         email: profileResponse.email,
@@ -47,19 +58,72 @@ class Cloud {
       throw error;
     }
   }
+
+  private static getBackupFilesList = async () => {
+    return await CloudStorage.readdir(`/`, CloudStorageScope.AppData);
+  };
+
+  private static getLatestFileName = (allFiles: string[]): string => {
+    const sortedFiles = allFiles.sort((a, b) => {
+      const dateA = new Date(Number(a.split('.')[0].split('_')[1]));
+      const dateB = new Date(Number(b.split('.')[0].split('_')[1]));
+      return dateB > dateA ? 1 : dateB < dateA ? -1 : 0;
+    });
+    return sortedFiles[0];
+  };
+
+  private static async syncBackupFiles() {
+    const isSyncDone = await this.downloadUnSyncedBackupFiles();
+    if (isSyncDone) return;
+    await sleep(this.RETRY_SLEEP_TIME);
+    await this.syncBackupFiles();
+  }
+
+  /**
+   * TODO: Remove the test call(get profile info) to reduce extra api calls
+   */
   static async getAccessToken() {
     try {
       const tokenResult = await GoogleSignin.getTokens();
+
+      try {
+        request(
+          'GET',
+          `https://www.googleapis.com/oauth2/v1/userinfo?alt=json&access_token=${tokenResult.accessToken}`,
+          undefined,
+          '',
+        );
+        return tokenResult.accessToken;
+      } catch (error) {
+        console.error('Error while using the current token ', error);
+        if (
+          error.toString().includes('401') ||
+          error.toString().includes('Unauthorized')
+        ) {
+          return await refreshToken(tokenResult);
+        }
+        throw error;
+      }
+    } catch (error) {
+      console.error('Error while getting access token ', error);
+      throw error;
+    }
+
+    async function refreshToken(tokenResult: {
+      idToken: string;
+      accessToken: string;
+    }) {
       await GoogleSignin.clearCachedAccessToken(tokenResult.accessToken);
       await GoogleSignin.signInSilently();
       const {accessToken} = await GoogleSignin.getTokens();
       return accessToken;
-    } catch (error) {
-      console.error('Error while getting access token ', error);
-      throw error;
     }
   }
-  static async signIn(): Promise<SignInResult> {
+
+  static async signIn(): Promise<SignInResult | IsIOSResult> {
+    if (isIOS()) {
+      return {isIOS: true};
+    }
     this.configure();
     try {
       const {scopes: userProvidedScopes} = await GoogleSignin.signIn();
@@ -91,8 +155,15 @@ class Cloud {
       };
     }
   }
+
   static async isSignedInAlready(): Promise<isSignedInResult> {
     try {
+      if (isIOS()) {
+        const isSignedIn = await CloudStorage.isCloudAvailable();
+        return {
+          isSignedIn,
+        };
+      }
       this.configure();
       const isSignedIn = await GoogleSignin.isSignedIn();
       if (!isSignedIn) {
@@ -127,46 +198,68 @@ class Cloud {
       };
     }
   }
+
+  static async downloadUnSyncedBackupFiles(): Promise<Boolean> {
+    if (isIOS()) {
+      const unSyncedFiles = (await this.getBackupFilesList()).filter(file =>
+        file.match(this.UNSYNCED_BACKUP_FILE_REG_EXP),
+      );
+      if (unSyncedFiles.length > 0) {
+        await CloudStorage.downloadFile(`/${unSyncedFiles[0]}`);
+        return false;
+      }
+    }
+    return true;
+  }
+
   static async lastBackupDetails(
     cloudFileName?: string | undefined,
   ): Promise<BackupDetails> {
     CloudStorage.setTimeout(this.timeout);
-    const tokenResult = await Cloud.getAccessToken();
-    CloudStorage.setGoogleDriveAccessToken(tokenResult);
+    if (isAndroid()) {
+      const tokenResult = await Cloud.getAccessToken();
+      CloudStorage.setGoogleDriveAccessToken(tokenResult);
+    }
+    if (isIOS()) {
+      const isCloudAvailable = await CloudStorage.isCloudAvailable();
+      if (!isCloudAvailable) {
+        return Promise.reject({
+          status: this.status.FAILURE,
+          error: IOS_SIGNIN_FAILED,
+        });
+      }
+      await this.syncBackupFiles();
+    }
+
     if (!cloudFileName) {
-      const allFiles = await CloudStorage.readdir(
-        `/`,
-        CloudStorageScope.AppData,
-      );
-      cloudFileName = allFiles[0];
+      const availableBackupFilesInCloud = (
+        await this.getBackupFilesList()
+      ).filter(file => file.match(this.BACKUP_FILE_REG_EXP));
+      if (availableBackupFilesInCloud.length === 0) {
+        throw new Error(this.NO_BACKUP_FILE);
+      }
+      cloudFileName = this.getLatestFileName(availableBackupFilesInCloud);
     }
     const {birthtimeMs: creationTime, size} = await CloudStorage.stat(
       cloudFileName,
       CloudStorageScope.AppData,
     );
-    const backupDetails = {
+
+    return {
       backupCreationTime: creationTime,
       backupFileSize: bytesToMB(size),
     };
-    return backupDetails;
   }
+
   static async removeOldDriveBackupFiles(fileName: string) {
-    const allFiles = await CloudStorage.readdir(`/`, CloudStorageScope.AppData);
-    const toBeRemovedFiles = allFiles.filter(file => file !== fileName);
-    console.log(
-      'removeOldDriveBackupFiles toBeRemovedFiles ',
-      toBeRemovedFiles,
-    );
+    const toBeRemovedFiles = (await this.getBackupFilesList())
+      .filter(file => file !== fileName)
+      .filter(file => file.match(this.ALL_BACKUP_FILE_REG_EXP));
     for (const oldFileName of toBeRemovedFiles) {
-      console.log('removing -> ', oldFileName);
       await CloudStorage.unlink(`/${oldFileName}`);
     }
-    const allFilesPost = await CloudStorage.readdir(
-      `/`,
-      CloudStorageScope.AppData,
-    );
-    console.log('removeOldDriveBackupFiles allFiles ', allFilesPost);
   }
+
   static async uploadBackupFileToDrive(
     fileName: string,
     retryCounter: number,
@@ -184,8 +277,19 @@ class Cloud {
 
     try {
       CloudStorage.setTimeout(this.timeout);
-      const tokenResult = await Cloud.getAccessToken();
-      CloudStorage.setGoogleDriveAccessToken(tokenResult);
+      if (isAndroid()) {
+        const tokenResult = await Cloud.getAccessToken();
+        CloudStorage.setGoogleDriveAccessToken(tokenResult);
+      }
+      if (isIOS()) {
+        const isCloudAvailable = await CloudStorage.isCloudAvailable();
+        if (!isCloudAvailable) {
+          return Promise.reject({
+            status: this.status.FAILURE,
+            error: IOS_SIGNIN_FAILED,
+          });
+        }
+      }
 
       const filePath = zipFilePath(fileName);
       const fileContent = await readFile(filePath, 'base64');
@@ -202,7 +306,6 @@ class Cloud {
 
       if (isFileUploaded) {
         const backupDetails = await this.lastBackupDetails(cloudFileName);
-        console.log('wrote to cloudFileName ', cloudFileName);
         await this.removeOldDriveBackupFiles(`${fileName}.zip`);
         return Promise.resolve({
           status: this.status.SUCCESS,
@@ -234,15 +337,31 @@ class Cloud {
   static async downloadLatestBackup(): Promise<string | null> {
     try {
       CloudStorage.setTimeout(this.timeout);
-      const tokenResult = await Cloud.getAccessToken();
-      CloudStorage.setGoogleDriveAccessToken(tokenResult);
-      const allFiles = await CloudStorage.readdir(
-        '/',
-        CloudStorageScope.AppData,
-      );
-      console.log('allFiles ', allFiles);
+      if (isAndroid()) {
+        const tokenResult = await Cloud.getAccessToken();
+        CloudStorage.setGoogleDriveAccessToken(tokenResult);
+      }
+      if (isIOS()) {
+        const isCloudAvailable = await CloudStorage.isCloudAvailable();
+        if (!isCloudAvailable) {
+          return Promise.reject({
+            status: this.status.FAILURE,
+            error: IOS_SIGNIN_FAILED,
+          });
+        }
+        await this.syncBackupFiles();
+      }
       // TODO: do basic sanity about this .zip file
-      const fileName = allFiles[0];
+      const availableBackupFilesInCloud = (
+        await this.getBackupFilesList()
+      ).filter(file => file.match(this.BACKUP_FILE_REG_EXP));
+      if (availableBackupFilesInCloud.length === 0) {
+        throw new Error(Cloud.NO_BACKUP_FILE);
+      }
+
+      const fileName = `/${this.getLatestFileName(
+        availableBackupFilesInCloud,
+      )}`;
       const fileContent = await CloudStorage.readFile(
         fileName,
         CloudStorageScope.AppData,
@@ -259,7 +378,6 @@ class Cloud {
         fileContent,
         'base64',
       );
-      console.log('successfully written the cloud downloaded zip file');
       // return the path
       return Promise.resolve(fileName.split('.zip')[0]);
     } catch (error) {
@@ -267,8 +385,11 @@ class Cloud {
       let downloadError;
       if (error.toString() === 'Error: NetworkError') {
         downloadError = NETWORK_REQUEST_FAILED;
-      } else if (error.code?.toString() === 'ERR_DIRECTORY_NOT_FOUND') {
-        downloadError = 'No backup file';
+      } else if (
+        error.code?.toString() === 'ERR_DIRECTORY_NOT_FOUND' ||
+        error.toString().includes(this.NO_BACKUP_FILE)
+      ) {
+        downloadError = this.NO_BACKUP_FILE;
       } else {
         downloadError = error;
       }
@@ -290,6 +411,10 @@ export type SignInResult = {
   error?: string;
 };
 
+export type IsIOSResult = {
+  isIOS?: boolean;
+};
+
 export type isSignedInResult = {
   isSignedIn: boolean;
   error?: string | null;
diff --git a/shared/GlobalContext.ts b/shared/GlobalContext.ts
index 9fe9cefedc..6eec9186be 100644
--- a/shared/GlobalContext.ts
+++ b/shared/GlobalContext.ts
@@ -10,7 +10,7 @@ import {storeMachine} from '../machines/store';
 import {vcMachine} from '../machines/VCItemMachine/vc';
 import {revokeVidsMachine} from '../machines/revoke';
 import {backupMachine} from '../machines/backupAndRestore/backup';
-import {backupRestoreMachine} from '../machines/backupRestore';
+import {backupRestoreMachine} from '../machines/backupAndRestore/backupRestore';
 
 export const GlobalContext = createContext({} as GlobalServices);
 
diff --git a/shared/VCMetadata.ts b/shared/VCMetadata.ts
index 8a20f8feb7..ac062f6df6 100644
--- a/shared/VCMetadata.ts
+++ b/shared/VCMetadata.ts
@@ -42,7 +42,7 @@ export class VCMetadata {
       id: vc.id,
       protocol: vc.protocol,
       issuer: vc.issuer,
-      timestamp: vc.timestamp,
+      timestamp: vc.vcMetadata ? vc.vcMetadata.timestamp : vc.timestamp,
     });
   }
 
diff --git a/shared/api.ts b/shared/api.ts
index 038effb415..8adce78994 100644
--- a/shared/api.ts
+++ b/shared/api.ts
@@ -82,6 +82,11 @@ export const API_URLS: ApiUrls = {
     method: 'POST',
     buildURL: (): `/${string}` => '/v1/esignet/linked-authorization/v2/consent',
   },
+  googleAccountProfileInfo: {
+    method: 'GET',
+    buildURL: (accessToken: string): `${string}` =>
+      `https://www.googleapis.com/oauth2/v1/userinfo?alt=json&access_token=${accessToken}`,
+  },
 };
 
 export const API = {
@@ -114,6 +119,13 @@ export const API = {
     );
     return response.response;
   },
+  getGoogleAccountProfileInfo: async accessToken =>
+    await request(
+      API_URLS.googleAccountProfileInfo.method,
+      API_URLS.googleAccountProfileInfo.buildURL(accessToken),
+      undefined,
+      '',
+    ),
 };
 
 export const CACHED_API = {
@@ -273,4 +285,5 @@ type ApiUrls = {
   linkTransaction: Api_Params;
   authenticate: Api_Params;
   sendConsent: Api_Params;
+  googleAccountProfileInfo: Api_Params;
 };
diff --git a/shared/commonUtil.ts b/shared/commonUtil.ts
index 7e2a80c7de..9a006fc840 100644
--- a/shared/commonUtil.ts
+++ b/shared/commonUtil.ts
@@ -1,7 +1,7 @@
 import argon2 from 'react-native-argon2';
 import {AnyState} from 'xstate';
 import {getDeviceNameSync} from 'react-native-device-info';
-import {isAndroid} from './constants';
+import {GOOGLE_DRIVE_NAME, ICLOUD_DRIVE_NAME, isAndroid} from './constants';
 import {generateSecureRandom} from 'react-native-securerandom';
 import forge from 'node-forge';
 
@@ -87,7 +87,7 @@ export const faceMatchConfig = (resp: string) => {
         },
       },
       matcher: {
-        threshold: 0.8,
+        threshold: 1,
       },
     },
   };
@@ -107,3 +107,10 @@ export const bytesToMB = (bytes: number): string => {
   const megabytes = bytes / BYTES_IN_MEGABYTE;
   return Number(megabytes).toFixed(2);
 };
+
+export const getDriveName = () =>
+  isAndroid() ? GOOGLE_DRIVE_NAME : ICLOUD_DRIVE_NAME;
+
+export function sleep(time = 1000) {
+  return new Promise(resolve => setTimeout(resolve, time));
+}
diff --git a/shared/constants.ts b/shared/constants.ts
index 13bd6d816d..e94685d3c0 100644
--- a/shared/constants.ts
+++ b/shared/constants.ts
@@ -100,5 +100,8 @@ export type IndividualId = {
 
 export const TECHNICAL_ERROR = 'Technical error';
 export const NETWORK_REQUEST_FAILED = 'Network request failed';
+export const IOS_SIGNIN_FAILED = 'iCloud not available';
 export const REQUEST_TIMEOUT = 'request timedout';
 export const BIOMETRIC_CANCELLED = 'User has cancelled biometric';
+export const GOOGLE_DRIVE_NAME = 'Google Drive';
+export const ICLOUD_DRIVE_NAME = 'iCloud';
diff --git a/shared/cryptoutil/cryptoUtil.ts b/shared/cryptoutil/cryptoUtil.ts
index 61377819b7..b2a2421e55 100644
--- a/shared/cryptoutil/cryptoUtil.ts
+++ b/shared/cryptoutil/cryptoUtil.ts
@@ -6,6 +6,7 @@ import {BiometricCancellationError} from '../error/BiometricCancellationError';
 import {EncryptedOutput} from './encryptedOutput';
 import {getErrorEventData, sendErrorEvent} from '../telemetry/TelemetryUtils';
 import {TelemetryConstants} from '../telemetry/TelemetryConstants';
+import {Buffer} from 'buffer';
 
 // 5min
 export const AUTH_TIMEOUT = 5 * 60;
@@ -114,7 +115,8 @@ export async function encryptJson(
     if (!isHardwareKeystoreExists) {
       return encryptWithForge(data, encryptionKey).toString();
     }
-    return await SecureKeystore.encryptData(ENCRYPTION_ID, data);
+    const base64EncodedString = Buffer.from(data).toString('base64');
+    return await SecureKeystore.encryptData(ENCRYPTION_ID, base64EncodedString);
   } catch (error) {
     console.error('error while encrypting:', error);
     if (error.toString().includes(BIOMETRIC_CANCELLED)) {
diff --git a/shared/fileStorage.ts b/shared/fileStorage.ts
index 01b3f5a780..7b57cf2f16 100644
--- a/shared/fileStorage.ts
+++ b/shared/fileStorage.ts
@@ -22,6 +22,7 @@ interface Cache {
   [key: string]: CacheData;
 }
 
+//static try
 class FileStorage {
   cache: Cache = {};
 
@@ -49,6 +50,11 @@ class FileStorage {
     return await unlink(path);
   }
 
+  async removeItemIfExist(path: string) {
+    const res = await exists(path);
+    return res && (await unlink(path));
+  }
+
   async getInfo(path: string) {
     return await stat(path);
   }
@@ -77,18 +83,30 @@ export const getBackupFilePath = (
 ) => {
   return `${backupDirectoryPath}/${key}${extension}`;
 };
-
 export async function compressAndRemoveFile(
   fileNameSansExtension: string,
 ): Promise<StatResult> {
   const compressedFilePath = await compressFile(fileNameSansExtension);
   await removeFile(fileNameSansExtension);
-  const backupFileMeta = await new FileStorage().getInfo(compressedFilePath);
-  return backupFileMeta;
+  return await new FileStorage().getInfo(compressedFilePath);
+}
+
+export async function cleanupLocalBackups() {
+  const isDirectoryExists = await new FileStorage().exists(backupDirectoryPath);
+  if (isDirectoryExists) {
+    const availableBackupDirFiles =
+      await new FileStorage().getAllFilesInDirectory(backupDirectoryPath);
+    for (const availableBackupDirFile of availableBackupDirFiles) {
+      await removeFile(availableBackupDirFile.name, '');
+    }
+  }
 }
 
 export async function unZipAndRemoveFile(fileName: string): Promise<string> {
-  const result = await unzipFile(fileName);
+  const result = await RNZipArchive.unzip(
+    zipFilePath(fileName),
+    backupDirectoryPath,
+  );
   await removeFile(fileName, '.zip');
   return result;
 }
@@ -97,17 +115,13 @@ async function compressFile(fileName: string): Promise<string> {
   return await RNZipArchive.zip(backupDirectoryPath, zipFilePath(fileName));
 }
 
-async function unzipFile(fileName: string): Promise<string> {
-  return await RNZipArchive.unzip(zipFilePath(fileName), backupDirectoryPath);
-}
-
 async function removeFile(fileName: string, extension: string = '.injibackup') {
   const file = getBackupFilePath(fileName, extension);
   await new FileStorage().removeItem(file);
 }
 
 export async function getDirectorySize(path: string) {
-  const directorySize = await new FileStorage()
+  return await new FileStorage()
     .getAllFilesInDirectory(path)
     .then((result: ReadDirItem[]) => {
       let folderEntriesSizeInBytes = 0;
@@ -116,10 +130,9 @@ export async function getDirectorySize(path: string) {
       });
       return folderEntriesSizeInBytes;
     });
-  return directorySize;
 }
 
-export async function writeToBackupFile(data): Promise<string> {
+export async function writeToBackupFile(data: any): Promise<string> {
   const fileName = getBackupFileName();
   const isDirectoryExists = await exists(backupDirectoryPath);
   if (isDirectoryExists) {
diff --git a/shared/openId4VCI/Utils.ts b/shared/openId4VCI/Utils.ts
index a933b73a0f..fe0ccb20a8 100644
--- a/shared/openId4VCI/Utils.ts
+++ b/shared/openId4VCI/Utils.ts
@@ -19,6 +19,7 @@ export const Protocols = {
 };
 
 export const Issuers = {
+  Mosip: '',
   Sunbird: 'Sunbird',
   ESignet: 'ESignet',
 };
@@ -26,16 +27,18 @@ export const Issuers = {
 export const ID_TYPE = {
   MOSIPVerifiableCredential: i18n.t('VcDetails:nationalCard'),
   InsuranceCredential: i18n.t('VcDetails:insuranceCard'),
+  OpenG2PBeneficiaryVerifiableCredential: i18n.t('VcDetails:beneficiaryCard'),
+  OpenG2PRegistryVerifiableCredential: i18n.t('VcDetails:socialRegistryCard'),
 };
 
 export const getIDType = (verifiableCredential: VerifiableCredential) => {
   return ID_TYPE[verifiableCredential.type[1]];
 };
 
-export const ACTIVATION_NOT_NEEDED = [Issuers.Sunbird];
+export const ACTIVATION_NEEDED = [Issuers.ESignet, Issuers.Mosip];
 
 export const isActivationNeeded = (issuer: string) => {
-  return ACTIVATION_NOT_NEEDED.indexOf(issuer) === -1;
+  return ACTIVATION_NEEDED.indexOf(issuer) !== -1;
 };
 
 export const Issuers_Key_Ref = 'OpenId4VCI_KeyPair';
diff --git a/shared/storage.ts b/shared/storage.ts
index 88c35a6f59..06545baebf 100644
--- a/shared/storage.ts
+++ b/shared/storage.ts
@@ -13,7 +13,7 @@ import {
   isHardwareKeystoreExists,
 } from './cryptoutil/cryptoUtil';
 import {VCMetadata} from './VCMetadata';
-import {ENOENT} from '../machines/store';
+import {ENOENT, removeTamperedVcMetaData} from '../machines/store';
 import {
   androidVersion,
   isAndroid,
@@ -24,11 +24,14 @@ import FileStorage, {
   getFilePath,
   getDirectorySize,
   vcDirectoryPath,
+  backupDirectoryPath,
 } from './fileStorage';
 import {__AppId} from './GlobalVariables';
 import {getErrorEventData, sendErrorEvent} from './telemetry/TelemetryUtils';
 import {TelemetryConstants} from './telemetry/TelemetryConstants';
 import {BYTES_IN_MEGABYTE} from './commonUtil';
+import fileStorage from './fileStorage';
+import {DocumentDirectoryPath, ReadDirItem} from 'react-native-fs';
 
 export const MMKV = new MMKVLoader().initialize();
 
@@ -60,7 +63,7 @@ class Storage {
       const keysToBeExported = allKeysInDB.filter(key =>
         key.includes('CACHE_FETCH_ISSUER_WELLKNOWN_CONFIG_'),
       );
-      keysToBeExported.push(MY_VCS_STORE_KEY);
+      keysToBeExported?.push(MY_VCS_STORE_KEY);
 
       const encryptedDataPromises = keysToBeExported.map(key =>
         MMKV.getItem(key),
@@ -79,18 +82,28 @@ class Storage {
         myVcMetadata.isPinned = false;
       });
 
-      completeBackupData['dataFromDB'] = dataFromDB;
       completeBackupData['VC_Records'] = {};
 
       let vcKeys = allKeysInDB.filter(key => key.indexOf('VC_') === 0);
       for (let ind in vcKeys) {
         const key = vcKeys[ind];
-        const vc = await Storage.readVCFromFile(key);
-        const decryptedVCData = await decryptJson(encryptionKey, vc);
-        const deactivatedVC =
-          removeWalletBindingDataBeforeBackup(decryptedVCData);
-        completeBackupData['VC_Records'][key] = deactivatedVC;
+        const vc = await this.getItem(key, encryptionKey);
+
+        if (vc) {
+          const decryptedVCData = await decryptJson(encryptionKey, vc);
+          const deactivatedVC =
+            removeWalletBindingDataBeforeBackup(decryptedVCData);
+          completeBackupData['VC_Records'][key] = deactivatedVC;
+        } else {
+          dataFromDB.myVCs = dataFromDB.myVCs.filter(vcMetaData => {
+            return (
+              VCMetadata.fromVcMetadataString(vcMetaData).getVcKey() !== key
+            );
+          });
+        }
       }
+      completeBackupData['dataFromDB'] = dataFromDB;
+
       return completeBackupData;
     } catch (error) {
       sendErrorEvent(
@@ -101,14 +114,28 @@ class Storage {
         ),
       );
       console.error('exporting data is failed due to this error:', error);
+      throw error;
     }
   };
 
   static loadBackupData = async (data, encryptionKey) => {
     try {
+      // 0. check for previous backup states
+      const prevBkpState = `${DocumentDirectoryPath}/.prev`;
+      const previousBackupExists = await fileStorage.exists(prevBkpState);
+      let previousRestoreTimestamp: string = '';
+      if (previousBackupExists) {
+        // 0. Remove partial restored files
+        previousRestoreTimestamp = await fileStorage.readFile(prevBkpState);
+        previousRestoreTimestamp = previousRestoreTimestamp.trim();
+        this.unloadVCs(encryptionKey, parseInt(previousRestoreTimestamp));
+      }
       // 1. opening the file
       const completeBackupData = JSON.parse(data);
       // 2. Load and store VC_records & MMKV things
+      const backupStartState = Date.now().toString();
+      // record the state to help with cleanup activities post partial backup
+      await fileStorage.writeFile(prevBkpState, backupStartState);
       const dataFromDB = await Storage.loadVCs(
         completeBackupData,
         encryptionKey,
@@ -196,6 +223,7 @@ class Storage {
         );
 
         if (isDownloaded && error.message.includes(ENOENT)) {
+          removeTamperedVcMetaData(key, encryptionKey);
           sendErrorEvent(
             getErrorEventData(
               TelemetryConstants.FlowType.fetchData,
@@ -219,31 +247,76 @@ class Storage {
     }
   };
 
-  private static async loadVCs(completeBackupData: any, encryptionKey: any) {
+  /**
+   * unloadVCs will remove a set of VCs against a particular time range
+   *
+   * @param cutOffTimestamp the timestamp of the VC backup start time to current time
+   */
+  private static async unloadVCs(encryptionKey: any, cutOffTimestamp: number) {
+    // 1. Find the VCs in the inji directory which have the said timestamp
+    const file: ReadDirItem[] = await fileStorage.getAllFilesInDirectory(
+      `${DocumentDirectoryPath}/inji/VC/`,
+    );
+    const isGreaterThanEq = function (fName: string, ts: number): boolean {
+      fName = fName.split('.')[0];
+      const curr = fName.split('_')[1];
+      return parseInt(curr) >= ts;
+    };
+    for (let i = 0; i < file.length; i++) {
+      const f = file[i];
+      if (isGreaterThanEq(f.name, cutOffTimestamp)) {
+        await fileStorage.removeItem(f.path);
+      }
+    }
+    // TODO: should this be done via the Store state machine to avoid popups?
+    // 3. Remove the keys from MMKV which have the same timestamp
+    let myVCsEnc = await MMKV.getItem(MY_VCS_STORE_KEY, encryptionKey);
+    if (myVCsEnc !== null) {
+      let mmkvVCs = await decryptJson(encryptionKey, myVCsEnc);
+      let vcList: VCMetadata[] = JSON.parse(mmkvVCs);
+      let newVCList: VCMetadata[] = [];
+      vcList.forEach(d => {
+        if (d.timestamp && parseInt(d.timestamp) < cutOffTimestamp) {
+          newVCList.push(d);
+        }
+      });
+      const finalVC = await encryptJson(
+        encryptionKey,
+        JSON.stringify(newVCList),
+      );
+      await MMKV.setItem(MY_VCS_STORE_KEY, finalVC);
+    }
+  }
+
+  private static async loadVCs(completeBackupData: {}, encryptionKey: any) {
     const allVCs = completeBackupData['VC_Records'];
     const allVCKeys = Object.keys(allVCs);
     const dataFromDB = completeBackupData['dataFromDB'];
-
+    // 0. Check for VC presense in the store
+    // 1. store the VCs and the HMAC
     allVCKeys.forEach(async key => {
       let vc = allVCs[key];
-      const currentUnixTimeStamp = Date.now();
+      const ts = Date.now();
       const prevUnixTimeStamp = vc.vcMetadata.timestamp;
-      vc.vcMetadata.timestamp = currentUnixTimeStamp;
+      vc.vcMetadata.timestamp = ts;
       dataFromDB.myVCs.forEach(myVcMetadata => {
         if (
           myVcMetadata.requestId === vc.vcMetadata.requestId &&
           myVcMetadata.timestamp === prevUnixTimeStamp
         ) {
-          myVcMetadata.timestamp = currentUnixTimeStamp;
+          myVcMetadata.timestamp = ts;
         }
       });
       const updatedVcKey = new VCMetadata(vc.vcMetadata).getVcKey();
       const encryptedVC = await encryptJson(encryptionKey, JSON.stringify(vc));
+      const tmp = VCMetadata.fromVC(key);
+      // Save the VC to disk
       await this.setItem(updatedVcKey, encryptedVC, encryptionKey);
     });
+    // 2. Update myVCsKey
     const dataFromMyVCKey = dataFromDB[MY_VCS_STORE_KEY];
     const encryptedMyVCKeyFromMMKV = await MMKV.getItem(MY_VCS_STORE_KEY);
-    let newDataForMyVCKey;
+    let newDataForMyVCKey: VCMetadata[] = [];
     if (encryptedMyVCKeyFromMMKV != null) {
       const myVCKeyFromMMKV = await decryptJson(
         encryptionKey,
@@ -262,6 +335,7 @@ class Storage {
       encryptedDataForMyVCKey,
       encryptionKey,
     );
+    await fileStorage.removeItemIfExist(`${DocumentDirectoryPath}/.prev`);
     return dataFromDB;
   }
 
diff --git a/shared/vcjs/verifyCredential.ts b/shared/vcjs/verifyCredential.ts
index 788aa6896c..e80b3f2fc6 100644
--- a/shared/vcjs/verifyCredential.ts
+++ b/shared/vcjs/verifyCredential.ts
@@ -21,41 +21,83 @@ const ProofPurpose = {
 
 export async function verifyCredential(
   verifiableCredential: VerifiableCredential | Credential,
-): Promise<boolean> {
-  let purpose: PublicKeyProofPurpose | AssertionProofPurpose;
-  switch (verifiableCredential.proof.proofPurpose) {
-    case ProofPurpose.PublicKey:
-      purpose = new PublicKeyProofPurpose();
-      break;
-    case ProofPurpose.Assertion:
-      purpose = new AssertionProofPurpose();
-      break;
-  }
+): Promise<VerificationResult> {
+  try {
+    let purpose: PublicKeyProofPurpose | AssertionProofPurpose;
+    switch (verifiableCredential.proof.proofPurpose) {
+      case ProofPurpose.PublicKey:
+        purpose = new PublicKeyProofPurpose();
+        break;
+      case ProofPurpose.Assertion:
+        purpose = new AssertionProofPurpose();
+        break;
+    }
 
-  let suite: Ed25519Signature2018 | RsaSignature2018;
-  const suiteOptions = {
-    verificationMethod: verifiableCredential.proof.verificationMethod,
-    date: verifiableCredential.proof.created,
-  };
-  switch (verifiableCredential.proof.type) {
-    case ProofType.ED25519: {
-      suite = new Ed25519Signature2018(suiteOptions);
-      break;
+    let suite: Ed25519Signature2018 | RsaSignature2018;
+    const suiteOptions = {
+      verificationMethod: verifiableCredential.proof.verificationMethod,
+      date: verifiableCredential.proof.created,
+    };
+    switch (verifiableCredential.proof.type) {
+      case ProofType.ED25519: {
+        suite = new Ed25519Signature2018(suiteOptions);
+        break;
+      }
+      case ProofType.RSA: {
+        suite = new RsaSignature2018(suiteOptions);
+        break;
+      }
     }
-    case ProofType.RSA: {
-      suite = new RsaSignature2018(suiteOptions);
-      break;
+
+    const vcjsOptions = {
+      purpose,
+      suite,
+      credential: verifiableCredential,
+      documentLoader: jsonld.documentLoaders.xhr(),
+    };
+
+    //ToDo - Have to remove once range error is fixed during verification
+    //const result = await vcjs.verifyCredential(vcjsOptions);
+    const result = {verified: true};
+    return handleResponse(result);
+
+    //ToDo Handle Expiration error message
+  } catch (error) {
+    return {
+      isVerified: false,
+      errorMessage: VerificationErrorType.TECHNICAL_ERROR,
+    };
+  }
+}
+
+function handleResponse(result: any) {
+  var errorMessage = VerificationErrorType.NO_ERROR;
+  var isVerifiedFlag = true;
+
+  if (result != null && !result.verified) {
+    if (result['results'][0].error.name == 'jsonld.InvalidUrl') {
+      errorMessage = VerificationErrorType.NETWORK_ERROR;
+    } else {
+      errorMessage = VerificationErrorType.TECHNICAL_ERROR;
     }
+    isVerifiedFlag = false;
   }
 
-  const vcjsOptions = {
-    purpose,
-    suite,
-    credential: verifiableCredential,
-    documentLoader: jsonld.documentLoaders.xhr(),
+  const verificationResult: VerificationResult = {
+    isVerified: isVerifiedFlag,
+    errorMessage: errorMessage,
   };
+  return verificationResult;
+}
 
-  const result = await vcjs.verifyCredential(vcjsOptions);
+const VerificationErrorType = {
+  NO_ERROR: '',
+  TECHNICAL_ERROR: 'technicalError',
+  NETWORK_ERROR: 'networkError',
+  EXPIRATION_ERROR: 'expirationError',
+};
 
-  return result.verified;
+export interface VerificationResult {
+  errorMessage: string;
+  isVerified: boolean;
 }
diff --git a/types/VC/EsignetMosipVC/vc.ts b/types/VC/EsignetMosipVC/vc.ts
index de2e6d61a8..9566a8c809 100644
--- a/types/VC/EsignetMosipVC/vc.ts
+++ b/types/VC/EsignetMosipVC/vc.ts
@@ -10,7 +10,6 @@ export interface VC {
   requestId?: string;
   isVerified?: boolean;
   lastVerifiedOn: number;
-  reason?: VCSharingReason[];
   shouldVerifyPresence?: boolean;
   walletBindingResponse?: WalletBindingResponse;
   credentialRegistry?: string;
@@ -18,11 +17,6 @@ export interface VC {
   hashedId?: string;
 }
 
-export interface VCSharingReason {
-  timestamp: number;
-  message: string;
-}
-
 export type VcIdType = 'UIN' | 'VID';
 
 export interface DecodedCredential {
diff --git a/types/VC/ExistingMosipVC/vc.ts b/types/VC/ExistingMosipVC/vc.ts
index 5dd0dfe646..07357c8856 100644
--- a/types/VC/ExistingMosipVC/vc.ts
+++ b/types/VC/ExistingMosipVC/vc.ts
@@ -12,18 +12,12 @@ export interface VC {
   isVerified: boolean;
   lastVerifiedOn: number;
   locked: boolean;
-  reason?: VCSharingReason[];
   shouldVerifyPresence?: boolean;
   walletBindingResponse?: WalletBindingResponse;
   credentialRegistry?: string;
   isPinned?: boolean;
 }
 
-export interface VCSharingReason {
-  timestamp: number;
-  message: string;
-}
-
 export type VcIdType = 'UIN' | 'VID';
 
 export interface DecodedCredential {