diff --git a/.detoxrc.js b/.detoxrc.js
index ef6adfaa4..1ed57edeb 100644
--- a/.detoxrc.js
+++ b/.detoxrc.js
@@ -15,7 +15,7 @@ module.exports = {
         'ios.simulator': {
             type: 'ios.simulator',
             headless: process.env.CI ? true : undefined,
-            device: { type: 'iPhone 15 Pro' },
+            device: { type: 'iPhone 16 Pro' },
         },
         'android.emulator': {
             type: 'android.apk',
diff --git a/.github/actions/prepare-env/action.yml b/.github/actions/prepare-env/action.yml
index 5f41aba3e..8b52d283b 100644
--- a/.github/actions/prepare-env/action.yml
+++ b/.github/actions/prepare-env/action.yml
@@ -13,7 +13,7 @@ runs:
     - name: Node
       uses: actions/setup-node@v4
       with:
-        node-version: 18.x
+        node-version: 20.x
 
     - name: Cache node_modules/
       uses: actions/cache@v4
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index f32736674..dadf6b2a9 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: [ self-hosted, macOS, ARM64 ]
     strategy:
       matrix:
-        ios: [ 17.4 ]
+        ios: [ 18.3.1 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -29,10 +29,17 @@ jobs:
       - name: Run tests
         working-directory: ios
         run: |
-          xcodebuild -quiet -workspace Xaman.xcworkspace -scheme Xaman -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15,OS=${{ matrix.ios }}' -resultBundlePath TestResults test
-
+          xcodebuild -quiet -workspace Xaman.xcworkspace -scheme Xaman -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro,OS=${{ matrix.ios }}' -resultBundlePath TestResults.xcresult test
+          echo "Exit code: $?"
+      
+      - name: Check for xcresult
+        working-directory: ios
+        run: |
+          ls -la
+          if [ -d "TestResults.xcresult" ]; then echo "Found TestResults.xcresult"; else echo "TestResults.xcresult not found"; fi
+          
       - name: Test Summary
-        uses: kishikawakatsumi/xcresulttool@v1
+        uses: slidoapp/xcresulttool@v3.1.0
         with:
           path: ios/TestResults.xcresult
         if: success() || failure()
diff --git a/.gitignore b/.gitignore
index 299a4e3b2..12ee1a8a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,8 @@ e2e/artifacts/*
 
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
+
+# Imageprepare scripts
+scripts/imageprepare-app/*.svg
+scripts/imageprepare-app/*.png
+scripts/imageprepare-app/*/*
diff --git a/Makefile b/Makefile
index b27790d4f..01ceba7a4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 OS := $(shell sh -c 'uname -s 2>/dev/null')
 VARIANT ?= Debug
-SIMULATOR ?= iPhone 15 Pro Max
+SIMULATOR ?= iPhone 16 Pro Max
 DETOX_CONFIGURATION ?= ios.simulator+xaman.ios
 
 # Function definitions ============================
@@ -118,12 +118,15 @@ build-android: | stop .pre-run .pre-android ## Build the Android app
 test: | .pre-run
 	@npm run test
 
-test-e2e: | .pre-run ## Runs e2e tests
+test-e2e:  ## Runs e2e tests
 	@npx detox clean-framework-cache;
 	@npx detox build-framework-cache;
-	@npx detox build e2e --configuration ${DETOX_CONFIGURATION} --if-missing;
+	@npx detox build e2e --configuration ${DETOX_CONFIGURATION};
 	@npx cucumber-js ./e2e test;
 
+retest-e2e:  ## Runs e2e tests
+	@DETOX_LOGLEVEL=trace DETOX_REUSE=yes npx cucumber-js ./e2e test;
+
 bump-build-number: ## Bump build number for Android and iOS
 	@./scripts/bump-build-number.sh;
 
diff --git a/Xaman.xctestplan b/Xaman.xctestplan
new file mode 100644
index 000000000..807f6d611
--- /dev/null
+++ b/Xaman.xctestplan
@@ -0,0 +1,28 @@
+{
+  "configurations" : [
+    {
+      "id" : "2E1A5BBE-F248-49BB-8B0E-F17B20BBA391",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:Xaman.xcodeproj",
+      "identifier" : "13B07F861A680F5B00A75B9A",
+      "name" : "Xaman"
+    }
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:Xaman.xcodeproj",
+        "identifier" : "00E356ED1AD99517003FC87E",
+        "name" : "XamanTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/android/app/build.gradle b/android/app/build.gradle
index ba7fd3443..4b3fda8f0 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -6,8 +6,8 @@ apply plugin: "com.google.firebase.crashlytics"
 
 import com.android.build.OutputFile
 
-def canonicalVersionName = "3.2.0"
-def canonicalVersionCode = 34
+def canonicalVersionName = "4.0.0"
+def canonicalVersionCode = 85
 
 // NOTE: DO NOT change postFixSize value, this is for handling legacy method for handling the versioning in android
 def postFixSize = 30_000
@@ -123,11 +123,22 @@ android {
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
+    bundle {
+        language {
+            enableSplit = true
+        }
+        density {
+            enableSplit = true
+        }
+        abi {
+            enableSplit = true
+        }
+    }
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
-            universalApk false  // If true, also generate a universal APK
+            universalApk true  // If true, also generate a universal APK
             include(*reactNativeArchitectures())
         }
     }
@@ -213,7 +224,7 @@ dependencies {
     // qrcode generate
     implementation 'com.github.kenglxn.QRGen:android:2.6.0'
     // blur view
-    implementation 'com.github.Dimezis:BlurView:version-2.0.2'
+    implementation 'com.github.Dimezis:BlurView:version-2.0.6'
     // WebView
     implementation 'androidx.webkit:webkit:1.11.0'
     // inApp purchase
diff --git a/android/app/src/main/res/drawable-hdpi/background_pattern.png b/android/app/src/main/res/drawable-hdpi/background_pattern.png
index d31a407b8..d41ff8243 100644
Binary files a/android/app/src/main/res/drawable-hdpi/background_pattern.png and b/android/app/src/main/res/drawable-hdpi/background_pattern.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/background_pattern_light.png b/android/app/src/main/res/drawable-hdpi/background_pattern_light.png
index 8424fdd65..52ff988e6 100644
Binary files a/android/app/src/main/res/drawable-hdpi/background_pattern_light.png and b/android/app/src/main/res/drawable-hdpi/background_pattern_light.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/background_shapes.png b/android/app/src/main/res/drawable-hdpi/background_shapes.png
index 380db1f76..d41ff8243 100644
Binary files a/android/app/src/main/res/drawable-hdpi/background_shapes.png and b/android/app/src/main/res/drawable-hdpi/background_shapes.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/background_shapes_light.png b/android/app/src/main/res/drawable-hdpi/background_shapes_light.png
index 21071a87e..52ff988e6 100644
Binary files a/android/app/src/main/res/drawable-hdpi/background_shapes_light.png and b/android/app/src/main/res/drawable-hdpi/background_shapes_light.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/create.png b/android/app/src/main/res/drawable-hdpi/create.png
new file mode 100644
index 000000000..3aec47dfb
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/create.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/formerly_logo.png b/android/app/src/main/res/drawable-hdpi/formerly_logo.png
index 23b53b23f..7e2537f8e 100644
Binary files a/android/app/src/main/res/drawable-hdpi/formerly_logo.png and b/android/app/src/main/res/drawable-hdpi/formerly_logo.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_fingerprint.png b/android/app/src/main/res/drawable-hdpi/icon_fingerprint.png
index 400a43c7a..3bb76baec 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_fingerprint.png and b/android/app/src/main/res/drawable-hdpi/icon_fingerprint.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_fingerprintx.png b/android/app/src/main/res/drawable-hdpi/icon_fingerprintx.png
new file mode 100644
index 000000000..400a43c7a
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_fingerprintx.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_import.png b/android/app/src/main/res/drawable-hdpi/icon_import.png
new file mode 100644
index 000000000..fce4bae61
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_import.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_request.png b/android/app/src/main/res/drawable-hdpi/icon_request.png
new file mode 100644
index 000000000..caa64573b
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_request.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_send_v2.png b/android/app/src/main/res/drawable-hdpi/icon_send_v2.png
new file mode 100644
index 000000000..8e2b5c24f
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_send_v2.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_swap.png b/android/app/src/main/res/drawable-hdpi/icon_swap.png
new file mode 100644
index 000000000..7d16a9dde
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_swap.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_events.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_events.png
index 120675a40..e8580acf3 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_events.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_events.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_events_selected.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_events_selected.png
index 0fd939e7e..85e70f2f8 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_events_selected.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_events_selected.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_events_selected_light.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_events_selected_light.png
index 55136a48c..e7f906aec 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_events_selected_light.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_events_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_home.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_home.png
index 93b1dec85..c85526ec8 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_home.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_home.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_home_selected.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_home_selected.png
index 1f323244f..88af096bd 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_home_selected.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_home_selected.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_home_selected_light.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_home_selected_light.png
index e40b44bfe..cc849a924 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_home_selected_light.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_home_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings.png
index 159e6ce26..4dc594d46 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings_selected.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings_selected.png
index 549cae986..92cdc110c 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings_selected.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings_selected.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings_selected_light.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings_selected_light.png
index dfa6093bf..2fd308983 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings_selected_light.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_settings_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp.png
index c0cd7c82d..d768048a4 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp_selected.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp_selected.png
index 37d86c8d9..86db51bfd 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp_selected.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp_selected.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp_selected_light.png b/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp_selected_light.png
index 4c26ce293..c61969656 100644
Binary files a/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp_selected_light.png and b/android/app/src/main/res/drawable-hdpi/icon_tabbar_xapp_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/image_encryption_migration.png b/android/app/src/main/res/drawable-hdpi/image_encryption_migration.png
index 35003a071..db072bfbc 100644
Binary files a/android/app/src/main/res/drawable-hdpi/image_encryption_migration.png and b/android/app/src/main/res/drawable-hdpi/image_encryption_migration.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/notification.png b/android/app/src/main/res/drawable-hdpi/notification.png
new file mode 100644
index 000000000..cb3c1b2d3
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/notification.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/phones_dark.png b/android/app/src/main/res/drawable-hdpi/phones_dark.png
new file mode 100644
index 000000000..82035abcf
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/phones_dark.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/phones_light.png b/android/app/src/main/res/drawable-hdpi/phones_light.png
new file mode 100644
index 000000000..03e50ff13
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/phones_light.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/pincode.png b/android/app/src/main/res/drawable-hdpi/pincode.png
new file mode 100644
index 000000000..01907fd36
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/pincode.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash_screen_patterns.png b/android/app/src/main/res/drawable-hdpi/splash_screen_patterns.png
index 4b827b017..8eb3b7077 100644
Binary files a/android/app/src/main/res/drawable-hdpi/splash_screen_patterns.png and b/android/app/src/main/res/drawable-hdpi/splash_screen_patterns.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/tangem.png b/android/app/src/main/res/drawable-hdpi/tangem.png
new file mode 100644
index 000000000..5ba39ef42
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/tangem.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/background_pattern.png b/android/app/src/main/res/drawable-mdpi/background_pattern.png
index 97a49dc4c..356f8f87d 100644
Binary files a/android/app/src/main/res/drawable-mdpi/background_pattern.png and b/android/app/src/main/res/drawable-mdpi/background_pattern.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/background_pattern_light.png b/android/app/src/main/res/drawable-mdpi/background_pattern_light.png
index 4cc894f54..38417d391 100644
Binary files a/android/app/src/main/res/drawable-mdpi/background_pattern_light.png and b/android/app/src/main/res/drawable-mdpi/background_pattern_light.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/background_shapes.png b/android/app/src/main/res/drawable-mdpi/background_shapes.png
index 140de997e..356f8f87d 100644
Binary files a/android/app/src/main/res/drawable-mdpi/background_shapes.png and b/android/app/src/main/res/drawable-mdpi/background_shapes.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/background_shapes_light.png b/android/app/src/main/res/drawable-mdpi/background_shapes_light.png
index 26aa958ed..38417d391 100644
Binary files a/android/app/src/main/res/drawable-mdpi/background_shapes_light.png and b/android/app/src/main/res/drawable-mdpi/background_shapes_light.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/create.png b/android/app/src/main/res/drawable-mdpi/create.png
new file mode 100644
index 000000000..95eef7c04
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/create.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/formerly_logo.png b/android/app/src/main/res/drawable-mdpi/formerly_logo.png
index a24699723..d578dfbd7 100644
Binary files a/android/app/src/main/res/drawable-mdpi/formerly_logo.png and b/android/app/src/main/res/drawable-mdpi/formerly_logo.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_fingerprint.png b/android/app/src/main/res/drawable-mdpi/icon_fingerprint.png
index 59c5e2859..22ae2b591 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_fingerprint.png and b/android/app/src/main/res/drawable-mdpi/icon_fingerprint.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_fingerprintx.png b/android/app/src/main/res/drawable-mdpi/icon_fingerprintx.png
new file mode 100644
index 000000000..59c5e2859
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/icon_fingerprintx.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_import.png b/android/app/src/main/res/drawable-mdpi/icon_import.png
new file mode 100644
index 000000000..7acfb2ab9
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/icon_import.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_request.png b/android/app/src/main/res/drawable-mdpi/icon_request.png
new file mode 100644
index 000000000..ffd3d2b1b
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/icon_request.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_send_v2.png b/android/app/src/main/res/drawable-mdpi/icon_send_v2.png
new file mode 100644
index 000000000..4c347f6f5
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/icon_send_v2.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_swap.png b/android/app/src/main/res/drawable-mdpi/icon_swap.png
new file mode 100644
index 000000000..df260a6c6
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/icon_swap.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_events.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_events.png
index fb02c0de2..6c1180075 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_events.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_events.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_events_selected.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_events_selected.png
index a347233e5..2ed2560df 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_events_selected.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_events_selected.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_events_selected_light.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_events_selected_light.png
index 4d2a55db0..9ff0a617d 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_events_selected_light.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_events_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_home.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_home.png
index d24415a53..42cb7cd20 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_home.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_home.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_home_selected.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_home_selected.png
index 47d2c5ce6..4bfaacc4a 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_home_selected.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_home_selected.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_home_selected_light.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_home_selected_light.png
index 343c763b8..57d9b6888 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_home_selected_light.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_home_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings.png
index b12043534..3429aea06 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings_selected.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings_selected.png
index 07b545022..ce7d36bcc 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings_selected.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings_selected.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings_selected_light.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings_selected_light.png
index a0244da0b..918905e28 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings_selected_light.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_settings_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp.png
index bdbb74761..7ad1dae95 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp_selected.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp_selected.png
index e1aec027b..fa924ca6a 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp_selected.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp_selected.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp_selected_light.png b/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp_selected_light.png
index 89cbd331b..904ffe0a9 100644
Binary files a/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp_selected_light.png and b/android/app/src/main/res/drawable-mdpi/icon_tabbar_xapp_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/image_encryption_migration.png b/android/app/src/main/res/drawable-mdpi/image_encryption_migration.png
index 64c1dfcfc..124205875 100644
Binary files a/android/app/src/main/res/drawable-mdpi/image_encryption_migration.png and b/android/app/src/main/res/drawable-mdpi/image_encryption_migration.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/notification.png b/android/app/src/main/res/drawable-mdpi/notification.png
new file mode 100644
index 000000000..1c68af2b1
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/notification.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/phones_dark.png b/android/app/src/main/res/drawable-mdpi/phones_dark.png
new file mode 100644
index 000000000..407c40883
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/phones_dark.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/phones_light.png b/android/app/src/main/res/drawable-mdpi/phones_light.png
new file mode 100644
index 000000000..b69aedb21
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/phones_light.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/pincode.png b/android/app/src/main/res/drawable-mdpi/pincode.png
new file mode 100644
index 000000000..3d6249cb9
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/pincode.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash_screen_patterns.png b/android/app/src/main/res/drawable-mdpi/splash_screen_patterns.png
index ca88244e9..45c6fd7a5 100644
Binary files a/android/app/src/main/res/drawable-mdpi/splash_screen_patterns.png and b/android/app/src/main/res/drawable-mdpi/splash_screen_patterns.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/tangem.png b/android/app/src/main/res/drawable-mdpi/tangem.png
new file mode 100644
index 000000000..833b7e94b
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/tangem.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/background_pattern.png b/android/app/src/main/res/drawable-xhdpi/background_pattern.png
index 79f315669..9ee03b6dc 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/background_pattern.png and b/android/app/src/main/res/drawable-xhdpi/background_pattern.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/background_pattern_light.png b/android/app/src/main/res/drawable-xhdpi/background_pattern_light.png
index e4542d618..d8003935d 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/background_pattern_light.png and b/android/app/src/main/res/drawable-xhdpi/background_pattern_light.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/background_shapes.png b/android/app/src/main/res/drawable-xhdpi/background_shapes.png
index c5813a0d8..9ee03b6dc 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/background_shapes.png and b/android/app/src/main/res/drawable-xhdpi/background_shapes.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/background_shapes_light.png b/android/app/src/main/res/drawable-xhdpi/background_shapes_light.png
index a1b32ae89..d8003935d 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/background_shapes_light.png and b/android/app/src/main/res/drawable-xhdpi/background_shapes_light.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/create.png b/android/app/src/main/res/drawable-xhdpi/create.png
new file mode 100644
index 000000000..b5e6353d3
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/create.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/formerly_logo.png b/android/app/src/main/res/drawable-xhdpi/formerly_logo.png
index 707ae49e7..adcf8222f 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/formerly_logo.png and b/android/app/src/main/res/drawable-xhdpi/formerly_logo.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_fingerprint.png b/android/app/src/main/res/drawable-xhdpi/icon_fingerprint.png
index 475e4ee94..311ef3d57 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_fingerprint.png and b/android/app/src/main/res/drawable-xhdpi/icon_fingerprint.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_fingerprintx.png b/android/app/src/main/res/drawable-xhdpi/icon_fingerprintx.png
new file mode 100644
index 000000000..475e4ee94
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_fingerprintx.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_import.png b/android/app/src/main/res/drawable-xhdpi/icon_import.png
new file mode 100644
index 000000000..66bafc3fe
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_import.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_request.png b/android/app/src/main/res/drawable-xhdpi/icon_request.png
new file mode 100644
index 000000000..e3a62a96d
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_request.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_send_v2.png b/android/app/src/main/res/drawable-xhdpi/icon_send_v2.png
new file mode 100644
index 000000000..a67e165cb
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_send_v2.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_swap.png b/android/app/src/main/res/drawable-xhdpi/icon_swap.png
new file mode 100644
index 000000000..66738892f
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_swap.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events.png
index 7a1be7677..5119f70f4 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events_selected.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events_selected.png
index 95d52ff96..b004a4a5f 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events_selected.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events_selected.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events_selected_light.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events_selected_light.png
index 417f70569..584f17066 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events_selected_light.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_events_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home.png
index 6e8b1a805..f16ce1a75 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home_selected.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home_selected.png
index 90f0eea33..c18df7586 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home_selected.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home_selected.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home_selected_light.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home_selected_light.png
index af1381af4..777c20ef7 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home_selected_light.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_home_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings.png
index 1ba4fd541..34b65ad4b 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings_selected.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings_selected.png
index 980d39294..8679664b6 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings_selected.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings_selected.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings_selected_light.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings_selected_light.png
index 1378e324d..4c2d6a925 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings_selected_light.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_settings_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp.png
index ae93a6f15..a9cdf089e 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp_selected.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp_selected.png
index b12c1dbc7..778b1e754 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp_selected.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp_selected.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp_selected_light.png b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp_selected_light.png
index e9632d45f..db7b70755 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp_selected_light.png and b/android/app/src/main/res/drawable-xhdpi/icon_tabbar_xapp_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/image_encryption_migration.png b/android/app/src/main/res/drawable-xhdpi/image_encryption_migration.png
index 76c5fefa5..dd2e49609 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/image_encryption_migration.png and b/android/app/src/main/res/drawable-xhdpi/image_encryption_migration.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/notification.png b/android/app/src/main/res/drawable-xhdpi/notification.png
new file mode 100644
index 000000000..7687e4c24
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/notification.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/phones_dark.png b/android/app/src/main/res/drawable-xhdpi/phones_dark.png
new file mode 100644
index 000000000..a24e694ab
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/phones_dark.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/phones_light.png b/android/app/src/main/res/drawable-xhdpi/phones_light.png
new file mode 100644
index 000000000..987e9283b
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/phones_light.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/pincode.png b/android/app/src/main/res/drawable-xhdpi/pincode.png
new file mode 100644
index 000000000..20c1798c2
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/pincode.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash_screen_patterns.png b/android/app/src/main/res/drawable-xhdpi/splash_screen_patterns.png
index 943157824..19a97efe3 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/splash_screen_patterns.png and b/android/app/src/main/res/drawable-xhdpi/splash_screen_patterns.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/tangem.png b/android/app/src/main/res/drawable-xhdpi/tangem.png
new file mode 100644
index 000000000..8965f6033
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/tangem.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/background_pattern.png b/android/app/src/main/res/drawable-xxhdpi/background_pattern.png
index 2025ca620..c428d8f1c 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/background_pattern.png and b/android/app/src/main/res/drawable-xxhdpi/background_pattern.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/background_pattern_light.png b/android/app/src/main/res/drawable-xxhdpi/background_pattern_light.png
index 713ae90a0..3a44cebb0 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/background_pattern_light.png and b/android/app/src/main/res/drawable-xxhdpi/background_pattern_light.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/background_shapes.png b/android/app/src/main/res/drawable-xxhdpi/background_shapes.png
index 87de48eaf..c428d8f1c 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/background_shapes.png and b/android/app/src/main/res/drawable-xxhdpi/background_shapes.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/background_shapes_light.png b/android/app/src/main/res/drawable-xxhdpi/background_shapes_light.png
index 12a12732f..3a44cebb0 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/background_shapes_light.png and b/android/app/src/main/res/drawable-xxhdpi/background_shapes_light.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/create.png b/android/app/src/main/res/drawable-xxhdpi/create.png
new file mode 100644
index 000000000..863464b31
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/create.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/formerly_logo.png b/android/app/src/main/res/drawable-xxhdpi/formerly_logo.png
index bd6050b05..daa18e8a8 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/formerly_logo.png and b/android/app/src/main/res/drawable-xxhdpi/formerly_logo.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_fingerprint.png b/android/app/src/main/res/drawable-xxhdpi/icon_fingerprint.png
index 20d0e7b54..08ec470dd 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_fingerprint.png and b/android/app/src/main/res/drawable-xxhdpi/icon_fingerprint.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_fingerprintx.png b/android/app/src/main/res/drawable-xxhdpi/icon_fingerprintx.png
new file mode 100644
index 000000000..20d0e7b54
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_fingerprintx.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_import.png b/android/app/src/main/res/drawable-xxhdpi/icon_import.png
new file mode 100644
index 000000000..fa3b091e1
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_import.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_request.png b/android/app/src/main/res/drawable-xxhdpi/icon_request.png
new file mode 100644
index 000000000..216d5958d
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_request.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_send_v2.png b/android/app/src/main/res/drawable-xxhdpi/icon_send_v2.png
new file mode 100644
index 000000000..802f3e1d8
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_send_v2.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_swap.png b/android/app/src/main/res/drawable-xxhdpi/icon_swap.png
new file mode 100644
index 000000000..a6a2a272e
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_swap.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events.png
index c5c1c1812..38ce93712 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events_selected.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events_selected.png
index 557895b16..42938c760 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events_selected.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events_selected.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events_selected_light.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events_selected_light.png
index 4b072fde4..344f27883 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events_selected_light.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_events_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home.png
index b6de1a270..9e820989d 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home_selected.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home_selected.png
index 74849b08e..9209b829b 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home_selected.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home_selected.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home_selected_light.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home_selected_light.png
index 403758736..7e12ef998 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home_selected_light.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_home_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings.png
index bb8664c58..f45ac7adf 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings_selected.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings_selected.png
index 7b53ec112..ffe81b3be 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings_selected.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings_selected.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings_selected_light.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings_selected_light.png
index 745b7e9fb..5ba763ef6 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings_selected_light.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_settings_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp.png
index 86a23288b..fd0ece5cc 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp_selected.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp_selected.png
index 001f94b3b..87864244d 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp_selected.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp_selected.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp_selected_light.png b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp_selected_light.png
index f865b0cc9..8531a764a 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp_selected_light.png and b/android/app/src/main/res/drawable-xxhdpi/icon_tabbar_xapp_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/image_encryption_migration.png b/android/app/src/main/res/drawable-xxhdpi/image_encryption_migration.png
index f812d65de..744f5cd68 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/image_encryption_migration.png and b/android/app/src/main/res/drawable-xxhdpi/image_encryption_migration.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/notification.png b/android/app/src/main/res/drawable-xxhdpi/notification.png
new file mode 100644
index 000000000..93d92beb9
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/notification.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/phones_dark.png b/android/app/src/main/res/drawable-xxhdpi/phones_dark.png
new file mode 100644
index 000000000..afa188f01
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/phones_dark.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/phones_light.png b/android/app/src/main/res/drawable-xxhdpi/phones_light.png
new file mode 100644
index 000000000..c3be693cf
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/phones_light.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/pincode.png b/android/app/src/main/res/drawable-xxhdpi/pincode.png
new file mode 100644
index 000000000..0ade6e005
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/pincode.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash_screen_patterns.png b/android/app/src/main/res/drawable-xxhdpi/splash_screen_patterns.png
index 3d942249e..7b4a21519 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/splash_screen_patterns.png and b/android/app/src/main/res/drawable-xxhdpi/splash_screen_patterns.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/tangem.png b/android/app/src/main/res/drawable-xxhdpi/tangem.png
new file mode 100644
index 000000000..c2861c1a5
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/tangem.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/background_pattern.png b/android/app/src/main/res/drawable-xxxhdpi/background_pattern.png
new file mode 100644
index 000000000..7fb913a20
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/background_pattern.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/background_pattern_light.png b/android/app/src/main/res/drawable-xxxhdpi/background_pattern_light.png
index 2d288876a..25de154be 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/background_pattern_light.png and b/android/app/src/main/res/drawable-xxxhdpi/background_pattern_light.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/background_shapes.png b/android/app/src/main/res/drawable-xxxhdpi/background_shapes.png
index 5084e5aa5..7fb913a20 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/background_shapes.png and b/android/app/src/main/res/drawable-xxxhdpi/background_shapes.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/background_shapes_light.png b/android/app/src/main/res/drawable-xxxhdpi/background_shapes_light.png
index 365a1f203..25de154be 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/background_shapes_light.png and b/android/app/src/main/res/drawable-xxxhdpi/background_shapes_light.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/create.png b/android/app/src/main/res/drawable-xxxhdpi/create.png
new file mode 100644
index 000000000..25a09fac9
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/create.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/formerly_logo.png b/android/app/src/main/res/drawable-xxxhdpi/formerly_logo.png
index 76ccbc61f..c22d1f077 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/formerly_logo.png and b/android/app/src/main/res/drawable-xxxhdpi/formerly_logo.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_fingerprint.png b/android/app/src/main/res/drawable-xxxhdpi/icon_fingerprint.png
index 4572f37eb..b6dd7555a 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_fingerprint.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_fingerprint.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_fingerprintx.png b/android/app/src/main/res/drawable-xxxhdpi/icon_fingerprintx.png
new file mode 100644
index 000000000..4572f37eb
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_fingerprintx.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_import.png b/android/app/src/main/res/drawable-xxxhdpi/icon_import.png
new file mode 100644
index 000000000..e15ef4583
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_import.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_request.png b/android/app/src/main/res/drawable-xxxhdpi/icon_request.png
new file mode 100644
index 000000000..30e6546b7
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_request.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_send_v2.png b/android/app/src/main/res/drawable-xxxhdpi/icon_send_v2.png
new file mode 100644
index 000000000..267160e2a
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_send_v2.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_swap.png b/android/app/src/main/res/drawable-xxxhdpi/icon_swap.png
new file mode 100644
index 000000000..61132875f
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_swap.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events.png
index 6bf29c3f6..434604b67 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events_selected.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events_selected.png
index efb288da3..3e83b035c 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events_selected.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events_selected.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events_selected_light.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events_selected_light.png
index 7969686fd..76498c5c2 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events_selected_light.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_events_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home.png
index 86816e7b6..4cd19f7fd 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home_selected.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home_selected.png
index 32c4c0844..fca501f7f 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home_selected.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home_selected.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home_selected_light.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home_selected_light.png
index c2f5f4e7c..31e54d76c 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home_selected_light.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_home_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings.png
index 7010e4201..10cb78484 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings_selected.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings_selected.png
index cb6fbdec2..58885fdce 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings_selected.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings_selected.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings_selected_light.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings_selected_light.png
index 17528bcfe..b5f14c5ac 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings_selected_light.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_settings_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp.png
index 9a0291e5f..464984e0e 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp_selected.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp_selected.png
index 38c2cd565..ed35d0005 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp_selected.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp_selected.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp_selected_light.png b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp_selected_light.png
index 2d8ccb00a..7d33a2cd9 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp_selected_light.png and b/android/app/src/main/res/drawable-xxxhdpi/icon_tabbar_xapp_selected_light.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/image_encryption_migration.png b/android/app/src/main/res/drawable-xxxhdpi/image_encryption_migration.png
index 881dd74a6..810a56d81 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/image_encryption_migration.png and b/android/app/src/main/res/drawable-xxxhdpi/image_encryption_migration.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/notification.png b/android/app/src/main/res/drawable-xxxhdpi/notification.png
new file mode 100644
index 000000000..09b96eceb
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/notification.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/phones_dark.png b/android/app/src/main/res/drawable-xxxhdpi/phones_dark.png
new file mode 100644
index 000000000..4f00ba647
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/phones_dark.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/phones_light.png b/android/app/src/main/res/drawable-xxxhdpi/phones_light.png
new file mode 100644
index 000000000..a436d1dbe
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/phones_light.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/pincode.png b/android/app/src/main/res/drawable-xxxhdpi/pincode.png
new file mode 100644
index 000000000..c576f53c6
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/pincode.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash_screen_patterns.png b/android/app/src/main/res/drawable-xxxhdpi/splash_screen_patterns.png
index fba2e34a0..2f1867612 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash_screen_patterns.png and b/android/app/src/main/res/drawable-xxxhdpi/splash_screen_patterns.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/tangem.png b/android/app/src/main/res/drawable-xxxhdpi/tangem.png
new file mode 100644
index 000000000..a9ddb1040
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/tangem.png differ
diff --git a/android/app/src/main/res/drawable/background_pattern.png b/android/app/src/main/res/drawable/background_pattern.png
new file mode 100644
index 000000000..356f8f87d
Binary files /dev/null and b/android/app/src/main/res/drawable/background_pattern.png differ
diff --git a/android/app/src/main/res/drawable/background_pattern_light.png b/android/app/src/main/res/drawable/background_pattern_light.png
new file mode 100644
index 000000000..38417d391
Binary files /dev/null and b/android/app/src/main/res/drawable/background_pattern_light.png differ
diff --git a/android/app/src/main/res/drawable/background_shapes.png b/android/app/src/main/res/drawable/background_shapes.png
new file mode 100644
index 000000000..356f8f87d
Binary files /dev/null and b/android/app/src/main/res/drawable/background_shapes.png differ
diff --git a/android/app/src/main/res/drawable/background_shapes_light.png b/android/app/src/main/res/drawable/background_shapes_light.png
new file mode 100644
index 000000000..38417d391
Binary files /dev/null and b/android/app/src/main/res/drawable/background_shapes_light.png differ
diff --git a/android/app/src/main/res/drawable/icon_fingerprint.png b/android/app/src/main/res/drawable/icon_fingerprint.png
new file mode 100644
index 000000000..22ae2b591
Binary files /dev/null and b/android/app/src/main/res/drawable/icon_fingerprint.png differ
diff --git a/android/app/src/main/res/drawable/notification.png b/android/app/src/main/res/drawable/notification.png
new file mode 100644
index 000000000..1c68af2b1
Binary files /dev/null and b/android/app/src/main/res/drawable/notification.png differ
diff --git a/android/app/src/main/res/drawable/phones_dark.png b/android/app/src/main/res/drawable/phones_dark.png
new file mode 100644
index 000000000..407c40883
Binary files /dev/null and b/android/app/src/main/res/drawable/phones_dark.png differ
diff --git a/android/app/src/main/res/drawable/phones_light.png b/android/app/src/main/res/drawable/phones_light.png
new file mode 100644
index 000000000..b69aedb21
Binary files /dev/null and b/android/app/src/main/res/drawable/phones_light.png differ
diff --git a/android/app/src/main/res/drawable/pincode.png b/android/app/src/main/res/drawable/pincode.png
new file mode 100644
index 000000000..3d6249cb9
Binary files /dev/null and b/android/app/src/main/res/drawable/pincode.png differ
diff --git a/android/app/src/main/res/layout/activity_splash.xml b/android/app/src/main/res/layout/activity_splash.xml
index 05b48dfa2..a3e03426e 100644
--- a/android/app/src/main/res/layout/activity_splash.xml
+++ b/android/app/src/main/res/layout/activity_splash.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     android:background="@color/splash_screen_background"
     >
   <ImageView
@@ -14,11 +15,13 @@
       android:scaleType="centerCrop"
       android:src="@drawable/splash_screen_patterns" />
 
-  <ImageView
-      android:layout_width="200dp"
-      android:layout_height="200dp"
-      android:layout_centerInParent="true"
-      android:contentDescription="@string/splash_screen_foreground"
-      android:scaleType="fitCenter"
-      android:src="@drawable/formerly_logo" />
+    <ImageView
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="50dp"
+        android:contentDescription="@string/splash_screen_foreground"
+        android:scaleType="fitCenter"
+        android:src="@drawable/formerly_logo" />
 </RelativeLayout>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 4ae7d1237..97c985b18 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,6 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <!-- <background android:drawable="@android:color/transparent"/> -->
+    <!-- <foreground android:drawable="@android:color/transparent"/> -->
 </adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 201fb36bd..aacd9478c 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="splash_screen_background" type="color">#FFFFFF</item>
+    <item name="splash_screen_background" type="color">#1129C1</item>
     <item name="push_notification" type="color">#4494D3</item>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 5b435883c..1af1af5e5 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,11 +5,17 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:textColor">#000000</item>
+        <item name="android:windowBackground">#1129C1</item>
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <!-- <item name="android:navigationBarColor">@android:color/transparent</item> -->
+        <item name="android:navigationBarColor">#1129C1</item>
+        <item name="android:statusBarColor">#1129C1</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:fitsSystemWindows">false</item>
     </style>
 
-
     <!-- General theme for the ActionSheet -->
     <style name="DialogListItemStyle">
         <item name="android:layout_width">match_parent</item>
diff --git a/android/build.gradle b/android/build.gradle
index 8bb13ab9b..c64efa0de 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,7 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 import groovy.json.JsonSlurper
 
-
 buildscript {
     ext {
         buildToolsVersion = "34.0.0"
@@ -44,7 +43,6 @@ allprojects {
         google()
         maven { url 'https://jitpack.io' }
         maven { url "https://cdn.veriff.me/android/" } // veriff
-
     }
 }
 
diff --git a/e2e/01_setup.feature b/e2e/01_setup.feature
index d0e9273ef..1e991c1b2 100644
--- a/e2e/01_setup.feature
+++ b/e2e/01_setup.feature
@@ -1,8 +1,8 @@
 Feature: Setup App
     Scenario: Show onboarding
         Given I should have 'onboarding-screen'
-        Given I should see 'slider-start-button'
-        Then I tap 'slider-start-button'
+        Given I should see 'start-button'
+        Then I tap 'start-button'
 
     Scenario: Setup passcode
         Given I should have 'setup-passcode-screen'
@@ -11,12 +11,13 @@ Feature: Setup App
         Given I should see 'pin-code-entry-view'
         Then I type my passcode
         Then I tap 'next-button'
+#        Then I tap alert button with label 'Use anyway'
         Then I type my passcode
         Then I tap 'next-button'
 
     Scenario: Finish setup
-        Given I should wait 5 sec to see 'agreement-setup-screen'
-        Then I wait 5 sec for button 'confirm-button' to be enabled
+        Given I should wait 4 sec to see 'agreement-setup-screen'
+        Then I wait 4 sec for button 'confirm-button' to be enabled
         Then I tap 'confirm-button'
 
     Scenario: After setup
diff --git a/e2e/02_generate_account.feature b/e2e/02_generate_account.feature
index 4e64f70c9..4390932b3 100644
--- a/e2e/02_generate_account.feature
+++ b/e2e/02_generate_account.feature
@@ -14,7 +14,7 @@ Feature: Generate Account
         Then I tap 'next-button'
         Given I should have 'account-generate-confirm-private-view'
         Then I enter my secret number
-        Then I tap 'next-button'
+#        Then I tap 'next-button'
         Given I should have 'account-generate-show-address-view'
         Then I read my account address
         Then I tap 'next-button'
@@ -73,7 +73,7 @@ Feature: Generate Account
         Then I tap 'next-button'
         Given I should have 'account-generate-confirm-private-view'
         Then I enter my secret number
-        Then I tap 'next-button'
+#        Then I tap 'next-button'
         Given I should have 'account-generate-show-address-view'
         Then I read my account address
         Then I tap 'next-button'
diff --git a/e2e/03_import_account.feature b/e2e/03_import_account.feature
index 3b19110af..362009c25 100644
--- a/e2e/03_import_account.feature
+++ b/e2e/03_import_account.feature
@@ -14,7 +14,7 @@ Feature: Import Account
         Then I tap 'next-button'
         Then I generate new secret number
         Then I enter my secret number
-        Then I tap 'next-button'
+#        Then I tap 'next-button'
         Given I should have 'account-import-show-address-view'
         Then I read my account address
         Then I tap 'next-button'
@@ -27,7 +27,7 @@ Feature: Import Account
         Then I tap 'next-button'
         Given I should have 'account-import-finish-view'
         Then I tap 'finish-button'
-        Then I tap 'tab-Home'
+#        Then I tap 'tab-Home'
         Given I should have 'home-tab-view'
         Given I should see same account address
 
diff --git a/e2e/04_upgrade_account.feature b/e2e/04_upgrade_account.feature
index fa49a92a1..e2332d860 100644
--- a/e2e/04_upgrade_account.feature
+++ b/e2e/04_upgrade_account.feature
@@ -19,7 +19,7 @@ Feature: Upgrade Account
         Then I tap 'next-button'
         Given I should have 'account-import-finish-view'
         Then I tap 'finish-button'
-        Then I tap 'tab-Home'
+#        Then I tap 'tab-Home'
         Given I should have 'home-tab-view'
         Given I should see same account address
 
@@ -44,8 +44,8 @@ Feature: Upgrade Account
         Then I tap 'next-button'
         Given I should have 'account-import-finish-view'
         Then I tap 'finish-button'
-        Given I should have 'settings-tab-screen'
-        Then I tap 'tab-Home'
+#        Given I should have 'settings-tab-screen'
+#        Then I tap 'tab-Home'
         Given I should have 'home-tab-view'
         Given I should see same account address
 
@@ -101,8 +101,8 @@ Feature: Upgrade Account
         Then I tap 'next-button'
         Given I should have 'account-import-finish-view'
         Then I tap 'finish-button'
-        Given I should have 'settings-tab-screen'
-        Then I tap 'tab-Home'
+#        Given I should have 'settings-tab-screen'
+#        Then I tap 'tab-Home'
         Given I should have 'home-tab-view'
         Given I should see same account address
 
diff --git a/e2e/step_definitions/account.js b/e2e/step_definitions/account.js
index 5cd145b42..561c0832c 100644
--- a/e2e/step_definitions/account.js
+++ b/e2e/step_definitions/account.js
@@ -32,32 +32,10 @@ Then('I generate new secret number', async () => {
 
 Then('I enter my secret number', { timeout: 5 * 60 * 1000 }, async () => {
     for (let r = 0; r < 8; r++) {
-        // get values for any column
         for (let c = 0; c < 6; c++) {
-            const attributes = await element(by.id(`${r}.${c}`)).getAttributes();
-            const value = attributes.text;
-
-            let diff = Number(value) - Number(this.numbers[r][c]);
-
-            let pos = true;
-
-            if (diff < 0) {
-                pos = false;
-            }
-
-            diff = Math.abs(diff);
-
-            for (let t = 0; t < diff; t++) {
-                if (pos) {
-                    await element(by.id('minus-btn')).tap();
-                } else {
-                    await element(by.id('plus-btn')).tap();
-                }
-            }
-
-            await element(by.id('right-btn')).tap();
-        }
-    }
+            await element(by.id(`${this.numbers[r][c]}-key`)).tap();
+        };
+    };
 });
 
 Then('I read my account address', async () => {
@@ -82,7 +60,7 @@ Then('I generate testnet account', async () => {
 });
 
 Then('I enter the address in the input', async () => {
-    await element(by.id('address-input')).typeText(this.address);
+    await element(by.id('address-input')).typeText(`${this.address}\n`);
 });
 
 Then('I generate new family seed', async () => {
@@ -90,7 +68,7 @@ Then('I generate new family seed', async () => {
 });
 
 Then('I enter my seed in the input', async () => {
-    await element(by.id('seed-input')).typeText(this.seed);
+    await element(by.id('seed-input')).typeText(`${this.seed}\n`);
 });
 
 Then('I generate new mnemonic', async () => {
diff --git a/e2e/step_definitions/auth.js b/e2e/step_definitions/auth.js
index a3adb0bce..c3f68ed42 100644
--- a/e2e/step_definitions/auth.js
+++ b/e2e/step_definitions/auth.js
@@ -17,18 +17,30 @@ Then('I enter my passcode', async () => {
 });
 
 Then('I type my passcode', async () => {
-    await element(by.id('pin-input')).typeText(passcode);
+    // await element(by.id('pin-input')).typeText(`${passcode}\n`);
+    await element(by.id(`${passcode[0]}-key`)).tap();
+    await element(by.id(`${passcode[1]}-key`)).tap();
+    await element(by.id(`${passcode[2]}-key`)).tap();
+    await element(by.id(`${passcode[3]}-key`)).tap();
+    await element(by.id(`${passcode[4]}-key`)).tap();
+    await element(by.id(`${passcode[5]}-key`)).tap();
 });
 
 Then('I type my new passcode', async () => {
     passcode = '958347';
-    await element(by.id('pin-input')).typeText(passcode);
+    // await element(by.id('pin-input')).typeText(`${passcode}\n`);
+    await element(by.id(`${passcode[0]}-key`)).tap();
+    await element(by.id(`${passcode[1]}-key`)).tap();
+    await element(by.id(`${passcode[2]}-key`)).tap();
+    await element(by.id(`${passcode[3]}-key`)).tap();
+    await element(by.id(`${passcode[4]}-key`)).tap();
+    await element(by.id(`${passcode[5]}-key`)).tap();
 });
 
 Then('I enter my passphrase in {string}', async (input) => {
-    await element(by.id(input)).typeText(passphrase);
+    await element(by.id(input)).typeText(`${passphrase}\n`);
 });
 
 Then('I enter my new passphrase in {string}', async (input) => {
-    await element(by.id(input)).typeText(newPassphrase);
+    await element(by.id(input)).typeText(`${newPassphrase}\n`);
 });
diff --git a/e2e/step_definitions/detox.js b/e2e/step_definitions/detox.js
index e1106f0e9..edd637776 100644
--- a/e2e/step_definitions/detox.js
+++ b/e2e/step_definitions/detox.js
@@ -31,7 +31,7 @@ Then('I wait {int} sec for button {string} to be enabled', async (timeoutSec, bu
 });
 
 Then('I enter {string} in {string}', async (value, textInputId) => {
-    await element(by.id(textInputId)).typeText(value);
+    await element(by.id(textInputId)).typeText(`${value}\n`);
 });
 
 Given('I should have {string}', async (elementId) => {
diff --git a/e2e/support/init.js b/e2e/support/init.js
index 26f5c9800..b3973e576 100644
--- a/e2e/support/init.js
+++ b/e2e/support/init.js
@@ -10,7 +10,8 @@ const { startDeviceLogStream } = require('../helpers/simulator');
 BeforeAll(async () => {
     await detox.init({
         argv: {
-            reuse: false,
+            // reuse: false,
+            reuse: String(process.env?.DETOX_REUSE || 'no').toLowerCase() === 'yes',
         },
     });
 
diff --git a/ios/LaunchScreen.storyboard b/ios/LaunchScreen.storyboard
index 161da2274..b2f16d26e 100644
--- a/ios/LaunchScreen.storyboard
+++ b/ios/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,16 +13,16 @@
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" fixedFrame="YES" image="SplashScreenPatterns" translatesAutoresizingMaskIntoConstraints="NO" id="zVd-fc-Q4r" userLabel="SplashScreenPatterns">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" image="BootSplash" translatesAutoresizingMaskIntoConstraints="NO" id="N1e-2e-Poh">
+                                <rect key="frame" x="-102" y="-26" width="521" height="621"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             </imageView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="FormerlyLogo" translatesAutoresizingMaskIntoConstraints="NO" id="Cqv-g3-EnD">
-                                <rect key="frame" x="106" y="393" width="199" height="110"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="FormerlyLogo" translatesAutoresizingMaskIntoConstraints="NO" id="Y42-VH-H5f">
+                                <rect key="frame" x="66" y="320" width="187" height="224"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
@@ -31,11 +31,11 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="52.173913043478265" y="375"/>
+            <point key="canvasLocation" x="50.232558139534881" y="372.74678111587986"/>
         </scene>
     </scenes>
     <resources>
-        <image name="FormerlyLogo" width="195" height="64"/>
-        <image name="SplashScreenPatterns" width="29.5" height="64"/>
+        <image name="BootSplash" width="594" height="844"/>
+        <image name="FormerlyLogo" width="230" height="93"/>
     </resources>
 </document>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 78e3af73c..a64d81526 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1106,6 +1106,8 @@ PODS:
     - React-Core
   - react-native-camera/RN (4.2.1):
     - React-Core
+  - react-native-device-brightness (1.2.7):
+    - React
   - react-native-netinfo (11.3.2):
     - React-Core
   - react-native-sdk (7.1.0):
@@ -1423,6 +1425,7 @@ DEPENDENCIES:
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
   - react-native-camera (from `../node_modules/react-native-camera`)
+  - "react-native-device-brightness (from `../node_modules/@adrianso/react-native-device-brightness`)"
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - "react-native-sdk (from `../node_modules/@veriff/react-native-sdk`)"
   - React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
@@ -1546,6 +1549,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon"
   react-native-camera:
     :path: "../node_modules/react-native-camera"
+  react-native-device-brightness:
+    :path: "../node_modules/@adrianso/react-native-device-brightness"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
   react-native-sdk:
@@ -1663,6 +1668,7 @@ SPEC CHECKSUMS:
   React-logger: 29fa3e048f5f67fe396bc08af7606426d9bd7b5d
   React-Mapbuffer: bf56147c9775491e53122a94c423ac201417e326
   react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
+  react-native-device-brightness: 886cfbfb49a32b6de4ccfc1f720776dc5f381d24
   react-native-netinfo: 076df4f9b07f6670acf4ce9a75aac8d34c2e2ccc
   react-native-sdk: f5e5134a8855b4b6d7e923c8332d236a5fd814b2
   React-nativeconfig: 9f223cd321823afdecf59ed00861ab2d69ee0fc1
@@ -1700,6 +1706,6 @@ SPEC CHECKSUMS:
   VeriffSDK: 9c4e31693dfe772af8553209c4a6543bffc75d24
   Yoga: ae3c32c514802d30f687a04a6a35b348506d411f
 
-PODFILE CHECKSUM: 02b3ced84ce14879cfec9b0703fe756147dd6237
+PODFILE CHECKSUM: f947ef6218c1db942687c4ffe318679d03d75520
 
-COCOAPODS: 1.16.0
+COCOAPODS: 1.15.2
diff --git a/ios/Xaman.xcodeproj/project.pbxproj b/ios/Xaman.xcodeproj/project.pbxproj
index 66764b455..f02176e56 100644
--- a/ios/Xaman.xcodeproj/project.pbxproj
+++ b/ios/Xaman.xcodeproj/project.pbxproj
@@ -1098,6 +1098,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ENABLE_MODULES = YES;
 				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = LK5BBJNJZ6;
 				ENABLE_ON_DEMAND_RESOURCES = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1182,7 +1183,7 @@
 				CODE_SIGN_ENTITLEMENTS = Xaman/Xaman.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = LK5BBJNJZ6;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1193,7 +1194,7 @@
 				INFOPLIST_FILE = Xaman/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.2.0;
+				MARKETING_VERSION = 4.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1218,13 +1219,13 @@
 				CODE_SIGN_ENTITLEMENTS = Xaman/Xaman.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = LK5BBJNJZ6;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = Xaman/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.2.0;
+				MARKETING_VERSION = 4.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1271,6 +1272,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				CXX = "";
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
diff --git a/ios/Xaman.xcworkspace/contents.xcworkspacedata b/ios/Xaman.xcworkspace/contents.xcworkspacedata
index a15b1ea22..37483e6c3 100644
--- a/ios/Xaman.xcworkspace/contents.xcworkspacedata
+++ b/ios/Xaman.xcworkspace/contents.xcworkspacedata
@@ -7,4 +7,7 @@
    <FileRef
       location = "group:Pods/Pods.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:../Xaman.xctestplan">
+   </FileRef>
 </Workspace>
diff --git a/ios/Xaman/AppDelegate.m b/ios/Xaman/AppDelegate.m
index daf71cece..c94866c19 100644
--- a/ios/Xaman/AppDelegate.m
+++ b/ios/Xaman/AppDelegate.m
@@ -1,4 +1,5 @@
 #import "AppDelegate.h"
+#import "SecurityProvider.h"
 
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTLinkingManager.h>
@@ -29,6 +30,9 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull N
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+  // Initialize security key early
+  [SecurityProvider ensureKeyIsReady];
+
   // bootstrap rnn
   RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
   [ReactNativeNavigation bootstrapWithBridge:bridge];
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/114_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/114_appicon-darkmode.png
new file mode 100644
index 000000000..0bcaada9d
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/114_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/114_appicon-lightmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/114_appicon-lightmode.png
new file mode 100644
index 000000000..a6e275cc9
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/114_appicon-lightmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/114_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/114_appicon-tinted.png
new file mode 100644
index 000000000..c2c7f8385
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/114_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-darkmode 1.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-darkmode 1.png
new file mode 100644
index 000000000..f2b53301c
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-darkmode 1.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-darkmode.png
new file mode 100644
index 000000000..f2b53301c
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-tinted 1.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-tinted 1.png
new file mode 100644
index 000000000..d44939b77
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-tinted 1.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-tinted.png
new file mode 100644
index 000000000..d44939b77
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/120_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/128_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/128_appicon-darkmode.png
new file mode 100644
index 000000000..63ea74a7c
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/128_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/128_appicon-lightmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/128_appicon-lightmode.png
new file mode 100644
index 000000000..e59b616b4
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/128_appicon-lightmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/128_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/128_appicon-tinted.png
new file mode 100644
index 000000000..fed637fb0
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/128_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/136_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/136_appicon-darkmode.png
new file mode 100644
index 000000000..89a6f9f24
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/136_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/136_appicon-lightmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/136_appicon-lightmode.png
new file mode 100644
index 000000000..854fd26d4
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/136_appicon-lightmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/136_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/136_appicon-tinted.png
new file mode 100644
index 000000000..d08c5957c
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/136_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/152_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/152_appicon-darkmode.png
new file mode 100644
index 000000000..137dbef7a
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/152_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/152_appicon-lightmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/152_appicon-lightmode.png
new file mode 100644
index 000000000..b6a00ba50
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/152_appicon-lightmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/152_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/152_appicon-tinted.png
new file mode 100644
index 000000000..16e664118
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/152_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/167_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/167_appicon-darkmode.png
new file mode 100644
index 000000000..e667ef1ba
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/167_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/167_appicon-lightmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/167_appicon-lightmode.png
new file mode 100644
index 000000000..1250f2f9b
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/167_appicon-lightmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/167_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/167_appicon-tinted.png
new file mode 100644
index 000000000..b29f646f6
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/167_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/180_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/180_appicon-darkmode.png
new file mode 100644
index 000000000..a03abad60
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/180_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/180_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/180_appicon-tinted.png
new file mode 100644
index 000000000..b9284b1e4
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/180_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/192_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/192_appicon-darkmode.png
new file mode 100644
index 000000000..218810b23
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/192_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/192_appicon-lightmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/192_appicon-lightmode.png
new file mode 100644
index 000000000..16c6f9033
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/192_appicon-lightmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/192_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/192_appicon-tinted.png
new file mode 100644
index 000000000..ae062c7a6
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/192_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/40_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/40_appicon-darkmode.png
new file mode 100644
index 000000000..a4e0b9b72
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/40_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/40_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/40_appicon-tinted.png
new file mode 100644
index 000000000..c1273cb05
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/40_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/58_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/58_appicon-darkmode.png
new file mode 100644
index 000000000..df39d5acb
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/58_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/58_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/58_appicon-tinted.png
new file mode 100644
index 000000000..25aa50da6
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/58_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/60_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/60_appicon-darkmode.png
new file mode 100644
index 000000000..a27ee9339
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/60_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/60_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/60_appicon-tinted.png
new file mode 100644
index 000000000..12485acbf
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/60_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/76_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/76_appicon-darkmode.png
new file mode 100644
index 000000000..f224372fb
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/76_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/76_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/76_appicon-tinted.png
new file mode 100644
index 000000000..a077ac1ac
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/76_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/80_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/80_appicon-darkmode.png
new file mode 100644
index 000000000..4ff8dc6c5
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/80_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/80_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/80_appicon-tinted.png
new file mode 100644
index 000000000..a3d8c5811
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/80_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/87_appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/87_appicon-darkmode.png
new file mode 100644
index 000000000..f4b5a8aa6
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/87_appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/87_appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/87_appicon-tinted.png
new file mode 100644
index 000000000..3ea984055
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/87_appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-20.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-20.png
deleted file mode 100644
index 6c27aed51..000000000
Binary files a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-20.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-29.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-29.png
deleted file mode 100644
index 387ea99b6..000000000
Binary files a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-29.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-40.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-40.png
deleted file mode 100644
index 8c63d9e02..000000000
Binary files a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-40.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-60@2x.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-40@3x 1.png
similarity index 100%
rename from ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-60@2x.png
rename to ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-40@3x 1.png
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-76@2x.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-76@2x.png
deleted file mode 100644
index bfe0a7724..000000000
Binary files a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-76@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-83.5@2x.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-83.5@2x.png
deleted file mode 100644
index 7f6a9b2a8..000000000
Binary files a/ios/Xaman/Images.xcassets/AppIcon.appiconset/AppIcon-83.5@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/Xaman/Images.xcassets/AppIcon.appiconset/Contents.json
index 3f79a8e61..7253e9193 100644
--- a/ios/Xaman/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Xaman/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,116 +1,533 @@
 {
   "images" : [
-	{
-      "size" : "20x20",
-      "idiom": "iphone",
-	  "filename" : "AppIcon-20@2x.png",
-      "scale": "2x"
-    },
-	{
-      "size" : "20x20",
-      "idiom": "iphone",
-	  "filename" : "AppIcon-20@3x.png",
-      "scale": "3x"
-    },
-	{
-      "size" : "20x20",
-      "idiom": "ipad",
-	  "filename" : "AppIcon-20.png",
-      "scale": "1x"
+    {
+      "filename" : "AppIcon-20@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom": "ipad",
-	  "filename" : "AppIcon-20@2x.png",
-      "scale": "2x"
+      "filename" : "AppIcon-20@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
       "filename" : "AppIcon-29@2x.png",
-      "scale" : "2x"
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
       "filename" : "AppIcon-29@3x.png",
-      "scale" : "3x"
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "AppIcon-76.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "38x38"
+    },
+    {
+      "filename" : "114_appicon-lightmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "38x38"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
       "filename" : "AppIcon-40@2x.png",
-      "scale" : "2x"
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "AppIcon-40@3x.png",
-      "scale" : "3x"
+      "filename" : "AppIcon-40@3x 1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "AppIcon-60@2x.png",
-      "scale" : "2x"
+      "filename" : "AppIcon-40@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
       "filename" : "AppIcon-60@3x.png",
-      "scale" : "3x"
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-29.png",
-      "scale" : "1x"
+      "filename" : "128_appicon-lightmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "64x64"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-29@2x.png",
-      "scale" : "2x"
+      "filename" : "192_appicon-lightmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "64x64"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-40.png",
-      "scale" : "1x"
+      "filename" : "136_appicon-lightmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "68x68"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-40@2x.png",
-      "scale" : "2x"
+      "filename" : "152_appicon-lightmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-76.png",
-      "scale" : "1x"
+      "filename" : "167_appicon-lightmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-76@2x.png",
-      "scale" : "2x"
+      "filename" : "AppIcon-1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     },
     {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "AppIcon-83.5@2x.png",
-      "scale" : "2x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "40_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "AppIcon-1024.png",
-      "scale" : "1x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "60_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "58_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "87_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "76_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "38x38"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "114_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "38x38"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "80_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "120_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "120_appicon-darkmode 1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "180_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "128_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "64x64"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "192_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "64x64"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "136_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "68x68"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "152_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "167_appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "appicon-darkmode.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "40_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "60_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "58_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "87_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "76_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "38x38"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "114_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "38x38"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "80_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "120_appicon-tinted 1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "120_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "180_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "128_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "64x64"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "192_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "64x64"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "136_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "68x68"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "152_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "167_appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "appicon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/appicon-darkmode.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/appicon-darkmode.png
new file mode 100644
index 000000000..c6488fc73
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/appicon-darkmode.png differ
diff --git a/ios/Xaman/Images.xcassets/AppIcon.appiconset/appicon-tinted.png b/ios/Xaman/Images.xcassets/AppIcon.appiconset/appicon-tinted.png
new file mode 100644
index 000000000..6a50cebc1
Binary files /dev/null and b/ios/Xaman/Images.xcassets/AppIcon.appiconset/appicon-tinted.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/Contents.json
index 583ff0ad3..dbe538c00 100644
--- a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "onboarding-bg-darkmode@1x.png",
       "idiom" : "universal",
-      "filename" : "background-pattern.png",
       "scale" : "1x"
     },
     {
+      "filename" : "onboarding-bg-darkmode@2x.png",
       "idiom" : "universal",
-      "filename" : "background-pattern@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "onboarding-bg-darkmode@3x.png",
       "idiom" : "universal",
-      "filename" : "background-pattern@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/background-pattern.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/background-pattern.png
deleted file mode 100644
index 97a49dc4c..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/background-pattern.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/background-pattern@2x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/background-pattern@2x.png
deleted file mode 100644
index 79f315669..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/background-pattern@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/background-pattern@3x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/background-pattern@3x.png
deleted file mode 100644
index 2025ca620..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/background-pattern@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/onboarding-bg-darkmode@1x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/onboarding-bg-darkmode@1x.png
new file mode 100644
index 000000000..356f8f87d
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/onboarding-bg-darkmode@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/onboarding-bg-darkmode@2x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/onboarding-bg-darkmode@2x.png
new file mode 100644
index 000000000..9ee03b6dc
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/onboarding-bg-darkmode@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/onboarding-bg-darkmode@3x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/onboarding-bg-darkmode@3x.png
new file mode 100644
index 000000000..c428d8f1c
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundPattern.imageset/onboarding-bg-darkmode@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/Contents.json
index 2823b25b9..8a6592a90 100644
--- a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "background_pattern_light.png",
+      "filename" : "onboarding-bg-lightmode@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "background_pattern_light@2x.png",
+      "filename" : "onboarding-bg-lightmode@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "background_pattern_light@3x.png",
+      "filename" : "onboarding-bg-lightmode@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/background_pattern_light.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/background_pattern_light.png
deleted file mode 100644
index 4cc894f54..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/background_pattern_light.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/background_pattern_light@2x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/background_pattern_light@2x.png
deleted file mode 100644
index e4542d618..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/background_pattern_light@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/background_pattern_light@3x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/background_pattern_light@3x.png
deleted file mode 100644
index 713ae90a0..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/background_pattern_light@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/onboarding-bg-lightmode@1x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/onboarding-bg-lightmode@1x.png
new file mode 100644
index 000000000..38417d391
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/onboarding-bg-lightmode@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/onboarding-bg-lightmode@2x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/onboarding-bg-lightmode@2x.png
new file mode 100644
index 000000000..d8003935d
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/onboarding-bg-lightmode@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/onboarding-bg-lightmode@3x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/onboarding-bg-lightmode@3x.png
new file mode 100644
index 000000000..3a44cebb0
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundPatternLight.imageset/onboarding-bg-lightmode@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/Contents.json
index 3a450ec3d..dbe538c00 100644
--- a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "background-shapes@1x.png",
+      "filename" : "onboarding-bg-darkmode@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "background-shapes@3x.png",
+      "filename" : "onboarding-bg-darkmode@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "background-shapes@2x.png",
+      "filename" : "onboarding-bg-darkmode@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/background-shapes@1x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/background-shapes@1x.png
deleted file mode 100644
index 8783eab96..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/background-shapes@1x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/background-shapes@2x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/background-shapes@2x.png
deleted file mode 100644
index 00e359df0..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/background-shapes@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/background-shapes@3x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/background-shapes@3x.png
deleted file mode 100644
index 8b6eda7a1..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/background-shapes@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/onboarding-bg-darkmode@1x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/onboarding-bg-darkmode@1x.png
new file mode 100644
index 000000000..356f8f87d
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/onboarding-bg-darkmode@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/onboarding-bg-darkmode@2x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/onboarding-bg-darkmode@2x.png
new file mode 100644
index 000000000..9ee03b6dc
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/onboarding-bg-darkmode@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/onboarding-bg-darkmode@3x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/onboarding-bg-darkmode@3x.png
new file mode 100644
index 000000000..c428d8f1c
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapes.imageset/onboarding-bg-darkmode@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/Contents.json
index 8ae2e21c0..8a6592a90 100644
--- a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "background_shapes_light.png",
+      "filename" : "onboarding-bg-lightmode@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "background_shapes_light@2x.png",
+      "filename" : "onboarding-bg-lightmode@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "background_shapes_light@3x.png",
+      "filename" : "onboarding-bg-lightmode@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/background_shapes_light.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/background_shapes_light.png
deleted file mode 100644
index 26aa958ed..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/background_shapes_light.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/background_shapes_light@2x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/background_shapes_light@2x.png
deleted file mode 100644
index a1b32ae89..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/background_shapes_light@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/background_shapes_light@3x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/background_shapes_light@3x.png
deleted file mode 100644
index 12a12732f..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/background_shapes_light@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/onboarding-bg-lightmode@1x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/onboarding-bg-lightmode@1x.png
new file mode 100644
index 000000000..38417d391
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/onboarding-bg-lightmode@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/onboarding-bg-lightmode@2x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/onboarding-bg-lightmode@2x.png
new file mode 100644
index 000000000..d8003935d
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/onboarding-bg-lightmode@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/onboarding-bg-lightmode@3x.png b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/onboarding-bg-lightmode@3x.png
new file mode 100644
index 000000000..3a44cebb0
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BackgroundShapesLight.imageset/onboarding-bg-lightmode@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/Contents.json
similarity index 64%
rename from ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/Contents.json
rename to ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/Contents.json
index 08842f71e..6f8d38da6 100644
--- a/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "image_biometric_light.png",
+      "filename" : "splash-bg.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "image_biometric_light@2x.png",
+      "filename" : "splash-bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "image_biometric_light@3x.png",
+      "filename" : "splash-bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/splash-bg.png b/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/splash-bg.png
new file mode 100644
index 000000000..45c6fd7a5
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/splash-bg.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/splash-bg@2x.png b/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/splash-bg@2x.png
new file mode 100644
index 000000000..19a97efe3
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/splash-bg@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/splash-bg@3x.png b/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/splash-bg@3x.png
new file mode 100644
index 000000000..16179b5a5
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/BootSplash.imageset/splash-bg@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/Contents.json
index 3ce3f085d..b54d4d9a0 100644
--- a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "formerly_logo@1x.png",
+      "filename" : "logo.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "formerly_logo@2x.png",
+      "filename" : "logo@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "formerly_logo@3x.png",
+      "filename" : "logo@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/formerly_logo@1x.png b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/formerly_logo@1x.png
deleted file mode 100644
index eee7cf8b8..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/formerly_logo@1x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/formerly_logo@2x.png b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/formerly_logo@2x.png
deleted file mode 100644
index 7f3a673ac..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/formerly_logo@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/formerly_logo@3x.png b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/formerly_logo@3x.png
deleted file mode 100644
index 76ccbc61f..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/formerly_logo@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/logo.png b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/logo.png
new file mode 100644
index 000000000..d578dfbd7
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/logo.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/logo@2x.png b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/logo@2x.png
new file mode 100644
index 000000000..adcf8222f
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/logo@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/logo@3x.png b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/logo@3x.png
new file mode 100644
index 000000000..daa18e8a8
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/FormerlyLogo.imageset/logo@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/Contents.json
index e7791c513..ad4c0af6a 100644
--- a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "icon-biometric.png",
+      "filename" : "fingerprint@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "icon-biometric@3x.png",
+      "filename" : "fingerprint@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon-biometric@2x.png",
+      "filename" : "fingerprint@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/fingerprint@1x.png b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/fingerprint@1x.png
new file mode 100644
index 000000000..22ae2b591
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/fingerprint@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/fingerprint@2x.png b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/fingerprint@2x.png
new file mode 100644
index 000000000..311ef3d57
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/fingerprint@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/fingerprint@3x.png b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/fingerprint@3x.png
new file mode 100644
index 000000000..08ec470dd
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/fingerprint@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/icon-biometric.png b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/icon-biometric.png
deleted file mode 100644
index f370a7513..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/icon-biometric.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/icon-biometric@2x.png b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/icon-biometric@2x.png
deleted file mode 100644
index ceef1b50d..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/icon-biometric@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/icon-biometric@3x.png b/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/icon-biometric@3x.png
deleted file mode 100644
index 897e4a865..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/ImageBiometric.imageset/icon-biometric@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/image_biometric_light.png b/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/image_biometric_light.png
deleted file mode 100644
index fb75e4f55..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/image_biometric_light.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/image_biometric_light@2x.png b/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/image_biometric_light@2x.png
deleted file mode 100644
index a74bc94ca..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/image_biometric_light@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/image_biometric_light@3x.png b/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/image_biometric_light@3x.png
deleted file mode 100644
index 44b24e071..000000000
Binary files a/ios/Xaman/Images.xcassets/Graphics/ImageBiometricLight.imageset/image_biometric_light@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@1x.png b/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@1x.png
index f9456ab02..5b17bd630 100644
Binary files a/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@1x.png and b/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@2x.png b/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@2x.png
index ce4830bb1..0edeacdeb 100644
Binary files a/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@2x.png and b/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@3x.png b/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@3x.png
index 881dd74a6..810a56d81 100644
Binary files a/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@3x.png and b/ios/Xaman/Images.xcassets/Graphics/ImageEncryptionMigration.imageset/image_encryption_migration@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Contents.json
new file mode 100644
index 000000000..7b08e773b
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Notification@1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Notification@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Notification@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Notification@1x.png b/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Notification@1x.png
new file mode 100644
index 000000000..1c68af2b1
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Notification@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Notification@2x.png b/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Notification@2x.png
new file mode 100644
index 000000000..7687e4c24
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Notification@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Notification@3x.png b/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Notification@3x.png
new file mode 100644
index 000000000..93d92beb9
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/Notification.imageset/Notification@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/Contents.json
new file mode 100644
index 000000000..f9bfcfddb
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "PhonesLight@1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "PhonesLight@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "PhonesLight@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/PhonesLight@1x.png b/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/PhonesLight@1x.png
new file mode 100644
index 000000000..407c40883
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/PhonesLight@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/PhonesLight@2x.png b/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/PhonesLight@2x.png
new file mode 100644
index 000000000..a24e694ab
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/PhonesLight@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/PhonesLight@3x.png b/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/PhonesLight@3x.png
new file mode 100644
index 000000000..afa188f01
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/PhonesDark.imageset/PhonesLight@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/Contents.json
new file mode 100644
index 000000000..8897c3757
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "PhonesDark@1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "PhonesDark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "PhonesDark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/PhonesDark@1x.png b/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/PhonesDark@1x.png
new file mode 100644
index 000000000..b69aedb21
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/PhonesDark@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/PhonesDark@2x.png b/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/PhonesDark@2x.png
new file mode 100644
index 000000000..987e9283b
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/PhonesDark@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/PhonesDark@3x.png b/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/PhonesDark@3x.png
new file mode 100644
index 000000000..c3be693cf
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/PhonesLight.imageset/PhonesDark@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Contents.json b/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Contents.json
new file mode 100644
index 000000000..d2dc09d60
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Pincode@1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Pincode@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Pincode@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Pincode@1x.png b/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Pincode@1x.png
new file mode 100644
index 000000000..3d6249cb9
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Pincode@1x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Pincode@2x.png b/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Pincode@2x.png
new file mode 100644
index 000000000..20c1798c2
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Pincode@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Pincode@3x.png b/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Pincode@3x.png
new file mode 100644
index 000000000..0ade6e005
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Graphics/Pincode.imageset/Pincode@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/Contents.json
new file mode 100644
index 000000000..d8e594c3b
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "create.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "create@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "create@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/create.png b/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/create.png
new file mode 100644
index 000000000..7ac254523
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/create.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/create@2x.png b/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/create@2x.png
new file mode 100644
index 000000000..00fcf9d44
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/create@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/create@3x.png b/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/create@3x.png
new file mode 100644
index 000000000..25a09fac9
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconCreate.imageset/create@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/Contents.json
new file mode 100644
index 000000000..15bb58425
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "import.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "import@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "import@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/import.png b/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/import.png
new file mode 100644
index 000000000..4b63b670d
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/import.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/import@2x.png b/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/import@2x.png
new file mode 100644
index 000000000..3cea6a7f9
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/import@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/import@3x.png b/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/import@3x.png
new file mode 100644
index 000000000..e15ef4583
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconImport.imageset/import@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/Contents.json
index 52502bf8b..75ec5ec6d 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarEvents.png",
+      "filename" : "ei.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarEvents@2x.png",
+      "filename" : "ei@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarEvents@3x.png",
+      "filename" : "ei@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/IconTabBarEvents.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/IconTabBarEvents.png
deleted file mode 100644
index 91084b4c4..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/IconTabBarEvents.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/IconTabBarEvents@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/IconTabBarEvents@2x.png
deleted file mode 100644
index 7824eb828..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/IconTabBarEvents@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/IconTabBarEvents@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/IconTabBarEvents@3x.png
deleted file mode 100644
index 5b44f85df..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/IconTabBarEvents@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/ei.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/ei.png
new file mode 100644
index 000000000..0131621e0
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/ei.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/ei@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/ei@2x.png
new file mode 100644
index 000000000..25cbca2a0
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/ei@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/ei@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/ei@3x.png
new file mode 100644
index 000000000..434604b67
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarEvents.imageset/ei@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/Contents.json
index 6014fae61..65ebffa6d 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarEventsSelected.png",
+      "filename" : "ed.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarEventsSelected@2x.png",
+      "filename" : "ed@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarEventsSelected@3x.png",
+      "filename" : "ed@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/IconTabBarEventsSelected.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/IconTabBarEventsSelected.png
deleted file mode 100644
index f17483294..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/IconTabBarEventsSelected.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/IconTabBarEventsSelected@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/IconTabBarEventsSelected@2x.png
deleted file mode 100644
index 8d5a4c4b2..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/IconTabBarEventsSelected@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/IconTabBarEventsSelected@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/IconTabBarEventsSelected@3x.png
deleted file mode 100644
index c80e9d22d..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/IconTabBarEventsSelected@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/ed.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/ed.png
new file mode 100644
index 000000000..3e146dcea
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/ed.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/ed@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/ed@2x.png
new file mode 100644
index 000000000..addf11bc9
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/ed@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/ed@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/ed@3x.png
new file mode 100644
index 000000000..3e83b035c
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelected.imageset/ed@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/Contents.json
index 1b4fe840e..e2fb2ef22 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarEventsSelectedLight.png",
+      "filename" : "dl.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarEventsSelectedLight@2x.png",
+      "filename" : "dl@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarEventsSelectedLight@3x.png",
+      "filename" : "dl@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/IconTabBarEventsSelectedLight.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/IconTabBarEventsSelectedLight.png
deleted file mode 100644
index 4089d4a75..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/IconTabBarEventsSelectedLight.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/IconTabBarEventsSelectedLight@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/IconTabBarEventsSelectedLight@2x.png
deleted file mode 100644
index 318b81757..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/IconTabBarEventsSelectedLight@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/IconTabBarEventsSelectedLight@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/IconTabBarEventsSelectedLight@3x.png
deleted file mode 100644
index eea8c5f8b..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/IconTabBarEventsSelectedLight@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/dl.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/dl.png
new file mode 100644
index 000000000..ab96d091f
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/dl.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/dl@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/dl@2x.png
new file mode 100644
index 000000000..e036606e4
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/dl@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/dl@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/dl@3x.png
new file mode 100644
index 000000000..76498c5c2
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarEventsSelectedLight.imageset/dl@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/Contents.json
index ee39e5d6c..5728527fc 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarHome.png",
+      "filename" : "icon home.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarHome@2x.png",
+      "filename" : "icon home@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarHome@3x.png",
+      "filename" : "icon home@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/IconTabBarHome.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/IconTabBarHome.png
deleted file mode 100644
index ee5f545d4..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/IconTabBarHome.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/IconTabBarHome@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/IconTabBarHome@2x.png
deleted file mode 100644
index 8db3b93d4..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/IconTabBarHome@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/IconTabBarHome@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/IconTabBarHome@3x.png
deleted file mode 100644
index 69a2d545e..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/IconTabBarHome@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/icon home.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/icon home.png
new file mode 100644
index 000000000..d608f0518
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/icon home.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/icon home@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/icon home@2x.png
new file mode 100644
index 000000000..d616f00e7
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/icon home@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/icon home@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/icon home@3x.png
new file mode 100644
index 000000000..4cd19f7fd
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarHome.imageset/icon home@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/Contents.json
index ed4aef288..0fc165a92 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarHomeSelected.png",
+      "filename" : "icon home dark.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarHomeSelected@2x.png",
+      "filename" : "icon home dark@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarHomeSelected@3x.png",
+      "filename" : "icon home dark@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/IconTabBarHomeSelected.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/IconTabBarHomeSelected.png
deleted file mode 100644
index dfe1853ae..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/IconTabBarHomeSelected.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/IconTabBarHomeSelected@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/IconTabBarHomeSelected@2x.png
deleted file mode 100644
index a8e341c09..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/IconTabBarHomeSelected@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/IconTabBarHomeSelected@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/IconTabBarHomeSelected@3x.png
deleted file mode 100644
index 17622d7d9..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/IconTabBarHomeSelected@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/icon home dark.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/icon home dark.png
new file mode 100644
index 000000000..da241f069
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/icon home dark.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/icon home dark@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/icon home dark@2x.png
new file mode 100644
index 000000000..0386d7012
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/icon home dark@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/icon home dark@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/icon home dark@3x.png
new file mode 100644
index 000000000..fca501f7f
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelected.imageset/icon home dark@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/Contents.json
index 743ada029..d1f0b9ea3 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarHomeSelectedLight.png",
+      "filename" : "icon home light.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarHomeSelectedLight@2x.png",
+      "filename" : "icon home light@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarHomeSelectedLight@3x.png",
+      "filename" : "icon home light@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/IconTabBarHomeSelectedLight.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/IconTabBarHomeSelectedLight.png
deleted file mode 100644
index b0473a7a8..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/IconTabBarHomeSelectedLight.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/IconTabBarHomeSelectedLight@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/IconTabBarHomeSelectedLight@2x.png
deleted file mode 100644
index c641ef2f9..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/IconTabBarHomeSelectedLight@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/IconTabBarHomeSelectedLight@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/IconTabBarHomeSelectedLight@3x.png
deleted file mode 100644
index 9976fdfdf..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/IconTabBarHomeSelectedLight@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/icon home light.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/icon home light.png
new file mode 100644
index 000000000..b011bda40
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/icon home light.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/icon home light@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/icon home light@2x.png
new file mode 100644
index 000000000..1bd41292c
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/icon home light@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/icon home light@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/icon home light@3x.png
new file mode 100644
index 000000000..31e54d76c
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarHomeSelectedLight.imageset/icon home light@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/Contents.json
index 5db233334..f01819381 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarSettings.png",
+      "filename" : "s.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarSettings@2x.png",
+      "filename" : "s@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarSettings@3x.png",
+      "filename" : "s@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/IconTabBarSettings.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/IconTabBarSettings.png
deleted file mode 100644
index 8c2f1b985..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/IconTabBarSettings.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/IconTabBarSettings@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/IconTabBarSettings@2x.png
deleted file mode 100644
index 036f973aa..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/IconTabBarSettings@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/IconTabBarSettings@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/IconTabBarSettings@3x.png
deleted file mode 100644
index faaaacad9..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/IconTabBarSettings@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/s.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/s.png
new file mode 100644
index 000000000..49b6154d8
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/s.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/s@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/s@2x.png
new file mode 100644
index 000000000..a1e49a071
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/s@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/s@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/s@3x.png
new file mode 100644
index 000000000..10cb78484
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettings.imageset/s@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/Contents.json
index 232b39dc0..9cd42e597 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarSettingsSelected.png",
+      "filename" : "sdark.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarSettingsSelected@2x.png",
+      "filename" : "sdark@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarSettingsSelected@3x.png",
+      "filename" : "sdark@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/IconTabBarSettingsSelected.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/IconTabBarSettingsSelected.png
deleted file mode 100644
index 5ec97e93e..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/IconTabBarSettingsSelected.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/IconTabBarSettingsSelected@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/IconTabBarSettingsSelected@2x.png
deleted file mode 100644
index 7da5c0032..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/IconTabBarSettingsSelected@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/IconTabBarSettingsSelected@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/IconTabBarSettingsSelected@3x.png
deleted file mode 100644
index 0e3ead497..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/IconTabBarSettingsSelected@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/sdark.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/sdark.png
new file mode 100644
index 000000000..19b4c925a
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/sdark.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/sdark@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/sdark@2x.png
new file mode 100644
index 000000000..3deb171c0
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/sdark@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/sdark@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/sdark@3x.png
new file mode 100644
index 000000000..58885fdce
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelected.imageset/sdark@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/Contents.json
index e05e9f52a..b9a9416b2 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarSettingsSelectedLight.png",
+      "filename" : "slight.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarSettingsSelectedLight@2x.png",
+      "filename" : "slight@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarSettingsSelectedLight@3x.png",
+      "filename" : "slight@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/IconTabBarSettingsSelectedLight.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/IconTabBarSettingsSelectedLight.png
deleted file mode 100644
index dc401686d..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/IconTabBarSettingsSelectedLight.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/IconTabBarSettingsSelectedLight@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/IconTabBarSettingsSelectedLight@2x.png
deleted file mode 100644
index af36bc294..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/IconTabBarSettingsSelectedLight@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/IconTabBarSettingsSelectedLight@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/IconTabBarSettingsSelectedLight@3x.png
deleted file mode 100644
index a2d7b7299..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/IconTabBarSettingsSelectedLight@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/slight.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/slight.png
new file mode 100644
index 000000000..c4efa2ba5
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/slight.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/slight@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/slight@2x.png
new file mode 100644
index 000000000..484f6e8e6
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/slight@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/slight@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/slight@3x.png
new file mode 100644
index 000000000..b5f14c5ac
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarSettingsSelectedLight.imageset/slight@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/Contents.json
index e08e73954..fa1057611 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarXapp.png",
+      "filename" : "xApps grey.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarXapp@2x.png",
+      "filename" : "xApps grey@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarXapp@3x.png",
+      "filename" : "xApps grey@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/IconTabBarXapp.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/IconTabBarXapp.png
deleted file mode 100644
index 129861a07..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/IconTabBarXapp.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/IconTabBarXapp@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/IconTabBarXapp@2x.png
deleted file mode 100644
index 7cc9c9c00..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/IconTabBarXapp@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/IconTabBarXapp@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/IconTabBarXapp@3x.png
deleted file mode 100644
index c6dfb4b1e..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/IconTabBarXapp@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/xApps grey.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/xApps grey.png
new file mode 100644
index 000000000..999baf9b5
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/xApps grey.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/xApps grey@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/xApps grey@2x.png
new file mode 100644
index 000000000..b81f811dc
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/xApps grey@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/xApps grey@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/xApps grey@3x.png
new file mode 100644
index 000000000..464984e0e
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarXapp.imageset/xApps grey@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/Contents.json
index 5b8c803c4..3b2a7cdfb 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarXappSelected.png",
+      "filename" : "xapps.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarXappSelected@2x.png",
+      "filename" : "xapps@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarXappSelected@3x.png",
+      "filename" : "xapps@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/IconTabBarXappSelected.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/IconTabBarXappSelected.png
deleted file mode 100644
index 58010d89e..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/IconTabBarXappSelected.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/IconTabBarXappSelected@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/IconTabBarXappSelected@2x.png
deleted file mode 100644
index 5668cb49a..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/IconTabBarXappSelected@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/IconTabBarXappSelected@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/IconTabBarXappSelected@3x.png
deleted file mode 100644
index b726e8ab7..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/IconTabBarXappSelected@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/xapps.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/xapps.png
new file mode 100644
index 000000000..0df5fb51a
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/xapps.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/xapps@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/xapps@2x.png
new file mode 100644
index 000000000..901b0c4cb
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/xapps@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/xapps@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/xapps@3x.png
new file mode 100644
index 000000000..ed35d0005
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelected.imageset/xapps@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/Contents.json
index 8125be16e..287180fc1 100644
--- a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/Contents.json
+++ b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "IconTabBarXappSelectedLight.png",
+      "filename" : "xapps light.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "IconTabBarXappSelectedLight@2x.png",
+      "filename" : "xapps light@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "IconTabBarXappSelectedLight@3x.png",
+      "filename" : "xapps light@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/IconTabBarXappSelectedLight.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/IconTabBarXappSelectedLight.png
deleted file mode 100644
index 34490f460..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/IconTabBarXappSelectedLight.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/IconTabBarXappSelectedLight@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/IconTabBarXappSelectedLight@2x.png
deleted file mode 100644
index e35103627..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/IconTabBarXappSelectedLight@2x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/IconTabBarXappSelectedLight@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/IconTabBarXappSelectedLight@3x.png
deleted file mode 100644
index 774e866dd..000000000
Binary files a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/IconTabBarXappSelectedLight@3x.png and /dev/null differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/xapps light.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/xapps light.png
new file mode 100644
index 000000000..53b06fce5
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/xapps light.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/xapps light@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/xapps light@2x.png
new file mode 100644
index 000000000..c0bba4597
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/xapps light@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/xapps light@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/xapps light@3x.png
new file mode 100644
index 000000000..7d33a2cd9
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTabBarXappSelectedLight.imageset/xapps light@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/Contents.json
new file mode 100644
index 000000000..eab9c656b
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "tangem.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tangem@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tangem@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/tangem.png b/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/tangem.png
new file mode 100644
index 000000000..c8f8dddc0
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/tangem.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/tangem@2x.png b/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/tangem@2x.png
new file mode 100644
index 000000000..81833fe1a
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/tangem@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/tangem@3x.png b/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/tangem@3x.png
new file mode 100644
index 000000000..a9ddb1040
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconTangem.imageset/tangem@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/Contents.json
new file mode 100644
index 000000000..da5af02d4
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "icon-request.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon-request@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon-request@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/icon-request.png b/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/icon-request.png
new file mode 100644
index 000000000..ffd3d2b1b
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/icon-request.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/icon-request@2x.png b/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/icon-request@2x.png
new file mode 100644
index 000000000..e3a62a96d
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/icon-request@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/icon-request@3x.png b/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/icon-request@3x.png
new file mode 100644
index 000000000..216d5958d
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconV2Request.imageset/icon-request@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/Contents.json
new file mode 100644
index 000000000..cfb5dbdae
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "icon-send.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon-send@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon-send@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/icon-send.png b/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/icon-send.png
new file mode 100644
index 000000000..4c347f6f5
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/icon-send.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/icon-send@2x.png b/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/icon-send@2x.png
new file mode 100644
index 000000000..a67e165cb
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/icon-send@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/icon-send@3x.png b/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/icon-send@3x.png
new file mode 100644
index 000000000..802f3e1d8
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconV2Send.imageset/icon-send@3x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/Contents.json b/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/Contents.json
new file mode 100644
index 000000000..35916a968
--- /dev/null
+++ b/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "icon-swap.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon-swap@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon-swap@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/icon-swap.png b/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/icon-swap.png
new file mode 100644
index 000000000..df260a6c6
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/icon-swap.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/icon-swap@2x.png b/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/icon-swap@2x.png
new file mode 100644
index 000000000..66738892f
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/icon-swap@2x.png differ
diff --git a/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/icon-swap@3x.png b/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/icon-swap@3x.png
new file mode 100644
index 000000000..a6a2a272e
Binary files /dev/null and b/ios/Xaman/Images.xcassets/Icons/IconV2Swap.imageset/icon-swap@3x.png differ
diff --git a/ios/Xaman/Info.plist b/ios/Xaman/Info.plist
index 7999ad71b..cc53d8563 100644
--- a/ios/Xaman/Info.plist
+++ b/ios/Xaman/Info.plist
@@ -54,7 +54,9 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>85</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>https</string>
diff --git a/ios/Xaman/Libs/Security/Authentication/Biometric/BiometricModule.m b/ios/Xaman/Libs/Security/Authentication/Biometric/BiometricModule.m
index e4b7d874a..7f868aff7 100644
--- a/ios/Xaman/Libs/Security/Authentication/Biometric/BiometricModule.m
+++ b/ios/Xaman/Libs/Security/Authentication/Biometric/BiometricModule.m
@@ -23,9 +23,7 @@ @implementation BiometricModule
 +(void)initialise {
   dispatch_async(dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     // generate key if not exist
-    if(![SecurityProvider isKeyReady]){
-      [SecurityProvider generateKey];
-    }
+    [SecurityProvider ensureKeyIsReady];
   });
 }
 
@@ -58,7 +56,7 @@ -(NSString *) getSensorError: (LAContext *)context {
 RCT_EXPORT_METHOD(isSensorAvailable:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-  dispatch_async(dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     LAContext *context = [[LAContext alloc] init];
     NSString *error = [self getSensorError:context];
     
@@ -67,8 +65,15 @@ -(NSString *) getSensorError: (LAContext *)context {
       
       // if sensor is available but the key is not generated
       if(![SecurityProvider isKeyReady]){
-        reject(ERROR_NOT_MEET_SECURITY_REQUIREMENTS, nil, nil);
-        return;
+        // NSLog(@"BiometricModule: Key not ready, attempting to generate key");
+        BOOL keyGenerated = [SecurityProvider ensureKeyIsReady];
+        
+        if (!keyGenerated) {
+          // NSLog(@"BiometricModule: Key generation failed");
+          reject(ERROR_NOT_MEET_SECURITY_REQUIREMENTS, nil, nil);
+          return;
+        }
+        // NSLog(@"BiometricModule: Key generated successfully");
       }
       
       resolve([self getBiometryType:context]);
diff --git a/ios/Xaman/Libs/Security/Authentication/Biometric/SecurityProvider.h b/ios/Xaman/Libs/Security/Authentication/Biometric/SecurityProvider.h
index 4a8d53fa2..49ab215e9 100644
--- a/ios/Xaman/Libs/Security/Authentication/Biometric/SecurityProvider.h
+++ b/ios/Xaman/Libs/Security/Authentication/Biometric/SecurityProvider.h
@@ -12,6 +12,7 @@ extern NSString *const ENCRYPTION_SUCCESS;
 + (bool)isKeyReady;
 + (void)generateKey;
 + (void)deleteInvalidKey;
++ (bool)ensureKeyIsReady;
 + (NSString *)signRandomBytes: (LAContext *)authentication_context;
 + (NSString *)signRandomBytesWithBackoff: (LAContext *)authentication_context;
 @end
diff --git a/ios/Xaman/Libs/Security/Authentication/Biometric/SecurityProvider.m b/ios/Xaman/Libs/Security/Authentication/Biometric/SecurityProvider.m
index ffc24abc8..ea723687a 100644
--- a/ios/Xaman/Libs/Security/Authentication/Biometric/SecurityProvider.m
+++ b/ios/Xaman/Libs/Security/Authentication/Biometric/SecurityProvider.m
@@ -12,6 +12,20 @@
 
 @implementation SecurityProvider
 
++ (BOOL)ensureKeyIsReady {
+    // First check if the key is already ready
+    if ([self isKeyReady]) {
+        return YES;
+    }
+    
+    // If not ready, generate the key
+    // Call your existing key generation method which is void
+    [self generateKey]; // or whatever your void key generation method is named
+    
+    // Check again if the key is ready after generation
+    return [self isKeyReady];
+}
+
 + (void) generateKey {
   CFErrorRef error = NULL;
   SecAccessControlRef access =
diff --git a/ios/XamanTests/Info.plist b/ios/XamanTests/Info.plist
index 11a3c5782..7e11935ee 100644
--- a/ios/XamanTests/Info.plist
+++ b/ios/XamanTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>85</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 12654d1e9..e599bbd94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,16 @@
 {
   "name": "xaman",
-  "version": "3.2.0",
+  "version": "4.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "xaman",
-      "version": "3.2.0",
+      "version": "4.0.0",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN <LICENSE>",
       "dependencies": {
+        "@adrianso/react-native-device-brightness": "^1.2.7",
         "@react-native-community/netinfo": "11.3.2",
         "@react-native-firebase/analytics": "20.4.0",
         "@react-native-firebase/app": "20.4.0",
@@ -25,13 +26,14 @@
         "react": "18.2.0",
         "react-native": "0.74.2",
         "react-native-camera": "4.2.1",
+        "react-native-drop-shadow": "^1.0.0",
         "react-native-interactable": "2.0.1",
         "react-native-navigation": "7.40.1",
         "realm": "12.13.0",
         "tangem-sdk-react-native": "2.3.1",
         "uuid": "10.0.0",
-        "xrpl-accountlib": "3.6.2",
-        "xrpl-orderbook-reader": "0.4.0",
+        "xrpl-accountlib": "^8.3.0",
+        "xrpl-orderbook-reader": "^1.0.0",
         "xumm-string-decode": "0.7.0"
       },
       "devDependencies": {
@@ -58,7 +60,7 @@
         "babel-plugin-rewrite-require": "1.14.5",
         "babel-plugin-transform-remove-console": "6.9.4",
         "coveralls": "3.1.1",
-        "detox": "20.20.0",
+        "detox": "20.32.0",
         "eslint": "8.57.0",
         "eslint-config-airbnb": "19.0.4",
         "eslint-config-airbnb-base": "15.0.0",
@@ -94,6 +96,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@adrianso/react-native-device-brightness": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@adrianso/react-native-device-brightness/-/react-native-device-brightness-1.2.7.tgz",
+      "integrity": "sha512-q3OTFGohAh04R8cBka7/eNXaeSD8bAZocMsifLIR3oDF5N9cNH2UVEjzJaFXW8DHFEsODpljpT+eyGWIhKlkow=="
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
@@ -3410,9 +3417,9 @@
       "integrity": "sha512-zuWxyfXNbsKbm96HhXzainONPFqRcoZblQ++e9cAIGUuHfl2cFSBzW01jtesqWG/lqaUyX3H8O1y9oWboGNQBA=="
     },
     "node_modules/@flatten-js/interval-tree": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@flatten-js/interval-tree/-/interval-tree-1.1.2.tgz",
-      "integrity": "sha512-OwLoV9E/XM6b7bes2rSFnGNjyRy7vcoIHFTnmBR2WAaZTf0Fe4EX4GdA65vU1KgFAasti7iRSg2dZfYd1Zt00Q==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@flatten-js/interval-tree/-/interval-tree-1.1.3.tgz",
+      "integrity": "sha512-xhFWUBoHJFF77cJO1D6REjdgJEMRf2Y2Z+eKEPav8evGKcLSnj1ud5pLXQSbGuxF3VSvT1rWhMfVpXEKJLTL+A==",
       "dev": true
     },
     "node_modules/@grpc/grpc-js": {
@@ -4352,12 +4359,26 @@
         "eslint-scope": "5.1.1"
       }
     },
+    "node_modules/@noble/curves": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.8.0.tgz",
+      "integrity": "sha512-j84kjAbzEnQHaSIhRPUmB3/eVXu2k3dKPl2LOrR8fSOIL+89U+7lV117EWHtq/GHM3ReGHM46iRBdZfpc4HRUQ==",
+      "dependencies": {
+        "@noble/hashes": "1.7.0"
+      },
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@noble/hashes": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz",
-      "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.0.tgz",
+      "integrity": "sha512-HXydb0DgzTpDPwbVeDGCG1gIu7X6+AuU6Zl6av/E/KG8LMsvPntvq+w17CHRpKBmN6Ybdrt1eP3k4cj8DJa78w==",
       "engines": {
-        "node": ">= 16"
+        "node": "^14.21.3 || >=16"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
@@ -5986,6 +6007,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/@scure/base": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.2.1.tgz",
+      "integrity": "sha512-DGmGtC8Tt63J5GfHgfl5CuAXh96VF/LD8K9Hr/Gv0J2lAoRGlPOMpqMpMbCTOoOJMZCk2Xt+DskdDyn6dEFdzQ==",
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@sideway/address": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
@@ -6593,6 +6622,44 @@
         "react-native": "^0.74.0"
       }
     },
+    "node_modules/@xrplf/isomorphic": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@xrplf/isomorphic/-/isomorphic-1.0.1.tgz",
+      "integrity": "sha512-0bIpgx8PDjYdrLFeC3csF305QQ1L7sxaWnL5y71mCvhenZzJgku9QsA+9QCXBC1eNYtxWO/xR91zrXJy2T/ixg==",
+      "dependencies": {
+        "@noble/hashes": "^1.0.0",
+        "eventemitter3": "5.0.1",
+        "ws": "^8.13.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@xrplf/isomorphic/node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
+    "node_modules/@xrplf/isomorphic/node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@yarnpkg/lockfile": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
@@ -7955,9 +8022,9 @@
       }
     },
     "node_modules/bunyamin": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/bunyamin/-/bunyamin-1.5.2.tgz",
-      "integrity": "sha512-Xp2nfqk33zt3nX90OSTkLVOc5N+1zdR3MWvfLHoIrm3cGRkdxPTPYB9CCgrDV8oum5rbghJjAbmXFXOrRXvMtg==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/bunyamin/-/bunyamin-1.6.3.tgz",
+      "integrity": "sha512-m1hAijFhu8pFiidsVc0XEDic46uxPK+mKNLqkb5mluNx0nTolNzx/DjwMqHChQWCgfOLMjKYJJ2uPTQLE6t4Ng==",
       "dev": true,
       "dependencies": {
         "@flatten-js/interval-tree": "^1.1.2",
@@ -9033,11 +9100,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
-    },
     "node_modules/decompress-response": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@@ -9383,9 +9445,9 @@
       }
     },
     "node_modules/detox": {
-      "version": "20.20.0",
-      "resolved": "https://registry.npmjs.org/detox/-/detox-20.20.0.tgz",
-      "integrity": "sha512-8aiIcNrrjsrWCMGiDB22vGKYHLfDVgwcCMlFmEiJsVbPfhtjDbhGSfSvHqpyf6rb63GEPq/HxCkCy+NBkowXtQ==",
+      "version": "20.32.0",
+      "resolved": "https://registry.npmjs.org/detox/-/detox-20.32.0.tgz",
+      "integrity": "sha512-xi2FSkoZ+8XYbfOFaMpC1uMKiuRlx0AXjnzTwuCGxjCsntM+YIU/zlACRjmsIAH4pHt7yVlJeV8xZyVGqIeeOg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -9395,13 +9457,14 @@
         "caf": "^15.0.1",
         "chalk": "^4.0.0",
         "child-process-promise": "^2.2.0",
+        "detox-copilot": "^0.0.27",
         "execa": "^5.1.1",
         "find-up": "^5.0.0",
         "fs-extra": "^11.0.0",
         "funpermaproxy": "^1.1.0",
         "glob": "^8.0.3",
         "ini": "^1.3.4",
-        "jest-environment-emit": "^1.0.5",
+        "jest-environment-emit": "^1.0.8",
         "json-cycle": "^1.3.0",
         "lodash": "^4.17.11",
         "multi-sort-stream": "^1.0.3",
@@ -9440,6 +9503,12 @@
         }
       }
     },
+    "node_modules/detox-copilot": {
+      "version": "0.0.27",
+      "resolved": "https://registry.npmjs.org/detox-copilot/-/detox-copilot-0.0.27.tgz",
+      "integrity": "sha512-H2febTNp0arVx2A8rvM1C2BwDiBEP/2Ya8Hd1mVyV66rR5u8om1gdIypaRGm+plpTLCHhlefe4+7qLtHgVzpng==",
+      "dev": true
+    },
     "node_modules/detox/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -9781,9 +9850,9 @@
       "integrity": "sha512-R1CccCDYqndR25CaXFd6hp/u9RaaMcftMkphmvuepXr5b1vfLkRml6aWVeBhXJ7rbevHkKEMJtz8XqPf7ffmew=="
     },
     "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz",
+      "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
       "dependencies": {
         "bn.js": "^4.11.9",
         "brorand": "^1.1.0",
@@ -13915,9 +13984,9 @@
       }
     },
     "node_modules/jest-environment-emit": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-emit/-/jest-environment-emit-1.0.6.tgz",
-      "integrity": "sha512-iE+N18T76Gr5EVn58ANoUu1BMTrEYEgqpCOrAlev/KUfv8YuqUfyLon8C2tsp4qSmk0wIhEHhBMB0v54yv4tRA==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/jest-environment-emit/-/jest-environment-emit-1.0.8.tgz",
+      "integrity": "sha512-WNqvxBLH0yNojHJQ99Y21963aT7UTavxV3PgiBQFi8zwrlnKU6HvkB6LOvQrbk5I8mI8JEKvcoOrQOvBVMLIXQ==",
       "dev": true,
       "dependencies": {
         "bunyamin": "^1.5.2",
@@ -13979,9 +14048,9 @@
       }
     },
     "node_modules/jest-environment-emit/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true
     },
     "node_modules/jest-environment-node": {
@@ -16510,6 +16579,7 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
       "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -16527,6 +16597,7 @@
       "version": "2.4.5",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
       "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -18267,6 +18338,15 @@
         "prop-types": "^15.6.2"
       }
     },
+    "node_modules/react-native-drop-shadow": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-drop-shadow/-/react-native-drop-shadow-1.0.0.tgz",
+      "integrity": "sha512-om6oMDDn90ClFa+tEGMsFcACKlea5TO4jYur8PJKRpzfz+SnDIJlddhzp2kbOLpRTe7lleq6Md5QqC3u7RfOow==",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/react-native-interactable": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/react-native-interactable/-/react-native-interactable-2.0.1.tgz",
@@ -18960,18 +19040,28 @@
       }
     },
     "node_modules/ripple-keypairs": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/ripple-keypairs/-/ripple-keypairs-1.3.1.tgz",
-      "integrity": "sha512-dmPlraWKJciFJxHcoubDahGnoIalG5e/BtV6HNDUs7wLXmtnLMHt6w4ed9R8MTL2zNrVPiIdI/HCtMMo0Tm7JQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ripple-keypairs/-/ripple-keypairs-2.0.0.tgz",
+      "integrity": "sha512-b5rfL2EZiffmklqZk1W+dvSy97v3V/C7936WxCCgDynaGPp7GE6R2XO7EU9O2LlM/z95rj870IylYnOQs+1Rag==",
       "dependencies": {
-        "bn.js": "^5.1.1",
-        "brorand": "^1.0.5",
-        "elliptic": "^6.5.4",
-        "hash.js": "^1.0.3",
-        "ripple-address-codec": "^4.3.1"
+        "@noble/curves": "^1.0.0",
+        "@xrplf/isomorphic": "^1.0.0",
+        "ripple-address-codec": "^5.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 16"
+      }
+    },
+    "node_modules/ripple-keypairs/node_modules/ripple-address-codec": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ripple-address-codec/-/ripple-address-codec-5.0.0.tgz",
+      "integrity": "sha512-de7osLRH/pt5HX2xw2TRJtbdLLWHu0RXirpQaEeCnWKY5DYHykh3ETSkofvm0aX0LJiV7kwkegJxQkmbO94gWw==",
+      "dependencies": {
+        "@scure/base": "^1.1.3",
+        "@xrplf/isomorphic": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 16"
       }
     },
     "node_modules/ripple-secret-codec": {
@@ -19608,9 +19698,9 @@
       }
     },
     "node_modules/stream-json": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.8.0.tgz",
-      "integrity": "sha512-HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.9.1.tgz",
+      "integrity": "sha512-uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw==",
       "dev": true,
       "dependencies": {
         "stream-chain": "^2.2.5"
@@ -20880,6 +20970,30 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/verify-xrpl-signature": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/verify-xrpl-signature/-/verify-xrpl-signature-8.2.0.tgz",
+      "integrity": "sha512-PevfGWTkijzD+6u0+KiQ95EtUPxYijJStIU+B8N5p/9V+J+f0xea6HG0xtL/Vr0oQ1n3NDlqZVJQybV8xxVCsg==",
+      "dependencies": {
+        "ripple-keypairs": "^1.1.4",
+        "xrpl-binary-codec-prerelease": "^8.2.0"
+      }
+    },
+    "node_modules/verify-xrpl-signature/node_modules/ripple-keypairs": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/ripple-keypairs/-/ripple-keypairs-1.3.1.tgz",
+      "integrity": "sha512-dmPlraWKJciFJxHcoubDahGnoIalG5e/BtV6HNDUs7wLXmtnLMHt6w4ed9R8MTL2zNrVPiIdI/HCtMMo0Tm7JQ==",
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "brorand": "^1.0.5",
+        "elliptic": "^6.5.4",
+        "hash.js": "^1.0.3",
+        "ripple-address-codec": "^4.3.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/vlq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/vlq/-/vlq-1.0.1.tgz",
@@ -21229,24 +21343,25 @@
       }
     },
     "node_modules/xrpl-accountlib": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/xrpl-accountlib/-/xrpl-accountlib-3.6.2.tgz",
-      "integrity": "sha512-Ad6vZ1341opkhFgGRmSWn6PZ+cptHhCe2gG6WhbWL4hAWWANt02kxXsrPbfa6Px1N8+DXYTddcMm43ifYkOzOA==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/xrpl-accountlib/-/xrpl-accountlib-8.3.0.tgz",
+      "integrity": "sha512-XEwaaaA9A8aRQgWFMRIfyGLSs3KaZA0HSP5ggrl1OVHuSii0y90SMz1d03DhWnQYrtO3UcjgKCax2S2MXPMYyw==",
       "dependencies": {
         "assert": "^2.0.0",
         "bip32": "^2.0.6",
         "bip39": "^3.0.4",
         "bn.js": "^5.2.1",
-        "elliptic": "6.5.4",
+        "elliptic": "^6.6.1",
         "hash.js": "^1.1.7",
         "lodash": "^4.17.21",
         "ripple-address-codec": "^4.2.5",
-        "ripple-keypairs": "^1.1.4",
+        "ripple-keypairs": "^2.0.0",
         "ripple-secret-codec": "^1.0.3",
-        "xrpl-binary-codec-prerelease": "^8.0.1",
+        "verify-xrpl-signature": "^8.2.0",
+        "xrpl-binary-codec-prerelease": "^8.2.0",
         "xrpl-client": "^2.3.0",
-        "xrpl-secret-numbers": "^0.3.3",
-        "xrpl-sign-keypairs": "^2.6.1"
+        "xrpl-secret-numbers": "^0.3.5",
+        "xrpl-sign-keypairs": "^8.2.0"
       }
     },
     "node_modules/xrpl-accountlib/node_modules/assert": {
@@ -21274,66 +21389,28 @@
       }
     },
     "node_modules/xrpl-binary-codec-prerelease": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/xrpl-binary-codec-prerelease/-/xrpl-binary-codec-prerelease-8.0.1.tgz",
-      "integrity": "sha512-HQZeazeNmgsM5dV4oSNSwWv+yp99xRvsWoZNvtCuCwkvwit6/fsoK14yNCxVaeiEm0cMkz1yt08UU6MebKgRcQ==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/xrpl-binary-codec-prerelease/-/xrpl-binary-codec-prerelease-8.2.0.tgz",
+      "integrity": "sha512-TNxEcEf6Nt4Rjl+lDxYmBrWbcb5XO8Nj8i30TwLkYjO8YcSh5sIuLPlo0/T2v/RpPK2OcYyV0qKWOyZtZp4lUQ==",
       "dependencies": {
-        "assert": "^2.0.0",
-        "big-integer": "^1.6.48",
-        "buffer": "6.0.3",
-        "create-hash": "^1.2.0",
-        "decimal.js": "^10.2.0",
-        "ripple-address-codec": "^4.3.1"
+        "@xrplf/isomorphic": "^1.0.1",
+        "bignumber.js": "^9.0.0",
+        "ripple-address-codec": "^5.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 18"
       }
     },
-    "node_modules/xrpl-binary-codec-prerelease/node_modules/assert": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
-      "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-nan": "^1.3.2",
-        "object-is": "^1.1.5",
-        "object.assign": "^4.1.4",
-        "util": "^0.12.5"
-      }
-    },
-    "node_modules/xrpl-binary-codec-prerelease/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "node_modules/xrpl-binary-codec-prerelease/node_modules/util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+    "node_modules/xrpl-binary-codec-prerelease/node_modules/ripple-address-codec": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ripple-address-codec/-/ripple-address-codec-5.0.0.tgz",
+      "integrity": "sha512-de7osLRH/pt5HX2xw2TRJtbdLLWHu0RXirpQaEeCnWKY5DYHykh3ETSkofvm0aX0LJiV7kwkegJxQkmbO94gWw==",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
+        "@scure/base": "^1.1.3",
+        "@xrplf/isomorphic": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 16"
       }
     },
     "node_modules/xrpl-client": {
@@ -21346,9 +21423,9 @@
       }
     },
     "node_modules/xrpl-orderbook-reader": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/xrpl-orderbook-reader/-/xrpl-orderbook-reader-0.4.0.tgz",
-      "integrity": "sha512-b2qWucqXBCL+p8LIjedBgBbP6L9ZLp3Ux/glImpbECIbqXKU0BiEhDon3xI/E586H+Gt05Sz6hRfmpvpmZUIiw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/xrpl-orderbook-reader/-/xrpl-orderbook-reader-1.0.0.tgz",
+      "integrity": "sha512-BSTpdbDZjkOdjpoTDmC122PaKaDXvdbDgi6nQAVnFUReiY4Es/59rt9mCtoXgmGXEpqk87CIwvMMPAhJCSky0A==",
       "dependencies": {
         "@types/debug": "^4.1.5",
         "assert": "^2.0.0",
@@ -21381,24 +21458,24 @@
       }
     },
     "node_modules/xrpl-secret-numbers": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/xrpl-secret-numbers/-/xrpl-secret-numbers-0.3.4.tgz",
-      "integrity": "sha512-B3m0OLRsmNLQpN/BUR15+LC4yejM/pdneoWgijfBYbgjVVnpyCF5+Ur7zbAs4nCAlBUZYXnxp+o/rSNZkke9jQ==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/xrpl-secret-numbers/-/xrpl-secret-numbers-0.3.5.tgz",
+      "integrity": "sha512-5W2Ijp4nFpplEJ4IEK8JNAnRN9+3/+8BdBQ0hOZ3bZfa/+K9c9GNdN5fHDkKoECJN3nzXNcj6/Ejg7wUQDtRnQ==",
       "dependencies": {
         "@types/brorand": "^1.0.30",
         "brorand": "^1.1.0",
-        "ripple-keypairs": "^1.1.5"
+        "ripple-keypairs": "^2.0.0"
       }
     },
     "node_modules/xrpl-sign-keypairs": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/xrpl-sign-keypairs/-/xrpl-sign-keypairs-2.6.1.tgz",
-      "integrity": "sha512-J38zSKtgGvCYGXIhbEcImRZdE7bP1S4O6elKz/erHn+ZRUxqGQUofxk1Nq7VloQv35HWd/gzdL3uvvFuwCe/Aw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/xrpl-sign-keypairs/-/xrpl-sign-keypairs-8.2.0.tgz",
+      "integrity": "sha512-iH9+2hQtdb4FR0lVDw+pOEs09v+HVV4VFDa8M7N4axWXmqIV6Zkz/yysdJcYo6WnwyI9Ywa07UJQymQU6ydSUQ==",
       "dependencies": {
         "big-integer": "^1.6.51",
         "ripple-address-codec": "^4.2.4",
-        "ripple-keypairs": "^1.1.4",
-        "xrpl-binary-codec-prerelease": "^8.0.1"
+        "ripple-keypairs": "^2.0.0",
+        "xrpl-binary-codec-prerelease": "^8.2.0"
       }
     },
     "node_modules/xtend": {
diff --git a/package.json b/package.json
index 07b3f63a3..c8c27476d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xaman",
-  "version": "3.2.0",
+  "version": "4.0.0",
   "license": "SEE LICENSE IN <LICENSE>",
   "scripts": {
     "start": "node node_modules/react-native/cli.js start",
@@ -14,6 +14,7 @@
     "cosmos": "cosmos-native --config .cosmos/cosmos.config.json"
   },
   "dependencies": {
+    "@adrianso/react-native-device-brightness": "^1.2.7",
     "@react-native-community/netinfo": "11.3.2",
     "@react-native-firebase/analytics": "20.4.0",
     "@react-native-firebase/app": "20.4.0",
@@ -29,13 +30,14 @@
     "react": "18.2.0",
     "react-native": "0.74.2",
     "react-native-camera": "4.2.1",
+    "react-native-drop-shadow": "^1.0.0",
     "react-native-interactable": "2.0.1",
     "react-native-navigation": "7.40.1",
     "realm": "12.13.0",
     "tangem-sdk-react-native": "2.3.1",
     "uuid": "10.0.0",
-    "xrpl-accountlib": "3.6.2",
-    "xrpl-orderbook-reader": "0.4.0",
+    "xrpl-accountlib": "^8.3.0",
+    "xrpl-orderbook-reader": "^1.0.0",
     "xumm-string-decode": "0.7.0"
   },
   "devDependencies": {
@@ -62,7 +64,7 @@
     "babel-plugin-rewrite-require": "1.14.5",
     "babel-plugin-transform-remove-console": "6.9.4",
     "coveralls": "3.1.1",
-    "detox": "20.20.0",
+    "detox": "20.32.0",
     "eslint": "8.57.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-airbnb-base": "15.0.0",
diff --git a/scripts/imageprepare-app/appicon-ios.bash b/scripts/imageprepare-app/appicon-ios.bash
new file mode 100755
index 000000000..047640592
--- /dev/null
+++ b/scripts/imageprepare-app/appicon-ios.bash
@@ -0,0 +1,19 @@
+#!/bin/bash
+for png in *.png; do
+
+    sips -z 40 40 $png --out "40_$png"
+    sips -z 60 60 $png --out "60_$png"
+    sips -z 58 58 $png --out "58_$png"
+    sips -z 76 76 $png --out "76_$png"
+    sips -z 80 80 $png --out "80_$png"
+    sips -z 87 87 $png --out "87_$png"
+    sips -z 114 114 $png --out "114_$png"
+    sips -z 120 120 $png --out "120_$png"
+    sips -z 128 128 $png --out "128_$png"
+    sips -z 136 136 $png --out "136_$png"
+    sips -z 152 152 $png --out "152_$png"
+    sips -z 167 167 $png --out "167_$png"
+    sips -z 180 180 $png --out "180_$png"
+    sips -z 192 192 $png --out "192_$png"
+
+done
\ No newline at end of file
diff --git a/scripts/imageprepare-app/png-android.bash b/scripts/imageprepare-app/png-android.bash
new file mode 100755
index 000000000..ff381e919
--- /dev/null
+++ b/scripts/imageprepare-app/png-android.bash
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Android density scaling factors relative to mdpi (1x)
+# mdpi: 1x (baseline)
+# hdpi: 1.5x
+# xhdpi: 2x
+# xxhdpi: 3x
+# xxxhdpi: 4x
+
+# Set the Android resource directories
+ANDROID_RES_DIR="/Users/wrw/Desktop/Xaman/xaman-app/android/app/src/main/res"
+MDPI_DIR="${ANDROID_RES_DIR}/drawable-mdpi"
+HDPI_DIR="${ANDROID_RES_DIR}/drawable-hdpi"
+XHDPI_DIR="${ANDROID_RES_DIR}/drawable-xhdpi"
+XXHDPI_DIR="${ANDROID_RES_DIR}/drawable-xxhdpi"
+XXXHDPI_DIR="${ANDROID_RES_DIR}/drawable-xxxhdpi"
+DEFAULT_DIR="${ANDROID_RES_DIR}/drawable"
+
+# Create directories if they don't exist
+mkdir -p "$MDPI_DIR" "$HDPI_DIR" "$XHDPI_DIR" "$XXHDPI_DIR" "$XXXHDPI_DIR" "$DEFAULT_DIR"
+
+# Process each PNG file in current directory
+for png in *.png; do
+    # Skip if not a file
+    [ -f "$png" ] || continue
+    
+    # Skip if already processed files
+    if [[ "$png" == *"@1x.png" ]] || [[ "$png" == *"@2x.png" ]]; then
+        continue
+    fi
+    
+    echo "Processing $png..."
+    
+    # Extract the base filename (remove the @3x if it exists)
+    if [[ "$png" == *"@3x.png" ]]; then
+        filename="${png%@3x.png}"
+    else
+        filename="${png%.png}"
+    fi
+    
+    # Get original dimensions
+    width=$(sips -g pixelWidth "$png" | grep -o '[0-9]*$')
+    height=$(sips -g pixelHeight "$png" | grep -o '[0-9]*$')
+    
+    # XXHDPI is equivalent to @3x (iOS), so use original for that
+    # Calculate other dimensions based on Android scaling factors
+    
+    # xxxhdpi = 4x (4/3 of the @3x)
+    width_xxxhdpi=$((width * 4 / 3))
+    height_xxxhdpi=$((height * 4 / 3))
+    
+    # xxhdpi = 3x (our original @3x)
+    width_xxhdpi=$width
+    height_xxhdpi=$height
+    
+    # xhdpi = 2x (2/3 of the @3x)
+    width_xhdpi=$((width * 2 / 3))
+    height_xhdpi=$((height * 2 / 3))
+    
+    # hdpi = 1.5x (1/2 of the @3x)
+    width_hdpi=$((width / 2))
+    height_hdpi=$((height / 2))
+    
+    # mdpi = 1x (1/3 of the @3x)
+    width_mdpi=$((width / 3))
+    height_mdpi=$((height / 3))
+    
+    # Create Android resource versions
+    
+    # xxxhdpi (4x)
+    cp "$png" temp.png
+    sips -z $height_xxxhdpi $width_xxxhdpi temp.png --out "${XXXHDPI_DIR}/${filename}.png"
+    
+    # xxhdpi (3x) - original size
+    cp "$png" "${XXHDPI_DIR}/${filename}.png"
+    
+    # xhdpi (2x)
+    cp "$png" temp.png
+    sips -z $height_xhdpi $width_xhdpi temp.png --out "${XHDPI_DIR}/${filename}.png"
+    
+    # hdpi (1.5x)
+    cp "$png" temp.png
+    sips -z $height_hdpi $width_hdpi temp.png --out "${HDPI_DIR}/${filename}.png"
+    
+    # mdpi (1x)
+    cp "$png" temp.png
+    sips -z $height_mdpi $width_mdpi temp.png --out "${MDPI_DIR}/${filename}.png"
+    
+    # Also copy to default drawable folder (usually same as mdpi)
+    cp "${MDPI_DIR}/${filename}.png" "${DEFAULT_DIR}/${filename}.png"
+    
+    # Clean up temp file
+    rm -f temp.png
+    
+    echo "Completed processing $filename"
+done
+
+echo "All images have been processed and placed in the appropriate Android resource directories."
\ No newline at end of file
diff --git a/scripts/imageprepare-app/png-ios.bash b/scripts/imageprepare-app/png-ios.bash
new file mode 100755
index 000000000..bd84c9927
--- /dev/null
+++ b/scripts/imageprepare-app/png-ios.bash
@@ -0,0 +1,37 @@
+#!/bin/bash
+for png in *.png; do
+    # Skip if already a @1x or @2x file
+    if [[ "$png" == *"@1x.png" ]] || [[ "$png" == *"@2x.png" ]]; then
+        continue
+    fi
+    
+    # Assume the input file is the @3x version
+    # Extract the base filename (remove the @3x if it exists)
+    if [[ "$png" == *"@3x.png" ]]; then
+        filename="${png%@3x.png}"
+    else
+        filename="${png%.png}"
+    fi
+    
+    # Get original dimensions
+    width=$(sips -g pixelWidth "$png" | grep -o '[0-9]*$')
+    height=$(sips -g pixelHeight "$png" | grep -o '[0-9]*$')
+    
+    # Calculate @1x and @2x dimensions
+    width_1x=$((width / 3))
+    height_1x=$((height / 3))
+    width_2x=$((width * 2 / 3))
+    height_2x=$((height * 2 / 3))
+    
+    # Create the @1x and @2x versions
+    cp "$png" "${filename}.png"
+    sips -z $height_1x $width_1x "${filename}.png" --out "${filename}@1x.png"
+    
+    cp "$png" "${filename}@2x.png"
+    sips -z $height_2x $width_2x "${filename}@2x.png" --out "${filename}@2x.png"
+    
+    # Optionally rename the original to ensure it has @3x suffix
+    if [[ "$png" != *"@3x.png" ]]; then
+        mv "$png" "${filename}@3x.png"
+    fi
+done
\ No newline at end of file
diff --git a/scripts/imageprepare-app/svg-android b/scripts/imageprepare-app/svg-android
new file mode 100644
index 000000000..e38f8cd8a
--- /dev/null
+++ b/scripts/imageprepare-app/svg-android
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Create directories if they don't exist
+mkdir -p drawable-mdpi drawable-hdpi drawable-xhdpi drawable-xxhdpi drawable-xxxhdpi
+
+# Base size (mdpi size - change 24 to your base icon size)
+BASE_SIZE=48
+
+for svg in *.svg; do
+    # Get filename without extension
+    filename="${svg%.svg}"
+    
+    # Generate for each density
+    # mdpi (1x)
+    svgexport "$svg" "drawable-mdpi/${filename}.png" "${BASE_SIZE}:${BASE_SIZE}"
+    
+    # hdpi (1.5x)
+    size=$((BASE_SIZE * 3/2))
+    svgexport "$svg" "drawable-hdpi/${filename}.png" "${size}:${size}"
+    
+    # xhdpi (2x)
+    size=$((BASE_SIZE * 2))
+    svgexport "$svg" "drawable-xhdpi/${filename}.png" "${size}:${size}"
+    
+    # xxhdpi (3x)
+    size=$((BASE_SIZE * 3))
+    svgexport "$svg" "drawable-xxhdpi/${filename}.png" "${size}:${size}"
+    
+    # xxxhdpi (4x)
+    size=$((BASE_SIZE * 4))
+    svgexport "$svg" "drawable-xxxhdpi/${filename}.png" "${size}:${size}"
+    
+    echo "Processed $svg"
+done
+
+echo "All done! Generated PNGs for all densities"
diff --git a/scripts/imageprepare-app/svg-ios.bash b/scripts/imageprepare-app/svg-ios.bash
new file mode 100644
index 000000000..2135e31a3
--- /dev/null
+++ b/scripts/imageprepare-app/svg-ios.bash
@@ -0,0 +1,7 @@
+#!/bin/bash
+for svg in *.svg; do
+    filename="${svg%.svg}"
+    svgexport "$svg" "${filename}.png" 64:64
+    svgexport "$svg" "${filename}@2x.png" 128:128
+    svgexport "$svg" "${filename}@3x.png" 192:192
+done
diff --git a/src/app.tsx b/src/app.tsx
index d7e883645..ef0eda1eb 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -4,7 +4,7 @@
 
 import moment from 'moment-timezone';
 
-import { UIManager, I18nManager, Platform, Alert, Text, TextInput } from 'react-native';
+import { UIManager, I18nManager, Platform, Alert, Text, TextInput, Appearance } from 'react-native';
 
 import messaging from '@react-native-firebase/messaging';
 import { Navigation } from 'react-native-navigation';
@@ -35,6 +35,10 @@ import DataStorage from '@store/storage';
 // services
 import * as services from '@services';
 
+// Textencoder/decoder polyfill TextEncoder TextDecoder
+// Needed for ripple-binary-codec/... isomorphic
+import '@common/helpers/textencoder';
+
 messaging().setBackgroundMessageHandler(async () => {
     // FIXME: temporary fix for error
     // Invariant Violation: Module AppRegistry is not a registered callable module (calling startHeadlessTask)
@@ -52,7 +56,7 @@ class Application {
         this.initialized = false;
     }
 
-    run() {
+    run() {     
         // Listen for app launched event
         Navigation.events().registerAppLaunchedListener(() => {
             // start the app
@@ -163,6 +167,51 @@ class Application {
             // lock the app and the start the app
             AuthenticationService.checkLockScreen().then(() => {
                 Navigator.startDefault();
+
+                // Switch theme if back from background and changed
+                services.AppService.on('appStateChange', newState => {
+                    if (newState === 'Active') {
+                        const coreSettings = CoreRepository.getSettings();
+                        if (coreSettings.themeAutoSwitch) {
+                            if (
+                                (
+                                    Appearance.getColorScheme() === 'light' &&
+                                    services.StyleService.getCurrentTheme() !== 'light'
+                                ) || (
+                                    Appearance.getColorScheme() === 'dark' &&
+                                    services.StyleService.getCurrentTheme() === 'light'
+                                )
+                            ) {
+                                // Switch to light/dark
+                                // console.log('Foreground appstatechange theme switch')
+                                Navigator.awaitSafeThemeSwitch().then(() => {
+                                    services.StyleService.initialize(coreSettings)
+                                    .then(() => {
+                                        requestAnimationFrame(() => {
+                                            Navigator.switchTheme();
+                                        });
+                                    });
+                                });
+                            }
+                        }
+                    }
+                });
+
+                // Auto switch theme based on OS notification
+                Appearance.addChangeListener(() => { // { colorScheme }
+                    // console.log('Theme changed to:', colorScheme);
+                    const coreSettings = CoreRepository.getSettings();
+                    if (coreSettings.themeAutoSwitch) {
+                        Navigator.awaitSafeThemeSwitch().then(() => {
+                            services.StyleService.initialize(coreSettings)
+                            .then(() => {
+                                requestAnimationFrame(() => {
+                                    Navigator.switchTheme();
+                                });
+                            });
+                        });
+                    }
+                });
             });
         } else {
             Navigator.startOnboarding();
@@ -175,12 +224,14 @@ class Application {
     };
 
     // initialize all the services
-    initializeServices = () => {
+    initializeServices = (onlyService?: string) => {
         return new Promise<void>((resolve, reject) => {
             try {
                 const coreSettings = CoreRepository.getSettings();
                 const servicesPromise = [] as Array<Promise<any>>;
-                Object.keys(services).map((key) => {
+                Object.keys(services).filter(key => {
+                    return !onlyService || onlyService === key;
+                }).map((key) => {
                     // @ts-ignore
                     const service = services[key];
                     if (typeof service.initialize === 'function') {
@@ -257,10 +308,15 @@ class Application {
                         return;
                     }
                 } else if (Platform.OS === 'ios') {
-                    const isJailBroken = await IsDeviceJailBroken();
-                    if (isJailBroken) {
-                        reject(new Error(ErrorMessages.runningOnJailBrokenDevice));
-                        return;
+                    if (process?.env?.NODE_ENV === 'development') {
+                        // That's fine
+                    } else {
+                        const isJailBroken = await IsDeviceJailBroken();
+
+                        if (isJailBroken) {
+                            reject(new Error(ErrorMessages.runningOnJailBrokenDevice));
+                            return;
+                        }
                     }
                 }
 
diff --git a/src/common/constants/config.ts b/src/common/constants/config.ts
index c78dbe9e1..ff7cbce55 100644
--- a/src/common/constants/config.ts
+++ b/src/common/constants/config.ts
@@ -19,6 +19,7 @@ export default {
         nftInfo: 'xumm.nft-info',
         activateAccount: 'xumm.activateacc',
         xappDonation: 'xumm.xapp-donation',
+        swap: 'xaman.swap',
     },
 
     // localization config
@@ -32,4 +33,10 @@ export default {
 
     // account label limit
     accountLabelLimit: 64,
+
+    // TX filtering in EventsView
+    belowDropsTxIsSpam: 10000, // 10k drops, 0.01 of asset
+
+    // Account to send fees to
+    feeAccount: 'ryouhapPYV5KNHmFUKrjNqsjxhnxvQiVt',
 };
diff --git a/src/common/constants/endpoints.ts b/src/common/constants/endpoints.ts
index 5a6074ea5..2e5c58f53 100644
--- a/src/common/constants/endpoints.ts
+++ b/src/common/constants/endpoints.ts
@@ -30,12 +30,16 @@ export enum Endpoints {
     AuditTrail = '/v1/app/audit-trail/{destination}',
     AddAccount = '/v1/app/add-account',
     AddTransaction = '/v1/app/add-tx',
+    AddSignedTxBlob = '/v1/app/signed-tx-blob',
     ThirdPartyApps = '/v1/app/third-party-permissions',
     ThirdPartyApp = '/v1/app/third-party-permissions/{appId}',
     NftDetails = '/v1/app/nft-details',
     NftOffered = '/v1/app/nft-offered/{account}',
     NetworkRails = '/v1/app/rails',
     VerifyPurchase = '/v1/app/verify-purchase',
+    ServiceFee = '/v1/app/get-service-fee',
+    PrivateAccountInfo = '/v1/app/private-account-info',
+    MultiAccountNativeInfo = '/v1/app/multi-account-info',
 }
 
 export enum WebLinks {
diff --git a/src/common/helpers/__tests__/advisory.test.ts b/src/common/helpers/__tests__/advisory.test.ts
new file mode 100644
index 000000000..3ef51298f
--- /dev/null
+++ b/src/common/helpers/__tests__/advisory.test.ts
@@ -0,0 +1,222 @@
+import Advisory from '../advisory';
+
+import { TransactionTypes } from '@common/libs/ledger/types/enums';
+
+import LedgerService from '@services/LedgerService';
+
+jest.mock('@services/LedgerService');
+
+describe('Advisory Helper', () => {
+    describe('checkRequireDestinationTag', () => {
+        beforeAll(() => {
+            jest.replaceProperty(Advisory, 'HIGH_SENDER_COUNT', 5);
+        });
+
+        const mockIncomingTransaction = (destination: string, amount: any, tag?: number, account?: string) => ({
+            tx: {
+                TransactionType: 'Payment' as TransactionTypes,
+                Destination: destination,
+                Amount: amount,
+                DestinationTag: tag,
+                Account: account || '',
+                date: 0,
+                hash: '',
+            },
+            ledger_index: 0,
+            meta: {
+                AffectedNodes: [],
+                TransactionIndex: 0,
+                TransactionResult: 'tesSUCCESS',
+            },
+            validated: true,
+        });
+
+        beforeEach(() => {
+            jest.clearAllMocks();
+        });
+
+        it('should return true if advisory.force_dtag is true', async () => {
+            const result = await Advisory.checkRequireDestinationTag('address', { force_dtag: true });
+            expect(result).toBe(true);
+        });
+
+        it('should return true if accountFlags.requireDestinationTag is true', async () => {
+            const result = await Advisory.checkRequireDestinationTag(
+                'address',
+                { force_dtag: false },
+                // @ts-ignore
+                {
+                    requireDestinationTag: true,
+                },
+            );
+
+            expect(result).toBe(true);
+        });
+
+        it('should return true if there are incoming transactions with tags meeting requirements', async () => {
+            const address = 'testAddress';
+
+            // @ts-ignore
+            const spy = jest.spyOn(LedgerService, 'getTransactions').mockResolvedValue({
+                transactions: [
+                    mockIncomingTransaction(address, '2000', 99999, 'sender1'),
+                    mockIncomingTransaction(address, '3000', 99999, 'sender2'),
+                    mockIncomingTransaction(address, '1500', 99999, 'sender3'),
+                    mockIncomingTransaction(address, '2000', 99999, 'sender4'),
+                    mockIncomingTransaction(address, '2500', undefined, 'sender5'),
+                ],
+            });
+
+            const result = await Advisory.checkRequireDestinationTag(
+                address,
+                { force_dtag: false },
+                // @ts-ignore
+                { requireDestinationTag: false },
+            );
+
+            expect(result).toBe(true);
+
+            spy.mockRestore();
+        });
+
+        it('should return false for non native token transactions', async () => {
+            const address = 'testAddress';
+
+            // @ts-ignore
+            const spy = jest.spyOn(LedgerService, 'getTransactions').mockResolvedValue({
+                transactions: [
+                    mockIncomingTransaction(address, { value: '1', currency: 'EUR' }, 99999, 'sender1'),
+                    mockIncomingTransaction(address, { value: '200', currency: 'EUR' }, 99999, 'sender2'),
+                    mockIncomingTransaction(address, { value: '1337', currency: 'EUR' }, 99999, 'sender3'),
+                    mockIncomingTransaction(address, { value: '89', currency: 'EUR' }, 99999, 'sender4'),
+                ],
+            });
+
+            const result = await Advisory.checkRequireDestinationTag(
+                address,
+                { force_dtag: false },
+                // @ts-ignore
+                { requireDestinationTag: false },
+            );
+
+            expect(result).toBe(false);
+
+            spy.mockRestore();
+        });
+
+        it('should return false for transactions with low amount transaction', async () => {
+            const address = 'testAddress';
+
+            // @ts-ignore
+            const spy = jest.spyOn(LedgerService, 'getTransactions').mockResolvedValue({
+                transactions: [
+                    mockIncomingTransaction(address, '1', 99999, 'sender1'),
+                    mockIncomingTransaction(address, '100', 99999, 'sender2'),
+                    mockIncomingTransaction(address, '50', 99999, 'sender3'),
+                    mockIncomingTransaction(address, '500', 99999, 'sender4'),
+                ],
+            });
+
+            const result = await Advisory.checkRequireDestinationTag(
+                address,
+                { force_dtag: false },
+                // @ts-ignore
+                { requireDestinationTag: false },
+            );
+
+            expect(result).toBe(false);
+
+            spy.mockRestore();
+        });
+
+        it('should return false if transactions have less than required unique senders', async () => {
+            const address = 'testAddress';
+
+            // @ts-ignore
+            const spy = jest.spyOn(LedgerService, 'getTransactions').mockResolvedValue({
+                transactions: [
+                    mockIncomingTransaction(address, '2000', 99999, 'sender1'),
+                    mockIncomingTransaction(address, '3000', 99999, 'sender1'),
+                    mockIncomingTransaction(address, '1500', 99999, 'sender1'),
+                ],
+            });
+
+            const result = await Advisory.checkRequireDestinationTag(
+                address,
+                { force_dtag: false },
+                // @ts-ignore
+                { requireDestinationTag: false },
+            );
+
+            expect(result).toBe(false);
+
+            spy.mockRestore();
+        });
+
+        it('should return false if percentage of tagged transactions is too low', async () => {
+            const address = 'testAddress';
+
+            // @ts-ignore
+            const spy = jest.spyOn(LedgerService, 'getTransactions').mockResolvedValue({
+                transactions: [
+                    mockIncomingTransaction(address, '2000', undefined, 'sender1'),
+                    mockIncomingTransaction(address, '3000', undefined, 'sender2'),
+                    mockIncomingTransaction(address, '1500', undefined, 'sender3'),
+                ],
+            });
+
+            const result = await Advisory.checkRequireDestinationTag(
+                address,
+                { force_dtag: false },
+                // @ts-ignore
+                { requireDestinationTag: false },
+            );
+
+            expect(result).toBe(false);
+            spy.mockRestore();
+        });
+
+        it('should return false if there are no relevant transactions', async () => {
+            const address = 'testAddress';
+
+            // @ts-ignore
+            const spy = jest.spyOn(LedgerService, 'getTransactions').mockResolvedValue({
+                transactions: [],
+            });
+
+            const result = await Advisory.checkRequireDestinationTag(
+                address,
+                { force_dtag: false },
+                // @ts-ignore
+                { requireDestinationTag: false },
+            );
+
+            expect(result).toBe(false);
+
+            spy.mockRestore();
+        });
+
+        it('should return false if LedgerService returns an error', async () => {
+            const address = 'testAddress';
+
+            // @ts-ignore
+            const spy = jest.spyOn(LedgerService, 'getTransactions').mockResolvedValue({
+                error: 'account_not_found',
+            });
+
+            // Mock LedgerService to return an error
+            (LedgerService.getTransactions as jest.Mock).mockResolvedValue({ error: 'Some error' });
+
+            const result = await Advisory.checkRequireDestinationTag(
+                address,
+                { force_dtag: false },
+                // @ts-ignore
+                { requireDestinationTag: false },
+            );
+
+            expect(result).toBe(false);
+
+            spy.mockRestore();
+        });
+    });
+});
diff --git a/src/common/helpers/__tests__/navigator.test.ts b/src/common/helpers/__tests__/navigator.test.ts
index d2384ef11..544a60171 100644
--- a/src/common/helpers/__tests__/navigator.test.ts
+++ b/src/common/helpers/__tests__/navigator.test.ts
@@ -56,6 +56,11 @@ describe('Navigator helper', () => {
                 id: overlay,
                 passProps: { componentType: ComponentTypes.Overlay },
                 options: {
+                    animations: {
+                        setRoot: {
+                            waitForRender: true,
+                        },
+                    },
                     overlay: {
                         handleKeyboardEvents: true,
                     },
diff --git a/src/common/helpers/advisory.ts b/src/common/helpers/advisory.ts
index 9bf94d3da..4459b7aa1 100644
--- a/src/common/helpers/advisory.ts
+++ b/src/common/helpers/advisory.ts
@@ -9,19 +9,19 @@ import LedgerService from '@services/LedgerService';
 import { AccountRoot } from '@common/libs/ledger/types/ledger';
 import { AccountInfoAccountFlags } from '@common/libs/ledger/types/methods/accountInfo';
 
-/* Constants ==================================================================== */
-const BLACK_HOLE_KEYS = ['rrrrrrrrrrrrrrrrrrrrrhoLvTp', 'rrrrrrrrrrrrrrrrrrrrBZbvji'];
-const EXCHANGE_BALANCE_THRESHOLD = 1000000000000;
-const MIN_TRANSACTION_TAG = 9999;
-const HIGH_SENDER_COUNT = 10;
-const HIGH_PERCENTAGE_TAGGED_TX = 50;
-
 /* Helper Functions ==================================================================== */
 /**
  * The Advisory object provides methods to fetch account advisory information, account details,
  * and perform various checks on accounts based on their data and flags.
  */
 const Advisory = {
+    /* Constants ==================================================================== */
+    BLACK_HOLE_KEYS: ['rrrrrrrrrrrrrrrrrrrrrhoLvTp', 'rrrrrrrrrrrrrrrrrrrrBZbvji'],
+    EXCHANGE_BALANCE_THRESHOLD: 1000000000000,
+    MIN_TRANSACTION_TAG: 9999,
+    HIGH_SENDER_COUNT: 10,
+    HIGH_PERCENTAGE_TAGGED_TX: 50,
+
     /**
      * Determines whether a possible exchange can take place based on the account balance.
      *
@@ -31,7 +31,10 @@ const Advisory = {
      * @returns {boolean} - Returns true if the account balance exceeds the exchange threshold; otherwise, false.
      */
     checkPossibleExchange: (accountData?: AccountRoot): boolean => {
-        return !!accountData?.Balance && new BigNumber(accountData.Balance).isGreaterThan(EXCHANGE_BALANCE_THRESHOLD);
+        return (
+            !!accountData?.Balance &&
+            new BigNumber(accountData.Balance).isGreaterThan(Advisory.EXCHANGE_BALANCE_THRESHOLD)
+        );
     },
 
     /**
@@ -50,7 +53,7 @@ const Advisory = {
         return (
             !!accountData?.RegularKey &&
             !!accountFlags?.disableMasterKey &&
-            BLACK_HOLE_KEYS.includes(accountData.RegularKey)
+            Advisory.BLACK_HOLE_KEYS.includes(accountData.RegularKey)
         );
     },
 
@@ -92,14 +95,20 @@ const Advisory = {
         const transactionsResp = await LedgerService.getTransactions(address, undefined, 200);
 
         if (!('error' in transactionsResp) && transactionsResp.transactions?.length > 0) {
-            const incomingTXS = transactionsResp.transactions.filter((tx) => tx.tx.Destination === address);
+            const incomingTXS = transactionsResp.transactions.filter(
+                (tx) =>
+                    tx.tx.Destination === address &&
+                    typeof tx.tx.Amount === 'string' && // ensure only native asset
+                    new BigNumber(tx.tx.Amount).isGreaterThan(1000), // only more than 1000 drop
+            );
+
             const incomingTxCountWithTag = incomingTXS.filter(
-                (tx) => Number(tx.tx.DestinationTag) > MIN_TRANSACTION_TAG,
+                (tx) => Number(tx.tx.DestinationTag) > Advisory.MIN_TRANSACTION_TAG,
             ).length;
-            const uniqueSenders = new Set(transactionsResp.transactions.map((tx) => tx.tx.Account || '')).size;
+            const uniqueSenders = new Set(incomingTXS.map((tx) => tx.tx.Account || '')).size;
             const percentageTag = (incomingTxCountWithTag / incomingTXS.length) * 100;
 
-            return uniqueSenders >= HIGH_SENDER_COUNT && percentageTag > HIGH_PERCENTAGE_TAGGED_TX;
+            return uniqueSenders >= Advisory.HIGH_SENDER_COUNT && percentageTag > Advisory.HIGH_PERCENTAGE_TAGGED_TX;
         }
 
         return false;
diff --git a/src/common/helpers/images.ts b/src/common/helpers/images.ts
index 700e4d8ad..14064d45e 100644
--- a/src/common/helpers/images.ts
+++ b/src/common/helpers/images.ts
@@ -33,8 +33,7 @@ export const Images = {
     ImageSendReceiveLight: buildImageSource('ImageSendReceiveLight', 'image_send_receive_light'),
     ImagePincode: buildImageSource('ImagePincode', 'image_pincode'),
     ImagePincodeLight: buildImageSource('ImagePincodeLight', 'image_pincode_light'),
-    ImageBiometric: buildImageSource('ImageBiometric', 'image_biometric'),
-    ImageBiometricLight: buildImageSource('ImageBiometricLight', 'image_biometric_light'),
+    ImageBiometric: buildImageSource('ImageBiometric', 'icon_fingerprint'),
     ImageNotifications: buildImageSource('ImageNotifications', 'image_notifications'),
     ImageNotificationsLight: buildImageSource('ImageNotificationsLight', 'image_notifications_light'),
     ImageComplete: buildImageSource('ImageComplete', 'image_complete'),
@@ -126,7 +125,7 @@ export const Images = {
     IconChevronDown: buildImageSource('IconChevronDown', 'icon_chevron_down'),
     IconChevronUp: buildImageSource('IconChevronUp', 'icon_chevron_up'),
     IconClipboard: buildImageSource('IconClipboard', 'icon_clipboard'),
-    IconFingerprint: buildImageSource('IconFingerprint', 'icon_fingerprint'),
+    IconFingerprint: buildImageSource('IconFingerprint', 'icon_fingerprintx'),
     IconThumbsUp: buildImageSource('IconThumbsUp', 'icon_thumbs_up'),
     IconLink: buildImageSource('IconLink', 'icon_link'),
     IconExternalLink: buildImageSource('IconExternalLink', 'icon_external_link'),
@@ -162,4 +161,17 @@ export const Images = {
     IconCopy: buildImageSource('IconCopy', 'icon_copy'),
     IconRadio: buildImageSource('IconRadio', 'icon_radio'),
     IconFlaskConical: buildImageSource('IconFlaskConical', 'icon_flask_conical'),
+    // V2
+    IconV2Swap: buildImageSource('IconV2Swap', 'icon_swap'),
+    IconV2Send: buildImageSource('IconV2Send', 'icon_send_v2'),
+    IconV2Request: buildImageSource('IconV2Request', 'icon_request'),
+    // 4.0.0 Onboarding
+    Notification: buildImageSource('Notification', 'notification'),
+    Pincode: buildImageSource('Pincode', 'pincode'),
+    PhonesLight: buildImageSource('PhonesLight', 'phones_light'),
+    PhonesDark: buildImageSource('PhonesDark', 'phones_dark'),
+    // 4.0.0 Cards
+    IconCreate: buildImageSource('IconCreate', 'create'),
+    IconImport: buildImageSource('IconImport', 'icon_import'),
+    IconTangem: buildImageSource('IconTangem', 'tangem'),
 };
diff --git a/src/common/helpers/navigator.ts b/src/common/helpers/navigator.ts
index 1cb2f7412..2cf46c39f 100644
--- a/src/common/helpers/navigator.ts
+++ b/src/common/helpers/navigator.ts
@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import { get, merge } from 'lodash';
 import { Platform, InteractionManager } from 'react-native';
 
 import { Navigation, Options, LayoutTabsChildren } from 'react-native-navigation';
@@ -22,6 +22,8 @@ export type AppScreenKeys<T = typeof AppScreens, L0 = T[keyof T]> =
 
 type EnforcedProps<P extends { [K in keyof P]: any }> = P;
 
+const allScreens = new Set();
+
 /* Constants ==================================================================== */
 const getDefaultOptions = (): Options => {
     return {
@@ -38,9 +40,11 @@ const getDefaultOptions = (): Options => {
             backgroundColor: StyleService.value('$tint'),
         },
         statusBar: {
+            // @ts-ignore
             style: Platform.select({
                 android: undefined,
-                ios: StyleService.isDarkMode() ? 'light' : 'dark',
+                // @ts-ignore
+                ios: StyleService.value(StyleService.select({ light: 'dark', dark: 'light' })),
             }),
             drawBehind: false,
         },
@@ -53,20 +57,26 @@ const getDefaultOptions = (): Options => {
             titleDisplayMode: 'alwaysShow',
             elevation: 10,
             hideShadow: Platform.OS === 'android',
+            // @ts-ignore
             shadow: Platform.select({
                 android: undefined,
                 ios: {
-                    opacity: StyleService.isDarkMode() ? 0.13 : 0.07,
-                    color: StyleService.isDarkMode() ? 'white' : 'black',
-                    radius: StyleService.isDarkMode() ? 12 : 8,
+                    // @ts-ignore
+                    opacity: StyleService.value(StyleService.select({ light: 0.07, dark: 0.13 })),
+                    // @ts-ignore
+                    color: StyleService.value(StyleService.select({ light: 'black', dark: 'white' })),
+                    // @ts-ignore
+                    radius: StyleService.value(StyleService.select({ light: 8, dark: 12 })),
                 },
             }),
         },
-
         animations: {
             pop: {
                 enabled: Platform.OS === 'ios',
             },
+            setRoot: {
+                waitForRender: true, // Wait for the component to render before ANY transitions
+            },
         },
         popGesture: true,
         blurOnUnmount: true,
@@ -84,12 +94,12 @@ const getTabBarIcons = (): {
         [AppScreens.TabBar.Home]: {
             icon: StyleService.getImage('IconTabBarHome'),
             iconSelected: StyleService.getImage('IconTabBarHomeSelected'),
-            scale: GetBottomTabScale(),
+            scale: GetBottomTabScale(0.9),
         },
         [AppScreens.TabBar.Events]: {
             icon: StyleService.getImage('IconTabBarEvents'),
             iconSelected: StyleService.getImage('IconTabBarEventsSelected'),
-            scale: GetBottomTabScale(),
+            scale: GetBottomTabScale(0.9),
         },
         [AppScreens.TabBar.Actions]: {
             icon: StyleService.getImage('IconTabBarActions'),
@@ -99,7 +109,7 @@ const getTabBarIcons = (): {
         [AppScreens.TabBar.XApps]: {
             icon: StyleService.getImage('IconTabBarXapp'),
             iconSelected: StyleService.getImage('IconTabBarXappSelected'),
-            scale: GetBottomTabScale(),
+            scale: GetBottomTabScale(0.9),
         },
         [AppScreens.TabBar.Settings]: {
             icon: StyleService.getImage('IconTabBarSettings'),
@@ -109,6 +119,8 @@ const getTabBarIcons = (): {
     };
 };
 
+const bottomTabsChildren: LayoutTabsChildren[] = [];
+
 /* Lib ==================================================================== */
 
 const Navigator = {
@@ -133,8 +145,6 @@ const Navigator = {
 
         const TabBarIcons = getTabBarIcons();
 
-        const bottomTabsChildren: LayoutTabsChildren[] = [];
-
         Object.keys(AppScreens.TabBar).forEach((tab) => {
             bottomTabsChildren.push({
                 stack: {
@@ -182,6 +192,23 @@ const Navigator = {
         });
     },
 
+    /**
+     * Navigates to a specific tab by name.
+     *
+     * @param {string} tabName - The name of the tab to navigate to (e.g., 'Home', 'Events', 'XApps', 'Settings').
+     * @return {void}
+     */
+    navigateToTab(tabName: string): void {   
+        const tabId = `bottomTab-${tabName}`;
+      
+        // Switch to the specified tab
+        Navigation.mergeOptions(RootType.DefaultRoot, {
+            bottomTabs: {
+                currentTabId: tabId,
+            },
+        });
+    },
+
     /**
      * Starts the app navigation in onboarding screen
      *
@@ -225,6 +252,7 @@ const Navigator = {
     ): Promise<string | boolean> {
         const currentScreen = NavigationService.getCurrentScreen() ?? '';
         if (currentScreen !== nextScreen) {
+            allScreens.add(nextScreen);
             return Navigation.push(currentScreen, {
                 component: {
                     name: nextScreen,
@@ -292,7 +320,7 @@ const Navigator = {
                     name: overlay,
                     id: overlay,
                     passProps: Object.assign(passProps, { componentType: ComponentTypes.Overlay }),
-                    options: {
+                    options: merge({
                         overlay: {
                             handleKeyboardEvents: true,
                         },
@@ -300,8 +328,13 @@ const Navigator = {
                             backgroundColor: 'transparent',
                             componentBackgroundColor: 'transparent',
                         },
-                        ...options,
-                    },
+                        // Disable automatic splash screen dismissal
+                        animations: {
+                            setRoot: {
+                              waitForRender: true, // Wait for the component to render before ANY transitions
+                            },
+                        },
+                    }, options || {}),
                 },
             });
         }
@@ -428,21 +461,181 @@ const Navigator = {
         Navigation.updateProps(currentScreen, props);
     },
 
+    isInstantThemeSwitchPage(screenId: string): string | false {
+        return ([ 'app.Settings.General', ...Object.values(AppScreens.TabBar) ] as string[])
+            .indexOf(screenId) > -1
+                ? screenId
+                : false;
+    },
+
+    awaitSafeThemeSwitch(): Promise<void> {
+        return new Promise(resolve => {
+            if (!Navigator.isInstantThemeSwitchPage(NavigationService.getCurrentScreen() || '')) {
+                // console.log('Wait till back at main pages, now at', NavigationService.getCurrentScreen());
+                const pageListener = Navigation
+                    .events()
+                    .registerComponentDidAppearListener(({ componentId }) => {
+                        // console.log('componentId', componentId, 'appeared', Object.values(AppScreens.TabBar))
+                        if (Navigator.isInstantThemeSwitchPage(componentId)) {
+                            // console.log('Awaited page to one of main tab pages so going now')
+                            pageListener.remove();
+                            resolve();
+                        }
+                    });
+    
+                return;
+            }
+    
+            const modalOpen = NavigationService.getCurrentModal();
+            if (modalOpen) {
+                // We wait with all the updates till it closes
+                // console.log('Wait cause modal open', modalOpen)
+                const modalDismissListener = Navigation
+                    .events()
+                    .registerModalDismissedListener(({ componentId }) => {
+                        if (componentId === modalOpen) {
+                            // console.log('Awaited modal close so going now', modalOpen)
+                            modalDismissListener.remove();
+                            resolve();
+                        }
+                    });
+                return;
+            }
+    
+            const overlayOpen = NavigationService.getCurrentOverlay();
+            if (overlayOpen) {
+                // We wait with all the updates till it closes
+                // console.log('Wait cause overlay open', overlayOpen)
+                const overlayDismissListener = Navigation
+                    .events()
+                    .registerComponentDidDisappearListener(({ componentId }) => {
+                        if (componentId === overlayOpen) {
+                            // console.log('Awaited overlay close so going now', overlayOpen)
+                            overlayDismissListener.remove();
+                            resolve();
+                        }
+                    });
+                return;
+            }
+    
+            resolve();
+        });
+    },
+
+    switchTheme(): void {
+        Navigator.awaitSafeThemeSwitch().then(() => {
+            Navigator.reRender();
+        });
+    },
+
     /**
      * Updates the tabbar and re-renders the AppScreens.TabBar component.
      *
      * @return {void}
      */
     reRender(): void {
-        // update the tabbar
-        Object.keys(AppScreens.TabBar).forEach((tab) => {
-            Navigation.mergeOptions(`bottomTab-${tab}`, {
-                bottomTab: {
-                    text: tab !== 'Actions' ? Localize.t(`global.${tab.toLowerCase()}`) : '',
-                },
+        const defaultOptions = getDefaultOptions();
+        Navigation.setDefaultOptions(defaultOptions);
+
+        const bottomTabStyles = StyleService.applyTheme({
+            textColor: '$grey',
+            selectedTextColor: '$textPrimary',
+            fontFamily: AppFonts.base.familyExtraBold,
+            iconInsets: {
+                top: HasBottomNotch() ? 4 : 1,
+            },
+        });
+
+        // Update ALL active screens/stacks
+        ;(allScreens as unknown as string[]).forEach(allScreenIterator => {
+            Navigation.mergeOptions(allScreenIterator, { ...defaultOptions });
+            Navigation.updateProps(allScreenIterator, { timestamp: +new Date() });
+        });
+
+        const TabBarIcons = getTabBarIcons();
+
+        const updateTab = (tab: string) => {
+            const tabId = `bottomTab-${tab}`;
+            bottomTabsChildren
+                .filter(b => b.stack?.id === tabId)?.[0].stack?.children?.forEach(child => {
+                    if (child.component?.id) {
+                        Navigation.mergeOptions(child.component.id, { ...defaultOptions });
+                        Navigation.updateProps(child.component.id, { timestamp: +new Date() });
+                    }
+                });
+
+            const currentBottomTab = bottomTabsChildren
+                .filter(b => b.stack?.id === tabId)?.[0].stack?.options?.bottomTab;
+
+            if (currentBottomTab) {
+                const getTab = get(AppScreens.TabBar, tab);
+                Navigation.mergeOptions(getTab, {
+                    bottomTab: {
+                        ...currentBottomTab,
+                        text: tab !== 'Actions' ? Localize.t(`global.${tab.toLowerCase()}`) : '',
+                        icon: {
+                            scale: TabBarIcons[getTab].scale,
+                            ...TabBarIcons[getTab].icon,
+                        },
+                        selectedIcon: {
+                            scale: TabBarIcons[getTab].scale,
+                            ...TabBarIcons[getTab].iconSelected,
+                        },
+                        ...bottomTabStyles,
+                    },
+                    // ...defaultOptions,
+                });
+
+                Navigation.updateProps(getTab, { timestamp: +new Date() });
+            }
+        };
+    
+        let navSections = (NavigationService.getCurrentScreen() || '').split('.');
+        let isAtMainTab = false;
+
+        if (navSections?.[0] === 'app' && navSections?.[1] === 'TabBar') {
+            isAtMainTab = true;
+        }
+
+        if (NavigationService.getCurrentScreen() === 'app.Settings.General') {
+            // Mock settings for return
+            isAtMainTab = true;
+            navSections = ['app', 'TabBar', 'Settings'];
+        }
+
+        // First the artive tab
+        if (isAtMainTab && navSections?.[2]) {
+            requestAnimationFrame(() => {
+                updateTab(navSections?.[2]);
             });
+        }
+
+        // Then the rest
+        requestAnimationFrame(() => {
+            // Update the root with defaultOptions
+            Navigation.mergeOptions(RootType.DefaultRoot, { ...defaultOptions });
+            Navigation.updateProps(RootType.DefaultRoot, { timestamp: +new Date() });
+
+            Object.keys(AppScreens.TabBar)
+                .filter(tab => !isAtMainTab || (navSections?.[2] && tab !== navSections?.[2]) || !navSections?.[2])
+                .forEach(tab => updateTab(tab));
+        });
 
-            Navigation.updateProps(get(AppScreens.TabBar, tab), { timestamp: +new Date() });
+        requestAnimationFrame(() => {
+            // Update any active modals
+            const currentModal = NavigationService.getCurrentModal();
+            if (currentModal) {
+                // ^^ don't switch xapp browser as it borks webview state
+                Navigation.mergeOptions(currentModal, { ...defaultOptions });
+                Navigation.updateProps(currentModal, { timestamp: +new Date() });
+            }
+            const currentOverlay = NavigationService.getCurrentOverlay();
+            if (currentOverlay) {
+                // console.log(defaultOptions)
+                // Navigation.mergeOptions(currentOverlay, { ...defaultOptions });
+                // ^^ No need & if enabled it kills transparency on the backdrops
+                Navigation.updateProps(currentOverlay, { timestamp: +new Date() });
+            }
         });
     },
 };
diff --git a/src/common/helpers/textencoder.js b/src/common/helpers/textencoder.js
new file mode 100644
index 000000000..b1809394b
--- /dev/null
+++ b/src/common/helpers/textencoder.js
@@ -0,0 +1,68 @@
+/* eslint-disable */
+// @ts-nocheck
+(function(window){
+    "use strict";
+    var log = Math.log;
+    var LN2 = Math.LN2;
+    var clz32 = Math.clz32 || function(x) {return 31 - log(x >>> 0) / LN2 | 0};
+    var fromCharCode = String.fromCharCode;
+    var Object_prototype_toString = ({}).toString;
+    var NativeSharedArrayBuffer = window["SharedArrayBuffer"];
+    var sharedArrayBufferString = NativeSharedArrayBuffer ? Object_prototype_toString.call(NativeSharedArrayBuffer) : "";
+    var NativeUint8Array = window.Uint8Array;
+    var patchedU8Array = NativeUint8Array || Array;
+    var arrayBufferString = Object_prototype_toString.call((NativeUint8Array ? ArrayBuffer : patchedU8Array).prototype);
+    function decoderReplacer(encoded){
+        var cp0 = encoded.charCodeAt(0), codePoint=0x110000, i=0, stringLen=encoded.length|0, result="";
+        switch(cp0 >>> 4) {
+            // no 1 byte sequences
+            case 12:
+            case 13:
+                codePoint = ((cp0 & 0x1F) << 6) | (encoded.charCodeAt(1) & 0x3F);
+                i = codePoint < 0x80 ? 0 : 2;
+                break;
+            case 14:
+                codePoint = ((cp0 & 0x0F) << 12) | ((encoded.charCodeAt(1) & 0x3F) << 6) | (encoded.charCodeAt(2) & 0x3F);
+                i = codePoint < 0x800 ? 0 : 3;
+                break;
+            case 15:
+                if ((cp0 >>> 3) === 30) {
+                    codePoint = ((cp0 & 0x07) << 18) | ((encoded.charCodeAt(1) & 0x3F) << 12) | ((encoded.charCodeAt(2) & 0x3F) << 6) | encoded.charCodeAt(3);
+                    i = codePoint < 0x10000 ? 0 : 4;
+                }
+        }
+        if (i) {
+            if (stringLen < i) {
+                i = 0;
+            } else if (codePoint < 0x10000) { // BMP code point
+                result = fromCharCode(codePoint);
+            } else if (codePoint < 0x110000) {
+                codePoint = codePoint - 0x10080|0;//- 0x10000|0;
+                result = fromCharCode(
+                    (codePoint >>> 10) + 0xD800|0,  // highSurrogate
+                    (codePoint & 0x3ff) + 0xDC00|0 // lowSurrogate
+                );
+            } else i = 0; // to fill it in with INVALIDs
+        }
+
+        for (; i < stringLen; i=i+1|0) result += "\ufffd"; // fill rest with replacement character
+
+        return result;
+    }
+    function TextDecoder(_, opts){/*this["ignoreBOM"] = !!opts && !!opts["ignoreBOM"]*/};
+    TextDecoder["prototype"]["decode"] = function(inputArrayOrBuffer){
+        var buffer = (inputArrayOrBuffer && inputArrayOrBuffer.buffer) || inputArrayOrBuffer;
+        var asObjectString = Object_prototype_toString.call(buffer);
+        if (asObjectString !== arrayBufferString && asObjectString !== sharedArrayBufferString && inputArrayOrBuffer !== undefined)
+            throw TypeError("Failed to execute 'decode' on 'TextDecoder': The provided value is not of type '(ArrayBuffer or ArrayBufferView)'");
+        var inputAs8 = NativeUint8Array ? new patchedU8Array(buffer) : buffer;
+        var resultingString = "";
+        for (var index=0/*inputAs8[0]!==0xEF||inputAs8[1]!==0xBB||inputAs8[2]!==0xBF||this["ignoreBOM"]?0:3*/,len=inputAs8.length|0; index<len; index=index+32768|0)
+            resultingString += fromCharCode.apply(0, inputAs8[NativeUint8Array ? "subarray" : "slice"](index,index+32768|0));
+
+        return resultingString.replace(/[\xc0-\xff][\x80-\xbf]+|[\x80-\xff]/g, decoderReplacer);
+    }
+    if (!window["TextDecoder"]) window["TextDecoder"] = TextDecoder;
+// })(typeof global == "" + void 0 ? typeof self == "" + void 0 ? this : self : global);
+})(globalThis);
+/* eslint-enable */
diff --git a/src/common/libs/biometric.ts b/src/common/libs/biometric.ts
index d47b8b06e..2a46f9f63 100644
--- a/src/common/libs/biometric.ts
+++ b/src/common/libs/biometric.ts
@@ -29,12 +29,15 @@ export const Biometric = {
      * Authenticate with biometrics
      */
     authenticate: (reason: string): Promise<BiometryType> => {
+        // console.log('bio auth')
         return new Promise((resolve, reject) => {
             BiometricModule.authenticate(reason)
                 .then((biometryType: BiometryType) => {
+                    // console.log('bio auth reason')
                     resolve(biometryType);
                 })
                 .catch((error: any) => {
+                    // console.log('bio auth reason catch')
                     reject(Biometric.normalizeError(error.code));
                 });
         });
@@ -44,12 +47,15 @@ export const Biometric = {
      * check if any sensor is available
      */
     isSensorAvailable: (): Promise<BiometryType> => {
+        // console.log('bio available?')
         return new Promise((resolve, reject) => {
             BiometricModule.isSensorAvailable()
                 .then((biometryType: BiometryType) => {
+                    // console.log('bio available? then')
                     resolve(biometryType);
                 })
                 .catch((error: any) => {
+                    // console.log('bio available? catch', error)
                     reject(Biometric.normalizeError(error.code));
                 });
         });
diff --git a/src/common/libs/ledger/mixin/Mutations.mixin.ts b/src/common/libs/ledger/mixin/Mutations.mixin.ts
index 15795a468..e24e56d38 100644
--- a/src/common/libs/ledger/mixin/Mutations.mixin.ts
+++ b/src/common/libs/ledger/mixin/Mutations.mixin.ts
@@ -130,6 +130,21 @@ export function MutationsMixin<TBase extends Constructor>(Base: TBase) {
                 }
             }
 
+            if (typeof balanceChanges === 'object' && balanceChanges.length === 1) {
+                if (balanceChanges[0].action === OperationActions.DEC) {
+                    if (typeof balanceChanges[0].value === 'string' && balanceChanges[0].value.slice(0, 1) === '-') {
+                        // Double negative, by own account, in native asset (so: fee exceeded yield)
+                        if (owner === this?.Account && balanceChanges[0].currency === NetworkService.getNativeAsset()) {
+                            // Strip double negative.
+                            // This happens when it's native asset to self, and the yield of the transaction outcome
+                            // is a net negative because the yield - netwok fee results in a positive effect
+                            // turning out to be net negative.
+                            balanceChanges[0].value = balanceChanges[0].value.slice(1);
+                        }
+                    }
+                }
+            }
+
             // memorize the changes for this owner
             return this._BalanceChanges
                 .set(owner, {
diff --git a/src/common/libs/ledger/mixin/Sign.mixin.ts b/src/common/libs/ledger/mixin/Sign.mixin.ts
index 828779000..7b9feea52 100644
--- a/src/common/libs/ledger/mixin/Sign.mixin.ts
+++ b/src/common/libs/ledger/mixin/Sign.mixin.ts
@@ -28,6 +28,8 @@ export function SignMixin<TBase extends Constructor>(Base: TBase) {
         private isAborted?: boolean;
         private isSubmitted?: boolean;
 
+        public ServiceFee?: number;
+        public ServiceFeeTx?: SignedObjectType;
         public SignedBlob?: string;
         public SignerPubKey?: string;
         public SignMethod?: SignMethodType;
@@ -92,6 +94,7 @@ export function SignMixin<TBase extends Constructor>(Base: TBase) {
          */
         prepare = async (account: AccountModel): Promise<void> => {
             // ignore for pseudo transactions
+            // console.log('Sign.mixin.ts prepare')
 
             if (this.InstanceType === InstanceTypes.PseudoTransaction) {
                 return;
@@ -130,6 +133,7 @@ export function SignMixin<TBase extends Constructor>(Base: TBase) {
          */
         populateFields = ({ lastLedgerOffset }: { lastLedgerOffset?: number } = {}): void => {
             // ignore for pseudo transactions
+            // console.log('Sign.mixin.ts populate fields')
             if (this.InstanceType === InstanceTypes.PseudoTransaction) {
                 return;
             }
@@ -178,6 +182,7 @@ export function SignMixin<TBase extends Constructor>(Base: TBase) {
          * @returns {Promise<string>} signed tx blob
          */
         sign = (account: AccountModel, multiSign = false): Promise<string> => {
+            // console.log('Sign.mixin.ts SIGN')
             // eslint-disable-next-line no-async-promise-executor
             return new Promise(async (resolve, reject) => {
                 try {
@@ -233,9 +238,18 @@ export function SignMixin<TBase extends Constructor>(Base: TBase) {
                         account,
                         multiSign,
                         transaction: this as unknown as SignableTransaction,
-                        onSign: (signedObject: SignedObjectType) => {
+                        onSign: (signedObject: SignedObjectType, signedServiceFeeObject?: SignedObjectType) => {
                             const { id, signedTransaction, signerPubKey, signMethod, signers } = signedObject;
 
+                            // console.log(
+                            //  'Sign.mixin.ts showOverlay -- signedServiceFeeObject',
+                            //  signedServiceFeeObject
+                            // );
+
+                            if (signedServiceFeeObject) {
+                                this.setServiceFeeTx(signedServiceFeeObject);
+                            };
+
                             // verify the sign result
                             if (!signedTransaction || !signerPubKey || !signMethod) {
                                 reject(
@@ -281,6 +295,23 @@ export function SignMixin<TBase extends Constructor>(Base: TBase) {
             });
         };
 
+        /*
+        Set Service Fee
+        */
+        setServiceFee = (serviceFee: number) => {
+            // console.log('Sign Mixin setServiceFee', serviceFee);
+            this.ServiceFee = serviceFee;
+        };
+
+        /*
+        Set Service FeeTx
+        */
+        setServiceFeeTx = (serviceFeeTx: SignedObjectType) => {
+            // console.log('Sign Mixin setServiceFeeTx', serviceFeeTx);
+            // Inform the backend
+            this.ServiceFeeTx = serviceFeeTx;
+        };
+
         /*
         Verify the transaction from ledger
         */
@@ -302,6 +333,19 @@ export function SignMixin<TBase extends Constructor>(Base: TBase) {
             // persist verify result
             this.VerifyResult = { success: verifyResult.success };
 
+            // console.log('this.VerifyResult.success', this.VerifyResult.success)
+            if (this.VerifyResult.success) {
+                if (this.ServiceFeeTx && this.ServiceFeeTx.signedTransaction) {
+                    // Submit the Fee transaction
+                    // console.log('Submit fee tx')
+                    LedgerService.submitTransaction(
+                        this.ServiceFeeTx.signedTransaction,
+                        this.ServiceFeeTx.id,
+                        false,
+                    );
+                }
+            }
+
             return verifyResult;
         };
 
diff --git a/src/common/libs/ledger/mixin/types.ts b/src/common/libs/ledger/mixin/types.ts
index 351519b85..444809578 100644
--- a/src/common/libs/ledger/mixin/types.ts
+++ b/src/common/libs/ledger/mixin/types.ts
@@ -1,5 +1,4 @@
 import { AccountModel } from '@store/models';
-
 import { BaseTransaction } from '@common/libs/ledger/transactions/common';
 
 import {
@@ -8,8 +7,8 @@ import {
     OwnerCountChangeType,
     TransactionResult,
 } from '@common/libs/ledger/parser/types';
-import { SubmitResultType, VerifyResultType } from '@common/libs/ledger/types';
 import { HookExecution } from '@common/libs/ledger/types/common';
+import { SubmitResultType, VerifyResultType, SignedObjectType } from '@common/libs/ledger/types';
 
 export type BalanceChanges = {
     [OperationActions.INC]: BalanceChangeType[];
@@ -43,6 +42,8 @@ export interface SignMixinType {
     SignerPubKey?: string;
     SignMethod?: SignMethodType;
     SignerAccount?: string;
+    ServiceFee?: number;
+    ServiceFeeTx?: SignedObjectType;
 
     DefaultLastLedgerOffset: number;
 
@@ -54,6 +55,8 @@ export interface SignMixinType {
 
     get FinalResult(): TransactionResult;
 
+    setServiceFee(serviceFee: number): void;
+    setServiceFeeTx(serviceFeeTx: SignedObjectType): void;
     prepare(account: AccountModel): Promise<void>;
     populateFields(options?: { lastLedgerOffset?: number }): void;
     sign(account: AccountModel, multiSign?: boolean): Promise<string>;
diff --git a/src/common/libs/ledger/parser/common/amount.ts b/src/common/libs/ledger/parser/common/amount.ts
index 8ecb08e8e..1cc70bbde 100644
--- a/src/common/libs/ledger/parser/common/amount.ts
+++ b/src/common/libs/ledger/parser/common/amount.ts
@@ -7,7 +7,7 @@ class AmountParser {
     constructor(amount: string | number, drops = true) {
         // validate
 
-        if (typeof amount === 'string' && !drops) {
+        if (typeof amount === 'string' && !drops && amount !== '') {
             if (!amount.match(/^[+-]?\d+(?:[.]*\d*(?:[eE][+-]?\d+)?)?$/)) {
                 throw new Error(`invalid value '${amount}', should be a number`);
             } else if (amount === '.') {
diff --git a/src/common/libs/ledger/parser/common/flag.ts b/src/common/libs/ledger/parser/common/flag.ts
index b10d94516..9aee2378b 100644
--- a/src/common/libs/ledger/parser/common/flag.ts
+++ b/src/common/libs/ledger/parser/common/flag.ts
@@ -35,9 +35,10 @@ class FlagParser {
         const definitions = NetworkService.getNetworkDefinitions();
 
         // if the transaction flags is not present in the definitions use default flags
-        const transactionFlags = definitions?.transactionFlags ?? binary.DEFAULT_DEFINITIONS.TRANSACTION_FLAGS;
+        const transactionFlags =
+            definitions?.transactionFlags ?? (binary.DEFAULT_DEFINITIONS as any).TRANSACTION_FLAGS ?? {};
         const indicesFlags =
-            definitions?.transactionFlagsIndices ?? binary.DEFAULT_DEFINITIONS.TRANSACTION_FLAGS_INDICES;
+            definitions?.transactionFlagsIndices ?? (binary.DEFAULT_DEFINITIONS as any).TRANSACTION_FLAGS_INDICES ?? {};
 
         // transaction flags
         if (type in TransactionTypes && Object.prototype.hasOwnProperty.call(transactionFlags, type)) {
diff --git a/src/common/libs/ledger/parser/fields/Hash192.ts b/src/common/libs/ledger/parser/fields/Hash192.ts
new file mode 100644
index 000000000..d5ddd8e04
--- /dev/null
+++ b/src/common/libs/ledger/parser/fields/Hash192.ts
@@ -0,0 +1,18 @@
+/* Field ==================================================================== */
+export const Hash192 = {
+    getter: (self: any, name: string) => {
+        return (): string | undefined => {
+            return self[name];
+        };
+    },
+    setter: (self: any, name: string) => {
+        return (value: string): void => {
+            if (typeof value !== 'string') {
+                throw new Error(`field ${name} required type string, got ${typeof value}`);
+            }
+
+            // TODO: add value check and validation
+            self[name] = value;
+        };
+    },
+};
diff --git a/src/common/libs/ledger/parser/fields/STString.ts b/src/common/libs/ledger/parser/fields/STString.ts
new file mode 100644
index 000000000..096bfb358
--- /dev/null
+++ b/src/common/libs/ledger/parser/fields/STString.ts
@@ -0,0 +1,22 @@
+/* Field ==================================================================== */
+export const STString = {
+    getter: (self: any, name: string) => {
+        return (): string => {
+            return self[name];
+        };
+    },
+    setter: (self: any, name: string) => {
+        return (value: string): void => {
+            if (typeof value === 'undefined') {
+                self[name] = undefined;
+                return;
+            }
+
+            if (typeof value !== 'string') {
+                throw new Error(`field ${name} required type string, got ${typeof value}`);
+            }
+
+            self[name] = value;
+        };
+    },
+};
diff --git a/src/common/libs/ledger/parser/fields/UInt8.ts b/src/common/libs/ledger/parser/fields/UInt8.ts
new file mode 100644
index 000000000..b40657907
--- /dev/null
+++ b/src/common/libs/ledger/parser/fields/UInt8.ts
@@ -0,0 +1,17 @@
+/* Field ==================================================================== */
+export const UInt8 = {
+    getter: (self: any, name: string) => {
+        return (): number => {
+            return self[name];
+        };
+    },
+    setter: (self: any, name: string) => {
+        return (value: number): void => {
+            if (typeof value !== 'number') {
+                throw new Error(`field ${name} required type number, got ${typeof value}`);
+            }
+
+            self[name] = value;
+        };
+    },
+};
diff --git a/src/common/libs/ledger/parser/fields/codec/AuthorizeCredentials.ts b/src/common/libs/ledger/parser/fields/codec/AuthorizeCredentials.ts
new file mode 100644
index 000000000..5131073b4
--- /dev/null
+++ b/src/common/libs/ledger/parser/fields/codec/AuthorizeCredentials.ts
@@ -0,0 +1,15 @@
+import { Credential } from '@common/libs/ledger/types/common';
+
+/* Codec ==================================================================== */
+export const AuthorizeCredentials = {
+    decode: (_self: any, value: { Credential: Credential }[]): Credential[] => {
+        return value.map((s) => s.Credential);
+    },
+    encode: (_self: any, value: Credential[]): { Credential: Credential }[] => {
+        return value.map((s) => {
+            return {
+                Credential: s,
+            };
+        });
+    },
+};
diff --git a/src/common/libs/ledger/parser/fields/codec/index.ts b/src/common/libs/ledger/parser/fields/codec/index.ts
index e0636a2c4..9b264918c 100644
--- a/src/common/libs/ledger/parser/fields/codec/index.ts
+++ b/src/common/libs/ledger/parser/fields/codec/index.ts
@@ -13,6 +13,7 @@ import { TransferFee } from './TransferFee';
 import { TradingFee } from './TradingFee';
 import { AuthAccounts } from './AuthAccounts';
 import { Amounts } from './Amounts';
+import { AuthorizeCredentials } from './AuthorizeCredentials';
 
 export {
     FlagIndices,
@@ -29,4 +30,5 @@ export {
     AuthAccounts,
     Amounts,
     PriceDataSeries,
+    AuthorizeCredentials,
 };
diff --git a/src/common/libs/ledger/parser/fields/index.ts b/src/common/libs/ledger/parser/fields/index.ts
index 3797af780..06f60a037 100644
--- a/src/common/libs/ledger/parser/fields/index.ts
+++ b/src/common/libs/ledger/parser/fields/index.ts
@@ -6,14 +6,17 @@ import { AccountID } from './AccountID';
 import { Amount } from './Amount';
 import { STArray } from './STArray';
 import { STObject } from './STObject';
+import { UInt8 } from './UInt8';
 import { UInt16 } from './UInt16';
 import { UInt32 } from './UInt32';
 import { UInt64 } from './UInt64';
 import { Hash128 } from './Hash128';
+import { Hash192 } from './Hash192';
 import { Hash256 } from './Hash256';
 import { Blob } from './Blob';
 import { PathSet } from './PathSet';
 import { Issue } from './Issue';
+import { STString } from './STString';
 
 export {
     TransactionType,
@@ -22,12 +25,15 @@ export {
     Amount,
     STArray,
     STObject,
+    UInt8,
     UInt16,
     UInt32,
     UInt64,
     Hash128,
+    Hash192,
     Hash256,
     Blob,
     PathSet,
     Issue,
+    STString,
 };
diff --git a/src/common/libs/ledger/transactions/genuine/CheckCash/CheckCash.info.ts b/src/common/libs/ledger/transactions/genuine/CheckCash/CheckCash.info.ts
index cff3ebcd1..2d5269ab0 100644
--- a/src/common/libs/ledger/transactions/genuine/CheckCash/CheckCash.info.ts
+++ b/src/common/libs/ledger/transactions/genuine/CheckCash/CheckCash.info.ts
@@ -43,12 +43,13 @@ class CheckCashInfo extends ExplainerAbstract<CheckCash, MutationsMixinType> {
     }
 
     getMonetaryDetails() {
+        const amountField = this.item.Amount || this.item.DeliverMin;
         return {
             mutate: this.item.BalanceChange(this.account.address),
             factor: [
                 {
-                    currency: this.item.Amount!.currency,
-                    value: this.item.Amount!.value,
+                    currency: amountField!.currency,
+                    value: amountField!.value,
                     effect: MonetaryStatus.IMMEDIATE_EFFECT,
                 },
             ],
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialAccept/CredentialAccept.class.ts b/src/common/libs/ledger/transactions/genuine/CredentialAccept/CredentialAccept.class.ts
new file mode 100644
index 000000000..7c65b8c37
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialAccept/CredentialAccept.class.ts
@@ -0,0 +1,32 @@
+import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
+
+import { AccountID, Blob } from '@common/libs/ledger/parser/fields';
+
+/* Types ==================================================================== */
+import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
+import { TransactionTypes } from '@common/libs/ledger/types/enums';
+import { FieldConfig, FieldReturnType } from '@common/libs/ledger/parser/fields/types';
+
+/* Class ==================================================================== */
+class CredentialAccept extends BaseGenuineTransaction {
+    public static Type = TransactionTypes.CredentialAccept as const;
+    public readonly Type = CredentialAccept.Type;
+
+    public static Fields: { [key: string]: FieldConfig } = {
+        Issuer: { required: true, type: AccountID },
+        CredentialType: { required: true, type: Blob },
+    };
+
+    declare Issuer: FieldReturnType<typeof AccountID>;
+    declare CredentialType: FieldReturnType<typeof Blob>;
+
+    constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
+        super(tx, meta);
+
+        // set transaction type
+        this.TransactionType = CredentialAccept.Type;
+    }
+}
+
+/* Export ==================================================================== */
+export default CredentialAccept;
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialAccept/CredentialAccept.info.ts b/src/common/libs/ledger/transactions/genuine/CredentialAccept/CredentialAccept.info.ts
new file mode 100644
index 000000000..11f6d0512
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialAccept/CredentialAccept.info.ts
@@ -0,0 +1,41 @@
+import Localize from '@locale';
+
+import { AccountModel } from '@store/models';
+
+import CredentialAccept from './CredentialAccept.class';
+
+/* Types ==================================================================== */
+import { MutationsMixinType } from '@common/libs/ledger/mixin/types';
+import { ExplainerAbstract } from '@common/libs/ledger/factory/types';
+
+/* Descriptor ==================================================================== */
+class CredentialAcceptInfo extends ExplainerAbstract<CredentialAccept, MutationsMixinType> {
+    constructor(item: CredentialAccept & MutationsMixinType, account: AccountModel) {
+        super(item, account);
+    }
+
+    getEventsLabel(): string {
+        return Localize.t('events.credentialAccept');
+    }
+
+    generateDescription(): string {
+        return `This is an ${this.item.Type} transaction`;
+    }
+
+    getParticipants() {
+        return {
+            start: { address: this.item.Account, tag: this.item.SourceTag },
+            end: { address: this.item.Issuer, tag: undefined },
+        };
+    }
+
+    getMonetaryDetails() {
+        return {
+            mutate: this.item.BalanceChange(this.account.address),
+            factor: undefined,
+        };
+    }
+}
+
+/* Export ==================================================================== */
+export default CredentialAcceptInfo;
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialAccept/CredentialAccept.validation.ts b/src/common/libs/ledger/transactions/genuine/CredentialAccept/CredentialAccept.validation.ts
new file mode 100644
index 000000000..588c2e2f6
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialAccept/CredentialAccept.validation.ts
@@ -0,0 +1,15 @@
+import CredentialAccept from './CredentialAccept.class';
+
+/* Types ==================================================================== */
+import { ValidationType } from '@common/libs/ledger/factory/types';
+
+/* Validation ==================================================================== */
+const CredentialAcceptValidation: ValidationType<CredentialAccept> = (): Promise<void> => {
+    // TODO: add validation
+    return new Promise((resolve) => {
+        resolve();
+    });
+};
+
+/* Export ==================================================================== */
+export default CredentialAcceptValidation;
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialAccept/index.ts b/src/common/libs/ledger/transactions/genuine/CredentialAccept/index.ts
new file mode 100644
index 000000000..dba9765b1
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialAccept/index.ts
@@ -0,0 +1,3 @@
+export { default as CredentialAccept } from './CredentialAccept.class';
+export { default as CredentialAcceptValidation } from './CredentialAccept.validation';
+export { default as CredentialAcceptInfo } from './CredentialAccept.info';
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialCreate/CredentialCreate.class.ts b/src/common/libs/ledger/transactions/genuine/CredentialCreate/CredentialCreate.class.ts
new file mode 100644
index 000000000..866a4823b
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialCreate/CredentialCreate.class.ts
@@ -0,0 +1,37 @@
+import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
+
+import { AccountID, Blob, UInt32 } from '@common/libs/ledger/parser/fields';
+import { RippleTime } from '@common/libs/ledger/parser/fields/codec';
+
+/* Types ==================================================================== */
+import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
+import { TransactionTypes } from '@common/libs/ledger/types/enums';
+import { FieldConfig, FieldReturnType } from '@common/libs/ledger/parser/fields/types';
+
+/* Class ==================================================================== */
+class CredentialCreate extends BaseGenuineTransaction {
+    public static Type = TransactionTypes.CredentialCreate as const;
+    public readonly Type = CredentialCreate.Type;
+
+    public static Fields: { [key: string]: FieldConfig } = {
+        Subject: { required: true, type: AccountID },
+        CredentialType: { required: true, type: Blob },
+        URI: { type: Blob },
+        Expiration: { type: UInt32, codec: RippleTime },
+    };
+
+    declare Subject: FieldReturnType<typeof AccountID>;
+    declare CredentialType: FieldReturnType<typeof Blob>;
+    declare URI: FieldReturnType<typeof Blob>;
+    declare Expiration: FieldReturnType<typeof UInt32, typeof RippleTime>;
+
+    constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
+        super(tx, meta);
+
+        // set transaction type
+        this.TransactionType = CredentialCreate.Type;
+    }
+}
+
+/* Export ==================================================================== */
+export default CredentialCreate;
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialCreate/CredentialCreate.info.ts b/src/common/libs/ledger/transactions/genuine/CredentialCreate/CredentialCreate.info.ts
new file mode 100644
index 000000000..0c5a4d9f0
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialCreate/CredentialCreate.info.ts
@@ -0,0 +1,41 @@
+import Localize from '@locale';
+
+import { AccountModel } from '@store/models';
+
+import CredentialCreate from './CredentialCreate.class';
+
+/* Types ==================================================================== */
+import { MutationsMixinType } from '@common/libs/ledger/mixin/types';
+import { ExplainerAbstract } from '@common/libs/ledger/factory/types';
+
+/* Descriptor ==================================================================== */
+class CredentialCreateInfo extends ExplainerAbstract<CredentialCreate, MutationsMixinType> {
+    constructor(item: CredentialCreate & MutationsMixinType, account: AccountModel) {
+        super(item, account);
+    }
+
+    getEventsLabel(): string {
+        return Localize.t('events.credentialCreate');
+    }
+
+    generateDescription(): string {
+        return `This is an ${this.item.Type} transaction`;
+    }
+
+    getParticipants() {
+        return {
+            start: { address: this.item.Account, tag: this.item.SourceTag },
+            end: { address: this.item.Subject, tag: undefined },
+        };
+    }
+
+    getMonetaryDetails() {
+        return {
+            mutate: this.item.BalanceChange(this.account.address),
+            factor: undefined,
+        };
+    }
+}
+
+/* Export ==================================================================== */
+export default CredentialCreateInfo;
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialCreate/CredentialCreate.validation.ts b/src/common/libs/ledger/transactions/genuine/CredentialCreate/CredentialCreate.validation.ts
new file mode 100644
index 000000000..8f66178f2
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialCreate/CredentialCreate.validation.ts
@@ -0,0 +1,15 @@
+import CredentialCreate from './CredentialCreate.class';
+
+/* Types ==================================================================== */
+import { ValidationType } from '@common/libs/ledger/factory/types';
+
+/* Validation ==================================================================== */
+const CredentialCreateValidation: ValidationType<CredentialCreate> = (): Promise<void> => {
+    // TODO: add validation
+    return new Promise((resolve) => {
+        resolve();
+    });
+};
+
+/* Export ==================================================================== */
+export default CredentialCreateValidation;
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialCreate/index.ts b/src/common/libs/ledger/transactions/genuine/CredentialCreate/index.ts
new file mode 100644
index 000000000..840c6877c
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialCreate/index.ts
@@ -0,0 +1,3 @@
+export { default as CredentialCreate } from './CredentialCreate.class';
+export { default as CredentialCreateValidation } from './CredentialCreate.validation';
+export { default as CredentialCreateInfo } from './CredentialCreate.info';
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialDelete/CredentialDelete.class.ts b/src/common/libs/ledger/transactions/genuine/CredentialDelete/CredentialDelete.class.ts
new file mode 100644
index 000000000..bffd9211d
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialDelete/CredentialDelete.class.ts
@@ -0,0 +1,34 @@
+import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
+
+import { AccountID, Blob } from '@common/libs/ledger/parser/fields';
+
+/* Types ==================================================================== */
+import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
+import { TransactionTypes } from '@common/libs/ledger/types/enums';
+import { FieldConfig, FieldReturnType } from '@common/libs/ledger/parser/fields/types';
+
+/* Class ==================================================================== */
+class CredentialDelete extends BaseGenuineTransaction {
+    public static Type = TransactionTypes.CredentialDelete as const;
+    public readonly Type = CredentialDelete.Type;
+
+    public static Fields: { [key: string]: FieldConfig } = {
+        Subject: { type: AccountID },
+        Issuer: { type: AccountID },
+        CredentialType: { required: true, type: Blob },
+    };
+
+    declare Subject: FieldReturnType<typeof AccountID>;
+    declare Issuer: FieldReturnType<typeof AccountID>;
+    declare CredentialType: FieldReturnType<typeof Blob>;
+
+    constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
+        super(tx, meta);
+
+        // set transaction type
+        this.TransactionType = CredentialDelete.Type;
+    }
+}
+
+/* Export ==================================================================== */
+export default CredentialDelete;
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialDelete/CredentialDelete.info.ts b/src/common/libs/ledger/transactions/genuine/CredentialDelete/CredentialDelete.info.ts
new file mode 100644
index 000000000..f7443bfcc
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialDelete/CredentialDelete.info.ts
@@ -0,0 +1,41 @@
+import Localize from '@locale';
+
+import { AccountModel } from '@store/models';
+
+import CredentialDelete from './CredentialDelete.class';
+
+/* Types ==================================================================== */
+import { MutationsMixinType } from '@common/libs/ledger/mixin/types';
+import { ExplainerAbstract } from '@common/libs/ledger/factory/types';
+
+/* Descriptor ==================================================================== */
+class CredentialDeleteInfo extends ExplainerAbstract<CredentialDelete, MutationsMixinType> {
+    constructor(item: CredentialDelete & MutationsMixinType, account: AccountModel) {
+        super(item, account);
+    }
+
+    getEventsLabel(): string {
+        return Localize.t('events.credentialDelete');
+    }
+
+    generateDescription(): string {
+        return `This is an ${this.item.Type} transaction`;
+    }
+
+    getParticipants() {
+        return {
+            start: { address: this.item.Account, tag: this.item.SourceTag },
+            end: { address: this.item.Issuer, tag: undefined },
+        };
+    }
+
+    getMonetaryDetails() {
+        return {
+            mutate: this.item.BalanceChange(this.account.address),
+            factor: undefined,
+        };
+    }
+}
+
+/* Export ==================================================================== */
+export default CredentialDeleteInfo;
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialDelete/CredentialDelete.validation.ts b/src/common/libs/ledger/transactions/genuine/CredentialDelete/CredentialDelete.validation.ts
new file mode 100644
index 000000000..9f034c465
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialDelete/CredentialDelete.validation.ts
@@ -0,0 +1,15 @@
+import CredentialDelete from './CredentialDelete.class';
+
+/* Types ==================================================================== */
+import { ValidationType } from '@common/libs/ledger/factory/types';
+
+/* Validation ==================================================================== */
+const CredentialDeleteValidation: ValidationType<CredentialDelete> = (): Promise<void> => {
+    // TODO: add validation
+    return new Promise((resolve) => {
+        resolve();
+    });
+};
+
+/* Export ==================================================================== */
+export default CredentialDeleteValidation;
diff --git a/src/common/libs/ledger/transactions/genuine/CredentialDelete/index.ts b/src/common/libs/ledger/transactions/genuine/CredentialDelete/index.ts
new file mode 100644
index 000000000..b04f108e3
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/CredentialDelete/index.ts
@@ -0,0 +1,3 @@
+export { default as CredentialDelete } from './CredentialDelete.class';
+export { default as CredentialDeleteValidation } from './CredentialDelete.validation';
+export { default as CredentialDeleteInfo } from './CredentialDelete.info';
diff --git a/src/common/libs/ledger/transactions/genuine/DepositPreauth/DepositPreauth.class.ts b/src/common/libs/ledger/transactions/genuine/DepositPreauth/DepositPreauth.class.ts
index 313c88df2..451dac7bc 100644
--- a/src/common/libs/ledger/transactions/genuine/DepositPreauth/DepositPreauth.class.ts
+++ b/src/common/libs/ledger/transactions/genuine/DepositPreauth/DepositPreauth.class.ts
@@ -1,6 +1,7 @@
 import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
 
-import { AccountID } from '@common/libs/ledger/parser/fields';
+import { STArray, AccountID } from '@common/libs/ledger/parser/fields';
+import { AuthorizeCredentials } from '@common/libs/ledger/parser/fields/codec';
 
 /* Types ==================================================================== */
 import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
@@ -15,10 +16,14 @@ class DepositPreauth extends BaseGenuineTransaction {
     public static Fields: { [key: string]: FieldConfig } = {
         Authorize: { type: AccountID },
         Unauthorize: { type: AccountID },
+        AuthorizeCredentials: { type: STArray, codec: AuthorizeCredentials },
+        UnauthorizeCredentials: { type: STArray, codec: AuthorizeCredentials },
     };
 
     declare Authorize: FieldReturnType<typeof AccountID>;
     declare Unauthorize: FieldReturnType<typeof AccountID>;
+    declare AuthorizeCredentials: FieldReturnType<typeof STArray, typeof AuthorizeCredentials>;
+    declare UnauthorizeCredentials: FieldReturnType<typeof STArray, typeof AuthorizeCredentials>;
 
     constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
         super(tx, meta);
diff --git a/src/common/libs/ledger/transactions/genuine/DepositPreauth/DepositPreauth.info.ts b/src/common/libs/ledger/transactions/genuine/DepositPreauth/DepositPreauth.info.ts
index c922ddaae..bcff6be89 100644
--- a/src/common/libs/ledger/transactions/genuine/DepositPreauth/DepositPreauth.info.ts
+++ b/src/common/libs/ledger/transactions/genuine/DepositPreauth/DepositPreauth.info.ts
@@ -27,17 +27,39 @@ class DepositPreauthInfo extends ExplainerAbstract<DepositPreauth, MutationsMixi
     }
 
     generateDescription(): string {
+        const content = [];
+
         if (this.item.Authorize) {
-            return Localize.t('events.itAuthorizesSendingPaymentsToThisAccount', { address: this.item.Authorize });
+            content.push(
+                Localize.t('events.itAuthorizesSendingPaymentsToThisAccount', { address: this.item.Authorize }),
+            );
         }
 
         if (this.item.Unauthorize) {
-            return Localize.t('events.itRemovesAuthorizesSendingPaymentsToThisAccount', {
-                address: this.item.Unauthorize,
-            });
+            content.push(
+                Localize.t('events.itRemovesAuthorizesSendingPaymentsToThisAccount', {
+                    address: this.item.Unauthorize,
+                }),
+            );
+        }
+
+        if (this.item.AuthorizeCredentials) {
+            content.push(Localize.t('events.preauthorizeCredentials'));
+            content.push(
+                this.item.AuthorizeCredentials.map((credential) => `${credential.Issuer}:${credential.CredentialType}`),
+            );
+        }
+
+        if (this.item.UnauthorizeCredentials) {
+            content.push(Localize.t('events.unauthorizeCredentials'));
+            content.push(
+                this.item.UnauthorizeCredentials.map(
+                    (credential) => `${credential.Issuer}:${credential.CredentialType}`,
+                ),
+            );
         }
 
-        return 'No description, "Authorize" and "Unauthorize" field has not been set.';
+        return content.join('\n');
     }
 
     getParticipants() {
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/MPTokenAuthorize.class.ts b/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/MPTokenAuthorize.class.ts
new file mode 100644
index 000000000..d7a19171f
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/MPTokenAuthorize.class.ts
@@ -0,0 +1,32 @@
+import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
+
+import { AccountID, Hash192 } from '@common/libs/ledger/parser/fields';
+
+/* Types ==================================================================== */
+import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
+import { TransactionTypes } from '@common/libs/ledger/types/enums';
+import { FieldConfig, FieldReturnType } from '@common/libs/ledger/parser/fields/types';
+
+/* Class ==================================================================== */
+class MPTokenAuthorize extends BaseGenuineTransaction {
+    public static Type = TransactionTypes.MPTokenAuthorize as const;
+    public readonly Type = MPTokenAuthorize.Type;
+
+    public static Fields: { [key: string]: FieldConfig } = {
+        MPTokenIssuanceID: { required: true, type: Hash192 },
+        Holder: { type: AccountID },
+    };
+
+    declare MPTokenIssuanceID: FieldReturnType<typeof Hash192>;
+    declare Holder: FieldReturnType<typeof AccountID>;
+
+    constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
+        super(tx, meta);
+
+        // set transaction type
+        this.TransactionType = MPTokenAuthorize.Type;
+    }
+}
+
+/* Export ==================================================================== */
+export default MPTokenAuthorize;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/MPTokenAuthorize.info.ts b/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/MPTokenAuthorize.info.ts
new file mode 100644
index 000000000..589c5b374
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/MPTokenAuthorize.info.ts
@@ -0,0 +1,40 @@
+import Localize from '@locale';
+
+import { AccountModel } from '@store/models';
+
+import MPTokenAuthorize from './MPTokenAuthorize.class';
+
+/* Types ==================================================================== */
+import { MutationsMixinType } from '@common/libs/ledger/mixin/types';
+import { ExplainerAbstract } from '@common/libs/ledger/factory/types';
+
+/* Descriptor ==================================================================== */
+class MPTokenAuthorizeInfo extends ExplainerAbstract<MPTokenAuthorize, MutationsMixinType> {
+    constructor(item: MPTokenAuthorize & MutationsMixinType, account: AccountModel) {
+        super(item, account);
+    }
+
+    getEventsLabel = (): string => {
+        return Localize.t('events.mpTokenAuthorize');
+    };
+
+    generateDescription = (): string => {
+        return `This is an ${this.item.Type} transaction`;
+    };
+
+    getParticipants = () => {
+        return {
+            start: { address: this.item.Account, tag: this.item.SourceTag },
+        };
+    };
+
+    getMonetaryDetails() {
+        return {
+            mutate: this.item.BalanceChange(this.account.address),
+            factor: undefined,
+        };
+    }
+}
+
+/* Export ==================================================================== */
+export default MPTokenAuthorizeInfo;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/MPTokenAuthorize.validation.ts b/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/MPTokenAuthorize.validation.ts
new file mode 100644
index 000000000..fc357c9da
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/MPTokenAuthorize.validation.ts
@@ -0,0 +1,15 @@
+import MPTokenAuthorize from './MPTokenAuthorize.class';
+
+/* Types ==================================================================== */
+import { ValidationType } from '@common/libs/ledger/factory/types';
+
+/* Validation ==================================================================== */
+const MPTokenAuthorizeValidation: ValidationType<MPTokenAuthorize> = (): Promise<void> => {
+    // TODO: add validation
+    return new Promise((resolve) => {
+        resolve();
+    });
+};
+
+/* Export ==================================================================== */
+export default MPTokenAuthorizeValidation;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/index.ts b/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/index.ts
new file mode 100644
index 000000000..435cc6317
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenAuthorize/index.ts
@@ -0,0 +1,3 @@
+export { default as MPTokenAuthorize } from './MPTokenAuthorize.class';
+export { default as MPTokenAuthorizeValidation } from './MPTokenAuthorize.validation';
+export { default as MPTokenAuthorizeInfo } from './MPTokenAuthorize.info';
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/MPTokenIssuanceCreate.class.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/MPTokenIssuanceCreate.class.ts
new file mode 100644
index 000000000..7e103db47
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/MPTokenIssuanceCreate.class.ts
@@ -0,0 +1,41 @@
+import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
+
+import { Blob, STString, UInt16, UInt8 } from '@common/libs/ledger/parser/fields';
+import { TransferFee } from '@common/libs/ledger/parser/fields/codec';
+
+/* Types ==================================================================== */
+import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
+import { TransactionTypes } from '@common/libs/ledger/types/enums';
+import { FieldConfig, FieldReturnType } from '@common/libs/ledger/parser/fields/types';
+
+/* Class ==================================================================== */
+class MPTokenIssuanceCreate extends BaseGenuineTransaction {
+    public static Type = TransactionTypes.MPTokenIssuanceCreate as const;
+    public readonly Type = MPTokenIssuanceCreate.Type;
+
+    public static Fields: { [key: string]: FieldConfig } = {
+        AssetScale: { type: UInt8 },
+        TransferFee: { type: UInt16, codec: TransferFee },
+        MaximumAmount: { type: STString },
+        MPTokenMetadata: { type: Blob },
+    };
+
+    declare AssetScale: FieldReturnType<typeof UInt8>;
+    declare TransferFee: FieldReturnType<typeof UInt16, typeof TransferFee>;
+    declare MaximumAmount: FieldReturnType<typeof STString>;
+    declare MPTokenMetadata: FieldReturnType<typeof Blob>;
+
+    constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
+        super(tx, meta);
+
+        // set transaction type
+        this.TransactionType = MPTokenIssuanceCreate.Type;
+    }
+
+    get MPTokenIssuanceID(): string | undefined {
+        return this._meta?.mpt_issuance_id;
+    }
+}
+
+/* Export ==================================================================== */
+export default MPTokenIssuanceCreate;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/MPTokenIssuanceCreate.info.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/MPTokenIssuanceCreate.info.ts
new file mode 100644
index 000000000..3a4cd8f90
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/MPTokenIssuanceCreate.info.ts
@@ -0,0 +1,40 @@
+import Localize from '@locale';
+
+import { AccountModel } from '@store/models';
+
+import MPTokenIssuanceCreate from './MPTokenIssuanceCreate.class';
+
+/* Types ==================================================================== */
+import { MutationsMixinType } from '@common/libs/ledger/mixin/types';
+import { ExplainerAbstract } from '@common/libs/ledger/factory/types';
+
+/* Descriptor ==================================================================== */
+class MPTokenIssuanceCreateInfo extends ExplainerAbstract<MPTokenIssuanceCreate, MutationsMixinType> {
+    constructor(item: MPTokenIssuanceCreate & MutationsMixinType, account: AccountModel) {
+        super(item, account);
+    }
+
+    getEventsLabel = (): string => {
+        return Localize.t('events.mpTokenIssuanceCreate');
+    };
+
+    generateDescription = (): string => {
+        return `This is an ${this.item.Type} transaction`;
+    };
+
+    getParticipants = () => {
+        return {
+            start: { address: this.item.Account, tag: this.item.SourceTag },
+        };
+    };
+
+    getMonetaryDetails() {
+        return {
+            mutate: this.item.BalanceChange(this.account.address),
+            factor: undefined,
+        };
+    }
+}
+
+/* Export ==================================================================== */
+export default MPTokenIssuanceCreateInfo;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/MPTokenIssuanceCreate.validation.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/MPTokenIssuanceCreate.validation.ts
new file mode 100644
index 000000000..00c602483
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/MPTokenIssuanceCreate.validation.ts
@@ -0,0 +1,15 @@
+import MPTokenIssuanceCreate from './MPTokenIssuanceCreate.class';
+
+/* Types ==================================================================== */
+import { ValidationType } from '@common/libs/ledger/factory/types';
+
+/* Validation ==================================================================== */
+const MPTokenIssuanceCreateValidation: ValidationType<MPTokenIssuanceCreate> = (): Promise<void> => {
+    // TODO: add validation
+    return new Promise((resolve) => {
+        resolve();
+    });
+};
+
+/* Export ==================================================================== */
+export default MPTokenIssuanceCreateValidation;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/index.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/index.ts
new file mode 100644
index 000000000..129286500
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceCreate/index.ts
@@ -0,0 +1,3 @@
+export { default as MPTokenIssuanceCreate } from './MPTokenIssuanceCreate.class';
+export { default as MPTokenIssuanceCreateValidation } from './MPTokenIssuanceCreate.validation';
+export { default as MPTokenIssuanceCreateInfo } from './MPTokenIssuanceCreate.info';
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/MPTokenIssuanceDestroy.class.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/MPTokenIssuanceDestroy.class.ts
new file mode 100644
index 000000000..f8f5a31c0
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/MPTokenIssuanceDestroy.class.ts
@@ -0,0 +1,30 @@
+import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
+
+import { Hash192 } from '@common/libs/ledger/parser/fields';
+
+/* Types ==================================================================== */
+import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
+import { TransactionTypes } from '@common/libs/ledger/types/enums';
+import { FieldConfig, FieldReturnType } from '@common/libs/ledger/parser/fields/types';
+
+/* Class ==================================================================== */
+class MPTokenIssuanceDestroy extends BaseGenuineTransaction {
+    public static Type = TransactionTypes.MPTokenIssuanceDestroy as const;
+    public readonly Type = MPTokenIssuanceDestroy.Type;
+
+    public static Fields: { [key: string]: FieldConfig } = {
+        MPTokenIssuanceID: { required: true, type: Hash192 },
+    };
+
+    declare MPTokenIssuanceID: FieldReturnType<typeof Hash192>;
+
+    constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
+        super(tx, meta);
+
+        // set transaction type
+        this.TransactionType = MPTokenIssuanceDestroy.Type;
+    }
+}
+
+/* Export ==================================================================== */
+export default MPTokenIssuanceDestroy;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/MPTokenIssuanceDestroy.info.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/MPTokenIssuanceDestroy.info.ts
new file mode 100644
index 000000000..86675a1d3
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/MPTokenIssuanceDestroy.info.ts
@@ -0,0 +1,40 @@
+import Localize from '@locale';
+
+import { AccountModel } from '@store/models';
+
+import MPTokenIssuanceDestroy from './MPTokenIssuanceDestroy.class';
+
+/* Types ==================================================================== */
+import { MutationsMixinType } from '@common/libs/ledger/mixin/types';
+import { ExplainerAbstract } from '@common/libs/ledger/factory/types';
+
+/* Descriptor ==================================================================== */
+class MPTokenIssuanceDestroyInfo extends ExplainerAbstract<MPTokenIssuanceDestroy, MutationsMixinType> {
+    constructor(item: MPTokenIssuanceDestroy & MutationsMixinType, account: AccountModel) {
+        super(item, account);
+    }
+
+    getEventsLabel = (): string => {
+        return Localize.t('events.mpTokenIssuanceDestroy');
+    };
+
+    generateDescription = (): string => {
+        return `This is an ${this.item.Type} transaction`;
+    };
+
+    getParticipants = () => {
+        return {
+            start: { address: this.item.Account, tag: this.item.SourceTag },
+        };
+    };
+
+    getMonetaryDetails() {
+        return {
+            mutate: this.item.BalanceChange(this.account.address),
+            factor: undefined,
+        };
+    }
+}
+
+/* Export ==================================================================== */
+export default MPTokenIssuanceDestroyInfo;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/MPTokenIssuanceDestroy.validation.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/MPTokenIssuanceDestroy.validation.ts
new file mode 100644
index 000000000..f7a424c40
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/MPTokenIssuanceDestroy.validation.ts
@@ -0,0 +1,15 @@
+import MPTokenIssuanceDestroy from './MPTokenIssuanceDestroy.class';
+
+/* Types ==================================================================== */
+import { ValidationType } from '@common/libs/ledger/factory/types';
+
+/* Validation ==================================================================== */
+const MPTokenIssuanceDestroyValidation: ValidationType<MPTokenIssuanceDestroy> = (): Promise<void> => {
+    // TODO: add validation
+    return new Promise((resolve) => {
+        resolve();
+    });
+};
+
+/* Export ==================================================================== */
+export default MPTokenIssuanceDestroyValidation;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/index.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/index.ts
new file mode 100644
index 000000000..e559f667a
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceDestroy/index.ts
@@ -0,0 +1,3 @@
+export { default as MPTokenIssuanceDestroy } from './MPTokenIssuanceDestroy.class';
+export { default as MPTokenIssuanceDestroyValidation } from './MPTokenIssuanceDestroy.validation';
+export { default as MPTokenIssuanceDestroyInfo } from './MPTokenIssuanceDestroy.info';
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/MPTokenIssuanceSet.class.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/MPTokenIssuanceSet.class.ts
new file mode 100644
index 000000000..240d01384
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/MPTokenIssuanceSet.class.ts
@@ -0,0 +1,32 @@
+import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
+
+import { AccountID, Hash192 } from '@common/libs/ledger/parser/fields';
+
+/* Types ==================================================================== */
+import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
+import { TransactionTypes } from '@common/libs/ledger/types/enums';
+import { FieldConfig, FieldReturnType } from '@common/libs/ledger/parser/fields/types';
+
+/* Class ==================================================================== */
+class MPTokenIssuanceSet extends BaseGenuineTransaction {
+    public static Type = TransactionTypes.MPTokenIssuanceSet as const;
+    public readonly Type = MPTokenIssuanceSet.Type;
+
+    public static Fields: { [key: string]: FieldConfig } = {
+        MPTokenIssuanceID: { required: true, type: Hash192 },
+        Holder: { type: AccountID },
+    };
+
+    declare MPTokenIssuanceID: FieldReturnType<typeof Hash192>;
+    declare Holder: FieldReturnType<typeof AccountID>;
+
+    constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
+        super(tx, meta);
+
+        // set transaction type
+        this.TransactionType = MPTokenIssuanceSet.Type;
+    }
+}
+
+/* Export ==================================================================== */
+export default MPTokenIssuanceSet;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/MPTokenIssuanceSet.info.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/MPTokenIssuanceSet.info.ts
new file mode 100644
index 000000000..a6b1c68e7
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/MPTokenIssuanceSet.info.ts
@@ -0,0 +1,40 @@
+import Localize from '@locale';
+
+import { AccountModel } from '@store/models';
+
+import MPTokenIssuanceSet from './MPTokenIssuanceSet.class';
+
+/* Types ==================================================================== */
+import { MutationsMixinType } from '@common/libs/ledger/mixin/types';
+import { ExplainerAbstract } from '@common/libs/ledger/factory/types';
+
+/* Descriptor ==================================================================== */
+class MPTokenIssuanceSetInfo extends ExplainerAbstract<MPTokenIssuanceSet, MutationsMixinType> {
+    constructor(item: MPTokenIssuanceSet & MutationsMixinType, account: AccountModel) {
+        super(item, account);
+    }
+
+    getEventsLabel = (): string => {
+        return Localize.t('events.mpTokenIssuanceSet');
+    };
+
+    generateDescription = (): string => {
+        return `This is an ${this.item.Type} transaction`;
+    };
+
+    getParticipants = () => {
+        return {
+            start: { address: this.item.Account, tag: this.item.SourceTag },
+        };
+    };
+
+    getMonetaryDetails() {
+        return {
+            mutate: this.item.BalanceChange(this.account.address),
+            factor: undefined,
+        };
+    }
+}
+
+/* Export ==================================================================== */
+export default MPTokenIssuanceSetInfo;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/MPTokenIssuanceSet.validation.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/MPTokenIssuanceSet.validation.ts
new file mode 100644
index 000000000..5403fe026
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/MPTokenIssuanceSet.validation.ts
@@ -0,0 +1,15 @@
+import MPTokenIssuanceSet from './MPTokenIssuanceSet.class';
+
+/* Types ==================================================================== */
+import { ValidationType } from '@common/libs/ledger/factory/types';
+
+/* Validation ==================================================================== */
+const MPTokenIssuanceSetValidation: ValidationType<MPTokenIssuanceSet> = (): Promise<void> => {
+    // TODO: add validation
+    return new Promise((resolve) => {
+        resolve();
+    });
+};
+
+/* Export ==================================================================== */
+export default MPTokenIssuanceSetValidation;
diff --git a/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/index.ts b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/index.ts
new file mode 100644
index 000000000..9bde20187
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/MPTokenIssuanceSet/index.ts
@@ -0,0 +1,3 @@
+export { default as MPTokenIssuanceSet } from './MPTokenIssuanceSet.class';
+export { default as MPTokenIssuanceSetValidation } from './MPTokenIssuanceSet.validation';
+export { default as MPTokenIssuanceSetInfo } from './MPTokenIssuanceSet.info';
diff --git a/src/common/libs/ledger/transactions/genuine/NFTokenMint/NFTokenMint.class.ts b/src/common/libs/ledger/transactions/genuine/NFTokenMint/NFTokenMint.class.ts
index 966546628..344c2fbff 100644
--- a/src/common/libs/ledger/transactions/genuine/NFTokenMint/NFTokenMint.class.ts
+++ b/src/common/libs/ledger/transactions/genuine/NFTokenMint/NFTokenMint.class.ts
@@ -2,8 +2,8 @@ import { EncodeNFTokenID } from '@common/utils/codec';
 
 import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
 
-import { AccountID, Blob, UInt32, UInt16 } from '@common/libs/ledger/parser/fields';
-import { TransferFee } from '@common/libs/ledger/parser/fields/codec';
+import { AccountID, Blob, UInt32, UInt16, Amount } from '@common/libs/ledger/parser/fields';
+import { RippleTime, TransferFee } from '@common/libs/ledger/parser/fields/codec';
 
 /* Types ==================================================================== */
 import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
@@ -20,12 +20,18 @@ class NFTokenMint extends BaseGenuineTransaction {
         Issuer: { type: AccountID },
         TransferFee: { type: UInt16, codec: TransferFee },
         URI: { type: Blob },
+        Amount: { type: Amount },
+        Destination: { type: AccountID },
+        Expiration: { type: UInt32, codec: RippleTime },
     };
 
     declare NFTokenTaxon: FieldReturnType<typeof UInt32>;
     declare Issuer: FieldReturnType<typeof AccountID>;
     declare TransferFee: FieldReturnType<typeof UInt16, typeof TransferFee>;
     declare URI: FieldReturnType<typeof Blob>;
+    declare Amount: FieldReturnType<typeof Amount>;
+    declare Destination: FieldReturnType<typeof AccountID>;
+    declare Expiration: FieldReturnType<typeof UInt32, typeof RippleTime>;
 
     constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
         super(tx, meta);
diff --git a/src/common/libs/ledger/transactions/genuine/NFTokenMint/NFTokenMint.info.ts b/src/common/libs/ledger/transactions/genuine/NFTokenMint/NFTokenMint.info.ts
index 5dd1887d5..73564e3a4 100644
--- a/src/common/libs/ledger/transactions/genuine/NFTokenMint/NFTokenMint.info.ts
+++ b/src/common/libs/ledger/transactions/genuine/NFTokenMint/NFTokenMint.info.ts
@@ -1,12 +1,17 @@
-import Localize from '@locale';
+import moment from 'moment-timezone';
 
 import { AccountModel } from '@store/models';
 
+import { NormalizeCurrencyCode } from '@common/utils/monetary';
+
+import Localize from '@locale';
+
 import NFTokenMint from './NFTokenMint.class';
 
 /* Types ==================================================================== */
 import { MutationsMixinType } from '@common/libs/ledger/mixin/types';
-import { AssetDetails, AssetTypes, ExplainerAbstract } from '@common/libs/ledger/factory/types';
+import { AssetDetails, AssetTypes, ExplainerAbstract, MonetaryStatus } from '@common/libs/ledger/factory/types';
+import { OperationActions } from '@common/libs/ledger/parser/types';
 
 /* Descriptor ==================================================================== */
 class NFTokenMintInfo extends ExplainerAbstract<NFTokenMint, MutationsMixinType> {
@@ -29,23 +34,56 @@ class NFTokenMintInfo extends ExplainerAbstract<NFTokenMint, MutationsMixinType>
             content.push(Localize.t('events.theTokenTaxonForThisTokenIs', { taxon: this.item.NFTokenTaxon }));
         }
 
+        if (this.item.Amount) {
+            content.push(
+                Localize.t('events.nftOfferSellExplain', {
+                    address: this.item.Account,
+                    tokenID: this.item.NFTokenID,
+                    amount: this.item.Amount!.value,
+                    currency: NormalizeCurrencyCode(this.item.Amount!.currency),
+                }),
+            );
+        }
+
+        if (this.item.Destination) {
+            content.push(Localize.t('events.thisNftOfferMayOnlyBeAcceptedBy', { address: this.item.Destination }));
+        }
+
+        if (this.item.Expiration) {
+            content.push(
+                Localize.t('events.theOfferExpiresAtUnlessCanceledOrAccepted', {
+                    expiration: moment(this.item.Expiration).format('LLLL'),
+                }),
+            );
+        }
+
         return content.join('\n');
     };
 
     getParticipants = () => {
         return {
             start: { address: this.item.Account, tag: this.item.SourceTag },
-            end:
+            through:
                 this.item.Issuer && this.item.Issuer !== this.item.Account
                     ? { address: this.item.Issuer, tag: undefined }
                     : undefined,
+            end: { address: this.item.Destination, tag: undefined },
         };
     };
 
     getMonetaryDetails() {
         return {
             mutate: this.item.BalanceChange(this.account.address),
-            factor: undefined,
+            factor: this.item.Amount
+                ? [
+                      {
+                          currency: this.item.Amount!.currency,
+                          value: this.item.Amount!.value,
+                          effect: MonetaryStatus.POTENTIAL_EFFECT,
+                          action: OperationActions.INC,
+                      },
+                  ]
+                : [],
         };
     }
 
diff --git a/src/common/libs/ledger/transactions/genuine/Payment/Payment.class.ts b/src/common/libs/ledger/transactions/genuine/Payment/Payment.class.ts
index 8890b1bea..762b921d7 100644
--- a/src/common/libs/ledger/transactions/genuine/Payment/Payment.class.ts
+++ b/src/common/libs/ledger/transactions/genuine/Payment/Payment.class.ts
@@ -4,7 +4,7 @@ import { AmountParser } from '@common/libs/ledger/parser/common';
 
 import BaseGenuineTransaction from '@common/libs/ledger/transactions/genuine/base';
 
-import { AccountID, Amount, Hash256, PathSet, UInt32 } from '@common/libs/ledger/parser/fields';
+import { AccountID, Amount, Hash256, PathSet, STArray, UInt32 } from '@common/libs/ledger/parser/fields';
 
 /* Types ==================================================================== */
 import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
@@ -25,6 +25,7 @@ class Payment extends BaseGenuineTransaction {
         SendMax: { type: Amount },
         DeliverMin: { type: Amount },
         Paths: { type: PathSet },
+        CredentialIDs: { type: STArray },
     };
 
     declare Amount: FieldReturnType<typeof Amount>;
@@ -33,7 +34,8 @@ class Payment extends BaseGenuineTransaction {
     declare InvoiceID: FieldReturnType<typeof Hash256>;
     declare SendMax: FieldReturnType<typeof Amount>;
     declare DeliverMin: FieldReturnType<typeof Amount>;
-    declare Paths?: FieldReturnType<typeof PathSet>;
+    declare Paths: FieldReturnType<typeof PathSet>;
+    declare CredentialIDs: FieldReturnType<typeof STArray, string[]>;
 
     constructor(tx?: TransactionJson, meta?: TransactionMetadata) {
         super(tx, meta);
diff --git a/src/common/libs/ledger/transactions/genuine/Payment/Payment.info.ts b/src/common/libs/ledger/transactions/genuine/Payment/Payment.info.ts
index 9bd2d21b5..d952724b7 100644
--- a/src/common/libs/ledger/transactions/genuine/Payment/Payment.info.ts
+++ b/src/common/libs/ledger/transactions/genuine/Payment/Payment.info.ts
@@ -66,6 +66,14 @@ class PaymentInfo extends ExplainerAbstract<Payment, MutationsMixinType> {
             );
         }
 
+        if (typeof this.item.CredentialIDs !== 'undefined') {
+            content.push(
+                Localize.t('events.thePaymentIncludesCredentialIds', {
+                    credentialIDs: this.item.CredentialIDs.join(', '),
+                }),
+            );
+        }
+
         return content.join(' \n');
     }
 
diff --git a/src/common/libs/ledger/transactions/genuine/Payment/Payment.validation.ts b/src/common/libs/ledger/transactions/genuine/Payment/Payment.validation.ts
index 077bd33c3..acfbe5db4 100644
--- a/src/common/libs/ledger/transactions/genuine/Payment/Payment.validation.ts
+++ b/src/common/libs/ledger/transactions/genuine/Payment/Payment.validation.ts
@@ -73,7 +73,7 @@ const PaymentValidation: ValidationType<Payment> = (tx: Payment): Promise<void>
                         return;
                     }
                 } catch (e) {
-                    reject(Localize.t('account.unableGetAccountInfo'));
+                    reject(new Error(Localize.t('account.unableGetAccountInfo')));
                     return;
                 }
             }
diff --git a/src/common/libs/ledger/transactions/genuine/PaymentChannelClaim/PaymentChannelClaim.info.ts b/src/common/libs/ledger/transactions/genuine/PaymentChannelClaim/PaymentChannelClaim.info.ts
index 61678b269..f2f35bb36 100644
--- a/src/common/libs/ledger/transactions/genuine/PaymentChannelClaim/PaymentChannelClaim.info.ts
+++ b/src/common/libs/ledger/transactions/genuine/PaymentChannelClaim/PaymentChannelClaim.info.ts
@@ -51,8 +51,8 @@ class PaymentChannelClaimInfo extends ExplainerAbstract<PaymentChannelClaim, Mut
             mutate: this.item.BalanceChange(this.account.address),
             factor: [
                 {
-                    currency: (this.item.Amount ?? this.item.Balance)!.currency,
-                    value: (this.item.Amount ?? this.item.Balance)!.value,
+                    currency: (this.item.Amount ?? this.item.Balance)?.currency || '', // Claim can be zero
+                    value: (this.item.Amount ?? this.item.Balance)?.value || '0', // Claim can be zero
                     effect: MonetaryStatus.IMMEDIATE_EFFECT,
                 },
             ],
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/credentialAccept.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/credentialAccept.test.ts
new file mode 100644
index 000000000..b7b85dd66
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/credentialAccept.test.ts
@@ -0,0 +1,71 @@
+/* eslint-disable max-len */
+
+import Localize from '@locale';
+
+import { MutationsMixin } from '@common/libs/ledger/mixin';
+
+import { CredentialAccept, CredentialAcceptInfo } from '../CredentialAccept';
+import credentialCreateTemplate from './fixtures/CredentialAcceptTx.json';
+
+jest.mock('@services/NetworkService');
+
+describe('CredentialAccept tx', () => {
+    describe('Class', () => {
+        it('Should set tx type if not set', () => {
+            const instance = new CredentialAccept();
+            expect(instance.TransactionType).toBe('CredentialAccept');
+            expect(instance.Type).toBe('CredentialAccept');
+        });
+
+        it('Should return right parsed values', () => {
+            const { tx, meta }: any = credentialCreateTemplate;
+            const instance = new CredentialAccept(tx, meta);
+
+            expect(instance.Issuer).toBe('rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo');
+            expect(instance.CredentialType).toBe('4B5943');
+        });
+    });
+
+    describe('Info', () => {
+        const { tx, meta }: any = credentialCreateTemplate;
+        const Mixed = MutationsMixin(CredentialAccept);
+        const instance = new Mixed(tx, meta);
+        const info = new CredentialAcceptInfo(instance, {} as any);
+
+        describe('generateDescription()', () => {
+            it('should return the expected description', () => {
+                const expectedDescription = 'This is an CredentialAccept transaction';
+                expect(info.generateDescription()).toEqual(expectedDescription);
+            });
+        });
+
+        describe('getEventsLabel()', () => {
+            it('should return the expected label', () => {
+                expect(info.getEventsLabel()).toEqual(Localize.t('events.credentialAccept'));
+            });
+        });
+
+        describe('getParticipants()', () => {
+            it('should return the expected participants', () => {
+                expect(info.getParticipants()).toStrictEqual({
+                    start: { address: 'rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z', tag: undefined },
+                    end: { address: 'rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo', tag: undefined },
+                });
+            });
+        });
+
+        describe('getMonetaryDetails()', () => {
+            it('should return the expected monetary details', () => {
+                expect(info.getMonetaryDetails()).toStrictEqual({
+                    mutate: {
+                        DEC: [],
+                        INC: [],
+                    },
+                    factor: undefined,
+                });
+            });
+        });
+    });
+
+    describe('Validation', () => {});
+});
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/credentialCreate.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/credentialCreate.test.ts
new file mode 100644
index 000000000..b218801f5
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/credentialCreate.test.ts
@@ -0,0 +1,73 @@
+/* eslint-disable max-len */
+
+import Localize from '@locale';
+
+import { MutationsMixin } from '@common/libs/ledger/mixin';
+
+import { CredentialCreate, CredentialCreateInfo } from '../CredentialCreate';
+import credentialCreateTemplate from './fixtures/CredentialCreateTx.json';
+
+jest.mock('@services/NetworkService');
+
+describe('CredentialCreate tx', () => {
+    describe('Class', () => {
+        it('Should set tx type if not set', () => {
+            const instance = new CredentialCreate();
+            expect(instance.TransactionType).toBe('CredentialCreate');
+            expect(instance.Type).toBe('CredentialCreate');
+        });
+
+        it('Should return right parsed values', () => {
+            const { tx, meta }: any = credentialCreateTemplate;
+            const instance = new CredentialCreate(tx, meta);
+
+            expect(instance.Subject).toBe('rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z');
+            expect(instance.CredentialType).toBe('4B5943');
+            expect(instance.Expiration).toBe('2028-03-03T09:46:39.000Z');
+            expect(instance.URI).toBe('69736162656C2E636F6D2F63726564656E7469616C732F6B79632F616C696365');
+        });
+    });
+
+    describe('Info', () => {
+        const { tx, meta }: any = credentialCreateTemplate;
+        const Mixed = MutationsMixin(CredentialCreate);
+        const instance = new Mixed(tx, meta);
+        const info = new CredentialCreateInfo(instance, {} as any);
+
+        describe('generateDescription()', () => {
+            it('should return the expected description', () => {
+                const expectedDescription = 'This is an CredentialCreate transaction';
+                expect(info.generateDescription()).toEqual(expectedDescription);
+            });
+        });
+
+        describe('getEventsLabel()', () => {
+            it('should return the expected label', () => {
+                expect(info.getEventsLabel()).toEqual(Localize.t('events.credentialCreate'));
+            });
+        });
+
+        describe('getParticipants()', () => {
+            it('should return the expected participants', () => {
+                expect(info.getParticipants()).toStrictEqual({
+                    start: { address: 'rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo', tag: undefined },
+                    end: { address: 'rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z', tag: undefined },
+                });
+            });
+        });
+
+        describe('getMonetaryDetails()', () => {
+            it('should return the expected monetary details', () => {
+                expect(info.getMonetaryDetails()).toStrictEqual({
+                    mutate: {
+                        DEC: [],
+                        INC: [],
+                    },
+                    factor: undefined,
+                });
+            });
+        });
+    });
+
+    describe('Validation', () => {});
+});
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/credentialDelete.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/credentialDelete.test.ts
new file mode 100644
index 000000000..bb9c18b2b
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/credentialDelete.test.ts
@@ -0,0 +1,71 @@
+/* eslint-disable max-len */
+
+import Localize from '@locale';
+
+import { MutationsMixin } from '@common/libs/ledger/mixin';
+
+import { CredentialDelete, CredentialDeleteInfo } from '../CredentialDelete';
+import credentialCreateTemplate from './fixtures/CredentialDeleteTx.json';
+
+jest.mock('@services/NetworkService');
+
+describe('CredentialDelete tx', () => {
+    describe('Class', () => {
+        it('Should set tx type if not set', () => {
+            const instance = new CredentialDelete();
+            expect(instance.TransactionType).toBe('CredentialDelete');
+            expect(instance.Type).toBe('CredentialDelete');
+        });
+
+        it('Should return right parsed values', () => {
+            const { tx, meta }: any = credentialCreateTemplate;
+            const instance = new CredentialDelete(tx, meta);
+
+            expect(instance.Issuer).toBe('rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo');
+            expect(instance.CredentialType).toBe('4B5943');
+        });
+    });
+
+    describe('Info', () => {
+        const { tx, meta }: any = credentialCreateTemplate;
+        const Mixed = MutationsMixin(CredentialDelete);
+        const instance = new Mixed(tx, meta);
+        const info = new CredentialDeleteInfo(instance, {} as any);
+
+        describe('generateDescription()', () => {
+            it('should return the expected description', () => {
+                const expectedDescription = 'This is an CredentialDelete transaction';
+                expect(info.generateDescription()).toEqual(expectedDescription);
+            });
+        });
+
+        describe('getEventsLabel()', () => {
+            it('should return the expected label', () => {
+                expect(info.getEventsLabel()).toEqual(Localize.t('events.credentialDelete'));
+            });
+        });
+
+        describe('getParticipants()', () => {
+            it('should return the expected participants', () => {
+                expect(info.getParticipants()).toStrictEqual({
+                    start: { address: 'rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z', tag: undefined },
+                    end: { address: 'rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo', tag: undefined },
+                });
+            });
+        });
+
+        describe('getMonetaryDetails()', () => {
+            it('should return the expected monetary details', () => {
+                expect(info.getMonetaryDetails()).toStrictEqual({
+                    mutate: {
+                        DEC: [],
+                        INC: [],
+                    },
+                    factor: undefined,
+                });
+            });
+        });
+    });
+
+    describe('Validation', () => {});
+});
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/depositPreauth.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/depositPreauth.test.ts
index 740b7f273..90c5af6d8 100644
--- a/src/common/libs/ledger/transactions/genuine/__tests__/depositPreauth.test.ts
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/depositPreauth.test.ts
@@ -22,26 +22,45 @@ describe('DepositPreauth', () => {
 
             expect(instance.Authorize).toBe('rrrrrrrrrrrrrrrrrrrrbzbvji');
             expect(instance.Unauthorize).toBe('rrrrrrrrrrrrrrrrrrrrbzbvji');
+            expect(instance.AuthorizeCredentials).toMatchObject([
+                {
+                    Issuer: 'rrrrrrrrrrrrrrrrrrrrbzbvji',
+                    CredentialType: '4B5943',
+                },
+            ]);
+            expect(instance.UnauthorizeCredentials).toMatchObject([
+                {
+                    Issuer: 'rrrrrrrrrrrrrrrrrrrrbzbvji',
+                    CredentialType: '4B5943',
+                },
+            ]);
         });
     });
 
     describe('Info', () => {
         const { tx, meta }: any = depositPreauthTemplate;
         const MixedDepositPreauth = MutationsMixin(DepositPreauth);
-        const instanceAuthorize = new MixedDepositPreauth({ ...tx, ...{ Unauthorize: undefined } }, meta);
-        const instanceUnauthorize = new MixedDepositPreauth({ ...tx, ...{ Authorize: undefined } }, meta);
+        const instanceAuthorize = new MixedDepositPreauth(
+            { ...tx, ...{ Unauthorize: undefined, UnauthorizeCredentials: undefined } },
+            meta,
+        );
+        const instanceUnauthorize = new MixedDepositPreauth(
+            { ...tx, ...{ Authorize: undefined, AuthorizeCredentials: undefined } },
+            meta,
+        );
 
         describe('generateDescription()', () => {
             it('should return the expected description Authorize', () => {
                 const info = new DepositPreauthInfo(instanceAuthorize, {} as any);
-                const expectedDescription = 'It authorizes rrrrrrrrrrrrrrrrrrrrbzbvji to send payments to this account';
+                const expectedDescription =
+                    'It authorizes rrrrrrrrrrrrrrrrrrrrbzbvji to send payments to this account\nIt authorizes credential(s)\nrrrrrrrrrrrrrrrrrrrrbzbvji:4B5943';
                 expect(info.generateDescription()).toEqual(expectedDescription);
             });
 
             it('should return the expected description for Unauthorize', () => {
                 const info = new DepositPreauthInfo(instanceUnauthorize, {} as any);
                 const expectedDescription =
-                    'It removes the authorization for rrrrrrrrrrrrrrrrrrrrbzbvji to send payments to this account';
+                    'It removes the authorization for rrrrrrrrrrrrrrrrrrrrbzbvji to send payments to this account\nIt un-authorizes credential(s)\nrrrrrrrrrrrrrrrrrrrrbzbvji:4B5943';
                 expect(info.generateDescription()).toEqual(expectedDescription);
             });
         });
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/CredentialAcceptTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/CredentialAcceptTx.json
new file mode 100644
index 000000000..e4aa6232f
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/CredentialAcceptTx.json
@@ -0,0 +1,86 @@
+{
+  "tx": {
+    "Account": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+    "CredentialType": "4B5943",
+    "Fee": "100",
+    "Issuer": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+    "LastLedgerSequence": 7529577,
+    "Sequence": 7525982,
+    "SigningPubKey": "034A134A6E203657C9C883D535022D52B9E2E1915C4126394BF5A5C5F59FB45D11",
+    "TransactionType": "CredentialAccept",
+    "TxnSignature": "304502210097D5098D514EEB4E445156FC75CB4ABC12C9C97B1811984A421D71497DED59B40220019EB7039567A3E1168910179CECF81396BDC16C96E9EA340C6122370C38B2C5",
+    "ctid": "C072E45700000002",
+    "date": 790176961,
+    "hash": "818F507D5EF42CA018B7F9CE4A3CA712E95BDE600C9AFF40ECDB150EE29557D6",
+    "inLedger": 7529559,
+    "ledger_index": 7529559
+  },
+  "meta": {
+    "AffectedNodes": [
+      {
+        "ModifiedNode": {
+          "FinalFields": {
+            "Account": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "Balance": "899998744",
+            "FirstNFTokenSequence": 5232088,
+            "Flags": 0,
+            "MintedNFTokens": 2,
+            "OwnerCount": 3,
+            "Sequence": 5232093
+          },
+          "LedgerEntryType": "AccountRoot",
+          "LedgerIndex": "002A224276124D75B9E3D3AFC854CA1869363856C7E8946CC728D258FADF8304",
+          "PreviousFields": {
+            "OwnerCount": 4
+          },
+          "PreviousTxnID": "82E704BBEBCABDA34EC3CFB4BFE9E3394FB92610C66335D8DA94F8EA24A4E81D",
+          "PreviousTxnLgrSeq": 7529521
+        }
+      },
+      {
+        "ModifiedNode": {
+          "FinalFields": {
+            "Account": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+            "Balance": "99999900",
+            "Flags": 0,
+            "OwnerCount": 1,
+            "Sequence": 7525983
+          },
+          "LedgerEntryType": "AccountRoot",
+          "LedgerIndex": "277709AA554196B8665EE39014C58B6EB19FD24E7B8D42676F3BA87A1EE2E6EF",
+          "PreviousFields": {
+            "Balance": "100000000",
+            "OwnerCount": 0,
+            "Sequence": 7525982
+          },
+          "PreviousTxnID": "315284CA72A60565B0E923DEDD59BF7B774ADAD42E314AC1866F18814E39BD46",
+          "PreviousTxnLgrSeq": 7525998
+        }
+      },
+      {
+        "ModifiedNode": {
+          "FinalFields": {
+            "CredentialType": "4B5943",
+            "Expiration": 889004799,
+            "Flags": 65536,
+            "Issuer": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "IssuerNode": "0",
+            "Subject": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+            "SubjectNode": "0",
+            "URI": "69736162656C2E636F6D2F63726564656E7469616C732F6B79632F616C696365"
+          },
+          "LedgerEntryType": "Credential",
+          "LedgerIndex": "871CF11404B81BB7BAA6731A3425686D98D0DCC1C93EDC49329058CB8AB683AC",
+          "PreviousFields": {
+            "Flags": 0
+          },
+          "PreviousTxnID": "63217CDD218F8DEA58BCD028991F8B2EF619BDD21E7C970396950D7F5C028093",
+          "PreviousTxnLgrSeq": 7527455
+        }
+      }
+    ],
+    "TransactionIndex": 0,
+    "TransactionResult": "tesSUCCESS"
+  },
+  "validated": true
+}
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/CredentialCreateTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/CredentialCreateTx.json
new file mode 100644
index 000000000..5fc05a3ed
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/CredentialCreateTx.json
@@ -0,0 +1,85 @@
+{
+  "tx": {
+    "Account": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+    "CredentialType": "4B5943",
+    "Expiration": 889004799,
+    "Fee": "100",
+    "LastLedgerSequence": 7527473,
+    "Sequence": 5232091,
+    "SigningPubKey": "0343D41B6AF3055918AE9D10379B770C1CCD27BD9354A1FED5CC95821151B27591",
+    "Subject": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+    "TransactionType": "CredentialCreate",
+    "TxnSignature": "3044022025AF5BFF38E9426FAE402CFC9FCF0C558CC79E349D5CA76A44E4F450A2AF270602203D01068FD2AAA7339B7F66BC870A30D8F529819B3790D7497A02C9394D41881F",
+    "URI": "69736162656C2E636F6D2F63726564656E7469616C732F6B79632F616C696365",
+    "ctid": "C072DC1F00000002",
+    "date": 790170611,
+    "hash": "63217CDD218F8DEA58BCD028991F8B2EF619BDD21E7C970396950D7F5C028093",
+    "inLedger": 7527455,
+    "ledger_index": 7527455
+  },
+  "meta": {
+    "AffectedNodes": [
+      {
+        "ModifiedNode": {
+          "FinalFields": {
+            "Account": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "Balance": "899998844",
+            "FirstNFTokenSequence": 5232088,
+            "Flags": 0,
+            "MintedNFTokens": 2,
+            "OwnerCount": 4,
+            "Sequence": 5232092
+          },
+          "LedgerEntryType": "AccountRoot",
+          "LedgerIndex": "002A224276124D75B9E3D3AFC854CA1869363856C7E8946CC728D258FADF8304",
+          "PreviousFields": {
+            "Balance": "899998944",
+            "OwnerCount": 3,
+            "Sequence": 5232091
+          },
+          "PreviousTxnID": "A5352ADC5028C777EDB431F06A3A56CAD84D6B990239F18734D5AA4FB2522DB6",
+          "PreviousTxnLgrSeq": 7527448
+        }
+      },
+      {
+        "ModifiedNode": {
+          "FinalFields": {
+            "Flags": 0,
+            "Owner": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "RootIndex": "1990E625F19AC67A39FB6E824586A2EB362FD770974EB8663CDB33A5388DCF95"
+          },
+          "LedgerEntryType": "DirectoryNode",
+          "LedgerIndex": "1990E625F19AC67A39FB6E824586A2EB362FD770974EB8663CDB33A5388DCF95",
+          "PreviousTxnID": "315284CA72A60565B0E923DEDD59BF7B774ADAD42E314AC1866F18814E39BD46",
+          "PreviousTxnLgrSeq": 7525998
+        }
+      },
+      {
+        "CreatedNode": {
+          "LedgerEntryType": "Credential",
+          "LedgerIndex": "871CF11404B81BB7BAA6731A3425686D98D0DCC1C93EDC49329058CB8AB683AC",
+          "NewFields": {
+            "CredentialType": "4B5943",
+            "Expiration": 889004799,
+            "Issuer": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "Subject": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+            "URI": "69736162656C2E636F6D2F63726564656E7469616C732F6B79632F616C696365"
+          }
+        }
+      },
+      {
+        "CreatedNode": {
+          "LedgerEntryType": "DirectoryNode",
+          "LedgerIndex": "B6CFF468EB36465340F7EBAF8CF149005EE46BAEEFECF8D1E56D19EB0261576C",
+          "NewFields": {
+            "Owner": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+            "RootIndex": "B6CFF468EB36465340F7EBAF8CF149005EE46BAEEFECF8D1E56D19EB0261576C"
+          }
+        }
+      }
+    ],
+    "TransactionIndex": 0,
+    "TransactionResult": "tesSUCCESS"
+  },
+  "validated": true
+}
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/CredentialDeleteTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/CredentialDeleteTx.json
new file mode 100644
index 000000000..00cb673c1
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/CredentialDeleteTx.json
@@ -0,0 +1,89 @@
+{
+  "tx": {
+    "Account": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+    "CredentialType": "4B5943",
+    "Fee": "100",
+    "Issuer": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+    "LastLedgerSequence": 7529675,
+    "Sequence": 7525984,
+    "SigningPubKey": "034A134A6E203657C9C883D535022D52B9E2E1915C4126394BF5A5C5F59FB45D11",
+    "TransactionType": "CredentialDelete",
+    "TxnSignature": "30450221008FA3A696D4CA32120303A00F61EBDB84304D60E1612A854B6696190300F81899022036C25E8EC40782BB947407819A82FC0E9DEADC81F4C5AAAC3A67054BE14B75A7",
+    "ctid": "C072E4B900000002",
+    "date": 790177252,
+    "hash": "5E2188DBDCEAB924B132761B5409BFD4AACB98473ECD17B76575D7239F88F096",
+    "inLedger": 7529657,
+    "ledger_index": 7529657
+  },
+  "meta": {
+    "AffectedNodes": [
+      {
+        "ModifiedNode": {
+          "FinalFields": {
+            "Flags": 0,
+            "Owner": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "RootIndex": "1990E625F19AC67A39FB6E824586A2EB362FD770974EB8663CDB33A5388DCF95"
+          },
+          "LedgerEntryType": "DirectoryNode",
+          "LedgerIndex": "1990E625F19AC67A39FB6E824586A2EB362FD770974EB8663CDB33A5388DCF95",
+          "PreviousTxnID": "63217CDD218F8DEA58BCD028991F8B2EF619BDD21E7C970396950D7F5C028093",
+          "PreviousTxnLgrSeq": 7527455
+        }
+      },
+      {
+        "ModifiedNode": {
+          "FinalFields": {
+            "Account": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+            "Balance": "99999700",
+            "Flags": 0,
+            "OwnerCount": 0,
+            "Sequence": 7525985
+          },
+          "LedgerEntryType": "AccountRoot",
+          "LedgerIndex": "277709AA554196B8665EE39014C58B6EB19FD24E7B8D42676F3BA87A1EE2E6EF",
+          "PreviousFields": {
+            "Balance": "99999800",
+            "OwnerCount": 1,
+            "Sequence": 7525984
+          },
+          "PreviousTxnID": "EAE6E364332906C88B8206F19CA333288D48B906085A5DBE8A2F29270A5600D2",
+          "PreviousTxnLgrSeq": 7529643
+        }
+      },
+      {
+        "DeletedNode": {
+          "FinalFields": {
+            "CredentialType": "4B5943",
+            "Expiration": 889004799,
+            "Flags": 65536,
+            "Issuer": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "IssuerNode": "0",
+            "PreviousTxnID": "818F507D5EF42CA018B7F9CE4A3CA712E95BDE600C9AFF40ECDB150EE29557D6",
+            "PreviousTxnLgrSeq": 7529559,
+            "Subject": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+            "SubjectNode": "0",
+            "URI": "69736162656C2E636F6D2F63726564656E7469616C732F6B79632F616C696365"
+          },
+          "LedgerEntryType": "Credential",
+          "LedgerIndex": "871CF11404B81BB7BAA6731A3425686D98D0DCC1C93EDC49329058CB8AB683AC"
+        }
+      },
+      {
+        "DeletedNode": {
+          "FinalFields": {
+            "Flags": 0,
+            "Owner": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3Z",
+            "PreviousTxnID": "63217CDD218F8DEA58BCD028991F8B2EF619BDD21E7C970396950D7F5C028093",
+            "PreviousTxnLgrSeq": 7527455,
+            "RootIndex": "B6CFF468EB36465340F7EBAF8CF149005EE46BAEEFECF8D1E56D19EB0261576C"
+          },
+          "LedgerEntryType": "DirectoryNode",
+          "LedgerIndex": "B6CFF468EB36465340F7EBAF8CF149005EE46BAEEFECF8D1E56D19EB0261576C"
+        }
+      }
+    ],
+    "TransactionIndex": 0,
+    "TransactionResult": "tesSUCCESS"
+  },
+  "validated": true
+}
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/DepositPreauthTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/DepositPreauthTx.json
index 56f3b154f..33d7497d1 100644
--- a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/DepositPreauthTx.json
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/DepositPreauthTx.json
@@ -4,6 +4,22 @@
     "Account": "rrrrrrrrrrrrrrrrrrrrrholvtp",
     "Authorize": "rrrrrrrrrrrrrrrrrrrrbzbvji",
     "Unauthorize": "rrrrrrrrrrrrrrrrrrrrbzbvji",
+    "AuthorizeCredentials": [
+      {
+        "Credential": {
+          "Issuer": "rrrrrrrrrrrrrrrrrrrrbzbvji",
+          "CredentialType": "4B5943"
+        }
+      }
+    ],
+    "UnauthorizeCredentials": [
+      {
+        "Credential": {
+          "Issuer": "rrrrrrrrrrrrrrrrrrrrbzbvji",
+          "CredentialType": "4B5943"
+        }
+      }
+    ],
     "Fee": "10",
     "Flags": 2147483648,
     "Sequence": 2
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenAuthorizeTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenAuthorizeTx.json
new file mode 100644
index 000000000..d9f44cdd1
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenAuthorizeTx.json
@@ -0,0 +1,11 @@
+{
+  "tx": {
+    "Account": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+    "TransactionType": "MPTokenAuthorize",
+    "MPTokenIssuanceID": "004FD5D21BFB1ECDCD89560CBB2BB21F94559F32820FAD04",
+    "Holder": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+    "Flags": 1
+  },
+  "meta": {}
+
+}
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenIssuanceCreateTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenIssuanceCreateTx.json
new file mode 100644
index 000000000..e9e2304c8
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenIssuanceCreateTx.json
@@ -0,0 +1,77 @@
+{
+  "tx": {
+  "Account": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+  "AssetScale": 2,
+  "Fee": "100",
+  "Flags": 32,
+  "LastLedgerSequence": 7505669,
+  "MPTokenMetadata": "714F206C865D334721B2F3388BEAF33AA91BC1D78C71941D10A2A653C873EDD3",
+  "MaximumAmount": "1342177280",
+  "Sequence": 5232082,
+  "SigningPubKey": "0343D41B6AF3055918AE9D10379B770C1CCD27BD9354A1FED5CC95821151B27591",
+  "TransactionType": "MPTokenIssuanceCreate",
+  "TransferFee": 314,
+  "TxnSignature": "3045022100AE77437036C3EC6F08C43AE7E9A06138C9188163633B48B4F818EDC64B3E4EFB022066B539A8B10F42E4BB07F2837E9909AF83230CB4745646E0A278BC28F5E88964",
+  "hash": "8C8AB0195654F30C7FC9BF1ECD80A65B45AD7CCAE7183B8C6ED7CFB27694D080",
+  "ctid": "C07286F300000002"
+  },
+  "meta": {
+    "AffectedNodes": [
+      {
+        "ModifiedNode": {
+          "FinalFields": {
+            "Account": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "Balance": "999999744",
+            "Flags": 0,
+            "OwnerCount": 1,
+            "Sequence": 5232083
+          },
+          "LedgerEntryType": "AccountRoot",
+          "LedgerIndex": "002A224276124D75B9E3D3AFC854CA1869363856C7E8946CC728D258FADF8304",
+          "PreviousFields": {
+            "Balance": "999999844",
+            "OwnerCount": 0,
+            "Sequence": 5232082
+          },
+          "PreviousTxnID": "A2445C5743A1823E146005F4736651245C6FFFC035C407B7979891E2E612DC17",
+          "PreviousTxnLgrSeq": 5253296
+        }
+      },
+      {
+        "ModifiedNode": {
+          "FinalFields": {
+            "Flags": 0,
+            "Owner": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "RootIndex": "1990E625F19AC67A39FB6E824586A2EB362FD770974EB8663CDB33A5388DCF95"
+          },
+          "LedgerEntryType": "DirectoryNode",
+          "LedgerIndex": "1990E625F19AC67A39FB6E824586A2EB362FD770974EB8663CDB33A5388DCF95",
+          "PreviousTxnID": "A2445C5743A1823E146005F4736651245C6FFFC035C407B7979891E2E612DC17",
+          "PreviousTxnLgrSeq": 5253296
+        }
+      },
+      {
+        "CreatedNode": {
+          "LedgerEntryType": "MPTokenIssuance",
+          "LedgerIndex": "28949484D4B26476A9920BDBB209B5290A0F1691C526DC3A934A3D6ECCEC18A5",
+          "NewFields": {
+            "AssetScale": 2,
+            "Flags": 32,
+            "Issuer": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+            "MPTokenMetadata": "714F206C865D334721B2F3388BEAF33AA91BC1D78C71941D10A2A653C873EDD3",
+            "MaximumAmount": "1342177280",
+            "Sequence": 5232082,
+            "TransferFee": 314
+          }
+        }
+      }
+    ],
+    "TransactionIndex": 0,
+    "TransactionResult": "tesSUCCESS",
+    "mpt_issuance_id": "004FD5D21BFB1ECDCD89560CBB2BB21F94559F32820FAD04"
+  },
+  "validated": true,
+  "date": 790099732,
+  "ledger_index": 7505651,
+  "inLedger": 7505651
+}
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenIssuanceDestroyTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenIssuanceDestroyTx.json
new file mode 100644
index 000000000..c235ac724
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenIssuanceDestroyTx.json
@@ -0,0 +1,10 @@
+{
+  "tx": {
+    "Account": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+    "TransactionType": "MPTokenIssuanceDestroy",
+    "MPTokenIssuanceID": "004FD5D21BFB1ECDCD89560CBB2BB21F94559F32820FAD04",
+    "Flags": 1
+  },
+  "meta": {}
+
+}
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenIssuanceSetTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenIssuanceSetTx.json
new file mode 100644
index 000000000..eca91241c
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/MPTokenIssuanceSetTx.json
@@ -0,0 +1,11 @@
+{
+  "tx": {
+    "Account": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+    "TransactionType": "MPTokenIssuanceSet",
+    "MPTokenIssuanceID": "004FD5D21BFB1ECDCD89560CBB2BB21F94559F32820FAD04",
+    "Holder": "rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo",
+    "Flags": 1
+  },
+  "meta": {}
+
+}
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/NFTokenMintTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/NFTokenMintTx.json
index caeb5c9bc..011f3c0cc 100644
--- a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/NFTokenMintTx.json
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/NFTokenMintTx.json
@@ -13,6 +13,9 @@
         }
       }
     ],
+    "Amount": "1000000",
+    "Destination": "rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3",
+    "Expiration": 970113521,
     "NFTokenTaxon": 48,
     "Sequence": 72576766,
     "SigningPubKey": "ED8BB649713ED492AE35B4B5CA745CCA55ADF8EF4CEDB2CC8BA4E28557E993AD2F",
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/PaymentTx.json b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/PaymentTx.json
index e32d3594b..9f5eee28b 100644
--- a/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/PaymentTx.json
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/fixtures/PaymentTx.json
@@ -31,6 +31,7 @@
       "SigningPubKey": "03DF3AB842EB1B57F0A848CD7CC2CFD35F66E4AD0625EEACFFE72A45E4D13E49A",
       "SourceTag": 456,
       "TransactionType": "Payment",
+      "CredentialIDs": ["DD40031C6C21164E767317D467CEEE9"],
       "TxnSignature": "304402204ED27C2D29F609772B0E67ACCFC8C205422A85D54C065437179032419"
     },
     "meta": {
@@ -116,6 +117,7 @@
         "issuer": "rwietsevLFg8XSmG3bEZzFein1g8RBqWDZ",
         "value": "1.239054364262807"
       },
+      "CredentialIDs": ["DD40031C6C21164E767317D467CEEE9", "5319AEF0C6A19872E7BC983545FEE123"],
       "Sequence": 989,
       "SigningPubKey": "0350714189757DA0403CE1FF2025522337EA1B60D9796B11D5559EE914982D6AC3",
       "TransactionType": "Payment",
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenAuthorize.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenAuthorize.test.ts
new file mode 100644
index 000000000..3802d17e7
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenAuthorize.test.ts
@@ -0,0 +1,70 @@
+/* eslint-disable max-len */
+
+import Localize from '@locale';
+
+import { MutationsMixin } from '@common/libs/ledger/mixin';
+
+import { MPTokenAuthorize, MPTokenAuthorizeInfo } from '../MPTokenAuthorize';
+import MPTokenAuthorizeTemplate from './fixtures/MPTokenAuthorizeTx.json';
+
+jest.mock('@services/NetworkService');
+
+describe('MPTokenAuthorize tx', () => {
+    describe('Class', () => {
+        it('Should set tx type if not set', () => {
+            const instance = new MPTokenAuthorize();
+            expect(instance.TransactionType).toBe('MPTokenAuthorize');
+            expect(instance.Type).toBe('MPTokenAuthorize');
+        });
+
+        it('Should return right parsed values', () => {
+            const { tx, meta }: any = MPTokenAuthorizeTemplate;
+            const instance = new MPTokenAuthorize(tx, meta);
+
+            expect(instance.MPTokenIssuanceID).toBe('004FD5D21BFB1ECDCD89560CBB2BB21F94559F32820FAD04');
+            expect(instance.Holder).toBe('rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo');
+        });
+    });
+
+    describe('Info', () => {
+        const { tx, meta }: any = MPTokenAuthorizeTemplate;
+        const MixedMPTokenAuthorize = MutationsMixin(MPTokenAuthorize);
+        const instance = new MixedMPTokenAuthorize(tx, meta);
+        const info = new MPTokenAuthorizeInfo(instance, {} as any);
+
+        describe('generateDescription()', () => {
+            it('should return the expected description', () => {
+                const expectedDescription = 'This is an MPTokenAuthorize transaction';
+                expect(info.generateDescription()).toEqual(expectedDescription);
+            });
+        });
+
+        describe('getEventsLabel()', () => {
+            it('should return the expected label', () => {
+                expect(info.getEventsLabel()).toEqual(Localize.t('events.mpTokenAuthorize'));
+            });
+        });
+
+        describe('getParticipants()', () => {
+            it('should return the expected participants', () => {
+                expect(info.getParticipants()).toStrictEqual({
+                    start: { address: 'rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo', tag: undefined },
+                });
+            });
+        });
+
+        describe('getMonetaryDetails()', () => {
+            it('should return the expected monetary details', () => {
+                expect(info.getMonetaryDetails()).toStrictEqual({
+                    mutate: {
+                        DEC: [],
+                        INC: [],
+                    },
+                    factor: undefined,
+                });
+            });
+        });
+    });
+
+    describe('Validation', () => {});
+});
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenIssuanceCreate.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenIssuanceCreate.test.ts
new file mode 100644
index 000000000..35b77fcaf
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenIssuanceCreate.test.ts
@@ -0,0 +1,73 @@
+/* eslint-disable max-len */
+
+import Localize from '@locale';
+
+import { MutationsMixin } from '@common/libs/ledger/mixin';
+
+import { MPTokenIssuanceCreate, MPTokenIssuanceCreateInfo } from '../MPTokenIssuanceCreate';
+import mpTokenIssuanceCreateTemplate from './fixtures/MPTokenIssuanceCreateTx.json';
+
+jest.mock('@services/NetworkService');
+
+describe('MPTokenIssuanceCreate tx', () => {
+    describe('Class', () => {
+        it('Should set tx type if not set', () => {
+            const instance = new MPTokenIssuanceCreate();
+            expect(instance.TransactionType).toBe('MPTokenIssuanceCreate');
+            expect(instance.Type).toBe('MPTokenIssuanceCreate');
+        });
+
+        it('Should return right parsed values', () => {
+            const { tx, meta }: any = mpTokenIssuanceCreateTemplate;
+            const instance = new MPTokenIssuanceCreate(tx, meta);
+
+            expect(instance.MPTokenMetadata).toBe('714F206C865D334721B2F3388BEAF33AA91BC1D78C71941D10A2A653C873EDD3');
+            expect(instance.MaximumAmount).toBe('1342177280');
+            expect(instance.TransferFee).toBe(0.314);
+            expect(instance.AssetScale).toBe(2);
+            expect(instance.MPTokenIssuanceID).toBe('004FD5D21BFB1ECDCD89560CBB2BB21F94559F32820FAD04');
+        });
+    });
+
+    describe('Info', () => {
+        const { tx, meta }: any = mpTokenIssuanceCreateTemplate;
+        const MixedMPTokenIssuanceCreate = MutationsMixin(MPTokenIssuanceCreate);
+        const instance = new MixedMPTokenIssuanceCreate(tx, meta);
+        const info = new MPTokenIssuanceCreateInfo(instance, {} as any);
+
+        describe('generateDescription()', () => {
+            it('should return the expected description', () => {
+                const expectedDescription = 'This is an MPTokenIssuanceCreate transaction';
+                expect(info.generateDescription()).toEqual(expectedDescription);
+            });
+        });
+
+        describe('getEventsLabel()', () => {
+            it('should return the expected label', () => {
+                expect(info.getEventsLabel()).toEqual(Localize.t('events.mpTokenIssuanceCreate'));
+            });
+        });
+
+        describe('getParticipants()', () => {
+            it('should return the expected participants', () => {
+                expect(info.getParticipants()).toStrictEqual({
+                    start: { address: 'rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo', tag: undefined },
+                });
+            });
+        });
+
+        describe('getMonetaryDetails()', () => {
+            it('should return the expected monetary details', () => {
+                expect(info.getMonetaryDetails()).toStrictEqual({
+                    mutate: {
+                        DEC: [],
+                        INC: [],
+                    },
+                    factor: undefined,
+                });
+            });
+        });
+    });
+
+    describe('Validation', () => {});
+});
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenIssuanceDestroy.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenIssuanceDestroy.test.ts
new file mode 100644
index 000000000..a3896aac5
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenIssuanceDestroy.test.ts
@@ -0,0 +1,69 @@
+/* eslint-disable max-len */
+
+import Localize from '@locale';
+
+import { MutationsMixin } from '@common/libs/ledger/mixin';
+
+import { MPTokenIssuanceDestroy, MPTokenIssuanceDestroyInfo } from '../MPTokenIssuanceDestroy';
+import MPTokenIssuanceDestroyTemplate from './fixtures/MPTokenIssuanceDestroyTx.json';
+
+jest.mock('@services/NetworkService');
+
+describe('MPTokenIssuanceDestroy tx', () => {
+    describe('Class', () => {
+        it('Should set tx type if not set', () => {
+            const instance = new MPTokenIssuanceDestroy();
+            expect(instance.TransactionType).toBe('MPTokenIssuanceDestroy');
+            expect(instance.Type).toBe('MPTokenIssuanceDestroy');
+        });
+
+        it('Should return right parsed values', () => {
+            const { tx, meta }: any = MPTokenIssuanceDestroyTemplate;
+            const instance = new MPTokenIssuanceDestroy(tx, meta);
+
+            expect(instance.MPTokenIssuanceID).toBe('004FD5D21BFB1ECDCD89560CBB2BB21F94559F32820FAD04');
+        });
+    });
+
+    describe('Info', () => {
+        const { tx, meta }: any = MPTokenIssuanceDestroyTemplate;
+        const MixedMPTokenIssuanceDestroy = MutationsMixin(MPTokenIssuanceDestroy);
+        const instance = new MixedMPTokenIssuanceDestroy(tx, meta);
+        const info = new MPTokenIssuanceDestroyInfo(instance, {} as any);
+
+        describe('generateDescription()', () => {
+            it('should return the expected description', () => {
+                const expectedDescription = 'This is an MPTokenIssuanceDestroy transaction';
+                expect(info.generateDescription()).toEqual(expectedDescription);
+            });
+        });
+
+        describe('getEventsLabel()', () => {
+            it('should return the expected label', () => {
+                expect(info.getEventsLabel()).toEqual(Localize.t('events.mpTokenIssuanceDestroy'));
+            });
+        });
+
+        describe('getParticipants()', () => {
+            it('should return the expected participants', () => {
+                expect(info.getParticipants()).toStrictEqual({
+                    start: { address: 'rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo', tag: undefined },
+                });
+            });
+        });
+
+        describe('getMonetaryDetails()', () => {
+            it('should return the expected monetary details', () => {
+                expect(info.getMonetaryDetails()).toStrictEqual({
+                    mutate: {
+                        DEC: [],
+                        INC: [],
+                    },
+                    factor: undefined,
+                });
+            });
+        });
+    });
+
+    describe('Validation', () => {});
+});
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenIssuanceSet.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenIssuanceSet.test.ts
new file mode 100644
index 000000000..406c97f42
--- /dev/null
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/mpTokenIssuanceSet.test.ts
@@ -0,0 +1,70 @@
+/* eslint-disable max-len */
+
+import Localize from '@locale';
+
+import { MutationsMixin } from '@common/libs/ledger/mixin';
+
+import { MPTokenIssuanceSet, MPTokenIssuanceSetInfo } from '../MPTokenIssuanceSet';
+import mpTokenIssuanceSetTemplate from './fixtures/MPTokenIssuanceSetTx.json';
+
+jest.mock('@services/NetworkService');
+
+describe('MPTokenIssuanceSet tx', () => {
+    describe('Class', () => {
+        it('Should set tx type if not set', () => {
+            const instance = new MPTokenIssuanceSet();
+            expect(instance.TransactionType).toBe('MPTokenIssuanceSet');
+            expect(instance.Type).toBe('MPTokenIssuanceSet');
+        });
+
+        it('Should return right parsed values', () => {
+            const { tx, meta }: any = mpTokenIssuanceSetTemplate;
+            const instance = new MPTokenIssuanceSet(tx, meta);
+
+            expect(instance.MPTokenIssuanceID).toBe('004FD5D21BFB1ECDCD89560CBB2BB21F94559F32820FAD04');
+            expect(instance.Holder).toBe('rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo');
+        });
+    });
+
+    describe('Info', () => {
+        const { tx, meta }: any = mpTokenIssuanceSetTemplate;
+        const MixedMPTokenIssuanceSet = MutationsMixin(MPTokenIssuanceSet);
+        const instance = new MixedMPTokenIssuanceSet(tx, meta);
+        const info = new MPTokenIssuanceSetInfo(instance, {} as any);
+
+        describe('generateDescription()', () => {
+            it('should return the expected description', () => {
+                const expectedDescription = 'This is an MPTokenIssuanceSet transaction';
+                expect(info.generateDescription()).toEqual(expectedDescription);
+            });
+        });
+
+        describe('getEventsLabel()', () => {
+            it('should return the expected label', () => {
+                expect(info.getEventsLabel()).toEqual(Localize.t('events.mpTokenIssuanceSet'));
+            });
+        });
+
+        describe('getParticipants()', () => {
+            it('should return the expected participants', () => {
+                expect(info.getParticipants()).toStrictEqual({
+                    start: { address: 'rsYxnKtb8JBzfG4hp6sVF3WiVNw2broUFo', tag: undefined },
+                });
+            });
+        });
+
+        describe('getMonetaryDetails()', () => {
+            it('should return the expected monetary details', () => {
+                expect(info.getMonetaryDetails()).toStrictEqual({
+                    mutate: {
+                        DEC: [],
+                        INC: [],
+                    },
+                    factor: undefined,
+                });
+            });
+        });
+    });
+
+    describe('Validation', () => {});
+});
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/nfTokenMint.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/nfTokenMint.test.ts
index 8943b89e9..1ceec8a66 100644
--- a/src/common/libs/ledger/transactions/genuine/__tests__/nfTokenMint.test.ts
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/nfTokenMint.test.ts
@@ -27,6 +27,12 @@ describe('NFTokenMint tx', () => {
             expect(instance.URI).toEqual(
                 '697066733A2F2F62616679626569646272676F706B373763657764723771666B6F62736A71356D70367A706A68333736623474627235343268726C627561637266712F6D657461646174612E6A736F6E',
             );
+            expect(instance.Amount).toStrictEqual({
+                value: '1',
+                currency: 'XRP',
+            });
+            expect(instance.Destination).toBe('rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3');
+            expect(instance.Expiration).toBe('2030-09-28T03:58:41.000Z');
         });
 
         it('Should return right NFTokenID from meta data', () => {
@@ -43,7 +49,6 @@ describe('NFTokenMint tx', () => {
         });
     });
 
-    // TypeScript
     describe('Info', () => {
         const { tx, meta }: any = nfTokenMintTemplate;
         const Mixed = MutationsMixin(NFTokenMint);
@@ -52,7 +57,7 @@ describe('NFTokenMint tx', () => {
 
         describe('generateDescription()', () => {
             it('should return the expected description', () => {
-                const expectedDescription = `The Token ID is 000813883EBCBE82C32E1CA28616DBDD2E40873D446B0EC505C73BA9047ED3FE${'\n'}The token has a transfer fee: 5%${'\n'}The Taxon for this token is 48`;
+                const expectedDescription = `The Token ID is 000813883EBCBE82C32E1CA28616DBDD2E40873D446B0EC505C73BA9047ED3FE${'\n'}The token has a transfer fee: 5%${'\n'}The Taxon for this token is 48${'\n'}rXMART8usFd5kABXCayoP6ZfB35b4v43t offered to sell NFT token with ID 000813883EBCBE82C32E1CA28616DBDD2E40873D446B0EC505C73BA9047ED3FE in order to receive 1 XRP${'\n'}This offer may only be accepted by rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3${'\n'}The offer expires at Saturday, September 28, 2030 5:58 AM unless it is canceled or accepted before then.`;
                 expect(info.generateDescription()).toEqual(expectedDescription);
             });
         });
@@ -67,7 +72,8 @@ describe('NFTokenMint tx', () => {
             it('should return the expected participants', () => {
                 expect(info.getParticipants()).toStrictEqual({
                     start: { address: 'rXMART8usFd5kABXCayoP6ZfB35b4v43t', tag: undefined },
-                    end: { address: 'ra5jrnrq9BxsvzGeJY5XS9inftcJWMdJUx', tag: undefined },
+                    through: { address: 'ra5jrnrq9BxsvzGeJY5XS9inftcJWMdJUx', tag: undefined },
+                    end: { address: 'rH6PVvtAawMNGyxpLvEAkUjpqZNZ1gNT3', tag: undefined },
                 });
             });
         });
@@ -79,7 +85,14 @@ describe('NFTokenMint tx', () => {
                         DEC: [],
                         INC: [],
                     },
-                    factor: undefined,
+                    factor: [
+                        {
+                            action: 'INC',
+                            currency: 'XRP',
+                            effect: 'POTENTIAL_EFFECT',
+                            value: '1',
+                        },
+                    ],
                 });
             });
         });
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/payment.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/payment.test.ts
index 0d5824b8b..850f8539d 100644
--- a/src/common/libs/ledger/transactions/genuine/__tests__/payment.test.ts
+++ b/src/common/libs/ledger/transactions/genuine/__tests__/payment.test.ts
@@ -34,6 +34,7 @@ describe('Payment tx', () => {
 
             expect(instance.Destination).toEqual('rLHzPsX6oXkzU2qL12kHCH8G8cnZv1rBJh');
             expect(instance.DestinationTag).toEqual(123);
+            expect(instance.CredentialIDs).toStrictEqual(['DD40031C6C21164E767317D467CEEE9']);
         });
 
         it('Should return right parsed values for tx to self with path sets', () => {
@@ -140,7 +141,7 @@ describe('Payment tx', () => {
 
         describe('generateDescription()', () => {
             it('should return the expected description', () => {
-                const expectedDescription = `The payment source tag is: 1337 ${'\n'}The payment destination tag is: 1338 ${'\n'}It was instructed to deliver 1 XRP ${'\n'}by spending up to 1.239054364262807 USD`;
+                const expectedDescription = `The payment source tag is: 1337 ${'\n'}The payment destination tag is: 1338 ${'\n'}It was instructed to deliver 1 XRP ${'\n'}by spending up to 1.239054364262807 USD ${'\n'}The payment includes credential IDs: DD40031C6C21164E767317D467CEEE9, 5319AEF0C6A19872E7BC983545FEE123`;
                 expect(info.generateDescription()).toEqual(expectedDescription);
             });
         });
diff --git a/src/common/libs/ledger/transactions/genuine/index.ts b/src/common/libs/ledger/transactions/genuine/index.ts
index e30b8cc05..980000a35 100644
--- a/src/common/libs/ledger/transactions/genuine/index.ts
+++ b/src/common/libs/ledger/transactions/genuine/index.ts
@@ -46,3 +46,10 @@ export * from './DIDSet';
 export * from './DIDDelete';
 export * from './OracleSet';
 export * from './OracleDelete';
+export * from './MPTokenIssuanceCreate';
+export * from './MPTokenIssuanceDestroy';
+export * from './MPTokenIssuanceSet';
+export * from './MPTokenAuthorize';
+export * from './CredentialCreate';
+export * from './CredentialAccept';
+export * from './CredentialDelete';
diff --git a/src/common/libs/ledger/types/common/index.ts b/src/common/libs/ledger/types/common/index.ts
index 992989ece..616e11389 100644
--- a/src/common/libs/ledger/types/common/index.ts
+++ b/src/common/libs/ledger/types/common/index.ts
@@ -83,6 +83,11 @@ export interface SignerEntry {
     WalletLocator?: string;
 }
 
+export interface Credential {
+    Issuer: string;
+    CredentialType: number;
+}
+
 export interface PriceData {
     /**
      * The primary asset in a trading pair. Any valid identifier, such as a stock symbol,
diff --git a/src/common/libs/ledger/types/enums.ts b/src/common/libs/ledger/types/enums.ts
index 42bebdac5..4e9113597 100644
--- a/src/common/libs/ledger/types/enums.ts
+++ b/src/common/libs/ledger/types/enums.ts
@@ -54,6 +54,13 @@ export enum TransactionTypes {
     DIDSet = 'DIDSet',
     OracleSet = 'OracleSet',
     OracleDelete = 'OracleDelete',
+    MPTokenIssuanceCreate = 'MPTokenIssuanceCreate',
+    MPTokenIssuanceDestroy = 'MPTokenIssuanceDestroy',
+    MPTokenIssuanceSet = 'MPTokenIssuanceSet',
+    MPTokenAuthorize = 'MPTokenAuthorize',
+    CredentialCreate = 'CredentialCreate',
+    CredentialAccept = 'CredentialAccept',
+    CredentialDelete = 'CredentialDelete',
 }
 
 /**
diff --git a/src/common/libs/ledger/types/transaction/metadata.ts b/src/common/libs/ledger/types/transaction/metadata.ts
index 0c5ec2a69..c52e11935 100644
--- a/src/common/libs/ledger/types/transaction/metadata.ts
+++ b/src/common/libs/ledger/types/transaction/metadata.ts
@@ -46,4 +46,5 @@ export interface TransactionMetadata {
     HookEmissions?: { HookEmission: HookEmission }[];
     // "nftoken_id" is only present in transactions that involve NFTokens
     nftoken_id?: string;
+    mpt_issuance_id?: string;
 }
diff --git a/src/common/libs/preferences.ts b/src/common/libs/preferences.ts
index 402d8cf36..487b5a697 100644
--- a/src/common/libs/preferences.ts
+++ b/src/common/libs/preferences.ts
@@ -24,7 +24,7 @@ const Preferences = {
     /**
      * Get shared preferences by key
      */
-    get: async (key: Keys): Promise<string> => {
+    get: async (key: Keys): Promise<string | null> => {
         return SharedPreferencesModule.get(key);
     },
 
diff --git a/src/common/utils/__tests__/fee.test.ts b/src/common/utils/__tests__/fee.test.ts
index 2d73c3e74..4cd3fd7e7 100644
--- a/src/common/utils/__tests__/fee.test.ts
+++ b/src/common/utils/__tests__/fee.test.ts
@@ -1,7 +1,7 @@
-import { NormalizeFeeDataSet, PrepareTxForHookFee } from '../fee';
-
 import * as AccountLib from 'xrpl-accountlib';
 
+import { NormalizeFeeDataSet, PrepareTxForHookFee } from '../fee';
+
 describe('Utils.Fee', () => {
     describe('NormalizeFeeDataSet', () => {
         it('Should return right values', () => {
@@ -28,14 +28,17 @@ describe('Utils.Fee', () => {
                     availableFees: [
                         {
                             type: 'LOW',
+                            // @ts-ignore
                             value: baseFees[base][0],
                         },
                         {
                             type: 'MEDIUM',
+                            // @ts-ignore
                             value: baseFees[base][1],
                         },
                         {
                             type: 'HIGH',
+                            // @ts-ignore
                             value: baseFees[base][2],
                         },
                     ],
@@ -49,11 +52,11 @@ describe('Utils.Fee', () => {
     describe('PrepareTxForHookFee', () => {
         it('Should throw an error if txJson is not a valid object', () => {
             expect(() => {
-                PrepareTxForHookFee(undefined, {}, 0);
+                PrepareTxForHookFee(undefined, undefined, 0);
             }).toThrowError('PrepareTxForHookFee requires a json transaction to calculate the fee for');
 
             expect(() => {
-                PrepareTxForHookFee('invalid', {}, 0);
+                PrepareTxForHookFee('invalid', undefined, 0);
             }).toThrowError('PrepareTxForHookFee requires a json transaction to calculate the fee for');
         });
 
@@ -138,11 +141,11 @@ describe('Utils.Fee', () => {
             signSpy.mockClear();
         });
 
-        it('Should set xrplDefinitions if definitions is an object', () => {
+        it('Should set xrplDefinitions if definitions is set', () => {
             const txJson = {};
 
             const signSpy = jest.spyOn(AccountLib, 'sign');
-            PrepareTxForHookFee(txJson, AccountLib.binary.DEFAULT_DEFINITIONS, 0);
+            PrepareTxForHookFee(txJson, new AccountLib.XrplDefinitions(AccountLib.binary.DEFAULT_DEFINITIONS), 0);
             expect(signSpy).toBeCalledWith(
                 {
                     ...txJson,
diff --git a/src/common/utils/fee.ts b/src/common/utils/fee.ts
index 180849d8d..0b0565ff1 100644
--- a/src/common/utils/fee.ts
+++ b/src/common/utils/fee.ts
@@ -9,7 +9,7 @@ import { sign, derive, XrplDefinitions } from 'xrpl-accountlib';
  * @param networkId
  * @returns string
  */
-const PrepareTxForHookFee = (txJson: any, definitions: any, networkId: number): string => {
+const PrepareTxForHookFee = (txJson: any, definitions: XrplDefinitions | undefined, networkId: number): string => {
     if (!txJson || typeof txJson !== 'object') {
         throw new Error('PrepareTxForHookFee requires a json transaction to calculate the fee for');
     }
@@ -47,14 +47,8 @@ const PrepareTxForHookFee = (txJson: any, definitions: any, networkId: number):
         });
     }
 
-    // set the definitions if exist
-    let xrplDefinitions;
-    if (typeof definitions === 'object') {
-        xrplDefinitions = new XrplDefinitions(definitions);
-    }
-
     // sign the transaction with a dummy account
-    return sign(transaction, derive.passphrase(''), xrplDefinitions).signedTransaction;
+    return sign(transaction, derive.passphrase(''), definitions).signedTransaction;
 };
 
 /**
diff --git a/src/components/General/AmountText/AmountText.tsx b/src/components/General/AmountText/AmountText.tsx
index 01bef4d5d..eeadbe81b 100644
--- a/src/components/General/AmountText/AmountText.tsx
+++ b/src/components/General/AmountText/AmountText.tsx
@@ -26,6 +26,7 @@ interface Props {
     value: number | string;
     currency?: string;
     truncateCurrency?: boolean;
+    truncateLp?: boolean;
     style?: TextStyle | TextStyle[];
     valueContainerStyle?: ViewStyle | ViewStyle[];
     currencyStyle?: TextStyle | TextStyle[];
@@ -268,10 +269,16 @@ class AmountText extends Component<Props, State> {
         }
 
         return (
-            <View style={[styles.container, valueContainerStyle]}>
+            <View style={[
+                styles.container,
+                valueContainerStyle,
+            ]}>
                 {typeof prefix === 'function' && prefix()}
                 {typeof prefix === 'object' && prefix}
-                <Text testID={testID} numberOfLines={numberOfLines || 1} style={[style, discreet && discreetStyle]}>
+                <Text testID={testID} numberOfLines={numberOfLines || 1} style={[
+                    style,
+                    discreet && discreetStyle,
+                ]}>
                     {typeof prefix === 'string' && prefix}
                     {`${showValue}`}
                 </Text>
@@ -280,25 +287,34 @@ class AmountText extends Component<Props, State> {
     };
 
     renderCurrency = () => {
-        const { style, currencyStyle, truncateCurrency, numberOfLines } = this.props;
+        const { style, currencyStyle, truncateCurrency, truncateLp, numberOfLines } = this.props;
         let { currency } = this.state;
 
         if (typeof currency !== 'string' || !currency) {
             return null;
         }
 
-        if (currency.length > 4 && truncateCurrency) {
+        let isLp = false;
+        if (currency.length > 4 && (truncateCurrency || truncateLp)) {
             if (currency.startsWith('LP')) {
                 currency = `LP ${currency.slice(3, 7)}`;
-            } else {
+                if (truncateLp) {
+                    currency = 'LP';
+                }
+                isLp = true;
+            } else if (truncateCurrency) {
                 currency = `${currency.slice(0, 4)}…`;
             }
         }
 
         return (
             <Text numberOfLines={numberOfLines || 1} style={[style, currencyStyle]}>
-                {' '}
-                {currency}
+                {
+                    !isLp && <>
+                        {' '}
+                        {currency}
+                    </>
+                }
             </Text>
         );
     };
diff --git a/src/components/General/Button/Button.tsx b/src/components/General/Button/Button.tsx
index c059b7c09..3c11383c9 100644
--- a/src/components/General/Button/Button.tsx
+++ b/src/components/General/Button/Button.tsx
@@ -23,6 +23,7 @@ interface Props extends PropsWithChildren {
     light?: boolean;
     contrast?: boolean;
     rounded?: boolean;
+    nonBlock?: boolean;
     roundedSmall?: boolean;
     roundedMini?: boolean;
     roundedSmallBlock?: boolean;
@@ -72,6 +73,7 @@ export default class Button extends Component<Props> {
             light,
             contrast,
             rounded,
+            nonBlock,
             roundedSmall,
             roundedSmallBlock,
             roundedMini,
@@ -122,6 +124,7 @@ export default class Button extends Component<Props> {
                             secondary && styles.textButtonSecondary,
                             light && styles.textButtonLight,
                             contrast && styles.textButtonContrast,
+                            nonBlock && styles.textButtonNonBlock,
                             rounded && styles.textButtonRounded,
                             roundedSmall && styles.textButtonRoundedSmall,
                             roundedMini && styles.textButtonRoundedMini,
@@ -177,6 +180,7 @@ export default class Button extends Component<Props> {
             light,
             contrast,
             rounded,
+            nonBlock,
             roundedSmall,
             roundedSmallBlock,
             roundedMini,
@@ -197,6 +201,7 @@ export default class Button extends Component<Props> {
                         secondary && styles.buttonSecondary,
                         light && styles.buttonLight,
                         contrast && styles.buttonContrast,
+                        nonBlock && styles.buttonNonBlock,
                         rounded && styles.buttonRounded,
                         roundedSmall && styles.buttonRoundedSmall,
                         roundedSmallBlock && styles.buttonRoundedSmallBlock,
@@ -229,6 +234,7 @@ export default class Button extends Component<Props> {
                     light && styles.buttonLight,
                     contrast && styles.buttonContrast,
                     rounded && styles.buttonRounded,
+                    nonBlock && styles.buttonNonBlock,
                     roundedSmall && styles.buttonRoundedSmall,
                     roundedSmallBlock && styles.buttonRoundedSmallBlock,
                     roundedMini && styles.buttonRoundedMini,
diff --git a/src/components/General/Button/styles.ts b/src/components/General/Button/styles.ts
index 02550e24e..74b7461fb 100644
--- a/src/components/General/Button/styles.ts
+++ b/src/components/General/Button/styles.ts
@@ -8,11 +8,11 @@ const styles = StyleService.create({
         alignItems: 'center',
     },
     button: {
-        height: AppSizes.scale(55),
+        height: AppSizes.scale(45),
         flexDirection: 'row',
         borderWidth: 1,
-        borderRadius: AppSizes.scale(75) / 4,
-        paddingHorizontal: 15,
+        borderRadius: AppSizes.scale(75) / 5,
+        paddingHorizontal: 25,
         alignSelf: 'stretch',
         justifyContent: 'center',
         borderColor: '$transparent',
@@ -88,7 +88,7 @@ const styles = StyleService.create({
         height: AppSizes.scale(25),
         paddingHorizontal: 12,
         alignSelf: 'center',
-        borderRadius: AppSizes.scale(25) / 2,
+        borderRadius: AppSizes.scale(25) / 3,
     },
     textButtonRoundedMini: {
         fontSize: AppFonts.base.size * 0.8,
@@ -119,6 +119,15 @@ const styles = StyleService.create({
     textButtonRounded: {
         fontSize: AppFonts.base.size,
     },
+    buttonNonBlock: {
+        height: AppSizes.scale(42),
+        paddingHorizontal: 30,
+        alignSelf: 'center',
+        borderRadius: AppSizes.scale(75) / 5,
+    },
+    textButtonNonBlock: {
+        fontSize: AppFonts.base.size,
+    },
     iconLeft: {
         marginRight: 3,
         tintColor: '$white',
diff --git a/src/components/General/CheckBox/CheckBox.tsx b/src/components/General/CheckBox/CheckBox.tsx
index 1b82bdc47..2d3253d7e 100644
--- a/src/components/General/CheckBox/CheckBox.tsx
+++ b/src/components/General/CheckBox/CheckBox.tsx
@@ -5,7 +5,7 @@
  *
  */
 import React, { PureComponent } from 'react';
-import { View, Text } from 'react-native';
+import { View, Text, TextStyle } from 'react-native';
 
 import { TouchableDebounce } from '@components/General/TouchableDebounce';
 import { Icon } from '@components/General/Icon';
@@ -19,6 +19,7 @@ interface Props {
     checked: boolean;
     label?: string;
     labelSmall?: string;
+    style?: TextStyle | TextStyle[];
     description?: string;
     testID?: string;
 }
@@ -33,15 +34,19 @@ class CheckBox extends PureComponent<Props> {
     };
 
     render() {
-        const { checked, label, labelSmall, description, testID } = this.props;
+        const { checked, label, labelSmall, description, testID, style } = this.props;
         return (
             <TouchableDebounce
                 testID={testID}
                 activeOpacity={0.8}
                 onPress={this.onPress}
-                style={[styles.content, checked && styles.selected]}
+                style={[
+                    styles.content,
+                    checked && styles.selected,
+                    style,
+                ]}
             >
-                <View style={AppStyles.flex1}>
+                <View style={[ AppStyles.flex1 ]}>
                     <View style={[styles.box, checked ? styles.boxSelected : null]}>
                         {checked && <Icon name="IconCheckXaman" style={AppStyles.imgColorWhite} size={12} />}
                     </View>
diff --git a/src/components/General/CountDown/CountDown.tsx b/src/components/General/CountDown/CountDown.tsx
index 54a3863ec..c4cf185ff 100644
--- a/src/components/General/CountDown/CountDown.tsx
+++ b/src/components/General/CountDown/CountDown.tsx
@@ -64,16 +64,22 @@ class CountDown extends PureComponent<Props, State> {
         }
     };
 
+    onFinish = () => {
+        const { onFinish } = this.props;
+
+        if (typeof onFinish === 'function' && this._isMounted) {
+            onFinish();
+        }
+    };
+
     startCountDown = () => {
-        const { onFinish, seconds } = this.props;
-
-        Animated.timing(this.countDownAnimated, { toValue: 0, duration: seconds * 1000, useNativeDriver: true }).start(
-            () => {
-                if (typeof onFinish === 'function') {
-                    onFinish();
-                }
-            },
-        );
+        const { seconds } = this.props;
+
+        Animated.timing(this.countDownAnimated, {
+            toValue: 0,
+            duration: seconds * 1000,
+            useNativeDriver: true,
+        }).start(this.onFinish);
     };
 
     render() {
diff --git a/src/components/General/Header/Header.tsx b/src/components/General/Header/Header.tsx
index f215f3540..93de10b14 100644
--- a/src/components/General/Header/Header.tsx
+++ b/src/components/General/Header/Header.tsx
@@ -13,7 +13,7 @@ import styles from './styles';
 /* Types ==================================================================== */
 type placementType = 'left' | 'right' | 'center';
 
-interface ChildrenProps {
+export interface ChildrenProps {
     testID?: string;
     text?: string;
     textStyle?: TextStyle | TextStyle[];
diff --git a/src/components/General/Header/styles.ts b/src/components/General/Header/styles.ts
index 4867b727e..6c69e4822 100644
--- a/src/components/General/Header/styles.ts
+++ b/src/components/General/Header/styles.ts
@@ -26,6 +26,7 @@ const styles = StyleService.create({
     textStyle: {
         ...AppStyles.h5,
         textAlign: 'center',
+        color: '$contrast',
     },
     textStyleSmall: {
         ...AppStyles.pbold,
diff --git a/src/components/General/InfoMessage/styles.ts b/src/components/General/InfoMessage/styles.ts
index baa0d4ac7..3fecca439 100644
--- a/src/components/General/InfoMessage/styles.ts
+++ b/src/components/General/InfoMessage/styles.ts
@@ -30,7 +30,7 @@ export default StyleService.create({
     },
     labelContainer: {
         flex: 1,
-        paddingVertical: 10,
+        paddingVertical: 5,
     },
     label: {
         fontSize: AppFonts.subtext.size,
diff --git a/src/components/General/PinInput/PinInput.tsx b/src/components/General/PinInput/PinInput.tsx
index caa96751e..63be43076 100644
--- a/src/components/General/PinInput/PinInput.tsx
+++ b/src/components/General/PinInput/PinInput.tsx
@@ -29,6 +29,100 @@ interface State {
     code: string;
 }
 
+export const isStrong = (code: string): boolean => {
+    const mostUsedPin = [
+        '123456',
+        '123123',
+        '111111',
+        '121212',
+        '123321',
+        '666666',
+        '000000',
+        '654321',
+        '696969',
+        '112233',
+        '159753',
+        '292513',
+        '131313',
+        '123654',
+        '222222',
+        '789456',
+        '999999',
+        '101010',
+        '777777',
+        '007007',
+        '65432',
+        '555555',
+        '987654',
+        '888888',
+        '456789',
+        '333333',
+        '246810',
+        '159357',
+        '232323',
+        '252525',
+        '147258',
+        '147852',
+    ];
+
+    // pin code is in frequently used codes
+    if (mostUsedPin.indexOf(code) > -1) {
+        return false;
+    }
+
+    // at least 3 unique digits.
+    let uniqueDigits = code.length;
+    for (let i = 0; i < code.length; i++) {
+        for (let j = i + 1; j < code.length; j++) {
+            if (code[i] === code[j]) {
+                uniqueDigits -= 1;
+            }
+        }
+    }
+    if (uniqueDigits < 3) {
+        return false;
+    }
+
+    // start searching for pattern for where each digit can be start of the pattern
+    let totalSequence = 0;
+    let index = 0;
+    while (index < code.length) {
+        let following = index + 2;
+        let sequence = 0;
+        let repeating = 0;
+
+        const shift = Number(code[index + 1]) - Number(code[index]);
+
+        while (following < code.length) {
+            if (Number(code[following]) - Number(code[following - 1]) === shift) {
+                sequence += sequence === 0 ? 3 : 1;
+            } else if (code[following] === code[following - 1]) {
+                repeating++;
+            } else {
+                break;
+            }
+            following++;
+        }
+        if (sequence !== 0) {
+            sequence += repeating;
+        }
+        if (sequence >= 3) {
+            index = following + 1;
+            totalSequence += sequence;
+        } else {
+            index++;
+        }
+    }
+    if (totalSequence >= 3) {
+        return false;
+    }
+
+    // check if pin is reference as date
+    // if pin could be date with year (like 121091 that could be 12th of October or 10th of December 1991)
+    const possibleDate = moment(code, 'DDMMYY').isValid() || moment(code, 'MMDDYY').isValid();
+    return !possibleDate;
+};
+
 /* Component ==================================================================== */
 class PinInput extends Component<Props, State> {
     private readonly textInputRef: React.RefObject<TextInput>;
@@ -80,100 +174,6 @@ class PinInput extends Component<Props, State> {
         });
     };
 
-    isStrong = (code: string): boolean => {
-        const mostUsedPin = [
-            '123456',
-            '123123',
-            '111111',
-            '121212',
-            '123321',
-            '666666',
-            '000000',
-            '654321',
-            '696969',
-            '112233',
-            '159753',
-            '292513',
-            '131313',
-            '123654',
-            '222222',
-            '789456',
-            '999999',
-            '101010',
-            '777777',
-            '007007',
-            '65432',
-            '555555',
-            '987654',
-            '888888',
-            '456789',
-            '333333',
-            '246810',
-            '159357',
-            '232323',
-            '252525',
-            '147258',
-            '147852',
-        ];
-
-        // pin code is in frequently used codes
-        if (mostUsedPin.indexOf(code) > -1) {
-            return false;
-        }
-
-        // at least 3 unique digits.
-        let uniqueDigits = code.length;
-        for (let i = 0; i < code.length; i++) {
-            for (let j = i + 1; j < code.length; j++) {
-                if (code[i] === code[j]) {
-                    uniqueDigits -= 1;
-                }
-            }
-        }
-        if (uniqueDigits < 3) {
-            return false;
-        }
-
-        // start searching for pattern for where each digit can be start of the pattern
-        let totalSequence = 0;
-        let index = 0;
-        while (index < code.length) {
-            let following = index + 2;
-            let sequence = 0;
-            let repeating = 0;
-
-            const shift = Number(code[index + 1]) - Number(code[index]);
-
-            while (following < code.length) {
-                if (Number(code[following]) - Number(code[following - 1]) === shift) {
-                    sequence += sequence === 0 ? 3 : 1;
-                } else if (code[following] === code[following - 1]) {
-                    repeating++;
-                } else {
-                    break;
-                }
-                following++;
-            }
-            if (sequence !== 0) {
-                sequence += repeating;
-            }
-            if (sequence >= 3) {
-                index = following + 1;
-                totalSequence += sequence;
-            } else {
-                index++;
-            }
-        }
-        if (totalSequence >= 3) {
-            return false;
-        }
-
-        // check if pin is reference as date
-        // if pin could be date with year (like 121091 that could be 12th of October or 10th of December 1991)
-        const possibleDate = moment(code, 'DDMMYY').isValid() || moment(code, 'MMDDYY').isValid();
-        return !possibleDate;
-    };
-
     setPinCode = (newCode: string) => {
         const { onEdit } = this.props;
 
@@ -225,7 +225,7 @@ class PinInput extends Component<Props, State> {
             }
 
             if (onFinish) {
-                onFinish(cleanCode, checkStrength ? this.isStrong(cleanCode) : undefined);
+                onFinish(cleanCode, checkStrength ? isStrong(cleanCode) : undefined);
             }
         }
     };
diff --git a/src/components/General/RaisedButton/RaisedButton.tsx b/src/components/General/RaisedButton/RaisedButton.tsx
index 22d1d27ff..4b11b5961 100644
--- a/src/components/General/RaisedButton/RaisedButton.tsx
+++ b/src/components/General/RaisedButton/RaisedButton.tsx
@@ -92,7 +92,7 @@ export default class RaisedButton extends Component<Props, State> {
         const { small } = this.props;
 
         if (small) {
-            return AppSizes.scale(40);
+            return AppSizes.scale(35);
         }
 
         return AppSizes.scale(50);
diff --git a/src/components/General/RaisedButton/styles.ts b/src/components/General/RaisedButton/styles.ts
index f94f156da..e9e814add 100644
--- a/src/components/General/RaisedButton/styles.ts
+++ b/src/components/General/RaisedButton/styles.ts
@@ -1,13 +1,13 @@
 import StyleService from '@services/StyleService';
 
-import { AppFonts } from '@theme';
+import { AppFonts, AppSizes } from '@theme';
 
 export const styles = StyleService.create({
     container: {
         flex: 1,
         width: '100%',
         backgroundColor: '$white',
-        borderRadius: 13,
+        borderRadius: AppSizes.scale(75) / 6,
         alignItems: 'center',
         justifyContent: 'center',
         shadowColor: '$grey',
diff --git a/src/components/General/SearchBar/styles.ts b/src/components/General/SearchBar/styles.ts
index c4b51f029..5afd35e2c 100644
--- a/src/components/General/SearchBar/styles.ts
+++ b/src/components/General/SearchBar/styles.ts
@@ -5,7 +5,7 @@ import { AppFonts } from '@theme';
 export default StyleService.create({
     searchContainer: {
         flexDirection: 'row',
-        backgroundColor: '$tint',
+        // backgroundColor: '$tint',
     },
     searchContainerBorder: {
         borderWidth: 1.5,
@@ -16,16 +16,16 @@ export default StyleService.create({
         alignSelf: 'center',
         alignItems: 'center',
         position: 'absolute',
-        left: 15,
+        left: 5,
         tintColor: '$textPrimary',
     },
     searchInput: {
         height: '100%',
-        paddingLeft: 50,
-        paddingRight: 50,
-        fontFamily: AppFonts.base.familyMonoBold,
+        paddingLeft: 35,
+        paddingRight: 35,
+        fontFamily: AppFonts.base.family,
         fontSize: AppFonts.p.size,
-        fontWeight: '600',
+        // fontWeight: '600',
         color: '$textPrimary',
         paddingVertical: 0,
     },
diff --git a/src/components/General/SecurePinInput/SecurePinInput.tsx b/src/components/General/SecurePinInput/SecurePinInput.tsx
index 27c5ec914..140fcea4a 100644
--- a/src/components/General/SecurePinInput/SecurePinInput.tsx
+++ b/src/components/General/SecurePinInput/SecurePinInput.tsx
@@ -14,6 +14,7 @@ import {
     Platform,
     NativeSyntheticEvent,
     TextInputKeyPressEventData,
+    ViewStyle,
 } from 'react-native';
 
 import StyleService from '@services/StyleService';
@@ -24,15 +25,18 @@ import { Icon } from '@components/General/Icon';
 import { LoadingIndicator } from '@components/General/LoadingIndicator';
 
 import styles from './styles';
+import { AppStyles } from '@theme/index';
 
 /* Types ==================================================================== */
 interface Props {
     virtualKeyboard: boolean;
     supportBiometric: boolean;
+    condensed?: boolean;
     length: number;
     clearOnFinish: boolean;
     enableHapticFeedback?: boolean;
     isLoading?: boolean;
+    pinPadStyle?: ViewStyle | ViewStyle[];
     onInputFinish: (pin: string) => void;
     onBiometryPress: () => void;
 }
@@ -179,15 +183,21 @@ class SecurePinInput extends Component<Props, State> {
                 return (
                     <TouchableHighlight
                         testID="x-key"
-                        underlayColor={StyleService.value('$tint')}
-                        style={styles.line}
+                        underlayColor={StyleService.value('$transparentContrast')}
+                        activeOpacity={0.7}
+                        style={[
+                            styles.line,
+                        ]}
                         key="x-key"
                         onPress={() => {
                             this.onInput('Backspace');
                         }}
                         onLongPress={this.clearInput}
                     >
-                        <Icon name="IconChevronLeft" style={styles.iconStyle} size={35} />
+                        <Icon name="IconChevronLeft" style={[
+                            styles.iconStyle,
+                            AppStyles.marginTopNegativeSml,
+                        ]} size={35} />
                     </TouchableHighlight>
                 );
             }
@@ -196,8 +206,11 @@ class SecurePinInput extends Component<Props, State> {
                     return (
                         <TouchableHighlight
                             testID="y-key"
-                            underlayColor={StyleService.value('$tint')}
-                            style={styles.line}
+                            underlayColor={StyleService.value('$transparentContrast')}
+                            style={[
+                                styles.line,
+                            ]}
+                            activeOpacity={0.7}
                             key="y-key"
                             onPress={() => {
                                 if (onBiometryPress) {
@@ -233,8 +246,10 @@ class SecurePinInput extends Component<Props, State> {
             return (
                 <TouchableHighlight
                     testID={`${item}-key`}
-                    underlayColor={StyleService.value('$tint')}
-                    style={styles.line}
+                    underlayColor={StyleService.value('$transparentContrast')}
+                    style={[
+                        styles.line,
+                    ]}
                     activeOpacity={0.7}
                     key={`${item}-key`}
                     onPress={() => {
@@ -285,7 +300,7 @@ class SecurePinInput extends Component<Props, State> {
     };
 
     render() {
-        const { virtualKeyboard, length, isLoading } = this.props;
+        const { condensed, virtualKeyboard, length, isLoading, pinPadStyle } = this.props;
         const { digits } = this.state;
 
         let props: {};
@@ -319,10 +334,17 @@ class SecurePinInput extends Component<Props, State> {
                             {...props}
                         />
                     )}
-                    <View style={styles.digits}>{isLoading ? this.renderLoading() : this.renderDots()}</View>
+                    <View style={[
+                        styles.digits,
+                        condensed && styles.digitsCondensed,
+                    ]}>{isLoading ? this.renderLoading() : this.renderDots()}</View>
 
                     {virtualKeyboard && (
-                        <View testID="virtual-keyboard" style={styles.keyboardWrap}>
+                        <View testID="virtual-keyboard" style={[
+                            styles.keyboardWrap,
+                            pinPadStyle,
+                            condensed && styles.keyboardWrapCondensed,
+                        ]}>
                             {this.renderNum()}
                         </View>
                     )}
diff --git a/src/components/General/SecurePinInput/styles.ts b/src/components/General/SecurePinInput/styles.ts
index a5673b125..9f7dad939 100644
--- a/src/components/General/SecurePinInput/styles.ts
+++ b/src/components/General/SecurePinInput/styles.ts
@@ -15,6 +15,16 @@ export default StyleService.create({
         justifyContent: 'center',
         alignItems: 'center',
     },
+    digitsCondensed: {
+        height: AppSizes.screen.height < 800
+            ? AppSizes.verticalScale(50)
+            : AppSizes.verticalScale(65),
+    },
+    keyboardWrapCondensed: {
+        marginTop: AppSizes.screen.height < 800
+            ? AppSizes.verticalScale(20)
+            : AppSizes.verticalScale(50),
+    },
     hiddenInput: {
         width: 1,
         height: 1,
diff --git a/src/components/General/SegmentButtons/ButtonItem/styles.ts b/src/components/General/SegmentButtons/ButtonItem/styles.ts
index 9f5d8ad8a..202dd6fdb 100644
--- a/src/components/General/SegmentButtons/ButtonItem/styles.ts
+++ b/src/components/General/SegmentButtons/ButtonItem/styles.ts
@@ -8,7 +8,7 @@ const styles = StyleService.create({
         paddingVertical: AppSizes.paddingSml,
     },
     button: {
-        borderRadius: AppSizes.scale(75) / 5,
+        // borderRadius: AppSizes.scale(75) / 5,
         marginRight: AppSizes.paddingExtraSml,
     },
     textContainer: {
diff --git a/src/components/General/SortableFlatList/styles.ts b/src/components/General/SortableFlatList/styles.ts
index 3da5fc1f7..533dcf95c 100644
--- a/src/components/General/SortableFlatList/styles.ts
+++ b/src/components/General/SortableFlatList/styles.ts
@@ -1,9 +1,9 @@
 import { StyleSheet } from 'react-native';
-import { AppSizes } from '@theme';
+// import { AppSizes } from '@theme';
 
 const styles = StyleSheet.create({
     container: {
-        width: AppSizes.screen.width,
+        // width: AppSizes.screen.width, // Will auto width - this fixes Fold devices
     },
     contentContainerStyle: {
         flexGrow: 0,
diff --git a/src/components/General/SwipeButton/SwipeButton.tsx b/src/components/General/SwipeButton/SwipeButton.tsx
index 92cd52bc4..5e003fb14 100644
--- a/src/components/General/SwipeButton/SwipeButton.tsx
+++ b/src/components/General/SwipeButton/SwipeButton.tsx
@@ -59,6 +59,7 @@ class SwipeButton extends Component<Props, State> {
     };
 
     private animatedWidth: Animated.Value;
+    // private animatedWidth: number;
     private defaultContainerWidth: number;
     private maxWidth: number;
     private panResponder: any;
@@ -76,6 +77,7 @@ class SwipeButton extends Component<Props, State> {
         this.defaultContainerWidth = AppSizes.scale(45);
         this.maxWidth = 0;
         this.animatedWidth = new Animated.Value(this.defaultContainerWidth);
+        // this.animatedWidth = this.defaultContainerWidth;
 
         this.panResponder = PanResponder.create({
             onStartShouldSetPanResponder: () => true,
@@ -138,10 +140,11 @@ class SwipeButton extends Component<Props, State> {
     };
 
     changePosition = (width: number) => {
+        // this.animatedWidth = width;
         Animated.timing(this.animatedWidth, {
             toValue: width,
             duration: 400,
-            useNativeDriver: false,
+            useNativeDriver: true,
         }).start();
     };
 
@@ -194,11 +197,8 @@ class SwipeButton extends Component<Props, State> {
             // Reached end position
             this.changePosition(this.maxWidth);
         } else {
-            Animated.timing(this.animatedWidth, {
-                toValue: newWidth,
-                duration: 0,
-                useNativeDriver: false,
-            }).start();
+            // this.animatedWidth = newWidth;
+            this.animatedWidth.setValue(newWidth);
         }
     };
 
@@ -298,7 +298,10 @@ class SwipeButton extends Component<Props, State> {
                 <Text style={[styles.label, labelColor ? { color: labelColor } : {}]}>{label}</Text>
                 <Animated.View
                     testID={testID}
-                    style={[styles.thumpContainer, { width: this.animatedWidth }]}
+                    style={[
+                        styles.thumpContainer,
+                        { transform: [ { translateX: this.animatedWidth } ] },
+                    ]}
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...this.panResponder.panHandlers}
                 >
diff --git a/src/components/General/SwipeButton/styles.ts b/src/components/General/SwipeButton/styles.ts
index d6784717a..8b54a6cc5 100644
--- a/src/components/General/SwipeButton/styles.ts
+++ b/src/components/General/SwipeButton/styles.ts
@@ -5,7 +5,7 @@ import { AppFonts, AppSizes } from '@theme';
 const Styles = StyleService.create({
     container: {
         height: AppSizes.scale(55),
-        borderRadius: AppSizes.scale(55) * 0.3,
+        borderRadius: AppSizes.scale(55) * 0.25,
         alignSelf: 'stretch',
         borderWidth: 1,
         justifyContent: 'center',
@@ -34,10 +34,11 @@ const Styles = StyleService.create({
         alignSelf: 'flex-start',
         marginVertical: 1,
         marginHorizontal: 5,
+        left: -AppSizes.scale(45),
     },
     iconContainer: {
-        height: AppSizes.scale(45),
-        borderRadius: AppSizes.scale(45) * 0.3,
+        height: AppSizes.scale(44),
+        borderRadius: AppSizes.scale(45) * 0.21,
         backgroundColor: '$transparentWhite',
         width: AppSizes.scale(45),
         justifyContent: 'center',
diff --git a/src/components/General/Switch/Switch.tsx b/src/components/General/Switch/Switch.tsx
index 8317bb5b8..e0e963b49 100644
--- a/src/components/General/Switch/Switch.tsx
+++ b/src/components/General/Switch/Switch.tsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { View, Text, Platform, Switch as RNSwitch, TextStyle } from 'react-native';
+import { View, Text, Platform, Switch as RNSwitch, TextStyle, ViewStyle } from 'react-native';
 
 import { AppColors } from '@theme';
 import styles from './styles';
@@ -8,6 +8,7 @@ interface Props {
     testID?: string;
     title?: string;
     titleStyle?: TextStyle;
+    style?: ViewStyle | ViewStyle[];
     direction?: 'right' | 'left';
     checked: boolean;
     isDisabled?: boolean;
@@ -30,7 +31,7 @@ class Switch extends Component<Props> {
     };
 
     render() {
-        const { title, direction, checked, isDisabled, testID } = this.props;
+        const { title, direction, checked, isDisabled, testID, style } = this.props;
 
         let extraProps = {};
 
@@ -41,18 +42,27 @@ class Switch extends Component<Props> {
                 thumbColor: AppColors.light,
             };
         }
+        
+        const opacity = { opacity: isDisabled && Platform.OS === 'android' ? 0.5 : 1 };
 
         return (
             <View style={styles.container}>
                 {direction === 'right' && title && <Text style={styles.title}>{title}</Text>}
-                <View style={styles.switch}>
+                <View style={[
+                    styles.switch,
+                    style,
+                ]}>
                     <View>
                         <RNSwitch
                             testID={testID}
                             disabled={isDisabled}
                             onValueChange={this.onValueChange}
                             // eslint-disable-next-line react-native/no-inline-styles
-                            style={[styles.switch, { opacity: isDisabled && Platform.OS === 'android' ? 0.5 : 1 }]}
+                            style={[
+                                styles.switch,
+                                // style,
+                                opacity,
+                            ]}
                             value={checked}
                             // eslint-disable-next-line react/jsx-props-no-spreading
                             {...extraProps}
diff --git a/src/components/General/TextInput/TextInput.tsx b/src/components/General/TextInput/TextInput.tsx
index cd211379c..f7a5f86fd 100644
--- a/src/components/General/TextInput/TextInput.tsx
+++ b/src/components/General/TextInput/TextInput.tsx
@@ -37,6 +37,7 @@ interface Props extends TextInputProps {
     onScannerClose?: () => void;
     scannerFallback?: boolean;
     isLoading?: boolean;
+    multiline?: boolean;
 }
 
 interface State {
@@ -111,6 +112,8 @@ class Input extends Component<Props, State> {
             showScanner,
             keyboardType,
             autoCapitalize,
+            multiline,
+            secureTextEntry,
         } = this.props;
 
         const filteredProps = { ...this.props };
@@ -135,7 +138,12 @@ class Input extends Component<Props, State> {
         }
 
         return (
-            <View style={[styles.wrapper, containerStyle, focused && activeContainerStyle]}>
+            <View style={[
+                styles.wrapper,
+                containerStyle,
+                focused && activeContainerStyle,
+                multiline ? styles.multiline : styles.nonMultilineContainer,
+            ]}>
                 <TextInput
                     ref={this.instanceRef}
                     onFocus={this.onFocus}
@@ -143,8 +151,14 @@ class Input extends Component<Props, State> {
                     placeholderTextColor={StyleService.value('$textSecondary')}
                     autoCapitalize={autoCapitalize || 'none'}
                     autoCorrect={false}
-                    multiline={false}
-                    style={[styles.input, { paddingRight: scannerPadding }, inputStyle, focused && activeInputStyle]}
+                    multiline={!!multiline}
+                    style={[
+                        styles.input,
+                        { paddingRight: scannerPadding },
+                        inputStyle,
+                        focused && activeInputStyle,
+                        !multiline && secureTextEntry ? styles.nonMultilineSecureInput : undefined,
+                    ]}
                     {...filteredProps}
                 />
             </View>
diff --git a/src/components/General/TextInput/styles.ts b/src/components/General/TextInput/styles.ts
index 32abdd88a..de0af62e2 100644
--- a/src/components/General/TextInput/styles.ts
+++ b/src/components/General/TextInput/styles.ts
@@ -1,3 +1,5 @@
+import { Platform } from 'react-native';
+
 import StyleService from '@services/StyleService';
 
 import { AppFonts, AppSizes } from '@theme';
@@ -12,25 +14,37 @@ export default StyleService.create({
         alignSelf: 'stretch',
         paddingHorizontal: 15,
         borderColor: '$tint',
-        height: AppSizes.heightPercentageToDP(7),
         minHeight: 55,
         width: '100%',
         borderWidth: 2,
-        borderRadius: 14,
+        borderRadius: AppSizes.scale(75) / 5.5,
+    },
+    nonMultilineContainer: {
+        height: AppSizes.heightPercentageToDP(7),
+    },
+    nonMultilineSecureInput: { // family seed entry
+        height: AppSizes.heightPercentageToDP(7),
+        // lineHeight: AppSizes.heightPercentageToDP(7) / 2,
+        marginVertical: Platform.OS === 'ios' ? 2 : 0,
+        borderColor: '$transparent',
+        borderWidth: 1,
+    },
+    multiline: {
+        paddingVertical: Platform.OS === 'ios' ? 10 : 0,
     },
     input: {
         flex: 1,
         fontSize: AppFonts.base.size,
         color: '$blue',
-        fontFamily: AppFonts.base.familyMonoBold,
-        fontWeight: '600',
+        fontFamily: AppFonts.base.family,
     },
     scanIcon: {
         tintColor: '$white',
     },
     scanButton: {
         position: 'absolute',
-        right: 4,
+        right: 5,
+        // top: Platform.OS === 'ios' ? 10 : 9,
         height: AppSizes.heightPercentageToDP(6),
         width: AppSizes.heightPercentageToDP(6),
         minHeight: 45,
diff --git a/src/components/General/__tests__/__snapshots__/CheckBox.test.tsx.snap b/src/components/General/__tests__/__snapshots__/CheckBox.test.tsx.snap
index 5112d5bf4..ac87df537 100644
--- a/src/components/General/__tests__/__snapshots__/CheckBox.test.tsx.snap
+++ b/src/components/General/__tests__/__snapshots__/CheckBox.test.tsx.snap
@@ -49,9 +49,11 @@ exports[`[CheckBox] renders correctly when checked 1`] = `
 >
   <View
     style={
-      {
-        "flex": 1,
-      }
+      [
+        {
+          "flex": 1,
+        },
+      ]
     }
   >
     <View
@@ -201,9 +203,11 @@ exports[`[CheckBox] renders correctly when unchecked 1`] = `
 >
   <View
     style={
-      {
-        "flex": 1,
-      }
+      [
+        {
+          "flex": 1,
+        },
+      ]
     }
   >
     <View
diff --git a/src/components/General/__tests__/__snapshots__/InfoMessage.test.tsx.snap b/src/components/General/__tests__/__snapshots__/InfoMessage.test.tsx.snap
index e31cbd9cc..0da1a57d4 100644
--- a/src/components/General/__tests__/__snapshots__/InfoMessage.test.tsx.snap
+++ b/src/components/General/__tests__/__snapshots__/InfoMessage.test.tsx.snap
@@ -33,7 +33,7 @@ exports[`[InfoMessage] renders correctly Error 1`] = `
       style={
         {
           "flex": 1,
-          "paddingVertical": 10,
+          "paddingVertical": 5,
         }
       }
     >
@@ -94,7 +94,7 @@ exports[`[InfoMessage] renders correctly Info 1`] = `
       style={
         {
           "flex": 1,
-          "paddingVertical": 10,
+          "paddingVertical": 5,
         }
       }
     >
@@ -155,7 +155,7 @@ exports[`[InfoMessage] renders correctly Warning 1`] = `
       style={
         {
           "flex": 1,
-          "paddingVertical": 10,
+          "paddingVertical": 5,
         }
       }
     >
@@ -246,7 +246,7 @@ exports[`[InfoMessage] should render with icon Error 1`] = `
       style={
         {
           "flex": 1,
-          "paddingVertical": 10,
+          "paddingVertical": 5,
         }
       }
     >
@@ -337,7 +337,7 @@ exports[`[InfoMessage] should render with icon Info 1`] = `
       style={
         {
           "flex": 1,
-          "paddingVertical": 10,
+          "paddingVertical": 5,
         }
       }
     >
@@ -428,7 +428,7 @@ exports[`[InfoMessage] should render with icon Warning 1`] = `
       style={
         {
           "flex": 1,
-          "paddingVertical": 10,
+          "paddingVertical": 5,
         }
       }
     >
diff --git a/src/components/General/__tests__/__snapshots__/SearchBar.test.tsx.snap b/src/components/General/__tests__/__snapshots__/SearchBar.test.tsx.snap
index 468d899a8..87b75c954 100644
--- a/src/components/General/__tests__/__snapshots__/SearchBar.test.tsx.snap
+++ b/src/components/General/__tests__/__snapshots__/SearchBar.test.tsx.snap
@@ -31,7 +31,6 @@ exports[`[SearchBar] renders correctly 1`] = `
   onStartShouldSetResponder={[Function]}
   style={
     {
-      "backgroundColor": "#F3F6FA",
       "borderRadius": 18.375,
       "flexDirection": "row",
       "height": 73.5,
@@ -46,7 +45,7 @@ exports[`[SearchBar] renders correctly 1`] = `
         "alignItems": "center",
         "alignSelf": "center",
         "flexDirection": "column",
-        "left": 15,
+        "left": 5,
         "position": "absolute",
         "tintColor": "#000000",
       }
@@ -91,12 +90,11 @@ exports[`[SearchBar] renders correctly 1`] = `
         [
           {
             "color": "#000000",
-            "fontFamily": "UbuntuMono-Bold",
+            "fontFamily": "ProximaNova-Regular",
             "fontSize": 34.285714285714285,
-            "fontWeight": "600",
             "height": "100%",
-            "paddingLeft": 50,
-            "paddingRight": 50,
+            "paddingLeft": 35,
+            "paddingRight": 35,
             "paddingVertical": 0,
           },
           {
@@ -143,7 +141,6 @@ exports[`[SearchBar] should clear text 1`] = `
   onStartShouldSetResponder={[Function]}
   style={
     {
-      "backgroundColor": "#F3F6FA",
       "borderRadius": 18.375,
       "flexDirection": "row",
       "height": 73.5,
@@ -158,7 +155,7 @@ exports[`[SearchBar] should clear text 1`] = `
         "alignItems": "center",
         "alignSelf": "center",
         "flexDirection": "column",
-        "left": 15,
+        "left": 5,
         "position": "absolute",
         "tintColor": "#000000",
       }
@@ -203,12 +200,11 @@ exports[`[SearchBar] should clear text 1`] = `
         [
           {
             "color": "#000000",
-            "fontFamily": "UbuntuMono-Bold",
+            "fontFamily": "ProximaNova-Regular",
             "fontSize": 34.285714285714285,
-            "fontWeight": "600",
             "height": "100%",
-            "paddingLeft": 50,
-            "paddingRight": 50,
+            "paddingLeft": 35,
+            "paddingRight": 35,
             "paddingVertical": 0,
           },
           {
@@ -255,7 +251,6 @@ exports[`[SearchBar] should show clear button on text enter 1`] = `
   onStartShouldSetResponder={[Function]}
   style={
     {
-      "backgroundColor": "#F3F6FA",
       "borderRadius": 18.375,
       "flexDirection": "row",
       "height": 73.5,
@@ -270,7 +265,7 @@ exports[`[SearchBar] should show clear button on text enter 1`] = `
         "alignItems": "center",
         "alignSelf": "center",
         "flexDirection": "column",
-        "left": 15,
+        "left": 5,
         "position": "absolute",
         "tintColor": "#000000",
       }
@@ -315,12 +310,11 @@ exports[`[SearchBar] should show clear button on text enter 1`] = `
         [
           {
             "color": "#000000",
-            "fontFamily": "UbuntuMono-Bold",
+            "fontFamily": "ProximaNova-Regular",
             "fontSize": 34.285714285714285,
-            "fontWeight": "600",
             "height": "100%",
-            "paddingLeft": 50,
-            "paddingRight": 50,
+            "paddingLeft": 35,
+            "paddingRight": 35,
             "paddingVertical": 0,
           },
           {
diff --git a/src/components/General/__tests__/__snapshots__/SecurePinInput.test.tsx.snap b/src/components/General/__tests__/__snapshots__/SecurePinInput.test.tsx.snap
index cdff28e4c..c264b55a7 100644
--- a/src/components/General/__tests__/__snapshots__/SecurePinInput.test.tsx.snap
+++ b/src/components/General/__tests__/__snapshots__/SecurePinInput.test.tsx.snap
@@ -44,13 +44,16 @@ exports[`[SecurePinInput] renders correctly 1`] = `
   />
   <View
     style={
-      {
-        "alignItems": "center",
-        "display": "flex",
-        "flexDirection": "row",
-        "height": 156.94117647058823,
-        "justifyContent": "center",
-      }
+      [
+        {
+          "alignItems": "center",
+          "display": "flex",
+          "flexDirection": "row",
+          "height": 156.94117647058823,
+          "justifyContent": "center",
+        },
+        undefined,
+      ]
     }
   >
     <View
@@ -183,13 +186,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
 >
   <View
     style={
-      {
-        "alignItems": "center",
-        "display": "flex",
-        "flexDirection": "row",
-        "height": 156.94117647058823,
-        "justifyContent": "center",
-      }
+      [
+        {
+          "alignItems": "center",
+          "display": "flex",
+          "flexDirection": "row",
+          "height": 156.94117647058823,
+          "justifyContent": "center",
+        },
+        undefined,
+      ]
     }
   >
     <View
@@ -291,10 +297,14 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
   </View>
   <View
     style={
-      {
-        "marginTop": 98.08823529411764,
-        "width": 750,
-      }
+      [
+        {
+          "marginTop": 98.08823529411764,
+          "width": 750,
+        },
+        undefined,
+        undefined,
+      ]
     }
     testID="virtual-keyboard"
   >
@@ -325,14 +335,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="1-key"
       >
@@ -378,14 +390,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="2-key"
       >
@@ -433,14 +447,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="3-key"
       >
@@ -497,14 +513,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="4-key"
       >
@@ -552,14 +570,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="5-key"
       >
@@ -607,14 +627,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="6-key"
       >
@@ -671,14 +693,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="7-key"
       >
@@ -726,14 +750,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="8-key"
       >
@@ -781,14 +807,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="9-key"
       >
@@ -845,14 +873,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="y-key"
       >
@@ -895,14 +925,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="0-key"
       >
@@ -948,14 +980,16 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
         style={
-          {
-            "alignItems": "center",
-            "borderRadius": 45,
-            "height": 127.51470588235294,
-            "justifyContent": "center",
-            "margin": 5,
-            "width": 141.42857142857144,
-          }
+          [
+            {
+              "alignItems": "center",
+              "borderRadius": 45,
+              "height": 127.51470588235294,
+              "justifyContent": "center",
+              "margin": 5,
+              "width": 141.42857142857144,
+            },
+          ]
         }
         testID="x-key"
       >
@@ -972,9 +1006,14 @@ exports[`[SecurePinInput] renders correctly with virtualKeyboard 1`] = `
                 "height": 55,
                 "width": 55,
               },
-              {
-                "tintColor": "#000000",
-              },
+              [
+                {
+                  "tintColor": "#000000",
+                },
+                {
+                  "marginTop": -15,
+                },
+              ],
             ]
           }
         />
diff --git a/src/components/General/__tests__/__snapshots__/Switch.test.tsx.snap b/src/components/General/__tests__/__snapshots__/Switch.test.tsx.snap
index 74275a68c..3cdd85feb 100644
--- a/src/components/General/__tests__/__snapshots__/Switch.test.tsx.snap
+++ b/src/components/General/__tests__/__snapshots__/Switch.test.tsx.snap
@@ -13,9 +13,12 @@ exports[`[Switch] renders correctly 1`] = `
 >
   <View
     style={
-      {
-        "alignSelf": "center",
-      }
+      [
+        {
+          "alignSelf": "center",
+        },
+        undefined,
+      ]
     }
   >
     <View>
@@ -60,9 +63,12 @@ exports[`[Switch] renders with given label 1`] = `
 >
   <View
     style={
-      {
-        "alignSelf": "center",
-      }
+      [
+        {
+          "alignSelf": "center",
+        },
+        undefined,
+      ]
     }
   >
     <View>
diff --git a/src/components/General/__tests__/__snapshots__/TextInput.test.tsx.snap b/src/components/General/__tests__/__snapshots__/TextInput.test.tsx.snap
index b638363da..c98b9da80 100644
--- a/src/components/General/__tests__/__snapshots__/TextInput.test.tsx.snap
+++ b/src/components/General/__tests__/__snapshots__/TextInput.test.tsx.snap
@@ -20,10 +20,9 @@ exports[`[TextInput] renders correctly 1`] = `
           "alignSelf": "stretch",
           "backgroundColor": "#F3F6FA",
           "borderColor": "#F3F6FA",
-          "borderRadius": 14,
+          "borderRadius": 29.22077922077922,
           "borderWidth": 2,
           "flexDirection": "row",
-          "height": 93.5,
           "justifyContent": "center",
           "minHeight": 55,
           "paddingHorizontal": 15,
@@ -31,6 +30,9 @@ exports[`[TextInput] renders correctly 1`] = `
         },
         undefined,
         false,
+        {
+          "height": 93.5,
+        },
       ]
     }
   >
@@ -46,15 +48,15 @@ exports[`[TextInput] renders correctly 1`] = `
           {
             "color": "#0030CF",
             "flex": 1,
-            "fontFamily": "UbuntuMono-Bold",
+            "fontFamily": "ProximaNova-Regular",
             "fontSize": 32.14285714285714,
-            "fontWeight": "600",
           },
           {
             "paddingRight": 0,
           },
           undefined,
           false,
+          undefined,
         ]
       }
     />
diff --git a/src/components/Modules/AccountElement/AccountElement.tsx b/src/components/Modules/AccountElement/AccountElement.tsx
index 8890840a3..2efe45f83 100644
--- a/src/components/Modules/AccountElement/AccountElement.tsx
+++ b/src/components/Modules/AccountElement/AccountElement.tsx
@@ -14,6 +14,7 @@ import { TouchableDebounce, Avatar, Badge, Icon, LoadingIndicator } from '@compo
 import Localize from '@locale';
 
 import { Props as ParticipantMenuOverlayProps } from '@screens/Overlay/ParticipantMenu/types';
+import { type cachedTokenDetailsState } from '@components/Modules/EventsList/EventListItems/Transaction';
 
 import { AppStyles } from '@theme';
 import styles from './styles';
@@ -43,6 +44,7 @@ interface Props {
     textStyle?: TextStyle | TextStyle[];
     onPress?: (account: AccountElementType) => void;
     onInfoUpdate?: (info: AccountNameResolveType) => void;
+    tokenDetails?: cachedTokenDetailsState;
 }
 
 interface State {
@@ -174,7 +176,7 @@ class AccountElement extends Component<Props, State> {
     };
 
     renderAvatar = () => {
-        const { address, visibleElements } = this.props;
+        const { address, visibleElements, tokenDetails } = this.props;
         const { info } = this.state;
 
         if (!visibleElements?.avatar) return null;
@@ -185,7 +187,11 @@ class AccountElement extends Component<Props, State> {
             badge = 'IconCheckXaman';
         }
 
-        return <Avatar source={{ uri: `${WebLinks.AvatarURL}/${address}_180_50.png` }} badge={badge} border />;
+        if (tokenDetails && tokenDetails?.participant === address) {
+            return tokenDetails.icon;
+        }
+
+        return <Avatar source={{ uri: `${WebLinks.AvatarURL}/${address}_180_50.png` }} badge={badge} />;
     };
 
     renderSource = () => {
@@ -201,8 +207,19 @@ class AccountElement extends Component<Props, State> {
     };
 
     renderName = () => {
-        const { textStyle } = this.props;
+        const { address, textStyle, tokenDetails } = this.props;
         const { isLoading, info } = this.state;
+        
+        if (tokenDetails && tokenDetails?.participant === address) {
+            return (
+                <View style={[AppStyles.flex1, AppStyles.row]}>
+                    <Text numberOfLines={1} style={[styles.nameText, textStyle]}>
+                        {tokenDetails.title}
+                    </Text>
+                    {this.renderSource()}
+                </View>
+            );
+        }
 
         if (isLoading || typeof info === 'undefined') {
             return (
diff --git a/src/components/Modules/AccountElement/styles.ts b/src/components/Modules/AccountElement/styles.ts
index 2a7e1edb5..ef79b0735 100644
--- a/src/components/Modules/AccountElement/styles.ts
+++ b/src/components/Modules/AccountElement/styles.ts
@@ -7,13 +7,12 @@ export default StyleService.create({
         flexDirection: 'row',
         alignItems: 'center',
         padding: 5,
-        marginBottom: 8,
-        backgroundColor: '$tint',
+        marginBottom: 0,
+        // backgroundColor: '$tint',
         borderRadius: 12,
         borderWidth: 2,
-        borderColor: '$tint',
+        borderColor: '$transparent',
     },
-
     centerContent: {
         paddingLeft: 10,
     },
diff --git a/src/components/Modules/AccountPicker/styles.ts b/src/components/Modules/AccountPicker/styles.ts
index 0856856ed..86c067006 100644
--- a/src/components/Modules/AccountPicker/styles.ts
+++ b/src/components/Modules/AccountPicker/styles.ts
@@ -4,14 +4,14 @@ import { AppStyles, AppFonts } from '@theme';
 /* Styles ==================================================================== */
 export default StyleService.create({
     pickerContainer: {
-        borderRadius: 15,
-        backgroundColor: '$tint',
-        height: 80,
-        paddingHorizontal: 17,
+        borderRadius: 8,
+        // backgroundColor: '$tint',
+        height: 40,
+        paddingHorizontal: 0,
         justifyContent: 'center',
     },
     collapseButton: {
-        backgroundColor: '$black',
+        // backgroundColor: '$black',
         borderRadius: 8,
         height: 25,
         width: 40,
@@ -21,7 +21,7 @@ export default StyleService.create({
     },
     collapseIcon: {
         alignSelf: 'center',
-        tintColor: '$white',
+        tintColor: '$fark',
     },
     accountItemTitle: {
         fontSize: AppStyles.baseText.fontSize,
diff --git a/src/components/Modules/AccountSwitchElement/AccountSwitchElement.tsx b/src/components/Modules/AccountSwitchElement/AccountSwitchElement.tsx
index 80ee906fc..25da17c6c 100644
--- a/src/components/Modules/AccountSwitchElement/AccountSwitchElement.tsx
+++ b/src/components/Modules/AccountSwitchElement/AccountSwitchElement.tsx
@@ -24,6 +24,7 @@ interface Props {
     onSwitcherClose?: () => void;
     showAddAccountButton?: boolean;
     containerStyle?: ViewStyle | ViewStyle[];
+    noPadding?: boolean;
 }
 
 interface State {
@@ -81,10 +82,11 @@ class AccountSwitchElement extends Component<Props, State> {
     };
 
     render() {
-        const { account, discreet, containerStyle } = this.props;
+        const { account, discreet, noPadding, containerStyle } = this.props;
+        // const { account, discreet, containerStyle } = this.props;
         const { isSwitcherOpen } = this.state;
 
-        if (!account) {
+        if (!account?.isValid()) {
             return (
                 <View style={styles.container}>
                     <Text style={styles.accountLabelText} numberOfLines={1}>
@@ -95,7 +97,11 @@ class AccountSwitchElement extends Component<Props, State> {
         }
 
         return (
-            <TouchableDebounce activeOpacity={0.7} onPress={this.onPress} style={[styles.container, containerStyle]}>
+            <TouchableDebounce activeOpacity={0.7} onPress={this.onPress} style={[
+                styles.container,
+                containerStyle,
+                noPadding && styles.containerNoPadding,
+            ]}>
                 <View style={AppStyles.flex1}>
                     <Text style={styles.accountLabelText} numberOfLines={1}>
                         {account.label}
diff --git a/src/components/Modules/AccountSwitchElement/styles.ts b/src/components/Modules/AccountSwitchElement/styles.ts
index 871df5b1b..dd86c0f03 100644
--- a/src/components/Modules/AccountSwitchElement/styles.ts
+++ b/src/components/Modules/AccountSwitchElement/styles.ts
@@ -5,19 +5,26 @@ import { AppFonts, AppSizes } from '@theme';
 export default StyleService.create({
     container: {
         flexDirection: 'row',
-        backgroundColor: '$tint',
-        borderRadius: 12,
-        padding: AppSizes.paddingExtraSml,
+        // backgroundColor: '$tint',
+        // borderRadius: 12,
+        // padding: AppSizes.paddingExtraSml,
         paddingHorizontal: AppSizes.paddingSml,
+        marginBottom: 5,
+    },
+    containerNoPadding: { // xApp header
+        paddingRight: 0,
+        paddingLeft: 3,
     },
     accountLabelText: {
         fontFamily: AppFonts.base.familyExtraBold,
         fontSize: AppFonts.p.size,
+        lineHeight: AppFonts.p.size * 1.4,
         color: '$textPrimary',
     },
     accountAddressText: {
         fontFamily: AppFonts.base.familyMono,
         fontSize: AppFonts.small.size,
+        lineHeight: AppFonts.small.size * 1.1,
         color: '$textSecondary',
     },
     iconChevron: {
diff --git a/src/components/Modules/AssetsList/Tokens/ListFilter/ListFilter.tsx b/src/components/Modules/AssetsList/Tokens/ListFilter/ListFilter.tsx
index 7247babe6..05aaca4ae 100644
--- a/src/components/Modules/AssetsList/Tokens/ListFilter/ListFilter.tsx
+++ b/src/components/Modules/AssetsList/Tokens/ListFilter/ListFilter.tsx
@@ -1,12 +1,12 @@
 import { isEqual } from 'lodash';
 import React, { Component } from 'react';
-import { Animated, View } from 'react-native';
+import { View } from 'react-native';
 
 import { TouchableDebounce, Icon, SearchBar } from '@components/General';
 
 import Localize from '@locale';
 
-import { AppSizes } from '@theme';
+// import { AppSizes } from '@theme';
 import styles from './styles';
 
 /* Types ==================================================================== */
@@ -32,7 +32,6 @@ interface State {
 
 /* Component ==================================================================== */
 class ListFilter extends Component<Props, State> {
-    private animatedContainer: Animated.Value;
     private readonly searchInputRef: React.RefObject<SearchBar>;
 
     constructor(props: Props) {
@@ -46,7 +45,6 @@ class ListFilter extends Component<Props, State> {
         };
 
         this.searchInputRef = React.createRef();
-        this.animatedContainer = new Animated.Value(1);
     }
 
     shouldComponentUpdate(nextProps: Readonly<Props>, nextState: Readonly<State>): boolean {
@@ -124,51 +122,43 @@ class ListFilter extends Component<Props, State> {
     onFavoritePress = () => {
         const { favoritesEnabled } = this.state;
 
-        this.setState(
-            {
+        this.setState({
+            filterText: undefined,
+        }, () => {
+            this.setState({
                 ownUpdate: true,
+                filterText: undefined,
                 favoritesEnabled: !favoritesEnabled,
-            },
-            this.onFilterChange,
-        );
+            }, this.onFilterChange);
+        });
     };
 
     onHideZeroPress = () => {
         const { hideZeroEnabled } = this.state;
 
-        this.setState(
-            {
+        this.setState({
+            filterText: undefined,
+        }, () => {
+            this.setState({
                 ownUpdate: true,
                 hideZeroEnabled: !hideZeroEnabled,
-            },
-            this.onFilterChange,
-        );
+            }, this.onFilterChange);    
+        });
     };
 
     onFilterTextChange = (filterText: string) => {
-        this.setState(
-            {
-                ownUpdate: true,
-                filterText,
-            },
-            this.onFilterChange,
-        );
+        this.setState({
+            ownUpdate: true,
+            hideZeroEnabled: false,
+            favoritesEnabled: false,
+            filterText,
+        }, this.onFilterChange);
     };
 
     onSearchInputFocus = () => {
-        Animated.timing(this.animatedContainer, {
-            toValue: 0,
-            duration: 300,
-            useNativeDriver: false,
-        }).start();
     };
 
     onSearchInputBlur = () => {
-        Animated.timing(this.animatedContainer, {
-            toValue: 1,
-            duration: 300,
-            useNativeDriver: false,
-        }).start();
     };
 
     onSearchClearButtonPress = () => {
@@ -186,21 +176,11 @@ class ListFilter extends Component<Props, State> {
             return null;
         }
 
-        const maxWidthInterpolate = this.animatedContainer.interpolate({
-            inputRange: [0, 1],
-            outputRange: [0, 1000],
-        });
-
-        const opacityInterpolate = this.animatedContainer.interpolate({
-            inputRange: [0, 1],
-            outputRange: [0, 1],
-        });
-
         return (
             <View style={styles.container}>
                 <SearchBar
                     ref={this.searchInputRef}
-                    height={AppSizes.heightPercentageToDP(4.5)}
+                    height={styles.filterButton.height}
                     onChangeText={this.onFilterTextChange}
                     onFocus={this.onSearchInputFocus}
                     onBlur={this.onSearchInputBlur}
@@ -211,12 +191,10 @@ class ListFilter extends Component<Props, State> {
                     iconStyle={styles.searchBarIcon}
                     clearButtonVisibility="focus"
                     iconSize={15}
-                    border
                 />
-                <Animated.View
+                <View
                     style={[
                         styles.filterButtonsContainer,
-                        { maxWidth: maxWidthInterpolate, opacity: opacityInterpolate },
                     ]}
                 >
                     <TouchableDebounce onPress={this.onReorderPress} style={[styles.filterButton]}>
@@ -242,7 +220,7 @@ class ListFilter extends Component<Props, State> {
                             style={[styles.filterButtonIcon, hideZeroEnabled && styles.hideZeroIconActive]}
                         />
                     </TouchableDebounce>
-                </Animated.View>
+                </View>
             </View>
         );
     }
diff --git a/src/components/Modules/AssetsList/Tokens/ListFilter/styles.ts b/src/components/Modules/AssetsList/Tokens/ListFilter/styles.ts
index e5f6ebd18..ef383e235 100644
--- a/src/components/Modules/AssetsList/Tokens/ListFilter/styles.ts
+++ b/src/components/Modules/AssetsList/Tokens/ListFilter/styles.ts
@@ -20,10 +20,10 @@ export default StyleService.create({
         flexDirection: 'row',
     },
     filterButton: {
-        height: AppSizes.scale(30),
-        borderRadius: AppSizes.scale(30) / 2,
-        backgroundColor: '$tint',
-        paddingHorizontal: 15,
+        height: 35,
+        borderRadius: AppSizes.scale(35) / 4,
+        // backgroundColor: '$tint',
+        paddingHorizontal: 8,
         marginHorizontal: 3,
         justifyContent: 'center',
         alignItems: 'center',
diff --git a/src/components/Modules/AssetsList/Tokens/ListHeader/ListHeader.tsx b/src/components/Modules/AssetsList/Tokens/ListHeader/ListHeader.tsx
index 7959a53cf..17d27f8cb 100644
--- a/src/components/Modules/AssetsList/Tokens/ListHeader/ListHeader.tsx
+++ b/src/components/Modules/AssetsList/Tokens/ListHeader/ListHeader.tsx
@@ -68,7 +68,7 @@ class ListHeader extends PureComponent<Props> {
         if (showTokenAddButton) {
             return (
                 <Button
-                    secondary
+                    light
                     roundedMini
                     numberOfLines={1}
                     testID="add-token-button"
diff --git a/src/components/Modules/AssetsList/Tokens/NativeItem/NativeItem.tsx b/src/components/Modules/AssetsList/Tokens/NativeItem/NativeItem.tsx
index 0f5ddffb5..b2aa80c75 100644
--- a/src/components/Modules/AssetsList/Tokens/NativeItem/NativeItem.tsx
+++ b/src/components/Modules/AssetsList/Tokens/NativeItem/NativeItem.tsx
@@ -145,7 +145,7 @@ class NativeItem extends Component<Props, State> {
     };
 
     getTokenAvatar = () => {
-        return <TokenAvatar token="Native" border size={35} />;
+        return <TokenAvatar token="Native" networkService={NetworkService} size={35} />;
     };
 
     getTokenIcon = () => {
diff --git a/src/components/Modules/AssetsList/Tokens/NativeItem/styles.ts b/src/components/Modules/AssetsList/Tokens/NativeItem/styles.ts
index 872552c04..585409ac4 100644
--- a/src/components/Modules/AssetsList/Tokens/NativeItem/styles.ts
+++ b/src/components/Modules/AssetsList/Tokens/NativeItem/styles.ts
@@ -5,10 +5,10 @@ import { AppFonts, AppSizes } from '@theme';
 export default StyleService.create({
     currencyItem: {
         justifyContent: 'space-between',
-        backgroundColor: '$lightBlue',
+        // backgroundColor: '$lightBlue',
         borderRadius: 10,
-        paddingHorizontal: 5,
-        paddingVertical: 5,
+        // paddingHorizontal: 5,
+        // paddingVertical: 5,
         marginHorizontal: AppSizes.paddingSml,
     },
     balanceRow: {
diff --git a/src/components/Modules/AssetsList/Tokens/TokenItem/TokenItem.tsx b/src/components/Modules/AssetsList/Tokens/TokenItem/TokenItem.tsx
index c41501676..767fbbcc6 100644
--- a/src/components/Modules/AssetsList/Tokens/TokenItem/TokenItem.tsx
+++ b/src/components/Modules/AssetsList/Tokens/TokenItem/TokenItem.tsx
@@ -3,7 +3,7 @@ import isEqual from 'lodash/isEqual';
 import React, { PureComponent } from 'react';
 import { View, Text } from 'react-native';
 
-import { Button, AmountText, Icon } from '@components/General';
+import { Button, AmountText, Icon, Badge, BadgeType } from '@components/General';
 
 import { TokenAvatar, TokenIcon } from '@components/Modules/TokenElement';
 
@@ -160,7 +160,7 @@ class TokenItem extends PureComponent<Props, State> {
                     <View style={styles.tokenAvatarContainer}>
                         <TokenAvatar
                             token={token}
-                            border
+                            // border
                             size={35}
                             badge={this.getTokenAvatarBadge}
                             saturate={saturate}
@@ -169,6 +169,17 @@ class TokenItem extends PureComponent<Props, State> {
                     <View style={[AppStyles.column, AppStyles.centerContent]}>
                         <Text numberOfLines={1} style={styles.currencyLabel} ellipsizeMode="middle">
                             {token.getFormattedCurrency()}
+                            {
+                                token.isLiquidityPoolToken() && (
+                                    <View style={styles.lpBadgeContainer}>
+                                        <Badge
+                                            label="LP"
+                                            type={BadgeType.Planned}
+                                            containerStyle={styles.lpBadge}
+                                        />
+                                    </View>
+                                )
+                            }
                         </Text>
                         <Text numberOfLines={1} style={styles.issuerLabel}>
                             {token.getFormattedIssuer()}
diff --git a/src/components/Modules/AssetsList/Tokens/TokenItem/styles.ts b/src/components/Modules/AssetsList/Tokens/TokenItem/styles.ts
index a0db40aa9..511cfc238 100644
--- a/src/components/Modules/AssetsList/Tokens/TokenItem/styles.ts
+++ b/src/components/Modules/AssetsList/Tokens/TokenItem/styles.ts
@@ -1,10 +1,11 @@
 import StyleService from '@services/StyleService';
 
 import { AppFonts, AppSizes } from '@theme';
+
 /* Styles ==================================================================== */
 export default StyleService.create({
     currencyItem: {
-        width: AppSizes.screen.width,
+        width: AppSizes.screen.uncorrectedWidth, // Fixes fold devices
         flexDirection: 'row',
         backgroundColor: '$background',
         paddingHorizontal: AppSizes.paddingList,
@@ -23,6 +24,15 @@ export default StyleService.create({
         fontFamily: AppFonts.base.family,
         color: '$grey',
     },
+    lpBadgeContainer: {
+        height: AppFonts.subtext.size * 0.85,
+    },
+    lpBadge: {
+        paddingTop: 2,
+        paddingLeft: 4,
+        paddingRight: 3,
+        height: AppFonts.subtext.size * 0.95,
+    },
     balanceContainer: {
         flex: 1,
         flexDirection: 'row',
@@ -33,7 +43,11 @@ export default StyleService.create({
         marginRight: 10,
     },
     tokenIconContainer: {
-        paddingRight: 5,
+        marginRight: 5,
+        borderRadius: 3,
+        borderColor: '$background',
+        borderWidth: 1,
+        overflow: 'hidden',
     },
     reorderButtonContainer: {
         flexDirection: 'row',
diff --git a/src/components/Modules/AssetsList/Tokens/TokensList.tsx b/src/components/Modules/AssetsList/Tokens/TokensList.tsx
index f5e9ea6f8..99beb918f 100644
--- a/src/components/Modules/AssetsList/Tokens/TokensList.tsx
+++ b/src/components/Modules/AssetsList/Tokens/TokensList.tsx
@@ -22,6 +22,7 @@ import { NativeItem } from '@components/Modules/AssetsList/Tokens/NativeItem';
 import { ListHeader } from '@components/Modules/AssetsList/Tokens/ListHeader';
 import { ListEmpty } from '@components/Modules/AssetsList/Tokens/ListEmpty';
 import { ListFilter, FiltersType } from '@components/Modules/AssetsList/Tokens/ListFilter';
+import { AppSizes } from '@theme/index';
 
 /* Types ==================================================================== */
 interface Props {
@@ -212,6 +213,7 @@ class TokensList extends Component<Props, State> {
                 {
                     overlay: {
                         interceptTouchOutside: false,
+                        //     ^^  Needed for tapping backdrop = close, uses onTouchStart={this.startTouch}
                     },
                 },
             );
@@ -353,12 +355,16 @@ class TokensList extends Component<Props, State> {
                     onTokenAddPress={this.onTokenAddButtonPress}
                     onTitlePress={this.onCategoryChangePress}
                 />
-                <ListFilter
-                    filters={filters}
-                    visible={!reorderEnabled && typeof experimentalUI !== 'undefined' && !experimentalUI}
-                    onFilterChange={this.onFilterChange}
-                    onReorderPress={this.toggleReordering}
-                />
+                { !reorderEnabled && (
+                    <View style={{height: AppSizes.scale(41)}}>
+                        <ListFilter
+                            filters={filters}
+                            visible={typeof experimentalUI !== 'undefined' && !experimentalUI}
+                            onFilterChange={this.onFilterChange}
+                            onReorderPress={this.toggleReordering}
+                        />
+                    </View>
+                )}
                 <NativeItem
                     account={account}
                     discreetMode={discreetMode}
diff --git a/src/components/Modules/CurrencyPicker/CurrencyItem/CurrencyItem.tsx b/src/components/Modules/CurrencyPicker/CurrencyItem/CurrencyItem.tsx
index 069b2c68e..451b273e6 100644
--- a/src/components/Modules/CurrencyPicker/CurrencyItem/CurrencyItem.tsx
+++ b/src/components/Modules/CurrencyPicker/CurrencyItem/CurrencyItem.tsx
@@ -30,7 +30,7 @@ class CurrencyItem extends Component<Props> {
         return (
             <View style={[AppStyles.row, AppStyles.centerAligned]}>
                 <View style={styles.currencyImageContainer}>
-                    <TokenAvatar token="Native" border size={35} />
+                    <TokenAvatar token="Native" size={35} />
                 </View>
                 <View style={[AppStyles.column, AppStyles.centerContent]}>
                     <Text style={[styles.currencyItemLabel, selected && AppStyles.colorBlue]}>
diff --git a/src/components/Modules/CurrencyPicker/CurrencyPicker.tsx b/src/components/Modules/CurrencyPicker/CurrencyPicker.tsx
index c57aef358..5123b7584 100644
--- a/src/components/Modules/CurrencyPicker/CurrencyPicker.tsx
+++ b/src/components/Modules/CurrencyPicker/CurrencyPicker.tsx
@@ -22,6 +22,7 @@ interface Props {
     selectedItem?: TrustLineModel | string;
     onSelect?: (item: any) => void;
     containerStyle?: ViewStyle;
+    timestamp?: number;
 }
 
 interface State {
@@ -89,7 +90,11 @@ class CurrencyPicker extends Component<Props, State> {
         }
 
         return (
-            <TouchableDebounce activeOpacity={0.9} onPress={this.showPicker} style={[styles.pickerContainer]}>
+            <TouchableDebounce
+                activeOpacity={0.9}
+                onPress={this.showPicker}
+                style={[styles.pickerContainer]}
+            >
                 <View style={AppStyles.row}>
                     <View style={AppStyles.flex1}>
                         <CurrencyItem account={account} item={selectedItem} />
diff --git a/src/components/Modules/CurrencyPicker/styles.ts b/src/components/Modules/CurrencyPicker/styles.ts
index 118e309b4..f26b1db9c 100644
--- a/src/components/Modules/CurrencyPicker/styles.ts
+++ b/src/components/Modules/CurrencyPicker/styles.ts
@@ -4,13 +4,13 @@ import StyleService from '@services/StyleService';
 export default StyleService.create({
     pickerContainer: {
         borderRadius: 15,
-        backgroundColor: '$tint',
-        height: 80,
-        paddingHorizontal: 17,
+        // backgroundColor: '$tint',
+        height: 40,
+        // paddingHorizontal: 17,
         justifyContent: 'center',
     },
     collapseButton: {
-        backgroundColor: '$black',
+        // backgroundColor: '$black',
         borderRadius: 8,
         height: 25,
         width: 40,
@@ -20,6 +20,6 @@ export default StyleService.create({
     },
     collapseIcon: {
         alignSelf: 'center',
-        tintColor: '$white',
+        tintColor: '$contrast',
     },
 });
diff --git a/src/components/Modules/EventsList/EventListItems/Blocks/Avatar.tsx b/src/components/Modules/EventsList/EventListItems/Blocks/Avatar.tsx
index bb6d9f6ce..036a8f783 100644
--- a/src/components/Modules/EventsList/EventListItems/Blocks/Avatar.tsx
+++ b/src/components/Modules/EventsList/EventListItems/Blocks/Avatar.tsx
@@ -45,7 +45,7 @@ class AvatarBlock extends PureComponent<IProps> {
         return (
             <View style={styles.avatarContainer}>
                 <Avatar
-                    border
+                    // border
                     source={{ uri: `${WebLinks.AvatarURL}/${participant?.address}_180_50.png` }}
                     isLoading={!participant}
                     badge={badgeProps?.badge}
diff --git a/src/components/Modules/EventsList/EventListItems/Blocks/Monetary.tsx b/src/components/Modules/EventsList/EventListItems/Blocks/Monetary.tsx
index 2a04ba6c0..5c1fa7b06 100644
--- a/src/components/Modules/EventsList/EventListItems/Blocks/Monetary.tsx
+++ b/src/components/Modules/EventsList/EventListItems/Blocks/Monetary.tsx
@@ -75,7 +75,7 @@ class Monetary extends PureComponent<IProps, State> {
                 value: factor.at(0)?.value,
                 currency: factor.at(0)?.currency,
                 style: factor.at(0)?.action
-                    ? factor.at(0)?.action
+                    ? factor.at(0)?.action === OperationActions.DEC
                         ? styles.pendingDecColor
                         : styles.pendingIncColor
                     : styles.notEffectedColor,
diff --git a/src/components/Modules/EventsList/EventListItems/Request.tsx b/src/components/Modules/EventsList/EventListItems/Request.tsx
index 29944080b..c2b673567 100644
--- a/src/components/Modules/EventsList/EventListItems/Request.tsx
+++ b/src/components/Modules/EventsList/EventListItems/Request.tsx
@@ -185,7 +185,7 @@ class RequestItem extends Component<Props, State> {
                 style={[styles.container, { height: RequestItem.Height }]}
             >
                 <View style={[AppStyles.flex1, AppStyles.centerContent]}>
-                    <Avatar border source={{ uri: item.getApplicationIcon() }} />
+                    <Avatar source={{ uri: item.getApplicationIcon() }} />
                 </View>
                 <View style={[AppStyles.flex3, AppStyles.centerContent]}>
                     <Text style={styles.label}>{item.getApplicationName()}</Text>
diff --git a/src/components/Modules/EventsList/EventListItems/Transaction.tsx b/src/components/Modules/EventsList/EventListItems/Transaction.tsx
index eb5aaeb17..cb8a17465 100644
--- a/src/components/Modules/EventsList/EventListItems/Transaction.tsx
+++ b/src/components/Modules/EventsList/EventListItems/Transaction.tsx
@@ -1,8 +1,14 @@
 import { isEmpty, isEqual } from 'lodash';
 
+// import { NetworkService } from '@services';
+
 import React, { Component } from 'react';
-import { View, InteractionManager } from 'react-native';
+import { Text, View, InteractionManager } from 'react-native';
+import type { RatesType } from '@services/BackendService';
+
+import Localize from '@locale';
 
+import AppConfig from '@common/constants/config';
 import { AppScreens } from '@common/constants';
 
 import { ExplainerFactory } from '@common/libs/ledger/factory';
@@ -13,12 +19,13 @@ import { ExplainerAbstract } from '@common/libs/ledger/factory/types';
 import { LedgerObjects } from '@common/libs/ledger/objects/types';
 
 import { AccountModel } from '@store/models';
+import { TokenAvatar } from '@components/Modules/TokenElement';
 
 import ResolverService, { AccountNameResolveType } from '@services/ResolverService';
 
 import { Navigator } from '@common/helpers/navigator';
 
-import { TouchableDebounce } from '@components/General';
+import { TouchableDebounce, Badge, BadgeType } from '@components/General';
 
 import { TransactionDetailsViewProps } from '@screens/Events/Details';
 
@@ -26,23 +33,41 @@ import * as Blocks from './Blocks';
 
 import { AppSizes, AppStyles } from '@theme';
 import styles from './styles';
+import lpStyles from '@components/Modules/AssetsList/Tokens/TokenItem/styles';
+import trustLine from '@store/repositories/trustLine';
 
 /* types ==================================================================== */
+export interface cachedTokenDetailsState {
+    title?: React.JSX.Element;
+    participant?: string;
+    icon?: React.JSX.Element;
+    account?: string;
+};
+
 export interface Props {
     account: AccountModel;
     item: Transactions & MutationsMixinType;
     timestamp?: number;
+    rates?: {
+        fiatCurrency: string;
+        fiatRate: RatesType | undefined;
+        isLoadingRate: boolean;
+    };
 }
 
 export interface State {
     isLoading: boolean;
     participant?: AccountNameResolveType;
     explainer?: ExplainerAbstract<CombinedTransactions | LedgerObjects>;
+    isFeeTransaction?: boolean;
+    feeText?: string;
+    cachedTokenDetails: cachedTokenDetailsState;
 }
 
 /* Component ==================================================================== */
 class TransactionItem extends Component<Props, State> {
     static Height = AppSizes.heightPercentageToDP(7.5);
+    static FeeHeight = AppSizes.heightPercentageToDP(4);
 
     private mounted = false;
 
@@ -53,19 +78,27 @@ class TransactionItem extends Component<Props, State> {
             isLoading: true,
             participant: undefined,
             explainer: undefined,
+            cachedTokenDetails: {
+                title: undefined,
+                icon: undefined,
+                account: undefined,
+                participant: undefined,
+            },
         };
     }
 
     shouldComponentUpdate(nextProps: Props, nextState: State) {
-        const { item, timestamp } = this.props;
-        const { isLoading, participant, explainer } = this.state;
+        // const { item, timestamp } = this.props;
+        // const { isLoading, participant, explainer } = this.state;
+        const { isLoading, cachedTokenDetails } = this.state;
 
         return (
-            !isEqual(nextProps.item?.hash, item?.hash) ||
+            // !isEqual(nextProps.item?.hash, item?.hash) ||
             !isEqual(nextState.isLoading, isLoading) ||
-            !isEqual(nextState.participant, participant) ||
-            !isEqual(nextState.explainer, explainer) ||
-            !isEqual(nextProps.timestamp, timestamp)
+            !isEqual(nextState.cachedTokenDetails.account, cachedTokenDetails.account)
+            // !isEqual(nextState.participant, participant) ||
+            // !isEqual(nextState.explainer, explainer) // ||
+            // !isEqual(nextProps.timestamp, timestamp)
         );
     }
 
@@ -98,6 +131,8 @@ class TransactionItem extends Component<Props, State> {
         if (!isLoading) {
             this.setState({
                 isLoading: true,
+                feeText: '',
+                isFeeTransaction: false,
             });
         }
 
@@ -118,16 +153,44 @@ class TransactionItem extends Component<Props, State> {
                 ? participants.start
                 : participants.end?.address && participants.end?.address !== account.address
                   ? participants.end
-                  : { address: account.address };
+                  : { address: account.address };        
 
         try {
             // get participant details
             const resp = await ResolverService.getAccountName(otherParty.address, otherParty.tag);
+
+            const isFeeTransaction = resp?.address && AppConfig?.feeAccount &&
+                String(resp?.address || '') === String(AppConfig?.feeAccount || '') &&
+                typeof item.MetaData.delivered_amount === 'string' &&
+                (item as any)?._tx?.InvoiceID;
+
+            let feeText = '';
+            
+            if (isFeeTransaction) {
+                const feeFactor = explainer?.getMonetaryDetails()?.factor?.[0];
+                if (feeFactor) {
+                    feeText = `${feeFactor?.value} ${feeFactor?.currency}`.trim();
+                    // if (rates?.fiatRate?.rate && rates?.fiatRate?.symbol) {
+                    // const effectiveAmount = Number(feeFactor?.value || 0) * Number(rates?.fiatRate?.rate || 0);
+                    const effectiveAmount = Number(feeFactor?.value || 0);
+                    if (effectiveAmount !== 0) {
+                        feeText = `${Localize.formatNumber(effectiveAmount, 6)} ${feeFactor?.currency}`.trim();
+                        // feeText = `${rates?.fiatRate?.symbol} ${Localize.formatNumber(effectiveAmount, 2)}`.trim();
+                        // if (effectiveAmount < 0.01) {
+                        //     feeText = `< ${rates?.fiatRate?.symbol} ${Localize.formatNumber(0.01, 2)}`.trim();
+                        // } 
+                    }
+                // }
+                }
+            }
+
             if (!isEmpty(resp) && this.mounted) {
                 this.setState({
                     explainer,
                     participant: resp,
                     isLoading: false,
+                    feeText,
+                    isFeeTransaction,
                 });
             }
         } catch (error) {
@@ -139,42 +202,192 @@ class TransactionItem extends Component<Props, State> {
                 });
             }
         }
+
+        this.getTokenDetails();
     };
 
     onPress = () => {
         const { item, account } = this.props;
+        const { cachedTokenDetails } = this.state;
 
         Navigator.push<TransactionDetailsViewProps>(AppScreens.Transaction.Details, {
             item,
             account,
+            cachedTokenDetails,
         });
     };
 
-    render() {
+    getTokenDetails() {
         const { item, account } = this.props;
-        const { participant, explainer } = this.state;
+        const { participant, cachedTokenDetails } = this.state;
+
+        if (cachedTokenDetails?.icon) return;
+
+        let changesToAmmLine;
+        let changesSwap;
+
+        if ([
+            'AMMCreate',
+            'AMMDeposit',
+            'AMMWithdraw',
+        ].indexOf(item.TransactionType) > -1) {
+            changesToAmmLine = Object.values(item.MetaData)
+                .flat().filter(f => typeof f === 'object')
+                .map(f => Object.values(f))
+                .flat().filter(f => typeof f === 'object')
+                .map(f => Object.values(f) as any)
+                .flat().filter(f => typeof f.AMMID === 'string' && typeof f.Account === 'string')
+                .map(f => f.Account)
+                .map(issuer => trustLine.findBy('currency.issuer', issuer)?.[0])
+                .filter(line => typeof line === 'object' && line && line?.currency)?.[0];
+        }
+
+        if (item.TransactionType === 'Payment' && item.Account === (item as any)?.Destination) {
+            // Payment to self
+            const itemAsAny = (item as any);
+            const fieldsToCheck = ['SendMax', 'Amount', 'DeliverMin']; // In this order for logical from/to
+            const mutations = fieldsToCheck
+                .map(field => itemAsAny?.[field])
+                .filter(field => !!field && field?.currency)
+                .map(field => `${field.currency} ${field?.issuer || ''}`.trim())
+                .reduce((a: string[], v: string) => {
+                    if (a.indexOf(v) < 0) a.push(v);
+                    return a;
+                }, []);
+
+            if (mutations.length === 2) {
+                changesSwap = mutations.map(mutation => {
+                    const [currency, issuer] = mutation.split(' ');
+                    return trustLine.findBy('currency.currencyCode', currency)
+                        .filter(line => line.currency.issuer === issuer)?.[0] || mutation;
+                });
+            }
+        }
+
+        if (changesToAmmLine) {
+            this.setState({cachedTokenDetails: {
+                account: changesToAmmLine.currency.issuer,
+                participant: changesToAmmLine.currency.issuer,
+                title: (
+                    <Text style={styles.boldTitle}>
+                        {changesToAmmLine.getFormattedCurrency()}
+                        {
+                            changesToAmmLine.isLiquidityPoolToken() && (
+                                <View style={lpStyles.lpBadgeContainer}>
+                                    <Badge
+                                        label="LP"
+                                        type={BadgeType.Planned}
+                                        containerStyle={lpStyles.lpBadge}
+                                    />
+                                </View>
+                            )
+                        }
+                    </Text>
+                ),
+                icon: (
+                    <View style={styles.ammIcon}>
+                        <TokenAvatar
+                            token={changesToAmmLine}
+                            // border
+                            size={35}
+                        />
+                    </View>
+                ),
+            }});
+        } else if (changesSwap) {
+            const tokenNames = changesSwap.map(token => {
+                return typeof token?.currency?.currencyCode === 'string'
+                    ? token.getFormattedCurrency()
+                    : typeof token === 'string'
+                    ? token
+                    : '?';
+            }).join(' / ');
+
+            this.setState({cachedTokenDetails: {
+                account: item.Account,
+                participant: participant?.address,
+                title: (
+                    <Text style={styles.boldTitle}>
+                        {tokenNames}
+                    </Text>
+                ),
+                icon: (
+                    <View style={styles.ammIcon}>
+                        <TokenAvatar
+                            tokenPair={changesSwap}
+                            // border
+                            size={35}
+                        />
+                    </View>
+                ),
+            }});  
+        } else {
+            this.setState({cachedTokenDetails: {
+                account: account.address,
+                participant: participant?.address,
+                title: <Blocks.LabelBlock item={item} account={account} participant={participant} />,
+                icon: <Blocks.AvatarBlock participant={participant} item={item} />,
+            }});
+        }
+    }
+
+    render() {
+        const { item, account } = this.props; // , rates
+        const { participant, explainer, isFeeTransaction, feeText, cachedTokenDetails } = this.state;
+
+        // if participant is block the show an overlay to reduce the visibility
+        const showHalfTransparent = participant?.blocked && !isFeeTransaction;
+        const opacity = { opacity: showHalfTransparent ? 0.3 : 1 };
 
         return (
             <TouchableDebounce
                 onPress={this.onPress}
-                activeOpacity={0.6}
-                style={[styles.container, { height: TransactionItem.Height }]}
+                activeOpacity={Math.min(0.2, 0.6 * opacity.opacity)}
+                style={[
+                    styles.container,
+                    {
+                        height: isFeeTransaction
+                            ? TransactionItem.FeeHeight
+                            : TransactionItem.Height,
+                    },
+                ]}
             >
-                {/* if participant is block the show an overlay to reduce the visibility */}
-                {participant?.blocked && <View style={styles.containerBlocked} />}
-
-                <View style={[AppStyles.flex1, AppStyles.centerContent]}>
-                    <Blocks.AvatarBlock participant={participant} item={item} />
+                <View style={[AppStyles.flex1, AppStyles.centerContent, opacity]}>
+                    { isFeeTransaction && (
+                        <View style={[ styles.feeTxAvatar ]}>
+                            <Text>💝</Text>
+                        </View>
+                    )}
+                    { !isFeeTransaction && (
+                        cachedTokenDetails?.icon
+                    )}
                 </View>
-                <View style={[AppStyles.flex3, AppStyles.centerContent]}>
-                    <Blocks.LabelBlock item={item} account={account} participant={participant} />
-                    <View style={[AppStyles.row, AppStyles.centerAligned]}>
-                        <Blocks.ActionBlock item={item} explainer={explainer} participant={participant} />
-                        <Blocks.IndicatorIconBlock item={item} account={account} />
-                    </View>
+                <View style={[AppStyles.flex3, AppStyles.centerContent, opacity]}>
+                    { !isFeeTransaction && (
+                        cachedTokenDetails?.title
+                    )}
+                    { isFeeTransaction && (
+                        <Text style={styles.feeTxText}>{Localize.t('events.serviceFee')}</Text>
+                    )}
+                    { !isFeeTransaction && !participant?.blocked && (
+                        <View style={[AppStyles.row, AppStyles.centerAligned]}>
+                            <Blocks.ActionBlock item={item} explainer={explainer} participant={participant} />
+                            <Blocks.IndicatorIconBlock item={item} account={account} />
+                        </View>
+                    )}
+                    { !isFeeTransaction && participant?.blocked && (
+                        <Text style={styles.feeTxText}>{Localize.t('global.unusualTransaction')}</Text>
+                    )}
                 </View>
-                <View style={[AppStyles.flex2, AppStyles.rightAligned, AppStyles.centerContent]}>
-                    <Blocks.MonetaryBlock explainer={explainer} />
+                <View style={[AppStyles.flex2, AppStyles.rightAligned, AppStyles.centerContent, opacity]}>
+                    { isFeeTransaction && (
+                        <Text style={[ styles.requestTimeText, styles.naturalColor, styles.currency ]}>
+                            { feeText }
+                        </Text>
+                    )}
+                    { !isFeeTransaction && (
+                        <Blocks.MonetaryBlock explainer={explainer} />
+                    )}
                 </View>
             </TouchableDebounce>
         );
diff --git a/src/components/Modules/EventsList/EventListItems/styles.tsx b/src/components/Modules/EventsList/EventListItems/styles.tsx
index 94f62f25e..e49d1abf1 100644
--- a/src/components/Modules/EventsList/EventListItems/styles.tsx
+++ b/src/components/Modules/EventsList/EventListItems/styles.tsx
@@ -1,6 +1,6 @@
 import StyleService from '@services/StyleService';
 
-import { HexToRgbA } from '@common/utils/color';
+// import { HexToRgbA } from '@common/utils/color';
 
 import { AppFonts, AppSizes } from '@theme';
 
@@ -11,13 +11,34 @@ const styles = StyleService.create({
         alignItems: 'center',
         borderRadius: AppSizes.borderRadius,
     },
-    containerBlocked: {
-        width: '100%',
-        height: '100%',
-        backgroundColor: HexToRgbA(StyleService.value('$background'), 0.8),
-        position: 'absolute',
-        borderRadius: AppSizes.borderRadius,
-        zIndex: 9999, // top of all
+    ammIcon: {
+        marginLeft: 8,
+    },
+    boldTitle: {
+        fontFamily: AppFonts.base.familyBold,
+        color: '$textPrimary',
+    },
+    feeTxAvatar: {
+        position: 'relative',
+        flex: 1,
+        flexDirection: 'column',
+        justifyContent: 'center',
+        alignItems: 'center',
+        alignContent: 'stretch',
+        opacity: 1,
+        width: AppSizes.scale(40),
+        paddingTop: 1,
+        paddingLeft: 2,
+        borderRadius: 10,
+        // borderWidth: 1,
+        // borderColor: '$lightGrey',
+    },
+    feeTxText: {
+        flexShrink: 1,
+        fontFamily: AppFonts.base.family,
+        fontSize: AppFonts.subtext.size * 0.9,
+        opacity: 0.5,
+        color: '$textPrimary',
     },
     iconContainer: {
         borderColor: '$lightGrey',
diff --git a/src/components/Modules/EventsList/EventsList.tsx b/src/components/Modules/EventsList/EventsList.tsx
index 14d1f6123..9b6ba81e3 100644
--- a/src/components/Modules/EventsList/EventsList.tsx
+++ b/src/components/Modules/EventsList/EventsList.tsx
@@ -1,9 +1,17 @@
 import React, { PureComponent } from 'react';
+// import { View, Text, RefreshControl, SectionList, InteractionManager } from 'react-native';
 import { View, Text, RefreshControl, SectionList } from 'react-native';
 
-import { AccountModel } from '@store/models';
+import has from 'lodash/has';
 
 import StyleService from '@services/StyleService';
+// import BackendService, { RatesType } from '@services/BackendService';
+import { type RatesType } from '@services/BackendService';
+
+import { CoreRepository } from '@store/repositories';
+import { AccountModel, CoreModel } from '@store/models';
+
+import { VibrateHapticFeedback } from '@common/helpers/interface';
 
 import { Payload } from '@common/libs/payload';
 
@@ -28,33 +36,72 @@ export type DataSourceItem = {
     header: string;
 };
 
+interface State {
+    fiatCurrency?: string;
+    fiatRate?: RatesType | undefined;
+    isLoadingRate?: boolean;
+    coreSettings?: CoreModel;
+}
+
 interface Props {
     account: AccountModel;
     isLoading?: boolean;
+    isFiltering?: boolean;
+    isVisible?: boolean;
     isLoadingMore?: boolean;
     dataSource: Array<DataSourceItem>;
     headerComponent?: any;
     timestamp?: number;
+    forceFullLoader?: boolean;
     onRefresh?: () => void;
     onEndReached?: () => void;
 }
 
 /* Component ==================================================================== */
-class EventsList extends PureComponent<Props> {
+class EventsList extends PureComponent<Props, State> {
+    constructor(props: Props) {
+        super(props);
+
+        const coreSettings = CoreRepository.getSettings();
+
+        this.state = {
+            fiatCurrency: coreSettings.currency,
+            coreSettings,
+            // fiatRate: undefined,
+            // isLoadingRate: false,
+        };
+    }
+
     renderListEmpty = () => {
-        const { isLoading } = this.props;
+        const {
+            isLoading,
+            isFiltering,
+        } = this.props;
+
+        // // This fixes the double spinner on loading @ Event list
+        // if (isLoading) {
+        //     return (
+        //         <View style={[styles.listEmptyContainer]}>
+        //             <LoadingIndicator />
+        //         </View>
+        //     );
+        // }
 
-        if (isLoading) {
+        if (isFiltering) {
             return (
                 <View style={styles.listEmptyContainer}>
-                    <LoadingIndicator />
+                    <Text>{Localize.t('events.fetchingTransactionsFromNetwork')}</Text>
                 </View>
-            );
+            );    
         }
 
         return (
             <View style={styles.listEmptyContainer}>
-                <Text style={AppStyles.pbold}>{Localize.t('global.noInformationToShow')}</Text>
+                <Text style={AppStyles.pbold}>{
+                    !isLoading
+                        ? Localize.t('global.noInformationToShow')
+                        : ' '
+                }</Text>
             </View>
         );
     };
@@ -69,6 +116,9 @@ class EventsList extends PureComponent<Props> {
 
     renderItem = ({ item }: { item: RowItemType }): React.ReactElement | null => {
         const { account, timestamp } = this.props;
+        // const { fiatCurrency, fiatRate, isLoadingRate } = this.state;
+
+        // console.log('renderItem')
 
         if (item instanceof Payload) {
             return React.createElement(EventListItems.Request, {
@@ -82,6 +132,7 @@ class EventsList extends PureComponent<Props> {
                 item,
                 account,
                 timestamp,
+                // rates: { fiatCurrency, fiatRate, isLoadingRate },
             } as {
                 item: Transactions & MutationsMixinType;
                 account: AccountModel;
@@ -108,21 +159,94 @@ class EventsList extends PureComponent<Props> {
         if (isLoadingMore) {
             return <LoadingIndicator />;
         }
+
         return null;
     };
 
     renderRefreshControl = () => {
-        const { isLoading, onRefresh } = this.props;
+        const { coreSettings } = this.state;
+        const { isLoading, onRefresh, isVisible } = this.props;
+
+        const refreshNow = async () => {
+            if (coreSettings?.hapticFeedback) {
+                // VibrateHapticFeedback('notificationSuccess');
+                VibrateHapticFeedback('impactLight');
+            };
+
+            if (onRefresh) {
+                await onRefresh();
+                if (coreSettings?.hapticFeedback) {
+                    // VibrateHapticFeedback('notificationSuccess');
+                    VibrateHapticFeedback('impactLight');
+                };
+            }
+        };
 
         return (
             <RefreshControl
-                refreshing={!!isLoading}
-                onRefresh={onRefresh}
+                refreshing={!!isLoading && !!isVisible}
+                onRefresh={refreshNow}
                 tintColor={StyleService.value('$contrast')}
             />
         );
     };
 
+    componentDidMount() {
+        // add listener for changes on currency and showReservePanel setting
+        CoreRepository.on('updateSettings', this.onCoreSettingsUpdate);
+        // this.fetchCurrencyRate();
+    }
+    
+    componentWillUnmount() {
+        CoreRepository.off('updateSettings', this.onCoreSettingsUpdate);
+    }
+
+    onCoreSettingsUpdate = (coreSettings: CoreModel, changes: Partial<CoreModel>) => {
+        const { fiatCurrency } = this.state;
+
+        // currency changed
+        if (has(changes, 'currency') && fiatCurrency !== changes.currency) {
+            this.setState({
+                // fiatRate: undefined,
+                fiatCurrency: coreSettings.currency,
+            });
+        }
+
+        // default network changed
+        // if (has(changes, 'network')) {
+        //     // clean up rate
+        //     this.setState({
+        //         fiatRate: undefined,
+        //     });
+
+        //     InteractionManager.runAfterInteractions(this.fetchCurrencyRate);
+        // }
+    };
+
+    // fetchCurrencyRate = () => {
+    //     const { fiatCurrency, isLoadingRate } = this.state;
+
+    //     if (!isLoadingRate) {
+    //         this.setState({
+    //             isLoadingRate: true,
+    //         });
+    //     }
+
+    //     BackendService.getCurrencyRate(fiatCurrency)
+    //         .then((rate: any) => {
+    //             this.setState({
+    //                 fiatRate: rate,
+    //                 isLoadingRate: false,
+    //             });
+    //         })
+    //         .catch(() => {
+    //             // Toast(Localize.t('global.unableToFetchCurrencyRate'));
+    //             this.setState({
+    //                 isLoadingRate: false,
+    //             });
+    //         });
+    // };
+
     keyExtractor = (item: any, index: number): string => {
         let key = '';
         if ([InstanceTypes.GenuineTransaction, InstanceTypes.FallbackTransaction].includes(item.InstanceType)) {
@@ -137,28 +261,48 @@ class EventsList extends PureComponent<Props> {
     };
 
     render() {
-        const { dataSource, onEndReached, headerComponent } = this.props;
+        const {
+            dataSource,
+            onEndReached,
+            headerComponent,
+            isLoading,
+            forceFullLoader,
+        } = this.props;
+        
+        const renderSeparateLoadingIndicator = !!isLoading && (dataSource || []).length === 0;
 
         return (
-            <SectionList
-                style={styles.sectionList}
-                contentContainerStyle={styles.sectionListContainer}
-                sections={dataSource}
-                renderItem={this.renderItem}
-                renderSectionHeader={this.renderSectionHeader}
-                keyExtractor={this.keyExtractor}
-                ListEmptyComponent={this.renderListEmpty}
-                ListHeaderComponent={headerComponent}
-                onEndReached={onEndReached}
-                onEndReachedThreshold={0.2}
-                ListFooterComponent={this.renderFooter}
-                windowSize={10}
-                maxToRenderPerBatch={10}
-                initialNumToRender={20}
-                refreshControl={this.renderRefreshControl()}
-                indicatorStyle={StyleService.isDarkMode() ? 'white' : 'default'}
-                stickySectionHeadersEnabled={false}
-            />
+            <>
+                { (renderSeparateLoadingIndicator || forceFullLoader) &&
+                    <View style={[styles.listEmptyContainer]}>
+                        <LoadingIndicator />
+                        <Text>{' '}</Text>
+                        <Text>{Localize.t('events.fetchingTransactionsFromNetwork')}</Text>
+                        <Text>{' '}</Text>
+                    </View>        
+                }
+                { !renderSeparateLoadingIndicator && !forceFullLoader && 
+                    <SectionList
+                        style={styles.sectionList}
+                        contentContainerStyle={styles.sectionListContainer}
+                        sections={dataSource}
+                        renderItem={this.renderItem}
+                        renderSectionHeader={this.renderSectionHeader}
+                        keyExtractor={this.keyExtractor}
+                        ListEmptyComponent={this.renderListEmpty}
+                        ListHeaderComponent={headerComponent}
+                        onEndReached={onEndReached}
+                        onEndReachedThreshold={0.2}
+                        ListFooterComponent={this.renderFooter}
+                        windowSize={10}
+                        maxToRenderPerBatch={10}
+                        initialNumToRender={20}
+                        refreshControl={this.renderRefreshControl()}
+                        indicatorStyle={StyleService.isDarkMode() ? 'white' : 'default'}
+                        stickySectionHeadersEnabled={false}
+                    />
+                }
+            </>
         );
     }
 }
diff --git a/src/components/Modules/FeeList/FeeList.tsx b/src/components/Modules/FeeList/FeeList.tsx
index 08f473127..4284459e7 100644
--- a/src/components/Modules/FeeList/FeeList.tsx
+++ b/src/components/Modules/FeeList/FeeList.tsx
@@ -32,7 +32,11 @@ class FeeList extends PureComponent<Props> {
             return <Text>No Fee available!</Text>;
         }
 
-        return <View style={containerStyle}>{items.map(this.renderItem)}</View>;
+        return <View
+            shouldRasterizeIOS
+            renderToHardwareTextureAndroid
+            style={containerStyle}
+        >{items.map(this.renderItem)}</View>;
     }
 }
 
diff --git a/src/components/Modules/FeeList/FeeListItem/styles.tsx b/src/components/Modules/FeeList/FeeListItem/styles.tsx
index 8df0ff738..0f1759436 100644
--- a/src/components/Modules/FeeList/FeeListItem/styles.tsx
+++ b/src/components/Modules/FeeList/FeeListItem/styles.tsx
@@ -21,7 +21,7 @@ const styles = StyleService.create({
     dot: {
         height: 26,
         width: 26,
-        borderRadius: 12,
+        borderRadius: 20,
         borderWidth: 2,
         borderColor: '$grey',
         marginTop: 4,
diff --git a/src/components/Modules/FeePicker/FeePicker.tsx b/src/components/Modules/FeePicker/FeePicker.tsx
index 3e908ede4..b85f3bcb6 100644
--- a/src/components/Modules/FeePicker/FeePicker.tsx
+++ b/src/components/Modules/FeePicker/FeePicker.tsx
@@ -14,6 +14,9 @@ import { Navigator } from '@common/helpers/navigator';
 import { Capitalize } from '@common/utils/string';
 
 import { TouchableDebounce, Badge, Button, LoadingIndicator, InfoMessage } from '@components/General';
+import BackendService from '@services/BackendService';
+
+import { type Payload } from '@common/libs/payload';
 
 import Localize from '@locale';
 
@@ -22,18 +25,24 @@ import { FeeItem, Props as SelectFeeOverlayProps } from '@screens/Overlay/Select
 import { AppStyles } from '@theme';
 import styles from './styles';
 
+import { type AccountModel } from '@store/models';
+import { AccessLevels, AccountTypes } from '@store/types';
+
 /* Types ==================================================================== */
 interface Props {
     txJson: any;
     containerStyle?: ViewStyle | ViewStyle[];
     textStyle?: TextStyle | TextStyle[];
+    source?: AccountModel;
+    payload?: Payload;
     showHooksFee?: boolean;
-    onSelect?: (item: any) => void;
+    onSelect?: (txFee: any, serviceFee: any) => void;
 }
 
 interface State {
     availableFees?: FeeItem[];
-    selected?: FeeItem;
+    selectedTxFee?: FeeItem;
+    selectedServiceFee?: FeeItem;
     feeHooks?: number;
     error: boolean;
 }
@@ -51,7 +60,8 @@ class FeePicker extends Component<Props, State> {
 
         this.state = {
             availableFees: undefined,
-            selected: undefined,
+            selectedTxFee: undefined,
+            selectedServiceFee: undefined,
             feeHooks: undefined,
             error: false,
         };
@@ -64,24 +74,69 @@ class FeePicker extends Component<Props, State> {
         if (!isEqual(omit(txJson, 'Fee'), omit(prevProps.txJson, 'Fee'))) {
             this.setState(
                 {
-                    availableFees: undefined,
-                    selected: undefined,
-                    feeHooks: undefined,
+                    // Just keep things as is to prevent them from bouncing
+                    // around while updating a tx memo.
+                    // availableFees: undefined,
+                    // selectedTxFee: undefined,
+                    // selectedServiceFee: undefined,
+                    // feeHooks: undefined,
                     error: false,
                 },
-                this.fetchAvailableFees,
+                this.debouncedFetchFees,
             );
         }
     }
 
     componentDidMount() {
         // fetch available fees from network
-        InteractionManager.runAfterInteractions(this.fetchAvailableFees);
+        InteractionManager.runAfterInteractions(this.fetchFees);
+        // InteractionManager.runAfterInteractions(this.fetchServiceFee);
     }
 
-    fetchAvailableFees = debounce(() => {
+    fetchServiceFee = (isFallback = false): Promise<void> => {
+        const { txJson, source, payload } = this.props;
+
+        const noFee = () => {
+            this.setState({
+                selectedServiceFee: {
+                    type: 'LOW',
+                    value: '0',
+                },
+            });
+        };
+
+        if (source && source?.accessLevel === AccessLevels.Full && source?.type === AccountTypes.Tangem) {
+            // Tangem may sign this, no fees
+            return Promise.resolve(noFee());
+        }
+        
+        if (source && source?.accessLevel !== AccessLevels.Full) {
+            // We don't know what is going to sign this
+            return Promise.resolve(noFee());
+        }
+
+        const payloadUuid = payload
+            ? payload?.getPayloadUUID()
+            : undefined;
+        
+        // when it's retry with fallback then we don't include txJson
+        return BackendService.getServiceFee(!isFallback ? txJson : undefined, payloadUuid)
+            .then((res) => {
+                // console.log('Picked backend service service fee', res);
+                const { availableFees } = res;
+
+                if (Array.isArray(availableFees) && availableFees.length > 0) {
+                    this.setState({
+                        selectedServiceFee: availableFees[0],
+                    });
+                };
+            })
+            .catch(() => {});
+    };
+
+    fetchFees = (isFallback = false): Promise<void> => {
         const { txJson } = this.props;
-        const { error } = this.state;
+        const { error, selectedServiceFee, selectedTxFee } = this.state;
 
         // clear any error for retrying again
         if (error) {
@@ -90,59 +145,79 @@ class FeePicker extends Component<Props, State> {
             });
         }
 
-        // calculate and persist the transaction fees
-        NetworkService.getAvailableNetworkFee(txJson)
-            .then((res) => {
-                const { availableFees, feeHooks, suggested } = res;
-
-                this.setState({
-                    availableFees,
-                    feeHooks,
+        // when it's retry with fallback then we don't include txJson
+        return this.fetchServiceFee().then(() => {
+            NetworkService.getAvailableNetworkFee(!isFallback ? txJson : undefined)
+                .then((res) => {
+                    const { availableFees, feeHooks, suggested } = res;
+
+                    this.setState({
+                        availableFees,
+                        feeHooks,
+                    });
+
+                    // set the suggested fee by default
+                    this.onSelect(find(availableFees, {
+                        type: selectedTxFee && selectedTxFee?.type
+                            ? selectedTxFee.type
+                            : suggested,
+                    })!, selectedServiceFee);
+                })
+                .catch(() => {
+                    // if it's not a retry fallback then let's try again
+                    if (!isFallback) {
+                        this.fetchFees(true);
+                        return;
+                    }
+                    // let's give up
+                    this.setState({
+                        error: true,
+                    });
                 });
+        });
+    };
 
-                // set the suggested fee by default
-                this.onSelect(find(availableFees, { type: suggested })!);
-            })
-            .catch(() => {
-                this.setState({
-                    error: true,
-                });
-            });
-    }, 300);
+    debouncedFetchFees = debounce(this.fetchFees, 750);
 
-    onSelect = (item: FeeItem) => {
+    onSelect = (txFeeItem: FeeItem, serviceFeeItem?: FeeItem) => {
         const { onSelect } = this.props;
+        const { selectedServiceFee } = this.state;
 
         this.setState(
             {
-                selected: item,
+                selectedTxFee: txFeeItem,
+                selectedServiceFee: serviceFeeItem || selectedServiceFee,
             },
             () => {
                 if (typeof onSelect === 'function') {
-                    onSelect(item);
+                    onSelect(txFeeItem, serviceFeeItem || selectedServiceFee);
                 }
             },
         );
     };
 
     showFeeSelectOverlay = () => {
-        const { availableFees, selected } = this.state;
+        const { availableFees, selectedTxFee, selectedServiceFee } = this.state;
 
         Navigator.showOverlay<SelectFeeOverlayProps>(AppScreens.Overlay.SelectFee, {
             availableFees: availableFees!,
-            selectedFee: selected!,
+            selectedFee: selectedTxFee!,
+            serviceFee: selectedServiceFee!,
             onSelect: this.onSelect,
         });
     };
 
     getNormalizedFee = () => {
-        const { selected } = this.state;
+        const { selectedTxFee, selectedServiceFee } = this.state;
 
-        if (!selected) {
+        if (!selectedTxFee) {
             return 0;
         }
 
-        return new AmountParser(selected.value).dropsToNative().toString();
+        return new AmountParser(
+            Number(selectedTxFee.value) +
+            Number(selectedServiceFee?.value || 0),
+        ).dropsToNative().toString();
     };
 
     getNormalizedHooksFee = () => {
@@ -156,9 +231,9 @@ class FeePicker extends Component<Props, State> {
     };
 
     getFeeColor = () => {
-        const { selected } = this.state;
+        const { selectedTxFee } = this.state;
 
-        switch (selected?.type) {
+        switch (selectedTxFee?.type) {
             case 'LOW':
                 return StyleService.value('$green');
             case 'MEDIUM':
@@ -180,7 +255,7 @@ class FeePicker extends Component<Props, State> {
                     type="error"
                     actionButtonLabel={Localize.t('global.tryAgain')}
                     actionButtonIcon="IconRefresh"
-                    onActionButtonPress={this.fetchAvailableFees}
+                    onActionButtonPress={this.debouncedFetchFees}
                 />
             </View>
         );
@@ -190,16 +265,30 @@ class FeePicker extends Component<Props, State> {
         const { containerStyle, textStyle } = this.props;
 
         return (
-            <View style={[AppStyles.row, containerStyle]}>
-                <Text style={textStyle}>{Localize.t('global.loading')}...&nbsp;</Text>
-                <LoadingIndicator />
+            <View style={[
+                styles.outerContainer,
+                AppStyles.row,
+                containerStyle,
+            ]}>
+                <View style={[
+                    styles.loaderContainer,
+                ]}>
+                    <LoadingIndicator
+                        style={styles.loader}
+                        size='small'
+                    />
+                    <Text style={[
+                        styles.loaderText,
+                        textStyle,
+                    ]}>{Localize.t('global.loading')}...&nbsp;</Text>
+                </View>
             </View>
         );
     };
 
     render() {
         const { containerStyle, textStyle } = this.props;
-        const { selected, availableFees, feeHooks, error } = this.state;
+        const { selectedTxFee, selectedServiceFee, availableFees, feeHooks, error } = this.state;
 
         // error while fetching the fee
         //  give the user ability to retry
@@ -208,19 +297,22 @@ class FeePicker extends Component<Props, State> {
         }
 
         // nothing to show
-        if (!selected) {
+        if (!selectedTxFee || !selectedServiceFee) {
             return this.renderLoading();
         }
 
         return (
-            <View style={containerStyle}>
+            <View style={[
+                styles.outerContainer,
+                containerStyle,
+            ]}>
                 <TouchableDebounce activeOpacity={0.8} style={AppStyles.row} onPress={this.showFeeSelectOverlay}>
                     <View style={[AppStyles.flex1, AppStyles.row, AppStyles.centerAligned]}>
                         <Text style={textStyle}>
                             {this.getNormalizedFee()} {NetworkService.getNativeAsset()}
                         </Text>
                         <Badge
-                            label={Capitalize(selected.type)}
+                            label={Capitalize(selectedTxFee.type)}
                             size="small"
                             color={this.getFeeColor()}
                             labelStyle={styles.badgeLabel}
@@ -230,7 +322,7 @@ class FeePicker extends Component<Props, State> {
                         <Button
                             onPress={this.showFeeSelectOverlay}
                             style={styles.editButton}
-                            roundedSmall
+                            roundedMini
                             iconSize={13}
                             light
                             icon="IconEdit"
@@ -248,6 +340,14 @@ class FeePicker extends Component<Props, State> {
                         />
                     </View>
                 )}
+                {selectedServiceFee?.note && (
+                    <View style={AppStyles.paddingTopSml}>
+                        <InfoMessage
+                            type="info"
+                            label={selectedServiceFee?.note || 'No note'}
+                        />
+                    </View>
+                )}
             </View>
         );
     }
diff --git a/src/components/Modules/FeePicker/styles.ts b/src/components/Modules/FeePicker/styles.ts
index 8cbea60d4..6a98f5d28 100644
--- a/src/components/Modules/FeePicker/styles.ts
+++ b/src/components/Modules/FeePicker/styles.ts
@@ -2,6 +2,21 @@ import StyleService from '@services/StyleService';
 
 /* Styles ==================================================================== */
 export default StyleService.create({
+    outerContainer: {
+        // borderWidth: 2,
+        // borderColor: '#ffcc00',
+        minHeight: 45,
+    },
+    loaderText: {
+        marginLeft: 29,
+        top: 4,
+    },
+    loaderContainer: {
+    },
+    loader: {
+        position: 'absolute',
+        top: 2,
+    },
     container: {
         flexDirection: 'row',
     },
@@ -12,7 +27,7 @@ export default StyleService.create({
         width: 40,
         justifyContent: 'center',
         alignSelf: 'center',
-        marginRight: 15,
+        // marginRight: 15,
     },
     badgeLabel: {
         color: '$textContrast',
diff --git a/src/components/Modules/HooksExplainer/HooksExplainer.tsx b/src/components/Modules/HooksExplainer/HooksExplainer.tsx
index 206949eec..8860bac46 100644
--- a/src/components/Modules/HooksExplainer/HooksExplainer.tsx
+++ b/src/components/Modules/HooksExplainer/HooksExplainer.tsx
@@ -19,10 +19,17 @@ import Localize from '@locale';
 
 import { AppSizes } from '@theme';
 /* Types ==================================================================== */
+
+export enum HookExplainerOrigin {
+    TransactionDetails = 'TransactionDetails',
+    ReviewPayload = 'ReviewPayload',
+}
+
 interface Props {
     account: AccountModel;
     payload?: Payload;
     transaction?: TransactionsType | FallbackTransaction;
+    origin?: HookExplainerOrigin;
 }
 
 interface State {
@@ -40,7 +47,7 @@ class HooksExplainer extends Component<Props, State> {
     }
 
     getSource = () => {
-        const { account, payload, transaction } = this.props;
+        const { account, payload, transaction, origin } = this.props;
 
         const params = {
             network: NetworkService.getNetwork().key,
@@ -71,6 +78,12 @@ class HooksExplainer extends Component<Props, State> {
             });
         }
 
+        if (origin) {
+            Object.assign(params, {
+                origin,
+            });
+        }
+
         return {
             uri: `${WebLinks.HooksExplainerURL}/${Localize.getCurrentLocale()}`,
             method: 'POST',
@@ -84,13 +97,10 @@ class HooksExplainer extends Component<Props, State> {
 
     onMessage = (event: any) => {
         try {
-            // get passed data
-            const data = get(event, 'nativeEvent.data');
-
-            const parsedData = JSON.parse(data);
-
+            const parsedData = JSON.parse(get(event, 'nativeEvent.data', {}));
             const layoutHeight = get(parsedData, 'layout.height');
 
+            // we use this so the height of the container can be set by xApp running behind the explainer
             if (typeof layoutHeight === 'number') {
                 this.setState({
                     containerHeight: layoutHeight,
diff --git a/src/components/Modules/InactiveAccount/InactiveAccount.tsx b/src/components/Modules/InactiveAccount/InactiveAccount.tsx
index 3a5611adb..3bf0a6ea2 100644
--- a/src/components/Modules/InactiveAccount/InactiveAccount.tsx
+++ b/src/components/Modules/InactiveAccount/InactiveAccount.tsx
@@ -21,6 +21,7 @@ import Localize from '@locale';
 import { Props as XAppBrowserModalProps } from '@screens/Modal/XAppBrowser/types';
 
 import RegularKeyItem from '@components/Modules/InactiveAccount/RegularKeyItem';
+import NetworkService from '@services/NetworkService';
 
 import { AppStyles } from '@theme';
 import styles from './styles';
@@ -108,18 +109,25 @@ class InactiveAccount extends PureComponent<Props, State> {
 
         return (
             <View style={styles.messageContainer} testID="not-activated-account-container">
-                <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorRed]}>
+                <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorBlue]}>
                     {Localize.t('account.yourAccountIsNotActivated')}
                 </Text>
+                <Text style={[AppStyles.subtext, AppStyles.textCenterAligned, AppStyles.colorBlue]}>
+                    {Localize.t('account.accountGenerateActivationExplain', {
+                        baseReserve: NetworkService.getNetworkReserve().BaseReserve,
+                        nativeAsset: NetworkService.getNativeAsset(),
+                    })}
+                </Text>
                 {regularKeyAccounts && regularKeyAccounts?.length > 0 && (
-                    <Text style={[AppStyles.smalltext, AppStyles.textCenterAligned, AppStyles.colorRed]}>
+                    <Text style={[AppStyles.smalltext, AppStyles.textCenterAligned, AppStyles.colorBlue]}>
                         {Localize.t('account.activateRegularKeyAccountWarning')}
                     </Text>
                 )}
 
                 <Button
-                    roundedSmall
+                    nonBlock
                     style={AppStyles.marginTopSml}
+                    icon="IconWallet"
                     label={Localize.t('home.activateYourAccount')}
                     onPress={this.openActivateAccountXApp}
                 />
@@ -129,7 +137,11 @@ class InactiveAccount extends PureComponent<Props, State> {
 
     render() {
         return (
-            <View style={AppStyles.flex1}>
+            <View
+                style={[
+                    AppStyles.flex1,
+                ]}
+            >
                 {this.renderRegularKeys()}
                 {this.renderActivateAccount()}
             </View>
diff --git a/src/components/Modules/InactiveAccount/styles.ts b/src/components/Modules/InactiveAccount/styles.ts
index cc2166737..00f446100 100644
--- a/src/components/Modules/InactiveAccount/styles.ts
+++ b/src/components/Modules/InactiveAccount/styles.ts
@@ -37,10 +37,9 @@ export default StyleService.create({
         marginRight: 15,
         tintColor: '$grey',
     },
-
     messageContainer: {
         alignItems: 'center',
-        backgroundColor: '$lightRed',
+        backgroundColor: '$lightBlue',
         margin: AppSizes.paddingSml,
         padding: AppSizes.paddingSml,
         borderRadius: AppSizes.borderRadius,
diff --git a/src/components/Modules/MonetizationElement/MonetizationElement.tsx b/src/components/Modules/MonetizationElement/MonetizationElement.tsx
index 652202a0a..e3d1a0a38 100644
--- a/src/components/Modules/MonetizationElement/MonetizationElement.tsx
+++ b/src/components/Modules/MonetizationElement/MonetizationElement.tsx
@@ -89,22 +89,12 @@ class MonetizationElement extends PureComponent<Props, State> {
         });
     };
 
-    onSuccessPurchase = () => {
-        // purchase was successful clear the monetization status
-        ProfileRepository.saveProfile({
-            monetization: {
-                monetizationStatus: MonetizationStatus.NONE,
-            },
-        });
-    };
-
     purchaseProduct = () => {
         const { productForPurchase, monetizationType } = this.state;
 
         Navigator.showModal<PurchaseProductModalProps>(AppScreens.Modal.PurchaseProduct, {
             productId: productForPurchase!,
             productDescription: monetizationType!,
-            onSuccessPurchase: this.onSuccessPurchase,
         });
     };
 
diff --git a/src/components/Modules/MutationWidgets/ActionButtons.tsx b/src/components/Modules/MutationWidgets/ActionButtons.tsx
index 330291ab5..b8efcf377 100644
--- a/src/components/Modules/MutationWidgets/ActionButtons.tsx
+++ b/src/components/Modules/MutationWidgets/ActionButtons.tsx
@@ -27,6 +27,7 @@ import Localize from '@locale';
 import styles from './styles';
 /* Types ==================================================================== */
 import { Props } from './types';
+import { AppStyles } from '@theme/index';
 
 enum ActionTypes {
     NEW_PAYMENT = 'NEW_PAYMENT',
@@ -92,7 +93,7 @@ const ActionButton: React.FC<{ actionType: ActionTypes; onPress: (actionType: Ac
 
     const { label, secondary } = buttonData;
 
-    return <Button rounded secondary={secondary} label={label} onPress={onActionPress} />;
+    return <Button style={[styles.actionButton]} secondary={secondary} label={label} onPress={onActionPress} />;
 };
 
 /* Component ==================================================================== */
@@ -348,14 +349,25 @@ class ActionButtons extends PureComponent<Props, State> {
 
     renderActionButtons = () => {
         const { availableActions } = this.state;
+        const { item } = this.props;
 
         if (!availableActions) {
             return null;
         }
 
-        return availableActions.map((type) => (
-            <ActionButton key={`action-button-${type}`} actionType={type} onPress={this.onActionButtonPress} />
-        ));
+        return availableActions.map((type) => {
+            const key = `action-button-${type}-${item.Account}-${(item as any)?.Destination}`;
+
+            return (
+                <View style={[AppStyles.paddingBottomExtraSml]}>
+                    <ActionButton
+                        key={key}
+                        actionType={type}
+                        onPress={this.onActionButtonPress}
+                    />
+                </View>
+            );
+        });
     };
 
     render() {
diff --git a/src/components/Modules/MutationWidgets/AssetsMutations.tsx b/src/components/Modules/MutationWidgets/AssetsMutations.tsx
index a875b1fed..e5245b055 100644
--- a/src/components/Modules/MutationWidgets/AssetsMutations.tsx
+++ b/src/components/Modules/MutationWidgets/AssetsMutations.tsx
@@ -107,6 +107,7 @@ class AssetsMutations extends PureComponent<Props, State> {
                     value={change.value}
                     currency={change.currency}
                     prefix={change.action === OperationActions.DEC && '-'}
+                    truncateLp
                     style={[
                         styles.amountText,
                         {
diff --git a/src/components/Modules/MutationWidgets/HookDetails.tsx b/src/components/Modules/MutationWidgets/HookDetails.tsx
index d159e071b..b314f770a 100644
--- a/src/components/Modules/MutationWidgets/HookDetails.tsx
+++ b/src/components/Modules/MutationWidgets/HookDetails.tsx
@@ -4,7 +4,7 @@ import { View, Text } from 'react-native';
 import { BaseLedgerObject } from '@common/libs/ledger/objects';
 import { TransactionTypes } from '@common/libs/ledger/types/enums';
 
-import HooksExplainer from '@components/Modules/HooksExplainer/HooksExplainer';
+import HooksExplainer, { HookExplainerOrigin } from '@components/Modules/HooksExplainer/HooksExplainer';
 
 import Localize from '@locale';
 
@@ -32,7 +32,11 @@ class HookDetails extends PureComponent<Props> {
             return (
                 <View style={styles.detailContainer}>
                     <Text style={styles.detailsLabelText}>{Localize.t('global.hooks')}</Text>
-                    <HooksExplainer transaction={item} account={account} />
+                    <HooksExplainer
+                        transaction={item}
+                        account={account}
+                        origin={HookExplainerOrigin.TransactionDetails}
+                    />
                 </View>
             );
         }
diff --git a/src/components/Modules/MutationWidgets/Label.tsx b/src/components/Modules/MutationWidgets/Label.tsx
index 023ce18ef..ae05b4b60 100644
--- a/src/components/Modules/MutationWidgets/Label.tsx
+++ b/src/components/Modules/MutationWidgets/Label.tsx
@@ -42,7 +42,10 @@ class Label extends PureComponent<Props, State> {
     renderItemLabel = () => {
         const { label } = this.state;
 
-        return <Text style={AppStyles.h5}>{label}</Text>;
+        return <Text style={[
+            AppStyles.h4,
+            styles.noBold,
+        ]}>{label}</Text>;
     };
 
     renderStatus = () => {
@@ -69,7 +72,9 @@ class Label extends PureComponent<Props, State> {
         const { item } = this.props;
 
         if ('Date' in item) {
-            return <Text style={styles.dateText}>{moment(item.Date).format('LLLL')}</Text>;
+            return <Text style={[
+                styles.dateText,
+            ]}>{moment(item.Date).format('LLLL')}</Text>;
         }
 
         return null;
diff --git a/src/components/Modules/MutationWidgets/Participants.tsx b/src/components/Modules/MutationWidgets/Participants.tsx
index e540346d0..8fd31428c 100644
--- a/src/components/Modules/MutationWidgets/Participants.tsx
+++ b/src/components/Modules/MutationWidgets/Participants.tsx
@@ -22,7 +22,7 @@ interface State {
 class Participants extends PureComponent<Props, State> {
     constructor(props: Props) {
         super(props);
-
+        
         this.state = {
             participants: undefined,
         };
@@ -40,6 +40,16 @@ class Participants extends PureComponent<Props, State> {
         });
     };
 
+    getTokenDetails = (forced = false) => {
+        const { cachedTokenDetails } = this.props;
+        const { participants } = this.state;
+        // Not if self (token swap)
+
+        return (forced || participants?.start?.address !== participants?.end?.address) && cachedTokenDetails
+            ? cachedTokenDetails
+            : undefined;
+    };
+
     renderStart = (start: Account | undefined) => {
         const { account } = this.props;
 
@@ -54,8 +64,10 @@ class Participants extends PureComponent<Props, State> {
                 <AccountElement
                     address={start.address}
                     tag={start.tag}
+                    tokenDetails={this.getTokenDetails()}
+                    containerStyle={styles.participant}
                     visibleElements={{
-                        tag: true,
+                        tag: start.address !== account.address,
                         avatar: true,
                         menu: start.address !== account.address,
                     }}
@@ -78,7 +90,13 @@ class Participants extends PureComponent<Props, State> {
                 <Text style={styles.detailsLabelText}>{Localize.t('events.through')}</Text>
                 <AccountElement
                     address={through.address}
-                    visibleElements={{ tag: true, avatar: true, menu: through.address !== account.address }}
+                    tokenDetails={this.getTokenDetails()}
+                    containerStyle={styles.participant}
+                    visibleElements={{
+                        tag: true,
+                        avatar: true,
+                        menu: through.address !== account.address,
+                    }}
                 />
             </>
         );
@@ -99,6 +117,8 @@ class Participants extends PureComponent<Props, State> {
                 <AccountElement
                     address={end.address}
                     tag={end.tag}
+                    tokenDetails={this.getTokenDetails(true)}
+                    containerStyle={styles.participant}
                     visibleElements={{
                         tag: true,
                         avatar: true,
@@ -111,6 +131,7 @@ class Participants extends PureComponent<Props, State> {
 
     render() {
         const { participants } = this.state;
+        // const { cachedTokenDetails } = this.props;
 
         // nothing to show
         if (typeof participants === 'undefined') {
@@ -120,6 +141,7 @@ class Participants extends PureComponent<Props, State> {
         return (
             <View style={styles.participantContainer}>
                 {this.renderStart(participants.start)}
+                {/* <Text>{cachedTokenDetails?.account}</Text> */}
                 {this.renderThrough(participants.through)}
                 {this.renderEnd(participants.end)}
             </View>
diff --git a/src/components/Modules/MutationWidgets/ReserveChange.tsx b/src/components/Modules/MutationWidgets/ReserveChange.tsx
index 6d054227b..adf17251d 100644
--- a/src/components/Modules/MutationWidgets/ReserveChange.tsx
+++ b/src/components/Modules/MutationWidgets/ReserveChange.tsx
@@ -140,7 +140,7 @@ class ReserveChange extends PureComponent<Props, State> {
                 </View>
                 <Button
                     roundedMini
-                    light
+                    // light
                     label={Localize.t('events.myBalanceAndReserve')}
                     onPress={this.showBalanceExplain}
                 />
diff --git a/src/components/Modules/MutationWidgets/ValidatedLedger.tsx b/src/components/Modules/MutationWidgets/ValidatedLedger.tsx
index 0f1752818..21d831906 100644
--- a/src/components/Modules/MutationWidgets/ValidatedLedger.tsx
+++ b/src/components/Modules/MutationWidgets/ValidatedLedger.tsx
@@ -31,7 +31,7 @@ class ValidatedLedger extends PureComponent<Props> {
                     {Localize.t('events.thisTransactionWasSuccessful')} {Localize.t('events.andValidatedInLedger')}
                     <Text style={AppStyles.monoBold}> {item.LedgerIndex} </Text>
                     {Localize.t('events.onDate')}
-                    <Text style={AppStyles.monoBold}> {moment(item.Date).format('LLLL')}</Text>
+                    <Text style={AppStyles.bold}> {moment(item.Date).format('LLLL')}</Text>
                 </Text>
             </View>
         );
diff --git a/src/components/Modules/MutationWidgets/styles.tsx b/src/components/Modules/MutationWidgets/styles.tsx
index 151318e4e..f96ffb4f5 100644
--- a/src/components/Modules/MutationWidgets/styles.tsx
+++ b/src/components/Modules/MutationWidgets/styles.tsx
@@ -5,10 +5,10 @@ import { AppFonts, AppSizes } from '@theme';
 /* Styles ==================================================================== */
 const styles = StyleService.create({
     labelContainer: {
-        width: AppSizes.screen.width,
+        width: AppSizes.screen.uncorrectedWidth, // Fixes square fold devices
         justifyContent: 'center',
         alignItems: 'center',
-        padding: 25,
+        padding: 15,
         gap: AppSizes.paddingExtraSml,
     },
     advisoryContainer: {
@@ -19,13 +19,16 @@ const styles = StyleService.create({
         backgroundColor: '$red',
     },
     itemContainer: {
-        width: AppSizes.screen.width,
+        width: AppSizes.screen.uncorrectedWidth,
         justifyContent: 'center',
         alignItems: 'center',
         paddingTop: 10,
         paddingBottom: 25,
         paddingHorizontal: 25,
     },
+    actionButton: {
+        borderRadius: 12,
+    },
     detailContainer: {
         paddingBottom: AppSizes.padding,
         paddingHorizontal: 25,
@@ -36,10 +39,13 @@ const styles = StyleService.create({
     },
     participantContainer: {
         padding: 25,
-        borderTopColor: '$tint',
-        borderTopWidth: 1,
+        paddingTop: 5,
+        // borderTopColor: '$tint',
+        // borderTopWidth: 1,
+    },
+    noBold: {
+        fontFamily: AppFonts.base.family,
     },
-
     detailsLabelText: {
         fontFamily: AppFonts.base.familyBold,
         fontSize: AppFonts.base.size,
@@ -47,7 +53,7 @@ const styles = StyleService.create({
         color: '$textPrimary',
     },
     detailsValueText: {
-        fontFamily: AppFonts.base.familyMono,
+        fontFamily: AppFonts.base.family,
         lineHeight: 20,
         fontSize: AppFonts.base.size * 0.9,
         color: '$textPrimary',
@@ -56,15 +62,17 @@ const styles = StyleService.create({
     itemContainerGap: {
         gap: AppSizes.paddingExtraSml,
     },
-
     amountContainer: {
         flexDirection: 'row',
         justifyContent: 'center',
         alignItems: 'center',
-        backgroundColor: '$tint',
-        paddingVertical: 20,
-        paddingHorizontal: 30,
-        borderRadius: 50,
+        // backgroundColor: '$tint',
+        borderWidth: 1,
+        borderColor: '$tint',
+        width: '100%',
+        paddingVertical: 15,
+        paddingHorizontal: 50,
+        borderRadius: 10,
     },
     amountContainerSmall: {
         flexDirection: 'row',
@@ -75,12 +83,11 @@ const styles = StyleService.create({
         paddingHorizontal: 30,
         borderRadius: 50,
     },
-
     dateText: {
-        fontFamily: AppFonts.base.familyMonoBold,
+        fontFamily: AppFonts.base.family,
         fontSize: AppFonts.small.size,
-        color: '$grey',
-        textAlign: 'left',
+        color: '$textPrimary',
+        textAlign: 'center',
     },
     hashText: {
         fontFamily: AppFonts.base.familyMono,
@@ -125,12 +132,10 @@ const styles = StyleService.create({
         color: '$grey',
         tintColor: '$grey',
     },
-
     iconArrow: {
         marginTop: 12,
         marginBottom: -12,
     },
-
     nfTokenContainer: {
         justifyContent: 'center',
         alignItems: 'center',
@@ -147,6 +152,10 @@ const styles = StyleService.create({
         paddingHorizontal: 10,
         borderRadius: 50,
     },
+    participant: {
+        borderWidth: 1,
+        borderColor: '$tint',
+    },
 });
 
 export default styles;
diff --git a/src/components/Modules/MutationWidgets/types.ts b/src/components/Modules/MutationWidgets/types.ts
index 6d129b9ee..14acbf2c9 100644
--- a/src/components/Modules/MutationWidgets/types.ts
+++ b/src/components/Modules/MutationWidgets/types.ts
@@ -8,10 +8,13 @@ import { MutationsMixinType } from '@common/libs/ledger/mixin/types';
 import { ComponentTypes } from '@services/NavigationService';
 import { ExplainerAbstract } from '@common/libs/ledger/factory/types';
 
+import { type cachedTokenDetailsState } from '@components/Modules/EventsList/EventListItems/Transaction';
+
 export interface Props {
     item: ((FallbackTransaction | Transactions) & MutationsMixinType) | LedgerObjects;
     account: AccountModel;
     advisory?: string;
     explainer?: ExplainerAbstract<FallbackTransaction | Transactions | LedgerObjects>;
     componentType: ComponentTypes;
+    cachedTokenDetails?: cachedTokenDetailsState;
 }
diff --git a/src/components/Modules/NetworkSwitchButton/NetworkSwitchButton.tsx b/src/components/Modules/NetworkSwitchButton/NetworkSwitchButton.tsx
index 7f6372445..4af19146d 100644
--- a/src/components/Modules/NetworkSwitchButton/NetworkSwitchButton.tsx
+++ b/src/components/Modules/NetworkSwitchButton/NetworkSwitchButton.tsx
@@ -6,6 +6,8 @@ import { AppScreens } from '@common/constants';
 
 import NetworkService, { NetworkStateStatus } from '@services/NetworkService';
 
+import { NetworkRepository } from '@store/repositories';
+
 import { Navigator } from '@common/helpers/navigator';
 
 import { NetworkModel } from '@store/models';
@@ -26,6 +28,7 @@ interface Props {
     onNetworkChange?: (network: NetworkModel) => void;
     onSwitcherClose?: () => void;
     containerStyle?: ViewStyle | ViewStyle[];
+    developerMode?: boolean;
 }
 
 interface State {
@@ -38,6 +41,7 @@ interface State {
 class NetworkSwitchButton extends PureComponent<Props, State> {
     public static CircleSize = AppSizes.scale(13);
     public static ButtonHeight = AppSizes.scale(30);
+    public static PillHeight = AppSizes.scale(31);
     private animation: Animated.Value;
 
     declare readonly props: Props & Required<Pick<Props, keyof typeof NetworkSwitchButton.defaultProps>>;
@@ -74,7 +78,7 @@ class NetworkSwitchButton extends PureComponent<Props, State> {
 
     componentWillUnmount() {
         NetworkService.off('stateChange', this.onNetworkStateChange);
-        NetworkService.off('networkChange', this.onNetworkChange);
+        NetworkService.off('networkChange', this.debouncedOnNetworkChange);
     }
 
     onNetworkStateChange = (state: NetworkStateStatus) => {
@@ -158,7 +162,24 @@ class NetworkSwitchButton extends PureComponent<Props, State> {
         }
     };
 
-    onButtonPress = () => {
+    onButtonPressPillToggle = () => {
+        const { network } = this.state;
+        const toNetworkKey = network.key === 'XAHAU'
+            ? 'MAINNET'
+            : 'XAHAU';
+        if (NetworkService.getNetwork().key !== toNetworkKey) {
+            const toNetwork = NetworkRepository.findBy('key', toNetworkKey);
+            if (toNetwork.length === 1) {
+                try {
+                    NetworkService.switchNetwork(toNetwork[0]);
+                } catch (e) {
+                    //
+                }
+            }
+        }
+    };
+
+    onButtonPressSwitcher = () => {
         this.setState({
             isSwitcherOpen: true,
         });
@@ -170,81 +191,164 @@ class NetworkSwitchButton extends PureComponent<Props, State> {
     };
 
     render() {
-        const { height, containerStyle, hidden, showChevronIcon } = this.props;
+        const { height, containerStyle, hidden, showChevronIcon, developerMode } = this.props;
         const { network, networkState, isSwitcherOpen } = this.state;
 
         if (hidden || !network) {
             return null;
         }
 
+        // const showAsSwitchPill = !showChevronIcon;
+        const isPillEligibleNetwork = network.key === 'XAHAU' || network.key === 'MAINNET';
+        const showAsSwitchPill = !showChevronIcon && !developerMode && isPillEligibleNetwork;
+
+        const showNetworkPillLeft = showAsSwitchPill && network.key === 'XAHAU';
+        const showNetworkPillRight = showAsSwitchPill && network.key === 'MAINNET';
+
+        const networkName = network.key === 'MAINNET' && showAsSwitchPill // Home screen
+            ? 'XRPL'
+            : network.key === 'XAHAU'
+            ? 'XAHAU' // upper case
+            : network.name;
+
         return (
-            <TouchableDebounce
-                testID="network-switch-button"
-                accessibilityRole="button"
-                delayPressIn={0}
-                style={[styles.buttonContainer, containerStyle, { height: height || NetworkSwitchButton.ButtonHeight }]}
-                onPress={this.onButtonPress}
-                activeOpacity={0.8}
-            >
-                <View style={styles.pulseWrapper}>
-                    <Animated.View
-                        style={[
-                            styles.pulseCircle,
-                            {
-                                backgroundColor: network.color,
-                                borderRadius: (NetworkSwitchButton.CircleSize * 1.4) / 2,
-                                width: NetworkSwitchButton.CircleSize,
-                                height: NetworkSwitchButton.CircleSize,
-                                transform: [
+            <View style={[
+                styles.buttonContainer,
+                containerStyle,
+                showAsSwitchPill ? styles.switchPillContainer : {},
+            ]}>
+                <TouchableDebounce
+                    testID="network-switch-button"
+                    accessibilityRole="button"
+                    delayPressIn={0}
+                    style={[
+                        styles.buttonContainer,
+                        containerStyle,
+                        { 
+                            height: showAsSwitchPill
+                                ? NetworkSwitchButton.PillHeight
+                                : height || NetworkSwitchButton.ButtonHeight,
+                        },
+                        showAsSwitchPill ? {
+                            ...styles.borderW0,
+                         } : {
+                            ...styles.borderW1,
+                         },
+                    ]}
+                    onPress={
+                        showAsSwitchPill
+                            ? this.onButtonPressPillToggle
+                            : this.onButtonPressSwitcher
+                    }
+                    activeOpacity={0.8}
+                >
+                    { showNetworkPillLeft && 
+                        <View style={[
+                            styles.theOtherNetworkLeft,
+                        ]}>
+                            <Text style={[
+                                styles.buttonText,
+                                styles.theOtherNetworkText,
+                                showChevronIcon && AppStyles.flex4,
+                                showAsSwitchPill && styles.pillFontSize,
+                            ]} numberOfLines={1}>
+                                XRPL
+                            </Text>
+                        </View>
+                    }
+
+                    <View style={[
+                        styles.buttonContainer,
+                        showAsSwitchPill ? {
+                            ...styles.borderW0,
+                            ...styles.theSelectedNetwork,
+                         } : {
+                            ...styles.borderW1,
+                         },
+                    ]}>
+                        <View style={styles.pulseWrapper}>
+                            <Animated.View
+                                style={[
+                                    styles.pulseCircle,
                                     {
-                                        scale: this.animation.interpolate({
-                                            inputRange: [0, 1],
-                                            outputRange: [1, 1.7],
+                                        backgroundColor: network.color,
+                                        borderRadius: (NetworkSwitchButton.CircleSize * 1.4) / 2,
+                                        width: NetworkSwitchButton.CircleSize,
+                                        height: NetworkSwitchButton.CircleSize,
+                                        transform: [
+                                            {
+                                                scale: this.animation.interpolate({
+                                                    inputRange: [0, 1],
+                                                    outputRange: [1, 1.7],
+                                                }),
+                                            },
+                                        ],
+                                        opacity: this.animation.interpolate({
+                                            inputRange: [0.02, 1],
+                                            outputRange: [1, 0],
                                         }),
                                     },
-                                ],
-                                opacity: this.animation.interpolate({
-                                    inputRange: [0.02, 1],
-                                    outputRange: [1, 0],
-                                }),
-                            },
-                        ]}
-                    />
-                    <View
-                        key={`${network.id.toHexString()}`}
-                        style={[
-                            AppStyles.centerContent,
-                            AppStyles.centerAligned,
-                            {
-                                width: NetworkSwitchButton.CircleSize,
-                                height: NetworkSwitchButton.CircleSize,
-                                borderRadius: NetworkSwitchButton.CircleSize / 2,
-                                backgroundColor: network.color,
-                            },
-                        ]}
-                    >
-                        {networkState === NetworkStateStatus.Disconnected && (
-                            <Text adjustsFontSizeToFit style={styles.exclamationMarkText}>
-                                !
-                            </Text>
-                        )}
-                    </View>
-                </View>
-
-                <Text style={[styles.buttonText, showChevronIcon && AppStyles.flex4]} numberOfLines={1}>
-                    {network.name}
-                </Text>
-
-                {showChevronIcon && (
-                    <View style={[AppStyles.flex1, AppStyles.rightAligned]}>
-                        <Icon
-                            style={styles.iconChevron}
-                            size={25}
-                            name={isSwitcherOpen ? 'IconChevronUp' : 'IconChevronDown'}
-                        />
+                                ]}
+                            />
+                            <View
+                                key={`${network.id.toHexString()}`}
+                                style={[
+                                    AppStyles.centerContent,
+                                    AppStyles.centerAligned,
+                                    {
+                                        width: NetworkSwitchButton.CircleSize,
+                                        height: NetworkSwitchButton.CircleSize,
+                                        borderRadius: NetworkSwitchButton.CircleSize / 2,
+                                        backgroundColor: network.color,
+                                    },
+                                ]}
+                            >
+                                {networkState === NetworkStateStatus.Disconnected && (
+                                    <Text adjustsFontSizeToFit style={styles.exclamationMarkText}>
+                                        !
+                                    </Text>
+                                )}
+                            </View>
+                        </View>
+
+                        <Text style={[
+                            styles.buttonText,
+                            showChevronIcon && AppStyles.flex4,
+                            showAsSwitchPill && [
+                                styles.pillFontSize,
+                                AppStyles.colorBlack,
+                            ],
+                        ]} numberOfLines={1}>
+                            {networkName}
+                        </Text>
                     </View>
-                )}
-            </TouchableDebounce>
+
+                    { showNetworkPillRight && 
+                        <View style={[
+                            styles.theOtherNetworkRight,
+                        ]}>
+                            <Text style={[
+                                styles.buttonText,
+                                styles.theOtherNetworkText,
+                                showChevronIcon && AppStyles.flex4,
+                                showAsSwitchPill && styles.pillFontSize,
+                            ]} numberOfLines={1}>
+                                XAHAU
+                            </Text>
+                        </View>
+                    }
+
+                    {showChevronIcon && (
+                        <View style={[AppStyles.flex1, AppStyles.rightAligned]}>
+                            <Icon
+                                style={styles.iconChevron}
+                                size={25}
+                                name={isSwitcherOpen ? 'IconChevronUp' : 'IconChevronDown'}
+                            />
+                        </View>
+                    )}
+                </TouchableDebounce>
+            </View>
         );
     }
 }
diff --git a/src/components/Modules/NetworkSwitchButton/styles.ts b/src/components/Modules/NetworkSwitchButton/styles.ts
index cc5cca5f5..53a6878bd 100644
--- a/src/components/Modules/NetworkSwitchButton/styles.ts
+++ b/src/components/Modules/NetworkSwitchButton/styles.ts
@@ -7,26 +7,60 @@ export default StyleService.create({
     buttonContainer: {
         flexDirection: 'row',
         alignItems: 'center',
-        borderWidth: 1,
-        backgroundColor: '$tint',
+        // backgroundColor: '$tint',
         borderColor: '$transparent',
         borderRadius: AppSizes.scale(18) / 2,
-        paddingHorizontal: 10,
+    },
+    borderW0: {
+        borderWidth: 0,
+    },
+    borderW1: {
+        borderWidth: 1,
     },
     buttonText: {
         fontFamily: AppFonts.base.familyExtraBold,
         fontSize: AppFonts.subtext.size,
         color: '$textPrimary',
         textAlign: 'left',
-        paddingHorizontal: 5,
+        paddingHorizontal: 8,
         paddingTop: 2,
     },
+    pillFontSize: {
+        fontSize: AppFonts.subtext.size * 0.9,
+        paddingHorizontal: 5,
+    },
     exclamationMarkText: {
         fontFamily: AppFonts.base.familyExtraBold,
         fontSize: AppFonts.small.size,
         color: '$textContrast',
         textAlign: 'center',
     },
+    switchPillContainer: {
+        backgroundColor: '$tint',
+        borderRadius: 9,
+        paddingHorizontal: 5,
+    },
+    theSelectedNetwork: {
+        backgroundColor: '$white',
+        borderRadius: AppSizes.scale(18) / 2 - 3,
+        paddingLeft: 4,
+        paddingRight: 1,
+        paddingVertical: 2,
+        borderWidth: 1,
+        borderColor: '$white',
+    },
+    theOtherNetworkText: {
+        color: '$textSecondary',
+    },
+    theOtherNetworkLeft: {
+        marginRight: 2,
+    },
+    theOtherNetworkRight: {
+        marginLeft: 3,
+        // paddingLeft: 5,
+        // borderLeftWidth: 1,
+        // borderColor: 'red',
+    },
     pulseWrapper: {
         alignItems: 'center',
         justifyContent: 'center',
diff --git a/src/components/Modules/ProBadge/ProBadge.tsx b/src/components/Modules/ProBadge/ProBadge.tsx
index bd7f03c03..e536d8e7d 100644
--- a/src/components/Modules/ProBadge/ProBadge.tsx
+++ b/src/components/Modules/ProBadge/ProBadge.tsx
@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { View, Text, InteractionManager } from 'react-native';
+import { View, Text, InteractionManager, ViewStyle } from 'react-native';
 
 import { ProfileRepository } from '@store/repositories';
 
@@ -8,10 +8,14 @@ import { Icon } from '@components/General';
 import styles from './styles';
 
 /* Types ==================================================================== */
-interface Props {}
+interface Props {
+    hasPro?: number;
+    style?: ViewStyle | ViewStyle[];
+}
 
 interface State {
     hasPro: boolean;
+    hasProFromProps: boolean;
 }
 
 /* Component ==================================================================== */
@@ -19,24 +23,45 @@ class ProBadge extends PureComponent<Props, State> {
     constructor(props: Props) {
         super(props);
 
+        const { hasPro } = this.props;
+
+        const hasProFromProps = typeof hasPro === 'number';
+
         this.state = {
-            hasPro: false,
+            hasPro: hasProFromProps
+                ? hasPro > 0
+                : false,
+            hasProFromProps,
         };
     }
 
     componentDidMount() {
         // get the has pro status
-        InteractionManager.runAfterInteractions(this.getProStatus);
+        const { hasProFromProps } = this.state;
 
-        // update the badge visibility when updated
-        ProfileRepository.on('profileUpdate', this.getProStatus);
+        if (!hasProFromProps) {
+            InteractionManager.runAfterInteractions(this.getProStatus);
+
+            // update the badge visibility when updated
+            ProfileRepository.on('profileUpdate', this.getProStatus);
+        }
     }
 
     componentWillUnmount() {
-        ProfileRepository.off('profileUpdate', this.getProStatus);
+        const { hasProFromProps } = this.state;
+
+        if (!hasProFromProps) {
+            ProfileRepository.off('profileUpdate', this.getProStatus);
+        }
     }
 
     getProStatus = () => {
+        const { hasProFromProps } = this.state;
+        
+        if (hasProFromProps) {
+            return;
+        }
+
         const profile = ProfileRepository.getProfile();
 
         // no profile found
@@ -50,6 +75,7 @@ class ProBadge extends PureComponent<Props, State> {
     };
 
     render() {
+        const { style } = this.props;
         const { hasPro } = this.state;
 
         if (!hasPro) {
@@ -57,7 +83,10 @@ class ProBadge extends PureComponent<Props, State> {
         }
 
         return (
-            <View style={styles.proBadgeContainer}>
+            <View style={[
+                styles.proBadgeContainer,
+                style,
+            ]}>
                 <Icon name="IconPro" size={15} />
                 <Text style={styles.proBadgeLabel}>Pro</Text>
             </View>
diff --git a/src/components/Modules/SecretNumberInput/SecretNumberInput.tsx b/src/components/Modules/SecretNumberInput/SecretNumberInput.tsx
index fcf66a9b0..fb8df94d4 100644
--- a/src/components/Modules/SecretNumberInput/SecretNumberInput.tsx
+++ b/src/components/Modules/SecretNumberInput/SecretNumberInput.tsx
@@ -5,349 +5,161 @@
  *
  */
 
-import { get, set } from 'lodash';
-
-import React, { Component } from 'react';
-import { View, TouchableOpacity, LayoutAnimation } from 'react-native';
-
-import { Icon } from '@components/General/Icon';
-
-import { AppStyles } from '@theme';
-import styles from './styles';
-
-import SecretNumberRow from './SecretNumberRow';
-
-/* Types ==================================================================== */
-interface Props {
-    currentRow?: number;
-    currentColumn?: number;
-    secretNumbers?: Array<string>;
-    readonly?: boolean;
-    checksum?: boolean;
-    onRowChanged?: (row: number) => void;
-    onAllFilled?: (filled: boolean) => void;
-    validateRow?: (row: number, numbers: string) => boolean;
-}
-
-interface State {
-    columnsNumber: number;
-    rowsNumber: number;
-    currentRow: number;
-    currentColumn: number;
-    secretNumbers: number[][];
-    rowChecksumError: boolean;
-}
-
-/* Constants ==================================================================== */
-const ROWS = 8;
-const COLUMNS = 6;
-const COLUMN_WIHTOUT_CHECKSUM = 5;
-
-/* Component ==================================================================== */
-class SecretNumberInput extends Component<Props, State> {
-    declare readonly props: Props & Required<Pick<Props, keyof typeof SecretNumberInput.defaultProps>>;
-
-    static defaultProps: Partial<Props> = {
-        checksum: true,
-    };
-
-    constructor(props: Props) {
-        super(props);
-
-        let rows = [...Array(ROWS)].map(() => Array(props.checksum ? COLUMNS : COLUMN_WIHTOUT_CHECKSUM));
-        if (props.secretNumbers) {
-            rows = [];
-            props.secretNumbers.forEach((row) => rows.push(row.split('')));
-        }
-
-        this.state = {
-            columnsNumber: props.checksum ? COLUMNS : COLUMN_WIHTOUT_CHECKSUM,
-            rowsNumber: ROWS,
-            currentRow: props.currentRow || 0,
-            currentColumn: props.currentColumn || 0,
-            secretNumbers: rows,
-            rowChecksumError: false,
-        };
+    import React, { Component } from 'react';
+    import { View } from 'react-native';
+    
+    import { CoreModel } from '@store/models';
+    
+    import { SecurePinInput } from '@components/General';
+    import { CoreRepository } from '@store/repositories';
+    
+    import { AppStyles } from '@theme';
+    
+    import SecretNumberRow from './SecretNumberRow';
+    
+    /* Types ==================================================================== */
+    interface Props {
+        currentRow?: number;
+        currentColumn?: number;
+        secretNumbers?: Array<string>;
+        readonly?: boolean;
+        checksum?: boolean;
+        validateRow?: (numbers: string) => boolean;
     }
-
-    componentDidMount() {
-        const { readonly } = this.props;
-        // set first row/col value if not readonly
-        if (!readonly) {
-            const defaultValue = Math.floor(Math.random() * 9);
-            this.setValue(0, 0, defaultValue);
-        }
+    
+    interface State {
+        coreSettings: CoreModel;
+        isBiometricAvailable: boolean;
+        columnsNumber: number;
+        rowsNumber: number;
+        currentRow: number;
+        currentColumn: number;
+        secretNumbers: number[][];
+        rowChecksumError: boolean;
     }
-
-    static getDerivedStateFromProps(props: Props, state: State) {
-        if (typeof props.currentRow === 'number') {
-            return {
-                ...state,
-                currentRow: props.currentRow,
+    
+    /* Constants ==================================================================== */
+    const ROWS = 8;
+    const COLUMNS = 6;
+    const COLUMN_WIHTOUT_CHECKSUM = 5;
+    
+    /* Component ==================================================================== */
+    class SecretNumberInput extends Component<Props, State> {
+        declare readonly props: Props & Required<Pick<Props, keyof typeof SecretNumberInput.defaultProps>>;
+    
+        private securePinInputRef: React.RefObject<SecurePinInput>;
+    
+        static defaultProps: Partial<Props> = {
+            checksum: true,
+        };
+    
+        constructor(props: Props) {
+            super(props);
+    
+            let rows = [...Array(ROWS)].map(() => Array(props.checksum ? COLUMNS : COLUMN_WIHTOUT_CHECKSUM));
+            if (props.secretNumbers) {
+                rows = [];
+                props.secretNumbers.forEach((row) => rows.push(row.split('')));
+            }
+    
+            this.securePinInputRef = React.createRef();
+    
+            this.state = {
+                coreSettings: CoreRepository.getSettings(),
+                isBiometricAvailable: false,
+                columnsNumber: props.checksum ? COLUMNS : COLUMN_WIHTOUT_CHECKSUM,
+                rowsNumber: ROWS,
+                currentRow: props.currentRow || 0,
+                currentColumn: props.currentColumn || 0,
+                secretNumbers: rows,
+                rowChecksumError: false,
             };
         }
-
-        return state;
-    }
-
-    public getCurrentRow = (): number => {
-        const { currentRow } = this.state;
-
-        return currentRow;
-    };
-
-    checkChecksum = (row: number, numbers: string): Boolean => {
-        const { validateRow, checksum } = this.props;
-        const { columnsNumber } = this.state;
-
-        // ignore checking for checksum if checksum in the props
-        if (!checksum) {
-            // if any custom row validation
-            if (typeof validateRow === 'function') {
-                return validateRow(row, numbers);
+    
+        static getDerivedStateFromProps(props: Props, state: State) {
+            if (typeof props.currentRow === 'number') {
+                return {
+                    ...state,
+                    currentRow: props.currentRow,
+                };
             }
-            return true;
-        }
-
-        if (numbers.length !== columnsNumber) {
-            return false;
+    
+            return state;
         }
 
-        const calculatedChecksum = parseInt(numbers.slice(5), 10);
-        const value = parseInt(numbers.slice(0, 5), 10);
-
-        const validChecksum = (value * (row * 2 + 1)) % 9 === calculatedChecksum;
-
-        // if any custom row validation
-        if (typeof validateRow === 'function') {
-            return validateRow(row, numbers) && validChecksum;
-        }
-        return validChecksum;
-    };
-
-    goLeft = () => {
-        const { onAllFilled, onRowChanged } = this.props;
-        const { currentRow, currentColumn, columnsNumber, rowsNumber } = this.state;
-        // we are at first row and column
-        if (currentRow === 0 && currentColumn === 0) return;
-
-        if (currentRow !== rowsNumber) {
-            this.setValue(currentRow, currentColumn, undefined, true);
-        }
-        // go to previous row
-        if (currentColumn === 0) {
-            this.setState(
-                {
-                    currentRow: currentRow - 1,
-                    currentColumn: columnsNumber - 1,
-                    rowChecksumError: false,
-                },
-                () => {
-                    if (onRowChanged) {
-                        onRowChanged(currentRow - 1);
-                    }
-                    if (currentRow === rowsNumber) {
-                        if (typeof onAllFilled === 'function') {
-                            onAllFilled(false);
-                        }
-                    }
-                },
-            );
-            return;
-        }
-        // go to previous column
-        this.setState({
-            currentColumn: currentColumn - 1,
-            rowChecksumError: false,
-        });
-    };
-
-    goRight = () => {
-        const { onAllFilled, onRowChanged } = this.props;
-        const { currentRow, currentColumn, secretNumbers, rowsNumber, columnsNumber } = this.state;
-
-        // we are after last row
-        if (currentRow === rowsNumber && currentColumn === 0) {
-            return;
-        }
-
-        // check the checksum and go to next row
-        if (currentColumn === columnsNumber - 1) {
-            if (this.checkChecksum(currentRow, secretNumbers[currentRow].join(''))) {
-                this.setState(
-                    {
-                        currentRow: currentRow + 1,
-                        currentColumn: 0,
-                        rowChecksumError: false,
-                    },
-                    () => {
-                        if (onRowChanged) {
-                            onRowChanged(currentRow + 1);
-                        }
-                        if (currentRow + 1 === rowsNumber) {
-                            if (typeof onAllFilled === 'function') {
-                                onAllFilled(true);
-                            }
-                        }
-                    },
+        clearPin = () => {
+            this.securePinInputRef.current?.setState({
+                digits: '',
+            });
+        };
+    
+        renderRows = () => {
+            const { readonly } = this.props;
+            const {
+                currentRow,
+                currentColumn,
+                secretNumbers,
+                rowChecksumError,
+                rowsNumber,
+                columnsNumber,
+            } = this.state;
+            const rows = [];
+    
+            for (let i = 0; i < rowsNumber; i++) {
+                rows.push(
+                    <SecretNumberRow
+                        key={`secret-number-row-${i}`}
+                        columnsNumber={columnsNumber}
+                        numbers={[...secretNumbers[i]]}
+                        readonly={readonly}
+                        rowNumber={i}
+                        currentColumn={currentRow === i ? currentColumn : 0}
+                        rowActive={currentRow === i}
+                        rowChecksumCorrect={currentRow > i}
+                        rowChecksumError={rowChecksumError}
+                    />,
                 );
-
-                if (currentRow + 1 !== rowsNumber) {
-                    const defaultValue = Math.floor(Math.random() * 9);
-                    this.setValue(currentRow + 1, 0, defaultValue, true);
-                }
-            } else {
-                this.setState({
-                    rowChecksumError: true,
-                });
             }
+            return rows;
+        };
+    
+        onPasscodeEntered = (pin: string) => {
+            const { validateRow } = this.props;
+            const { currentRow } = this.state;
 
-            return;
-        }
-        // go to previous column
-        this.setState({
-            currentColumn: currentColumn + 1,
-        });
-
-        const defaultValue = Math.floor(Math.random() * 9);
-        this.setValue(currentRow, currentColumn + 1, defaultValue);
-    };
-
-    plusValue = () => {
-        const { currentRow, currentColumn, secretNumbers, rowsNumber } = this.state;
-
-        if (currentRow === rowsNumber) return;
-
-        const currentValue = get(secretNumbers, `[${currentRow}][${currentColumn}]`);
-
-        if (typeof currentValue !== 'undefined') {
-            if (currentValue + 1 > 9) {
-                // loop
-                this.setValue(currentRow, currentColumn, 0);
-            } else {
-                this.setValue(currentRow, currentColumn, currentValue + 1);
+            if (typeof validateRow === 'function') {
+                const validates = validateRow(pin);
+                if (validates) {
+                    this.setState({
+                        currentRow: currentRow + 1,
+                    });
+                }
             }
-        }
-    };
-
-    minusValue = () => {
-        const { currentRow, currentColumn, secretNumbers, rowsNumber } = this.state;
-
-        if (currentRow === rowsNumber) return;
-
-        const currentValue = get(secretNumbers, `[${currentRow}][${currentColumn}]`);
-
-        if (typeof currentValue !== 'undefined') {
-            if (currentValue - 1 < 0) {
-                // loop
-                this.setValue(currentRow, currentColumn, 9);
-            } else {
-                this.setValue(currentRow, currentColumn, currentValue - 1);
+        };
+    
+        render() {
+            const { readonly } = this.props;
+            const { isBiometricAvailable, coreSettings } = this.state;
+    
+            if (readonly) {
+                return this.renderRows();
             }
-        }
-    };
-
-    setValue = (row: number, col: number, value: number | undefined, newRow?: boolean) => {
-        const { secretNumbers } = this.state;
-
-        // animation
-        if (newRow) {
-            LayoutAnimation.easeInEaseOut();
-        } else if (!(row === 0 && col === 0)) {
-            LayoutAnimation.spring();
-        }
-
-        this.setState({
-            secretNumbers: set(secretNumbers, `[${row}][${col}]`, value),
-        });
-    };
-
-    getNumbers = () => {
-        const { secretNumbers } = this.state;
-        const secretNumber = [] as string[];
-        secretNumbers.forEach((row) => secretNumber.push(row.join('')));
-        return secretNumber;
-    };
-
-    renderRows = () => {
-        const { readonly } = this.props;
-        const { currentRow, currentColumn, secretNumbers, rowChecksumError, rowsNumber, columnsNumber } = this.state;
-        const rows = [];
-
-        for (let i = 0; i < rowsNumber; i++) {
-            rows.push(
-                <SecretNumberRow
-                    key={`secret-number-row-${i}`}
-                    columnsNumber={columnsNumber}
-                    numbers={[...secretNumbers[i]]}
-                    readonly={readonly}
-                    rowNumber={i}
-                    currentColumn={currentRow === i ? currentColumn : 0}
-                    rowActive={currentRow === i}
-                    rowChecksumCorrect={currentRow > i}
-                    rowChecksumError={rowChecksumError}
-                />,
+    
+            return (
+                <View style={AppStyles.stretchSelf}>
+                    <SecurePinInput
+                        ref={this.securePinInputRef}
+                        virtualKeyboard
+                        onInputFinish={this.onPasscodeEntered}
+                        supportBiometric={isBiometricAvailable}
+                        enableHapticFeedback={coreSettings.hapticFeedback}
+                        length={6}
+                    />
+                </View>
             );
         }
-        return rows;
-    };
-
-    render() {
-        const { readonly } = this.props;
-
-        if (readonly) {
-            return this.renderRows();
-        }
-
-        return (
-            <View style={AppStyles.stretchSelf}>
-                <View>{this.renderRows()}</View>
-                <View style={[AppStyles.row, AppStyles.centerContent, AppStyles.paddingTopSml]}>
-                    <View style={[AppStyles.flex1, AppStyles.centerAligned]}>
-                        <TouchableOpacity
-                            testID="left-btn"
-                            activeOpacity={0.8}
-                            onPress={this.goLeft}
-                            style={styles.buttonRoundBlack}
-                        >
-                            <Icon size={25} name="IconChevronLeft" style={styles.buttonRoundIcon} />
-                        </TouchableOpacity>
-                    </View>
-
-                    <View style={[AppStyles.flex2, AppStyles.row, AppStyles.centerContent, AppStyles.centerAligned]}>
-                        <TouchableOpacity
-                            testID="minus-btn"
-                            activeOpacity={0.8}
-                            onPress={this.minusValue}
-                            style={styles.buttonMiddleLeft}
-                        >
-                            <Icon size={30} name="IconMinus" style={styles.buttonRoundIcon} />
-                        </TouchableOpacity>
-                        <TouchableOpacity
-                            testID="plus-btn"
-                            activeOpacity={0.8}
-                            onPress={this.plusValue}
-                            style={styles.buttonMiddleRight}
-                        >
-                            <Icon size={30} name="IconPlus" style={styles.buttonRoundIcon} />
-                        </TouchableOpacity>
-                    </View>
-
-                    <View style={[AppStyles.flex1, AppStyles.centerAligned]}>
-                        <TouchableOpacity
-                            testID="right-btn"
-                            activeOpacity={0.8}
-                            onPress={this.goRight}
-                            style={styles.buttonRoundBlack}
-                        >
-                            <Icon size={25} name="IconChevronRight" style={styles.buttonRoundIcon} />
-                        </TouchableOpacity>
-                    </View>
-                </View>
-            </View>
-        );
     }
-}
-
-/* Export Component ==================================================================== */
-export default SecretNumberInput;
+    
+    /* Export Component ==================================================================== */
+    export default SecretNumberInput;
+    
\ No newline at end of file
diff --git a/src/components/Modules/ServiceFee/ServiceFee.tsx b/src/components/Modules/ServiceFee/ServiceFee.tsx
new file mode 100644
index 000000000..21ed1ebf0
--- /dev/null
+++ b/src/components/Modules/ServiceFee/ServiceFee.tsx
@@ -0,0 +1,248 @@
+import { find, debounce } from 'lodash';
+
+import React, { Component } from 'react';
+import { View, Text, ViewStyle, InteractionManager, TextStyle } from 'react-native';
+
+import NetworkService from '@services/NetworkService';
+import BackendService from '@services/BackendService';
+
+import { AmountParser } from '@common/libs/ledger/parser/common';
+
+import { TouchableDebounce, LoadingIndicator, InfoMessage } from '@components/General';
+
+import { type Payload } from '@common/libs/payload';
+
+import Localize from '@locale';
+
+import { FeeItem } from '@screens/Overlay/SelectFee/types';
+
+import { AppStyles } from '@theme';
+
+/**
+ * This module is ONLY loaded on a SIGN REQUEST with a FIXED payload
+ * where the service fee must be separately rendered. In all other
+ * occasions, the Service Fee is part of the REGULAR FEE PICKER.
+ */
+
+/* Types ==================================================================== */
+interface Props {
+    txJson: any;
+    containerStyle?: ViewStyle | ViewStyle[];
+    textStyle?: TextStyle | TextStyle[];
+    showHooksFee?: boolean;
+    payload?: Payload;
+    onSelect?: (item: any) => void;
+}
+
+interface State {
+    availableFees?: FeeItem[];
+    selected?: FeeItem;
+    feeHooks?: number;
+    feePercentage?: number;
+    error: boolean;
+}
+
+/* Component ==================================================================== */
+class ServiceFee extends Component<Props, State> {
+    declare readonly props: Props & Required<Pick<Props, keyof typeof ServiceFee.defaultProps>>;
+
+    static defaultProps: Partial<Props> = {
+        showHooksFee: true,
+    };
+
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {
+            // availableFees: undefined,
+            selected: undefined,
+            feeHooks: undefined,
+            feePercentage: undefined,
+            error: false,
+        };
+    }
+
+    // We don't update anymore, there's nothing that can
+    // change now that will change the fee. Amounts. etc.
+    // are already known here.
+    // componentDidUpdate(prevProps: Readonly<Props>) {
+    //     const { txJson } = this.props;
+    //     // re-fetch the fees when received new transaction json
+    //     if (!isEqual(omit(txJson, 'Fee'), omit(prevProps.txJson, 'Fee'))) {
+    //         this.setState(
+    //             {
+    //                 // availableFees: undefined,
+    //                 selected: undefined,
+    //                 feeHooks: undefined,
+    //                 error: false,
+    //             },
+    //             this.fetchFees,
+    //         );
+    //     }
+    // }
+
+    componentDidMount() {
+        // fetch available fees from network
+        InteractionManager.runAfterInteractions(this.fetchFees);
+    }
+
+    fetchFees = (isFallback = false): Promise<void> => {
+        const { txJson, payload } = this.props;
+
+        const payloadUuid = payload
+            ? payload?.getPayloadUUID()
+            : undefined;
+
+        // when it's retry with fallback then we don't include txJson
+        return BackendService.getServiceFee(!isFallback ? txJson : undefined, payloadUuid)
+            .then((res) => {
+                // console.log('Picked backend service service fee', res);
+                const { availableFees, feeHooks, suggested, feePercentage } = res;
+
+                this.setState({
+                    // availableFees,
+                    feeHooks,
+                    feePercentage,
+                });
+
+                // set the suggested fee by default
+                this.onSelect(find(availableFees, { type: suggested })!);
+            })
+            .catch(() => {});
+    };
+
+    debouncedFetchFees = debounce(this.fetchFees, 300);
+
+    onSelect = (item: FeeItem) => {
+        const { onSelect } = this.props;
+
+        this.setState(
+            {
+                selected: item,
+            },
+            () => {
+                if (typeof onSelect === 'function') {
+                    onSelect(item);
+                }
+            },
+        );
+    };
+
+    getNormalizedFee = () => {
+        const { selected } = this.state;
+
+        if (!selected) {
+            return 0;
+        }
+
+        return new AmountParser(selected.value).dropsToNative().toString();
+    };
+
+    getNormalizedFeePercentage = () => {
+        const { feePercentage } = this.state;
+
+        if (!feePercentage) {
+            return 0;
+        }
+
+        return feePercentage;
+    };
+
+    getNormalizedHooksFee = () => {
+        const { feeHooks } = this.state;
+
+        if (!feeHooks) {
+            return 0;
+        }
+
+        return new AmountParser(feeHooks).dropsToNative().toString();
+    };
+
+    renderError = () => {
+        const { containerStyle } = this.props;
+
+        return (
+            <View style={containerStyle}>
+                <InfoMessage
+                    label={Localize.t('global.unableToLoadNetworkFee')}
+                    type="error"
+                    actionButtonLabel={Localize.t('global.tryAgain')}
+                    actionButtonIcon="IconRefresh"
+                    onActionButtonPress={this.debouncedFetchFees}
+                />
+            </View>
+        );
+    };
+
+    renderLoading = () => {
+        const { containerStyle, textStyle } = this.props;
+
+        return (
+            <View style={[AppStyles.row, containerStyle]}>
+                <Text style={textStyle}>{Localize.t('global.loading')}...&nbsp;</Text>
+                <LoadingIndicator />
+            </View>
+        );
+    };
+
+    render() {
+        const { containerStyle, textStyle } = this.props;
+        const { selected, error } = this.state;
+
+        if (error) {
+            return this.renderError();
+        }
+
+        // nothing to show
+        if (!selected) {
+            return this.renderLoading();
+        }
+
+        return (
+            <View style={containerStyle}>
+                <TouchableDebounce activeOpacity={0.8} style={AppStyles.row}>
+                    <View style={[AppStyles.flex1, AppStyles.row, AppStyles.centerAligned]}>
+                        {
+                            (
+                                String(this.getNormalizedFeePercentage()) === '0' &&
+                                String(this.getNormalizedFee()) === '0'
+                            ) && (
+                                <Text style={textStyle}>{Localize.t('global.none')}</Text>
+                            )
+                        }
+                        {
+                            (
+                                String(this.getNormalizedFeePercentage()) !== '0'
+                            ) && (
+                                <Text style={textStyle}>
+                                    {this.getNormalizedFeePercentage()}%
+                                </Text>
+                            )
+                        }
+                        {
+                            (
+                                String(this.getNormalizedFeePercentage()) === '0' &&
+                                String(this.getNormalizedFee()) !== '0'
+                            ) && (
+                                <Text style={textStyle}>
+                                    {this.getNormalizedFee()}{' '}
+                                    {NetworkService.getNativeAsset()}
+                                </Text>
+                            )
+                        }
+                    </View>
+                </TouchableDebounce>
+                {selected?.note && (
+                    <View style={AppStyles.paddingTopSml}>
+                        <InfoMessage
+                            type="info"
+                            label={selected?.note || 'No note'}
+                        />
+                    </View>
+                )}
+            </View>
+        );
+    }
+}
+
+export default ServiceFee;
diff --git a/src/components/Modules/ServiceFee/index.ts b/src/components/Modules/ServiceFee/index.ts
new file mode 100644
index 000000000..a9e0b31e3
--- /dev/null
+++ b/src/components/Modules/ServiceFee/index.ts
@@ -0,0 +1 @@
+export { default as ServiceFee } from './ServiceFee';
diff --git a/src/components/Modules/ServiceFee/styles.ts b/src/components/Modules/ServiceFee/styles.ts
new file mode 100644
index 000000000..8cbea60d4
--- /dev/null
+++ b/src/components/Modules/ServiceFee/styles.ts
@@ -0,0 +1,20 @@
+import StyleService from '@services/StyleService';
+
+/* Styles ==================================================================== */
+export default StyleService.create({
+    container: {
+        flexDirection: 'row',
+    },
+    editButton: {
+        backgroundColor: '$tint',
+        borderRadius: 8,
+        height: 25,
+        width: 40,
+        justifyContent: 'center',
+        alignSelf: 'center',
+        marginRight: 15,
+    },
+    badgeLabel: {
+        color: '$textContrast',
+    },
+});
diff --git a/src/components/Modules/TokenElement/TokenAvatar/TokenAvatar.tsx b/src/components/Modules/TokenElement/TokenAvatar/TokenAvatar.tsx
index d1ca735c1..178541ec8 100644
--- a/src/components/Modules/TokenElement/TokenAvatar/TokenAvatar.tsx
+++ b/src/components/Modules/TokenElement/TokenAvatar/TokenAvatar.tsx
@@ -11,50 +11,39 @@ import { NetworkService, StyleService } from '@services';
 import { TrustLineModel } from '@store/models';
 
 import { Avatar, AvatarProps } from '@components/General/Avatar';
+import { View, Text } from 'react-native';
+// import { AppStyles } from '@theme/index';
+import styles from './styles';
 
 /* Types ==================================================================== */
 interface Props extends Omit<AvatarProps, 'source'> {
-    token: TrustLineModel | 'Native';
+    token?: TrustLineModel | 'Native';
+    tokenPair?: (TrustLineModel | string)[];
     saturate?: boolean;
+    networkService?: typeof NetworkService;
 }
 
 interface State {
-    avatar?: string;
 }
 
 /* Component ==================================================================== */
 class TokenAvatar extends PureComponent<Props, State> {
     constructor(props: Props) {
         super(props);
-
-        this.state = {
-            avatar: undefined,
-        };
-    }
-
-    static getDerivedStateFromProps(nextProps: Props, prevState: State): Partial<State> | null {
-        const avatar = TokenAvatar.getAvatar(nextProps.token);
-        if (prevState.avatar !== avatar) {
-            return {
-                avatar,
-            };
-        }
-        return null;
     }
 
-    static getAvatar = (token: TrustLineModel | 'Native'): string => {
-        // native asset
+    getAvatar (): string {
+        const {token, networkService} = this.props;
         if (token === 'Native') {
-            const { asset } = NetworkService.getNativeAssetIcons();
-            return asset;
+            return (networkService || NetworkService).getNativeAssetIcons().asset || '';
         }
 
         // issuer avatar
-        if (token?.currency?.issuerAvatarUrl) {
+        if (typeof token === 'object' && token && token?.currency?.issuerAvatarUrl) {
             return token.currency.issuerAvatarUrl;
         }
 
-        if (token?.isLiquidityPoolToken()) {
+        if (typeof token === 'object' && token && token?.isLiquidityPoolToken()) {
             return StyleService.getImage('ImageUnknownAMM').uri;
         }
 
@@ -62,11 +51,22 @@ class TokenAvatar extends PureComponent<Props, State> {
     };
 
     render() {
-        const { size, imageScale, border, badge, saturate, badgeColor, containerStyle, backgroundColor } = this.props;
-        const { avatar } = this.state;
+        const {
+            token,
+            tokenPair,
+            size,
+            imageScale,
+            border,
+            badge,
+            saturate,
+            badgeColor,
+            containerStyle,
+            backgroundColor,
+            networkService,
+        } = this.props;
 
         // add saturation to avatar before passing it
-        let avatarUrl = avatar;
+        let avatarUrl = this.getAvatar();
         if (avatarUrl && saturate) {
             const BASE_CDN_URL = '/cdn-cgi/image/';
             const SATURATION_PARAM = 'saturation=0,';
@@ -75,10 +75,76 @@ class TokenAvatar extends PureComponent<Props, State> {
                 avatarUrl = avatarUrl.replace(BASE_CDN_URL, `${BASE_CDN_URL}${SATURATION_PARAM}`);
             }
         }
+        
+        const _containerStyle = containerStyle || { backgroundColor: 'transparent' };
+
+        const nativeAsset = (networkService || NetworkService).getNativeAsset();
+
+        const TokenPair = token
+            ? typeof token !== 'string' && token.getLpAssetPair() || undefined
+            : tokenPair && typeof tokenPair === 'object' && tokenPair.length === 2 ? tokenPair.map(_token => {
+                return typeof _token === 'object' && _token?.currency?.issuerAvatarUrl
+                    ? _token.currency.issuerAvatarUrl
+                    : typeof _token === 'string' && _token === nativeAsset
+                    ? _token
+                    : StyleService.getImage('ImageUnknownTrustLine').uri;
+            }) : undefined;
+
+        if (TokenPair && TokenPair?.[0] && TokenPair?.[1] && TokenPair?.[0] !== '' && TokenPair?.[1] !== '') {
+            const [t1, t2] = TokenPair;
+            const img1 = t1 === nativeAsset
+                ? (networkService || NetworkService).getNativeAssetIcons().asset
+                : t1 === ''
+                ? StyleService.getImage('ImageUnknownAMM').uri
+                : t1;
+            const img2 = t2 === nativeAsset
+                ? (networkService || NetworkService).getNativeAssetIcons().asset
+                : t1 === ''
+                ? StyleService.getImage('ImageUnknownAMM').uri
+                : t2;
+
+            return (
+                <View
+                    style={[
+                        styles.lpContainer,
+                        { width: size, height: size },
+                        containerStyle,
+                        { backgroundColor },
+                    ]}
+                >
+                    <Avatar
+                        containerStyle={[
+                            styles.miniAvatar,
+                            styles.avatar1,
+                        ]}
+                        size={21} source={{ uri: img1 }} />
+                    <Avatar
+                        containerStyle={[
+                            styles.miniAvatar,
+                            styles.avatar2,
+                        ]}
+                        size={21} source={{ uri: img2 }} />
+                </View>
+            );
+        }
+
+        if (!avatarUrl || avatarUrl === '') {
+            return <Text>?</Text>;
+        }
 
         return (
             <Avatar
-                {...{ size, imageScale, border, badge, badgeColor, containerStyle, backgroundColor }}
+                {...
+                    {
+                        size,
+                        imageScale,
+                        border,
+                        badge,
+                        badgeColor,
+                        containerStyle: _containerStyle,
+                        backgroundColor,
+                    }
+                }
                 source={{ uri: avatarUrl }}
             />
         );
diff --git a/src/components/Modules/TokenElement/TokenAvatar/styles.ts b/src/components/Modules/TokenElement/TokenAvatar/styles.ts
index 28b8eefb3..8a929d37e 100644
--- a/src/components/Modules/TokenElement/TokenAvatar/styles.ts
+++ b/src/components/Modules/TokenElement/TokenAvatar/styles.ts
@@ -1,4 +1,32 @@
 import StyleService from '@services/StyleService';
 
 /* Styles ==================================================================== */
-export default StyleService.create({});
+export default StyleService.create({
+    lpContainer: {
+        // borderWidth: 1,
+        // borderColor: 'red',
+        width: 35,
+        height: 35,
+        borderRadius: 3,
+    },
+    dualAvatar: {
+        // borderRadius: 200,
+        // width: 23,
+        // height: 23,
+        // backgroundColor: '$light',
+    },
+    miniAvatar: {
+        backgroundColor: '$light',
+        borderRadius: 50,
+    },
+    avatar1: {
+        position: 'absolute',
+        top: -1,
+        left: -2,
+    },
+    avatar2: {
+        position: 'absolute',
+        left: 14,
+        top: 12,
+    },
+});
diff --git a/src/components/Modules/XAppBrowserHeader/XAppBrowserHeader.tsx b/src/components/Modules/XAppBrowserHeader/XAppBrowserHeader.tsx
index 3b75fd2af..3dede8955 100644
--- a/src/components/Modules/XAppBrowserHeader/XAppBrowserHeader.tsx
+++ b/src/components/Modules/XAppBrowserHeader/XAppBrowserHeader.tsx
@@ -3,6 +3,7 @@ import { View, Text, Animated } from 'react-native';
 
 import { AccountModel, NetworkModel } from '@store/models';
 
+// components
 import { AccountSwitchElement } from '@components/Modules/AccountSwitchElement';
 import { NetworkLabel } from '@components/Modules/NetworkLabel';
 import { NetworkSwitchButton } from '@components/Modules/NetworkSwitchButton';
@@ -20,6 +21,8 @@ interface Props {
     icon?: string;
     account: AccountModel;
     network: NetworkModel;
+    noSwitching?: boolean;
+    nativeTitle?: string;
     onAccountChange?: (account: AccountModel) => void;
     onNetworkChange?: (network: any) => void;
     onClosePress?: () => void;
@@ -111,12 +114,15 @@ class XAppBrowserHeader extends Component<Props, State> {
     };
 
     render() {
-        const { title, icon, account } = this.props;
+        const { title, icon, account, noSwitching } = this.props;
         const { isPanelExpanding, panelExpanded } = this.state;
 
         return (
             <>
-                <View style={[styles.headerContainer, { borderBottomWidth: +!isPanelExpanding && +!panelExpanded }]}>
+                <View style={[
+                    styles.headerContainer,
+                    { borderBottomWidth: +!isPanelExpanding && +!panelExpanded },
+                ]}>
                     <View style={styles.headerLeftContainer}>
                         <Avatar isLoading={!icon} source={{ uri: icon }} size={30} />
                         <TextPlaceholder isLoading={!title} style={styles.titleText} length={24}>
@@ -124,19 +130,21 @@ class XAppBrowserHeader extends Component<Props, State> {
                         </TextPlaceholder>
                     </View>
                     <View style={styles.headerRightContainer}>
-                        <Button
-                            testID="expand-button"
-                            numberOfLines={1}
-                            roundedMini
-                            light
-                            style={styles.headerButton}
-                            onPress={this.toggleExpandedBar}
-                        >
-                            <View style={[AppStyles.row, AppStyles.centerAligned]}>
-                                <NetworkLabel size={13} type="circle" onPress={this.toggleExpandedBar} />
-                                <Text style={styles.headerButtonText}>•••</Text>
-                            </View>
-                        </Button>
+                        { !noSwitching &&
+                            <Button
+                                testID="expand-button"
+                                numberOfLines={1}
+                                roundedMini
+                                light
+                                style={styles.headerButton}
+                                onPress={this.toggleExpandedBar}
+                            >
+                                <View style={[AppStyles.row, AppStyles.centerAligned]}>
+                                    <NetworkLabel size={13} type="circle" onPress={this.toggleExpandedBar} />
+                                    <Text style={styles.headerButtonText}>•••</Text>
+                                </View>
+                            </Button>
+                        }
                         <Button
                             contrast
                             testID="close-button"
@@ -174,6 +182,7 @@ class XAppBrowserHeader extends Component<Props, State> {
                     <View style={styles.accountSwitchContainer}>
                         <AccountSwitchElement
                             account={account}
+                            noPadding
                             onAccountSwitch={this.onDefaultAccountChange}
                             onSwitcherClose={this.toggleExpandedBar}
                         />
@@ -187,10 +196,14 @@ class XAppBrowserHeader extends Component<Props, State> {
                             label={Localize.t('xapp.aboutThisXApp')}
                             onPress={this.showXAppInfo}
                             activeOpacity={0.8}
-                            style={[AppStyles.flex1, styles.headerButton]}
+                            style={[AppStyles.flex3, styles.headerButton]}
                         />
                         <NetworkSwitchButton
-                            containerStyle={[AppStyles.flex1, { marginLeft: AppSizes.paddingSml }]}
+                            containerStyle={[
+                                AppStyles.flex4,
+                                { marginLeft: AppSizes.paddingSml },
+                                styles.networkSwitchBtn,
+                            ]}
                             loadingAnimation={false}
                             showChevronIcon
                             height="100%"
diff --git a/src/components/Modules/XAppBrowserHeader/styles.tsx b/src/components/Modules/XAppBrowserHeader/styles.tsx
index 087ca23d1..7f3684858 100644
--- a/src/components/Modules/XAppBrowserHeader/styles.tsx
+++ b/src/components/Modules/XAppBrowserHeader/styles.tsx
@@ -66,9 +66,18 @@ const styles = StyleService.create({
     iconChevronDown: {
         tintColor: '$contrast',
     },
-
+    networkSwitchBtn: {
+        backgroundColor: '$tint',
+        paddingRight: 4,
+    },
     accountSwitchContainer: {
         marginBottom: AppSizes.paddingExtraSml,
+        paddingTop: 7,
+        paddingBottom: 4,
+        paddingLeft: 10,
+        paddingRight: 6,
+        borderRadius: 11,
+        backgroundColor: '$tint',
     },
 });
 
diff --git a/src/components/Modules/XAppShortList/XAppItem/XAppItem.tsx b/src/components/Modules/XAppShortList/XAppItem/XAppItem.tsx
index ae5783977..9b60c70c1 100644
--- a/src/components/Modules/XAppShortList/XAppItem/XAppItem.tsx
+++ b/src/components/Modules/XAppShortList/XAppItem/XAppItem.tsx
@@ -1,10 +1,12 @@
-import { isEmpty } from 'lodash';
 import React, { Component } from 'react';
 import { View, Text, Animated, Image } from 'react-native';
 
-import { Spacer, TouchableDebounce } from '@components/General';
+import { TouchableDebounce } from '@components/General';
+
+import Localize from '@locale';
 
 import styles from './styles';
+// import { AppStyles } from '@theme/index';
 
 /* types ==================================================================== */
 export type AppType = {
@@ -15,6 +17,7 @@ export type AppType = {
 
 export interface Props {
     app?: AppType;
+    index?: number;
     onPress?: (app: any) => void;
 }
 
@@ -53,6 +56,7 @@ class XAppItem extends Component<Props> {
         const { app } = this.props;
 
         // if app provided stop the placeholder animation
+
         if (app) {
             this.startFadeAnimation();
             return;
@@ -80,52 +84,117 @@ class XAppItem extends Component<Props> {
         }
     };
 
-    renderPlaceholder = () => {
-        return (
-            <View style={styles.container}>
-                <Animated.View
-                    style={[
-                        styles.appIcon,
-                        styles.appIconPlaceholder,
-                        {
-                            opacity: this.placeholderAnimation,
-                        },
-                    ]}
-                />
-
-                <Animated.Text
-                    numberOfLines={1}
-                    style={[styles.appTitle, styles.appTitlePlaceholder, { opacity: this.placeholderAnimation }]}
-                >
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                </Animated.Text>
-                <Spacer size={2} />
-                <Animated.Text
-                    numberOfLines={1}
-                    style={[styles.appTitle, styles.appTitlePlaceholder, { opacity: this.placeholderAnimation }]}
-                >
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                </Animated.Text>
-            </View>
-        );
-    };
-
     render() {
-        const { app } = this.props;
-
-        if (isEmpty(app)) {
-            return this.renderPlaceholder();
+        const { app, index } = this.props;
+
+        if (typeof app === 'object' && !app?.title) {
+            //  Nada
+            const invisible: {
+                opacity: number;
+            } = { opacity: 0 };
+            const none: {
+                flex: number;
+                alignItems: 'center';
+                justifyContent: 'center';
+            } = { 
+                flex: 1,
+                justifyContent: 'center',
+                alignItems: 'center',
+            };
+            return (
+                <View style={styles.container}>
+                    <View
+                        style={[
+                            styles.appIcon,
+                            styles.appIconPlaceholder,
+                            Number(index || 0) > 0 ? invisible : none,
+                        ]}
+                    >
+                        {
+                            Number(index || 0) === 0 && (
+                                <View style={[
+                                    // AppStyles.column,
+                                    // AppStyles.borderGreen,
+                                ]}>
+                                    <Text style={[
+                                        // styles.appTitle,
+                                        styles.appIconPlaceholderText,
+                                    ]}>
+                                        { Localize.t('global.none') }
+                                    </Text>
+                                </View>
+                            )
+                        }
+                    </View>
+                    <View style={[
+                        styles.appTitlePlaceholderContainer,
+                    ]}>
+                        <Text
+                            numberOfLines={2}
+                            style={[
+                                styles.appTitle, styles.appTitlePlaceholder,
+                                Number(index || 0) > 0 ? invisible : undefined,
+                            ]}
+                        >
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        </Text>
+                    </View>
+                </View>
+            );
         }
 
         return (
-            <Animated.View style={[styles.container, { opacity: this.fadeAnimation }]}>
-                <TouchableDebounce activeOpacity={0.8} onPress={this.onPress}>
-                    <Image source={{ uri: app.icon }} style={styles.appIcon} />
-                    <Text numberOfLines={2} style={styles.appTitle}>
-                        {app.title}
-                    </Text>
-                </TouchableDebounce>
-            </Animated.View>
+            <>
+                { !app &&
+                    <View style={[
+                        styles.container,
+                    ]}>
+                        <Animated.View
+                            style={[
+                                styles.appIcon,
+                                styles.appIconPlaceholder,
+                                {
+                                    opacity: this.placeholderAnimation,
+                                },
+                            ]}
+                        />
+                        <View style={[
+                            styles.appTitlePlaceholderContainer,
+                        ]}>
+                            <Animated.Text
+                                numberOfLines={2}
+                                style={[
+                                    styles.appTitle,
+                                    styles.appTitlePlaceholder,
+                                    { opacity: this.placeholderAnimation },
+                                ]}
+                            >
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            </Animated.Text>
+                        </View>
+                    </View>
+                }
+                { app &&
+                    <Animated.View style={[styles.container, { opacity: this.fadeAnimation }]}>
+                        <TouchableDebounce activeOpacity={0.8} onPress={this.onPress}>
+                            <Image source={{ uri: app.icon }} style={styles.appIcon} />
+                            <View style={[
+                                styles.appTitleContainer,
+                            ]}>
+                                <Text numberOfLines={2} style={styles.appTitle}>
+                                    {app.title}
+                                </Text>
+                            </View>
+                        </TouchableDebounce>
+                    </Animated.View>
+                }
+            </>
         );
     }
 }
diff --git a/src/components/Modules/XAppShortList/XAppItem/styles.tsx b/src/components/Modules/XAppShortList/XAppItem/styles.tsx
index 41c00a5be..4d0c60a47 100644
--- a/src/components/Modules/XAppShortList/XAppItem/styles.tsx
+++ b/src/components/Modules/XAppShortList/XAppItem/styles.tsx
@@ -8,27 +8,49 @@ const styles = StyleService.create({
         flex: 1,
         alignItems: 'center',
         paddingHorizontal: AppSizes.paddingExtraSml,
+        // position: 'relative',
     },
     appTitle: {
-        lineHeight: AppFonts.subtext.size * 0.9,
-        fontFamily: AppFonts.base.familyBold,
-        fontSize: AppFonts.subtext.size * 0.9,
+        lineHeight: AppFonts.subtext.size * 0.95,
+        fontFamily: AppFonts.base.family,
+        fontSize: AppFonts.subtext.size * 0.89,
         textAlign: 'center',
         color: '$textPrimary',
+        height: AppFonts.subtext.size * 2,
     },
     appTitlePlaceholder: {
         color: StyleService.select({ dark: '$darkGrey', light: '$light' }),
         backgroundColor: StyleService.select({ dark: '$darkGrey', light: '$light' }),
     },
+    appTitleContainer: {
+        height: AppFonts.subtext.size * 2,
+    },
+    appTitlePlaceholderContainer: {
+        borderRadius: 10,
+        overflow: 'hidden',
+        height: AppFonts.subtext.size * 2,
+    },
     appIcon: {
         width: '80%',
         aspectRatio: 1,
         borderRadius: 10,
         marginBottom: AppSizes.paddingExtraSml,
         alignSelf: 'center',
+        // borderWidth: 3,
+        // borderColor: 'red',
     },
     appIconPlaceholder: {
         backgroundColor: StyleService.select({ dark: '$darkGrey', light: '$silver' }),
+        // borderColor: 'green',
+    },
+    appIconPlaceholderText: {
+        opacity: 0.4,
+        // lineHeight: AppFonts.subtext.size * 1.4,
+        // lineHeight: AppFonts.subtext.size,
+        fontFamily: AppFonts.base.family,
+        fontSize: AppFonts.subtext.size,
+        color: '$textSecondary',
+        // height: AppFonts.subtext.size,
     },
 });
 
diff --git a/src/components/Modules/XAppShortList/XAppShortList.tsx b/src/components/Modules/XAppShortList/XAppShortList.tsx
index 27b903d8d..811bb2d07 100644
--- a/src/components/Modules/XAppShortList/XAppShortList.tsx
+++ b/src/components/Modules/XAppShortList/XAppShortList.tsx
@@ -70,9 +70,9 @@ class XAppShortList extends Component<Props, State> {
         const { apps } = this.state;
 
         return (
-            <View style={[styles.container, containerStyle]}>
+            <View style={[styles.container, containerStyle]} shouldRasterizeIOS renderToHardwareTextureAndroid>
                 {apps.map((app, index) => (
-                    <XAppItem key={index} app={app} onPress={onAppPress} />
+                    <XAppItem key={index} app={app} index={index} onPress={onAppPress} />
                 ))}
             </View>
         );
diff --git a/src/components/Modules/XAppStore/AppsList/AppsList.tsx b/src/components/Modules/XAppStore/AppsList/AppsList.tsx
index 1d2e5b994..6b9337af1 100644
--- a/src/components/Modules/XAppStore/AppsList/AppsList.tsx
+++ b/src/components/Modules/XAppStore/AppsList/AppsList.tsx
@@ -73,7 +73,7 @@ class AppsList extends Component<Props, State> {
         if (!leadingItem || !trailingSection) {
             return null;
         }
-        return <HorizontalLine />;
+        return <HorizontalLine style={AppStyles.marginTopSml} />;
     };
 
     renderRefreshControl = () => {
diff --git a/src/components/Modules/index.ts b/src/components/Modules/index.ts
index 4e5059e0c..7aaab6f60 100644
--- a/src/components/Modules/index.ts
+++ b/src/components/Modules/index.ts
@@ -9,6 +9,7 @@ export * from './AssetsList';
 export * from './NodeList';
 export * from './FeeList';
 export * from './FeePicker';
+export * from './ServiceFee';
 export * from './XAppShortList';
 export * from './ProBadge';
 export * from './PaymentOptionsPicker';
diff --git a/src/locale/en.json b/src/locale/en.json
index 0565c3cd3..3eb0810fd 100644
--- a/src/locale/en.json
+++ b/src/locale/en.json
@@ -14,6 +14,8 @@
     "discard": "Discard",
     "remove": "Remove",
     "go": "Go",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Close",
     "save": "Save",
     "confirm": "Confirm",
@@ -21,6 +23,7 @@
     "balance": "Balance",
     "spendable": "Spendable",
     "home": "Home",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Events",
     "profile": "Profile",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Settings",
     "search": "Search",
     "send": "Send",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Slide to send",
     "done": "Done",
     "previous": "Previous",
@@ -37,7 +42,8 @@
     "exchange": "Exchange",
     "exchanges": "Issuers",
     "scan": "Scan",
-    "request": "Request",
+    "request": "Receive",
+    "receiveOnAccount": "Receive on account",
     "details": "Details",
     "recipient": "Recipient",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "Continue",
     "code": "Code",
     "copy": "Copy",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Selected",
     "share": "Share",
@@ -119,6 +130,7 @@
     "day": "day",
     "days": "days",
     "week": "week",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Auto lock",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Strong",
     "veryStrong": "Very strong",
     "subject": "Subject",
+    "credentialType": "Credential Type",
     "empty": "Empty",
     "update": "Update",
     "notNow": "Not now",
@@ -284,7 +302,7 @@
     "needPermissionToAccessCamera": "Need permission to access Camera.",
     "pleaseApproveCameraPermission": "Please approve camera permissions",
     "looksLikeYouAreOffline": "Looks like you're offline (no internet connection)",
-    "unableToConnectToXRPLNodePleaseCheckYourConnection": "Unable to connect to XRPL node, Please check your internet connection and try again",
+    "unableToConnectToXRPLNodePleaseCheckYourConnection": "Unable to connect to network node, Please check your internet connection and try again",
     "pressBackAgainToExit": "Press back again to exit",
     "alertDanger": "ALERT! DANGER!",
     "thisAccountIsReportedAsScamOrFraudulentAddressPleaseProceedWithCaution": "The sender has been reported for suspicious behaviour. Don't interact with the sender of this account to prevent loss of funds.",
@@ -341,7 +359,8 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wants to open this URL:\r\n\r\n%{url}",
-    "createPaymentRequestLink": "Create Payment Request link",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
+    "createPaymentRequestLink": "Create Request Link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
     "unableToGetLastClosedLedger": "Unable to get last closed ledger, please check you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee incl udes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -380,13 +402,17 @@
     "closingIn": "Closing in"
   },
   "onboarding": {
-    "slideOne_title": "Payments and\r\npayment requests\r\non the XRP Ledger",
+    "slideOne_title": "Payments and\r\npayment requests\r\non the ledger",
     "slideTwo_title": "User friendly access",
     "slideTwo_desc": "Add multiple accounts, in full access mode, or read only. Send transactions and sign requests with your full access accounts.",
     "slideThree_title": "Security first",
     "slideThree_desc": "The Xaman application and platform are built with security as a priority. Never enter your secrets again, sign transactions from your own, trusted device.",
     "slideFour_title": "Send and receive",
-    "slideFour_desc": "You can send and receive XRP and other trusted tokens as well"
+    "slideFour_desc": "You can send and receive XRP and other trusted tokens as well",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Setup a passcode",
@@ -413,16 +439,16 @@
   },
   "setupTermOfService": {
     "XamanIsNonCustodial": "Xaman is self-custodial",
-    "XamanNotCustodialExplain": "Xaman is a self custodial wallet, meaning your funds aren't in Xaman custody, but 'live' on the XRP Ledger.\r\n\r\nOnly you can access your funds with your account secrets, as generated by Xaman or imported into Xaman.\r\n\r\nThis means Xaman and the Xaman team cannot access and cannot recover your funds if you make a mistake or lose your secret keys.",
+    "XamanNotCustodialExplain": "Xaman is a self custodial wallet, meaning your funds aren't in Xaman custody, but 'live' on the ledger.\r\n\r\nOnly you can access your funds with your account secrets, as generated by Xaman or imported into Xaman.\r\n\r\nThis means Xaman and the Xaman team cannot access and cannot recover your funds if you make a mistake or lose your secret keys.",
     "keepYourSecretsSafe": "Keep your secrets safe",
     "KeepYourSecretsSafeExplain": "Only you, using your account secret(s) can access your funds.\r\n\r\nYou and you alone are responsible for keeping them safe, offline.\r\n\r\nWrite down your backups at multiple offline locations.",
     "IWillKeepMySecretsSafeAndOffline": "I will keep my secret keys safe and offline.",
     "transactionsArePermanent": "Transactions are permanent",
     "transactionsArePermanentExplain": "Xaman cannot revert transactions, or recover funds if you make a mistake.\r\n\r\nTransactions are instant and irreversible.",
     "iAmResponsibleForKeepingMyKeysAndFundsSafe": "I'm responsible for keeping my keys and funds safe",
-    "yourFundsLiveOnTheXRPLedger": "Your funds 'live' on the XRP ledger",
-    "yourFundsLiveOnTheXRPLedgerExplain": "Xaman is an XRP ledger client application.\r\n\r\nThis means your XRP does not reside in Xaman but on the XRP Ledger.\r\n\r\nTransactions sent and received are sent and received live on/by the XRP ledger.",
-    "myFundsAreRegisteredOnTheXRPLedger": "All of my funds are stored and registered on the XRP Ledger, not on the Xaman application ",
+    "yourFundsLiveOnTheXRPLedger": "Your funds 'live' on the ledger",
+    "yourFundsLiveOnTheXRPLedgerExplain": "Xaman is an ledger client application.\r\n\r\nThis means your XRP does not reside in Xaman but on the ledger.\r\n\r\nTransactions sent and received are sent and received live on/by the ledger.",
+    "myFundsAreRegisteredOnTheXRPLedger": "All of my funds are stored and registered on the ledger, not on the Xaman application ",
     "neverShareYourSecret": "NEVER share your secret keys",
     "neverShareYourSecretExplain": "Xaman and the Xaman support department WILL NEVER ask for your secret\r\n\r\nIf someone does, or asks you to enter your secret somewhere, you are being scammed.\r\n\r\nPlease do contact us with as much information that you have about the incident.",
     "IWillNeverGiveMySecretsToAnyone": "I will never share my secret keys with anyone nor enter them elsewhere",
@@ -449,7 +475,7 @@
     "youDonNotHaveNFTokens": "You have no NFT tokens",
     "activateYourAccount": "Activate your account",
     "howActivateMyAccount": "How can I activate my account?",
-    "otherAssetsDesc": "The XRP ledger also allows you to hold balances of, and to send and receive, tokens other than %{nativeAsset}. These tokens can be issued by other accounts on the XRP ledger. If you want to be able to send or receive a non-%{nativeAsset} token, you will have to trust the issuer of the non-%{nativeAsset} token.",
+    "otherAssetsDesc": "The ledger also allows you to hold balances of, and to send and receive, tokens other than %{nativeAsset}. These tokens can be issued by other accounts on the ledger. If you want to be able to send or receive a non-%{nativeAsset} token, you will have to trust the issuer of the non-%{nativeAsset} token.",
     "explainMyBalance": "Explain my balance",
     "nativeAssetYouOwnVsYourSpendableBalance": "%{nativeAsset} you own vs. your spendable balance.",
     "emptyAccountAddFirstAccount": "It’s a little bit empty here add your first account.",
@@ -480,7 +506,7 @@
     "onDate": "on",
     "paymentReceived": "Payment received",
     "paymentSent": "Payment sent",
-    "exchangedAssets": "Exchanged tokens",
+    "exchangedAssets": "Swapped tokens",
     "addedATrustLine": "Added a token (TrustLine)",
     "removedATrustLine": "Removed a token (TrustLine)",
     "updatedATrustLine": "Token Updated (TrustLine)",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Cannot fetch account transactions!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Unable to load the transaction, please make sure you are connected to internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "The payment destination tag is: %{tag}",
     "itWasInstructedToDeliver": "It was instructed to deliver %{amount} %{currency}",
     "bySpendingUpTo": "by spending up to %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "It deleted account %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "It was instructed to deliver the remaining balance of %{amount} %{currency} to %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "The transaction will cancel check with ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "It authorizes %{address} to send payments to this account",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "It removes the authorization for %{address} to send payments to this account",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "It removed TrustLine currency %{currency} to %{issuer}",
     "itEstablishesTrustLineTo": "It establishes %{limit} as the maximum amount of %{currency} from %{issuer} that %{address} is willing to hold.",
     "itRemovesTheAccountDomain": "It removes the account domain",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Enter name or address",
     "enterCurrencyCodeOrName": "Enter currency code or name",
     "enterName": "Please enter a name",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Contact already exists",
     "contactSuccessSaved": "Contact successfully added",
     "contactSuccessUpdated": "Contact successfully updated",
@@ -759,6 +801,8 @@
     "changePasscode": "Change passcode",
     "biometricAuthentication": "Biometric authentication",
     "hapticFeedback": "Haptic feedback",
+    "hideAdvisoryTransactions": "Hide spam/scam events",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Developer mode",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Use system currency format",
@@ -811,7 +855,7 @@
     "unableToDeleteNodeWhenConnectedToNetwork": "Unable to remove the node while connected to this network, please switch network and try again!",
     "developerModeEnabledWarning": "Enabling Developer Mode may reduce certain security functions. Proceed with utmost caution, and only enable it if you comprehend the potential consequences.",
     "disablingDeveloperMode": "Disabling Developer Mode",
-    "disableDeveloperModeRevertNetworkWarning": "Please note that this action will revert your selected network from '%{currentNetwork}' to the '%{defaultNetwork}'. Are you sure you want to proceed?",
+    "disableDeveloperModeRevertNetworkWarning": "Please note that this action will revert your selected network from '%{currentNetwork}' to '%{defaultNetwork}'. Are you sure you want to proceed?",
     "blockingTakingScreenShotsIsDisabled": "Developer mode is active, Screenshot capture protection is temporarily disabled.",
     "syncRailsRemoveNetworkWarning": "Applying this sync will disconnect you from the current network (%{currentNetwork}). Please switch to a different network and try again.",
     "syncRailsRemoveNodeWarning": "By applying this sync, the current node (%{connectedNode}) to which you are currently connected will be removed. Please select a new default node for this network and try again.",
@@ -841,7 +885,7 @@
     "generateNewAccount": "Create a new account",
     "confirmPrivateTitle": "Confirm your secret numbers",
     "confirmPrivateDescription": "Please provide the numbers, this is for your own safety: we want you to confirm you wrote it down.",
-    "invalidSecretNumber": "Invalid secret number key entered",
+    "invalidSecretNumber": "The numbers entered do not match the requested row of numbers.",
     "accountSetupCompleted": "Account setup is complete.",
     "YouJustCreatedAccount": "You have just created a new fresh account.",
     "yeahLetsGo": "Hooray, let's go!",
@@ -879,12 +923,13 @@
     "goBackRefillTheInput": "Are you sure you want to go back? \r\n (you have to re-fill all the inputs for security reasons)",
     "accountType": "Account type",
     "secretType": "Secret type",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Please select your account type",
     "pleaseSelectAccountSecretType": "Please select your account secret type",
     "fullAccess": "Full access",
     "fullAccessTransactionSending": "Full access (transaction sending)",
     "addTangemCard": "Add Tangem card",
-    "tangemCardEmptyGenerateWalletAlert": "Your Tangem card does not contain an XRP Ledger account yet. To use this card, an account will have to be generated by the card.",
+    "tangemCardEmptyGenerateWalletAlert": "Your Tangem card does not contain an account yet. To use this card, an account will have to be generated by the card.",
     "generateAccount": "Generate account",
     "cardSecurity": "Card security",
     "tangemLongTapExplain": "This mechanism protects the card against proximity attacks: it will enforce a delay between reception and execution of commands.",
@@ -902,8 +947,8 @@
     "chooseAccountType": "Choose account type",
     "secretNumbers": "Secret numbers",
     "secretNumbersDesc": "Preferred account type. 8 rows of 6 digits",
-    "familySeed": "Family Seed",
-    "familySeedDesc": "Looks like sXXX1234XXX...",
+    "familySeed": "Family Seed / Private Key",
+    "familySeedDesc": "E.g. sXb1c3aX... or EDAF9E...",
     "mnemonic": "Mnemonic",
     "scanFromQR": "Scan from QR code",
     "mnemonicDesc": "Based on 12, 16 or 24 words",
@@ -916,10 +961,10 @@
     "pleaseEnterYourMnemonic": "Please enter your Mnemonic",
     "howManyWordsYourMnemonicIs": "How many words does your mnemonic have?",
     "pleaseEnterYourSecretNumber": "Please enter your secret numbers",
-    "invalidFamilySeed": "Invalid Family Seed",
+    "invalidFamilySeed": "Invalid Family Seed / Private Key",
     "invalidHexPrivateKey": "Invalid HEX private key! HEX private keys should be 66 HEX characters (A-F, 0-9) long.",
-    "pleaseProvideFamilySeed": "Please provide your account secret/family Seed.",
-    "pleaseEnterYourFamilySeed": "Please enter your family seed",
+    "pleaseProvideFamilySeed": "Please provide your account secret (Family Seed) or 66 HEX char. private key.",
+    "pleaseEnterYourFamilySeed": "Enter your Family Seed / Private Key",
     "accountImportCompleted": "Account import complete!",
     "youJustImportedAccount": "You just added your account",
     "accountSettings": "Edit account",
@@ -940,7 +985,7 @@
     "upgradingAccessLevelWarning": "You are upgrading your access level. You need to import your private key for this account.",
     "downgradingAccessLevelWarning": "You are downgrading your account access level. Doing so changes your account into a Read Only account, as Xaman will purge the internal, encrypted record of your secret key. You can only access your funds again when you import your secret key again. Only continue if you are certain you have an offline backup of your secret key for this account.",
     "downgradingAccessLevelWarningPhysical": "You are downgrading your access level. Are you sure?",
-    "removeTrustLineWarning": "You are removing this token from your XRP Ledger account. Are you sure?",
+    "removeTrustLineWarning": "You are removing this token from your account. Are you sure?",
     "unavailableChangeSecurityLevel": "Changing Security level is not available right now",
     "accountRemoveWarning": "Your account will be deleted permanently from Xaman. Are you sure?",
     "accountMaxLabelLengthError": "Account label should be less than 64 characters!",
@@ -975,19 +1020,19 @@
     "accountBalance": "Account balance",
     "availableForSpending": "Available for spending",
     "readOnlyAccountSpendableBalanceWarning": "Please note: The access level for this account is Read-Only. There is currently no way to sign transactions that can affect the account state in any form.",
-    "deleteAccountWarning": "This is an Account Delete transaction. When signing your account will be deleted, and all your remaining funds (except for the last %{ownerReserve} reserved %{nativeAsset}, as the fee on the XRP ledger for deleting an account is %{ownerReserve} %{nativeAsset}) will be sent to the configured destination. Please check the destination twice, and ONLY continue if you ACTUALLY want to delete your account on the XRP ledger",
-    "deleteAccountObjectsExistError": "You cannot delete this account, because it contains specific XRP ledger objects, like tokens (non-XRP), Decentralized Exchange (DEX) offers, Escrows (as a creator or beneficiary)",
+    "deleteAccountWarning": "This is an Account Delete transaction. When signing your account will be deleted, and all your remaining funds (except for the last %{ownerReserve} reserved %{nativeAsset}, as the fee on the ledger for deleting an account is %{ownerReserve} %{nativeAsset}) will be sent to the configured destination. Please check the destination twice, and ONLY continue if you ACTUALLY want to delete your account on the ledger",
+    "deleteAccountObjectsExistError": "You cannot delete this account, because it contains specific ledger objects, like tokens (non-XRP), Decentralized Exchange (DEX) offers, Escrows (as a creator or beneficiary)",
     "deleteAccountSequenceIsNotEnoughError": "This account cannot be deleted yet. It takes %{remainingSequence} more ledgers to close before this account can be deleted.",
-    "unableToCheckAccountObjects": "Unable to check for account objects, please make sure you are connected to the XRP ledger node",
-    "unableToCheckAccountNFTs": "Unable to check for account NFTs, please make sure you are connected to the XRP ledger node",
-    "unableToFetchLedgerSequence": "Unable to fetch the current ledger sequence. Please make sure you are connected to the XRP Ledger node.",
-    "unableGetDestinationAccountInfo": "Unable to get destination account info, please make sure you are connected to the XRP ledger node",
-    "unableGetAccountInfo": "Unable to fetch account info, please make sure you are connected to the XRP ledger node",
-    "destinationAccountIsNotActivated": "Destination account is not activated, Must be a funded account in the XRP ledger.",
+    "unableToCheckAccountObjects": "Unable to check for account objects, please make sure you are connected to the node",
+    "unableToCheckAccountNFTs": "Unable to check for account NFTs, please make sure you are connected to the node",
+    "unableToFetchLedgerSequence": "Unable to fetch the current ledger sequence. Please make sure you are connected to the node.",
+    "unableGetDestinationAccountInfo": "Unable to get destination account info, please make sure you are connected to the node",
+    "unableGetAccountInfo": "Unable to fetch account info, please make sure you are connected to the node",
+    "destinationAccountIsNotActivated": "Destination account is not activated, Must be a funded account on the ledger.",
     "destinationAddressRequiredDestinationTag": "Destination Address requires a Destination Tag",
     "destinationAccountAndSourceCannotBeSame": "Destination account and source cannot be the same.",
-    "accountGenerateActivationExplain": "Account activation is a requirement on the XRP ledger. To activate, you will have to make a first deposit of at least %{baseReserve} %{nativeAsset}.",
-    "accountImportActivationExplain": "You imported a new account on the XRP ledger. The account is not activated. Account activation is a requirement on the XRP ledger. To activate, you will have to make a first deposit of at least %{baseReserve} %{nativeAsset}.",
+    "accountGenerateActivationExplain": "Account activation is a requirement on the ledger. To activate, you will have to make a first deposit of at least %{baseReserve} %{nativeAsset}.",
+    "accountImportActivationExplain": "You imported a new account on the ledger. The account is not activated. Account activation is a requirement on the ledger. To activate, you will have to make a first deposit of at least %{baseReserve} %{nativeAsset}.",
     "accountActivateReserveExplain": "The first %{baseReserve} %{nativeAsset} deposited into your account cannot be spent, but will be reserved to keep your account active and pay for on ledger fees.",
     "accountReserveNotShownExplain": "Your reserved %{nativeAsset} will not show up as balance in Xaman, but you can view your reserve with the \"Explain my balance\" button in the home screen, above your %{nativeAsset} balance.",
     "thisAddressAppearsToBeExchangeAddress": "This address appears to be an exchange address, are you sure you want to continue?\r\n\r\nYou can never send to this address without respecting the instructions of your exchange.",
@@ -998,11 +1043,11 @@
     "unableToHideDefaultAccountError": "Unable to hide this default account. Change default account and try again.",
     "tapAndHoldToReorder": "Tap and hold on an item to reorder by the desired priority",
     "importSecret": "Import secret",
-    "toTurnYourSecretIntoXrplLedgerAccountPleaseEnterYourSecret": "If you want to open an XRP Ledger account, please enter your secret keys.",
+    "toTurnYourSecretIntoXrplLedgerAccountPleaseEnterYourSecret": "If you want to open an account, please enter your secret keys.",
     "enterSecret": "Enter secret",
     "yourChainAddressWas": "Your %{chain} address was:",
-    "yourXRPLedgerAccountIsGoingToBe": "Your XRP Ledger account is going to be:",
-    "importSecretWithoutChecksumWarning": "If you proceed, you will import an XRP Ledger account from Secret Numbers. You are the sole party responsible to generate the Secret Numbers. We recommend you to use an offline method (eg. with dice) to generate them. After you generated the numbers, you must store them (eg. stamped in metal, written down).\r\nYOU SHOULD PROCEED ONLY IF YOU KNOW WHAT YOU ARE DOING.",
+    "yourXRPLedgerAccountIsGoingToBe": "Your account is going to be:",
+    "importSecretWithoutChecksumWarning": "If you proceed, you will import an account from Secret Numbers. You are the sole party responsible to generate the Secret Numbers. We recommend you to use an offline method (eg. with dice) to generate them. After you generated the numbers, you must store them (eg. stamped in metal, written down).\r\nYOU SHOULD PROCEED ONLY IF YOU KNOW WHAT YOU ARE DOING.",
     "tangemCardPasscodeSetWarning": "While adding a passcode to your card improves the safety of your funds in case of a lost (and found) card, it is important to realize that your funds will be INACCESSIBLE and CAN *NOT* BE RECOVERED (by anyone) if you don't remember your passcode.\r\n\r\nAre you really sure you want to add a passcode to your card?",
     "tangemCardAccessCodeSetWarning": "While adding a access code to your card improves the safety of your funds in case of a lost (and found) card, it is important to realize that your funds will be INACCESSIBLE and CAN *NOT* BE RECOVERED (by anyone) if you don't remember your access code.\r\n\r\nAre you really sure you want to add a access code to your card?",
     "thereAreAccountsEligibleToSign": "There are %{signersCount} accounts eligible to sign. Which one do you want to sign with?",
@@ -1011,15 +1056,15 @@
     "verifyTangemCard": "Verify Tangem card",
     "signatureVerification": "Signature verification",
     "signatureVerificationExplain": "To verify your Tangem card is working correctly and able to sign transactions, we will perform one signing routine to verify transaction signatures generated by your card.",
-    "yourXRPLedgerAccountWillNotBeTouched": "Your XRP Ledger account & funds will not be touched.",
+    "yourXRPLedgerAccountWillNotBeTouched": "Your account & funds will not be touched.",
     "unableToVerifyTheSignature": "Unable to verify the signature!",
     "newEncryptionMethodAvailable": "New encryption method available!",
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
-    "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
+    "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the node."
   },
   "send": {
     "amountIsBiggerThanYourSpend": "This amount is bigger than what you can spend (%{spendable})",
@@ -1032,6 +1077,7 @@
     "noSearchResult": "No search result",
     "noContact": "No contacts",
     "myAccount": "My Account",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Source and Destination address cannot be the same!",
     "enterANameOrAddress": "Enter a name or an address",
     "transferredSuccessfully": "Your transaction has been successfully registered on the %{network}.",
@@ -1048,12 +1094,12 @@
     "sendingFailed": "Sending failed!",
     "verificationFailed": "Verification failed!",
     "couldNotVerifyTransaction": "Couldn't verify transaction finality",
-    "verificationFailedDescription": "Your transaction has been signed and submitted successfully, however, we could not confirm transaction finality.\r\n\r\nThis can be caused by an internet connection hiccup or increased load on the XRP Ledger node you are connected to.\r\n\r\nPlease manually verify if this transaction shows in your transaction history (Events).",
+    "verificationFailedDescription": "Your transaction has been signed and submitted successfully, however, we could not confirm transaction finality.\r\n\r\nThis can be caused by an internet connection hiccup or increased load on the ledger node you are connected to.\r\n\r\nPlease manually verify if this transaction shows in your transaction history (Events).",
     "submitFailed": "Submission failed!",
     "somethingWentWrong": "Something went wrong!",
     "resultCopiedToClipboard": "Result copied to clipboard",
     "txIdCopiedToClipboard": "Transaction ID copied to clipboard",
-    "submittingToLedger": "Sending your transaction to the %{network}",
+    "submittingToLedger": "Sending your transaction to %{network}",
     "sendingFrom": "Sending from",
     "enterDescription": "Enter description",
     "enterPublicMemo": "Enter public memo (optional)",
@@ -1064,14 +1110,15 @@
     "destinationIsProbableIsScam": "The destination account is flagged as high risk",
     "selectedAccountDoNotSupportAsset": "The selected account does not support the selected token.",
     "memoPublicWarning": "Memo info will be public for everyone",
-    "destinationNotExistTooLittleToCreate": "The destination account hasn't  been used before, and doesn't have a balance. To activate an account on the XRP ledger, an initial deposit of at least %{baseReserve} %{nativeAsset} is required.",
-    "destinationNotExistCreationWarning": "Sending to the given destination account may be risky: it has never been used and has a zero balance, which is commonly seen in scams. We advise verifying the owner's authenticity to safeguard your assets. If you're confident in its safety but aware of the risks.\n\nIf you continue sending to this account, %{baseReserve} %{nativeAsset} of the %{amount} %{nativeAsset} will be used to activate the account on the XRP ledger.",
-    "destinationCannotActivateWithIOU": "The destination account is not activated as it doesn't hold the XRP Ledger enforced minimum balance of %{baseReserve} %{nativeAsset}. To activate an account on the XRP Ledger, an initial deposit of at least %{baseReserve} %{nativeAsset} has to be sent to the account. Non-%{nativeAsset} tokens cannot be used for the initial deposit.",
-    "destinationTagIsRequired": "The destination tag is required for sending this payment.",
+    "destinationNotExistTooLittleToCreate": "The destination account hasn't  been used before, and doesn't have a balance. To activate an account on the ledger, an initial deposit of at least %{baseReserve} %{nativeAsset} is required.",
+    "destinationNotExistCreationWarning": "Sending to the given destination account may be risky: it has never been used and has a zero balance, which is commonly seen in scams. We advise verifying the owner's authenticity to safeguard your assets. If you're confident in its safety but aware of the risks.\n\nIf you continue sending to this account, %{baseReserve} %{nativeAsset} of the %{amount} %{nativeAsset} will be used to activate the account on the ledger.",
+    "destinationCannotActivateWithIOU": "The destination account is not activated as it doesn't hold the ledger enforced minimum balance of %{baseReserve} %{nativeAsset}. To activate an account on the ledger, an initial deposit of at least %{baseReserve} %{nativeAsset} has to be sent to the account. Non-%{nativeAsset} tokens cannot be used for the initial deposit.",
+    "destinationTagIsRequired": "The destination tag is required to send this payment.",
     "unableGetRecipientAccountInfoPleaseTryAgain": "Unable to get recipient account info please try again.",
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
-    "theDestinationAccountIsSetAsBlackHole": "The destination account is set as black hole, sending to this account will cause losing sent %{currency}.",
+    "theDestinationAccountIsSetAsBlackHole": "The destination account 'Black Holed', sending to this account will cause losing sent %{currency}.",
     "noDestinationTag": "No destination tag",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "This address requires a Destination Tag",
     "pleaseEnterAmount": "Please enter the transaction amount",
     "trustLineLimitExceeded": "TrustLine limit is exceeded.\r\n\r\nNow: %{balance}\r\nMax: %{peer_limit}\r\nAvailable for issuing: %{available}\r\n\r\nThe recipient can update the Trustline limit.",
@@ -1124,7 +1171,7 @@
     "maxSpreadExceeded": "The price difference between selling and buying offers is too high.",
     "maxSlippageExceeded": "The exchange rate will be bad as there are not enough (good) offers on the Decentralized Exchange.",
     "maxReverseSlippageExceeded": "The exchange rate will be bad if you would try to exchange back, as there are not enough (good) offers on the Decentralized Exchange.",
-    "slippageSpreadWarning": "The exchange rate displayed is an estimate based on the current offers available on the XRP Ledger Decentralized Exchange.\nWhen you execute this trade and the liquidity changed while executing your transaction, you may get an up to %{slippage}% worse exchange rate. Please only continue if you accept this",
+    "slippageSpreadWarning": "The exchange rate displayed is an estimate based on the current offers available on the ledger Decentralized Exchange.\nWhen you execute this trade and the liquidity changed while executing your transaction, you may get an up to %{slippage}% worse exchange rate. Please only continue if you accept this",
     "iAcceptExchange": "I accept, exchange",
     "exchangeRate": "Exchange rate",
     "minimumReceived": "Minimum received",
@@ -1165,13 +1212,13 @@
     "payingWithNativeAssetExchangeRate": "Paying with ~ %{nativeRoundedUp} %{nativeAsset}\r\nExchange rate: ~ %{exchangeRate} ",
     "notEnoughLiquidityToSendThisPayment": "Not enough liquidity to send this payment.",
     "unableToCheckAssetConversion": "Unable to verify the token exchange rate. Please make sure you are properly connected to the internet",
-    "unableToGetNetworkFee": "Unable to get network fee, please make sure you are connected to the XRPL node",
+    "unableToGetNetworkFee": "Unable to get network fee, please make sure you are connected to the network node",
     "checkCanOnlyCashByCheckDestination": "A Check can only be cashed if the Check destination account is present in Xaman in Read/Write (or regular key) mode.",
-    "unableToGetCheckObject": "Unable to get check object. Please make sure you are connected to the XRPL node",
-    "checkObjectDoesNotExist": "Unable to get the Check object. Please make sure the Check exists on the XRP Ledger.",
+    "unableToGetCheckObject": "Unable to get check object. Please make sure you are connected to the network node",
+    "checkObjectDoesNotExist": "Unable to get the Check object. Please make sure the Check exists on the ledger.",
     "insufficientCashAmount": "Insufficient amount, cashable amount:  %{amount} %{currency}",
     "nonExpiredCheckCanOnlyCancelByCreatedAccount": "A (non expired) check can only be cancelled by the account that created it or destination account.",
-    "accountDeleteExchangeSupportWarning": "Note: when deleting your XRP ledger account and sending the remaining balance to an exchange, make sure the destination exchange supports deposits using AccountDelete transactions. Not all exchanges do, which results in a support procedure with the exchange to get your funds credited to your account",
+    "accountDeleteExchangeSupportWarning": "Note: when deleting your account and sending the remaining balance to an exchange, make sure the destination exchange supports deposits using AccountDelete transactions. Not all exchanges do, which results in a support procedure with the exchange to get your funds credited to your account",
     "notVettedTokenTradeWarning": "Trade at your own risk! The token you are about to trade **has not been vetted**.\n\nAnyone can create a token, including creating fake versions of existing tokens that claim to represent projects. If you trade this token, you may not be able to sell it back. You are potentially putting your assets/savings at risk!",
     "forcedSignersAccountsDoesNotExist": "This request can only be signed by \n\n%{accounts}\n\nThis accounts are not present with signing access.",
     "tradeEntireTokenWorthWarning": "Warning: the amount of %{currency} is equal to or higher than your %{currency} balance of this asset. If this offer is executed, you will fully liquidate your %{currency} position.",
@@ -1220,7 +1267,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService":"Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/af.json b/src/locale/translations/af.json
index f6267253d..ae84c4e23 100644
--- a/src/locale/translations/af.json
+++ b/src/locale/translations/af.json
@@ -14,6 +14,8 @@
     "discard": "Gooi weg",
     "remove": "Verwyder",
     "go": "Gaan",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Toe",
     "save": "Stoor",
     "confirm": "Bevestig",
@@ -21,6 +23,7 @@
     "balance": "Balans",
     "spendable": "Spandeerbaar",
     "home": "Tuis",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Gebeure",
     "profile": "Profiel",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Instellings",
     "search": "Soek",
     "send": "Stuur",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Skuif om te stuur",
     "done": "Klaar",
     "previous": "Vorige",
@@ -38,6 +43,7 @@
     "exchanges": "Uitruil",
     "scan": "Skandeer",
     "request": "Versoek",
+    "receiveOnAccount": "Receive on account",
     "details": "Besonderhede",
     "recipient": "Ontvanger",
     "destination": "Bestemming",
@@ -48,6 +54,11 @@
     "continue": "Gaan volgende",
     "code": "Kode",
     "copy": "Kopie",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Gekies",
     "share": "Deel",
@@ -119,6 +130,7 @@
     "day": "Dag",
     "days": "days",
     "week": "Week",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Outo-sluit",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Sterk",
     "veryStrong": "Baie sterk",
     "subject": "onderwerp",
+    "credentialType": "Credential Type",
     "empty": "Leeg",
     "update": "Opdateer",
     "notNow": "Nie nou nie",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wil hierdie URL oopmaak.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Veiligheid eers",
     "slideThree_desc": "Die Xumm-toepassing en -platform is gebou met veiligheid as prioriteit. Moet nooit weer u geheime betree nie, onderteken transaksies vanaf u eie, vertroude toestel.",
     "slideFour_title": "Stuur en ontvang",
-    "slideFour_desc": "U kan ook XRP en ander betroubare tokens stuur en ontvang"
+    "slideFour_desc": "U kan ook XRP en ander betroubare tokens stuur en ontvang",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Stel 'n wagkode op",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Kan nie rekeningtransaksies haal nie",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Die transaksie kan nie gelaai word nie. Maak seker dat u aan die internet gekoppel is!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Die betalingsbestemmingsmerker is: %{tag}",
     "itWasInstructedToDeliver": "Daar is opdrag gegee om %{amount} %{currency} af te lewer",
     "bySpendingUpTo": "deur tot %{amount} %{currency} te spandeer",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Dit het rekening %{address} uitgevee",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Daar is opdrag gegee om die oorblywende saldo van %{amount} %{currency} aan %{destination} te lewer",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Die transaksie sal die kontroleer kanselleer met ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Dit magtig %{address} om betalings aan hierdie rekening te stuur",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Dit verwyder die magtiging vir %{address} om betalings aan hierdie rekening te stuur",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Die verwyder betroubare geldeenheid %{currency} tot %{issuer}",
     "itEstablishesTrustLineTo": "Dit vestig %{limit} as die maksimum bedrag van %{currency} van %{issuer} wat %{address} bereid is om te hou.",
     "itRemovesTheAccountDomain": "Dit verwyder die rekening domein",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Voer naam of adres in",
     "enterCurrencyCodeOrName": "Tik geldeenheid kode of naam",
     "enterName": "Voer asseblief 'n naam in",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontak bestaan reeds",
     "contactSuccessSaved": "Kontak suksesvol bygevoeg",
     "contactSuccessUpdated": "Kontak suksesvol opgedateer",
@@ -759,6 +801,8 @@
     "changePasscode": "Verander wagkode",
     "biometricAuthentication": "Biometriese verifikasie",
     "hapticFeedback": "Haptiese terugvoer",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Ontwikkelaar modus",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Gebruik die stelsel-geldeenheid-formaat",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Is jy seker jy wil teruggaan?\r\n(U moet al die insette vir sekuriteitsrede weer invul)",
     "accountType": "Tekening tipe",
     "secretType": "Geheime tipe",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Kies asseblief u rekeningtipe",
     "pleaseSelectAccountSecretType": "Kies asseblief u rekening geheime tipe",
     "fullAccess": "Volle toegang",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Geen soekresultaat nie",
     "noContact": "Geen kontakte",
     "myAccount": "My Rekening",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Bron -en Bestemmingsadres kan nie dieselfde wees nie!",
     "enterANameOrAddress": "Voer 'n naam of adres in",
     "transferredSuccessfully": "U transaksie is suksesvol op die %{network} geregistreer.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Die bestemmingsrekening is an 'n swart gat gestel. As u na hierdie rekening stuur, kan die gestuurde XRP verloor word.",
     "noDestinationTag": "Geen bestemmingsplaatjie nie",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Hierdie adres vereis 'n bestemmingsplaatjie",
     "pleaseEnterAmount": "Voer asseblief die transaksiebedrag in",
     "trustLineLimitExceeded": "Vertrouenslyn-limiet word oorskry.\r\n\r\nNou: %{balance}\r\nMaks: %{peer_limit}\r\nBeskikbaar vir uitreiking: %{available}\r\n\r\nDie ontvanger kan die vertrouenslyn-limiet bywerk.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ar.json b/src/locale/translations/ar.json
index 828429b72..27a87dd67 100644
--- a/src/locale/translations/ar.json
+++ b/src/locale/translations/ar.json
@@ -14,6 +14,8 @@
     "discard": "تجاهل",
     "remove": "احذف",
     "go": "إبدأ",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "إغلاق",
     "save": "حفظ",
     "confirm": "تأكيد",
@@ -21,6 +23,7 @@
     "balance": "الرصيد",
     "spendable": "قابل للإنفاق",
     "home": "الرئيسية",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "الأحداث",
     "profile": "الملف الشخصي",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "الإعدادات",
     "search": "بحث",
     "send": "إرسال",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "الانزلاق بالتمرير للإرسال",
     "done": "تم",
     "previous": "السابق",
@@ -38,6 +43,7 @@
     "exchanges": "منصات التداول",
     "scan": "مسح",
     "request": "طلب",
+    "receiveOnAccount": "Receive on account",
     "details": "تفاصيل",
     "recipient": "مستلم",
     "destination": "وجهة",
@@ -48,6 +54,11 @@
     "continue": "إستمر",
     "code": "الرمز",
     "copy": "نسخ",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "مختار",
     "share": "مشاركة",
@@ -119,6 +130,7 @@
     "day": "يوم",
     "days": "days",
     "week": "أسبوع",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "قفل تلقائي",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "قوي",
     "veryStrong": "قوي جدا",
     "subject": "الموضوع",
+    "credentialType": "Credential Type",
     "empty": "فارغ",
     "update": "تحديث",
     "notNow": "ليس الآن",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' يريد xApp فتح عنوان URL هذا.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "الأمن أولاً",
     "slideThree_desc": "تم تصميم تطبيق ومنصة xumm مع وضع الأمان في الاعتبار. لا تدخل أسرارك مرة أخرى ، قم بتوقيع التحويل من جهازك الموثوق به.",
     "slideFour_title": "ارسل و استقبل",
-    "slideFour_desc": "يمكنك إرسال واستلام XRP والعملات الورقية الأخرى الموثوقة (سندات الدين) أيضًا"
+    "slideFour_desc": "يمكنك إرسال واستلام XRP والعملات الورقية الأخرى الموثوقة (سندات الدين) أيضًا",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "قم بإعداد رمز سري",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "لا يمكن جلب معاملات الحساب!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "غير قادر على تحميل المعاملة ، يرجى التأكد من اتصالك بالإنترنت!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "علامة وجهة الدفع هي: %{tag}",
     "itWasInstructedToDeliver": "وأوعز ذلك لتقديم %{amount} %{currency}",
     "bySpendingUpTo": "من خلال إنفاق ما يصل إلى %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "تم حذف الحساب %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "وأوعز ذلك لتقديم الرصيد المتبقي من %{amount} %{currency} ل %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "ستلغي المعاملة الشيك بالمعرف %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "أنه يخول %{address} لإرسال المدفوعات إلى هذا الحساب",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "يزيل التفويض الممنوح لل %{address} لإرسال المدفوعات إلى هذا الحساب",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "إزالته العملة خط الثقة %{currency} ل %{issuer}",
     "itEstablishesTrustLineTo": "يؤسس %{limit} كما أقصى قدر من %{currency}  من %{issuer} ذلك %{address} على استعداد لعقد.",
     "itRemovesTheAccountDomain": "فهو يزيل مجال الحساب",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "أدخل الاسم أو العنوان",
     "enterCurrencyCodeOrName": "أدخل رمز العملة أو الاسم",
     "enterName": "الرجاء ادخال الاسم",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "جهة الاتصال موجودة بالفعل",
     "contactSuccessSaved": "تمت إضافة جهة الاتصال بنجاح",
     "contactSuccessUpdated": "تم تحديث جهة الاتصال بنجاح",
@@ -759,6 +801,8 @@
     "changePasscode": "تغيير الرمز السري",
     "biometricAuthentication": "المصادقة البيومترية",
     "hapticFeedback": "ردود الفعل اللمسية",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "وضع المطور",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "استخدم عملة الجهاز المحددة",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "هل أنت متأكد أنك تريد العودة؟\r\n(عليك إعادة ملء جميع المدخلات لأسباب أمنية)",
     "accountType": "نوع الحساب",
     "secretType": "النوع السري",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "يرجى تحديد نوع حسابك",
     "pleaseSelectAccountSecretType": "يرجى تحديد نوع سر حسابك",
     "fullAccess": "الوصول الكامل",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "لا نتائج البحث",
     "noContact": "لا توجد جهات اتصال",
     "myAccount": "حسابي",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "لا يمكن أن يكون عنوان المصدر والوجهة متماثلين!",
     "enterANameOrAddress": "أدخل اسمًا أو عنوانًا",
     "transferredSuccessfully": "تم تسجيل معاملتك بنجاح في دفتر %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "تم تعيين حساب الوجهة على أنه ثقب أسود ، وسيؤدي الإرسال إلى هذا الحساب إلى فقد XRP المرسل.",
     "noDestinationTag": "لا توجد علامة وجهة",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "يتطلب هذا العنوان علامة الوجهة",
     "pleaseEnterAmount": "الرجاء إدخال مبلغ الصفقة",
     "trustLineLimitExceeded": "تم تخطي حدود خط الثقة، الآن : %{balance}, حد أقصى: %{peer_limit}، متاح لاصدار : %{available}. يمكن أن يقوم المستلم بتعديل حدود خط الثقة.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/bg.json b/src/locale/translations/bg.json
index 5a5ab9a43..759d98236 100644
--- a/src/locale/translations/bg.json
+++ b/src/locale/translations/bg.json
@@ -14,6 +14,8 @@
     "discard": "Отхвърляне",
     "remove": "Премахни",
     "go": "Напред",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Затвори",
     "save": "Запази",
     "confirm": "Потвърждение",
@@ -21,6 +23,7 @@
     "balance": "Баланс",
     "spendable": "Свободна наличност",
     "home": "Начало",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Събития",
     "profile": "Профил",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Настройки",
     "search": "Търсене",
     "send": "Изпрати",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Плъзнете, за да изпратите",
     "done": "Готово",
     "previous": "Предишен",
@@ -38,6 +43,7 @@
     "exchanges": "Борси",
     "scan": "Сканиране",
     "request": "Заявка",
+    "receiveOnAccount": "Receive on account",
     "details": "Детайли",
     "recipient": "Получател",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "Продължи",
     "code": "Код",
     "copy": "Копирай",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Избрано",
     "share": "Сподели",
@@ -119,6 +130,7 @@
     "day": "ден",
     "days": "days",
     "week": "Седмица",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Автоматично заключване",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Силен",
     "veryStrong": "Много силен",
     "subject": "Тема",
+    "credentialType": "Credential Type",
     "empty": "Празен",
     "update": "Обновяване",
     "notNow": "Не сега",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wants to open this URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Сигурност на първо място",
     "slideThree_desc": "Приложението и платформата Xumm са изградени като приоритет е сигурността. Никога повече не въвеждайте тайните си, подписвайте транзакции от вашето собствено надеждно устройство.",
     "slideFour_title": "Изпращайте и получавайте",
-    "slideFour_desc": "Можете да изпращате и получавате XRP, както и други надеждни активи (IOU)"
+    "slideFour_desc": "Можете да изпращате и получавате XRP, както и други надеждни активи (IOU)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Настройте парола",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Не могат да се извлекат транзакции по акаунт!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Не можете да заредете транзакцията, моля уверете се, че сте свързани към интернет!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Етикет за местоназначение на плащането (Destination Tag): %{tag}",
     "itWasInstructedToDeliver": "Беше инструктирано да достави %{amount} %{currency}",
     "bySpendingUpTo": "Беше инструктирано да достави %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Изтрита сметка  %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Беше инструктирано да достави оставащия баланс от %{amount} %{currency} до %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Транзакцията ще отмени чек с идентификатор %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Той разрешава на %{address} да изпраща плащания към тази сметка.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Премахва упълномощаването за %{address} за изпращане на плащания до тази сметка.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Той премахна валутата TrustLine %{currency} към %{issuer}",
     "itEstablishesTrustLineTo": "Той установява %{limit} като максималното количество от %{currency} от %{issuer}, че %{address} е готов да задържи.",
     "itRemovesTheAccountDomain": "Той премахва домейна на акаунта",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Въведете име или адрес",
     "enterCurrencyCodeOrName": "Въведете валутен код или име",
     "enterName": "Моля, въведете име",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Контактът вече съществува",
     "contactSuccessSaved": "Контактът е добавен успешно",
     "contactSuccessUpdated": "Контактът е актуализиран успешно",
@@ -759,6 +801,8 @@
     "changePasscode": "Промяна на парола",
     "biometricAuthentication": "Биометрично удостоверяване",
     "hapticFeedback": "Хаптична обратна връзка",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Икономичен режим",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Форматиране на валута на системата",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Наистина ли искате да се върнете?\r\n(Ако се върнете назад, ще трябва да въведете отново всичко от съображения за сигурност)",
     "accountType": "Тип сметка",
     "secretType": "Таен тип",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Моля, изберете типа на вашия акаунт",
     "pleaseSelectAccountSecretType": "Моля, изберете тайния тип на акаунта си",
     "fullAccess": "Пълен достъп",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Няма резултати от търсенето",
     "noContact": "Няма контакти",
     "myAccount": "Моята сметка",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Адрес на източника (Source) и адрес на местоназначението (Destination) не могат да бъдат еднакви!",
     "enterANameOrAddress": "Въведете име или адрес",
     "transferredSuccessfully": "Вашата транзакция е регистрирана успешно в %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Сметката на местоназначение е определена като черна дупка, изпращане към тази сметка ще доведе до загуба на XRP.",
     "noDestinationTag": "Няма етикет на местоназначение (destination tag)",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Този адрес изисква етикет на местоназначение (destination tag)",
     "pleaseEnterAmount": "Моля, въведете сумата на транзакцията",
     "trustLineLimitExceeded": "Ограничението на TrustLine е надвишено, сега: %{balance}, макс .: %{peer_limit}, налична за издаване: %{available}. Получателят може да актуализира ограничението за TrustLine.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/bn-BD.json b/src/locale/translations/bn-BD.json
index cdd1ccd55..53ac073b8 100644
--- a/src/locale/translations/bn-BD.json
+++ b/src/locale/translations/bn-BD.json
@@ -14,6 +14,8 @@
     "discard": "বাতিল করা",
     "remove": "অপসারণ",
     "go": "যাওয়া",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "বন্ধ",
     "save": "সংরক্ষণ",
     "confirm": "কনফার্ম",
@@ -21,6 +23,7 @@
     "balance": "ভারসাম্য",
     "spendable": "ব্যয়যোগ্য",
     "home": "বাড়ি",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "ইভেন্টগুলি",
     "profile": "প্রোফাইল",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "সেটিংস",
     "search": "অনুসন্ধান করুন",
     "send": "প্রেরণ",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "পাঠাতে স্লাইড",
     "done": "সম্পন্ন",
     "previous": "আগে",
@@ -38,6 +43,7 @@
     "exchanges": "এক্সচেঞ্জ",
     "scan": "স্ক্যান",
     "request": "অনুসন্ধান",
+    "receiveOnAccount": "Receive on account",
     "details": "বিশদ",
     "recipient": "প্রাপক",
     "destination": "গন্তব্য",
@@ -48,6 +54,11 @@
     "continue": "চালিয়ে যান",
     "code": "কোড",
     "copy": "কপি",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "নির্বাচিত",
     "share": "ভাগ করুন",
@@ -119,6 +130,7 @@
     "day": "দিন",
     "days": "days",
     "week": "সপ্তাহ",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "অটো লক",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "শক্তিশালী",
     "veryStrong": "খুব শক্তিশালী",
     "subject": "বিষয়",
+    "credentialType": "Credential Type",
     "empty": "খালি",
     "update": "হালনাগাদ",
     "notNow": "এখন না",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp নাম বা ঠিকানা লিখুন.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "সুরক্ষা আগে",
     "slideThree_desc": "Xumm অ্যাপ্লিকেশন এবং প্ল্যাটফর্মটি অগ্রাধিকার হিসাবে সুরক্ষা দিয়ে তৈরি। আপনার গোপনীয়তা আর কখনও প্রবেশ করবেন না, নিজের, বিশ্বস্ত ডিভাইস থেকে লেনদেনগুলিতে স্বাক্ষর করুন।",
     "slideFour_title": "প্রেরণ এবং গ্রহন",
-    "slideFour_desc": "আপনি এক্সআরপি পাশাপাশি অন্যান্য বিশ্বস্ত সম্পদ (আইইউ) প্রেরণ এবং গ্রহণ করতে পারেন"
+    "slideFour_desc": "আপনি এক্সআরপি পাশাপাশি অন্যান্য বিশ্বস্ত সম্পদ (আইইউ) প্রেরণ এবং গ্রহণ করতে পারেন",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "একটি পাসকোড সেটআপ করুন",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "অ্যাকাউন্টে লেনদেন আনতে পারবেন না!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "লেনদেন লোড করতে অক্ষম, দয়া করে নিশ্চিত হন যে আপনি ইন্টারনেটের সাথে সংযুক্ত আছেন!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "অর্থ প্রদানের একটি গন্তব্য ট্যাগ রয়েছে: %{tag}.\r\n",
     "itWasInstructedToDeliver": "এটি সরবরাহ করার নির্দেশ দেওয়া হয়েছিল %{amount} %{currency}.\r\n",
     "bySpendingUpTo": "পর্যন্ত ব্যয় করে %{amount} %{currency}\r\n",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "এটি দিয়ে অ্যাকাউন্টটি মুছে ফেলা হয়েছে %{address}.\r\n",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "এর বাকী ভারসাম্য সরবরাহ করার জন্য নির্দেশ দেওয়া হয়েছিল %{amount} %{currency} প্রতি %{destination}.\r\n",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "লেনদেন আইডি দিয়ে চেক বাতিল করবে %{checkId}.\r\n",
     "itAuthorizesSendingPaymentsToThisAccount": "এটি অনুমোদিত %{address} এই অ্যাকাউন্টে পেমেন্ট পাঠাতে।\r\n",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "এটি এর জন্য অনুমোদন সরিয়ে দেয় %{address} এই অ্যাকাউন্টে পেমেন্ট পাঠাতে।\r\n",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "এটি ট্রাস্টলাইন মুদ্রা সরিয়েছে %{currency} প্রতি %{issuer}.\r\n",
     "itEstablishesTrustLineTo": "এটি প্রতিষ্ঠিত করে %{limit} সর্বোচ্চ পরিমাণ হিসাবে %{currency} থেকে %{issuer} যে %{address} ধরে রাখতে ইচ্ছুক।\r\n",
     "itRemovesTheAccountDomain": "এটি অ্যাকাউন্টের ডোমেনটিকে সরিয়ে দেয়।",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "নাম বা ঠিকানা লিখুন",
     "enterCurrencyCodeOrName": "মুদ্রার কোড বা নাম লিখুন",
     "enterName": "দয়া করে একটি নাম লিখুন",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "যোগাযোগ ইতিমধ্যে বিদ্যমান",
     "contactSuccessSaved": "যোগাযোগ সফলভাবে যোগ করা হয়েছে",
     "contactSuccessUpdated": "যোগাযোগ সফলভাবে আপডেট হয়েছে",
@@ -759,6 +801,8 @@
     "changePasscode": "পাসকোড পরিবর্তন করুন",
     "biometricAuthentication": "বায়োমেট্রিক প্রমাণীকরণ",
     "hapticFeedback": "হাপটিক প্রতিক্রিয়া",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "বিকাশকারী মোড",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "সিস্টেম মুদ্রার ফর্ম্যাট ব্যবহার করুন",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "আপনি কি ফিরে যেতে চান?\r\n(সুরক্ষার কারণে আপনাকে সমস্ত ইনপুট পুনরায় পূরণ করতে হবে)",
     "accountType": "অ্যাকাউন্ট ধরন",
     "secretType": "গোপন প্রকার",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "আপনার অ্যাকাউন্টের ধরণটি নির্বাচন করুন",
     "pleaseSelectAccountSecretType": "আপনার অ্যাকাউন্ট গোপনীয়তা নির্বাচন করুন",
     "fullAccess": "পূর্ণ প্রবেশাধিকার",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "কোনও অনুসন্ধানের ফলাফল নেই",
     "noContact": "কোনও যোগাযোগ নেই",
     "myAccount": "আমার অ্যাকাউন্ট",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "উৎস এবং গন্তব্য ঠিকানা একই হতে পারে না!",
     "enterANameOrAddress": "একটি নাম বা ঠিকানা লিখুন",
     "transferredSuccessfully": "তোমার লেনদেন সফলভাবে %{network} উপর নিবন্ধন করা হয়েছে।",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "সতর্কতা: এই গন্তব্য অ্যাকাউন্টটি একটি ব্ল্যাকহোল হিসাবে সেট করা আছে। এই অ্যাকাউন্টে যে কোনও এক্সআরপি প্রেরণ করা হলে তহবিলের ক্ষতি হবে!",
     "noDestinationTag": "কোনও গন্তব্য ট্যাগ নেই",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "এই ঠিকানার জন্য একটি গন্তব্য ট্যাগ প্রয়োজন।",
     "pleaseEnterAmount": "এই লেনদেনের জন্য পরিমাণ লিখুন দয়া করে।",
     "trustLineLimitExceeded": "ট্রাস্টলাইন সীমাটি এখন ছাড়িয়ে গেছে: %{balance}, max: %{peer_limit}, জারি করার জন্য উপলব্ধ: %{available}. প্রাপক ট্রাস্টলাইন সীমা আপডেট করতে পারেন।",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ca.json b/src/locale/translations/ca.json
index dd464ff2e..d9518e35c 100644
--- a/src/locale/translations/ca.json
+++ b/src/locale/translations/ca.json
@@ -14,6 +14,8 @@
     "discard": "Descartar",
     "remove": "Eliminar",
     "go": "Continuar",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Tancar",
     "save": "Desar",
     "confirm": "Confirmar",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Disponible per gastar",
     "home": "Inici",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Activitat",
     "profile": "Perfil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Configuració",
     "search": "Cercar",
     "send": "Enviar",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Llisca per enviar",
     "done": "Fet",
     "previous": "Previ",
@@ -38,6 +43,7 @@
     "exchanges": "Emissors",
     "scan": "Escanejar",
     "request": "Rep",
+    "receiveOnAccount": "Receive on account",
     "details": "Detalls",
     "recipient": "Destinatari",
     "destination": "Destinatari",
@@ -48,6 +54,11 @@
     "continue": "Continuar",
     "code": "Codi",
     "copy": "Copiar",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Seleccionat",
     "share": "Compartir",
@@ -119,6 +130,7 @@
     "day": "dia",
     "days": "days",
     "week": "setmana",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Bloqueig automàtic",
     "suggested": "Suggerida",
     "low": "Baixa",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Tàxon Token",
     "uri": "IRU (Identificador de Recurs Únic)",
     "transferFee": "Comissió de transferència",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ID del Token",
     "tokenIDs": "IDs del Token",
     "tokenOffers": "Ofertes de Token",
@@ -227,6 +244,7 @@
     "strong": "Forta",
     "veryStrong": "Molt forta",
     "subject": "Tema",
+    "credentialType": "Credential Type",
     "empty": "Buit",
     "update": "Actualització",
     "notNow": "Ara no",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp vol obrir aquesta URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Crea un enllaç de sol·licitud de pagament",
     "transactionFeeIsNotSet": "La comissió de la transacció no s'ha establert, sisplau, espera fins que s'estableixi i intenta-ho de nou!",
     "unableToSetAccountSequence": "No s'ha pogut establir la seqüència del compte, sisplau, comprova que estàs connectat a internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "La seguretat primer",
     "slideThree_desc": "L'aplicació i la plataforma XUMM s'han creat prioritzant la seguretat.  No tornis mai a introduir les teves claus secretes i signa sempre les transaccions des dels teus dispositius de confiança.",
     "slideFour_title": "Enviar i rebre",
-    "slideFour_desc": "Pots enviar i rebre XRP així com també altres actius de confiança (IOUs)"
+    "slideFour_desc": "Pots enviar i rebre XRP així com també altres actius de confiança (IOUs)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Configura una contrasenya",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "No es poden obtenir les transaccions del compte.",
     "canNotFetchSignRequests": "No s'han pogut recuperar les peticions de signatura del compte!",
     "unableToLoadTheTransaction": "No s'ha pogut carregar la transacció, si us plau, assegura't que estàs connectat a Internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "El pagament té una etiqueta de destinació: %{tag}",
     "itWasInstructedToDeliver": "S'han donat instruccions per a lliurar %{amount} %{currency}.",
     "bySpendingUpTo": "gastant fins a %{amount}%{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "S'ha suprimit el compte %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Se li va indicar que lliurés el saldo restant de %{amount} %{currency} a %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "La transacció cancel·larà el xec amb ID %{checkId}.",
     "itAuthorizesSendingPaymentsToThisAccount": "Autoritza %{address} a enviar pagaments a aquest compte.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Elimina l'autorització de l'adreça %{address} per enviar pagaments a aquest compte.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "S'ha eliminat la Línia de Confiança de la moneda %{currency} de %{issuer}.",
     "itEstablishesTrustLineTo": "Estableix %{limit} com a quantitat màxima de %{currency} de %{issuer} que %{address} podrà tenir.",
     "itRemovesTheAccountDomain": "Elimina el domini del compte",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Introdueix un nom o una adreça",
     "enterCurrencyCodeOrName": "Introdueix el codi de la moneda o el nom",
     "enterName": "Si us plau, introdueix un nom",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "El contacte ja existeix",
     "contactSuccessSaved": "Contacte afegit correctament",
     "contactSuccessUpdated": "El contacte s'ha actualitzat correctament",
@@ -759,6 +801,8 @@
     "changePasscode": "Canvia la contrasenya",
     "biometricAuthentication": "Autenticació biomètrica",
     "hapticFeedback": "Retroalimentació hàptica",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Mode de desenvolupador",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Format de la moneda del sistema",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Segur que vols tornar enrere? (Si tornes enrere, hauràs de tornar a introduir totes les entrades per raons de seguretat)",
     "accountType": "Tipus de compte",
     "secretType": "Tipus de clau privada",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Si us plau, selecciona el tipus de compte",
     "pleaseSelectAccountSecretType": "Si us plau, selecciona el tipus de clau privada",
     "fullAccess": "Accés total",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "No hi ha resultats de cerca",
     "noContact": "Sense contactes",
     "myAccount": "El meu compte",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "L'adreça d'origen i la de destinació no poden ser la mateixa.",
     "enterANameOrAddress": "Introdueix un nom o una adreça",
     "transferredSuccessfully": "La teva transacció s'ha registrat amb èxit a l'%{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "No s'han pogut establir les taxes de transacció, torna-ho a provar.",
     "theDestinationAccountIsSetAsBlackHole": "AVÍS: Aquest compte de destinació està establert com a forat negre. L'XRP que s'hi enviï  es perdrà per sempre!",
     "noDestinationTag": "Sense etiqueta de destinació",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Aquesta adreça requereix una etiqueta de destinació (Destination Tag)",
     "pleaseEnterAmount": "Si us plau, introdueix l'import de la transacció",
     "trustLineLimitExceeded": "S'ha superat el límit de la línia de confiança (TrustLine), ara: %{balance}, màxim: %{peer_limit}, disponible per emetre: %{available}. El destinatari pot actualitzar el límit de la línia de confiança.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/cs.json b/src/locale/translations/cs.json
index e9e9ae59c..bad0428e3 100644
--- a/src/locale/translations/cs.json
+++ b/src/locale/translations/cs.json
@@ -14,6 +14,8 @@
     "discard": "Vyřadit",
     "remove": "Odstranit",
     "go": "Jdeme na to",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Zavřít",
     "save": "Uložit",
     "confirm": "Potvrdit",
@@ -21,6 +23,7 @@
     "balance": "Zůstatek",
     "spendable": "Použitelný zůstatek",
     "home": "Domů",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Transakce",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Nastavení",
     "search": "Hledat",
     "send": "Odeslat",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Pro poslání posuňte do strany",
     "done": "Hotovo",
     "previous": "Předchozí",
@@ -38,6 +43,7 @@
     "exchanges": "Směnárny",
     "scan": "Skenovat",
     "request": "Žádost",
+    "receiveOnAccount": "Receive on account",
     "details": "Detaily",
     "recipient": "Příjemce",
     "destination": "Místo určení",
@@ -48,6 +54,11 @@
     "continue": "Pokračovat",
     "code": "Kód",
     "copy": "Kopírovat",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Vybrané",
     "share": "Sdílet",
@@ -119,6 +130,7 @@
     "day": "den",
     "days": "days",
     "week": "týden",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "automatické uzamčení",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Silné",
     "veryStrong": "Velmi silné",
     "subject": "Předmět",
+    "credentialType": "Credential Type",
     "empty": "prázdný",
     "update": "Aktualizovat",
     "notNow": "Teď ne",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp chce otevřít tuto adresu URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Vytvořit odkaz na platební požadavek",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Bezpečnost především",
     "slideThree_desc": "Aplikace a platforma xumm jsou postaveny s důrazem na bezpečnost. Nikdy znovu nezadávejte své soukromé klíče a transakce podepisujte pouze ze svého důvěryhodného zařízení.",
     "slideFour_title": "Odesílání a příjem",
-    "slideFour_desc": "Můžete odesílat a přijímat XRP a další důvěryhodná aktiva (IOU)"
+    "slideFour_desc": "Můžete odesílat a přijímat XRP a další důvěryhodná aktiva (IOU)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Nastavit přístupový kód",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Nelze načíst transakce účtu!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Nelze načíst transakci! Ujistěte se prosím, že jste připojeni k internetu.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Platba má cílovou značku: %{tag}",
     "itWasInstructedToDeliver": "Bylo poukázáno k doručení %{amount} %{currency}",
     "bySpendingUpTo": "útratou až %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Odstranilo to účet s adresou %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Byl zadán příkaz na doručení zbývajícího zůstatku %{amount} %{currency} na %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Tato transakce zruší šek s ID %{checkId}.",
     "itAuthorizesSendingPaymentsToThisAccount": "Autorizuje to %{address} k odesílání plateb na tento účet.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Odebere to autorizaci %{address} k odesílání plateb na tento účet.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Odebralo to TrustLine měnu %{currency} od %{issuer}.",
     "itEstablishesTrustLineTo": "Zavádí to %{limit} jako maximální množství %{currency} od %{issuer}, které je adresa %{address} ochotná zadržet.",
     "itRemovesTheAccountDomain": "Odebere to doménu účtu.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Zadejte název nebo adresu",
     "enterCurrencyCodeOrName": "Zadejte kód měny nebo název",
     "enterName": "Zadejte název",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakt již existuje",
     "contactSuccessSaved": "Kontakt byl úspěšně přidán",
     "contactSuccessUpdated": "Kontakt byl úspěšně aktualizován",
@@ -759,6 +801,8 @@
     "changePasscode": "Změnit přístupové heslo",
     "biometricAuthentication": "Biometrické ověření",
     "hapticFeedback": "Odezva na dotek (haptická zpětná vazba)",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Režim vývojáře",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Formát měny systému",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Jste si jistí, že se chcete vrátit zpět? (Z bezpečnostních důvodů budete muset vše znovu vyplnit)",
     "accountType": "Typ účtu",
     "secretType": "Typ tajného klíče",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Prosíme vyberte typ vašeho účtu",
     "pleaseSelectAccountSecretType": "Prosíme vyberte typ tajného klíče k vašemu účtu",
     "fullAccess": "Úplný přístup",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Žádné výsledky hledání",
     "noContact": "Žádné kontakty",
     "myAccount": "Můj účet",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Zdrojová a cílová adresa nemohou být stejné!",
     "enterANameOrAddress": "Zadejte jméno nebo adresu",
     "transferredSuccessfully": "Vaše transakce byla úspěšně zaregistrována na %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "POZOR! Cílový účet je nastaven jako černá díra, odeslání na tento účet způsobí ztrátu XRP.",
     "noDestinationTag": "Žádná cílová značka (tag)",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Tato adresa vyžaduje cílovou značku (tag)",
     "pleaseEnterAmount": "Zadejte prosím částku transakce",
     "trustLineLimitExceeded": "Limit pro tuto TrustLine překročen, nyní: %{balance}, max: %{peer_limit}, k dispozici pro vydání: %{available}. Limit pro Trustline může změnit příjemce.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/da.json b/src/locale/translations/da.json
index da0dae802..ba3428af9 100644
--- a/src/locale/translations/da.json
+++ b/src/locale/translations/da.json
@@ -14,6 +14,8 @@
     "discard": "Slet",
     "remove": "Fjern",
     "go": "Videre",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Luk",
     "save": "Gem",
     "confirm": "Bekræft",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Til rådighed",
     "home": "Hjem",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Begivenheder",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Indstillinger",
     "search": "Søg",
     "send": "Send",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Træk for at sende",
     "done": "Udført",
     "previous": "Forrige",
@@ -38,6 +43,7 @@
     "exchanges": "Børser",
     "scan": "Scan",
     "request": "Modtag",
+    "receiveOnAccount": "Receive on account",
     "details": "Detaljer",
     "recipient": "Modtager",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "Fortsæt",
     "code": "Kode",
     "copy": "Kopier",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Valgt",
     "share": "Del",
@@ -119,6 +130,7 @@
     "day": "dag",
     "days": "days",
     "week": "uge",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automatisk lås",
     "suggested": "Foreslået",
     "low": "Lav",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token taksonomi",
     "uri": "URI",
     "transferFee": "Overførselsgebyr",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token-id",
     "tokenIDs": "Token-id'er",
     "tokenOffers": "Token-tilbud",
@@ -227,6 +244,7 @@
     "strong": "Stærk",
     "veryStrong": "Meget stærk",
     "subject": "Emne",
+    "credentialType": "Credential Type",
     "empty": "Tom",
     "update": "Opdater",
     "notNow": "Ikke nu",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp ønsker at åbne denne URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Opret link til betalingsanmodning",
     "transactionFeeIsNotSet": "Transaktionsgebyr er ikke angivet. Vent venligst til transaktionsgebyret er angivet, og prøv igen!",
     "unableToSetAccountSequence": "Kan ikke angive kontosekvens. Kontrollér, at du har forbindelse til internettet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Sikkerhed først",
     "slideThree_desc": "Xumm-applikationen og -platformen er bygget med sikkerhed for øje. Indtast aldrig dine hemmelige nøgler igen. Underskriv i stedet transaktioner fra din egen, betroede enhed.",
     "slideFour_title": "Send og modtag",
-    "slideFour_desc": "Du kan sende og modtage XRP og andre betroede aktiver (IOU'er)"
+    "slideFour_desc": "Du kan sende og modtage XRP og andre betroede aktiver (IOU'er)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Indstil en adgangskode",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Kan ikke hente kontoens transaktioner!",
     "canNotFetchSignRequests": "Kan ikke hente forespørgsler om kontounderskrivelse!",
     "unableToLoadTheTransaction": "Kan ikke indlæse transaktionen! Tjek venligst, at du har forbindelse til internettet.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Betalingen har en destinationskode: %{tag}",
     "itWasInstructedToDeliver": "Den er instrueret til at levere %{amount} %{currency}",
     "bySpendingUpTo": "ved at bruge op til %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Den slettede konto %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Den blev instrueret i at levere den resterende saldo af %{amount} %{currency} til %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Transaktionen annullerer check med id %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Den autoriserer %{address} til at sende udbetalinger til denne konto",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Den fjerner tilladelsen for %{address} til at sende overførsler til denne konto.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Den fjernede TrustLine-valuta %{currency} til %{issuer}",
     "itEstablishesTrustLineTo": "Den opretter %{limit} som maksimale beløb af %{currency} fra %{issuer}, som %{address} er villig til at tilbageholde.",
     "itRemovesTheAccountDomain": "Den fjerner kontodomænet",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Angiv navn eller adresse",
     "enterCurrencyCodeOrName": "Angiv valutakode eller navn",
     "enterName": "Angiv et navn",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakten findes allerede",
     "contactSuccessSaved": "Kontaktpersonen er tilføjet",
     "contactSuccessUpdated": "Kontaktpersonen er opdateret",
@@ -759,6 +801,8 @@
     "changePasscode": "Skift adgangskode",
     "biometricAuthentication": "Biometrisk validering",
     "hapticFeedback": "Haptisk feedback",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Udviklertilstand",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Brug systemets valuta indstillinger",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Er du sikker på, du vil tilbage? (du er nødt til at genudfylde alt igen af sikkerhedshensyn)",
     "accountType": "Kontotype",
     "secretType": "Hemmelighedstype",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Vælg venligst type af konto",
     "pleaseSelectAccountSecretType": "Vælg venligst type af konto-hemmelighed",
     "fullAccess": "Fuld adgang",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Intet søgeresultat",
     "noContact": "Ingen kontaktpersoner",
     "myAccount": "Min konto",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Afsender- og modtageradresse kan ikke være den samme!",
     "enterANameOrAddress": "Angiv et navn eller en adresse",
     "transferredSuccessfully": "Din transaktion er registreret på %{network}",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Kan ikke angive transaktionsgebyr. Prøv venligst igen.",
     "theDestinationAccountIsSetAsBlackHole": "ADVARSEL! Denne destinationskonto er angivet som et sort hul. Alle XRP, der sendes til denne konto, vil gå tabt!",
     "noDestinationTag": "Ingen destinationskode",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Denne adresse kræver en destinationskode",
     "pleaseEnterAmount": "Angiv venligst beløbet for denne transaktion.",
     "trustLineLimitExceeded": "TrustLine-grænse er overskredet, nu: %{balance}, maks.: %{peer_limit}, tilgængelig for udstedelse: %{available}. Modtageren kan opdatere grænsen for TrustLine.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/de.json b/src/locale/translations/de.json
index 181dcfd2a..e5235c407 100644
--- a/src/locale/translations/de.json
+++ b/src/locale/translations/de.json
@@ -14,6 +14,8 @@
     "discard": "Verwerfen",
     "remove": "Entfernen",
     "go": "Fortfahren",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Schließen",
     "save": "Speichern",
     "confirm": "Bestätigen",
@@ -21,6 +23,7 @@
     "balance": "Kontostand",
     "spendable": "Verfügbar",
     "home": "Startseite",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Ereignisse",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Einstellungen",
     "search": "Suche",
     "send": "Senden",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Streiche um zu senden",
     "done": "Fertig",
     "previous": "Zurück",
@@ -38,6 +43,7 @@
     "exchanges": "Exchanges",
     "scan": "Scannen",
     "request": "Empfangen",
+    "receiveOnAccount": "Receive on account",
     "details": "Details",
     "recipient": "Empfänger",
     "destination": "ziel",
@@ -48,6 +54,11 @@
     "continue": "Weiter",
     "code": "Code",
     "copy": "Kopieren",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Ausgewählt",
     "share": "Teilen",
@@ -119,6 +130,7 @@
     "day": "Tag",
     "days": "days",
     "week": "Woche",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automatische Sperre",
     "suggested": "Empfohlen",
     "low": "Niedrig",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Übertragungsgebühr",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token-ID",
     "tokenIDs": "Token-IDs",
     "tokenOffers": "Tokenangebote",
@@ -227,6 +244,7 @@
     "strong": "Stark",
     "veryStrong": "Sehr stark",
     "subject": "Betreff",
+    "credentialType": "Credential Type",
     "empty": "Leer",
     "update": "Aktualisieren",
     "notNow": "Nicht jetzt",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp möchte diese URL öffnen.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Link für Zahlungsanforderung erstellen",
     "transactionFeeIsNotSet": "Die Transaktionsgebühr ist nicht festgelegt. Bitte warten Sie, bis die Transaktionsgebühr gesetzt ist, und versuchen Sie es erneut!",
     "unableToSetAccountSequence": "Die Kontenfolge kann nicht festgelegt werden. Überprüfen Sie, ob Sie mit dem Internet verbunden sind.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Sicherheit geht vor",
     "slideThree_desc": "Die Xumm-App und Plattform wurde mir dem Schwerpunkt auf Sicherheit entwickelt. Sie müssen nie wieder Ihren geheimen Schlüssel eingeben, signieren Sie Transaktionen direkt mit Ihrem eigenen, vertrauenswürdigen Gerät.",
     "slideFour_title": "Senden und Empfangen",
-    "slideFour_desc": "Sie können auch XRP und andere vertrauenswürdige Assets (IOUs) senden und empfangen"
+    "slideFour_desc": "Sie können auch XRP und andere vertrauenswürdige Assets (IOUs) senden und empfangen",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Richten Sie einen Passcode ein",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Account Transaktionen nicht abrufbar!",
     "canNotFetchSignRequests": "Accountsignieranforderungen können nicht abgerufen werden!",
     "unableToLoadTheTransaction": "Transaktion kann nicht geladen werden! Bitte stellen Sie sicher, dass Sie mit dem Internet verbunden sind.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Die Zahlung hat eine Ziel Kennzeichnung (destination tag): %{tag}",
     "itWasInstructedToDeliver": "Es wurde angewiesen, %{amount} %{currency} zu übermitteln",
     "bySpendingUpTo": "Es wurde angewiesen, %{amount} %{currency} zu übermitteln",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Das Konto %{address} wurde gelöscht",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Es wurde angewiesen, den verbleibenden Bestand von %{amount} %{currency} an %{destination} zu übermitteln",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Die Transaktion wird den Scheck mit der ID %{checkId} abbrechen",
     "itAuthorizesSendingPaymentsToThisAccount": "Es autorisiert %{address} , Zahlungen an diesen Account zu senden",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Sie entfernt die Berechtigung um Zahlungen an diesen Account zu senden, für %{address}",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Sie löscht die TrustLine-Währung %{currency} mit %{issuer}",
     "itEstablishesTrustLineTo": "Es wird festgelegt, dass %{limit} die maximale Menge an %{currency} ist, die %{address} bereit ist von %{issuer} zu halten.",
     "itRemovesTheAccountDomain": "Es entfernt die Kontodomäne.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Name oder Adresse eingeben",
     "enterCurrencyCodeOrName": "Geben Sie den Währungscode oder den Namen ein",
     "enterName": "Bitte geben Sie einen Namen ein",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Der Kontakt ist bereits vorhanden",
     "contactSuccessSaved": "Kontakt wurde erfolgreich hinzugefügt",
     "contactSuccessUpdated": "Kontakt wurde erfolgreich aktualisiert",
@@ -759,6 +801,8 @@
     "changePasscode": "Ändern der Geheimzahl",
     "biometricAuthentication": "Biometrische Authentifizierung",
     "hapticFeedback": "Haptisches Feedback",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Entwicklermodus",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Systemwährung einstellen",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Sind Sie sicher, dass Sie zurück wollen? \r\n(Sie müssen aus Sicherheitsgründen alle Eingaben erneut ausfüllen)",
     "accountType": "Kontoart",
     "secretType": "Sicherheits-Typ",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Bitte wählen Sie Ihre Kontoart",
     "pleaseSelectAccountSecretType": "Bitte wählen Sie die Sicherheits-Art ihres Kontos",
     "fullAccess": "vollständiger Zugriff",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Keine Suchergebnisse",
     "noContact": "Keine Kontakte",
     "myAccount": "Mein Konto",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Quell- und Zieladresse dürfen nicht identisch sein!",
     "enterANameOrAddress": "Geben Sie einen Namen oder eine Adresse ein",
     "transferredSuccessfully": "Ihre Transaktion wurde erfolgreich auf dem %{network} registriert.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Die Transaktionsgebühr kann nicht festgelegt werden. Versuchen Sie es erneut.",
     "theDestinationAccountIsSetAsBlackHole": "WARNUNG: Dieser Ziel-Account wurde als \"schwarzes Loch\" gekennzeichnet. Alle XRP die an diesen Account gesendet werden, gehen verloren!",
     "noDestinationTag": "Kein Ziel-Tag (destination tag)",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Diese Adresse erfordert eine Bestimmungszahl (destination tag)",
     "pleaseEnterAmount": "Bitte geben Sie den Transaktionsbetrag ein",
     "trustLineLimitExceeded": "TrustLine-Limit wurde überschritten, jetzt: %{balance}, maximal: %{peer_limit}, zum Ausgeben verfügbar: %{available}. Der Empfänger kann das TrustLine-Limit aktualisieren.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/el.json b/src/locale/translations/el.json
index cf2251e90..6b3385354 100644
--- a/src/locale/translations/el.json
+++ b/src/locale/translations/el.json
@@ -14,6 +14,8 @@
     "discard": "Απορρίψτε",
     "remove": "Αφαίρεση",
     "go": "Ξεκινήστε",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Κλείσιμο",
     "save": "Αποθήκευση",
     "confirm": "Επιβεβαίωση",
@@ -21,6 +23,7 @@
     "balance": "Υπόλοιπο",
     "spendable": "Διαθέσιμα",
     "home": "Αρχική",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Συναλλαγές",
     "profile": "Προφίλ",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Ρυθμίσεις",
     "search": "Αναζήτηση",
     "send": "Αποστολή",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Σύρετε για αποστολή",
     "done": "Ολοκλήρωση",
     "previous": "Προηγούμενο",
@@ -38,6 +43,7 @@
     "exchanges": "Ανταλλακτήρια",
     "scan": "Σάρωση",
     "request": "Αίτημα",
+    "receiveOnAccount": "Receive on account",
     "details": "Λεπτομέρειες",
     "recipient": "Παραλήπτης",
     "destination": "Προορισμός",
@@ -48,6 +54,11 @@
     "continue": "Συνέχεια",
     "code": "Κωδικός",
     "copy": "Αντιγραφή",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Επιλεγμένο",
     "share": "Κοινή χρήση",
@@ -119,6 +130,7 @@
     "day": "ημέρα",
     "days": "days",
     "week": "εβδομάδα",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Αυτόματο κλείδωμα",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Δυνατό",
     "veryStrong": "Πολύ δυνατός",
     "subject": "Θέμα",
+    "credentialType": "Credential Type",
     "empty": "Άδειο",
     "update": "Ενημέρωση",
     "notNow": "Όχι τώρα",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}Το xApp θέλει να ανοίξει αυτή τη διεύθυνση URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Δημιουργία διασύνδεσης αίτησης πληρωμής",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Πρώτα η ασφάλεια",
     "slideThree_desc": "Η εφαρμογή xumm είναι χτισμένη με πρότυπο την ασφάλεια του χρήστη. Ποτέ μην εισάγετε τους μυστικούς σας αριθμούς κάπου αλλού, επιβεβαιώστε τις συναλλαγές από τη δική σας αξιόπιστη συσκευή.",
     "slideFour_title": "Αποστολή και λήψη",
-    "slideFour_desc": "Μπορείτε να στείλετε και να λάβετε το XRP και άλλα νομίσματα (IOUs) επίσης"
+    "slideFour_desc": "Μπορείτε να στείλετε και να λάβετε το XRP και άλλα νομίσματα (IOUs) επίσης",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Ρύθμιση κωδικού πρόσβασης",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Δεν είναι δυνατή η ανάκτηση συναλλαγών!",
     "canNotFetchSignRequests": "Δεν είναι δυνατή η ανάκτηση αιτήσεων υπογραφής λογαριασμών!",
     "unableToLoadTheTransaction": "Δεν είναι δυνατή η φόρτωση της συναλλαγής, παρακαλώ βεβαιωθείτε ότι έχετε συνδεθεί στο διαδίκτυο!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Η πληρωμή έχει μια ετικέτα προορισμού: %{tag}.",
     "itWasInstructedToDeliver": "Ήταν διατυπωμένο να παραδόσει %{amount} %{currency}.",
     "bySpendingUpTo": "με δαπάνες έως %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Διέγραψε τον λογαριασμό με %{address}.",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Ήταν διατυπωμένο να παραδώσει το υπόλοιπο των %{amount} %{currency} στο %{destination}.",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Η συναλλαγή θα ακυρώσει την επιταγή με ταυτότητα %{checkId}.",
     "itAuthorizesSendingPaymentsToThisAccount": "Εξουσιοδοτεί τον %{address} για να στέλνει πληρωμές σε αυτό το λογαριασμό.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Αφαιρεί την εξουσιοδότηση του %{address} για να στέλνει πληρωμές σε αυτό το λογαριασμό.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Έχει αφαιρέσει το νόμισμα του TrustLine %{currency} σε %{issuer}",
     "itEstablishesTrustLineTo": "Καθορίζει το %{limit} ως τη μέγιστη ποσότητα %{currency} από %{issuer} που είναι πρόθυμος ο/η %{address} να κρατήσει .",
     "itRemovesTheAccountDomain": "Αφαιρεί το domain του λογαριασμού",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Καταχωρήστε όνομα ή διεύθυνση",
     "enterCurrencyCodeOrName": "Εισάγετε κωδικό ή όνομα νομίσματος",
     "enterName": "Προσθήκη ονόματος",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Η επαφή υπάρχει ήδη",
     "contactSuccessSaved": "Η επαφή προστέθηκε επιτυχώς",
     "contactSuccessUpdated": "Η επαφή ενημερώθηκε επιτυχώς",
@@ -759,6 +801,8 @@
     "changePasscode": "Αλλαγή κωδικού πρόσβασης",
     "biometricAuthentication": "Βιομετρική ταυτοποίηση",
     "hapticFeedback": "Haptic σχόλια",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Λειτουργία προγραμματιστή",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Μορφοποίηση νομίσματος συστήματος",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Είστε σίγουρος ότι θέλετε να επιστρέψετε; \r\n(πρέπει να συμπληρώσετε ξανά όλες τις καταχωρήσεις για λόγους ασφαλείας)",
     "accountType": "Είδος λογαριασμού",
     "secretType": "Τύπος μυστικού",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Επιλέξτε το είδος λογαριασμού",
     "pleaseSelectAccountSecretType": "Επιλέξτε τον μυστικό τύπο του λογαριασμού σας",
     "fullAccess": "Πλήρης πρόσβαση",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Δεν υπάρχουν αποτελέσματα αναζήτησης",
     "noContact": "Δεν υπάρχουν επαφές",
     "myAccount": "Ο λογαριασμός μου",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Η διεύθυνση προέλευσης και προορισμού δεν μπορεί να είναι η ίδια!",
     "enterANameOrAddress": "Καταχωρήστε ένα όνομα ή διεύθυνση",
     "transferredSuccessfully": "Η συναλλαγή σας καταχωρήθηκε με επιτυχία στο %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "ΠΡΟΣΟΧΗ: Ο λογαριασμός του προορισμού έχει οριστεί ως \"μαύρη τρύπα\". Στέλνοντας XRP σε αυτό το λογαριασμό θα οδηγήσει στην απώλεια των χρημάτων.",
     "noDestinationTag": "Δεν υπάρχει ετικέτα προορισμού",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Αυτή η διεύθυνση απαιτεί ετικέτα προορισμού",
     "pleaseEnterAmount": "Παρακαλώ εισάγετε το ποσό αυτής της συναλλαγής.",
     "trustLineLimitExceeded": "Υπέρβαση του ορίου TrustLine: %{balance}, μέγιστο όριο: %{peer_limit}, διαθέσιμο για έκδοση: %{available}. Ο παραλήπτης μπορεί να ενημερώσει το όριο Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/en-AU.json b/src/locale/translations/en-AU.json
index 1803c0a99..bd3a5e144 100644
--- a/src/locale/translations/en-AU.json
+++ b/src/locale/translations/en-AU.json
@@ -14,6 +14,8 @@
     "discard": "Discard",
     "remove": "Remove",
     "go": "Go",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Close",
     "save": "Save",
     "confirm": "Confirm",
@@ -21,6 +23,7 @@
     "balance": "Balance",
     "spendable": "Spendable",
     "home": "Home",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Events",
     "profile": "Profile",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Settings",
     "search": "Search",
     "send": "Send",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Slide to send",
     "done": "Done",
     "previous": "Previous",
@@ -37,7 +42,8 @@
     "exchange": "Exchange",
     "exchanges": "Exchanges",
     "scan": "Scan",
-    "request": "Request",
+    "request": "Receive",
+    "receiveOnAccount": "Receive on account",
     "details": "Details",
     "recipient": "Recipient",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "Continue",
     "code": "Code",
     "copy": "Copy",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Selected",
     "share": "Share",
@@ -119,6 +130,7 @@
     "day": "day",
     "days": "days",
     "week": "week",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Auto-lock",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Strong",
     "veryStrong": "Very strong",
     "subject": "Subject",
+    "credentialType": "Credential Type",
     "empty": "Empty",
     "update": "Update",
     "notNow": "Not Now",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "%{xapp}' xApp wants to open this URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create payment request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set, and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check if you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Security First",
     "slideThree_desc": "Security is priority with XUMM app and platform. Never enter your secret key again! Sign transactions from your own trusted device.",
     "slideFour_title": "Send and receive",
-    "slideFour_desc": "You can send and receive XRP as well as other trusted assets (IOUs)"
+    "slideFour_desc": "You can send and receive XRP as well as other trusted assets (IOUs)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Set up a passcode",
@@ -480,7 +506,7 @@
     "onDate": "on",
     "paymentReceived": "Payment received",
     "paymentSent": "Payment sent",
-    "exchangedAssets": "Exchanged tokens",
+    "exchangedAssets": "Swapped tokens",
     "addedATrustLine": "Added a token (TrustLine)",
     "removedATrustLine": "Removed a token (TrustLine)",
     "updatedATrustLine": "Token Updated (TrustLine)",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Cannot fetch account transactions!\r\n",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Unable to load the transaction, please make sure you are connected to the internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Payment Destination Tag: %{tag}",
     "itWasInstructedToDeliver": "It was instructed to deliver %{amount} %{currency}",
     "bySpendingUpTo": "by spending up to %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "It deleted account %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "It was instructed to deliver the remaining balance of %{amount} %{currency} to %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "The transaction will cancel check with ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "It authorizes %{address} to send payments to this account",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "It removes the authorization for %{address} to send payments to this account",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "It removed TrustLine currency %{currency} to %{issuer}",
     "itEstablishesTrustLineTo": "It establishes %{limit} as the maximum amount of %{currency} from %{issuer} that %{address} is willing to hold.",
     "itRemovesTheAccountDomain": "It removes the account domain",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Enter a name or address",
     "enterCurrencyCodeOrName": "Enter currency code or name",
     "enterName": "Please enter a name",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "This contact already exists",
     "contactSuccessSaved": "Contact successfully added",
     "contactSuccessUpdated": "Contact successfully updated",
@@ -759,6 +801,8 @@
     "changePasscode": "Change passcode",
     "biometricAuthentication": "Biometric authentication",
     "hapticFeedback": "Haptic feedback",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Developer mode\r\n",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Use system currency format",
@@ -811,7 +855,7 @@
     "unableToDeleteNodeWhenConnectedToNetwork": "Unable to remove the node while connected to this network, please switch network and try again!",
     "developerModeEnabledWarning": "Enabling Developer Mode may reduce certain security functions. Proceed with utmost caution, and only enable it if you comprehend the potential consequences.",
     "disablingDeveloperMode": "Disabling Developer Mode",
-    "disableDeveloperModeRevertNetworkWarning": "Please note that this action will revert your selected network from '%{currentNetwork}' to the '%{defaultNetwork}'. Are you sure you want to proceed?",
+    "disableDeveloperModeRevertNetworkWarning": "Please note that this action will revert your selected network from '%{currentNetwork}' to '%{defaultNetwork}'. Are you sure you want to proceed?",
     "blockingTakingScreenShotsIsDisabled": "Developer mode is active, Screenshot capture protection is temporarily disabled.",
     "syncRailsRemoveNetworkWarning": "Applying this sync will disconnect you from the current network (%{currentNetwork}). Please switch to a different network and try again.",
     "syncRailsRemoveNodeWarning": "By applying this sync, the current node (%{connectedNode}) to which you are currently connected will be removed. Please select a new default node for this network and try again.",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Are you sure you want to go back?\r\n(you have to re-fill all the inputs for security reasons) ",
     "accountType": "Account type",
     "secretType": "Secret type",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Please select your account type",
     "pleaseSelectAccountSecretType": "Please select your account secret type.\r\n",
     "fullAccess": "Full access",
@@ -902,26 +947,26 @@
     "chooseAccountType": " Choose account type",
     "secretNumbers": "Secret Numeric Key",
     "secretNumbersDesc": "Preferred account type: 8 rows of 6 digits",
-    "familySeed": "Family Seed",
-    "familySeedDesc": "Looks like sXXX1234XXX...",
+    "familySeed": "Family Seed / Private Key",
+    "familySeedDesc": "E.g. sXb1c3aX... or EDAF9E...",
     "mnemonic": "Mnemonic",
     "scanFromQR": "Scan from QR code",
-    "mnemonicDesc": "Based on 12, 16 or 24 words\r\n",
-    "readOnlyAccount": "Read-only account",
-    "pleaseProvideAccountAddress": "Please provide your account address (starts with 'r...').",
+    "mnemonicDesc": "Based on 12, 16 or 24 words",
+    "readOnlyAccount": "Read only account",
+    "pleaseProvideAccountAddress": "Please provide your account address \r\n(Starts with 'r...')",
     "pleaseEnterYourAddress": "Please enter your account address",
     "invalidMnemonic": "Invalid mnemonic!",
-    "pleaseEnterAllWords": "Please enter your mnemonic key!",
-    "pleaseProvideMnemonic": "Please provide your account's mnemonic passphrase (24 words).",
-    "pleaseEnterYourMnemonic": "Please enter your mnemonic passphrase",
+    "pleaseEnterAllWords": "Please enter all your mnemonic words!",
+    "pleaseProvideMnemonic": "Please provide your Mnemonic (24 words) for your account.",
+    "pleaseEnterYourMnemonic": "Please enter your Mnemonic",
     "howManyWordsYourMnemonicIs": "How many words does your mnemonic have?",
-    "pleaseEnterYourSecretNumber": "Please enter your secret numeric key.",
-    "invalidFamilySeed": "Invalid Family Seed",
-    "invalidHexPrivateKey": "Invalid Hex private key! Hex private keys should be 66 HEX characters (A-F, 0-9) long.",
-    "pleaseProvideFamilySeed": "Please provide your account's secret/family Seed.",
-    "pleaseEnterYourFamilySeed": "Please enter your family seed\r\n",
+    "pleaseEnterYourSecretNumber": "Please enter your secret numbers",
+    "invalidFamilySeed": "Invalid Family Seed / Private Key",
+    "invalidHexPrivateKey": "Invalid HEX private key! HEX private keys should be 66 HEX characters (A-F, 0-9) long.",
+    "pleaseProvideFamilySeed": "Please provide your account secret (Family Seed) or 66 HEX char. private key.",
+    "pleaseEnterYourFamilySeed": "Enter your Family Seed / Private Key",
     "accountImportCompleted": "Account import complete!",
-    "youJustImportedAccount": "You've just added your account!",
+    "youJustImportedAccount": "You just added your account",
     "accountSettings": "Edit account",
     "switchAddAccount": "Switch/add account",
     "accountLabel": "Account label",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "No search result",
     "noContact": "No contacts",
     "myAccount": "My account",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Source and Destination addresses cannot be the same!",
     "enterANameOrAddress": "Enter a name or an address",
     "transferredSuccessfully": "Your transaction has been successfully registered on the %{network}.",
@@ -1053,7 +1099,7 @@
     "somethingWentWrong": "Something went wrong!",
     "resultCopiedToClipboard": "Result copied to clipboard",
     "txIdCopiedToClipboard": "Transaction ID copied to clipboard",
-    "submittingToLedger": "Sending your transaction to the %{network}",
+    "submittingToLedger": "Sending your transaction to %{network}",
     "sendingFrom": "Sending from",
     "enterDescription": "Enter description",
     "enterPublicMemo": "Enter public memo (optional)",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "WARNING: This destination account is set as a black hole. Any XRP sent to this account will result in loss of funds!",
     "noDestinationTag": "No Destination Tag",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "This address requires a Destination Tag",
     "pleaseEnterAmount": "Please enter the transaction amount",
     "trustLineLimitExceeded": "TrustLine limit is exceeded.\r\n\r\nNow: %{balance}\r\nMax: %{peer_limit}\r\nAvailable for issuing: %{available}\r\n\r\nThe recipient can update the Trustline limit.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/es-419.json b/src/locale/translations/es-419.json
index 36957ca6d..66da4e410 100644
--- a/src/locale/translations/es-419.json
+++ b/src/locale/translations/es-419.json
@@ -14,6 +14,8 @@
     "discard": "Descartar",
     "remove": "Quitar",
     "go": "Ir",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Cerrar",
     "save": "Guardar",
     "confirm": "Confirmar",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Disponible",
     "home": "Inicio",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Eventos",
     "profile": "Perfil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Configuración",
     "search": "Buscar",
     "send": "Enviar",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Desliza para enviar",
     "done": "Finalizado",
     "previous": "Anterior",
@@ -38,6 +43,7 @@
     "exchanges": "Intercambios",
     "scan": "Escanear",
     "request": "Solicitud",
+    "receiveOnAccount": "Receive on account",
     "details": "Detalles",
     "recipient": "Receptor",
     "destination": "Destino",
@@ -48,6 +54,11 @@
     "continue": "Continuar",
     "code": "Código",
     "copy": "Copiar",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Seleccionado",
     "share": "Compartir",
@@ -119,6 +130,7 @@
     "day": "día",
     "days": "days",
     "week": "semana",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Bloqueo automático",
     "suggested": "Sugerido",
     "low": "Baja",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Tasa de transferencia",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ID de Señal",
     "tokenIDs": "IDs de Señales",
     "tokenOffers": "Ofertas de señales",
@@ -227,6 +244,7 @@
     "strong": "Fuerte",
     "veryStrong": "Muy fuerte",
     "subject": "Tema",
+    "credentialType": "Credential Type",
     "empty": "Vacío",
     "update": "Actualizar",
     "notNow": "Ahora no",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp desea abrir este URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Crear enlace de solicitud de pago",
     "transactionFeeIsNotSet": "La tarifa de transacción no está establecida. Por favor, espere hasta que se establezca la tarifa de transacción e inténtelo nuevamente.",
     "unableToSetAccountSequence": "No se puede establecer la secuencia de la cuenta. Por favor, compruebe que está conectado a internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "La seguridad primero",
     "slideThree_desc": "La aplicación y plataforma XUMM están construidas con seguridad como prioridad. Nunca vuelve a ingresar sus claves secretas. Firme transacciones desde su propio dispositivo de confianza. ",
     "slideFour_title": "Enviar y recibir",
-    "slideFour_desc": "Puede enviar y recibir XRP así como otros activos de confianza (IOUs)."
+    "slideFour_desc": "Puede enviar y recibir XRP así como otros activos de confianza (IOUs).",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Configurar una contraseña",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "¡No se pueden recuperar las transacciones de la cuenta!",
     "canNotFetchSignRequests": "¡No se puede captar solicitudes de firma de cuenta!",
     "unableToLoadTheTransaction": "¡No se puede cargar la transacción! Por favor, asegúrese que está conectado al Internet.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "El pago tiene una etiqueta de destino ('Destination Tag'): %{tag}",
     "itWasInstructedToDeliver": "Se ha indicado la entrega de %{amount} %{currency}.",
     "bySpendingUpTo": "gastando hasta %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Se ha eliminado la cuenta %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Se le indicó que entregue el saldo restante de %{amount} %{currency} a %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "La transacción cancelará el cheque con el ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Autoriza a %{address} para que pueda enviar pagos a esta cuenta",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Elimina la autorización de Variable %{address} para enviar pagos a esta cuenta",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Eliminó el TrustLine del activo %{currency} a %{issuer}",
     "itEstablishesTrustLineTo": "Establece %{limit} como el monto máximo de %{currency} de %{issuer} que %{address} está dispuesta a mantener.",
     "itRemovesTheAccountDomain": "Elimina el dominio de la cuenta. ",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Ingrese nombre o dirección",
     "enterCurrencyCodeOrName": "Ingrese código de la moneda o nombre",
     "enterName": "Por favor ingrese un nombre",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "El contacto ya existe",
     "contactSuccessSaved": "Contacto agregado exitosamente",
     "contactSuccessUpdated": "Contacto actualizado correctamente",
@@ -759,6 +801,8 @@
     "changePasscode": "Cambiar código de acceso (PIN)",
     "biometricAuthentication": "Autenticación biométrica",
     "hapticFeedback": "Retroalimentación táctil",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Modalidad de programador",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Formato de moneda del sistema",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "¿Está seguro de que quiere volver atrás? ¡Por su seguridad, deberá volver a rellenar todas las entradas!",
     "accountType": "Tipo de cuenta",
     "secretType": "Tipo secreto",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Por favor seleccione su tipo de cuenta",
     "pleaseSelectAccountSecretType": "Seleccione el tipo de secreto de su cuenta",
     "fullAccess": "Acceso completo",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Búsqueda sin resultados",
     "noContact": "Sin contactos",
     "myAccount": "Mi Cuenta",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "¡La dirección de origen y destino no puede ser la misma!",
     "enterANameOrAddress": "Ingrese un nombre o dirección",
     "transferredSuccessfully": "Tu transacción se ha registrado con éxito en el %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "No se puede establecer la tasa de transacción, inténtelo de nuevo.",
     "theDestinationAccountIsSetAsBlackHole": "¡ADVERTENCIA: Esta cuenta destino ha sido establecida como un agujero negro. Todo XRP enviado a esta cuenta resultará en perdida de fondos!",
     "noDestinationTag": "Sin etiqueta de destino (Destination Tag)",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Esta dirección requiere una etiqueta de destino.",
     "pleaseEnterAmount": "Por favor, ingresa el monto para esta transacción.",
     "trustLineLimitExceeded": "Límite de TrustLine excedido. Ahora: %{balance}, máximo: %{peer_limit}, disponible para emisión: %{available}. El destinatario puede actualizar el límite del TrustLine.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/es.json b/src/locale/translations/es.json
index 6e21f2838..7034d1f2b 100644
--- a/src/locale/translations/es.json
+++ b/src/locale/translations/es.json
@@ -14,6 +14,8 @@
     "discard": "Descartar",
     "remove": "Eliminar",
     "go": "Ir",
+    "none": "Ninguno",
+    "okLetsGo": "¡Ok, vamos!",
     "close": "Cerrar",
     "save": "Guardar",
     "confirm": "Confirmar",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Disponible",
     "home": "Inicio",
+    "accounttxpush": "Notificaciones push de transacciones",
     "events": "Eventos",
     "profile": "Perfil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Ajustes",
     "search": "Buscar",
     "send": "Enviar",
+    "swap": "Cambiar",
+    "swap3p": "Cambiar (terceros)",
     "slideToSend": "Desliza para enviar",
     "done": "Hecho",
     "previous": "Anterior",
@@ -38,6 +43,7 @@
     "exchanges": "Intercambios",
     "scan": "Escanear",
     "request": "Solicitar",
+    "receiveOnAccount": "Recibir en cuenta",
     "details": "Detalles",
     "recipient": "Destinatario",
     "destination": "Destino",
@@ -48,6 +54,11 @@
     "continue": "Continuar",
     "code": "Código",
     "copy": "Copiar",
+    "holdToCopy": "mantén para pulsar",
+    "requestLinkNow": "Copia o comparte el enlace de solicitud",
+    "shareAsQr": "O comparte el código QR",
+    "orShareQr": "O comparte la cuenta como un QR",
+    "requestCopied": "Enlace de petición copiado a tu portapapeles",
     "select": "Seleccionar",
     "selected": "Seleccionado",
     "share": "Compartir",
@@ -68,7 +79,7 @@
     "nft": "NFT",
     "amm": "AMM",
     "uritoken": "URIToken",
-    "uriTokenOffer": "URI Token Offer",
+    "uriTokenOffer": "Oferta URI Token",
     "other": "Otros",
     "filter": "Filtrar",
     "favorite": "Favorito",
@@ -119,6 +130,7 @@
     "day": "día",
     "days": "días",
     "week": "semana",
+    "unusualTransaction": "Transacción Spam / Scam",
     "autoLock": "Bloqueo automático",
     "suggested": "Sugerido",
     "low": "Baja",
@@ -137,7 +149,7 @@
     "signing": "Firmando",
     "paymentChannelAuthorize": "Autorizar Canal de Pago",
     "issuer": "Emisor",
-    "inform": "Inform",
+    "inform": "Informar",
     "accept": "Aceptar",
     "slideToAccept": "Desliza para aceptar",
     "decline": "Rechazar",
@@ -169,8 +181,8 @@
     "longTap": "Mantener pulsado",
     "sequence": "Secuencia",
     "offerSequence": "Secuencia de ofertas",
-    "offerID": "Offer ID",
-    "escrowID": "Escrow ID",
+    "offerID": "ID Oferta",
+    "escrowID": "ID Escrow",
     "ticket": "Ticket",
     "ticketSequence": "Secuencia del Ticket",
     "ticketCount": "Recuento de tickets",
@@ -203,12 +215,17 @@
     "tokenTaxon": "Taxón del Token",
     "uri": "URI",
     "transferFee": "Tasa de transferencia",
+    "assetScale": "Escala de Activo",
+    "maximumAmount": "Cantidad máxima",
+    "mpTokenMetadata": "Metadata del MP Token",
+    "mpTokenIssuanceID": "ID de seguro de MP Token",
+    "holder": "Holder",
     "tokenID": "ID de token",
     "tokenIDs": "IDs de tokens",
     "tokenOffers": "Ofertas de tokens",
     "sellOffer": "Oferta de venta",
     "buyOffer": "Oferta de compra",
-    "brokerFee": "Broker fee",
+    "brokerFee": "Comisión de Broker",
     "reviewTransaction": "Revisar transacción",
     "important": "Importante",
     "sign": "Firmar",
@@ -227,6 +244,7 @@
     "strong": "Fuerte",
     "veryStrong": "Muy fuerte",
     "subject": "Asunto",
+    "credentialType": "Credential Type",
     "empty": "Vacío",
     "update": "Actualizar",
     "notNow": "Ahora no",
@@ -341,6 +359,7 @@
     "support": "Soporte",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp quiere abrir esta URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "Esta xApp esta solicitando tus 'Registros de sesión'. Los registros de sesión no contienen información personal, excepto las direcciones de la cuenta y los loggings de conexión al ledger.\r\n\r\nSi quieres inspeccionar los contenidos de  los registros de sesión primero, visita Ajustes - Avanzado - Registro de Sesión.\r\n\r\n¿Quieres permitir a la aplicación acceso a tu información de registro de sesión?",
     "createPaymentRequestLink": "Crear enlace de solicitud de pago",
     "transactionFeeIsNotSet": "No se ha establecido la tarifa de transacción, espera hasta que se establezca la tarifa de transacción y vuelve a intentarlo.",
     "unableToSetAccountSequence": "No se puede establecer la secuencia de cuentas, por favor, comprueba que estás conectado a Internet.",
@@ -349,35 +368,38 @@
     "networks": "Redes",
     "network": "Red",
     "networkId": "ID de la Red",
-    "operationLimit": "Operation limit",
+    "operationLimit": "Límite de operaciones",
     "connectedTo": "Conectado a:",
     "connected": "Conectado",
     "hooks": "Hooks",
     "blob": "Blob",
     "data": "Data",
-    "didDocument": "DID Document",
+    "didDocument": "Documento DID",
+    "authorizeCredentials": "Autorizar credenciales",
+    "unauthorizeCredentials": "Desautorizar credenciales",
     "digest": "Digest",
     "uriTokenId": "Id Token URI",
-    "oracleDocumentID": "Oracle Document Id",
-    "provider": "Provider",
-    "lastUpdateTime": "Last update time",
-    "assetClass": "Asset class",
-    "priceDataSeries": "Price data series",
-    "baseAsset": "Base asset",
-    "quoteAsset": "Quote asset",
-    "assetPrice": "Asset price",
-    "priceData": "Price Data",
-    "scale": "Scale",
+    "oracleDocumentID": "Id de Documento del Oráculo",
+    "provider": "Proveedor",
+    "lastUpdateTime": "Última vez actualizado",
+    "assetClass": "Clase de activo",
+    "priceDataSeries": "Series de datos de precio",
+    "baseAsset": "Activo base",
+    "quoteAsset": "Activo de cotización",
+    "assetPrice": "Precio del activo",
+    "priceData": "Datos de precio",
+    "credentialIDs": "Credential ID's",
+    "scale": "Escala",
     "hookParameters": "Parámetros del Hook",
     "hookFeeNotice": "Nota: La comisión total de la transacción incluye un comisión de hook de %{hookFee} %{nativeAsset}.",
     "unableToLoadNetworkFee": "¡No es posible cargar la comisión de red!",
     "encrypting": "Encriptando...",
     "stillWorkingOnIt": "Seguimos trabajando en ello",
     "doNotCloseTheApp": "NO cierres Xaman\r\nNO bloquees tu dispositivo",
-    "switchNetwork": "Switch network",
-    "theme": "Theme",
-    "searchTokens": "Search tokens",
-    "closingIn": "Closing in"
+    "switchNetwork": "Cambiar red",
+    "theme": "Tema",
+    "searchTokens": "Búsqueda de tokens",
+    "closingIn": "Acercar"
   },
   "onboarding": {
     "slideOne_title": "Pagos y solicitudes de pago en el XRP ledger",
@@ -386,7 +408,11 @@
     "slideThree_title": "La seguridad primero",
     "slideThree_desc": "Tanto la aplicación como la plataforma XUMM han sido desarrolladas con la seguridad en mente. Nunca introduzcas tus secretos de nuevo, firma transacciones desde tu propio dispositivo de confianza.",
     "slideFour_title": "Enviar y recibir",
-    "slideFour_desc": "Puede enviar y recibir XRP así como otros activos de confianza (IOUs)."
+    "slideFour_desc": "Puede enviar y recibir XRP así como otros activos de confianza (IOUs).",
+    "v2main1": "La principal cartera de autocustodia.",
+    "v2main2": "Protege tus criptos con confianza.",
+    "v2homepage_noacc1": "Bienvenido a Xaman",
+    "v2homepage_noacc2": "Importa tu cuenta actual o crea una nueva."
   },
   "setupPasscode": {
     "setupAPasscode": "Configurar una contraseña",
@@ -504,7 +530,7 @@
     "deleteAccount": "Eliminar Cuenta",
     "setSignerList": "Establecer lista de firmantes",
     "createTicket": "Crear ticket",
-    "cancelTicket": "Cancel ticket",
+    "cancelTicket": "Cancelar ticket",
     "updateAccountSettings": "Actualizar la configuración de la cuenta",
     "setARegularKey": "Establezca una Clave Regular",
     "setRegularKey": "Establecer clave regular",
@@ -523,27 +549,30 @@
     "createNFTOffer": "Crear oferta de NFT",
     "createURITokenSellOffer": "Crear Oferta de venta del URI Token",
     "cancelURITokenSellOffer": "Cancelar Oferta de venta del URI Token",
-    "ammBid": "AMM Bid",
-    "ammCreate": "AMM Create",
-    "ammDelete": "AMM Delete",
-    "ammDeposit": "AMM Deposit",
-    "ammVote": "AMM Vote",
-    "ammWithdraw": "AMM Withdraw",
+    "ammBid": "Pujar AMM",
+    "ammCreate": "Crear AMM",
+    "ammDelete": "Borrar AMM",
+    "ammDeposit": "Deposito AMM",
+    "ammVote": "Voto AMM",
+    "ammWithdraw": "Retirar AMM",
     "remit": "Remit",
-    "amounts": "Amounts",
+    "amounts": "Cantidades",
     "uriTokenIDs": "URIToken IDs",
-    "asset": "Asset",
-    "asset2": "Asset 2",
+    "asset": "Activo",
+    "asset2": "Activo 2",
     "amount2": "Amount 2",
     "bidMin": "Bid Min",
     "bidMax": "Bid Max",
-    "ePrice": "EPrice",
-    "lpTokenOut": "LP Token Out",
-    "lpTokenIn": "LP Token In",
-    "tradingFee": "Trading Fee",
-    "authAccounts": "Auth Accounts",
-    "genesisMint": "Genesis Mint",
-    "enableAmendment": "Enable Amendment",
+    "ePrice": "EPrecio",
+    "lpTokenOut": "LP Token Fuera",
+    "lpTokenIn": "LP Token Dentro",
+    "tradingFee": "Comisión Trading",
+    "fees": "Comisiones",
+    "txServiceFees": "Comisiones Ledger & Servicios",
+    "serviceFee": "Comisión Servicio",
+    "authAccounts": "Cuentas Auth",
+    "genesisMint": "Acuñación Genesis",
+    "enableAmendment": "Activar Enmienda",
     "cancelNFTOffer": "Cancelar oferta del NFT",
     "acceptNFTOffer": "Aceptar oferta del NFT",
     "setHooks": "Añadir Hooks",
@@ -552,10 +581,17 @@
     "invoke": "Invocar",
     "import": "Importar",
     "clawback": "Clawback",
-    "didSet": "DID Set",
-    "didDelete": "DID Delete",
-    "oracleSet": "Oracle Set",
-    "oracleDelete": "Oracle Delete",
+    "didSet": "Configurar DID",
+    "didDelete": "Borrar DID",
+    "credentialCreate": "Crear Credencia",
+    "credentialAccept": "Aceptar Credencial",
+    "credentialDelete": "Eliminar Credential",
+    "oracleSet": "Configurar Oráculo",
+    "oracleDelete": "Eliminar Oráculo",
+    "mpTokenIssuanceCreate": "Crear Emisión de MP Token",
+    "mpTokenIssuanceDestroy": "Destruir Emisión de MP Token",
+    "mpTokenIssuanceSet": "Configurar Emisión de MP Token",
+    "mpTokenAuthorize": "Autorizar MP Token",
     "canNotFetchTransactions": "¡No se pueden recuperar las transacciones de la cuenta!",
     "canNotFetchSignRequests": "¡No se puede captar solicitudes de firma de cuenta!",
     "unableToLoadTheTransaction": "¡No se puede cargar la transacción! Por favor, asegúrate de que estás conectado al Internet.",
@@ -565,7 +601,7 @@
     "openWithExplorer": "Abrir con %{explorer}",
     "openInExplorer": "Abrir en el explorador",
     "showMemo": "Mostrar nota",
-    "through": "Through",
+    "through": "a través de",
     "plannedOn": "Planeado en",
     "transactionId": "ID de la transacción",
     "ledgerIndex": "Índice de Registro",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "El pago tiene una etiqueta de destino: %{tag}.",
     "itWasInstructedToDeliver": "Se le ha indicado que entregue %{amount} %{currency}.",
     "bySpendingUpTo": "gastando hasta %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Se ha eliminado la cuenta %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Se le ha indicado que entregue el saldo restante de %{amount} %{currency} a %{destination}.",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "La transacción cancelará el cheque con el ID %{checkId}.",
     "itAuthorizesSendingPaymentsToThisAccount": "Autoriza a %{address} para que pueda enviar pagos a esta cuenta.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Retira la autorización a %{address} para poder enviar pagos a esta cuenta.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Has eliminado la línea de confianza (TrustLine) del activo %{currency} a %{issuer}.",
     "itEstablishesTrustLineTo": "Establece %{limit} como la cantidad máxima de %{currency} de %{issuer} que la cuenta %{address} está dispuesta a mantener.",
     "itRemovesTheAccountDomain": "Elimina el dominio de la cuenta",
@@ -664,48 +703,49 @@
     "thisTransactionDoesNotEffectAnyAccountSettings": "Esta transacción no afecta a ningún ajuste de cuenta.",
     "thisTransactionClearTicket": "Esta transacción borra (consume y borra) el ticket #%{ticketSequence}",
     "sellNFToken": "Vender token NFT",
-    "sellURIToken": "Sell URI token",
+    "sellURIToken": "Vender URI token",
     "nftOfferedToYou": "NFT ofrecido a ti",
     "uriTokenOfferedToYou": "URI Token offered to you",
     "buyNFToken": "Comprar token NFT",
     "offerOnYouNFT": "Oferta en tu NFT",
-    "offerOnYouURIToken": "Offer on your URI Token",
+    "offerOnYouURIToken": "Oferta en tu URI Token",
     "sellMyNFT": "Vender mi NFT",
-    "sellMyURIToken": "Sell my URI Token",
+    "sellMyURIToken": "Vender mi URI Token",
     "thisOfferCanOnlyBeAcceptedByThirdParty": "Esta oferta tiene un tercero (p.ej. un Broker) como destino. Solo esta cuenta puede aceptar la oferta.",
     "myBalanceAndReserve": "Mi balance y reserva",
-    "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
-    "fetchingTransactionFromNetwork": "Fetching transaction from network",
-    "unableToLoadExplainer": "Unable to load the explainer",
-    "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
-    "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
-    "invokeExplain": "The transaction will invoke hooks in account %{destination}",
-    "invokeInitiatorExplain": "The initiator of this transaction is %{address}",
-    "theTransactionHasADestination": "The transaction Destination address is: %{destination}",
-    "theURIForThisTokenIs": "The URI for this token is %{uri}",
-    "theTokenHasADigest": "The token has a digest: %{digest}",
-    "uriTokenMintAmount": "The minter of this token has set the initial selling price to %{value} %{currency}.",
-    "uriTokenDestinationExplain": "This token can only be purchased by %{address}",
-    "uriTokenSellOfferExplain": "%{address} offered to sell URI token with ID %{uriToken} in order to receive %{value} %{currency}",
-    "thisURITokenOfferMayOnlyBeAcceptedBy": "This offer may only be accepted by %{address}",
-    "theTransactionWillCancelURITokenOffer": "The transaction will cancel %{address}'s sell offer for URI token with ID %{tokenId}",
-    "importTransactionExplain": "This is an Import transaction",
-    "theIssuerIs": "The issuer address set to %{issuer}",
-    "claimRewardExplain": "This is a claim reward transaction",
-    "claimRewardExplainOptIn": "This transaction opts in %{address} to claim rewards in future",
-    "claimRewardExplainOptOut": "This transaction opts out %{address} to claim rewards in future"
+    "transactionDetailsDifferentNetworkError": "Esta transacción no es válida en la red a la que estás conectado.\n\nPor favor, cambia a la red %{network} y prueba otra vez.",
+    "fetchingTransactionFromNetwork": "Obteniendo transacción de la red",
+    "fetchingTransactionsFromNetwork": "Obteniendo transacciones de la red...",
+    "unableToLoadExplainer": "No es posible cargar la explicación",
+    "uriTokenBurnExplain": "La transacción quemará el token URI con ID %{tokenID}",
+    "uriTokenBuyExplain": "%{address} pagó %{amount} %{currency} para poder recibir el token URI con ID %{tokenID}",
+    "invokeExplain": "La transacción invocará hooks en la cuenta %{destination}",
+    "invokeInitiatorExplain": "El iniciador de esta transacción es %{address}",
+    "theTransactionHasADestination": "La transacción de dirección de Destino es: %{destination}",
+    "theURIForThisTokenIs": "El URI para este token es %{uri}",
+    "theTokenHasADigest": "El token tiene un digest: %{digest}",
+    "uriTokenMintAmount": "El emisor de este token ha configurado un precio de venta inicial de %{value} %{currency}.",
+    "uriTokenDestinationExplain": "Este token puede solo ser comprado por %{address}",
+    "uriTokenSellOfferExplain": "%{address} ofreció vender el token URI con ID %{uriToken} para pode recibir %{value} %{currency}",
+    "thisURITokenOfferMayOnlyBeAcceptedBy": "Esta oferta solo puede ser aceptada por %{address}",
+    "theTransactionWillCancelURITokenOffer": "La transacción cancelará la oferta de venta de %{address} del token URI con ID %{tokenId}",
+    "importTransactionExplain": "Esto es una transacción Importar",
+    "theIssuerIs": "La dirección de emisión configurada a %{issuer}",
+    "claimRewardExplain": "Esto es una transacción de reclamo de recompensa",
+    "claimRewardExplainOptIn": "Esta transacción incluye a %{address} a reclamar recompensas en el futuro",
+    "claimRewardExplainOptOut": "Esta transacción excluye a %{address} a reclamar recompensas en el futuro"
   },
   "xapp": {
     "popular": "Popular",
-    "recent": "Recent",
+    "recent": "Reciente",
     "ADashZ": "A-Z",
-    "categories": "Categories",
-    "openXapp": "Open",
-    "aboutXapp": "About",
+    "categories": "Categorías",
+    "openXapp": "Abrir",
+    "aboutXapp": "Sobre",
     "recentlyUsed": "Recientemente usado",
     "ourSuggestions": "Nuestras sugerencias",
     "all": "Todo",
-    "seeAll": "See all",
+    "seeAll": "Ver todo",
     "theXAppLoaderHasNotBeenResolved": "El cargador xApp no se ha resuelto todavía",
     "theXAppHasNotBeenFullyLoaded": "La xApp no se ha cargado completamente (todavía). Si tienes problemas al utilizar esta xApp, por favor, contacta con el desarrollador de la xApp",
     "forceShowXApp": "Forzar mostrar xApp",
@@ -718,10 +758,10 @@
     "donateToTheCreator": "Donar al creador",
     "chooseAmount": "Elegir cantidad",
     "aboutThisXApp": "Sobre esta xApp",
-    "xAppSupportNetworkError": "This xApp is not available on the network you are connected with",
-    "switchToSupportedNetworks": "Please switch to one of the supported networks below",
-    "xAppDoesNotHavePermissionToRunThisCommand": "This xApp does not have permission to run '%{command}' command. If you believe you need this permission, please contact support.",
-    "appReadyToAcceptCommands": "The xApp must be in a ready state to be able to accept commands."
+    "xAppSupportNetworkError": "Esta xApp no está disponible en la red en la que estás conectado",
+    "switchToSupportedNetworks": "Por favor cambia a una de las redes soportadas abajo",
+    "xAppDoesNotHavePermissionToRunThisCommand": "Esta xApp no tiene permiso para ejecutar el comando '%{command}'. Si crees que necesitas este permiso, por favor contacta con Soporte.",
+    "appReadyToAcceptCommands": "La xApp debe estar en modo preparado para poder aceptar comandos."
   },
   "settings": {
     "generalSettings": "General",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Introduce nombre o dirección",
     "enterCurrencyCodeOrName": "Ingresa el nombre o el código de la divisa",
     "enterName": "Por favor, introduce un nombre ",
+    "themeAutoSwitch": "Automáticamente cambia el modo día/noche",
+    "notChangingYetBecauseLightMode": "Tu dispositivo está actualmente en modo día, y cambia automáticamente. El tema de modo oscuro seleccionado se activará cuando el dispositivo esté en modo oscuro.",
     "contactAlreadyExist": "El contacto ya existe",
     "contactSuccessSaved": "Contacto añadido correctamente",
     "contactSuccessUpdated": "Contacto actualizado con éxito",
@@ -748,7 +790,7 @@
     "termsAndConditions": "Términos y Condiciones",
     "credits": "Créditos",
     "nodeChangeWarning": "Estás cambiando de %{from} a %{to} . ¡Es posible que no puedas usar tu cuenta o ver el historial de tu cuenta!",
-    "networkChangeAccountDetailsWarning": "Note: by switching from %{from} to %{to}. You may be unable to use your account or view your account history!",
+    "networkChangeAccountDetailsWarning": "Nota: cambiando de %{from} a %{to}. ¡Es posible que no puedas utilizar tu cuenta ni consultar tu historial!",
     "nodeList": "Lista de Nodos",
     "addNode": "Añadir Nodo",
     "enterURL": "Por favor, introduce una URL",
@@ -759,8 +801,10 @@
     "changePasscode": "Cambiar contraseña",
     "biometricAuthentication": "Autenticación biométrica",
     "hapticFeedback": "Feedback háptico",
+    "hideAdvisoryTransactions": "Ocultar transacciones spam/scam",
+    "hideServiceFeeTransactions": "Ocultar eventos de Comisiones de Servicio",
     "developerMode": "Modo Programador",
-    "developerSettings": "Developer settings",
+    "developerSettings": "Ajustes de Desarrollador",
     "useSystemSeparators": "Formato de moneda del sistema",
     "showReserveValue": "Mostrar el valor de la reserva en la pantalla de inicio",
     "enterOldPasscode": "Ingresa tu contraseña anterior",
@@ -776,7 +820,7 @@
     "biometricUnavailableDescription": "La seguridad biométrica no está disponible en tu dispositivo porque tu dispositivo no ofrece el nivel requerido de seguridad biométrica necesario",
     "viewChangeLog": "Ver registro de cambios",
     "hideBalanceByDefault": "Ocultar saldo por defecto",
-    "hideBalance": "Hide balance",
+    "hideBalance": "Ocultar balance",
     "blockTakingScreenshots": "Bloquear las capturas de pantalla",
     "unableToLoadListOfCurrencies": "No se puede cargar la lista de divisas.",
     "pushNotifications": "Notificaciones push",
@@ -803,34 +847,34 @@
     "noAuthorizedThirdPartyApp": "¡App de terceros no autorizada!",
     "onceYouAuthorizedAppYouWillSeeItHere": "Una vez autorices el acceso a una app de terceros, las verás aquí.",
     "networkList": "Lista de redes",
-    "addedNetwork": "Added network",
-    "removeNetwork": "Removed network",
-    "addedNode": "Added node",
-    "removedNode": "Removed node",
-    "changedProperty": "Property changed",
+    "addedNetwork": "Red añadida",
+    "removeNetwork": "Red eliminada",
+    "addedNode": "Añadido nodo",
+    "removedNode": "Eliminado nodo",
+    "changedProperty": "Propiedad cambiada",
     "unableToDeleteNodeWhenConnectedToNetwork": "No es posible eliminar el nodo mientras estas conectado a esta red, por favor, ¡cambia de red y prueba otra vez!",
-    "developerModeEnabledWarning": "Enabling Developer Mode may reduce certain security functions. Proceed with utmost caution, and only enable it if you comprehend the potential consequences.",
-    "disablingDeveloperMode": "Disabling Developer Mode",
-    "disableDeveloperModeRevertNetworkWarning": "Please note that this action will revert your selected network from '%{currentNetwork}' to the '%{defaultNetwork}'. Are you sure you want to proceed?",
-    "blockingTakingScreenShotsIsDisabled": "Developer mode is active, Screenshot capture protection is temporarily disabled.",
-    "syncRailsRemoveNetworkWarning": "Applying this sync will disconnect you from the current network (%{currentNetwork}). Please switch to a different network and try again.",
-    "syncRailsRemoveNodeWarning": "By applying this sync, the current node (%{connectedNode}) to which you are currently connected will be removed. Please select a new default node for this network and try again.",
-    "deletingNodeWillRemoveTheNetwork": "This is the sole node for this network. Removing this node will also delete the network. Do you wish to proceed?",
-    "networkRailsSyncCompleted": "Network Rails syncing has been successfully completed.",
-    "networkRailsAreAlreadyUpdateToDate": "Network rails are already up to date",
-    "networkRailsSuccessfullyUpdated": "Network rails have been successfully updated",
-    "networkSettings": "Network settings",
-    "changeDefaultNodeInfo": "Tap on any node in the list to set it as your preferred default node for the network.",
-    "networkHaveOnlyOneNodeAsDefault": "This network has only one node, which is already set as the default.",
-    "networkUpdates": "Network updates",
-    "everythingIsUpdateToDate": "Everything is up-to-date",
-    "networkAreUpdateToDate": "There are no added or changes for network settings at the moment.",
+    "developerModeEnabledWarning": "Activar el Modo Desarrollador puede reducir ciertas funciones de seguridad. Procede con la máxima precaución y habilítalo solo si comprendes las posibles consecuencias.",
+    "disablingDeveloperMode": "Desactivar Modo Desarrollador",
+    "disableDeveloperModeRevertNetworkWarning": "Ten en cuenta que esta acción revertirá la red seleccionada de '%{currentNetwork}' a '%{defaultNetwork}'. ¿Estás seguro de que deseas continuar?",
+    "blockingTakingScreenShotsIsDisabled": "El Modo Desarrollador está activado, la protección de captura de pantalla está desactivada temporalmente.",
+    "syncRailsRemoveNetworkWarning": "La aplicación de esta sincronización te desconectará de la red actual (%{currentNetwork}). Por favor, cambia a otra red e inténtelo de nuevo.",
+    "syncRailsRemoveNodeWarning": "Al aplicar esta sincronización, se eliminará el nodo actual (%{connectedNode}) al que está conectado actualmente. Por favor, selecciona un nuevo nodo predeterminado para esta red e inténtalo de nuevo.",
+    "deletingNodeWillRemoveTheNetwork": "Es el único nodo de la red. Al eliminar este nodo también se eliminará la red. ¿Deseas continuar?",
+    "networkRailsSyncCompleted": "La sincronización de los railes de red se ha completado con éxito.",
+    "networkRailsAreAlreadyUpdateToDate": "Los railes de red están ya actualizados",
+    "networkRailsSuccessfullyUpdated": "Los railes de red se han actualizado satisfactoriamente",
+    "networkSettings": "Ajustes de red",
+    "changeDefaultNodeInfo": "Pulsa sobre cualquier nodo de la lista para establecerlo como nodo predeterminado preferido para la red.",
+    "networkHaveOnlyOneNodeAsDefault": "Esta red solo tiene un nodo, el cual está como predeterminado.",
+    "networkUpdates": "Actualizaciones de red",
+    "everythingIsUpdateToDate": "Todo está actualizado",
+    "networkAreUpdateToDate": "No hay añadidos o cambios para los ajustes de red en este momento.",
     "experimental": "Experimental",
-    "experimentalSimplicityUi": "Simplicity UI",
+    "experimentalSimplicityUi": "Simplicidad de UI",
     "cache": "Cache",
-    "clearResolverCache": "Clear resolver cache",
-    "cacheClearedSuccessfully": "Cache Cleared Successfully",
-    "restartRequired": "A restart is required for these changes to take effect"
+    "clearResolverCache": "Borrar caché de resolución",
+    "cacheClearedSuccessfully": "Cache limpiada satisfactoriamente",
+    "restartRequired": "Un reinicio es necesario para que los cambios tengan efecto"
   },
   "account": {
     "addAccount": "Agregar una cuenta",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "¿Estás seguro de que quieres volver atrás? ¡Por tu seguridad, deberás volver a rellenar todas las entradas!",
     "accountType": "Tipo de cuenta",
     "secretType": "Tipo de clave secreta ",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Por favor, selecciona tu tipo de cuenta",
     "pleaseSelectAccountSecretType": "Por favor, selecciona el tipo de clave secreta de tu cuenta ",
     "fullAccess": "Acceso completo",
@@ -948,10 +993,10 @@
     "accountTrustLines": "TrustLines de la cuenta",
     "youDoNotHaveAnyTrustLine": "No tienes líneas de confianza (TrustLines)",
     "yourAccountIsNotActivated": "¡Su cuenta no ha sido activada!",
-    "activateRegularKeyAccountWarning": "If you want to use this account as Regular key only, you DO NOT have to activate the account.\n\nHowever, if you want to use this account also to transact, you can activate this account.",
+    "activateRegularKeyAccountWarning": "Si deseas utilizar esta cuenta únicamente como clave normal, NO tiene que activar la cuenta.\nSin embargo, si deseas utilizar esta cuenta también para realizar transacciones, puedes activarla.",
     "selectedAccountIsNotActivatedPleaseChooseAnotherOne": "¡La cuenta seleccionada aún no ha sido activada. Para firmar esta transacción necesitas seleccionar una cuenta que ya se encuentre activada!",
     "accountAlreadyExist": "¡La cuenta ya existe!",
-    "importingSecretAccountExist": "The account secret that you have entered belongs to this r-address and has already been imported into Xaman as a full access account.\n\n%{address}",
+    "importingSecretAccountExist": "El secreto de cuenta que ha introducido pertenece a esta dr-address y ya se ha importado a Xaman como cuenta de acceso total.\n\n%{address}",
     "upgradeAccountSecretIsNotMatch": "El secreto ingresado pertenece a otra dirección 'r-'. Si deseas importar una clave regular, por favor [Importar cuenta nueva], de lo contrario por favor [Cancelar] y comprueba el secreto ingresado. ",
     "toTheseExistingAccounts": "A esta(s) cuenta(s) existente(s)",
     "masterKeyForThisAccountDisableRegularKeyNotFound": "¡La clave maestra para esta cuenta está desactivada y la cuenta de clave normal no se encuentra en la lista de cuentas!",
@@ -974,7 +1019,7 @@
     "walletReserve": "Reserva de la cartera ",
     "accountBalance": "Saldo de la cuenta",
     "availableForSpending": "Disponible para gastar",
-    "readOnlyAccountSpendableBalanceWarning": "Please note: The access level for this account is Read-Only. There is currently no way to sign transactions that can affect the account state in any form.",
+    "readOnlyAccountSpendableBalanceWarning": "Nota: El nivel de acceso para esta cuenta es de sólo lectura. Actualmente no hay forma de firmar transacciones que puedan afectar de alguna forma al estado de la cuenta.",
     "deleteAccountWarning": "Esta es una transacción de eliminación de cuenta. Al firmar, tu cuenta se eliminará y todos tus fondos restantes (excepto los últimos %{ownerReserve} XRP reservados, ya que la tarifa del XRPL por eliminar una cuenta es de %{ownerReserve} XRP) se enviarán a la cuenta de destino que has configurado. Verifica el destino dos veces y SÓLO continúa si REALMENTE deseas eliminar tu cuenta del XRPL.",
     "deleteAccountObjectsExistError": "No puedes eliminar esta cuenta, ya que contiene objetos específicos del XRPL como: Otros activos, Ofertas de Exchange descentralizado y Escrows (como creador o beneficiario).",
     "deleteAccountSequenceIsNotEnoughError": "Esta cuenta todavía no se puede eliminar. Se necesitan cerrar %{remainingSequence} registros más para poder eliminar la cuenta.",
@@ -1013,25 +1058,26 @@
     "signatureVerificationExplain": "Para verificar que sus tarjetas Tangem están funcionando correctamente y son capaces de firmar transacciones, realizaremos una rutina de firma para verificar las firmas de transacciones generadas por su tarjeta.",
     "yourXRPLedgerAccountWillNotBeTouched": "Su cuenta y fondos de XRP Ledger no serán tocados.",
     "unableToVerifyTheSignature": "No se puede verificar la firma.",
-    "newEncryptionMethodAvailable": "New encryption method available!",
-    "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
-    "updateEncryption": "Update encryption",
-    "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
-    "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
-    "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
+    "newEncryptionMethodAvailable": "¡Nuevo método de encriptación disponible!",
+    "checkWhichAccountsNeedBetterEncryption": "Comprueba qué cuentas necesitan un mejor cifrado",
+    "updateEncryption": "Actualizar encriptación",
+    "whyUseThisNewEncryptionMethod": "¿Por qué utilizar el nuevo método de encriptación?",
+    "newEncryptionExplain": "Nuestra encriptación y seguridad se ha mejorado con los nuevos estándares AES256 GCM. Deberías encriptar tu cuenta con este nuevo método para estar más seguro. Aunque ya estás seguro, no está de más que te actualices a los nuevos estándares.",
+    "doNotTurnOffYourPhoneOrQuiteWhileMigration": "No apagues el teléfono ni salgas de la aplicación mientras realizas el cifrado.",
+    "unableToFetchAccountNFTokens": "No se pueden recuperar los NFT de la cuenta. Asegúrate de que estás conectado al nodo XRP Ledger."
   },
   "send": {
     "amountIsBiggerThanYourSpend": "La cantidad es mayor de lo que puede gastar (%{spendable})",
     "theMaxAmountYouCanSendIs": "La cantidad máxima que puedes enviar es %{spendable} %{currency}",
     "theMaxAmountYouCanSendWithFee": "El emisor de %{currency} cobra una tarifa de transferencia. La cantidad máxima que puede enviar (respetando la tarifa de transferencia) es %{spendable} %{currency}",
     "insufficientBalanceSpendableBalance": "Saldo insuficiente. El saldo gastable es %{spendable} %{currency}",
-    "trustLineIsFrozenByIssuer": "Your Trust Line for the requested asset (%{currency}) has been frozen by the issuer. Please contact the issuer of the asset.",
+    "trustLineIsFrozenByIssuer": "Tu Trust Line para el activo solicitado (%{currency}) ha sido congelado por el emisor. Por favor contacta con el emisor del activo.",
     "balanceIsNotEnoughForFee": "El saldo no es suficiente para cubrir la comisión (%{fee})",
     "searchResults": "Resultados de la búsqueda",
     "noSearchResult": "Sin resultados de búsqueda",
     "noContact": "Sin contactos",
     "myAccount": "Mi cuenta",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "¡La dirección de origen y de destino no puede ser la misma!",
     "enterANameOrAddress": "Introduzca un nombre o dirección",
     "transferredSuccessfully": "Tu transacción se ha registrado con éxito en el %{network}.",
@@ -1048,7 +1094,7 @@
     "sendingFailed": "¡Envío fallido!",
     "verificationFailed": "La verificación falló.",
     "couldNotVerifyTransaction": "No se ha podido verificar la finalidad de transacción",
-    "verificationFailedDescription": "Su transacción se ha firmado y enviado satisfactoriamente, sin embargo, no se ha podido confirmar la finalidad de la transacción.\r\n\r\nEsto puede ser causado por un contratiempo de conexión a Internet o un aumento de la carga en el nodo del libro mayor XRP al que está conectado.\r\n\r\nVerifique manualmente si esta transacción se muestra en el historial de transacciones (Sucesos).",
+    "verificationFailedDescription": "Tu transacción se ha firmado y enviado satisfactoriamente, sin embargo, no se ha podido confirmar la finalidad de la transacción.\r\n\r\nEsto puede ser causado por un contratiempo de conexión a Internet o un aumento de la carga en el nodo del XRP Ledger al que está conectado.\r\n\r\nVerifique manualmente si esta transacción se muestra en el historial de transacciones (Sucesos).",
     "submitFailed": "¡Envío fallido!",
     "somethingWentWrong": "¡Algo ha ido mal!",
     "resultCopiedToClipboard": "Resultado copiado al portapapeles",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "No se puede establecer la tasa de transacción, inténtelo de nuevo.",
     "theDestinationAccountIsSetAsBlackHole": "¡ADVERTENCIA: La cuenta de destino se establece como agujero negro. Enviando XRP a esta cuenta resultará en el perdido de sus fondos!",
     "noDestinationTag": "Sin etiqueta de destino (Destination Tag)",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Esta dirección requiere una etiqueta de destino.",
     "pleaseEnterAmount": "Por favor, ingresa el monto para esta transacción.",
     "trustLineLimitExceeded": "Se supera el límite de TrustLine, ahora:%{balance} , max:%{peer_limit} , disponible para emitir:%{available} . El destinatario puede actualizar el límite de Trustline.",
@@ -1104,10 +1151,10 @@
     "moreInfoAndFix": "Más información y arreglo",
     "addingTrustLineWarning": "XRPL Labs/Xaman no respalda ningún token o emisor de tokens. Sólo debe continuar si confía en el emisor del token.\r\nEn caso de preguntas o problemas relacionados con el token (línea de confianza), deberá ponerse en contacto con el emisor de token.\r\n\r\nContinúe bajo su propio riesgo.",
     "trustLineIsAlreadyExist": "Este token ya existe. No puede volver a añadir el mismo token.",
-    "issuerAddressCopiedToClipboard": "Issuer address copied to the clipboard",
-    "unableToLoadListOfTokens": "Unable to load the list of tokens!",
-    "selectCurrency": "Please select a token first",
-    "copyIssuerAddressWarning": "%{issuerAddress}\n\nYou are about to copy the Issuer Address. Please note that sending assets to the issuer address will PERMANENTLY BURN THE TOKENS. The Issuer Address for an asset should only be used to verify the legitimacy of the asset. "
+    "issuerAddressCopiedToClipboard": "Dirección del Emisor copiada en el portapapeles",
+    "unableToLoadListOfTokens": "¡No ha sido posible cargar la lista de tokens!",
+    "selectCurrency": "Por favor, elige un token primero",
+    "copyIssuerAddressWarning": "%{issuerAddress}\n\nEsetás a punto de copiar la dirección del Emisor. Por favor ten en cuenta que el envio de activos a la dirección del emisor QUEMARÁ PERMANENTEMENTE LOS TOKENS. La Dirección del Emisor para este activo solo se debería utilizar para verificar la legitimidad del activo. "
   },
   "exchange": {
     "exchanging": "Cambiando",
@@ -1173,61 +1220,62 @@
     "nonExpiredCheckCanOnlyCancelByCreatedAccount": "Un cheque (no vencido) sólo puede ser cancelado por la cuenta que lo creó o la cuenta de destino.",
     "accountDeleteExchangeSupportWarning": "Nota: al eliminar tu cuenta en el XRP Ledger y enviar el saldo restante a un intercambio, asegúrate de que el intercambio de destino da soporte a los depósitos que se efectuan mediante las transacción 'AccountDelete'. No todos los intercambios lo hacen, lo cual puede resultar en la necesidad de contactar al equipo de soporte del intercambio para completar el depósito de los fondos a tu cuenta.",
     "notVettedTokenTradeWarning": "¡Intercambia a su propio riesgo! El token que está a punto de intercambiar ** no ha sido vetada * *.\r\n\r\nCualquier persona puede crear un token, incluyendo la creación de versiones falsas de tokens existentes que dicen que representen proyectos. Si usted intercambia con este token, es posible que no pueda venderlo de vuelta. ¡Usted está potencialmente poniendo sus activos/ahorros en riesgo!",
-    "forcedSignersAccountsDoesNotExist": "This request can only be signed by \n\n%{accounts}\n\nThis accounts are not present with signing access.",
-    "tradeEntireTokenWorthWarning": "Warning: the amount of %{currency} is equal to or higher than your %{currency} balance of this asset. If this offer is executed, you will fully liquidate your %{currency} position.",
-    "paymentToDisallowedNativeAssetWarning": "The destination account configured their account to disallow incoming %{nativeAsset} (non-token) payments. If you proceed, you will most likely need support from the destination account owner.",
-    "paymentToBlackHoledAccountWarning": "The destination account is 'black holed', meaning all funds sent to the destination account will be inaccessible & unrecoverable. Are you sure you want to continue sending your funds to this destination account?",
+    "forcedSignersAccountsDoesNotExist": "Esta solicitud solo puede ser firmada por \n\n%{accounts}\n\nEstas cuentas no tienen acceso de firma.",
+    "tradeEntireTokenWorthWarning": "Atención: la cantidad de %{currency} es igual o superior a tu saldo de %{currency} de este activo. Si se ejecuta esta oferta, liquidarás totalmente tu posición de %{currency}.",
+    "paymentToDisallowedNativeAssetWarning": "La cuenta de destino configuró su cuenta para no permitir pagos entrantes %{nativeAsset} (no tokens). Si sigues adelante, lo más probable es que necesites ayuda del propietario de la cuenta de destino.",
+    "paymentToBlackHoledAccountWarning": "La cuenta de destino está «blackholed», lo que significa que todos los fondos enviados a la cuenta de destino serán inaccesibles e irrecuperables. ¿Estás seguro de que deseas seguir enviando fondos a esta cuenta de destino?",
     "findingPaymentOptions": "Finding payment options",
     "paymentOptionsExpired": "Payment options expired",
-    "findNewPaymentOptions": "Find new payment options",
-    "noPaymentOptionsFound": "No payment options found",
-    "unableToFindTheOfferObject": "Unable to find the offer object!",
-    "theIssuerCanBurnThisToken": "Note: The issuer can burn this token.",
-    "payloadForceNetworkError": "This payload is not available on the network you are connected with",
-    "pleaseSwitchToNetworkAndTryAgain": "Please switch to %{network} and try again",
-    "blobCopiedToClipboard": "Blob copied to clipboard",
-    "dataCopiedToClipboard": "Data copied to clipboard",
-    "didDocumentCopiedToClipboard": "DID Document copied to clipboard",
+    "findNewPaymentOptions": "Encontrar nuevas opciones de pago",
+    "noPaymentOptionsFound": "Opciones de pago no encontradas",
+    "unableToFindTheOfferObject": "¡No es posible encontrar la oferta del objeto!",
+    "theIssuerCanBurnThisToken": "Nota: El emisor puede eliminar este token.",
+    "payloadForceNetworkError": "Este payload no está disponible en la red a la que estás conectado.",
+    "pleaseSwitchToNetworkAndTryAgain": "Por favor, cambia a %{network} y vuelve a probar",
+    "blobCopiedToClipboard": "Blob copiado en el portapapeles",
+    "dataCopiedToClipboard": "Datos copiados en el portapapeles",
+    "didDocumentCopiedToClipboard": "Documento DID copiado en el portapapeles",
     "oracleDocumentIdCopiedToClipboard": "Oracle Document Id copied to clipboard",
-    "uriCopiedToClipboard": "URI copied to clipboard",
-    "transactionJsonCopiedToClipboard": "Transaction json copied to clipboard",
-    "didDeleteWarning": "Warning: You are about to delete the Decentralized Identifier (DID) tied to the selected account. Keep in mind, this action cannot be undone.",
-    "oracleDeleteWarning": "Warning: You are about to delete the oracle record identified by the above Oracle Document ID. Keep in mind, this action cannot be undone."
+    "uriCopiedToClipboard": "URI copiado en el portapapeles",
+    "transactionJsonCopiedToClipboard": "Json de la transacción copiado en el portapapeles",
+    "didDeleteWarning": "Advertencia: Estás a punto de eliminar el Identificador Descentralizado (DID) vinculado a la cuenta seleccionada. Ten en cuenta que esta acción no se puede deshacer. Estás a punto de eliminar el Identificador Descentralizado (DID) vinculado a la cuenta seleccionada.",
+    "oracleDeleteWarning": "Advertencia: Estás a punto de eliminar el registro Oráculo identificado por el ID de documento oráculo anterior. Ten en cuenta que esta acción no se puede deshacer."
   },
   "monetization": {
-    "oneTimeCharge": "One-time charge - not automatically renewing",
-    "payWithApplePay": "Pay with Apple Pay",
-    "payWithGooglePay": "Pay with Google Pay",
-    "payNow": "Pay now",
-    "restorePurchase": "Restore Purchase",
-    "thankYouForUsingXaman": "Thank you for using Xaman!",
-    "comingPaymentWarning": "You're still enjoying Xaman for free, but you're nearing our free limit. To support Xaman's innovation and security, a small in-app payment may be requested soon.",
-    "paymentRequiredMessage": "A small payment is required to maintain unlimited access for the next 30 days. Alternatively, Xaman will switch to limited-use mode until your monthly limits reset automatically.",
-    "prePurchaseMessage": "You're currently unable to open xApps and sign requests. A small payment is required to unlock 30 days of unrestricted access to Xaman.",
-    "learnMore": "Learn more",
-    "monetizationRequiredForThisFeature": "You currently can’t open Sign Requests & xApps: a small payment is required to unlock a 30 days of unrestricted use of Xaman. Developing Xaman, building secure software takes a lot of resources. We hope you will support us continuing to build. If you decide not to: every month your limits will reset, allowing you to open xApps & Sign Requests again.",
-    "allSet": "All set!",
-    "thankYouForPurchase": "Thank you for your purchase.",
-    "noPurchaseFound": "No Purchases Found",
-    "noPreviousPurchases": "We couldn't find any previous purchases to restore. If you believe this is an error, please contact our support team.",
-    "errorRestorePurchase": "An unexpected error occurred while checking your purchase history.\n\nPlease try again later or contact our support team if the issue persists.",
-    "couldNotFetchProductDetails": "Error fetching product details. Please try again later or contact support if the issue persists.",
-    "purchaseFailed": "Purchase failed!",
-    "termsAndConditions": "Terms and conditions",
-    "privacyPolicy": "Privacy policy",
-    "benefitsTextOne": "Sign payloads",
-    "benefitsTextTwo": "xApp access",
-    "benefitsTextThree": "Premium support",
-    "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "oneTimeCharge": "Cargo único - sin renovación automática",
+    "payWithApplePay": "Pagar con Apple Pay",
+    "payWithGooglePay": "Pagar con Google Pay",
+    "payNow": "Pagar ahora",
+    "restorePurchase": "Recuperar compra",
+    "thankYouForUsingXaman": "¡Gracias por usar Xaman!",
+    "comingPaymentWarning": "Sigues disfrutando de Xaman gratis, pero te estás acercando a nuestro límite de acceso gratuito. Para apoyar la innovación y la seguridad de Xaman, es posible que pronto te solicitemos un pequeño pago dentro de la aplicación.",
+    "paymentRequiredMessage": "Se requiere un pequeño pago para mantener el acceso ilimitado durante los próximos 30 días. Alternativamente, Xaman cambiará al modo de uso limitado hasta que tus límites mensuales se restablezcan automáticamente.",
+    "prePurchaseMessage": "YActualmente no puedes abrir xApps ni firmar solicitudes. Se requiere un pequeño pago para desbloquear 30 días de acceso sin restricciones a Xaman.",
+    "learnMore": "Aprende más",
+    "monetizationRequiredForThisFeature": "Actualmente no puedes abrir Firmar Peticiones & xApps: se requiere un pequeño pago para desbloquear 30 días de uso sin restricciones de Xaman. Desarrollar Xaman, construir software seguro requiere muchos recursos. Esperamos que nos apoyes para seguir construyendo. Si decides no hacerlo: cada mes tus límites se restablecerán, lo que te permitirá abrir xApps & Firmas Peticiones de nuevo.",
+    "allSet": "¡Todo listo!",
+    "thankYouForPurchase": "Gracias por tu compra.",
+    "noPurchaseFound": "Compras no encontradas",
+    "noPreviousPurchases": "No hemos podido encontrar ninguna compra anterior para restaurar. Si crees que se trata de un error, ponte en contacto con nuestro equipo de soporte.",
+    "errorRestorePurchase": "Se ha producido un error inesperado al comprobar tu historial de compras. Vuelve a intentarlo más tarde o ponte en contacto con nuestro equipo de soporte si el problema persiste.",
+    "couldNotFetchProductDetails": "Error al obtener los detalles del producto. Vuelve a intentarlo más tarde o ponte en contacto con el servicio de asistencia si el problema persiste.",
+    "purchaseFailed": "¡Compra fallida!",
+    "termsAndConditions": "Términos y condiciones",
+    "privacyPolicy": "Política de privacidad",
+    "benefitsTextOne": "Firma payloads",
+    "benefitsTextTwo": "Acceso xApp",
+    "benefitsTextThree": "Soporte Premium",
+    "unlockFullFunctionality": "Desbloquea todas las funcionalidades con un pequeño pago.",
+    "prePurchaseTipIos": "Ten en cuenta que se trata de una compra de 30 días. Asegúrate de haber iniciado sesión con tu ID de Apple y de que tus datos de pago estén actualizados. En caso de problemas, utiliza el botón «Restaurar compra».",
+    "prePurchaseTipAndroid": "Ten en cuenta que se trata de una compra de 30 días. Asegúrate de haber iniciado sesión en tu cuenta de Google y de que tus datos de pago estén actualizados. En caso de problemas, utiliza el botón «Restaurar compra»."
   },
   "errors": {
-    "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
-    "unableToLoadCredits": "Oops! Unable to Retrieve Credits",
-    "unableToLoadChangeLogs": "Oops! Unable to Retrieve Change Logs",
-    "tecPATH_DRY": "The transaction didn't work because funds couldn't be moved between the two accounts, or could not be moved at the requested exchange rate.\n\nThis might be because the two accounts involved don't have a connection (TrustLine) that allows them to exchange money with each other, or the transaction didn't work because there wasn't enough money available to move between the two accounts.",
-    "tecPATH_PARTIAL": "The transaction didn't go through because there weren't enough tokens available to send the complete amount at the requested exchange rate between the two accounts.",
-    "tecHOOK_REJECTED": "Rejected by hook on sending or receiving account.\n\n%{hookReturnString}"
+    "unableToLoadTermOfService": "¡Ups! No se pueden recuperar las condiciones de servicio",
+    "unableToLoadCredits": "¡Ups! No se pueden recuperar los créditos",
+    "unableToLoadChangeLogs": "¡Ups! No se pueden recuperar los logs de cambios",
+    "tecPATH_DRY": "La transacción no funcionó porque no se pudieron mover los fondos entre las dos cuentas, o no se pudieron mover al tipo de cambio solicitado.\n\nEsto se puede deber a que las dos cuentas implicadas no tienen conexión (Trustline) que permite intercambiar dinero entre sí, o la transación no funcionó porque no había suficiente dinero disponible para mover entre las dos cuentas.",
+    "tecPATH_PARTIAL": "La transacción no se realizó porque no había suficientes tokens disponibles para enviar la cantidad completa al tipo de cambio solicitado entre las dos cuentas.",
+    "tecHOOK_REJECTED": "Rechazado por hook en cuenta emisora o receptora.\n\n%{hookReturnString}"
   },
   "moment": {
     "calendar": {
diff --git a/src/locale/translations/et.json b/src/locale/translations/et.json
index c39005125..63c709336 100644
--- a/src/locale/translations/et.json
+++ b/src/locale/translations/et.json
@@ -14,6 +14,8 @@
     "discard": "Tühista",
     "remove": "Eemalda",
     "go": "Mine",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Sulge",
     "save": "Salvesta",
     "confirm": "Kinnita",
@@ -21,6 +23,7 @@
     "balance": "Kontoseis",
     "spendable": "Vaba jääk",
     "home": "Avaleht",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Sündmused",
     "profile": "Profiil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Seadistused",
     "search": "Otsing",
     "send": "Saada",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Saatmiseks lohista ekraani",
     "done": "Tehtud",
     "previous": "Eelmine",
@@ -38,6 +43,7 @@
     "exchanges": "Börsid",
     "scan": "Skaneeri",
     "request": "Taotlus",
+    "receiveOnAccount": "Receive on account",
     "details": "Detailid",
     "recipient": "Saaja",
     "destination": "Sihtkoht",
@@ -48,6 +54,11 @@
     "continue": "Jätka",
     "code": "Kood",
     "copy": "Kopeeri",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Valitud",
     "share": "Jaga",
@@ -119,6 +130,7 @@
     "day": "päev",
     "days": "days",
     "week": "Nädal",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automaatne lukustus",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Tugev",
     "veryStrong": "Väga tugev",
     "subject": "Teema",
+    "credentialType": "Credential Type",
     "empty": "Tühi",
     "update": "Uuenda",
     "notNow": "Mitte Praegu",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wants to open this URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Turvalisus ennekõike",
     "slideThree_desc": "Xumm rakendus ja platvorm on ehitatud tagades turvaline kasutamine. Ärge sisestage oma salasõna uuesti, allkirjastage tehingud oma usaldusväärse seadmega.",
     "slideFour_title": "Saada ja võta vastu",
-    "slideFour_desc": "Võite saata ja vastu võtta XRP-d ja muid usaldusväärseid varasid (IOU)"
+    "slideFour_desc": "Võite saata ja vastu võtta XRP-d ja muid usaldusväärseid varasid (IOU)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Loo pääsukood",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Ei saa hankida konto tehingute infot!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Tehingu laadimine nurjus. Palun veenduge, et olete internetiga ühendatud!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Makse on sihtmärgi silt on: %{tag}",
     "itWasInstructedToDeliver": "See oli määratud kandma %{amount} %{currency}",
     "bySpendingUpTo": "kulutades kuni %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "See kustutas konto aadressiga %{address}.",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "See oli määratud kandma ülejäänud summa %{amount} %{currency} aadressile %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Tehing tühistab kontrolli ID-ga %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Ta lubab %{address} sellele kontole makseid saata",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "See eemaldab autentimise %{address} selle kontole maksete saatmiseks",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "See eemaldas TrustLine valuuta %{currency} kuni %{issuer}",
     "itEstablishesTrustLineTo": "Sellega luuakse %{limit} maksimumkogus %{currency} alates %{issuer} , mis %{address} on valmis hoidma.",
     "itRemovesTheAccountDomain": "See eemaldab konto domeeni.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Sisesta nimi või aadress",
     "enterCurrencyCodeOrName": "Sisesta valuutakood või nimi",
     "enterName": "Palun sisesta nimi",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakt on juba olemas",
     "contactSuccessSaved": "Kontakt edukalt lisatud",
     "contactSuccessUpdated": "Kontakt edukalt uuendatud",
@@ -759,6 +801,8 @@
     "changePasscode": "Muuda pääsukoodi",
     "biometricAuthentication": "Biomeetriline autentimine",
     "hapticFeedback": "Taktiline(haptiline) tagasiside",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Arendaja režiim",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Süsteemi valuuta vormindamine",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Oled kindel, et tahad tagasi minna? \n (Te peate uuesti täitma kõik sisendid turvalisuse huvides)",
     "accountType": "Konto tüüp",
     "secretType": "Salajane tüüp",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Palun vali oma konto tüüp",
     "pleaseSelectAccountSecretType": "Palun vali oma konto salajane tüüp",
     "fullAccess": "Täielik juurdepääs",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Otsingutulemusi ei ole",
     "noContact": "Kontaktid puuduvad",
     "myAccount": "Minu konto",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Allika ja sihtkoha aadress ei saa olla sama!",
     "enterANameOrAddress": "Sisesta nimi või aadress",
     "transferredSuccessfully": "Sinu tehing on edukalt registreeritud %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Sihtkonto on must auk, saates see konto põhjustab kaotades saadetud XRP.",
     "noDestinationTag": "Sihtmärgi silt puudub",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "See aadress nõuab sihtsilti",
     "pleaseEnterAmount": "Sisestage tehingu summa",
     "trustLineLimitExceeded": "TrustLine ülempiir on ületatud, nüüd: %{balance}, maksimum: %{peer_limit}, välja andmiseks: %{available}. Saaja saab uuendada Trustline limiiti.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/eu.json b/src/locale/translations/eu.json
index cdea89fa6..0c8fdd56d 100644
--- a/src/locale/translations/eu.json
+++ b/src/locale/translations/eu.json
@@ -14,6 +14,8 @@
     "discard": "Baztertu",
     "remove": "Kendu",
     "go": "Zoaz",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Itxi",
     "save": "Gorde",
     "confirm": "Berretsi",
@@ -21,6 +23,7 @@
     "balance": "Oreka",
     "spendable": "Gastagarria",
     "home": "Etxea",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Ekitaldiak",
     "profile": "Profila",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Ezarpenak",
     "search": "Bilatu",
     "send": "Bidali",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "irristatu bidali",
     "done": "Eginda",
     "previous": "Aurrekoa",
@@ -38,6 +43,7 @@
     "exchanges": "Trukeak",
     "scan": "Eskaneatu",
     "request": "Eskaera",
+    "receiveOnAccount": "Receive on account",
     "details": "Xehetasunak",
     "recipient": "Hartzailea",
     "destination": "Helmuga",
@@ -48,6 +54,11 @@
     "continue": "Jarraitu",
     "code": "Kodea",
     "copy": "Kopiatu",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Aukeratua",
     "share": "Partekatu",
@@ -119,6 +130,7 @@
     "day": "eguna",
     "days": "days",
     "week": "astea",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Blokeo automatikoa",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Indartsua",
     "veryStrong": "Oso indartsua",
     "subject": "Gaia",
+    "credentialType": "Credential Type",
     "empty": "Hutsik",
     "update": "Eguneratu",
     "notNow": "Orain ez",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp-ek URL hau ireki nahi du.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Segurtasuna lehenik",
     "slideThree_desc": "Xumm aplikazioa eta plataforma segurtasuna lehentasunez eraikita daude. Ez sartu berriro zure sekretuak, sinatu transakzioak zure gailu fidagarritik.",
     "slideFour_title": "Bidali eta jaso",
-    "slideFour_desc": "XRP eta konfiantzazko beste token batzuk ere bidali eta jaso ditzakezu"
+    "slideFour_desc": "XRP eta konfiantzazko beste token batzuk ere bidali eta jaso ditzakezu",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Konfiguratu pasakode bat",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Ezin dira kontuaren transakzioak eskuratu!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Ezin izan da transakzioa kargatu, ziurtatu Internetera konektatuta zaudela!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Ordainketa helmuga etiketa hau da: %{tag}",
     "itWasInstructedToDeliver": "Emateko agindua eman zitzaion %{amount} %{currency}",
     "bySpendingUpTo": "gehienez gastatuz %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Kontua ezabatu du %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Gainerako saldoa emateko agindua eman zitzaion %{amount} %{currency} ra %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Transakzioak egiaztagiria IDarekin bertan behera utziko du %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Baimentzen du %{address} ordainketak kontu honetara bidaltzeko",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Baimena kentzen du %{address} ordainketak kontu honetara bidaltzeko",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Lineako moneta fidagarria kendu zuen %{currency} ra %{issuer}",
     "itEstablishesTrustLineTo": "Ezartzen du %{limit} gehieneko zenbateko gisa %{currency} tik %{issuer} hori %{address} eusteko prest dago.",
     "itRemovesTheAccountDomain": "Kontuaren domeinua kentzen du",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Idatzi izena edo helbidea",
     "enterCurrencyCodeOrName": "Idatzi moneta kodea edo izena",
     "enterName": "Mesedez idatzi izen bat",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontaktua dagoeneko badago",
     "contactSuccessSaved": "Kontaktua ondo gehitu da",
     "contactSuccessUpdated": "Kontaktua ondo gehitu da",
@@ -759,6 +801,8 @@
     "changePasscode": "Aldatu pasakodea",
     "biometricAuthentication": "biometrikoa autentifikazioa",
     "hapticFeedback": "Iritzi haptikoa",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Garatzaile modua",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Sistemaren moneta formateatzea",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Ziur zaude atzera egin nahi duzula?\r\n(segurtasun arrazoiengatik sarrera guztiak berriro bete behar dituzu)",
     "accountType": "Kontu mota",
     "secretType": "Mota sekretua",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Mesedez hautatu zure kontu mota",
     "pleaseSelectAccountSecretType": "Mesedez hautatu zure kontu sekretu mota",
     "fullAccess": "Sarbide osoa",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Bilaketaren emaitzarik ez",
     "noContact": "Ez dago harremanik",
     "myAccount": "Nire kontua",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Iturria eta Helmuga helbidea ezin dira berdinak izan!",
     "enterANameOrAddress": "Idatzi izena edo helbidea",
     "transferredSuccessfully": "Zure transakzioa %{network} erregistratu da.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Helmugako kontua zulo beltz gisa ezarrita dago, kontu honetara bidaltzeak bidalitako XRP galtzea eragingo du.",
     "noDestinationTag": "Helmugako etiketarik ez",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Helbide honek helmuga etiketa behar du",
     "pleaseEnterAmount": "Mesedez sartu transakzioaren zenbatekoa",
     "trustLineLimitExceeded": "KonfiantzaLerro muga gainditzen da.\r\n\r\nOrain: %{balance}\r\nGehienez: %{peer_limit}\r\nJaulkitzeko erabilgarri: %{available}\r\n\r\nHartzaileak KonfiantzaLerro muga egunera dezake.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/fi.json b/src/locale/translations/fi.json
index 1e7fea1b5..b0a74a3d4 100644
--- a/src/locale/translations/fi.json
+++ b/src/locale/translations/fi.json
@@ -14,6 +14,8 @@
     "discard": "Hylkää",
     "remove": "Poista",
     "go": "Jatka",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Sulje",
     "save": "Tallenna",
     "confirm": "Vahvista",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Käytettävissä",
     "home": "Etusivu",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Tapahtumat",
     "profile": "Profiili",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Asetukset",
     "search": "Hae",
     "send": "Lähetä",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Liu'uta lähettääksesi",
     "done": "Valmis",
     "previous": "Edellinen",
@@ -38,6 +43,7 @@
     "exchanges": "Kryptopörssit",
     "scan": "Skannaa",
     "request": "Pyydä",
+    "receiveOnAccount": "Receive on account",
     "details": "Tiedot",
     "recipient": "Vastaanottaja",
     "destination": "Kohde",
@@ -48,6 +54,11 @@
     "continue": "Jatka",
     "code": "Koodi",
     "copy": "Kopioi",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Valittu",
     "share": "Jaa",
@@ -119,6 +130,7 @@
     "day": "Päivä",
     "days": "days",
     "week": "Viikko",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automaattinen lukitus",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Vahva",
     "veryStrong": "Hyvin vahva",
     "subject": "Aihe",
+    "credentialType": "Credential Type",
     "empty": "Tyhjä",
     "update": "Päivitä",
     "notNow": "Ei nyt",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "\"%{xapp}\" xxApp haluaa avata tämän URL-osoitteen.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Turvallisuus ensin",
     "slideThree_desc": "Xumm-sovellus ja alusta on rakennettu turvallisuus tärkeimpänä . Älä enää koskaan syötä salaisuuksiasi uudelleen, allekirjoita tapahtumat vain omalla, luotetulla laitteellasi.",
     "slideFour_title": "Lähetä ja vastaanota",
-    "slideFour_desc": "Voit lähettää ja vastaanottaa XRP :tä ja muita luotettavia varoja (IOU :t)"
+    "slideFour_desc": "Voit lähettää ja vastaanottaa XRP :tä ja muita luotettavia varoja (IOU :t)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Määritä salasana",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Ei voi noutaa tilitapahtumia!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Tapahtumaa ei voi ladata, varmista, että sinulla on yhteys Internetiin!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Maksun kohdetunniste-tag: %{tag}",
     "itWasInstructedToDeliver": "Se on ohjeistettu toimittamaan %{amount} %{currency}",
     "bySpendingUpTo": "Käyttämällä enintään %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Se poisti tilin %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Se on ohjeistettu toimittamaan jäljellä oleva saldo %{amount} %{currency} osoitteeseen - %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Tapahtuma peruuttaa tarkistuksen, jonka tunnus on %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Se valtuuttaa %{address} lähettämään maksut tälle tilille",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Se poistaa %{address} -tunnuksen valtuutuksen lähettää maksuja tälle tilille",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Se poisti TrustLine-valuutan %{currency} - %{issuer}",
     "itEstablishesTrustLineTo": "Se määrittää maksimimäärän %{limit} valuuttaa %{currency}, minkä liikkeellelaskija %{issuer} osoitteessa %{address} on valmis tallettamaan.",
     "itRemovesTheAccountDomain": "Se poistaa tilin verkkotunnuksen",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Anna nimi tai osoite",
     "enterCurrencyCodeOrName": "Anna valuuttakoodi tai nimi",
     "enterName": "Anna nimi",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Yhteystieto on jo olemassa",
     "contactSuccessSaved": "Yhteystieto lisätty onnistuneesti",
     "contactSuccessUpdated": "Yhteyden päivitys onnistui",
@@ -759,6 +801,8 @@
     "changePasscode": "Muuta salasana",
     "biometricAuthentication": "Biometrinen tunnistus",
     "hapticFeedback": "Tuntoaistinen palaute",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Kehittäjätila",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Käytä järjestelmävaluutan muotoilua",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Oletko varma, että haluat palata? \n (kaikki syötteet on täytettävä uudelleen turvallisuussyistä)",
     "accountType": "Tilityyppi",
     "secretType": "Salainen tyyppi",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Valitse tilin laji",
     "pleaseSelectAccountSecretType": "Valitse tilin salainen laji",
     "fullAccess": "Täysi pääsy",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Ei hakutuloksia",
     "noContact": "Ei yhteystietoja",
     "myAccount": "Tilini",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Lähde-ja määräpaikan osoite ei voi olla sama.",
     "enterANameOrAddress": "Kirjoita nimi tai osoite",
     "transferredSuccessfully": "Tapahtumasi on rekisteröity %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "VAROITUS! Määränpäätili on kirjattu musta aukko. Kaikki XRP-varat mitkä lähetetään tälle tilille katoavat pysyvästi!",
     "noDestinationTag": "Ei kohdetilin tagi-merkintää",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Tämä osoite edellyttää kohdetilin tagi-tunnistetta",
     "pleaseEnterAmount": "Anna transaktion määrä",
     "trustLineLimitExceeded": "TrustLine-raja on ylitetty. \r\n\r\nNyt: %{balance} \r\nMax: %{peer_limit} \r\nJulkaisusta käytettävissä: %{available}\r\n\r\nVastaanottaja voi päivittää Trustline-rajan.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/fil.json b/src/locale/translations/fil.json
index fa8408662..acbec3d08 100644
--- a/src/locale/translations/fil.json
+++ b/src/locale/translations/fil.json
@@ -14,6 +14,8 @@
     "discard": "Itapon",
     "remove": "Tanggalin",
     "go": "pumunta",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Isara",
     "save": "Save",
     "confirm": "Kumpirmahin",
@@ -21,6 +23,7 @@
     "balance": "Balanse",
     "spendable": "Pwedeng gastusin",
     "home": "bahay",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Mga Kaganapan",
     "profile": "Profile",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Settings",
     "search": "Hanapin",
     "send": "Ipadala",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "padausdusin upang ipadala",
     "done": "Tapos",
     "previous": "Nakaraan",
@@ -38,6 +43,7 @@
     "exchanges": "Mga palitan",
     "scan": "I-scan",
     "request": "Kahilingan",
+    "receiveOnAccount": "Receive on account",
     "details": "Mga Detalye",
     "recipient": "Tatanggap",
     "destination": "Patutunguhan",
@@ -48,6 +54,11 @@
     "continue": "Magpatuloy",
     "code": "Code",
     "copy": "Kopyahin",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Napili",
     "share": "Ibahagi",
@@ -119,6 +130,7 @@
     "day": "araw",
     "days": "days",
     "week": "linggo",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "awtomatiko kandado",
     "suggested": "Iminungkahi",
     "low": "Mababa",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Bayad sa paglipat",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Alok ng token",
@@ -227,6 +244,7 @@
     "strong": "Malakas",
     "veryStrong": "Napakalakas",
     "subject": "Paksa",
+    "credentialType": "Credential Type",
     "empty": "Walang laman",
     "update": "pag-update",
     "notNow": "Hindi ngayon",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp nais na buksan ang URL na ito.\r\n%{url}\r\n",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Lumikha ng link ng Kahilingan sa Pagbabayad ",
     "transactionFeeIsNotSet": "Hindi nakatakda ang bayad sa transaksyon, mangyaring maghintay hanggang maitakda ang bayad sa transaksyon at subukang muli!",
     "unableToSetAccountSequence": "Hindi maitakda ang pagkakasunod-sunod ng account, Mangyaring suriin kung konektado ka sa internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "seguridad unang",
     "slideThree_desc": "Ang application at platform ng Xumm ay binuo na may seguridad bilang isang priyoridad. Huwag ipasok muli ang iyong mga lihim, mag-sign ng mga transaksyon mula sa iyong sarili, pinagkakatiwalaang aparato.",
     "slideFour_title": "Magpadala at tumanggap",
-    "slideFour_desc": "Maaari kang magpadala at tumanggap ng XRP at iba pang mga pinagkakatiwalaang token din"
+    "slideFour_desc": "Maaari kang magpadala at tumanggap ng XRP at iba pang mga pinagkakatiwalaang token din",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Mag-setup ng isang passcode",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Hindi makuha ang mga transaksyon sa account!",
     "canNotFetchSignRequests": "hini makuha ang kahilingan sa pag-sign in ng account!",
     "unableToLoadTheTransaction": "Hinde maikarga ang transaksyon, mangyaring tiyaking nakakonekta ka sa internet!\r\n",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Ang patutunguhang tag ng pagbabayad ay: %{tag}",
     "itWasInstructedToDeliver": "Inutusan itong maghatid %{amount} %{currency}",
     "bySpendingUpTo": "sa paggastos ng hanggang sa %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Tinanggal nito ang account %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Inatasan itong ihatid ang natitirang balanse ng %{amount} %{currency} sa %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Kakanselahin ng transaksyon ang tseke gamit ang ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Pinapahintulutan nito %{address} upang magpadala ng mga pagbabayad sa account na ito",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Tinatanggal nito ang pahintulot para sa %{address} upang magpadala ng mga pagbabayad sa account na ito",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Inalis nito ang pera ng TrustLine %{currency} sa %{issuer}",
     "itEstablishesTrustLineTo": "ito ay nagtatatag %{limit} bilang ang pinakamataas na halaga ng %{currency} mula sa %{issuer} yan %{address} ay handang hawakan.",
     "itRemovesTheAccountDomain": "Tinatanggal nito ang domain ng account",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Ipasok ang pangalan o address",
     "enterCurrencyCodeOrName": "Ipasok ang code ng pera o pangalan",
     "enterName": "Mangyaring maglagay ng pangalan",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Mayroon nang contact",
     "contactSuccessSaved": "Matagumpay na naidagdag ang contact",
     "contactSuccessUpdated": "Matagumpay na na-update ang contact",
@@ -759,6 +801,8 @@
     "changePasscode": "Palitan ang passcode",
     "biometricAuthentication": "Pagpapatotoo ng biometric",
     "hapticFeedback": "Haptic  puna",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Mode ng developer",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "sistema pera ayos",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Sigurado ka bang gusto mong bumalik?\r\n(kailangan mong punan muli ang lahat ng mga input para sa mga kadahilanang panseguridad)",
     "accountType": "Uri ng account",
     "secretType": "Lihim na uri",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Mangyaring piliin ang uri ng iyong account",
     "pleaseSelectAccountSecretType": "Mangyaring piliin ang iyong lihim na uri ng account",
     "fullAccess": "Buong pag-access",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Walang resulta sa paghahanap",
     "noContact": "Walang contact",
     "myAccount": "Aking Account",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Ang address ng Pinagmulan at patutunguhan ay hindi maaaring pareho!",
     "enterANameOrAddress": "Maglagay ng pangalan o address",
     "transferredSuccessfully": "Ang iyong transaksyon ay matagumpay na nakarehistro sa %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Hindi makapagtakda ng mga bayarin sa transaksyon, pakisubukang muli.",
     "theDestinationAccountIsSetAsBlackHole": "Ang patutunguhang account ay itinakda bilang itim na butas, ang pagpapadala sa account na ito ay magiging sanhi ng pagkawala ng naipadala na XRP.",
     "noDestinationTag": "Walang patutunguhang tag",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Nangangailangan ang address na ito ng patutunguhang Tag",
     "pleaseEnterAmount": "Mangyaring ipasok ang halaga ng transaksyon",
     "trustLineLimitExceeded": "Lumagpas sa limitasyon ng TrustLine.\r\n\r\nNgayon: %{balance}\r\nMax: %{peer_limit}\r\nMagagamit para sa pag-isyu: %{available}\r\n\r\nMaaaring i-update ng tatanggap ang limitasyon ng Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/fr.json b/src/locale/translations/fr.json
index f6b5e956d..46f6c886e 100644
--- a/src/locale/translations/fr.json
+++ b/src/locale/translations/fr.json
@@ -14,6 +14,8 @@
     "discard": "Jeter",
     "remove": "Supprimer",
     "go": "Aller",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Fermer",
     "save": "Sauvegarder",
     "confirm": "Confirmer",
@@ -21,6 +23,7 @@
     "balance": "Solde",
     "spendable": "Disponible",
     "home": "Accueil",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Activités",
     "profile": "Mon profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Paramètres",
     "search": "Rechercher",
     "send": "Envoyer",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Faites glisser pour envoyer",
     "done": "Terminé",
     "previous": "Précédent",
@@ -38,6 +43,7 @@
     "exchanges": "Plateformes d'échange",
     "scan": "Scanner",
     "request": "Demander",
+    "receiveOnAccount": "Receive on account",
     "details": "Détails",
     "recipient": "Bénéficiaire",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "Continuer",
     "code": "Code",
     "copy": "Copier",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Selectionné",
     "share": "Partager",
@@ -119,6 +130,7 @@
     "day": "jour",
     "days": "days",
     "week": "semaine",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Verrouillage automatique",
     "suggested": "Suggérés",
     "low": "Faible",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Taxon de jeton",
     "uri": "URI",
     "transferFee": "Taxe de transfert",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ID de jeton",
     "tokenIDs": "ID de token",
     "tokenOffers": "Offres de token",
@@ -227,6 +244,7 @@
     "strong": "Fort",
     "veryStrong": "Très fort",
     "subject": "Sujet",
+    "credentialType": "Credential Type",
     "empty": "Vide",
     "update": "Update",
     "notNow": "Pas maintenant ",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}'xApp veut ouvrir cette URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Créer un lien Demande de paiement",
     "transactionFeeIsNotSet": "Les frais de transaction ne sont pas fixés, veuillez attendre que les frais de transaction soient fixés, et essayez à nouveau !",
     "unableToSetAccountSequence": "Impossible de définir la séquence de compte, vérifiez que vous êtes connecté à Internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "La sécurité avant tout",
     "slideThree_desc": "L'application et la plateforme Xumm ont été développés avec la sécurité en priorité. Ne saisissez plus jamais vos clés secrètes, signez une transaction à partir de votre appareil de confiance.",
     "slideFour_title": "Envoyer et recevoir",
-    "slideFour_desc": "Vous pouvez envoyer et recevoir vos XRP et d'autres monnaies fiducaires de confiance également"
+    "slideFour_desc": "Vous pouvez envoyer et recevoir vos XRP et d'autres monnaies fiducaires de confiance également",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Paramétrer un code d'accès",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Impossible de récupérer les transactions du compte !",
     "canNotFetchSignRequests": "Impossible d'extraire les demandes de signature de compte !",
     "unableToLoadTheTransaction": "Impossible de charger la transaction, veuillez vous assurer que vous êtes connecté à Internet !",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Le paiement a une balise de destination: %{tag}",
     "itWasInstructedToDeliver": "Il a été chargé de distribuer %{amount} %{currency}",
     "bySpendingUpTo": "en dépensant jusqu'à %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Il a supprimé le compte %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Il a été demandé d'envoyer le solde restant de %{amount} %{currency} à %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "La transaction annulera le chèque avec l'ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Il autorise l'adresse %{address} à envoyer des paiements vers ce compte",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Il supprime l'autorisation pour l'adresse %{address} d'envoyer des paiements vers ce compte",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Il a supprimé la devise TrustLine %{currency} de %{issuer}",
     "itEstablishesTrustLineTo": "Il établit la limite %{limit} comme le nombre maximal de %{currency} de %{issuer} que l'adresse %{address} peut contenir.",
     "itRemovesTheAccountDomain": "Il supprime le domaine de ce compte",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Entrez le nom ou l'adresse",
     "enterCurrencyCodeOrName": "Entrez un code ou un nom de devise",
     "enterName": "Veuillez entrer un nom",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Le contact existe déjà",
     "contactSuccessSaved": "Contact ajouté avec succès",
     "contactSuccessUpdated": "Contact mis à jour avec succès! ",
@@ -759,6 +801,8 @@
     "changePasscode": "Changer le mot de passe",
     "biometricAuthentication": "Authentification biométrique",
     "hapticFeedback": "Vibrations au toucher",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Mode développeur",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Format des devises",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Êtes-vous sûr de vouloir revenir en arrière ? (vous devrez remplir à nouveau toutes les entrées pour des raisons de sécurité)",
     "accountType": "Type de compte",
     "secretType": "Type de secret",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Veuillez sélectionner votre type de compte",
     "pleaseSelectAccountSecretType": "Veuillez sélectionner votre type de clé secrète",
     "fullAccess": "Accès complet",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Pas de résultat pour votre recherche",
     "noContact": "Aucun contact disponible",
     "myAccount": "Mon compte",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "La source et la destination ne peuvent pas être identiques !",
     "enterANameOrAddress": "Entrer un nom ou une adresse",
     "transferredSuccessfully": "Votre transaction à été enregistrée avec succès sur le %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Impossible de définir les frais de transaction, veuillez réessayer.",
     "theDestinationAccountIsSetAsBlackHole": "ATTENTION : Le compte de destination est reconnu comme un trou noir. Tout XRP envoyé à ce compte entraînera la perte de vos fonds !",
     "noDestinationTag": "Aucun tag de destination",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Cette adresse requiert un tag de destination",
     "pleaseEnterAmount": "Veuillez entrer le montant de la transaction",
     "trustLineLimitExceeded": "La limite TrustLine est dépassée, maintenant: %{balance}, max: %{peer_limit}, disponible pour l'émission: %{available}. Le destinataire peut mettre à jour la limite de Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/gl-ES.json b/src/locale/translations/gl-ES.json
index 56196a2be..aa0f19cb9 100644
--- a/src/locale/translations/gl-ES.json
+++ b/src/locale/translations/gl-ES.json
@@ -14,6 +14,8 @@
     "discard": "Descartar",
     "remove": "Quitar",
     "go": "Ir",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Pechar",
     "save": "Gardar",
     "confirm": "Confirmar",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Gastable",
     "home": "Inicio",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Eventos",
     "profile": "Perfil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Axustes",
     "search": "Buscar",
     "send": "Enviar",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Deslice para enviar.",
     "done": "Feito",
     "previous": "Anterior",
@@ -38,6 +43,7 @@
     "exchanges": "Casas de cambio",
     "scan": "Escanear",
     "request": "Solicitar",
+    "receiveOnAccount": "Receive on account",
     "details": "Detalles",
     "recipient": "Recipiente",
     "destination": "Destino",
@@ -48,6 +54,11 @@
     "continue": "Continuar",
     "code": "Código",
     "copy": "Copiar",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Seleccionado",
     "share": "Compartir",
@@ -119,6 +130,7 @@
     "day": "día",
     "days": "days",
     "week": "semana",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Auto bloquear",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Forte",
     "veryStrong": "Moi forte",
     "subject": "Asunto",
+    "credentialType": "Credential Type",
     "empty": "Baleiro",
     "update": "Actualizar",
     "notNow": "Agora non",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "%{xapp}' xApp quere abrir éste URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Crear ligazón de solicitude de pago",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "A seguridade primeiro",
     "slideThree_desc": "A aplicación de XUMM e a súa plataforma están creadas coa seguridade como prioridades. Nunca introduza as súas claves de novo, asine transaccións desde o seu dispositivo de confianza.",
     "slideFour_title": "Enviar e recibir",
-    "slideFour_desc": "Pode enviar e recibir XRP e tamén outros activos de confianza (IOU's)."
+    "slideFour_desc": "Pode enviar e recibir XRP e tamén outros activos de confianza (IOU's).",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Engadir un PIN",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "¡Non se puideron obter as transaccións da conta!",
     "canNotFetchSignRequests": "Non se poden recuperar as solicitudes de inicio de sesión da conta.",
     "unableToLoadTheTransaction": "Non se puido cargar a transacción. Asegúrate de estar conectado a internet.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "O pago ten unha etiqueta de destino: (Variable%{tag}).",
     "itWasInstructedToDeliver": "Foi instruído para entregar (Variable%{amount}) (Variable%{currency}).",
     "bySpendingUpTo": "Gastando ata (Variable%{amount}) (Variable%{currency}).",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "A conta será eliminada con (Variable%{address})",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Foi instruído para enviar o saldo restante de (Variable%{amount}) (Variable%{currency}) a (Variable%{destination}).",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "A transacción cancelará a comprobación mediante ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Autoriza a (Variable%{address}) para enviar pagos a esta conta.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Eliminarase a autorizacion de (Variable%{address}) para enviar pagos a esta conta",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Eliminouse a moeda da liña de confianza (Variable%{currency}) a (Variable%{issuer}).",
     "itEstablishesTrustLineTo": "Establécese %{limit} como a cantidade máxima de %{currency} de %{issuer} que %{address} está disposto a soportar.",
     "itRemovesTheAccountDomain": "Eliminarase o dominio da conta.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Introduza nome ou dirección",
     "enterCurrencyCodeOrName": "Insira o nome ou o código de moeda",
     "enterName": "Por favor introduza un nome",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "O contacto xa existe",
     "contactSuccessSaved": "Contacto engadido con éxito",
     "contactSuccessUpdated": "Contacto actualizado con éxito",
@@ -759,6 +801,8 @@
     "changePasscode": "Cambiar código PIN",
     "biometricAuthentication": "Autenticación biométrica",
     "hapticFeedback": "Feedback háptico",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Modo desarrollador",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Formateo de moeda do sistema",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "¿Está seguro de que quere volver atrás? (terá que volver a completar tódalas entradas por razóns de seguridade)",
     "accountType": "Tipo de conta",
     "secretType": "Tipo de clave\r\n",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Por favor seleccione o tipo da súa conta",
     "pleaseSelectAccountSecretType": "Por favor seleccione o tipo do segredo da súa conta",
     "fullAccess": "Acceso completo",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Non hai resultados",
     "noContact": "Non hai contactos",
     "myAccount": "A miña conta",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "¡A conta de orixe e de destino non poden ser a mesma!",
     "enterANameOrAddress": "Introduza un nome ou dirección",
     "transferredSuccessfully": "A súa transacción foi rexistrada con éxito no %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "AVISO: Esta conta de destino configúrase como un burato negro. Calquera XRP enviado a esta conta provocará a perda de fondos.",
     "noDestinationTag": "Non hai etiqueta de destino",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Esta dirección precisa dunha etiqueta de destino",
     "pleaseEnterAmount": "Por favor introduza a cantidade da transacción",
     "trustLineLimitExceeded": "Excedeuse o límite da Liña de Confianza: agora %{balance}, máximo %{peer_limit}, dispoñible para emisión: %{available}. O destinatario pode actualiza-lo límite da Liña de Confianza.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/gu.json b/src/locale/translations/gu.json
index e4909ba91..d66178a67 100644
--- a/src/locale/translations/gu.json
+++ b/src/locale/translations/gu.json
@@ -14,6 +14,8 @@
     "discard": "કાઢી નાખો",
     "remove": "દૂર કરો",
     "go": "જાઓ",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "બંધ",
     "save": "સાચવો",
     "confirm": "પુષ્ટિ કરો",
@@ -21,6 +23,7 @@
     "balance": "સંતુલન",
     "spendable": "ખર્ચ કરવા યોગ્ય",
     "home": "ઘર",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "ઘટનાઓ",
     "profile": "પ્રોફાઇલ",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "સેટિંગ્સ",
     "search": "શોધો",
     "send": "મોકલો",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "મોકલવા માટે સ્લાઇડ",
     "done": "થઈ ગયું",
     "previous": "અગાઉના",
@@ -38,6 +43,7 @@
     "exchanges": "વિનિમય",
     "scan": "સ્કેન",
     "request": "વિનંતી",
+    "receiveOnAccount": "Receive on account",
     "details": "વિગતો",
     "recipient": "પ્રાપ્તકર્તા",
     "destination": "લક્ષ્યસ્થાન",
@@ -48,6 +54,11 @@
     "continue": "ચાલુ રાખો",
     "code": "કોડ",
     "copy": "નકલ કરો",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "પસંદ કરેલ",
     "share": "શેર કરો",
@@ -119,6 +130,7 @@
     "day": "દિવસ",
     "days": "days",
     "week": "અઠવાડિયું",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "ઓટો લોક",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "મજબૂત",
     "veryStrong": "એકદમ મજબુત",
     "subject": "વિષય",
+    "credentialType": "Credential Type",
     "empty": "ખાલી",
     "update": "અપડેટ",
     "notNow": "હવે નહીં",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp આ URL ખોલવા માંગે છે.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "સુરક્ષા પહેલા",
     "slideThree_desc": "Xumm એપ્લિકેશન સુરક્ષાને ધ્યાનમાં રાખીને બનાવવામાં આવી છે. તમારી ખાનગી કીઓ ફરીથી દાખલ ન કરો! તમારા પોતાના, વિશ્વસનીય ડિવાઇસથી ટ્રાંઝેક્શન પર સહી કરો.",
     "slideFour_title": "મોકલો અને પ્રાપ્ત કરો",
-    "slideFour_desc": "તમે મોકલો છો અને XRP તેમજ અન્ય વિશ્વસનીય અસ્કયામતો પ્રાપ્ત કરી શકો છો (માતાને)"
+    "slideFour_desc": "તમે મોકલો છો અને XRP તેમજ અન્ય વિશ્વસનીય અસ્કયામતો પ્રાપ્ત કરી શકો છો (માતાને)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "પાસકોડ સેટ કરો",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "ખાતાના વ્યવહારો લાવી શકતા નથી!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "વ્યવહાર લોડ કરવામાં અસમર્થ, કૃપા કરીને ખાતરી કરો કે તમે ઇન્ટરનેટથી કનેક્ટેડ છો!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "ચુકવણી ગંતવ્ય ટેગ ધરાવે છે: %{tag}.\r\n",
     "itWasInstructedToDeliver": "પહોંચાડવા સૂચના આપવામાં આવી હતી %{amount} %{currency}.\r\n",
     "bySpendingUpTo": "સુધી ખર્ચ કરીને %{amount} %{currency}\r\n",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "તેની સાથે એકાઉન્ટ કાઢી %{address}.\r\n",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "નું બાકીનું બેલેન્સ પહોંચાડવા સૂચના આપવામાં આવી હતી %{amount} %{currency} પ્રતિ %{destination}.\r\n",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "ટ્રાન્ઝેક્શન ID સાથે ચેક રદ કરશે %{checkId}.\r\n",
     "itAuthorizesSendingPaymentsToThisAccount": "તે આ ખાતામાં ચૂકવણી મોકલવા માટે %{address} ને સત્તાધિકારીત કરે છે",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "તે આ ખાતામાં ચૂકવણી મોકલવા માટે %{address} માટે સત્તાધિકરણ દૂર કરે છે",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "તે ટ્રસ્ટલાઈન ચલણ %{currency} ને %{issuer} માં દૂર કરેલ છે",
     "itEstablishesTrustLineTo": "તે પ્રસ્થાપિત %{limit} ની મહત્તમ રકમ તરીકે %{currency} માંથી %{issuer} કે %{address} પકડી રાખવા તૈયાર છે.",
     "itRemovesTheAccountDomain": "તે એકાઉન્ટ ડોમેનને દૂર કરે છે.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "નામ અથવા સરનામું દાખલ કરો",
     "enterCurrencyCodeOrName": "ચલણ કોડ અથવા નામ દાખલ કરો",
     "enterName": "કૃપા કરી કોઈ નામ દાખલ કરો",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "સંપર્ક પહેલેથી જ અસ્તિત્વમાં છે",
     "contactSuccessSaved": "સંપર્ક સફળતાપૂર્વક ઉમેર્યો",
     "contactSuccessUpdated": "સંપર્ક સફળતાપૂર્વક અપડેટ થયો",
@@ -759,6 +801,8 @@
     "changePasscode": "પાસકોડ બદલો",
     "biometricAuthentication": "બાયોમેટ્રિક પ્રમાણીકરણ",
     "hapticFeedback": "હેપ્ટિક પ્રતિસાદ",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "વિકાસકર્તા મોડ",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "સિસ્ટમ ચલણ ફોર્મેટનો ઉપયોગ કરો",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "શું તમે ખરેખર પાછા જવા માંગો છો?\r\n(તમારે સુરક્ષાના કારણોસર તમામ ઇનપુટ્સ ફરીથી ભરવા પડશે)",
     "accountType": "ખાતાનો પ્રકાર",
     "secretType": "ગુપ્ત પ્રકાર",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "કૃપા કરી તમારા ખાતાનો પ્રકાર પસંદ કરો",
     "pleaseSelectAccountSecretType": "કૃપા કરીને તમારું એકાઉન્ટ ગુપ્ત પ્રકાર પસંદ કરો",
     "fullAccess": "સંપૂર્ણ પ્રવેશ",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "કોઈ શોધ પરિણામ નથી",
     "noContact": "સંપર્કો નથી",
     "myAccount": "મારું ખાતુ",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "સ્રોત અને લક્ષ્યસ્થાન સરનામું એક સમાન હોઈ શકતું નથી!",
     "enterANameOrAddress": "નામ અથવા સરનામું દાખલ કરો",
     "transferredSuccessfully": "તમારું લેનદેન %{network} પર સફળતાપૂર્વક નોંધાયેલું છે.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "ચેતવણી: આ લક્ષ્યસ્થાન એકાઉન્ટમાં એક બ્લેક હોલ તરીકે સેટ કરવામાં આવે છે. આ એકાઉન્ટ પર મોકલેલા કોઇ XRP ભંડોળના નુકશાન પરિણમશે!",
     "noDestinationTag": "કોઈ ગંતવ્ય ટેગ",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "આ સરનામાં માટે ગંતવ્ય ટ tagગની જરૂર છે.",
     "pleaseEnterAmount": "કૃપા કરીને આ વ્યવહાર માટેની રકમ દાખલ કરો.",
     "trustLineLimitExceeded": "ટ્રસ્ટલાઈનની મર્યાદા ઓળંગી ગઈ છે.\r\nહવે: %{balance}\r\nમહત્તમ: %{peer_limit}\r\nજારી કરવા માટે ઉપલબ્ધ છે: %{available}\r\nપ્રાપ્તકર્તા ટ્રસ્ટલાઇન મર્યાદાને અપડેટ કરી શકે છે.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/he.json b/src/locale/translations/he.json
index 2718e161b..cdd35b840 100644
--- a/src/locale/translations/he.json
+++ b/src/locale/translations/he.json
@@ -14,6 +14,8 @@
     "discard": "להשליך",
     "remove": "לְהַסִיר",
     "go": "המשך",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "סגור",
     "save": "לשמור",
     "confirm": "לְאַשֵׁר",
@@ -21,6 +23,7 @@
     "balance": "מאזן",
     "spendable": "יתרה זמינה",
     "home": "בית",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "אירועים",
     "profile": "פרופיל",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "הגדרות",
     "search": "חיפוש",
     "send": "שלח",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "החלק לשליחה",
     "done": "בוצע",
     "previous": "הקודם",
@@ -38,6 +43,7 @@
     "exchanges": "זירות מסחר",
     "scan": "סריקה",
     "request": "קבל ",
+    "receiveOnAccount": "Receive on account",
     "details": "פרטים",
     "recipient": "נמענים",
     "destination": "יַעַד",
@@ -48,6 +54,11 @@
     "continue": "המשך",
     "code": "קוד",
     "copy": "העתק",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "נבחר",
     "share": "שיתוף",
@@ -119,6 +130,7 @@
     "day": "יום",
     "days": "days",
     "week": "שבוע",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "נעילה אוטומטית",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "חזק",
     "veryStrong": "מאוד חזק",
     "subject": "נושא",
+    "credentialType": "Credential Type",
     "empty": "ריק",
     "update": "עדכון",
     "notNow": "לא כעת",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp רוצה לפתוח את כתובת האתר הזו.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "קודם אבטחה ",
     "slideThree_desc": "היישום והפלטפורמה של Xumm בנויים עם עדיפות לאבטחה. לעולם אל תיכנס שוב לסודות שלך, חתום על עסקאות ממכשיר משלך ואמין.",
     "slideFour_title": "שליחה וקבלה",
-    "slideFour_desc": "אתה יכול לשלוח ולקבל גם XRP ואסימונים מהימנים אחרים"
+    "slideFour_desc": "אתה יכול לשלוח ולקבל גם XRP ואסימונים מהימנים אחרים",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "הגדרת קוד סיסמה",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "לא ניתן להשיג עסקאות בחשבון!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "לא ניתן לטעון את העסקה, אנא וודא שאתה מחובר לאינטרנט!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "תג יעד התשלום הוא: %{tag}",
     "itWasInstructedToDeliver": "הונחה למסור %{amount} %{currency}",
     "bySpendingUpTo": "על ידי הוצאות עד %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "זה מחק את החשבון %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "הונחה למסור את היתרה הנותרת של %{amount} %{currency} ל- %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "העסקה תבטל צ'ק עם תעודה מזהה %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "הוא מאשר ל- %{address} לשלוח תשלומים לחשבון זה",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "זה מסיר את ההרשאה ל- %{address} למשלוח תשלומים לחשבון זה",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "זה הסיר את TrustLine מטבע %{currency} ל- %{issuer}",
     "itEstablishesTrustLineTo": "היא קובעת את %{limit} כסכום המרבי של %{currency} מ- %{issuer} ש- %{address}  מוכן להחזיק.",
     "itRemovesTheAccountDomain": "זה מסיר את תחום החשבון",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "הזן שם או כתובת",
     "enterCurrencyCodeOrName": "הזן קוד מטבע או שם",
     "enterName": "אנא הזן שם",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "איש קשר כבר קיים",
     "contactSuccessSaved": "איש הקשר נוסף בהצלחה",
     "contactSuccessUpdated": "איש הקשר עודכן בהצלחה",
@@ -759,6 +801,8 @@
     "changePasscode": "שנה קוד גישה",
     "biometricAuthentication": "אימות ביומטרי",
     "hapticFeedback": "משוב הפטי",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "מצב מפתח",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "שינוי מטבע להצגה",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "האם אתה בטוח שאתה רוצה לחזור?\r\n(עליך למלא מחדש את כל התשומות מטעמי אבטחה)",
     "accountType": "סוג החשבון",
     "secretType": "טיפוס סודי",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "אנא בחר את סוג החשבון שלך",
     "pleaseSelectAccountSecretType": "אנא בחר את סוג סוד החשבון שלך",
     "fullAccess": "גישה מלאה",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "אין תוצאת חיפוש",
     "noContact": "אין אנשי קשר",
     "myAccount": "חשבון שלי",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "המקור וכתובת היעד לא יכולים להיות זהים!",
     "enterANameOrAddress": "הזן שם או כתובת",
     "transferredSuccessfully": "העסקה שלך נרשמה בהצלחה ב%{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "חשבון היעד מוגדר כחור שחור, שליחה לחשבון זה תגרום לאיבוד XRP שנשלח.",
     "noDestinationTag": "אין תג יעד",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "כתובת זו דורשת תג יעד",
     "pleaseEnterAmount": "אנא הזן את סכום העסקה",
     "trustLineLimitExceeded": "מגבלת TrustLine חורגת.\r\n\r\nעכשיו: %{balance}\r\nמקסימום: %{peer_limit}\r\nזמין להנפקה: %{available}\r\nהנמען יכול לעדכן את מגבלת ה- Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/hi-IN.json b/src/locale/translations/hi-IN.json
index f8fdeadc4..c701f8ff6 100644
--- a/src/locale/translations/hi-IN.json
+++ b/src/locale/translations/hi-IN.json
@@ -14,6 +14,8 @@
     "discard": "रद्द करें\r\n",
     "remove": "हटाना",
     "go": "जाओ",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "बंद करें",
     "save": "सहेजें",
     "confirm": "पुष्टि करें",
@@ -21,6 +23,7 @@
     "balance": "शेष",
     "spendable": "बिताना",
     "home": "घर",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "घटनाएँ",
     "profile": "प्रोफाइल",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "सेटिंग्स",
     "search": "ढूंढ़",
     "send": "भेजें",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "भेजने के लिए स्लाइड करें",
     "done": "पूर्ण",
     "previous": "पिछला",
@@ -38,6 +43,7 @@
     "exchanges": "एक्सचेंजों",
     "scan": "स्कैन",
     "request": "निवेदन",
+    "receiveOnAccount": "Receive on account",
     "details": "विवरण",
     "recipient": "प्राप्तकर्ता",
     "destination": "गंतव्य",
@@ -48,6 +54,11 @@
     "continue": "जारी रखें",
     "code": "कोड",
     "copy": "नक़ल",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "चुना गया",
     "share": "शेयर",
@@ -119,6 +130,7 @@
     "day": "दिन",
     "days": "days",
     "week": "सप्ताह",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "ऑटो लॉक",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "मजबूत",
     "veryStrong": "बहुत मजबूत",
     "subject": "विषय",
+    "credentialType": "Credential Type",
     "empty": "खाली",
     "update": "अद्यतन",
     "notNow": "अभी नहीं",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp इस URL को खोलना चाहता है।\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "पहले सुरक्षा",
     "slideThree_desc": "Xumm एप्लीकेशन और प्लेटफ़ॉर्म को सुरक्षा को ध्यान में रखकर बनाया गया है। कभी भी अपने रहस्यों को दर्ज न करें, अपने स्वयं के, विश्वसनीय उपकरण से लेनदेन पर हस्ताक्षर करें।",
     "slideFour_title": "भेजें और पाएं",
-    "slideFour_desc": "आप XRP और अन्य विश्वसनीय संपत्ति (IOU) भी भेज और प्राप्त कर सकते हैं"
+    "slideFour_desc": "आप XRP और अन्य विश्वसनीय संपत्ति (IOU) भी भेज और प्राप्त कर सकते हैं",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "एक पासकोड सेट करें",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "खाता लेन-देन नहीं कर सकते!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "लेनदेन लोड करने में असमर्थ, कृपया सुनिश्चित करें कि आप इंटरनेट से जुड़े हुए हैं!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "भुगतान में एक गंतव्य टैग है:%{tag}",
     "itWasInstructedToDeliver": "इसे पहुंचाने का निर्देश दिया गया था %{amount} %{currency}",
     "bySpendingUpTo": "%{amount} %{currency} तक खर्च करके",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "इसने खाते को हटा दिया %{address} है",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "शेष राशि का वितरण करने का निर्देश दिया गया %{amount} %{currency} के %{destination} ",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "लेनदेन आईडी के साथ चेक को रद्द कर देगा %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "यह इस खाते में भुगतान भेजने के लिए %{address}  को अधिकृत करता है।",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "यह इस खाते में भुगतान भेजने के लिए %{address} के लिए प्राधिकरण को हटा देता है।  ",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "इसने ट्रस्टलाइन मुद्रा को हटा दिया  %{currency} को %{issuer} ",
     "itEstablishesTrustLineTo": "यह %{limit} को %{currency} से %{issuer} के रूप में स्थापित करता है, जो %{address} रखने के लिए तैयार है।\r\n",
     "itRemovesTheAccountDomain": "यह खाता डोमेन निकालता है।",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "नाम या पता दर्ज करें",
     "enterCurrencyCodeOrName": "मुद्रा कोड या नाम दर्ज करें",
     "enterName": "कृपया एक नाम दर्ज करें",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "संपर्क पहले से मौजूद है",
     "contactSuccessSaved": "संपर्क सफलतापूर्वक जोड़ा गया",
     "contactSuccessUpdated": "संपर्क सफलतापूर्वक अपडेट किया गया",
@@ -759,6 +801,8 @@
     "changePasscode": "पासकोड बदलें",
     "biometricAuthentication": "बायोमेट्रिक प्रमाणीकरण",
     "hapticFeedback": "हप्टिक राय",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "डेवलपर मोड",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "तंत्र मुद्रा स्वरूपण",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "क्या आप वाकई वापस जाना चाहते हैं?\r\n(आपको सुरक्षा कारणों से सभी इनपुट को फिर से भरना होगा)",
     "accountType": "खाते का प्रकार",
     "secretType": "गुप्त प्रकार",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "कृपया अपना खाता प्रकार चुनें",
     "pleaseSelectAccountSecretType": "कृपया अपना खाता गुप्त प्रकार चुनें",
     "fullAccess": "पूर्ण पहुँच",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "कोई खोज परिणाम नहीं",
     "noContact": "कोई संपर्क नहीं",
     "myAccount": "मेरा खाता",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "स्रोत और गंतव्य पता एक ही नहीं हो सकता!",
     "enterANameOrAddress": "एक नाम या पता दर्ज करें",
     "transferredSuccessfully": "आपका लेन-देन %{network} पर सफलतापूर्वक पंजीकृत हो गया है।",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "चेतावनी: यह गंतव्य खाता ब्लैक होल के रूप में सेट है. इस खाते में भेजे गए किसी भी XRP के परिणामस्वरूप धन की हानि होगी.",
     "noDestinationTag": "कोई गंतव्य टैग नहीं",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "इस पते के लिए एक गंतव्य टैग की आवश्यकता होती है",
     "pleaseEnterAmount": "कृपया लेन-देन की राशि दर्ज करें",
     "trustLineLimitExceeded": "यह जारी रखने के लिए उपलब्ध है: %{balance}, अधिकतम: %{peer_limit}, जारी करने के लिए उपलब्ध है: %{available}। प्राप्तकर्ता ट्रस्टेलाइन सीमा का अद्यतन कर सकते हैं.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/hr.json b/src/locale/translations/hr.json
index d4c0e1482..e7a1d9060 100644
--- a/src/locale/translations/hr.json
+++ b/src/locale/translations/hr.json
@@ -14,6 +14,8 @@
     "discard": "Odbaci",
     "remove": "Ukloni",
     "go": "Idi",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Zatvori",
     "save": "Spremi",
     "confirm": "Potvrda",
@@ -21,6 +23,7 @@
     "balance": "Stanje računa",
     "spendable": "Raspoloživo",
     "home": "Početna",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Povijest ",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Postavke",
     "search": "Pretraga",
     "send": "Pošalji",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Kliznite za slanje",
     "done": "Gotovo",
     "previous": "Prethodna",
@@ -38,6 +43,7 @@
     "exchanges": "Mjenjačnice",
     "scan": "Skeniraj",
     "request": "Primati",
+    "receiveOnAccount": "Receive on account",
     "details": "Detalji",
     "recipient": "Primatelj",
     "destination": "Odredište",
@@ -48,6 +54,11 @@
     "continue": "Nastavi",
     "code": "Šifra",
     "copy": "Kopiraj",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Izabrano",
     "share": "Podijeli",
@@ -119,6 +130,7 @@
     "day": "dan",
     "days": "days",
     "week": "tjedan",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automatsko zaključavanje",
     "suggested": "Predloženo",
     "low": "Niski",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Naknada za prijenos",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ID tokena",
     "tokenIDs": "ID-ovi tokena",
     "tokenOffers": "Ponude tokena",
@@ -227,6 +244,7 @@
     "strong": "Jako",
     "veryStrong": "Vrlo jako",
     "subject": "Predmet",
+    "credentialType": "Credential Type",
     "empty": "Prazno",
     "update": "Ažuriraj",
     "notNow": "Ne sada",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp} xApp želi otvoriti ovaj URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Izradite vezu Zahtjev za plaćanje",
     "transactionFeeIsNotSet": "Naknada za transakciju nije postavljena, molim čekajte da se postavi naknada za transakciju i pokušajte ponovno!",
     "unableToSetAccountSequence": "Ne može se postaviti redoslijed računa, molimo vas da provjerite da li ste povezani s internetom.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Sigurnost na prvom mjestu",
     "slideThree_desc": "Xumm aplikacija i platforma izgrađena je s naglaskom na sigurnost. Nikada nemojte unositi svoje tajne brojeve, a potpis transakcija radite sa svojih pouzdanih uređaja.",
     "slideFour_title": "Slanje i primanje",
-    "slideFour_desc": "Možete poslati i primiti XRP i druga pouzdana sredstva (IOU's) također"
+    "slideFour_desc": "Možete poslati i primiti XRP i druga pouzdana sredstva (IOU's) također",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Postavljanje lozinke",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Ne mogu dobiti transakcije računa!",
     "canNotFetchSignRequests": "Nije moguće dohvatiti zahtjeve za potpisivanje računa!",
     "unableToLoadTheTransaction": "Transakcija se ne može učitati, molim provjerite da li ste povezani s internetom!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Plaćanje ima odredišnu oznaku: %{tag}",
     "itWasInstructedToDeliver": "Naloženo je da se dostavi %{amount} %{currency}",
     "bySpendingUpTo": "Naloženo je da se dostavi %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Izbrisan je račun %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Naloženo je da dostavi preostali saldo od %{amount} %{currency} do %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Transakcija će otkazati ček s ID-om %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Ovlašćuje %{address} slanje uplata na ovaj račun",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Uklanja autorizaciju za %{address} za slanje uplata na ovaj račun",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Uklonio je TrustLine valutu %{currency} na %{issuer}",
     "itEstablishesTrustLineTo": "Uspostavlja se %{limit} kao maksimalna količina od %{currency} od %{issuer} koje je %{address} spreman za zadržavanje.",
     "itRemovesTheAccountDomain": "Uklanja domenu računa",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Unesite ime ili adresu",
     "enterCurrencyCodeOrName": "Unesite šifru valute ili ime",
     "enterName": "Molimo vas unesite ime",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakt već postoji",
     "contactSuccessSaved": "Kontakt uspješno dodan",
     "contactSuccessUpdated": "Kontakt uspješno ažuriran",
@@ -759,6 +801,8 @@
     "changePasscode": "Promijeni lozinku",
     "biometricAuthentication": "Biometrijska provjera autentičnosti",
     "hapticFeedback": "Haptična povratna informacija",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Način za programere",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Formatiranje sistemske valute",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Jeste li sigurni da se želite vratiti? \r\n(morati ćete ponovno unositi sva polja zbog sigurnosnih razloga)",
     "accountType": "Vrsta računa",
     "secretType": "Vrsta tajne",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Molimo vas odaberite tip računa",
     "pleaseSelectAccountSecretType": "Molimo vas izaberite vrstu tajne za vaš račun",
     "fullAccess": "Puni pristup",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Nema rezultata pretraživanja",
     "noContact": "Nema kontakata",
     "myAccount": "Moj račun",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Adresa pošiljatelja i primatelja ne može biti ista!",
     "enterANameOrAddress": "Unesite ime ili adresu",
     "transferredSuccessfully": "Vaša transakcija je uspješno registrirana na %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Ne može se postaviti naknada za transakciju, molim pokušajte ponovno.",
     "theDestinationAccountIsSetAsBlackHole": "UPOZORENJE: Ovaj je odredišni račun postavljen kao crna rupa. Bilo koji XRP poslan na ovaj račun rezultirat će gubitkom sredstava!",
     "noDestinationTag": "Nema odredišne oznake (destination tag)",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Ova adresa zahtijeva odredišnu oznaku (destination tag)",
     "pleaseEnterAmount": "Molimo vas unesite iznos transakcije",
     "trustLineLimitExceeded": "Premašeno je ograničenje broja Linija povjeranje ('TrustLine'), trenutno stanje: %{balance}, maksimalno: %{peer_limit}, dostupno za izdavanje: %{available}. Primatelj može povećati broj maksimalnih Linija povjerenja.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ht.json b/src/locale/translations/ht.json
index 8cf0dd0e0..f0c8f3738 100644
--- a/src/locale/translations/ht.json
+++ b/src/locale/translations/ht.json
@@ -14,6 +14,8 @@
     "discard": "Jete",
     "remove": "Retire",
     "go": "Ale",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Fèmen",
     "save": "Sove",
     "confirm": "Konfime",
@@ -21,6 +23,7 @@
     "balance": "Balans",
     "spendable": "depansab",
     "home": "Kay",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Evènman",
     "profile": "pwofil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Anviwònman",
     "search": "Rechèch",
     "send": "Voye",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "glise pou voye",
     "done": "Fe",
     "previous": "anvan",
@@ -38,6 +43,7 @@
     "exchanges": "echanj",
     "scan": "eskane",
     "request": "demann",
+    "receiveOnAccount": "Receive on account",
     "details": "Detay",
     "recipient": "Moun k ap resevwa",
     "destination": "Destinasyon",
@@ -48,6 +54,11 @@
     "continue": "Kontinye",
     "code": "Kòd",
     "copy": "Kopi",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Chwazi",
     "share": "Pataje",
@@ -119,6 +130,7 @@
     "day": "jou",
     "days": "days",
     "week": "semèn",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "fèmen oto",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Bonjan",
     "veryStrong": "Fò anpil",
     "subject": "Sijè",
+    "credentialType": "Credential Type",
     "empty": "Vid",
     "update": "Mizajou",
     "notNow": "Pa kounye a",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp vle louvri URL sa a.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Sekirite an premye",
     "slideThree_desc": "Aplikasyon an Xumm ak platfòm yo bati ak sekirite kòm yon priyorite. Pa janm antre nan sekrè ou ankò, siyen tranzaksyon soti nan aparèy pwòp ou a, ou fè konfyans.",
     "slideFour_title": "Voye ak resevwa",
-    "slideFour_desc": "Ou ka voye ak resevwa XRP ak lòt marqueur ou fè konfyans tou"
+    "slideFour_desc": "Ou ka voye ak resevwa XRP ak lòt marqueur ou fè konfyans tou",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Enstalasyon yon paskod",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Pa ka chache tranzaksyon kont!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Kapab chaje tranzaksyon an, tanpri asire w ke ou konekte ak entènèt!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Tag destinasyon peman an se: %{tag}",
     "itWasInstructedToDeliver": "Li te enstwi delivre %{amount} %{currency}",
     "bySpendingUpTo": "pa depanse jiska %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Li efase kont %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Li te enstwi delivre balans ki rete nan %{amount} %{currency} a %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Tranzaksyon an ap anile tcheke avèk ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Li otorize %{address} pou voye peman nan kont sa a",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Li retire otorizasyon pou %{address} voye peman nan kont sa a",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Li retire KonfyansLiy lajan %{currency} a %{issuer}",
     "itEstablishesTrustLineTo": "Li etabli %{limit} kòm kantite maksimòm %{currency} nan %{issuer} ke %{address} vle kenbe.",
     "itRemovesTheAccountDomain": "Li retire domèn nan kont",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Mete non oswa adrès",
     "enterCurrencyCodeOrName": "Mete kòd lajan oswa non",
     "enterName": "Tanpri antre yon non",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontak deja egziste",
     "contactSuccessSaved": "Kontak te ajoute avèk siksè",
     "contactSuccessUpdated": "Kontakte avèk siksè mete ajou",
@@ -759,6 +801,8 @@
     "changePasscode": "Chanje paskod",
     "biometricAuthentication": "byometrik otantifikasyon",
     "hapticFeedback": "fidbak haptik",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "pwomotè mòd",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Fòma lajan sistèm lan",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Èske ou sèten ou vle tounen?\r\n(ou dwe re-ranpli tout entrain yo pou rezon sekirite)",
     "accountType": "Kalite Kont",
     "secretType": "Kalite sekrè",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Tanpri chwazi kalite kont ou",
     "pleaseSelectAccountSecretType": "Tanpri chwazi kont sekrè ou",
     "fullAccess": "Aksè konplè",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Pa gen rezilta rechèch",
     "noContact": "Pa gen kontak",
     "myAccount": "Kont mwen",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Sous ak adrès destinasyon an pa kapab menm!",
     "enterANameOrAddress": "Mete yon non oswa yon adrès",
     "transferredSuccessfully": "Tranzaksyon ou an te anrejistre avèk siksè sou %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Se kont lan destinasyon mete kòm twou nwa, voye nan kont sa a ap lakòz pèdi voye XRP.",
     "noDestinationTag": "Pa gen tag destinasyon",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Adrès sa a egzije yon etikèt destinasyon",
     "pleaseEnterAmount": "Tanpri antre kantite lajan tranzaksyon an",
     "trustLineLimitExceeded": "Limit KonfyansLiy depase.\r\n\r\nKounye a: %{balance}\r\nMaksimòm: %{peer_limit}\r\nDisponib pou founi dokiman yo: %{available}\r\nMoun k ap resevwa a ka mete ajou limit KonfyansLiy lan.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/hu.json b/src/locale/translations/hu.json
index a51f0dcf5..231e6a9a4 100644
--- a/src/locale/translations/hu.json
+++ b/src/locale/translations/hu.json
@@ -14,6 +14,8 @@
     "discard": "Elvetés",
     "remove": "Eltávolítás",
     "go": "Mehet",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Bezárás",
     "save": "Mentés",
     "confirm": "Rendben",
@@ -21,6 +23,7 @@
     "balance": "Egyenleg",
     "spendable": "Elkölthető",
     "home": "Főoldal",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Események",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Beállítások",
     "search": "Keresés",
     "send": "Küldés",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Slide to send",
     "done": "Kész",
     "previous": "Előző",
@@ -38,6 +43,7 @@
     "exchanges": "Exváltozások",
     "scan": "QR",
     "request": "Kérés",
+    "receiveOnAccount": "Receive on account",
     "details": "Részletek",
     "recipient": "Címzett",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "Folytatás",
     "code": "Kód",
     "copy": "Másolás",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Selected",
     "share": "Megosztás",
@@ -119,6 +130,7 @@
     "day": "day",
     "days": "days",
     "week": "week",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Auto lock",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Strong",
     "veryStrong": "Very strong",
     "subject": "Subject",
+    "credentialType": "Credential Type",
     "empty": "Empty",
     "update": "Update",
     "notNow": "Not now",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wants to open this URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Security first",
     "slideThree_desc": "The Xumm application and platform are built with security as a priority. Never enter your secrets again, sign transactions from your own, trusted device.",
     "slideFour_title": "Send and receive",
-    "slideFour_desc": "You can send and receive XRP and other trusted tokens as well"
+    "slideFour_desc": "You can send and receive XRP and other trusted tokens as well",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Setup a passcode",
@@ -480,7 +506,7 @@
     "onDate": "on",
     "paymentReceived": "Payment received",
     "paymentSent": "Payment sent",
-    "exchangedAssets": "Exchanged tokens",
+    "exchangedAssets": "Swapped tokens",
     "addedATrustLine": "Added a token (TrustLine)",
     "removedATrustLine": "Removed a token (TrustLine)",
     "updatedATrustLine": "Token Updated (TrustLine)",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Can not fetch account transactions!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Unable to load the transaction, please make sure you are connected to internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "The payment destination tag is: %{tag}",
     "itWasInstructedToDeliver": "It was instructed to deliver %{amount} %{currency}",
     "bySpendingUpTo": "by spending up to %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "It deleted account %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "It was instructed to deliver the remaining balance of %{amount} %{currency} to %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "The transaction will cancel check with ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "It authorizes %{address} to send payments to this account",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "It removes the authorization for %{address} to send payments to this account",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "It removed TrustLine currency %{currency} to %{issuer}",
     "itEstablishesTrustLineTo": "It establishes %{limit} as the maximum amount of %{currency} from %{issuer} that %{address} is willing to hold.",
     "itRemovesTheAccountDomain": "It removes the account domain",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Enter name or address",
     "enterCurrencyCodeOrName": "Enter currency code or name",
     "enterName": "Please enter a name",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Contact already exists",
     "contactSuccessSaved": "Contact successfully added",
     "contactSuccessUpdated": "Contact successfully updated",
@@ -759,6 +801,8 @@
     "changePasscode": "Change passcode",
     "biometricAuthentication": "Biometric authentication",
     "hapticFeedback": "Haptic feedback",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Developer mode",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Use system currency format",
@@ -841,7 +885,7 @@
     "generateNewAccount": "Create a new account",
     "confirmPrivateTitle": "Confirm your secret numbers",
     "confirmPrivateDescription": "Kérem, adja meg a számokat, a saját biztonsága érdekében: azt akarjuk, hogy erősítse meg, hogy leírta.",
-    "invalidSecretNumber": "Invalid secret number key entered",
+    "invalidSecretNumber": "The numbers entered do not match the requested row of numbers.",
     "accountSetupCompleted": "A fiók beállítása befejeződött.",
     "YouJustCreatedAccount": "Létrehozott egy új új számlát.",
     "yeahLetsGo": "Hurrá, gyerünk!",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Are you sure you want to go back? \r\n (you have to re-fill all the inputs for security reasons)",
     "accountType": "Account type",
     "secretType": "Secret type",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Please select your account type",
     "pleaseSelectAccountSecretType": "Please select your account secret type",
     "fullAccess": "Full access",
@@ -902,8 +947,8 @@
     "chooseAccountType": "Choose account type",
     "secretNumbers": "Secret numbers",
     "secretNumbersDesc": "Preferred account type. 8 rows of 6 digits",
-    "familySeed": "Family Seed",
-    "familySeedDesc": "Looks like sXXX1234XXX...",
+    "familySeed": "Family Seed / Private Key",
+    "familySeedDesc": "E.g. sXb1c3aX... or EDAF9E...",
     "mnemonic": "Mnemonic",
     "scanFromQR": "Scan from QR code",
     "mnemonicDesc": "Based on 12, 16 or 24 words",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "No search result",
     "noContact": "No contacts",
     "myAccount": "My Account",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "A forrás-és célcím nem lehet ugyanaz!",
     "enterANameOrAddress": "Enter a name or an address",
     "transferredSuccessfully": "A tranzakció sikeresen regisztrálva lett az %{network}.",
@@ -1070,8 +1116,9 @@
     "destinationTagIsRequired": "A fizetés elküldéséhez a cél címke szükséges.",
     "unableGetRecipientAccountInfoPleaseTryAgain": "A címzett fiók adatai nem kérhetők le, próbálkozzon újra.",
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
-    "theDestinationAccountIsSetAsBlackHole": "The destination account is set as black hole, sending to this account will cause losing sent XRP.",
+    "theDestinationAccountIsSetAsBlackHole": "The destination account is 'Black Holed', sending to this account will cause losing sent XRP.",
     "noDestinationTag": "No destination tag",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "This address requires a Destination Tag",
     "pleaseEnterAmount": "Please enter the transaction amount",
     "trustLineLimitExceeded": "A TrustLine korlát túllépésre került, most: %{balance}, max: %{peer_limit}, elérhető a következő kiadáshoz: %{available}. A címzett frissítheti a Trustline korlátot.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/id.json b/src/locale/translations/id.json
index 277d4a67d..d935c7a06 100644
--- a/src/locale/translations/id.json
+++ b/src/locale/translations/id.json
@@ -14,6 +14,8 @@
     "discard": "Singkirkan",
     "remove": "Hapus",
     "go": "Lanjutkan",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Tutup",
     "save": "Simpan",
     "confirm": "Konfirmasi",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Saldo tersedia untuk dibelanjakan",
     "home": "Beranda",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Peristiwa",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Tetapan",
     "search": "Cari",
     "send": "Hantar",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Geser untuk mengirim",
     "done": "Selesai",
     "previous": "Sebelumnya",
@@ -38,6 +43,7 @@
     "exchanges": "Daftar Bursa",
     "scan": "Pindai",
     "request": "Permintaan",
+    "receiveOnAccount": "Receive on account",
     "details": "Rincian",
     "recipient": "Penerima",
     "destination": "tujuan",
@@ -48,6 +54,11 @@
     "continue": "Teruskan",
     "code": "Kode",
     "copy": "Salin",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Dipilih",
     "share": "Kongsi",
@@ -119,6 +130,7 @@
     "day": "hari",
     "days": "days",
     "week": "minggu",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Kunci otomatis",
     "suggested": "Disarankan",
     "low": "Rendah",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Takson token",
     "uri": "URI",
     "transferFee": "Biaya transfer",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ID token",
     "tokenIDs": "ID token",
     "tokenOffers": "Penawaran token",
@@ -227,6 +244,7 @@
     "strong": "Kuat",
     "veryStrong": "Sangat kuat",
     "subject": "Subyek",
+    "credentialType": "Credential Type",
     "empty": "Kosong",
     "update": "Memperbarui",
     "notNow": "Bukan sekarang",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp ingin membuka URL ini.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Buat tautan Permintaan Pembayaran",
     "transactionFeeIsNotSet": "Biaya transaksi tidak diatur, harap tunggu sampai biaya transaksi ditetapkan, dan coba lagi!",
     "unableToSetAccountSequence": "Tidak dapat menset aturan akun, silakan cek Anda terhubung ke internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Keamanan dulu",
     "slideThree_desc": "Aplikasi dan platform Xumm dibangun dengan keamanan sebagai prioritas. Jangan pernah memasukkan rahasia Anda lagi, tanda tangani transaksi dari perangkat Anda sendiri yang tepercaya.",
     "slideFour_title": "Kirim dan terima",
-    "slideFour_desc": "Anda juga dapat mengirim dan menerima XRP dan token tepercaya lainnya"
+    "slideFour_desc": "Anda juga dapat mengirim dan menerima XRP dan token tepercaya lainnya",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Siapkan kode sandi",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Tidak dapat mengambil transaksi akun!",
     "canNotFetchSignRequests": "Tidak dapat mengambil permintaan tandatangan akun!",
     "unableToLoadTheTransaction": "Tidak dapat memuat transaksi, harap pastikan Anda terhubung ke internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Tag tujuan pembayaran adalah: %{tag}",
     "itWasInstructedToDeliver": "Itu diinstruksikan untuk mengirimkan %{amount} %{currency}",
     "bySpendingUpTo": "dengan membelanjakan hingga %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Ini menghapus akun %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Ini diinstruksikan untuk mengirimkan sisa saldo dari %{amount} %{currency} ke %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Transaksi akan membatalkan cek dengan ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Ini memberi otorisasi kepada %{address} untuk mengirim pembayaran ke akun ini",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Ini menghapus otorisasi untuk %{address} untuk mengirim pembayaran ke akun ini",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Ini menghapus TrustLine currency %{currency} menjadi %{issuer}",
     "itEstablishesTrustLineTo": "Ini menetapkan %{limit} sebagai jumlah maksimum %{currency} dari %{issuer} yang bersedia ditahan oleh %{address}.",
     "itRemovesTheAccountDomain": "Ini menghapus domain akun",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Masukkan nama atau alamat",
     "enterCurrencyCodeOrName": "Masukkan kode mata uang atau nama",
     "enterName": "Harap masukkan nama",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontak sudah ada",
     "contactSuccessSaved": "Kontak berhasil ditambahkan",
     "contactSuccessUpdated": "Kontak berhasil diperbarui",
@@ -759,6 +801,8 @@
     "changePasscode": "Ubah kode sandi",
     "biometricAuthentication": "Autentikasi biometrik",
     "hapticFeedback": "Umpan balik sentuhan",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "mode pengembang",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Gunakan format mata uang sistem",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Apakah Anda yakin ingin kembali? \r\n (Anda harus kembali mengisi semua masukan untuk alasan keamanan)",
     "accountType": "Jenis akun",
     "secretType": "Jenis rahasia",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Pilih jenis akun Anda",
     "pleaseSelectAccountSecretType": "Silakan pilih jenis rahasia akun Anda",
     "fullAccess": "Akses penuh",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Tidak ada hasil pencarian",
     "noContact": "Tidak ada kontak",
     "myAccount": "Akun saya",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Alamat Sumber dan Tujuan tidak boleh sama!",
     "enterANameOrAddress": "Masukkan nama atau alamat",
     "transferredSuccessfully": "Transaksi Anda telah berhasil didaftarkan pada buku besar %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Tidak dapat menset nilai transaksi, silakan coba lagi.",
     "theDestinationAccountIsSetAsBlackHole": "Akun tujuan ditetapkan sebagai lubang hitam, mengirim ke akun ini akan menyebabkan kehilangan XRP yang dikirim.",
     "noDestinationTag": "Tidak ada tag tujuan",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Alamat ini membutuhkan Tag Tujuan",
     "pleaseEnterAmount": "Harap masukkan jumlah transaksi",
     "trustLineLimitExceeded": "Batas TrustLine terlampaui.\r\n\r\nSekarang: %{balance}\r\nMaks .: %{peer_limit}\r\nTersedia untuk diterbitkan: %{available}\r\n\r\nPenerima dapat memperbarui batas Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/it.json b/src/locale/translations/it.json
index c9f4736ef..b1dd9f513 100644
--- a/src/locale/translations/it.json
+++ b/src/locale/translations/it.json
@@ -14,6 +14,8 @@
     "discard": "Scarta",
     "remove": "Rimuovi",
     "go": "Vai",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Chiudi",
     "save": "Salva",
     "confirm": "Conferma",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Disponibile",
     "home": "Inizio",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Eventi",
     "profile": "Profilo",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Impostazioni",
     "search": "Cerca",
     "send": "Invia",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Scorri per inviare",
     "done": "Fatto",
     "previous": "Precedente",
@@ -38,6 +43,7 @@
     "exchanges": "Mercati",
     "scan": "Scansione",
     "request": "Richiesta",
+    "receiveOnAccount": "Receive on account",
     "details": "Dettagli",
     "recipient": "Destinatario",
     "destination": "Destinazione",
@@ -48,6 +54,11 @@
     "continue": "Continua",
     "code": "Codice",
     "copy": "Copia",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Selezionato",
     "share": "Condividi",
@@ -119,6 +130,7 @@
     "day": "giorno",
     "days": "days",
     "week": "settimana",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Blocco automatico",
     "suggested": "Suggerito",
     "low": "Basso",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Forte",
     "veryStrong": "Molto forte",
     "subject": "Soggetto",
+    "credentialType": "Credential Type",
     "empty": "Vuoto",
     "update": "Aggiornare",
     "notNow": "Non Ora",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp vuole aprire questo URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Creare una richiesta di collegamento di pagamento",
     "transactionFeeIsNotSet": "La tariffa della transazione non è stata definita, attendere che venga determinata e poi riprovare!",
     "unableToSetAccountSequence": "Impossibile impostare la Sequenza di account, verificare di essere connessi a internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "La sicurezza prima di tutto",
     "slideThree_desc": "L'applicazione e la piattaforma Xumm sono state pensate avendo la sicurezza in mente. Non inserire mai più le tue chiavi segrete, e firma una transazione solo dal tuo personale dispositivo.",
     "slideFour_title": "Invia e ricevi",
-    "slideFour_desc": "Puoi inviare e ricevere XRP e anche altre risorse attendibili (IOU)"
+    "slideFour_desc": "Puoi inviare e ricevere XRP e anche altre risorse attendibili (IOU)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Imposta un codice di sblocco",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Impossibile recuperare le transazioni dell'account!",
     "canNotFetchSignRequests": "Impossibile recuperare le richieste di segno di account!",
     "unableToLoadTheTransaction": "Impossibile caricare la transazione, per favore assicurati di essere connesso a internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Il pagamento ha il seguente tag di destinazione: %{tag}",
     "itWasInstructedToDeliver": "È stato ordinato di consegnare %{amount} %{currency}",
     "bySpendingUpTo": "È stato ordinato di consegnare %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Ha cancellato l'account %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "È stato ordinato di versare il saldo rimanente di %{amount} %{currency} all'account %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "La transazione annullerà l'assegno avente ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Autorizza l'account %{address} ad inviare pagamenti a questo conto",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Rimuove l'autorizzazione per l'account %{address} ad inviare pagamenti a questo conto",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "E' stata rimossa la valuta fiduciaria TrustLine %{currency} a %{issuer}",
     "itEstablishesTrustLineTo": "E' stata stabilita in %{limit} la quantità massima di %{currency} da %{issuer} che l'account %{address} è disposta a tenere.",
     "itRemovesTheAccountDomain": "Rimuove il dominio dell'account",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Inserisci un nome o un indirizzo",
     "enterCurrencyCodeOrName": "Inserisci il codice o il nome della valuta",
     "enterName": "Inserisci un nome",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Contatto già esistente",
     "contactSuccessSaved": "Contatto aggiunto con successo",
     "contactSuccessUpdated": "Contatto aggiornato con successo",
@@ -759,6 +801,8 @@
     "changePasscode": "Cambia il codice di sblocco",
     "biometricAuthentication": "Autenticazione biometrica",
     "hapticFeedback": "Feedback tattile",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Modalità sviluppatore",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Formattazione della valuta di sistema",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Sei sicuro di voler tornare indietro?\r\n(per motivi di sicurezza dovrai riempire nuovamente tutti i dati inseriti)",
     "accountType": "Tipo di account",
     "secretType": "Tipo chiave segreta",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Seleziona il tipo di account",
     "pleaseSelectAccountSecretType": "Seleziona la tipologia di sblocco per accedere al tuo account",
     "fullAccess": "Accesso completo",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Nessun risultato",
     "noContact": "Nessun contatto",
     "myAccount": "Il mio Account",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "L'indirizzo di origine e quello di destinazione non possono essere gli stessi!",
     "enterANameOrAddress": "Inserire nome o indirizzo",
     "transferredSuccessfully": "La tua transazione è stata registrata con successo nel %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Impossibile impostare la tassa di transazione, riprovare.",
     "theDestinationAccountIsSetAsBlackHole": "L'account di destinazione è un black hole, gli XRP inviati non potranno più essere recuperati.",
     "noDestinationTag": "Nessun tag di destinazione ",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Questo indirizzo richiede un tag di destinazione",
     "pleaseEnterAmount": "Inserisci l'importo della transazione",
     "trustLineLimitExceeded": "Il limite di TrustLine è stato superato, ora: %{balance}, massimo: %{peer_limit}, disponibile per l'emissione: %{available}. Il destinatario può aggiornare il limite di Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ja.json b/src/locale/translations/ja.json
index 86edd5599..12c3f3317 100644
--- a/src/locale/translations/ja.json
+++ b/src/locale/translations/ja.json
@@ -14,6 +14,8 @@
     "discard": "破棄する",
     "remove": "削除する",
     "go": "進む",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "閉じる",
     "save": "保存する",
     "confirm": "確認",
@@ -21,6 +23,7 @@
     "balance": "残高",
     "spendable": "利用可能残高",
     "home": "ホーム",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "取引履歴",
     "profile": "プロフィール",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "設定",
     "search": "検索",
     "send": "送金する",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "スライドして送信する",
     "done": "完了",
     "previous": "前に戻る",
@@ -38,6 +43,7 @@
     "exchanges": "取引所",
     "scan": "スキャンする",
     "request": "受け取る",
+    "receiveOnAccount": "Receive on account",
     "details": "詳細",
     "recipient": "受取人",
     "destination": "宛先",
@@ -48,6 +54,11 @@
     "continue": "続ける",
     "code": "コード",
     "copy": "コピー",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "選択",
     "selected": "選択済み",
     "share": "共有",
@@ -119,6 +130,7 @@
     "day": "日",
     "days": "日",
     "week": "週",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "自動ロック",
     "suggested": "推奨",
     "low": "低",
@@ -203,6 +215,11 @@
     "tokenTaxon": "トークンのTaxon",
     "uri": "URI",
     "transferFee": "送金手数料",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "トークン ID",
     "tokenIDs": "トークン ID",
     "tokenOffers": "トークン・オファー",
@@ -227,6 +244,7 @@
     "strong": "強い",
     "veryStrong": "とても強い",
     "subject": "件名",
+    "credentialType": "Credential Type",
     "empty": "まだ中身がありません",
     "update": "更新",
     "notNow": "今はやめる",
@@ -341,6 +359,7 @@
     "support": "サポート",
     "nfts": "NFT",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xAppがURLを開こうとしています。\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "支払要求リンクの作成",
     "transactionFeeIsNotSet": "取引手数料が設定されていません。取引手数料が設定されるまでお待ちいただき、再試行してください！",
     "unableToSetAccountSequence": "アカウント・シーケンスを設定できません。インターネットに接続されていることを確認してください。",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "注記: トランザクション手数料には、フック手数料%{hookFee} %{nativeAsset}が含まれています。",
@@ -386,7 +408,11 @@
     "slideThree_title": "セキュリティ第一主義",
     "slideThree_desc": "Xamanアプリケーションとプラットフォームは、セキュリティを最優先に作成されています。秘密鍵は決して他では入力しないでください。また、あなたが保有し信頼できるデバイス以外からトランザクションへの署名は行わないでください。",
     "slideFour_title": "送受信",
-    "slideFour_desc": "XRPやその他の信頼できる資産(IOU)の送受信も可能です。"
+    "slideFour_desc": "XRPやその他の信頼できる資産(IOU)の送受信も可能です。",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "パスコードを設定する",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "アカウントのトランザクションを取得できません！",
     "canNotFetchSignRequests": "アカウントのサインリクエストを取得できません！",
     "unableToLoadTheTransaction": "トランザクションをロードできません。インターネットに接続されていることを確認してください！",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "支払先のタグは次のとおりです : %{tag}",
     "itWasInstructedToDeliver": "%{amount} %{currency}をお届けするよう指示されました。",
     "bySpendingUpTo": "最大%{amount} %{currency}の利用が許可されています。",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "アカウント %{address} を削除しました。",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "残額の %{amount} %{currency} を%{destination}に届けるように指示されています。",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "トランザクションは ID %{checkId} のチェックを取り消します。",
     "itAuthorizesSendingPaymentsToThisAccount": "%{address} に、このアカウントへの支払いの送信を許可します。",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "このアカウントに支払いを送信するための %{address} の承認を削除します。",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "%{issuer} に対する通貨 %{currency} のTrustLineを削除しました。",
     "itEstablishesTrustLineTo": "このトランザクションにより、%{address}が保有してもよいと考える%{issuer}の%{currency}の最大量として、%{limit}が設定されます。",
     "itRemovesTheAccountDomain": "アカウントのドメインを削除します。",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "残高と準備金を確認",
     "transactionDetailsDifferentNetworkError": "このトランザクションは、接続中のネットワークでは有効ではありません。\n\n%{network}に切り替えてもう一度お試しください。",
     "fetchingTransactionFromNetwork": "ネットワークからトランザクションを取得しています",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "トランザクションはID %{tokenID} のURIトークンをバーンします。",
     "uriTokenBuyExplain": "%{address}は%{amount} %{currency}を支払い、ID %{tokenID} のURIトークンを受け取りました。",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "名前またはアドレスを入力してください",
     "enterCurrencyCodeOrName": "通貨コードまたは通貨名の入力",
     "enterName": "名前を入力してください",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "連絡先はすでに存在します",
     "contactSuccessSaved": "連絡先を追加しました",
     "contactSuccessUpdated": "連絡先を更新しました",
@@ -759,6 +801,8 @@
     "changePasscode": "パスコードを変更する",
     "biometricAuthentication": "生体認証",
     "hapticFeedback": "触覚フィードバック",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "開発者モード",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "システムの通貨形式を使用",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "本当に戻りますか？\r\n（セキュリティ上の理由により、全ての項目を再度入力する必要があります）",
     "accountType": "アカウントの種類",
     "secretType": "シークレットタイプ",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "アカウントの種類を選択してください",
     "pleaseSelectAccountSecretType": "アカウントのシークレットタイプを選択してください",
     "fullAccess": "全権アクセス",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "暗号化方式の強化が必要なアカウントの確認",
     "updateEncryption": "暗号化方式の更新",
     "whyUseThisNewEncryptionMethod": "なぜ新しい暗号化方式を使うのですか？",
-    "newEncryptionExplain": "私たちの暗号化方式とセキュリティは、新しい規格であるAES512 GCMへと改善されています。より安全にご利用いただくために、この新しい方法でアカウントを暗号化する必要があります。すでに安全ではありますが、新しい規格にアップグレードして損はありません。",
+    "newEncryptionExplain": "私たちの暗号化方式とセキュリティは、新しい規格であるAES256 GCMへと改善されています。より安全にご利用いただくために、この新しい方法でアカウントを暗号化する必要があります。すでに安全ではありますが、新しい規格にアップグレードして損はありません。",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "暗号化中にデバイスの電源を切ったり、アプリを終了したりしないでください。",
     "unableToFetchAccountNFTokens": "アカウントのNFTを取得できません。XRP Ledgerノードに接続していることを確認してください。"
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "検索結果なし",
     "noContact": "連絡先なし",
     "myAccount": "マイアカウント",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "送信元アドレスと宛先アドレスを同じにすることはできません！",
     "enterANameOrAddress": "名前またはアドレスを入力してください",
     "transferredSuccessfully": "トランザクションは%{network}に正常に登録されました。",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "取引手数料を設定できません。再試行してください。",
     "theDestinationAccountIsSetAsBlackHole": "送信先のアカウントがブラックホールに設定されており、このアカウントに送信すると送信したXRPを失うことになります。",
     "noDestinationTag": "宛先タグなし",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "このアドレスには宛先タグが必要です",
     "pleaseEnterAmount": "取引金額を入力してください",
     "trustLineLimitExceeded": "トラストラインの制限を超えました。\r\n現在：%{balance}\r\n最大：%{peer_limit} \r\n発行可能：%{available} \r\n受取人はトラストラインの制限を更新することができます。",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ka.json b/src/locale/translations/ka.json
index 614e99ea6..207aa7722 100644
--- a/src/locale/translations/ka.json
+++ b/src/locale/translations/ka.json
@@ -14,6 +14,8 @@
     "discard": "გაუქმება",
     "remove": "წაშლა",
     "go": "დაყენება",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "დახურვა",
     "save": "დამახსოვრება",
     "confirm": "დადასტურება",
@@ -21,6 +23,7 @@
     "balance": "ბალანსი",
     "spendable": "გახარჯვადი",
     "home": "მთავარი",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "ტრანზაქციები",
     "profile": "პროფილი",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "პარამეტრები",
     "search": "ძებნა",
     "send": "გაგზავნა",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "გამოიყენეთ სლაიდი გაგზავნისთვის ",
     "done": "დასრულება",
     "previous": "უკან დაბრუნება",
@@ -38,6 +43,7 @@
     "exchanges": "ბირჟები",
     "scan": "სკანირება",
     "request": "მოთხოვნა",
+    "receiveOnAccount": "Receive on account",
     "details": "დეტალები",
     "recipient": "მიმღები",
     "destination": "დანიშნულების ადგილი",
@@ -48,6 +54,11 @@
     "continue": "გაგრძელება",
     "code": "კოდი",
     "copy": "დაკოპირება",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "არჩეული",
     "share": "გაზიარება",
@@ -119,6 +130,7 @@
     "day": "დღე",
     "days": "days",
     "week": "კვირა",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "აპლიკაციის ავტო-ჩაკეტვა",
     "suggested": "შემოთავაზებული",
     "low": "დაბალი",
@@ -203,6 +215,11 @@
     "tokenTaxon": "ტოკენ ტაქსონი",
     "uri": "URI",
     "transferFee": "გადარიცხვის საფასური",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ტოკენის ID",
     "tokenIDs": "ტოკენების ID",
     "tokenOffers": "ტოკენის შეთავაზებები",
@@ -227,6 +244,7 @@
     "strong": "ძლიერი",
     "veryStrong": "ძალიან ძლიერი",
     "subject": "საგანი",
+    "credentialType": "Credential Type",
     "empty": "ცარიელი",
     "update": "განახლება",
     "notNow": "ახლა არა",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp- ს სურს გახსნას ეს URL.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "შექმენით გადახდის მოთხოვნის ბმული",
     "transactionFeeIsNotSet": "ტრანზაქციის საკომისიო არ არის დაყენებული, გთხოვთ, დაელოდოთ ტრანზაქციის საკომისიოს დადგენას და სცადოთ ხელახლა!",
     "unableToSetAccountSequence": "ანგარიშის თანმიმდევრობის დაყენება შეუძლებელია, გთხოვთ, შეამოწმოთ, რომ დაკავშირებული ხართ ინტერნეტთან.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "უსაფრთხოება პირველ რიგში ",
     "slideThree_desc": "XUMM აპლიკაციის და მისი პლატფორმის აწყობის პროცესში, პირველ ადგილას ყოველთვის უსაფრთხოება იდგა. აპლიკაციაში სეკრეტის ხელმეორედ შეყვანა აღარ დაგჭირდებათ, დაამოწმეთ ტრანზაქციები თქვენი პირადი-სანდო მოწყობილობიდან.",
     "slideFour_title": "Გაგზავნა და მიღება",
-    "slideFour_desc": "თქვენ შეგიძლიათ გააგზავნოთ და მიიღოთ, როგორც XRP ასევე სხვადასხვა Trustline-ის მიერ გამოცემული აქტივები."
+    "slideFour_desc": "თქვენ შეგიძლიათ გააგზავნოთ და მიიღოთ, როგორც XRP ასევე სხვადასხვა Trustline-ის მიერ გამოცემული აქტივები.",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "დააყენეთ პასკოდი",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "არ შეგიძლიათ ანგარიშის ტრანსაქციების მიღება!",
     "canNotFetchSignRequests": "ვერ ხერხდება ანგარიშის დასტურების მიღება!",
     "unableToLoadTheTransaction": "ტრანზაქციის ჩატვირთვა ვერ ხერხდება, გთხოვთ დარმწუნდეთ, რომ დაკავშირებული ხართ ინტერნეტთან! ",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "გზავნილს გააჩნია მიმღები ანგარიშის თეგი: %{tag}",
     "itWasInstructedToDeliver": "ბრძანება შეიქმნა აღნიშნული რაოდენობის მიწოდების: %{amount} %{currency}",
     "bySpendingUpTo": "%{amount} %{currency}-ის გახარჯვით",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "წაშალა შემდეგი ანგარიში: %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "ბრძანება შეიქმნა დარჩენილი ბალანსის %{amount} %{currency}-ის მიწოდების შემდეგ მისამართზე: %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "ტრანზაქცია გააუქმებს ჩეკს, რომლის ID-ია: %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "ეს პარამეტრი უკეთებს ავტორიზირებას აღნიშნულ მისამართს: %{address} რომ განახორციელოს გზავნილი შემდეგ ანგარიშზე",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "ეს პარამეტრი ხსნის შემდეგ მისამართზე გზავნილის განხორციელების ავტორიზაციას ამ ანგარიშისთვის: %{address} ",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "%{issuer}-ის TrustLine-ის შემდეგი აქტივი მოხსნილია: %{currency}",
     "itEstablishesTrustLineTo": "ეს პარამეტრი აწესებს შემდეგ ლიმიტს: %{limit} როგორც %{currency}-ს მაქსიმალურ რაოდენობას შემდეგი გამომცემლისგან: %{issuer}, რაც შეიძლება რომ განთავსდეს აღნიშნულ ანგარიშზე: %{address}",
     "itRemovesTheAccountDomain": "ეს პარამეტრი ხსნის ანგარიშიდან დომენს",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "შეიყვანეთ სახელი ან მისამართი",
     "enterCurrencyCodeOrName": "შეიყვანეთ ვალუტის კოდი ან სახელი",
     "enterName": "გთხოვთ შეიყვანოთ სახელი",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "კონტაქტი უკვე არსებობს",
     "contactSuccessSaved": "კონტაქტი წარმატებით დაემატა",
     "contactSuccessUpdated": "კონტაქტი წარმატებით განახლდა",
@@ -759,6 +801,8 @@
     "changePasscode": "პასკოდის შეცვლა",
     "biometricAuthentication": "ბიომეტრიული ავთენტიფიკაცია",
     "hapticFeedback": "ვიბრაცია უკუკავშირზე ",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "დეველოპერის რეჟიმი ",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "სისტემის ვალუტის ფორმატირება",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "დარწმუნებული ხართ, რომ გსურთ უკან დაბრუნება?\r\n(უსაფრთხოებისათვის შეყვანილი ინფორმაციის ხელახლა შეყვანა დაგჭირდებათ)",
     "accountType": "ანგარიშის ტიპი",
     "secretType": "სეკრეტის ტიპი",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "გთხოვთ აირჩიოთ თქვენი ანგარიშის ტიპი",
     "pleaseSelectAccountSecretType": "გთხოვთ აირჩიოთ თქვენი ანგარიშის საიდუმლო ტიპი",
     "fullAccess": "სრული წვდომა",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "არაფერი მოიძებნა",
     "noContact": "კონტაქტები ცარიელია",
     "myAccount": "ჩემი ანგარიში",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "გამგზავნი და მიმღები მისამართები არ შეიძლება იყოს იგივე! ",
     "enterANameOrAddress": "შეიყვანეთ სახელი ან მისამართი",
     "transferredSuccessfully": "თქვენი ტრანზაქცია წარმატებით დარეგისტრირდა %{network}-ზე.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "ტრანზაქციის საკომისიოს დაყენება შეუძლებელია, გთხოვთ, სცადოთ ხელახლა.",
     "theDestinationAccountIsSetAsBlackHole": "მიმღები ანგარიში დაყენებულია როგროც შავი ხვრელი, ამ ანგარიშზე განხორციელებული გზავნილი გამოიწვევს თქვენი XRP-ის დაკარგვას.",
     "noDestinationTag": "მიმღები ანგარიშის თეგი ცარიელია",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "ამ მისამართზე მიმღები ანგარიშის თეგის შეყვანა სავალდებულოა ",
     "pleaseEnterAmount": "გთხოვთ შეიყვანეთ ტრანზაქციის რაოდენობა",
     "trustLineLimitExceeded": "\tTrustLine-ის ლიმიტი გადაჭარბებულია.\r\n\r\nახლა: %{balance}\r\nმაქსიმალური: %{peer_limit}\r\nგამოცემისთვის ხელმისაწვდომი: %{available}\r\n\r\nმიმღებ მისამართზე შესაძლებელია TrustLine-ის ლიმიტის განახლება.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/kk.json b/src/locale/translations/kk.json
index 1328326ee..df2cf0100 100644
--- a/src/locale/translations/kk.json
+++ b/src/locale/translations/kk.json
@@ -14,6 +14,8 @@
     "discard": "Қабылдамау",
     "remove": "Өшіру",
     "go": "Барыңыз",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Жабу",
     "save": "Сақтау",
     "confirm": "Растау",
@@ -21,6 +23,7 @@
     "balance": "Баланс",
     "spendable": "Жұмсауға болады",
     "home": "Үйге",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Оқиғалар",
     "profile": "Профиль",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Параметрлер",
     "search": "Іздеу",
     "send": "Жіберу",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Жіберу үшін слайд",
     "done": "Дайын",
     "previous": "Алдыңғы",
@@ -38,6 +43,7 @@
     "exchanges": "Айырмастырулар",
     "scan": "Сканерлеу",
     "request": "Сұрау",
+    "receiveOnAccount": "Receive on account",
     "details": "Толығырақ",
     "recipient": "Алушы",
     "destination": "Тағайындалған орны",
@@ -48,6 +54,11 @@
     "continue": "Жалғастыру",
     "code": "Код",
     "copy": "Көшіру",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Таңдалған",
     "share": "Бөлісу",
@@ -119,6 +130,7 @@
     "day": "күн",
     "days": "days",
     "week": "апта",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Автоматты құлыптау",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Күшті",
     "veryStrong": "Өте күшті",
     "subject": "Нысан",
+    "credentialType": "Credential Type",
     "empty": "Бос",
     "update": "Жаңарту",
     "notNow": "Қазір емес",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "%{xapp}' xApp бұл URL мекенжайын ашқысы келеді. %{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Төлем сұранысын құру үшін сілтеме",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Ең алдымен қауіпсіздік",
     "slideThree_desc": "Xumm қосымшасы мен платформасы қауіпсіздікті басымдық ретінде қарастырады. Ешқашан өз құпияңызды енгізбеңіз, өзіңіздің сенімді құрылғыңыздан транзакцияларға қол қойыңыз.",
     "slideFour_title": "Жіберу және алу",
-    "slideFour_desc": "Сондай-ақ XRP және басқа сенімді белгілерді жіберуге және алуға болады"
+    "slideFour_desc": "Сондай-ақ XRP және басқа сенімді белгілерді жіберуге және алуға болады",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Құпия сөзді орнату",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Шот бойынша транзакцияларды алу мүмкін емес!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Транзакцияны жүктеу мүмкін емес, интернетке қосылғаныңызға көз жеткізіңіз!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Төлем белгілеу тегі: %{tag}",
     "itWasInstructedToDeliver": "Оған жеткізу тапсырылды %{amount} %{currency}",
     "bySpendingUpTo": "жұмсауға дейін %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Ол тіркелгіні жойды %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Оған қалған қалдықты жеткізу тапсырылды %{amount} %{currency} - дан %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Транзакция ID көмегімен тексеруді болдырмайды %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Бұл авторизация %{address} to send payments to this account",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Бұл авторизацияны жояды %{address} төлемдерді осы шотқа жіберу үшін",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Бұл trustline валютасын жояды %{currency} - дан %{issuer}",
     "itEstablishesTrustLineTo": "Бұл %{limit} %{currency} %{issuer} максималды сомасы ретінде %{address} сақтауға дайын.",
     "itRemovesTheAccountDomain": "Бұл тіркелгі доменін жояды",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Атын немесе мекен-жайын енгізіңіз",
     "enterCurrencyCodeOrName": "Валюта кодын немесе атауын енгізіңіз",
     "enterName": "Атын енгізіңіз",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Байланыс қазірдің өзінде бар",
     "contactSuccessSaved": "Контакт сәтті қосылды",
     "contactSuccessUpdated": "Байланыс сәтті жаңартылды",
@@ -759,6 +801,8 @@
     "changePasscode": "Құпиясөзді өзгерту",
     "biometricAuthentication": "Биометриялық аутентификация",
     "hapticFeedback": "Тактильді кері байланыс",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Әзірлеуші режимі",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Валюта жүйесін пайдалану форматы",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Сіз шынымен оралғыңыз келе ме? (қауіпсіздік мақсатында барлық кірістерді қайтадан толтырыңыз)",
     "accountType": "Шот түрі",
     "secretType": "Құпия көрініс",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Есептік жазба түрін таңдаңыз",
     "pleaseSelectAccountSecretType": "Есептік жазбаңыздың құпия түрін таңдаңыз",
     "fullAccess": "Толық қол жеткізу",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Іздеу нәтижесі жоқ",
     "noContact": "Ешқандай контактілер",
     "myAccount": "Менің Шотым",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Дереккөздің мекен-жайы мен тағайындалған мекен-жайы бірдей бола алмайды!",
     "enterANameOrAddress": "Атын немесе мекен-жайын енгізіңіз",
     "transferredSuccessfully": "Сіздің транзакцияңыз %{network} тізілімінде сәтті тіркелді.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Мақсатты шот қара тесік ретінде орнатылады, осы шотқа жіберу жіберілген XRP жоғалуына әкеледі.",
     "noDestinationTag": "Тағайындау тегі жоқ",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Бұл мекен-жай тағайындалған тегті қажет етеді",
     "pleaseEnterAmount": "Сіз жібергіңіз келетін соманы толтырыңыз",
     "trustLineLimitExceeded": "Trustline шегі асып кетті.\r\n\r\nЕнді: %{balance}\r\nМакс: %{peer_limit}\r\nШығару үшін қол жетімді: %{available}\r\n\r\nАлушы сенім сызығының шегін жаңарта алады.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/kn.json b/src/locale/translations/kn.json
index 25627afe7..8649ed81f 100644
--- a/src/locale/translations/kn.json
+++ b/src/locale/translations/kn.json
@@ -14,6 +14,8 @@
     "discard": "ತ್ಯಜಿಸಿ",
     "remove": "ತೆಗೆದುಹಾಕಿ",
     "go": "ಹೋಗಿ",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "ಮುಚ್ಚಿ",
     "save": "ಉಳಿಸಿ",
     "confirm": "ದೃಢೀಕರಿಸಿ",
@@ -21,6 +23,7 @@
     "balance": "ಅಳತೆ",
     "spendable": "ಖರ್ಚು ಮಾಡಬಹುದಾದ",
     "home": "ಮನೆ",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "ಕಾರ್ಯಕ್ರಮಗಳು",
     "profile": "ಪ್ರೊಫೈಲ್",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "ಸಂಯೋಜನೆಗಳು",
     "search": "ಹುಡುಕಿ",
     "send": "ಕಳುಹಿಸು",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "ಕಳುಹಿಸಲು ಸ್ಲೈಡ್ ಮಾಡಿ",
     "done": "ಮುಗಿದಿದೆ",
     "previous": "ಹಿಂದಿನದು",
@@ -38,6 +43,7 @@
     "exchanges": "ಯ್ಕ್ಸ್ ಚೇಂಜ್ ಸ್",
     "scan": "ಸ್ಕ್ಯಾನ್ ಮಾಡಿ",
     "request": "ವಿನಂತಿ",
+    "receiveOnAccount": "Receive on account",
     "details": "ವಿವರಗಳು",
     "recipient": "ಸ್ವೀಕರಿಸುವವರು",
     "destination": "ಗಮ್ಯಸ್ಥಾನ",
@@ -48,6 +54,11 @@
     "continue": "ಮುಂದುವರಿಸಿ",
     "code": "ಕೋಡ್",
     "copy": "ನಕಲಿಸಿ",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ",
     "share": "ಹಂಚಿಕೊಳ್ಳಿ",
@@ -119,6 +130,7 @@
     "day": "ದಿನ",
     "days": "days",
     "week": "ವಾರ",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "ಸ್ವಯಂ ಲಾಕ್",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "ಬಲವಾದ",
     "veryStrong": "ತುಂಬಾ ಬಲಶಾಲಿ",
     "subject": "ವಿಷಯ",
+    "credentialType": "Credential Type",
     "empty": "ಖಾಲಿ",
     "update": "ನವೀಕರಿಸಿ",
     "notNow": "ಈಗ ಸಾಧ್ಯವಿಲ್ಲ",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp ಈ URL ಅನ್ನು ತೆರೆಯಲು ಬಯಸುತ್ತದೆ.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "ಮೊದಲು ಭದ್ರತೆ",
     "slideThree_desc": "Xumm ಅಪ್ಲಿಕೇಶನ್ ಮತ್ತು ಪ್ಲಾಟ್‌ಫಾರ್ಮ್ ಅನ್ನು ಸುರಕ್ಷತೆಯನ್ನು ಗಮನದಲ್ಲಿಟ್ಟುಕೊಂಡು ನಿರ್ಮಿಸಲಾಗಿದೆ. ನಿಮ್ಮ ರಹಸ್ಯಗಳನ್ನು ಮತ್ತೆ ನಮೂದಿಸಬೇಡಿ, ನಿಮ್ಮ ಸ್ವಂತ, ವಿಶ್ವಾಸಾರ್ಹ ಸಾಧನದಿಂದ ವ್ಯವಹಾರಕ್ಕೆ ಸಹಿ ಮಾಡಿ.",
     "slideFour_title": "ಕಳುಹಿಸಿ ಮತ್ತು ಸ್ವೀಕರಿಸಿ",
-    "slideFour_desc": "ನೀವು XRP ಮತ್ತು ಇತರ ವಿಶ್ವಾಸಾರ್ಹ ಸ್ವತ್ತುಗಳನ್ನು (ಐಒಯು) ಕಳುಹಿಸಬಹುದು ಮತ್ತು ಸ್ವೀಕರಿಸಬಹುದು"
+    "slideFour_desc": "ನೀವು XRP ಮತ್ತು ಇತರ ವಿಶ್ವಾಸಾರ್ಹ ಸ್ವತ್ತುಗಳನ್ನು (ಐಒಯು) ಕಳುಹಿಸಬಹುದು ಮತ್ತು ಸ್ವೀಕರಿಸಬಹುದು",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "ಪಾಸ್ಕೋಡ್ ಅನ್ನು ಹೊಂದಿಸಿ",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "ಖಾತೆ ವಹಿವಾಟುಗಳನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "ವಹಿವಾಟನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ, ದಯವಿಟ್ಟು ನೀವು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "ಪಾವತಿ ಗಮ್ಯಸ್ಥಾನ ಟ್ಯಾಗ್ ಹೊಂದಿದೆ: %{tag}.",
     "itWasInstructedToDeliver": "ತಲುಪಿಸಲು ಸೂಚನೆ ನೀಡಲಾಯಿತು %{amount} %{currency}.",
     "bySpendingUpTo": "ವರೆಗೆ ಖರ್ಚು ಮಾಡುವ ಮೂಲಕ %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "ಇದು ಖಾತೆಯನ್ನು ಅಳಿಸಿದೆ %{address}.",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "ಉಳಿದ ಬಾಕಿ ತಲುಪಿಸಲು ಸೂಚನೆ ನೀಡಲಾಯಿತು %{amount} %{currency} ಗೆ %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "ವಹಿವಾಟು ID ಯೊಂದಿಗೆ ಚೆಕ್ ಅನ್ನು ರದ್ದುಗೊಳಿಸುತ್ತದೆ  %{checkId}.\r\n",
     "itAuthorizesSendingPaymentsToThisAccount": "ಇದು ಅಧಿಕಾರ ನೀಡುತ್ತದೆ %{address} ಈ ಖಾತೆಗೆ ಪಾವತಿಗಳನ್ನು ಕಳುಹಿಸಲು.\r\n",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "ಇದು ಅಧಿಕೃತತೆಯನ್ನು ತೆಗೆದುಹಾಕುತ್ತದೆ %{address} ಈ ಖಾತೆಗೆ ಪಾವತಿಗಳನ್ನು ಕಳುಹಿಸಲು.\r\n",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "ಇದು ಟ್ರಸ್ಟ್‌ಲೈನ್ ಕರೆನ್ಸಿಯನ್ನು ತೆಗೆದುಹಾಕಿದೆ %{currency} ಗೆ %{issuer}.\r\n",
     "itEstablishesTrustLineTo": "ಇದು ಸ್ಥಾಪಿಸುತ್ತದೆ %{limit} ನ ಗರಿಷ್ಠ ಮೊತ್ತವಾಗಿ %{currency} ನಿಂದ %{issuer} ಅದು %{address} ಹಿಡಿದಿಡಲು ಸಿದ್ಧವಾಗಿದೆ.\r\n",
     "itRemovesTheAccountDomain": "ಇದು ಖಾತೆ ಡೊಮೇನ್ ಅನ್ನು ತೆಗೆದುಹಾಕುತ್ತದೆ.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "ಹೆಸರು ಅಥವಾ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ",
     "enterCurrencyCodeOrName": "ಕರೆನ್ಸಿ ಕೋಡ್ ಅಥವಾ ಹೆಸರನ್ನು ನಮೂದಿಸಿ",
     "enterName": "ದಯವಿಟ್ಟು ಹೆಸರನ್ನು ನಮೂದಿಸಿ",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "ಸಂಪರ್ಕವು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ",
     "contactSuccessSaved": "ಸಂಪರ್ಕವನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಗಿದೆ",
     "contactSuccessUpdated": "ಸಂಪರ್ಕವನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ",
@@ -759,6 +801,8 @@
     "changePasscode": "ಪಾಸ್ಕೋಡ್ ಬದಲಾಯಿಸಿ",
     "biometricAuthentication": "ಬಯೊಮೀಟ್ರಿಕ್ ದೃಢೀಕರಣ",
     "hapticFeedback": "ಹ್ಯಾಪ್ಟಿಕ್ ಪ್ರತಿಕ್ರಿಯೆ",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "ಡೆವಲಪರ್ ಮೋಡ್",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "ಸಿಸ್ಟಮ್ ಕರೆನ್ಸಿ ಫಾರ್ಮ್ಯಾಟಿಂಗ್",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "ನೀವು ಹಿಂತಿರುಗಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?\r\n(ಭದ್ರತಾ ಕಾರಣಗಳಿಗಾಗಿ ನೀವು ಎಲ್ಲಾ ಒಳಹರಿವುಗಳನ್ನು ಮತ್ತೆ ಭರ್ತಿ ಮಾಡಬೇಕು)",
     "accountType": "ಖಾತೆಯ ಪ್ರಕಾರ",
     "secretType": "ರಹಸ್ಯ ಪ್ರಕಾರ",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "ದಯವಿಟ್ಟು ನಿಮ್ಮ ಖಾತೆ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ",
     "pleaseSelectAccountSecretType": "ದಯವಿಟ್ಟು ನಿಮ್ಮ ಖಾತೆಯ ರಹಸ್ಯ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ",
     "fullAccess": "ಪೂರ್ಣ ಪ್ರವೇಶ",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "ಹುಡುಕಾಟ ಫಲಿತಾಂಶವಿಲ್ಲ",
     "noContact": "ಸಂಪರ್ಕಗಳಿಲ್ಲ",
     "myAccount": "ನನ್ನ ಖಾತೆ",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "ಮೂಲ ಮತ್ತು ಗಮ್ಯಸ್ಥಾನ ವಿಳಾಸ ಒಂದೇ ಆಗಿರಬಾರದು!",
     "enterANameOrAddress": "ಹೆಸರು ಅಥವಾ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ",
     "transferredSuccessfully": "ನಿಮ್ಮ ವಹಿವಾಟನ್ನು %{network}‌ನಲ್ಲಿ ಯಶಸ್ವಿಯಾಗಿ ನೋಂದಾಯಿಸಲಾಗಿದೆ.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "ಎಚ್ಚರಿಕೆ: ಈ ಗಮ್ಯಸ್ಥಾನ ಖಾತೆಯನ್ನು ಕಪ್ಪು ಕುಳಿಯಂತೆ ಹೊಂದಿಸಲಾಗಿದೆ. ಈ ಖಾತೆಗೆ ಕಳುಹಿಸಿದ ಯಾವುದೇ ಎಕ್ಸ್‌ಆರ್‌ಪಿ ಹಣದ ನಷ್ಟಕ್ಕೆ ಕಾರಣವಾಗುತ್ತದೆ!",
     "noDestinationTag": "ಗಮ್ಯಸ್ಥಾನ ಟ್ಯಾಗ್ ಇಲ್ಲ",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "ಈ ವಿಳಾಸಕ್ಕೆ ಗಮ್ಯಸ್ಥಾನ ಟ್ಯಾಗ್ ಅಗತ್ಯವಿದೆ",
     "pleaseEnterAmount": "ದಯವಿಟ್ಟು ವಹಿವಾಟಿನ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ",
     "trustLineLimitExceeded": "ಟ್ರಸ್ಟ್‌ಲೈನ್ ಮಿತಿಯನ್ನು ಮೀರಿದೆ, ಈಗ:%{balance}, ಗರಿಷ್ಠ:%{peer_limit}, ವಿತರಿಸಲು ಲಭ್ಯವಿದೆ:%{available}. ಸ್ವೀಕರಿಸುವವರು ಟ್ರಸ್ಟ್‌ಲೈನ್ ಮಿತಿಯನ್ನು ನವೀಕರಿಸಬಹುದು.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ko.json b/src/locale/translations/ko.json
index 10b648143..9827d5858 100644
--- a/src/locale/translations/ko.json
+++ b/src/locale/translations/ko.json
@@ -14,6 +14,8 @@
     "discard": "폐기",
     "remove": "삭제",
     "go": "시작",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "닫기",
     "save": "저장",
     "confirm": "확인",
@@ -21,6 +23,7 @@
     "balance": "잔액",
     "spendable": "사용 가능 금액",
     "home": "홈",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "거래 내역",
     "profile": "프로필",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "설정",
     "search": "검색",
     "send": "송금하기",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "보내려면 스와이프 하십시오",
     "done": "완료",
     "previous": "이전",
@@ -38,6 +43,7 @@
     "exchanges": "거래소",
     "scan": "스캔하기",
     "request": "입금받기",
+    "receiveOnAccount": "Receive on account",
     "details": "세부정보",
     "recipient": "받는 사람",
     "destination": "데스티네이션",
@@ -48,6 +54,11 @@
     "continue": "계속",
     "code": "암호",
     "copy": "복사하기",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "선택된",
     "share": "공유하기",
@@ -119,6 +130,7 @@
     "day": "일",
     "days": "days",
     "week": "주",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "자동 잠금",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "강함",
     "veryStrong": "매우 강한",
     "subject": "제목",
+    "credentialType": "Credential Type",
     "empty": "공백",
     "update": "계좌 정보 업데이트",
     "notNow": "다음에",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp에서 이 URL을 열려고 합니다.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "보안 우선",
     "slideThree_desc": "XUMM은 보안을 우선으로 하고 개발되었습니다. 복잡하게 개인 키를 입력하지 말고, 신뢰할 수 있는 기기에서 쉽게 거래에 서명하세요.",
     "slideFour_title": "보내기 / 받기",
-    "slideFour_desc": "XRP 및 기타 신뢰할 수있는 자산 (IOU)도 보내고받을 수 있습니다."
+    "slideFour_desc": "XRP 및 기타 신뢰할 수있는 자산 (IOU)도 보내고받을 수 있습니다.",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "비밀번호 설정",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "계좌에 거래를 연결할 수 없습니다.",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "트랜잭션을 로드할 수 없습니다. 인터넷에 연결되어 있는지 확인하십시오.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "지불 목적지 태그: %{tag}",
     "itWasInstructedToDeliver": "%{amount} %{currency} 을(를) 전송하도록 지시되었습니다",
     "bySpendingUpTo": "최대 %{amount} %{currency}  까지 지출하는 방법",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "%{address} 은 삭제된 계좌입니다",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "%{destination} 으로 잔액 %{amount} %{currency} 을(를) 전송하도록 지시되었습니다 ",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "트랜잭션이 ID %{checkId} 로 확인을 취소합니다 %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "이 계정에 지불을 보내도록 %{address} 에게 권한을 줍니다",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "이 계정에 지불을 전송하기 위한 %{address} 에 대한 권한을 제거합니다",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "TrustLine %{currency} 를 %{issuer} 로 제거했습니다.",
     "itEstablishesTrustLineTo": "It establishes %{limit} as the maximum amount of %{currency} from %{issuer} that %{address} is willing to hold.",
     "itRemovesTheAccountDomain": "계정 도메인을 제거합니다",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "이름 또는 주소 입력",
     "enterCurrencyCodeOrName": "통화 코드 또는 이름을 입력하세요",
     "enterName": "이름을 입력하세요",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "연락처가 이미 있습니다.",
     "contactSuccessSaved": "연락처가 성공적으로 추가되었습니다.",
     "contactSuccessUpdated": "연락처가 성공적으로 업데이트되었습니다.",
@@ -759,6 +801,8 @@
     "changePasscode": "비밀번호 변경",
     "biometricAuthentication": "생체 인증",
     "hapticFeedback": "햅틱 피드백",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "개발자 모드",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "시스템 통화 포맷팅 사용하기",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "돌아가시겠습니까? (보안상의 이유로 모든 입력을 다시 채워야합니다)",
     "accountType": "계정 유형",
     "secretType": "비밀 유형",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "계정 유형을 선택하십시오",
     "pleaseSelectAccountSecretType": "계정 비밀 유형을 선택하십시오",
     "fullAccess": "전체 액세스",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "검색 결과 없음",
     "noContact": "연락처 없음",
     "myAccount": "내 계정",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "출발지와 목적지 주소는 같을 수 없습니다!",
     "enterANameOrAddress": "이름 또는 주소를 입력하세요.",
     "transferredSuccessfully": "거래가 %{network}에 성공적으로 등록되었습니다.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "입금 계좌가 블랙홀로 설정되어 있으므로 이 계좌로 전송시 XRP가 손실됩니다.",
     "noDestinationTag": "목적지 태그 없음",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "이 주소에는 목적지 태그가 필요합니다.",
     "pleaseEnterAmount": "거래 금액을 입력하세요",
     "trustLineLimitExceeded": "TrustLine 한도가 초과되었습니다. \r\n\r\n지금: %{balance}\r\n최대: %{peer_limit}\r\n발행 가능: %{available}\r\n\r\n수신자는 TrustLine 한도를 바꿀 수 있습니다. ",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/lt.json b/src/locale/translations/lt.json
index c0d44244b..ada64015e 100644
--- a/src/locale/translations/lt.json
+++ b/src/locale/translations/lt.json
@@ -14,6 +14,8 @@
     "discard": "Atmesti",
     "remove": "Pašalinti",
     "go": "Eiti",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Uždaryti",
     "save": "Išsaugoti",
     "confirm": "Patvirtinti",
@@ -21,6 +23,7 @@
     "balance": "Balansas",
     "spendable": "išleidžiamas",
     "home": "Pagrindinis",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Įvykiai",
     "profile": "Profilis",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Nustatymai",
     "search": "Paieška",
     "send": "Siųsti",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Braukite į šoną jei norite išsiųsti",
     "done": "padaryta",
     "previous": "Ankstesnis",
@@ -38,6 +43,7 @@
     "exchanges": "Mainai",
     "scan": "Nuskaityti",
     "request": "Prašymas",
+    "receiveOnAccount": "Receive on account",
     "details": "Išsami informacija",
     "recipient": "Gavėjas",
     "destination": "paskirties vieta",
@@ -48,6 +54,11 @@
     "continue": "Tęsti",
     "code": "Kodas",
     "copy": "Kopijuoti",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Pasirinktas",
     "share": "Dalintis",
@@ -119,6 +130,7 @@
     "day": "diena",
     "days": "days",
     "week": "Savaitė",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automatinis užraktas",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Stiprus",
     "veryStrong": "Labai stipru",
     "subject": "Tema",
+    "credentialType": "Credential Type",
     "empty": "Tuščia",
     "update": "Atnaujinti",
     "notNow": "Ne dabar",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp nori atidaryti šį URL.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Pirmiausia saugumas",
     "slideThree_desc": "Xumm taikymas ir platformos yra pastatytas su saugumu, kaip prioritetą. Niekada daugiau nebeveskite savo paslapčių, nepasirašykite operacijų iš savo, patikimo įrenginio.",
     "slideFour_title": "Siųsti ir gauti",
-    "slideFour_desc": "Galite siųsti ir gauti XRP ir kitų patikimų žetonų, taip pat"
+    "slideFour_desc": "Galite siųsti ir gauti XRP ir kitų patikimų žetonų, taip pat",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Nustatyti slaptažodį",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Nepavyksta gauti sąskaitos operacijų!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Nepavyko įkelti sandorį, prašome įsitikinkite, kad esate prisijungę prie interneto!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Mokėjimo paskirties žyma yra: %{tag}",
     "itWasInstructedToDeliver": "Buvo nurodyta pristatyti %{amount} %{currency}",
     "bySpendingUpTo": "išleidžiant iki %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Tai ištrynė sąskaitą %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Jis buvo pavesta pristatyti likutį %{amount} %{currency} į %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Sandoris bus atšaukti čekį su ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Tai leidžia %{address} siųsti mokėjimus į šią sąskaitą",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Ji pašalina būtinybę %{address} siųsti mokėjimus į šią sąskaitą",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Tai pašalino pasitikėjimo linijos valiutą %{currency} į %{issuer}",
     "itEstablishesTrustLineTo": "Ji nustato %{limit} kaip maksimalią sumą %{currency} nuo %{issuer} kad %{address} kuri nori laikyti.",
     "itRemovesTheAccountDomain": "Tai pašalina paskyros domeną",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Įveskite vardą arba adresą",
     "enterCurrencyCodeOrName": "Įveskite valiutos kodą arba pavadinimą",
     "enterName": "Prašome įvesti vardą",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontaktinė jau egzistuoja",
     "contactSuccessSaved": "Kontaktine sėkmingai pridėtas",
     "contactSuccessUpdated": "Kontaktinė sėkmingai atnaujintas",
@@ -759,6 +801,8 @@
     "changePasscode": "Pakeiskite kodą",
     "biometricAuthentication": "Biometrinių duomenų autentifikavimas",
     "hapticFeedback": "Feedback - grįžtamasis ryšys",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Kūrėjo režimas",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Sistemos valiutos formatavimas",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Ar tikrai norite eiti atgal?\r\n(saugumo sumetimais turite iš naujo užpildyti visus įvestis)",
     "accountType": "Paskyros tipas",
     "secretType": "Slaptas tipas",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Pasirinkite savo paskyros tipą",
     "pleaseSelectAccountSecretType": "Pasirinkite savo paskyros slaptąjį tipą",
     "fullAccess": "Visiška prieiga",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Paieškos rezultatų nėra",
     "noContact": "Nėra kontaktų",
     "myAccount": "Mano paskyra",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Šaltinio ir paskirties adresas negali būti tas pats!",
     "enterANameOrAddress": "Įveskite vardą arba adresą",
     "transferredSuccessfully": "Jūsų operacija sėkmingai užregistruota %{network} sąskaitos knygoje",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Paskirties paskyra nustatyta kaip juodoji skylė. Siunčiant į šią sąskaitą bus prarasta išsiųsta XRP.",
     "noDestinationTag": "Nėra paskirties žymos",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Šis adresas reikalauja paskirties žymos",
     "pleaseEnterAmount": "Įveskite sumą, kurią norite pervesti",
     "trustLineLimitExceeded": "PasitikėjimoLinijos limitas viršytas.\r\n\r\nDabar: %{balance}\r\nMaks.: %{peer_limit}\r\nGalima išduoti: %{available}\r\n\r\nGavėjas gali atnaujinti PasitikėjimoLinijos limitą.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/lv.json b/src/locale/translations/lv.json
index 2c761fd70..fa6e7d514 100644
--- a/src/locale/translations/lv.json
+++ b/src/locale/translations/lv.json
@@ -14,6 +14,8 @@
     "discard": "Izmest",
     "remove": "Noņemt",
     "go": "Ieiet",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Aizvērt",
     "save": "Saglabāt",
     "confirm": "Apstiprināt",
@@ -21,6 +23,7 @@
     "balance": "Atlikums",
     "spendable": "Pieejamais",
     "home": "Sākums",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Pārskats",
     "profile": "Profils",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Iestatījumi",
     "search": "Meklēt",
     "send": "Sūtīt",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Sūtīt slīdrādi",
     "done": "Darīts",
     "previous": "Iepriekšējais",
@@ -38,6 +43,7 @@
     "exchanges": "Biržas",
     "scan": "Skenēt",
     "request": "Pieprasīt",
+    "receiveOnAccount": "Receive on account",
     "details": "informācija",
     "recipient": "Saņēmējs",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "Turpināt",
     "code": "Kods",
     "copy": "Kopēt",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Izvēlētais",
     "share": "Dalīties",
@@ -119,6 +130,7 @@
     "day": "diena",
     "days": "days",
     "week": "nedēļa",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automātiskā bloķēšana",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Spēcīgs",
     "veryStrong": "Ļoti spēcīga",
     "subject": "Priekšmets",
+    "credentialType": "Credential Type",
     "empty": "Tukšs",
     "update": "Atjaunināt",
     "notNow": "Ne tagad",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wants to open this URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Drošība pirmajā vietā",
     "slideThree_desc": "XUMM aplikācija veidota uz viedās drošības pamata. Nekad neievadiet savas pieejas atslēgas aplikācijā vēlreiz! Apstipriniet transakciju no uzticamas ierīces.",
     "slideFour_title": "Sūtīt un saņemt",
-    "slideFour_desc": "Jūs varat nosūtīt un saņemt XRP monētas un citus uzticamus aktīvus (IOU), kā arī"
+    "slideFour_desc": "Jūs varat nosūtīt un saņemt XRP monētas un citus uzticamus aktīvus (IOU), kā arī",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Pieejas koda iestatījumi",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Nevar ielādēt konta darījumus!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Neizdevās ielādēt transakciju, lūdzu pārliecinieties, ka esat pieslēgti tīklam!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Maksājuma galamērķa apzīmējums: %{tag}",
     "itWasInstructedToDeliver": "Tas bija instruēts piegādāt %{amount} %{currency}",
     "bySpendingUpTo": "tērējot līdz %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Dzēsts konts %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Tas bija instruēts nosūtīt %{amount} %{currency} atlikušo atlikumu uz %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Transakcija atcels pārbaudi ar personas apliecību %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Tā autorizē %{address} sūtīt maksājumus uz šo kontu",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Tas noņem atļauju %{address} sūtīt maksājumus uz šo kontu",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Tā noņēma TrustLine valūtu %{currency} %{issuer}",
     "itEstablishesTrustLineTo": "Tas izveido %{limit} kā %{currency} maksimālo summu no %{issuer} , kā %{address} aizturēšanai.",
     "itRemovesTheAccountDomain": "Tas noņem konta domēnu",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Ievadiet vārdu vai adresi",
     "enterCurrencyCodeOrName": "Ievadiet valūtas kodu vai nosaukumu",
     "enterName": "Lūdzu ievadiet vārdu",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakts jau pievienots",
     "contactSuccessSaved": "Kontakts veiksmīgi pievienots",
     "contactSuccessUpdated": "Kontakts veiksmīgi atjaunināts",
@@ -759,6 +801,8 @@
     "changePasscode": "Mainīt paroli",
     "biometricAuthentication": "Biometriskā autentifikācija",
     "hapticFeedback": "Laimīgas atsauksmes",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Izstrādātāja režīms",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Sistēmas valūtas formatēšana",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Vai esi drošs, ka gribi atgriezties? \r\n (Jums ir atkārtoti jāaizpilda ievadāmie lauki drošības apsvērumu dēļ)",
     "accountType": "Konta veids",
     "secretType": "Slepens tips",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Lūdzu, izvēlieties sava konta tipu",
     "pleaseSelectAccountSecretType": "Lūdzu, izvēlieties sava konta slepeno tipu",
     "fullAccess": "Pilnīga piekļuve",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Nav meklēšanas rezultātu",
     "noContact": "Nav kontaktu",
     "myAccount": "Mans konts",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Avota un galamērķa adrese nevar būt tāda pati!",
     "enterANameOrAddress": "Ievadiet nosaukumu vai adresi",
     "transferredSuccessfully": "Jūsu darījums ir veiksmīgi reģistrēts %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Saņēmēja konts iestatīts kā tukšums, sūtot uz šo kontu variet zaudēt nosūtītos XRP.",
     "noDestinationTag": "Nav autentifikatora",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Adresei nepieciešams autentifikators",
     "pleaseEnterAmount": "Lūdzu ievadiet summu, kuru vēlaties nosūtīt",
     "trustLineLimitExceeded": "TrustLine limits ir pārsniegts.\r\nTagad: Variable %{balance}\r\nMax: Variable %{peer_limit}\r\nPieejams izdošanai: Variable %{available}\r\n\r\nSaņēmējs var atjaunināt Trustline limitu.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ml.json b/src/locale/translations/ml.json
index b909526ab..e8aa477c7 100644
--- a/src/locale/translations/ml.json
+++ b/src/locale/translations/ml.json
@@ -14,6 +14,8 @@
     "discard": "നിരസിക്കുക",
     "remove": "നീക്കംചെയ്യുക",
     "go": "പോകൂ",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "അടയ്ക്കുക",
     "save": "രക്ഷിക്കും",
     "confirm": "സ്ഥിരീകരിക്കുക",
@@ -21,6 +23,7 @@
     "balance": "ബാലന്സ്",
     "spendable": "ചെലവഴിക്കാവുന്ന",
     "home": "വീട്",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "ഇവന്റുകൾ",
     "profile": "പ്രൊഫൈൽ",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "ക്രമീകരണങ്ങൾ",
     "search": "തിരയുക",
     "send": "അയയ്ക്കുക",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "അയയ്‌ക്കാൻ സ്ലൈഡ് ചെയ്യുക",
     "done": "ചെയ്‌തു",
     "previous": "മുമ്പത്തെ",
@@ -38,6 +43,7 @@
     "exchanges": "എക്സ്ചേഞ്ചുകൾ",
     "scan": "സ്കാൻ ചെയ്യുക",
     "request": "അഭ്യർത്ഥിക്കുക",
+    "receiveOnAccount": "Receive on account",
     "details": "വിശദാംശങ്ങൾ",
     "recipient": "സ്വീകർത്താവ്",
     "destination": "ലക്ഷ്യസ്ഥാനം",
@@ -48,6 +54,11 @@
     "continue": "തുടരുക",
     "code": "കോഡ്",
     "copy": "പകര്ത്തുക",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "തിരഞ്ഞെടുത്തു",
     "share": "പങ്കിടുക",
@@ -119,6 +130,7 @@
     "day": "ദിവസം",
     "days": "days",
     "week": "ആഴ്ച",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "യാന്ത്രിക-ലോക്ക്",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "ശക്തമായ",
     "veryStrong": "വളരെ ശക്തമാണ്",
     "subject": "വിഷയം",
+    "credentialType": "Credential Type",
     "empty": "ശൂന്യമാണ്",
     "update": "അപ്ഡേറ്റ്",
     "notNow": "ഇപ്പോൾ വേണ്ട",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp ഈ URL തുറക്കാൻ ആഗ്രഹിക്കുന്നു.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "ആദ്യം സുരക്ഷ",
     "slideThree_desc": "സുരക്ഷ കണക്കിലെടുത്ത് xumm ആപ്ലിക്കേഷൻ നിർമ്മിച്ചിരിക്കുന്നു. നിങ്ങളുടെ സ്വകാര്യ കീകൾ വീണ്ടും നൽകരുത്! നിങ്ങളുടെ സ്വന്തം, വിശ്വസനീയമായ ഉപകരണത്തിൽ നിന്ന് ഒരു ഇടപാട് ഒപ്പിടുക.",
     "slideFour_title": "അയച്ച് സ്വീകരിക്കുക",
-    "slideFour_desc": "നിങ്ങൾക്ക് എക്സ്ആർ‌പിയും മറ്റ് വിശ്വസനീയ ആസ്തികളും (ഐ‌യു‌എസ്) അയയ്‌ക്കാനും സ്വീകരിക്കാനും കഴിയും"
+    "slideFour_desc": "നിങ്ങൾക്ക് എക്സ്ആർ‌പിയും മറ്റ് വിശ്വസനീയ ആസ്തികളും (ഐ‌യു‌എസ്) അയയ്‌ക്കാനും സ്വീകരിക്കാനും കഴിയും",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "ഒരു പാസ്‌കോഡ് സജ്ജമാക്കുക",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "അക്കൗണ്ട് ഇടപാടുകൾ നേടാനാവില്ല!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "ഇടപാട് ലോഡുചെയ്യാനായില്ല! നിങ്ങൾ ഇന്റർനെറ്റുമായി ബന്ധിപ്പിച്ചിട്ടുണ്ടെന്ന് ഉറപ്പാക്കുക.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "പേയ്‌മെന്റിന് ഒരു ലക്ഷ്യസ്ഥാന ടാഗ് ഉണ്ട്: %{tag}.\r\n",
     "itWasInstructedToDeliver": "എത്തിക്കാൻ നിർദ്ദേശം നൽകി %{amount} %{currency}.\r\n",
     "bySpendingUpTo": "വരെ ചെലവഴിച്ചുകൊണ്ട് %{amount} %{currency}\r\n",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "ഇത് അക്കൗണ്ട് ഇല്ലാതാക്കി %{address}.\r\n",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "ബാക്കി തുക കൈമാറാൻ നിർദ്ദേശം നൽകി %{amount} %{currency} ടു %{destination}.\r\n",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "ഇടപാട് ഐഡി ഉപയോഗിച്ചുള്ള പരിശോധന റദ്ദാക്കും %{checkId}.\r\n",
     "itAuthorizesSendingPaymentsToThisAccount": "ഇത് അംഗീകാരം നൽകുന്നു %{address} ഈ അക്കൗണ്ടിലേക്ക് പേയ്‌മെന്റുകൾ അയയ്‌ക്കാൻ.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "ഇത് അംഗീകാരം നീക്കംചെയ്യുന്നു %{address} ഈ അക്കൗണ്ടിലേക്ക് പേയ്‌മെന്റുകൾ അയയ്‌ക്കാൻ.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "ഇത് ട്രസ്റ്റ്ലൈൻ കറൻസി നീക്കംചെയ്തു %{currency} ടു %{issuer}.\r\n",
     "itEstablishesTrustLineTo": "ഇത് സ്ഥാപിക്കുന്നു %{limit} പരമാവധി തുകയായി %{currency} മുതൽ %{issuer} അത് %{address} പിടിക്കാൻ തയ്യാറാണ്.\r\n",
     "itRemovesTheAccountDomain": "ഇത് അക്കൗണ്ട് ഡൊമെയ്ൻ നീക്കംചെയ്യുന്നു.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "പേരോ വിലാസമോ നൽകുക",
     "enterCurrencyCodeOrName": "കറൻസി കോഡോ പേരോ നൽകുക",
     "enterName": "ഒരു പേര് നൽകുക",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "കോൺ‌ടാക്റ്റ് ഇതിനകം നിലവിലുണ്ട്",
     "contactSuccessSaved": "കോൺ‌ടാക്റ്റ് വിജയകരമായി ചേർ‌ത്തു",
     "contactSuccessUpdated": "കോൺ‌ടാക്റ്റ് വിജയകരമായി അപ്‌ഡേറ്റുചെയ്‌തു",
@@ -759,6 +801,8 @@
     "changePasscode": "പാസ്‌കോഡ് മാറ്റുക",
     "biometricAuthentication": "ബയോമെട്രിക് പ്രാമാണീകരണം",
     "hapticFeedback": "ഹപ്‌റ്റിക് ഫീഡ്‌ബാക്ക്",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "ഡവലപ്പർ മോഡ്",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "സിസ്റ്റം കറൻസി ഫോർമാറ്റ് ഉപയോഗിക്കുക",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "നിങ്ങൾക്ക് തിരികെ പോകണമെന്ന് ഉറപ്പാണോ?\r\n(സുരക്ഷാ കാരണങ്ങളാൽ നിങ്ങൾ എല്ലാ ഇൻപുട്ടുകളും വീണ്ടും പൂരിപ്പിക്കണം)",
     "accountType": "അക്കൌണ്ട് തരം",
     "secretType": "രഹസ്യ തരം",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "നിങ്ങളുടെ അക്കൗണ്ട് തരം തിരഞ്ഞെടുക്കുക",
     "pleaseSelectAccountSecretType": "നിങ്ങളുടെ അക്കൗണ്ട് രഹസ്യ തരം തിരഞ്ഞെടുക്കുക",
     "fullAccess": "പൂർണ്ണ ആക്സസ്",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "തിരയൽ ഫലങ്ങളൊന്നുമില്ല",
     "noContact": "കോൺ‌ടാക്റ്റുകളൊന്നുമില്ല",
     "myAccount": "എന്റെ അക്കൗണ്ട്",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "ഉറവിടവും ലക്ഷ്യസ്ഥാന വിലാസവും ഒന്നായിരിക്കരുത്!",
     "enterANameOrAddress": "ഒരു പേരോ വിലാസമോ നൽകുക",
     "transferredSuccessfully": "നിങ്ങളുടെ ഇടപാട് %{network}ലെഡ്ജറിൽ വിജയകരമായി രജിസ്റ്റർ ചെയ്തു.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "മുന്നറിയിപ്പ്: ഈ ലക്ഷ്യസ്ഥാന അക്കൗണ്ട് ഒരു തമോഗർത്തമായി സജ്ജമാക്കി. ഈ അക്ക to ണ്ടിലേക്ക് അയച്ച ഏത് എക്സ്ആർ‌പിയും ഫണ്ട് നഷ്‌ടപ്പെടും.",
     "noDestinationTag": "ഉദ്ദിഷ്ടസ്ഥാന ടാഗ് ഇല്ല",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "ഈ വിലാസത്തിന് ഒരു ലക്ഷ്യസ്ഥാന ടാഗ് ആവശ്യമാണ്.",
     "pleaseEnterAmount": "ഈ ഇടപാടിനായി തുക നൽകുക.",
     "trustLineLimitExceeded": "ട്രസ്റ്റ്‌ലൈൻ പരിധി കവിഞ്ഞു.\r\nഇപ്പോൾ: %{balance} \r\nപരമാവധി: %{peer_limit}\r\nനൽകുന്നതിന് ലഭ്യമാണ്: %{available}\r\nസ്വീകർത്താവിന് ട്രസ്റ്റ്‌ലൈൻ പരിധി അപ്‌ഡേറ്റുചെയ്യാനാകും.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/mr.json b/src/locale/translations/mr.json
index c4744184c..9f2419e82 100644
--- a/src/locale/translations/mr.json
+++ b/src/locale/translations/mr.json
@@ -14,6 +14,8 @@
     "discard": "टाकून द्या",
     "remove": "काढा",
     "go": "जा",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "बंद",
     "save": "जतन करा",
     "confirm": "पुष्टी",
@@ -21,6 +23,7 @@
     "balance": "शिल्लक",
     "spendable": "खर्च करण्यायोग्य",
     "home": "मुख्यपृष्ठ",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "कार्यक्रम",
     "profile": "प्रोफाइल",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "सेटिंग्ज",
     "search": "शोधा",
     "send": "पाठवा",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "पाठविण्यासाठी स्लाइड",
     "done": "पूर्ण झाले",
     "previous": "मागील",
@@ -38,6 +43,7 @@
     "exchanges": "एक्सचेंज",
     "scan": "स्कॅन",
     "request": "विनंती",
+    "receiveOnAccount": "Receive on account",
     "details": "तपशील",
     "recipient": "प्राप्तकर्ता",
     "destination": "गंतव्य",
@@ -48,6 +54,11 @@
     "continue": "सुरू",
     "code": "कोड",
     "copy": "प्रत",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "निवडलेले",
     "share": "सामायिक करा",
@@ -119,6 +130,7 @@
     "day": "दिवस",
     "days": "days",
     "week": "आठवडा",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "स्वचलित कुलूप",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "मजबूत",
     "veryStrong": "अतिशय मजबूत",
     "subject": "विषय",
+    "credentialType": "Credential Type",
     "empty": "रिक्त",
     "update": "अद्यतनित करा",
     "notNow": "आता नाही",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}'   xApp ही URL उघडू इच्छित आहे.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "सुरक्षा प्रथम",
     "slideThree_desc": "प्राधान्य म्हणून झूमम अ‍ॅप्लिकेशन आणि प्लॅटफॉर्म सुरक्षिततेसह तयार केले गेले आहेत. पुन्हा कधीही आपली रहस्ये प्रविष्ट करु नका, आपल्या स्वत: च्या, विश्वसनीय डिव्हाइसवरून व्यवहारांवर स्वाक्षरी करा.",
     "slideFour_title": "पाठवा आणि प्राप्त करा",
-    "slideFour_desc": "आपण एक्सआरपी तसेच इतर विश्वासार्ह मालमत्ता (आयओयू) पाठवू आणि प्राप्त करू शकता"
+    "slideFour_desc": "आपण एक्सआरपी तसेच इतर विश्वासार्ह मालमत्ता (आयओयू) पाठवू आणि प्राप्त करू शकता",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "पासकोड सेट अप करा",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "खाती व्यवहार आणू शकत नाही!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "व्यवहार लोड करण्यात अक्षम, कृपया आपण इंटरनेटशी कनेक्ट असल्याचे सुनिश्चित करा!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "देयकास गंतव्य टॅग आहे: %{tag}\r\n",
     "itWasInstructedToDeliver": "वितरित करण्याच्या सूचना देण्यात आल्या %{amount} %{currency}\r\n",
     "bySpendingUpTo": "पर्यंत खर्च करून %{amount} %{currency}\r\n",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "यात खाते हटविले %{address}\r\n",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "उर्वरित शिल्लक देण्याची सूचना केली होती %{amount} %{currency} करण्यासाठी %{destination}\r\n",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "व्यवहार आयडीसह चेक रद्द करेल %{checkId}\r\n",
     "itAuthorizesSendingPaymentsToThisAccount": "तो अधिकृत करतो %{address} या खात्यावर देयके पाठविण्यासाठी",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "यासाठी अधिकृतता काढून टाकते %{address} या खात्यावर देयके पाठविण्यासाठी\r\n",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "हे ट्रस्टलाइन चलन काढले %{currency} करण्यासाठी %{issuer}\r\n",
     "itEstablishesTrustLineTo": "ते स्थापित करते %{limit} जास्तीत जास्त रक्कम म्हणून %{currency} पासून %{issuer} ते %{address} ठेवण्यासाठी तयार आहे.\r\n",
     "itRemovesTheAccountDomain": "हे खाते डोमेन काढून टाकते",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "नाव किंवा पत्ता प्रविष्ट करा",
     "enterCurrencyCodeOrName": "चलन कोड किंवा नाव प्रविष्ट करा",
     "enterName": "कृपया एखादे नाव प्रविष्ट करा",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "संपर्क आधीपासून विद्यमान आहे",
     "contactSuccessSaved": "संपर्क यशस्वीरित्या जोडला",
     "contactSuccessUpdated": "संपर्क यशस्वीरित्या अद्यतनित केला",
@@ -759,6 +801,8 @@
     "changePasscode": "पासकोड बदला",
     "biometricAuthentication": "बायोमेट्रिक प्रमाणीकरण",
     "hapticFeedback": "हॅप्टिक अभिप्राय",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "विकसक मोड",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "सिस्टम चलन स्वरूप वापरा",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "आपली खात्री आहे की आपण परत जाऊ इच्छिता?\r\n(सुरक्षिततेच्या कारणास्तव आपल्याला सर्व इनपुट पुन्हा भरावे लागतील)",
     "accountType": "खाते प्रकार",
     "secretType": "गुप्त प्रकार",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "कृपया आपल्या खात्याचा प्रकार निवडा",
     "pleaseSelectAccountSecretType": "कृपया आपला खाते गुप्त प्रकार निवडा",
     "fullAccess": "पूर्ण प्रवेश",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "शोध परिणाम नाही",
     "noContact": "संपर्क नाहीत",
     "myAccount": "माझे खाते",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "स्त्रोत आणि गंतव्य पत्ता समान असू शकत नाही!",
     "enterANameOrAddress": "नाव किंवा पत्ता प्रविष्ट करा",
     "transferredSuccessfully": "आपला व्यवहार %{network} खातीवर यशस्वीरित्या नोंदविला गेला आहे.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "गंतव्य खाते ब्लॅक होल म्हणून सेट केले आहे, या खात्यावर पाठविल्यास पाठविलेला एक्सआरपी गमावेल.",
     "noDestinationTag": "गंतव्य टॅग नाही",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "या पत्त्यास गंतव्य टॅग आवश्यक आहे",
     "pleaseEnterAmount": "कृपया या व्यवहारासाठी रक्कम प्रविष्ट करा.",
     "trustLineLimitExceeded": "ट्रस्टलाइनची मर्यादा ओलांडली आहे.\r\nआता: %{balance}\r\nकमाल: %{peer_limit}\r\nजारी करण्यासाठी उपलब्ध: %{available}\r\nप्राप्तकर्ता ट्रस्टलाइन मर्यादा अद्यतनित करू शकतात.\r\n\r\n",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/nl.json b/src/locale/translations/nl.json
index b340a3c65..ce78938b1 100644
--- a/src/locale/translations/nl.json
+++ b/src/locale/translations/nl.json
@@ -14,6 +14,8 @@
     "discard": "Verwijderen",
     "remove": "Verwijderen",
     "go": "Ga",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Sluiten",
     "save": "Opslaan",
     "confirm": "Bevestigen",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Beschikbaar",
     "home": "Start",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Gebeurtenissen",
     "profile": "Profiel",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Instellingen",
     "search": "Zoeken",
     "send": "Versturen",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Schuif om te versturen",
     "done": "Klaar",
     "previous": "Vorige",
@@ -38,6 +43,7 @@
     "exchanges": "Uitgevers",
     "scan": "Scannen",
     "request": "Verzoeken",
+    "receiveOnAccount": "Receive on account",
     "details": "Details",
     "recipient": "Ontvanger",
     "destination": "Bestemming",
@@ -48,6 +54,11 @@
     "continue": "Doorgaan",
     "code": "Code",
     "copy": "Kopiëren",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Selecteren",
     "selected": "Geselecteerd",
     "share": "Delen",
@@ -119,6 +130,7 @@
     "day": "dag",
     "days": "dagen",
     "week": "week",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automatisch vergrendelen",
     "suggested": "Voorgesteld",
     "low": "Laag",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer kosten",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token aanbiedingen",
@@ -227,6 +244,7 @@
     "strong": "Sterk",
     "veryStrong": "Zeer sterk",
     "subject": "Onderwerp",
+    "credentialType": "Credential Type",
     "empty": "Leeg",
     "update": "Bijwerken",
     "notNow": "Niet nu",
@@ -341,6 +359,7 @@
     "support": "Ondersteuning",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wil deze URL openen:\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Betalingsverzoek link maken",
     "transactionFeeIsNotSet": "Transactiekosten zijn niet ingesteld, wacht tot de transactiekosten zijn ingesteld en probeer het opnieuw!",
     "unableToSetAccountSequence": "Kan account Sequence niet instellen, controleer of u verbonden bent met internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset prijs",
     "priceData": "Prijsgegevens",
+    "credentialIDs": "Credential ID's",
     "scale": "Schaal",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Let op: De totale transactiekosten bevatten %{hookFee} %{nativeAsset} hooks kosten.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Veiligheid eerst",
     "slideThree_desc": "De Xaman applicatie en platform zijn gebouwd met veiligheid als prioriteit. Voer nooit meer uw geheimen in, onderteken transacties vanaf uw eigen, vertrouwde apparaat.",
     "slideFour_title": "Versturen en ontvangen",
-    "slideFour_desc": "U kunt XRP en andere vertrouwde tokens versturen en ontvangen"
+    "slideFour_desc": "U kunt XRP en andere vertrouwde tokens versturen en ontvangen",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Stel een toegangscode in",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Uit",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Handelskosten",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Geautoriseerde Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Amendment Inschakelen",
@@ -554,8 +583,15 @@
     "clawback": "Terugvorderen",
     "didSet": "DID Instellen",
     "didDelete": "DID Verwijderen",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Instellen",
     "oracleDelete": "Oracle Verwijderen",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Kan account transacties niet ophalen!",
     "canNotFetchSignRequests": "Kan account ondertekeningsverzoeken niet ophalen!",
     "unableToLoadTheTransaction": "Kan de transactie niet laden, controleer of u verbonden bent met internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "De betaling destination tag is: %{tag}",
     "itWasInstructedToDeliver": "Er werd opdracht gegeven om %{amount} %{currency} af te leveren",
     "bySpendingUpTo": "door maximaal %{amount} %{currency} uit te geven",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Het verwijderde account %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Er werd opdracht gegeven om het resterende saldo van %{amount} %{currency} af te leveren aan %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "De transactie zal check met ID %{checkId} annuleren",
     "itAuthorizesSendingPaymentsToThisAccount": "Het autoriseert %{address} om betalingen naar dit account te sturen",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Het verwijdert de autorisatie voor %{address} om betalingen naar dit account te sturen",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Het verwijderde TrustLine valuta %{currency} naar %{issuer}",
     "itEstablishesTrustLineTo": "Het stelt %{limit} in als het maximale bedrag van %{currency} van %{issuer} dat %{address} bereid is aan te houden.",
     "itRemovesTheAccountDomain": "Het verwijdert het account domein",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "Mijn saldo & reserve",
     "transactionDetailsDifferentNetworkError": "Deze transactie is niet geldig op het netwerk waarmee u verbonden bent.\n\nSchakel over naar %{network} en probeer het opnieuw.",
     "fetchingTransactionFromNetwork": "Transactie ophalen van netwerk",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Kan de uitleg niet laden",
     "uriTokenBurnExplain": "De transactie zal URI token met ID %{tokenID} verbranden",
     "uriTokenBuyExplain": "%{address} betaalde %{amount} %{currency} om een URI token met ID %{tokenID} te ontvangen",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Voer naam of adres in",
     "enterCurrencyCodeOrName": "Voer valutacode of naam in",
     "enterName": "Voer een naam in",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Contact bestaat al",
     "contactSuccessSaved": "Contact succesvol toegevoegd",
     "contactSuccessUpdated": "Contact succesvol bijgewerkt",
@@ -759,6 +801,8 @@
     "changePasscode": "Toegangscode wijzigen",
     "biometricAuthentication": "Biometrische authenticatie",
     "hapticFeedback": "Haptische feedback",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Ontwikkelaarsmodus",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Gebruik systeem valuta format",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Weet u zeker dat u terug wilt gaan? \r\n (u moet om veiligheidsredenen alle invoervelden opnieuw invullen)",
     "accountType": "Account type",
     "secretType": "Geheim type",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Selecteer uw account type",
     "pleaseSelectAccountSecretType": "Selecteer uw account geheim type",
     "fullAccess": "Volledige toegang",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Controleer welke accounts betere encryptie nodig hebben",
     "updateEncryption": "Encryptie bijwerken",
     "whyUseThisNewEncryptionMethod": "Waarom deze nieuwe encryptiemethode gebruiken?",
-    "newEncryptionExplain": "Onze encryptie & beveiliging is verbeterd naar nieuwe standaarden AES512 GCM. U zou uw account met deze nieuwe methode moeten versleutelen om extra veilig te zijn. Hoewel u al veilig bent, kan het geen kwaad om te upgraden naar de nieuwe standaarden.",
+    "newEncryptionExplain": "Onze encryptie & beveiliging is verbeterd naar nieuwe standaarden AES256 GCM. U zou uw account met deze nieuwe methode moeten versleutelen om extra veilig te zijn. Hoewel u al veilig bent, kan het geen kwaad om te upgraden naar de nieuwe standaarden.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Zet uw telefoon niet uit en sluit de app niet af tijdens de encryptie.",
     "unableToFetchAccountNFTokens": "Kan de account NFT's niet ophalen. Zorg ervoor dat u verbonden bent met de %{network} node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Geen zoekresultaten",
     "noContact": "Geen contacten",
     "myAccount": "Mijn Account",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Bron- en bestemmingsadres kunnen niet hetzelfde zijn!",
     "enterANameOrAddress": "Voer een naam of adres in",
     "transferredSuccessfully": "Uw transactie is succesvol geregistreerd op het %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Kan transactiekosten niet instellen, probeer het opnieuw.",
     "theDestinationAccountIsSetAsBlackHole": "Het bestemmingsaccount is ingesteld als black hole, versturen naar dit account zal leiden tot verlies van verstuurde %{currency}.",
     "noDestinationTag": "Geen destination tag",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Dit adres vereist een Destination Tag",
     "pleaseEnterAmount": "Voer het transactiebedrag in",
     "trustLineLimitExceeded": "TrustLine limiet is overschreden.\r\n\r\nNu: %{balance}\r\nMax: %{peer_limit}\r\nBeschikbaar voor uitgeven: %{available}\r\n\r\nDe ontvanger kan de Trustline limiet bijwerken.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oeps! Kan de Algemene Voorwaarden niet ophalen",
diff --git a/src/locale/translations/no-NO.json b/src/locale/translations/no-NO.json
index 2691d8c05..e68f5bb04 100644
--- a/src/locale/translations/no-NO.json
+++ b/src/locale/translations/no-NO.json
@@ -14,6 +14,8 @@
     "discard": "Forkast",
     "remove": "Fjern",
     "go": "Gå",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Lukk",
     "save": "Lagre",
     "confirm": "Bekreft",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Tilgjengelig",
     "home": "Hjem",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Hendelser",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Innstillinger",
     "search": "Søk",
     "send": "Send",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Skyv for å sende",
     "done": "Ferdig",
     "previous": "Forrige",
@@ -38,6 +43,7 @@
     "exchanges": "Banker",
     "scan": "Skan",
     "request": "Be om",
+    "receiveOnAccount": "Receive on account",
     "details": "Detaljer",
     "recipient": "Mottaker",
     "destination": "Destinasjon",
@@ -48,6 +54,11 @@
     "continue": "Fortsett",
     "code": "Kode",
     "copy": "Kopier",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Valgt",
     "share": "Del",
@@ -119,6 +130,7 @@
     "day": "dag",
     "days": "days",
     "week": "uke",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automatisk lås",
     "suggested": "Foreslått",
     "low": "Lav",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Overførings avgift",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Enhet ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Sterk",
     "veryStrong": "Veldig sterk",
     "subject": "Emne",
+    "credentialType": "Credential Type",
     "empty": "Tom",
     "update": "Oppdater",
     "notNow": "Ikke nå",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp ønsker å åpne denne nett-adressen.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Opprett betalingsforespørsel-link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Sikkerhet først",
     "slideThree_desc": "XUMM applikasjonen og plattformen er bygget med sikkerhet i fokus. Du trenger aldri oppgi din hemmlige nøkkel igjen, signer transaksjoner med din egen klarerte enhet.",
     "slideFour_title": "Send og motta",
-    "slideFour_desc": "Du kan sende og motta XRP samt andre pålitelige aktiva (IOU) i tillegg"
+    "slideFour_desc": "Du kan sende og motta XRP samt andre pålitelige aktiva (IOU) i tillegg",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Oppsett av kode",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Klarte ikke å hente konto-transaksjoner!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Klarte ikke å laste transaksjoner! Vennligst sørg for at du er tilkoblet Internet.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Betalingen har en destinasjons-kode: %{tag}.",
     "itWasInstructedToDeliver": "Det ble instruert å levere %{amount} %{currency}",
     "bySpendingUpTo": "ved å bruke opptil %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Det slettet konto %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Det ble instruert at gjenværende balanse på %{amount} %{currency} skal bli sendt til %{destination}.",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Transaksjonen vil kansellere sjekken med ID %{checkId}.",
     "itAuthorizesSendingPaymentsToThisAccount": "Det godkjenner %{address} å sende innbetalinger til denne kontoen",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Det fjerner godkjennelsen for %{address} til å sende betalinger til denne kontoen.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Det fjerner TrustLine valuta %{currency} til %{issuer}.",
     "itEstablishesTrustLineTo": "Den etablerer %{limit} som det maksimale beløpet på %{currency} fra %{issuer} som %{address} er villig til å ha.",
     "itRemovesTheAccountDomain": "Det fjerner kontoens domene",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Legg inn navn eller adresse",
     "enterCurrencyCodeOrName": "Oppgi valutakode eller navn",
     "enterName": "Vennligst legg inn et navn",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakt finnes allerede",
     "contactSuccessSaved": "Kontakten ble lagt til",
     "contactSuccessUpdated": "Kontakten ble oppdatert",
@@ -759,6 +801,8 @@
     "changePasscode": "Bytt kode",
     "biometricAuthentication": "Biometrisk autentisering",
     "hapticFeedback": "Haptisk tilbakemelding",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Utviklermodus",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Formatering av systemvaluta",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Er du sikker på at du vil gå tilbake?\r\n(du må da fylle inn alle data på nytt igjen av sikkerhetsgrunner)",
     "accountType": "Kontotype",
     "secretType": "Hemmelig type",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Vennligst velg kontotype",
     "pleaseSelectAccountSecretType": "Vennligst velg type hemmelighet for din konto",
     "fullAccess": "Full tilgang",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Ingen søkeresultater",
     "noContact": "Ingen kontakter",
     "myAccount": "Min Konto",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Kilde og destinasjonsadresse kan ikke være like!",
     "enterANameOrAddress": "Legg inn ett navn eller adresse",
     "transferredSuccessfully": "Transaksjonen din ble vellykket registrert på %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "ADVARSEL: denne destinasjonkontoen er konfigurert som et svart hull. Alt av XRP sent til denne kontoen vil resultere i tap av midler!",
     "noDestinationTag": "Blankt destinasjonsmerke",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Denne adressen krever et destinasjonsmerke",
     "pleaseEnterAmount": "Vennligst oppgi beløpet for transaksjonen",
     "trustLineLimitExceeded": "TillitsLinje-grense er overskredet, nåværende verdi: %{balance}, maks: %{peer_limit}, tilgjengelig for utstedelse: %{available}. Mottakeren kan oppdatere Tillitslinje-grense.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/pa.json b/src/locale/translations/pa.json
index fe7a61540..a37153e1f 100644
--- a/src/locale/translations/pa.json
+++ b/src/locale/translations/pa.json
@@ -14,6 +14,8 @@
     "discard": "ਡਿਸਕਾਰਡ",
     "remove": "ਰਿਮੂਵ",
     "go": "ਜਾਣਾ",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "ਕਲੋਜ਼",
     "save": "ਸੇਵ",
     "confirm": "ਪੁਸ਼ਟੀ ਕਰੋ",
@@ -21,6 +23,7 @@
     "balance": "ਸੰਤੁਲਨ",
     "spendable": "ਖਰਚ ਕਰਨ ਯੋਗ",
     "home": "ਘਰ",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "ਇਵੈ਼ੱਨਟ",
     "profile": "ਪ੍ਰੋਫ਼ਾਈਲ",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "ਸੈਟਿੰਗਸ",
     "search": "ਸੱਰਚ",
     "send": "ਭੇਜੋ",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "ਭੇਜਣ ਲਈ ਸਲਾਈਡ ਕਰੋ",
     "done": "ਸੈੱਨਡ",
     "previous": "ਪ੍ਰੀਵੀਅਸ",
@@ -38,6 +43,7 @@
     "exchanges": "ਐਕਸਚੇਂਜ",
     "scan": "ਸਕੈਨ",
     "request": "ਰਿਕਵੈਸਟ",
+    "receiveOnAccount": "Receive on account",
     "details": "ਡਿਟੇਲ",
     "recipient": "ਰਿਸਿਪਿਅੰਟ",
     "destination": "ਮੰਜ਼ਿਲ",
@@ -48,6 +54,11 @@
     "continue": "ਕਨਟਿਨਿਊ",
     "code": "ਕੋਡ",
     "copy": "ਕਾੱਪੀ",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "ਚੁਣਿਆ ਹੋਇਆ",
     "share": "ਸਾਂਝਾ ਕਰੋ",
@@ -119,6 +130,7 @@
     "day": "ਡੇ",
     "days": "days",
     "week": "ਹਫ਼ਤਾ",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "ਆਟੋ-ਲਾਕ",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "ਮਜ਼ਬੂਤ",
     "veryStrong": "ਬਹੁਤ ਮਜ਼ਬੂਤ",
     "subject": "ਵਿਸ਼ਾ",
+    "credentialType": "Credential Type",
     "empty": "ਐਂਪਟੀ",
     "update": "ਅਪਡੇਟ",
     "notNow": "ਨਾ ਹੁਣ",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp ਇਸ URL ਨੂੰ ਖੋਲ੍ਹਣਾ ਚਾਹੁੰਦਾ ਹੈ.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "ਸੁਰੱਖਿਆ ਪਹਿਲਾਂ",
     "slideThree_desc": "Xumm ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਧਿਆਨ ਵਿੱਚ ਰੱਖਦੇ ਹੋਏ ਬਣਾਇਆ ਗਿਆ ਹੈ. ਆਪਣੀਆਂ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀਆਂ ਮੁੜ ਕਦੇ ਨਾ ਭਰੋ! ਆਪਣੀ ਖੁਦ ਦੀ, ਭਰੋਸੇਮੰਦ ਡਿਵਾਈਸ ਤੋਂ ਸੌਦੇ ਤੇ ਦਸਤਖਤ ਕਰੋ.",
     "slideFour_title": "ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ",
-    "slideFour_desc": "ਤੁਸੀਂ ਐਕਸਆਰਪੀ ਭੇਜ ਸਕਦੇ ਹੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਨਾਲ ਹੀ ਹੋਰ ਭਰੋਸੇਯੋਗ ਸੰਪਤੀਆਂ (ਆਈਯੂਯੂ)"
+    "slideFour_desc": "ਤੁਸੀਂ ਐਕਸਆਰਪੀ ਭੇਜ ਸਕਦੇ ਹੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਨਾਲ ਹੀ ਹੋਰ ਭਰੋਸੇਯੋਗ ਸੰਪਤੀਆਂ (ਆਈਯੂਯੂ)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "ਇੱਕ ਪਾਸਕੋਡ ਸੈਟ ਅਪ ਕਰੋ",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "ਖਾਤਾ ਲੈਣ-ਦੇਣ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "ਲੈਣਦੇਣ ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ! ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਸੁਨਿਸ਼ਚਿਤ ਕਰੋ ਕਿ ਤੁਸੀਂ ਇੰਟਰਨੈਟ ਨਾਲ ਜੁੜੇ ਹੋ.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "ਭੁਗਤਾਨ ਦਾ ਇੱਕ ਟਿਕਾਣਾ ਟੈਗ ਹੈ: %{tag}.\r\n",
     "itWasInstructedToDeliver": "ਨੂੰ ਸਪੁਰਦ ਕਰਨ ਦੀ ਹਦਾਇਤ ਕੀਤੀ ਗਈ ਸੀ %{amount} %{currency}.\r\n",
     "bySpendingUpTo": "ਤੱਕ ਖਰਚ ਕੇ  %{amount} %{currency}\r\n",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "ਇਸ ਨਾਲ ਖਾਤਾ ਮਿਟਾ ਦਿੱਤਾ ਗਿਆ %{address}.\r\n",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "ਦੀ ਬਾਕੀ ਬਚੀ ਰਕਮ ਦੀ ਸਪੁਰਦਗੀ ਕਰਨ ਲਈ ਨਿਰਦੇਸ਼ ਦਿੱਤਾ ਗਿਆ ਸੀ %{amount} %{currency} ਨੂੰ %{destination}.\r\n",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "ਲੈਣ-ਦੇਣ ਆਈਡੀ ਨਾਲ ਚੈੱਕ ਨੂੰ ਰੱਦ ਕਰ ਦੇਵੇਗਾ %{checkId}.\r\n",
     "itAuthorizesSendingPaymentsToThisAccount": "ਇਹ ਅਧਿਕਾਰ ਹੈ %{address} ਇਸ ਖਾਤੇ ਵਿੱਚ ਭੁਗਤਾਨ ਭੇਜਣ ਲਈ.\r\n",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "ਇਹ ਅਧਿਕਾਰ ਨੂੰ ਹਟਾ ਦਿੰਦਾ ਹੈ %{address} ਇਸ ਖਾਤੇ ਵਿੱਚ ਭੁਗਤਾਨ ਭੇਜਣ ਲਈ.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "ਇਹ ਟਰੱਸਟਲਾਈਨ ਮੁਦਰਾ ਨੂੰ ਹਟਾ ਦਿੱਤਾ %{currency} ਨੂੰ %{issuer}.\r\n",
     "itEstablishesTrustLineTo": "ਇਹ ਸਥਾਪਿਤ ਕਰਦਾ ਹੈ %{limit} ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਮਾਤਰਾ ਵਜੋਂ %{currency} ਤੋਂ %{issuer} ਕਿ %{address} ਰੱਖਣ ਲਈ ਤਿਆਰ ਹੈ.\r\n",
     "itRemovesTheAccountDomain": "ਇਹ ਖਾਤਾ ਡੋਮੇਨ ਨੂੰ ਹਟਾ ਦਿੰਦਾ ਹੈ.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "ਨਾਮ ਜਾਂ ਪਤਾ ਦਾਖਲ ਕਰੋ",
     "enterCurrencyCodeOrName": "ਮੁਦਰਾ ਕੋਡ ਜਾਂ ਨਾਮ ਦਰਜ ਕਰੋ",
     "enterName": "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਨਾਮ ਦਾਖਲ ਕਰੋ",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "ਸੰਪਰਕ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ",
     "contactSuccessSaved": "ਸੰਪਰਕ ਸਫਲਤਾਪੂਰਵਕ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ",
     "contactSuccessUpdated": "ਸੰਪਰਕ ਸਫਲਤਾਪੂਰਵਕ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
@@ -759,6 +801,8 @@
     "changePasscode": "ਪਾਸਕੋਡ ਬਦਲੋ",
     "biometricAuthentication": "ਬਾਇਓਮੈਟ੍ਰਿਕ ਪ੍ਰਮਾਣਿਕਤਾ",
     "hapticFeedback": "ਹੈਪੇਟਿਕ ਫੀਡਬੈਕ",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "ਡਿਵੈਲਪਰ ਮੋਡ",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "ਸਿਸਟਮ ਮੁਦਰਾ ਦਾ ਫਾਰਮੈਟ ਵਰਤੋ",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "ਕੀ ਤੁਸੀਂ ਪੱਕਾ ਵਾਪਸ ਜਾਣਾ ਚਾਹੁੰਦੇ ਹੋ?\r\n(ਤੁਹਾਨੂੰ ਸੁਰੱਖਿਆ ਦੇ ਕਾਰਨਾਂ ਕਰਕੇ ਸਾਰੀ ਜਾਣਕਾਰੀ ਨੂੰ ਦੁਬਾਰਾ ਭਰਨਾ ਪਏਗਾ)",
     "accountType": "ਖਾਤਾ ਕਿਸਮ",
     "secretType": "ਗੁਪਤ ਕਿਸਮ",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਖਾਤੇ ਦੀ ਕਿਸਮ ਦੀ ਚੋਣ ਕਰੋ",
     "pleaseSelectAccountSecretType": "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਖਾਤੇ ਦੀ ਗੁਪਤ ਕਿਸਮ ਦੀ ਚੋਣ ਕਰੋ",
     "fullAccess": "ਪੂਰੀ ਪਹੁੰਚ",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "ਕੋਈ ਖੋਜ ਨਤੀਜਾ ਨਹੀਂ",
     "noContact": "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ",
     "myAccount": "ਮੇਰਾ ਖਾਤਾ",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "ਸਰੋਤ ਅਤੇ ਮੰਜ਼ਿਲ ਦਾ ਪਤਾ ਇਕੋ ਜਿਹਾ ਨਹੀਂ ਹੋ ਸਕਦਾ!",
     "enterANameOrAddress": "ਇੱਕ ਨਾਮ ਜਾਂ ਪਤਾ ਦਾਖਲ ਕਰੋ",
     "transferredSuccessfully": "ਤੁਹਾਡਾ ਲੈਣ-ਦੇਣ %{network} ਤੇ ਸਫਲਤਾਪੂਰਵਕ ਰਜਿਸਟਰ ਹੋਇਆ ਹੈ.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "ਚੇਤਾਵਨੀ: ਇਹ ਮੰਜ਼ਿਲ ਖਾਤਾ ਇੱਕ ਬਲੈਕ ਹੋਲ ਦੇ ਰੂਪ ਵਿੱਚ ਸੈਟ ਕੀਤਾ ਗਿਆ ਹੈ. ਇਸ ਖਾਤੇ ਨੂੰ ਭੇਜਿਆ ਗਿਆ ਕੋਈ ਵੀ ਐਕਸਆਰਪੀ ਫੰਡਾਂ ਦੇ ਨੁਕਸਾਨ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋਵੇਗਾ!",
     "noDestinationTag": "ਕੋਈ ਮੰਜ਼ਿਲ ਟੈਗ ਨਹੀਂ",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "ਇਸ ਪਤੇ ਲਈ ਇੱਕ ਟਿਕਾਣਾ ਟੈਗ ਚਾਹੀਦਾ ਹੈ.",
     "pleaseEnterAmount": "ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਸੌਦੇ ਲਈ ਰਕਮ ਦਾਖਲ ਕਰੋ.",
     "trustLineLimitExceeded": "ਟਰੱਸਟਲਾਈਨ ਦੀ ਹੱਦ ਪਾਰ ਹੋ ਗਈ ਹੈ.\r\nਹੁਣ: %{balance}\r\nਅਧਿਕਤਮ: %{peer_limit}\r\nਜਾਰੀ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹੈ: %{available}\r\nਪ੍ਰਾਪਤਕਰਤਾ ਟਰੱਸਟਲਾਈਨ ਸੀਮਾ ਨੂੰ ਅਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/pl.json b/src/locale/translations/pl.json
index 9f26c2bb7..95c59a13f 100644
--- a/src/locale/translations/pl.json
+++ b/src/locale/translations/pl.json
@@ -14,6 +14,8 @@
     "discard": "Odrzuć",
     "remove": "Usuń",
     "go": "Idź",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Zamknij",
     "save": "Zapisz",
     "confirm": "Potwierdź",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Do wydania",
     "home": "Strona główna",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Transakcje",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Ustawienia",
     "search": "Szukaj",
     "send": "Wyślij",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Przesuń, aby wysłać",
     "done": "Gotowe",
     "previous": "Poprzedni",
@@ -38,6 +43,7 @@
     "exchanges": "Giełdy",
     "scan": "Skanuj",
     "request": "Żądanie zapłaty",
+    "receiveOnAccount": "Receive on account",
     "details": "Szczegóły",
     "recipient": "Odbiorca",
     "destination": "Miejsce docelowe",
@@ -48,6 +54,11 @@
     "continue": "Kontynuuj",
     "code": "Kod",
     "copy": "Kopiuj",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Wybrane",
     "share": "Udostępnij",
@@ -119,6 +130,7 @@
     "day": "dzień",
     "days": "days",
     "week": "tydzień",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automatyczne blokowanie",
     "suggested": "Sugerowane",
     "low": "Niski",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxona",
     "uri": "Identyfikator URI",
     "transferFee": "Opłata transferowa",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Identyfikator tokenu",
     "tokenIDs": "Identyfikatory tokenów",
     "tokenOffers": "Oferty tokenów",
@@ -227,6 +244,7 @@
     "strong": "Mocne",
     "veryStrong": "Bardzo mocne",
     "subject": "Temat",
+    "credentialType": "Credential Type",
     "empty": "Pusty",
     "update": "Aktualizuj",
     "notNow": "Nie Teraz",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp chce otworzyć ten adres URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Utwórz link do żądania płatności",
     "transactionFeeIsNotSet": "Opłata transakcyjna nie jest ustawiona, proszę czekać, aż opłata transakcyjna zostanie ustawiona, i spróbuj ponownie!",
     "unableToSetAccountSequence": "Nie można ustawić kolejności kont, sprawdź, czy masz połączenie z Internetem.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Bezpieczeństwo przede wszystkim",
     "slideThree_desc": "Aplikacja i platforma XUMM zostały stworzone z myślą o bezpieczeństwie. Nigdy więcej nie wprowadzaj swoich sekretnych kluczy, podpisz transakcję z własnego, zaufanego urządzenia.",
     "slideFour_title": "Wyślij i odbierz ",
-    "slideFour_desc": "Możesz wysyłać i odbierać XRP jak również inne zaufane aktywa (IOU)"
+    "slideFour_desc": "Możesz wysyłać i odbierać XRP jak również inne zaufane aktywa (IOU)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Ustaw kod dostępu ",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Nie można pobrać transakcji dla konta!",
     "canNotFetchSignRequests": "Nie można pobrać żądania podpisania konta!",
     "unableToLoadTheTransaction": "Nie można załadować transakcji. Upewnij się, że nawiązano połączenie z Internetem.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Płatność ma Tag docelowy: %{tag}",
     "itWasInstructedToDeliver": "Został poinstruowany, aby dostarczyć %{amount} %{currency}",
     "bySpendingUpTo": "Został poinstruowany, aby dostarczyć %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Usunięte konto %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Został on poinstruowany o dostarczyniu pozostałego salda %{amount} %{currency} na %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Ta transakcja anuluje czek o identyfikatorze %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Upoważnia %{address} do wysyłania płatności na to konto",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Usuwa autoryzację dla %{address}, aby wysyłać płatności do tego konta",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Usunięto walutę TrustLine %{currency} do %{issuer}",
     "itEstablishesTrustLineTo": "Ustanawia %{limit} jako maksymalną kwotę %{currency} od %{issuer}, którą %{address} jest skłonny przechowywać.",
     "itRemovesTheAccountDomain": "Usuwa domenę konta",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Wprowadź nazwę lub adres",
     "enterCurrencyCodeOrName": "Wprowadź kod waluty lub nazwę",
     "enterName": "Wprowadź nazwę",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakt już istnieje",
     "contactSuccessSaved": "Kontakt pomyślnie dodany",
     "contactSuccessUpdated": "Kontakt został pomyślnie zaktualizowany",
@@ -759,6 +801,8 @@
     "changePasscode": "Zmień kod dostępu",
     "biometricAuthentication": "Uwierzytelnianie biometryczne",
     "hapticFeedback": "Wibracje przy powiadomieniu",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Tryb programisty",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Formatowanie walut według systemu operacyjnego",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Czy na pewno chcesz wrócić?\r\n(z względów bezpieczeństwa musisz ponownie wypełnić wszystkie dane wejściowe)",
     "accountType": "Typ konta",
     "secretType": "Typ tajnego kodu (secret type)",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Wybierz typ konta",
     "pleaseSelectAccountSecretType": "Wybierz typ tajnego kodu dla konta (secret type)",
     "fullAccess": "Pełny dostęp",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Brak wyników wyszukiwania",
     "noContact": "Brak kontaktów",
     "myAccount": "Moje konto",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Adres nadawczy i odbiorczy nie może być taki sam!",
     "enterANameOrAddress": "Wpisz nazwę lub adres",
     "transferredSuccessfully": "Twoja transakcja została pomyślnie zarejestrowana w księdze %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Nie można ustawić opłaty transakcyjnej. Spróbuj ponownie.",
     "theDestinationAccountIsSetAsBlackHole": "Konto docelowe jest ustawione jako czarna dziura, wysyłanie na to konto spowoduje utratę wysłanych XRP.",
     "noDestinationTag": "Brak tagu docelowego",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Ten adres wymaga tagu docelowego",
     "pleaseEnterAmount": "Wprowadź kwotę transakcji",
     "trustLineLimitExceeded": "Limit TrustLine został przekroczony, teraz: %{balance}, max: %{peer_limit}, dostępny do wydania: %{available}. Odbiorca może zaktualizować limit TrustLine.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/pt-BR.json b/src/locale/translations/pt-BR.json
index 297f1f69c..d23348256 100644
--- a/src/locale/translations/pt-BR.json
+++ b/src/locale/translations/pt-BR.json
@@ -14,6 +14,8 @@
     "discard": "Descartar",
     "remove": "Remover",
     "go": "Vamos",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Fechar",
     "save": "Salvar",
     "confirm": "Confirmar",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "  Gastável",
     "home": "Início",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Eventos",
     "profile": "Perfil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Configurações",
     "search": "Busca",
     "send": "Enviar",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Deslizar para enviar",
     "done": "Feito",
     "previous": "Anterior",
@@ -38,6 +43,7 @@
     "exchanges": "Corretoras",
     "scan": "Varredura",
     "request": "Solicitar",
+    "receiveOnAccount": "Receive on account",
     "details": "Detalhes",
     "recipient": "Beneficiário",
     "destination": "Destino",
@@ -48,6 +54,11 @@
     "continue": "Continuar",
     "code": "Código",
     "copy": "Copiar",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Selecionado",
     "share": "Compartilhar",
@@ -119,6 +130,7 @@
     "day": "dia",
     "days": "days",
     "week": "semana",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Bloqueio automático",
     "suggested": "Sugerido",
     "low": "Baixo",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Taxon do token",
     "uri": "URI",
     "transferFee": "Taxa de transferência",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ID do token",
     "tokenIDs": "IDs de token",
     "tokenOffers": "Ofertas de token",
@@ -227,6 +244,7 @@
     "strong": "Forte",
     "veryStrong": "Muito forte",
     "subject": "Assunto",
+    "credentialType": "Credential Type",
     "empty": "Vazio",
     "update": "Atualizar",
     "notNow": "Agora não",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp quer abrir esta URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Criar conexão \"Pedido de Pagamento\"",
     "transactionFeeIsNotSet": "Taxa de transação não é definida, aguarde até que a taxa de transação seja definida, e tente novamente!",
     "unableToSetAccountSequence": "Incapaz de configurar Sequência de contas, por favor, verifique você está conectado à internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Segurança primeiro",
     "slideThree_desc": "A aplicação e plataforma XUMM foram construídas com a segurança em mente. Nunca introduza as suas palavra-chave (secret pass), assine uma transação a partir do seu dispositivo pessoal.",
     "slideFour_title": "Enviar e receber",
-    "slideFour_desc": "Você pode enviar e receber XRP e outros ativos confiáveis ​​(IOUs) também"
+    "slideFour_desc": "Você pode enviar e receber XRP e outros ativos confiáveis ​​(IOUs) também",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Configure um código PIN",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Não foi possível obter as transações da conta!",
     "canNotFetchSignRequests": "Não foi possível encontrar solicitações de assinaturas na conta!",
     "unableToLoadTheTransaction": "Incapaz de carregar a transação, por favor, certifique-se de estar conectado à internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "O pagamento tem uma tag de destino: %{tag}",
     "itWasInstructedToDeliver": "Foi instruída a entrega de %{amount} %{currency}",
     "bySpendingUpTo": "Foi instruída a entrega de %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Foi excluída a conta %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Foi instruído a entregar o saldo restante de %{amount} %{currency} a %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "A transação cancelará o cheque com ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Autoriza %{address} a enviar pagamentos para esta conta.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Isso removerá a autorização de %{address} enviar pagamentos para esta conta.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Removeu a TrustLine do ativo %{currency} para %{issuer}",
     "itEstablishesTrustLineTo": "Isso estabelece o %{limit} como valor máximo de %{currency} a partir de %{issuer} que %{address} está disposto a assegurar.",
     "itRemovesTheAccountDomain": "Remove o domínio da conta.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Digite o nome ou endereço",
     "enterCurrencyCodeOrName": "Inserir código ou nome da moeda",
     "enterName": "Por favor, digite um nome",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Contato já existe",
     "contactSuccessSaved": "Contato adicionado com sucesso",
     "contactSuccessUpdated": "Contato atualizado com sucesso",
@@ -759,6 +801,8 @@
     "changePasscode": "Alterar código PIN",
     "biometricAuthentication": "Autenticação biométrica",
     "hapticFeedback": "Feedback Háptico",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Modo desenvolvedor",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Câmbio do sistema a formatar",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Tem certeza que deseja voltar atrás ? (você terá que preencher novamente todos os campos por motivos de segurança)",
     "accountType": "Tipo de conta",
     "secretType": "Tipo de segredo",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Por favor, selecione o seu tipo de conta",
     "pleaseSelectAccountSecretType": "Por favor, selecione o tipo de segredo da sua conta",
     "fullAccess": "Acesso completo",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Nenhum resultado de pesquisa",
     "noContact": "Sem contactos",
     "myAccount": "Minha Conta",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Endereço de origem e destino não pode ser o mesmo!",
     "enterANameOrAddress": "Digite um nome ou endereço",
     "transferredSuccessfully": "Sua transação foi registrada com sucesso na %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Incapaz de definir taxa de transação, tente novamente.",
     "theDestinationAccountIsSetAsBlackHole": "AVISO: A conta de destino está definida como buraco negro. O envio de XRP para esta conta, resultará numa perda de fundos.",
     "noDestinationTag": "Sem etiqueta de destino",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Este endereço requer uma etiqueta de destino (destination tag)",
     "pleaseEnterAmount": "Por favor, digite o valor para esta transação.",
     "trustLineLimitExceeded": "O limite TrustLine foi excedido, agora: %{balance}, máx: %{peer_limit}, disponível para emissão: %{available}. O destinatário pode atualizar o limite Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/pt.json b/src/locale/translations/pt.json
index c451292d0..1e36255b3 100644
--- a/src/locale/translations/pt.json
+++ b/src/locale/translations/pt.json
@@ -14,6 +14,8 @@
     "discard": "Descartar",
     "remove": "Remover",
     "go": "Avançar",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Fechar",
     "save": "Guardar",
     "confirm": "Confirmar",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Disponível",
     "home": "Início",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Eventos",
     "profile": "Perfil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Definições",
     "search": "Pesquisar",
     "send": "Enviar",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Deslizar para enviar",
     "done": "Concluído",
     "previous": "Anterior",
@@ -38,6 +43,7 @@
     "exchanges": "Corretoras",
     "scan": "Escanear",
     "request": "Solicitar",
+    "receiveOnAccount": "Receive on account",
     "details": "Detalhes",
     "recipient": "Destinatário",
     "destination": "Destino",
@@ -48,6 +54,11 @@
     "continue": "Continuar",
     "code": "Código",
     "copy": "Copiar",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Selecionado",
     "share": "Partilhar",
@@ -119,6 +130,7 @@
     "day": "dia",
     "days": "days",
     "week": "semana",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Bloqueio automático",
     "suggested": "Sugerido",
     "low": "Baixo",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Taxon do token",
     "uri": "URI",
     "transferFee": "Taxa de transferência",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ID do token",
     "tokenIDs": "IDs dos tokens",
     "tokenOffers": "Ofertas de token",
@@ -227,6 +244,7 @@
     "strong": "Forte",
     "veryStrong": "Muito forte",
     "subject": "Assunto",
+    "credentialType": "Credential Type",
     "empty": "Vazio",
     "update": "Atualizar",
     "notNow": "Agora não.",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp quer abrir esta URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Criar ligação \"Pedido de Pagamento\"",
     "transactionFeeIsNotSet": "Taxa de transação não é definida, aguarde até que a taxa de transação seja definida, e tente novamente!",
     "unableToSetAccountSequence": "Incapaz de configurar Sequência de contas, por favor, verifique você está conectado à internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Segurança em primeiro lugar",
     "slideThree_desc": "A aplicação XUMM e a plataforma foram construídas com a segurança como prioridade. Nunca introduza novamente as palavras-chave, assine uma transacção a partir do seu dispositivo pessoal e confiável. ",
     "slideFour_title": "Enviar e receber",
-    "slideFour_desc": "Pode enviar e receber XRP, e também outros ativos de confiança (IOU's) "
+    "slideFour_desc": "Pode enviar e receber XRP, e também outros ativos de confiança (IOU's) ",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Definir um código de acesso. ",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Não foi possível obter transações da conta!",
     "canNotFetchSignRequests": "Não foi possível encontrar solicitações de assinaturas na conta!",
     "unableToLoadTheTransaction": "Impossível carregar a transação, por favor certifique-se de que está ligado à internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "O pagamento tem uma etiqueta de destino: %{tag}.",
     "itWasInstructedToDeliver": "Foi instruída a entrega de %{amount} %{currency}.",
     "bySpendingUpTo": "Gastando até %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Foi apagada a conta %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Foi feita uma instrução para entregar o saldo restante de %{amount} %{currency} a %{destination}.",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "A transação irá cancelar o cheque com o ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Autoriza %{address} a enviar pagamentos para esta conta.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Isso removerá a autorização de %{address} enviar pagamentos para esta conta.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Removeu a TrustLine do activo %{currency} para %{issuer}.",
     "itEstablishesTrustLineTo": "Estabelece %{limit} como a quantidade máxima de %{currency} a partir %{issuer} que %{address} está disposta a manter.",
     "itRemovesTheAccountDomain": "Remove o domínio da conta.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Introduza o nome ou endereço",
     "enterCurrencyCodeOrName": "Inserir código ou nome da moeda",
     "enterName": "Por favor, introduza um nome",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "O contacto já existe.",
     "contactSuccessSaved": "Contato adicionado com sucesso",
     "contactSuccessUpdated": "Contacto atualizado com sucesso",
@@ -759,6 +801,8 @@
     "changePasscode": "Alterar código de acesso",
     "biometricAuthentication": "Autenticação biométrica",
     "hapticFeedback": "Feedback Háptico",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Modo desenvolvedor",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Formato de moeda do sistema",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Tem a certeza que deseja voltar? (terá de preencher todos os campos novamente, por motivos de segurança)",
     "accountType": "Tipo de conta",
     "secretType": "Tipo de segredo",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Por favor, seleccione o seu tipo de conta.",
     "pleaseSelectAccountSecretType": "Por favor selecione o seu tipo de segredo de conta",
     "fullAccess": "Acesso completo",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Nenhum resultado de pesquisa.",
     "noContact": "Sem contactos",
     "myAccount": "Minha Conta",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Endereço de origem e destino não pode ser o mesmo!",
     "enterANameOrAddress": "Introduza um nome ou endereço.",
     "transferredSuccessfully": "A sua transação foi registada com sucesso no %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Incapaz de definir taxa de transação, tente novamente.",
     "theDestinationAccountIsSetAsBlackHole": "Aviso : A conta de destino está definida como buraco negro. O envio de XRP para esta conta, resultará numa perda de fundos.",
     "noDestinationTag": "Sem etiqueta de destino (destination tag)",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Este endereço requer uma etiqueta de destino (destination tag).",
     "pleaseEnterAmount": "Por favor, introduza o montante para esta transação.",
     "trustLineLimitExceeded": "O limite TrustLine foi excedido, agora: %{balance}, máx: %{peer_limit}, disponível para emissão: %{available}. O destinatário pode atualizar o limite Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ro.json b/src/locale/translations/ro.json
index 8c103cbd4..5b0269883 100644
--- a/src/locale/translations/ro.json
+++ b/src/locale/translations/ro.json
@@ -14,6 +14,8 @@
     "discard": "Renunţare",
     "remove": "Înlăturare",
     "go": "Go",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Închidere",
     "save": "Salvare",
     "confirm": "Confirmare",
@@ -21,6 +23,7 @@
     "balance": "Sold",
     "spendable": "Sold disponibil",
     "home": "Acasă",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Evenimente",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Setări",
     "search": "Căutare",
     "send": "Trimite",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Glisați pentru a trimite.",
     "done": "Încheiat",
     "previous": "Înapoi",
@@ -38,6 +43,7 @@
     "exchanges": "Cursuri de schimb",
     "scan": "Scanare",
     "request": "Primește",
+    "receiveOnAccount": "Receive on account",
     "details": "Detalii",
     "recipient": "Destinatar",
     "destination": "Destinaţie",
@@ -48,6 +54,11 @@
     "continue": "Continuare",
     "code": "Cod",
     "copy": "Copiere",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Selectat",
     "share": "Partajare",
@@ -119,6 +130,7 @@
     "day": "zi",
     "days": "days",
     "week": "săptămână",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Blocare automată",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Puternic",
     "veryStrong": "Foarte puternic",
     "subject": "Subiect",
+    "credentialType": "Credential Type",
     "empty": "Gol",
     "update": "Modificați",
     "notNow": "Nu acum",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp vrea să deschidă acest URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Creează o cerere de plată",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Securitatea are prioritate.",
     "slideThree_desc": "Aplicaţia Xumm şi platforma sunt construite sa fie sigure. Nu mai introduceţi niciodată datele contului din XRPL, semnaţi o tranzacţie din propriul dumneavoastră dispozitiv de încredere.",
     "slideFour_title": "Trimitere şi primire",
-    "slideFour_desc": "Puteţi trimite/primi XRP şi alte active ( IOU-uri )."
+    "slideFour_desc": "Puteţi trimite/primi XRP şi alte active ( IOU-uri ).",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Creați un cod de acces",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Nu se pot lista tranzacţiile efectuate ! ",
     "canNotFetchSignRequests": "Nu poate afișa cererile de semnătură!",
     "unableToLoadTheTransaction": "Tranzacția nu poate fi încărcată. Vă rugăm să vă asigurați că sunteți conectat(ă) la internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Plata are ca etichetă (tag) de destinaţie: %{tag}.",
     "itWasInstructedToDeliver": "A fost instruit să livreze %{amount} %{currency}.",
     "bySpendingUpTo": "A fost instruit să livreze %{amount} %{currency}.",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "A fost şters contul %{address}.",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "A fost instruit să livreze soldul rămas  %{amount} %{currency} la %{destination}.",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Tranzacţia va anula cecul cu ID-ul %{checkId}.",
     "itAuthorizesSendingPaymentsToThisAccount": "Se autorizează %{address} să efectueze plăţi către acest cont.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Se înlătură autorizația %{address} de a efectua plăţi către acest cont.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Înlătură opțiunea TrustLine %{currency} pentru %{issuer}.",
     "itEstablishesTrustLineTo": "Se stabilește %{limit} ca sumă maximă de %{currency} de la %{issuer}, pe care %{address} este dispusă să o dețină.",
     "itRemovesTheAccountDomain": "Înlătură domeniul contului.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Introduceți un nume sau o adresă.",
     "enterCurrencyCodeOrName": "Introducere cod sau nume monedă",
     "enterName": "Introduceţi un nume.",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Contactul introdus există deja.",
     "contactSuccessSaved": "Contactul a fost adăugat cu succes.",
     "contactSuccessUpdated": "Contactul a fost actualizat cu succes.",
@@ -759,6 +801,8 @@
     "changePasscode": "Modificați codul de acces.",
     "biometricAuthentication": "Autentificare biometrică",
     "hapticFeedback": "Feedback haptic",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Opțiuni dezvoltator",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Utilizează formatul Monedă",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Sunteţi sigur(ă) că doriţi să vă întoarceţi ?\r\n(Câmpurile completate vor trebui recompletate din motive de securitate) ",
     "accountType": "Tipul contului",
     "secretType": "Tipul cheii secrete  ",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Vă rugăm să selectaţi tipul contului.",
     "pleaseSelectAccountSecretType": "Vă rugăm să selectați tipul de cheie secretă a contului.",
     "fullAccess": "Acces complet",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Niciun rezultat găsit",
     "noContact": "Fără contacte",
     "myAccount": "Contul meu",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Adresele sursă și de destinație nu pot fi identice !",
     "enterANameOrAddress": "Introduceți un nume sau o adresă.",
     "transferredSuccessfully": "Tranzacţia dumneavoastră a fost înregistrată cu succes în registrul %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Imposibil de stabilit taxa de tranzacție, vă rugăm să încercați din nou.",
     "theDestinationAccountIsSetAsBlackHole": "Atenție: Contul destinar este setat ca ”gaură neagră”. Acest lucru înseamnă că fondurile trimise la această adresă nu vor mai putea fi vreodată recuperate.",
     "noDestinationTag": "Nicio etichetă pentru destinaţie",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Această adresă necesită o etichetă (tag).",
     "pleaseEnterAmount": "Vă rugăm să introduceți suma tranzacției.",
     "trustLineLimitExceeded": "Limita funcției TrusLine este depășită, acum: %{balance}, max: %{peer_limit}, disponibil pentru emiterea: %{available}. Destinatarul poate actualiza limita funcției TrustLine.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ru.json b/src/locale/translations/ru.json
index 131ae23e2..6bf7e9200 100644
--- a/src/locale/translations/ru.json
+++ b/src/locale/translations/ru.json
@@ -14,6 +14,8 @@
     "discard": "Отмена",
     "remove": "Удалить",
     "go": "Начать",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Закрыть",
     "save": "Сохранить",
     "confirm": "Подтвердить",
@@ -21,6 +23,7 @@
     "balance": "Баланс",
     "spendable": "Доступно",
     "home": "Главная",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "События",
     "profile": "Профиль",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Настройки",
     "search": "Поиск",
     "send": "Отправить",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Переместите для отправки",
     "done": "Готово",
     "previous": "Предыдущий",
@@ -38,6 +43,7 @@
     "exchanges": "Обменники",
     "scan": "Сканировать",
     "request": "Получить",
+    "receiveOnAccount": "Receive on account",
     "details": "Детали",
     "recipient": "Получатель",
     "destination": "Назначение",
@@ -48,6 +54,11 @@
     "continue": "Продолжить",
     "code": "Код",
     "copy": "Копировать",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Выбранный",
     "share": "Поделиться",
@@ -119,6 +130,7 @@
     "day": "день",
     "days": "days",
     "week": "неделя",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Автоматическая блокировка",
     "suggested": "Предложено",
     "low": "Низкий",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Маркер Taxon",
     "uri": "URI",
     "transferFee": "Трансферная плата",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ИД маркера",
     "tokenIDs": "ИД маркеров",
     "tokenOffers": "Предложения маркеров",
@@ -227,6 +244,7 @@
     "strong": "Надежный",
     "veryStrong": "Очень надежный",
     "subject": "Тема",
+    "credentialType": "Credential Type",
     "empty": "Пусто",
     "update": "Обновление",
     "notNow": "Не сейчас",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp хочет открыть этот URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Ссылка на запрос на создание платежа",
     "transactionFeeIsNotSet": "Плата за транзакцию не установлена, подождите, пока не будет установлена плата за транзакцию, и повторите попытку!",
     "unableToSetAccountSequence": "Не удается задать последовательность счетов, проверьте, подключены ли к Интернету.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Безопасность прежде всего ",
     "slideThree_desc": "При создании приложения и платформы Xumm безопасность была в приоритете. Подписывайте транзакции с Вашего собственного, надежного устройства. ",
     "slideFour_title": "Отправить и получить",
-    "slideFour_desc": "Вы можете отправлять и получать XRP, а также другие доверенные активы (IOUs)"
+    "slideFour_desc": "Вы можете отправлять и получать XRP, а также другие доверенные активы (IOUs)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Установка ПИН-кода",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Не удается получить транзакции аккаунта!",
     "canNotFetchSignRequests": "Не удалось получить запросы на подписание учетной записи!",
     "unableToLoadTheTransaction": "Не удается загрузить транзакцию, убедитесь, что вы подключены к Интернету!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Платеж имеет тег назначения: %{tag}",
     "itWasInstructedToDeliver": "Было поручено доставить %{amount} %{currency}",
     "bySpendingUpTo": "Было поручено доставить %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Это удалило аккаунт %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Было поручено доставить остаток баланса в размере %{amount} %{currency} к %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Транзакция отменит чек с идентификатором %{checkId}\r\n",
     "itAuthorizesSendingPaymentsToThisAccount": "Это позволяет %{address} отправлять платежи на этот аккаунт",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Это удаляет разрешение для %{address} отправлять платежи на этот аккаунт ",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Это изъяло линию доверия к активу %{currency} от %{issuer}",
     "itEstablishesTrustLineTo": "Это устанавливает %{limit} как максимальную сумму %{currency} от %{issuer}, которую %{address} готов удерживать. ",
     "itRemovesTheAccountDomain": "Это удаляет домен аккаунта",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Введите имя или адрес",
     "enterCurrencyCodeOrName": "Введите код валюты или ее название",
     "enterName": "Пожалуйста введите имя",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Контакт уже существует",
     "contactSuccessSaved": "Контакт успешно добавлен",
     "contactSuccessUpdated": "Контакт успешно обновлен",
@@ -759,6 +801,8 @@
     "changePasscode": "Изменить ПИН-код",
     "biometricAuthentication": "Биометрическая аутентификация",
     "hapticFeedback": "Тактильная обратная связь",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Режим разработчика",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Системный формат валюты",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Вы уверены, что хотите вернуться?\r\n(Вам придется заново заполнить все входные данные из соображений безопасности)",
     "accountType": "Тип аккаунта",
     "secretType": "Тип секретного ключа",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Пожалуйста, выберите тип Вашего аккаунта",
     "pleaseSelectAccountSecretType": "Пожалуйста, выберите тип секретного ключа Вашего аккаунт",
     "fullAccess": "Полный доступ",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Нет результатов поиска",
     "noContact": "Нет контактов",
     "myAccount": "Мой аккаунт",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Исходный и целевой адрес не могут совпадать!",
     "enterANameOrAddress": "Введите имя или адрес",
     "transferredSuccessfully": "Ваша транзакция успешно зарегистрирована в %{network}. ",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Невозможно установить плату за транзакцию, повторите попытку.",
     "theDestinationAccountIsSetAsBlackHole": "ВНИМАНИЕ: целевой аккаунт обозначен как \"черная дыра\". Все XRP отправленные на этот акаунт будут потеряны.",
     "noDestinationTag": "Отсутствует тег назначения",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Для этого адреса требуется тег назначения",
     "pleaseEnterAmount": "Пожалуйста, введите сумму транзакции",
     "trustLineLimitExceeded": "Лимит линии доверия превышен.\r\nСейчас: %{balance}\r\nМаксимум: %{peer_limit}\r\nДоступен для выпуска: %{available}\r\nПолучатель может обновить лимит. ",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/sd.json b/src/locale/translations/sd.json
index 231b19118..5ce6a536e 100644
--- a/src/locale/translations/sd.json
+++ b/src/locale/translations/sd.json
@@ -14,6 +14,8 @@
     "discard": "خارج ڪريو",
     "remove": "هٽايو",
     "go": "وڃ",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "بند ڪريو",
     "save": "محفوظ ڪريو",
     "confirm": "پڪ ڪريو",
@@ -21,6 +23,7 @@
     "balance": "بيلنس",
     "spendable": "خرچ لائق",
     "home": "گهر",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "ايونٽس",
     "profile": "پروفائيل",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "جوڙ",
     "search": "ڳولا",
     "send": "موڪليو",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "موڪلڻ لاءِ سلائيڊ",
     "done": "ٿي ويو",
     "previous": "اڳوڻو",
@@ -38,6 +43,7 @@
     "exchanges": "تبادلو",
     "scan": "سکين",
     "request": "عرض ڪيو",
+    "receiveOnAccount": "Receive on account",
     "details": "تفصيلات",
     "recipient": "وصول ڪندڙ",
     "destination": "منزلن",
@@ -48,6 +54,11 @@
     "continue": "جاري رکو",
     "code": "ڪوڊ",
     "copy": "ڪاپي",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "چونڊيل",
     "share": "حصيداري ڪريو",
@@ -119,6 +130,7 @@
     "day": "ڏينهن",
     "days": "days",
     "week": "هفتو",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "پاڻمرادو لاڪ",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "طاقتور",
     "veryStrong": "تمام مضبوط",
     "subject": "موضوع",
+    "credentialType": "Credential Type",
     "empty": "خالي",
     "update": "اپڊيٽ",
     "notNow": "هاڻ نه",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}'  xApp اهو URL کولڻ چاهي ٿو.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "سيڪيورٽي پهرين",
     "slideThree_desc": "Xumm ايپليڪيشن ۽ پليٽ فارم سيڪيورٽي سان گڏ ترجيح طور تي تعمير ڪيا ويا آهن. ڪڏهن به پنهنجو راز ٻيهر نه لکو ، پنهنجي ، اعتماد واري ڊوائيس مان ٽرانس ٽرانزيڪشن ڪريو.",
     "slideFour_title": "موڪليو ۽ حاصل ڪريو",
-    "slideFour_desc": "توهان XRP سان گڏ ٻيون قابل اعتماد اثاثو (IOUs) موڪلي ۽ وصول ڪري سگهو ٿا"
+    "slideFour_desc": "توهان XRP سان گڏ ٻيون قابل اعتماد اثاثو (IOUs) موڪلي ۽ وصول ڪري سگهو ٿا",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "پاس ڪوڊ قائم ڪريو",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "اڪائونٽ جي ٽرانزيڪشن نٿا ڪري سگهجن!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "ٽرانزيڪشن لوڊ ڪرڻ کان قاصر! مهرباني ڪري پڪ ڪريو ته توهان انٽرنيٽ سان ڳن آهن آهيو.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "ادائيگي جي منزل ٽيگ آهي: %{tag}",
     "itWasInstructedToDeliver": "ان کي پهچائڻ جي هدايت ڏني وئي %{amount} %{currency}",
     "bySpendingUpTo": "لاء خرچ ڪندي %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "اهو کاتو خارج ٿيل %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "انهي کي هدايت ڪئي وئي ته بيلنس جي باقي مقدار کي پهچائي %{amount} %{currency} جي طرف %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "ٽرانسڪشن آئي ڊي سان چيڪ منسوخ ڪندو %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "اھو کاتي ۾ ادائيگي موڪلڻ لاءِ %{address} کي اختيار ڏيندو آھي",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "اھو اڪائونٽ ۾ ادائيگي موڪلڻ لاءِ %{address} کي اختيار ختم ڪري ٿو",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "ان کي ختم ڪري TrustLine ڪرنسي %{currency} جي طرف %{issuer}",
     "itEstablishesTrustLineTo": "اهو قائم ڪري ٿو %{limit} وڌ کان وڌ رقم %{currency} کان %{issuer} اهو %{address} رکڻ جي خواهشمند آهي.",
     "itRemovesTheAccountDomain": "اهو کاتو ڊومين کي ختم ڪندو آهي",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "نالو يا پتو داخل ڪريو",
     "enterCurrencyCodeOrName": "ڪرنسي ڪوڊ يا نالو داخل ڪريو",
     "enterName": "مهرباني ڪري نالو لکو",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "رابطو اڳ ئي موجود آهي",
     "contactSuccessSaved": "رابطو ڪاميابي سان شامل ڪيو ويو",
     "contactSuccessUpdated": "سان رابطو ڪريو ڪاميابي سان اپڊيٽ",
@@ -759,6 +801,8 @@
     "changePasscode": "تبديلي پاسڪوڊ",
     "biometricAuthentication": "بايوميٽرڪ جي تصديق",
     "hapticFeedback": "هاپيڪ راءِ",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "ٺاهيندڙ موڊ",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "سسٽم ڪرنس جو فارميٽ استعمال ڪريو",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "ڇا اوھان کي پڪ واپس وڃو ڪرڻ چاھيو ٿا؟\r\n(توهان کي سيڪيورٽي سببن لاءِ سڀني معلومات کي ٻيهر ڀرڻو پوندو)",
     "accountType": "کاتي جو قسم",
     "secretType": "راز جو قسم",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "مهرباني ڪري پنهنجي کاتي جو قسم چونڊيو",
     "pleaseSelectAccountSecretType": "مهرباني ڪري پنهنجي کاتي جي راز قسم چونڊيو",
     "fullAccess": "مڪمل رسائي",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "ڳولا جو نتيجو ناهي",
     "noContact": "ڪوبه رابطو ناهي",
     "myAccount": "منهنجو اڪائونٽ",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "ذريعو ۽ منزل جو پتو ساڳيو نٿي ٿي سگھي!",
     "enterANameOrAddress": "نالو يا پتو داخل ڪريو",
     "transferredSuccessfully": "توهان جو ٽرانزيڪشن ڪاميابي سان %{network} تي رجسٽر ٿيو آهي.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "منزل وارو کاتو بليڪ هول طور مقرر ڪيو ويو آهي. XRP انهي اڪائونٽ تي موڪلڻ جي نتيجي ۾ فنڊز جي ضايع ٿيندي.",
     "noDestinationTag": "نه منزل ٽيگ",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "هن ايڊريس کي منزل جي ٽيگ جي ضرورت آهي",
     "pleaseEnterAmount": "مهرباني ڪري موڪلڻ لاء رقم توهان چاهيو ۾ ڀريندا ڪريو",
     "trustLineLimitExceeded": "ٽرسٽ لائين جي حد وڌي وئي آهي.\r\nھاڻي: %{balance}\r\nوڌ کان وڌ: %{peer_limit}\r\nمسئلي لاءِ جاري ڪرڻ: %{available}\r\nوصول ڪندڙ ٽرسٽ لائن جي حد کي تازو ڪري سگھي ٿو.\r\n ",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/sk.json b/src/locale/translations/sk.json
index dcc253a6c..76efc189b 100644
--- a/src/locale/translations/sk.json
+++ b/src/locale/translations/sk.json
@@ -14,6 +14,8 @@
     "discard": "Zahodiť",
     "remove": "Odstrániť",
     "go": "Pokračovať",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Zatvoriť",
     "save": "Uložiť",
     "confirm": "Potvrdiť",
@@ -21,6 +23,7 @@
     "balance": "Zostatok",
     "spendable": "Na minutie",
     "home": "Domov",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Udalosti",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Nastavenia",
     "search": "Hľadať",
     "send": "Poslať",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "skĺznuť na odoslanie",
     "done": "Hotovo",
     "previous": "Predchádzajúce",
@@ -38,6 +43,7 @@
     "exchanges": "Zmenárne",
     "scan": "Skenovať",
     "request": "Žiadosť",
+    "receiveOnAccount": "Receive on account",
     "details": "Podrobnosti",
     "recipient": "Príjemca",
     "destination": "Destinácia",
@@ -48,6 +54,11 @@
     "continue": "Pokračovať",
     "code": "Kód",
     "copy": "Kopírovať",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Zvolené",
     "share": "Zdieľať",
@@ -119,6 +130,7 @@
     "day": "dní",
     "days": "days",
     "week": "týždňov",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automatické zamknutie",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Silný",
     "veryStrong": "Veľmi silné",
     "subject": "Predmet",
+    "credentialType": "Credential Type",
     "empty": "prázdny",
     "update": "Aktualizácia",
     "notNow": "Nie teraz",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp chce otvoriť túto URL.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Bezpečnosť na prvom mieste",
     "slideThree_desc": "Aplikácia a platforma xumm sú vytvorené s ohľadom na bezpečnosť. Už nikdy viac nezadávajte svoje secrets, podpisujte transakcie z vlastného dôveryhodného zariadenia.",
     "slideFour_title": "Posielajte a prijímajte",
-    "slideFour_desc": "Môžete tiež odosielať a prijímať XRP a ďalšie dôveryhodné aktíva (IOU)"
+    "slideFour_desc": "Môžete tiež odosielať a prijímať XRP a ďalšie dôveryhodné aktíva (IOU)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Nastavte prístupový kód",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Nie je možné načítať transakcie účtu!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Transakciu sa nepodarilo načítať. Uistite sa, že ste pripojení k internetu!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Platba destinácia značka je: %{tag}",
     "itWasInstructedToDeliver": "Bolo nariadené doručiť %{amount} %{currency}\r\n",
     "bySpendingUpTo": "utratením až %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Vymazalo konto %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "To bol inštruovaný dodať zostávajúce zostatok %{amount} %{currency} do %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Transakcia zruší šek s ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Splnomocňuje %{address} na zasielanie platieb na tento účet",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Odstraňuje autorizáciu pre %{address}  na odosielanie platieb na tento účet",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Odstránil TrustLine mena %{currency} na %{issuer}",
     "itEstablishesTrustLineTo": "Stanovuje %{limit} ako maximálnu sumu %{currency} od %{issuer} ktorú je %{address} ochotná zadržať.",
     "itRemovesTheAccountDomain": "Odoberie doménu účtu",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Zadajte meno alebo adresu",
     "enterCurrencyCodeOrName": "Zadajte kód meny alebo názov",
     "enterName": "Prosím zadajte meno",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakt už existuje",
     "contactSuccessSaved": "Kontakt bol úspešne pridaný",
     "contactSuccessUpdated": "Kontakt bol úspešne aktualizovaný",
@@ -759,6 +801,8 @@
     "changePasscode": "Zmeňte prístupový kód",
     "biometricAuthentication": "Overenie biometriou",
     "hapticFeedback": "Haptická spätná väzba",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Režim vývojára",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Formátovanie systémovej meny",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Naozaj sa chcete vrátiť späť?\r\n(z bezpečnostných dôvodov musíte znova vyplniť všetky vstupy)",
     "accountType": "Typ účtu",
     "secretType": "Typ tajných čísel",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Vyberte typ účtu",
     "pleaseSelectAccountSecretType": "Prosím vyberte typ tajných čísel vášho účtu",
     "fullAccess": "Úplný prístup",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Žiadny výsledok vyhľadávania",
     "noContact": "Žiadne kontakty",
     "myAccount": "Môj účet",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Zdrojová a cieľová adresa nemôžu byť rovnaké!",
     "enterANameOrAddress": "Zadajte meno alebo adresu",
     "transferredSuccessfully": "Vaša transakcia bola úspešne zaregistrovaný na %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Cieľový účet je nastavený ako čierna diera, odoslanie na tento účet spôsobí stratu odoslaného XRP.",
     "noDestinationTag": "Žiadna cieľová značka",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Táto adresa vyžaduje cieľovú značku",
     "pleaseEnterAmount": "Zadajte, prosím, výšku transakcie",
     "trustLineLimitExceeded": "Bol prekročený limit linky dôveryhodnosti.\r\n\r\nTeraz: %{balance}\r\nMax: %{peer_limit}\r\nK dispozícii na vydanie: %{available}\r\n\r\nPríjemca môže aktualizovať limit dôveryhodných liniek.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/sl.json b/src/locale/translations/sl.json
index afb873eae..7546456bd 100644
--- a/src/locale/translations/sl.json
+++ b/src/locale/translations/sl.json
@@ -14,6 +14,8 @@
     "discard": "Zavrzi",
     "remove": "Odstrani",
     "go": "Pojdi",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Zapri",
     "save": "Shrani",
     "confirm": "Potrdi",
@@ -21,6 +23,7 @@
     "balance": "Stanje",
     "spendable": "Na voljo",
     "home": "Domov",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Dogodki",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Nastavitve",
     "search": "Išči",
     "send": "Pošlji",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Podrsaj za pošiljanje",
     "done": "Končano",
     "previous": "Prejšnji",
@@ -38,6 +43,7 @@
     "exchanges": "Menjalnice",
     "scan": "Skeniraj",
     "request": "Zahtevaj",
+    "receiveOnAccount": "Receive on account",
     "details": "Podrobnosti",
     "recipient": "Prejemnik",
     "destination": "Cilj",
@@ -48,6 +54,11 @@
     "continue": "Nadaljuj",
     "code": "Koda",
     "copy": "Kopiraj",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Izbrano",
     "share": "Deli",
@@ -119,6 +130,7 @@
     "day": "dan",
     "days": "days",
     "week": "teden",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Samodejno zakleni",
     "suggested": "Predlagano",
     "low": "Nizko",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Vrsta žetona",
     "uri": "URI",
     "transferFee": "Plačilo za prenos",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "ID žetona",
     "tokenIDs": "ID-ji",
     "tokenOffers": "Ponudbe žetonov",
@@ -227,6 +244,7 @@
     "strong": "Močna",
     "veryStrong": "Zelo močno",
     "subject": "Predmet",
+    "credentialType": "Credential Type",
     "empty": "Prazno",
     "update": "Posodobi",
     "notNow": "Ne zdaj",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp želi odpreti ta URL:\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Izdelaj povezavo zahtevka za plačilo",
     "transactionFeeIsNotSet": "Provizija za transakcijo ni nastavljena, prosimo počakajte, da se nastavi provizija za transakcijo in poskusite znova!",
     "unableToSetAccountSequence": "Ne morem nastaviti vrstnega reda računa. Preverite, ali ste povezani z internetom.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Najprej varnost",
     "slideThree_desc": "Xumm aplikacija in platforma sta zgrajeni z varnostjo v mislih. Nikoli več ne vnašajte svojih skrivnih ključev. Transakcijo podpisujte samo iz svoje zaupanja vredne naprave.",
     "slideFour_title": "Pošlji in prejmi",
-    "slideFour_desc": "Pošiljate in prejemate lahko XRP in tudi druga zaupanja vredna sredstva (IOU)"
+    "slideFour_desc": "Pošiljate in prejemate lahko XRP in tudi druga zaupanja vredna sredstva (IOU)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Nastavitev gesla",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Transakcij računa ni mogoče pridobiti!",
     "canNotFetchSignRequests": "Zahteve za podpis računa ni mogoče pridobiti!",
     "unableToLoadTheTransaction": "Transakcije ni mogoče naložiti. Prosimo, preverite internetno povezavo!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Plačilo ima ciljno oznako: %{tag}",
     "itWasInstructedToDeliver": "Naročilo za dostavo %{amount} %{currency}",
     "bySpendingUpTo": "Naročilo za dostavo %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Račun  %{address} je bil izbrisan",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Zahtevek za dostavo preostalega stanja %{amount} %{currency} na %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Transakcija bo preklicala ček z ID-jem %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Avtorizacija %{address} za pošiljanje plačil na ta račun",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Odstrani pooblastilo %{address} za pošiljanje plačila na ta račun",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Odstranjena je bila valuta zaupanja vredne povezave %{currency} za %{issuer}",
     "itEstablishesTrustLineTo": "Vzpostavlja %{limit} kot najvišji znesek %{currency} od %{issuer}, ki ga je %{address} pripravljen zadržati.",
     "itRemovesTheAccountDomain": "Odstrani domeno računa",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Vnesite ime ali naslov",
     "enterCurrencyCodeOrName": "Vnesite kodo valute ali ime",
     "enterName": "Prosimo, vnesite ime",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Stik že obstaja",
     "contactSuccessSaved": "Stik je bil uspešno dodan",
     "contactSuccessUpdated": "Stik je bil uspešno posodobljen",
@@ -759,6 +801,8 @@
     "changePasscode": "Spremeni geslo",
     "biometricAuthentication": "Biometrično overjanje",
     "hapticFeedback": "Haptične povratne informacije",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Razvijalski način",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Uporabite sistemsko valuto",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Ste prepričani, da želite iti nazaj? (iz varnostnih razlogov morate ponovno vnesti vse podatke)",
     "accountType": "Vrsta računa",
     "secretType": "Tip skrivnosti",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Prosimo, izberite vrsto računa",
     "pleaseSelectAccountSecretType": "Izberite tip skrivnosti svojega računa",
     "fullAccess": "Polni dostop",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Ni rezultatov iskanja",
     "noContact": "Ni stikov",
     "myAccount": "Moj račun",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Izvorni in ciljni naslov ne moreta biti enaka!",
     "enterANameOrAddress": "Vnesite ime ali naslov",
     "transferredSuccessfully": "Vaša transakcija je bila uspešno registrirana v glavni knjigi %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Ne morem nastaviti stroškov transakcije. Prosimo, poskusite znova.",
     "theDestinationAccountIsSetAsBlackHole": "OPOZORILO: Ciljni račun je nastavljen kot črna luknja, pošiljanje na ta račun pa bo povzročilo izgubo poslanih XRP.",
     "noDestinationTag": "Ni ciljne oznake",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Ta naslov zahteva ciljno oznako",
     "pleaseEnterAmount": "Prosimo, vnesite znesek transakcije",
     "trustLineLimitExceeded": "Omejitev zaupanja vredne povezave je presežena, zdaj: %{balance}, max: %{peer_limit}, na voljo za izdajo: %{available}. Prejemnik lahko posodobi omejitev zaupanja vredne povezave.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/sr.json b/src/locale/translations/sr.json
index 5ce5c21ef..1d592a809 100644
--- a/src/locale/translations/sr.json
+++ b/src/locale/translations/sr.json
@@ -14,6 +14,8 @@
     "discard": "Одбацити",
     "remove": "Уклонити",
     "go": "Иди",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Затвори",
     "save": "Сачувај",
     "confirm": "Потврди",
@@ -21,6 +23,7 @@
     "balance": "Стање",
     "spendable": "Потрошни",
     "home": "Кући",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Догађаји",
     "profile": "Профил",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Подешавања",
     "search": "Претрага",
     "send": "Пошаљите",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Повуците да пошаљете",
     "done": "Готово",
     "previous": "Предходни",
@@ -38,6 +43,7 @@
     "exchanges": "Мењачнице",
     "scan": "Скенирај",
     "request": "Захтев",
+    "receiveOnAccount": "Receive on account",
     "details": "Детаљи",
     "recipient": "Прималац",
     "destination": "Одредиште",
@@ -48,6 +54,11 @@
     "continue": "Настави",
     "code": "шифра ",
     "copy": "Копирај",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Изабрано",
     "share": "Дели",
@@ -119,6 +130,7 @@
     "day": "дан",
     "days": "days",
     "week": "седмица",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Аутоматско закључавање",
     "suggested": "Предложено",
     "low": "Низак",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Токен Таксон",
     "uri": "URI",
     "transferFee": "Пренос накнаде",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Токен ИД",
     "tokenIDs": "Токене",
     "tokenOffers": "Токен понуда",
@@ -227,6 +244,7 @@
     "strong": "Јак",
     "veryStrong": "Веома јак",
     "subject": "Тема",
+    "credentialType": "Credential Type",
     "empty": "Празно",
     "update": "Ажурирање",
     "notNow": "Не сада",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp жели да отвори овај URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Креирај линк за захтев за плаћање",
     "transactionFeeIsNotSet": "Накнада за трансакцију није постављена, молимо сачекајте да се трансакција плати да буде постављена, и покушајте поново!",
     "unableToSetAccountSequence": "Није могуће проверити секвенцу налога, проверите да ли сте повезани на интернет.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Прво сигурност",
     "slideThree_desc": "Апликација и платформа Xumm изграђени су са приоритетом сигурности. Никада више не уносите своје тајне, потписујте трансакције са свог поузданог уређаја.",
     "slideFour_title": "Послати и примити",
-    "slideFour_desc": "Можете послати и примити XRP и остале поуздане ресурсе (IOU ' s) као добро"
+    "slideFour_desc": "Можете послати и примити XRP и остале поуздане ресурсе (IOU ' s) као добро",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Поставити лозинку",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Не могу се повратити трансакције налога!",
     "canNotFetchSignRequests": "Не могу да дохватим захтеве за потписивањем налога!",
     "unableToLoadTheTransaction": "Учитавање трансакције није могуће, уверите се да сте повезани на Интернет!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Ознака одредишта за плаћање је: %{tag}",
     "itWasInstructedToDeliver": "Било је наложено да испоручи %{amount} %{currency}",
     "bySpendingUpTo": "трошећи до  %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Избрисан је рачун %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Било је наложено да испоручи преостали биланс %{amount} %{currency} %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Трансакција ће отказати чек са личним документом са ИД %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "То овлашћује %{address} да пошаље уплате на овај рачун",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Уклања ауторизацију за %{address} да бисте послали уплате на овај рачун",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Уклонио је ТрустЛине валуту %{currency} у %{issuer}",
     "itEstablishesTrustLineTo": "Она утврђује %{limit} као максимална количина %{currency} од %{issuer} је %{address} спреман да држи.",
     "itRemovesTheAccountDomain": "Уклања домен рачуна",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Унесите име или веб адресу",
     "enterCurrencyCodeOrName": "Унесите код или назив валуте ",
     "enterName": "Унесите име",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Контакт већ постоји",
     "contactSuccessSaved": "Контакт је успешно додат",
     "contactSuccessUpdated": "Контакт је успешно ажуриран",
@@ -759,6 +801,8 @@
     "changePasscode": "Промени лозинку",
     "biometricAuthentication": "Биометријска потврда идентитета",
     "hapticFeedback": "Haptic подаци о резултатима",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Опција програмера ",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Користите одрђену валуту у систему",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Да ли сте сигурни да се желите вратити?\r\n(из сигурносних разлога морате поново попунити све уносе)",
     "accountType": "Тип налога",
     "secretType": "Тајни тип",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Молимо вас одаберите врсту рачуна",
     "pleaseSelectAccountSecretType": "Молимо вас одаберите тајну врсту свог рачуна",
     "fullAccess": "Потпуни приступ \r\n",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Нема резултата претраге",
     "noContact": "Нема контаката",
     "myAccount": "Мој рачун",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Порекло извора и Дестинације веб странице не може бити исто!",
     "enterANameOrAddress": "Унесите име или веб адресу",
     "transferredSuccessfully": "Ваша трансакција је успешно регистрована на %{network} .",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Не могу да поставим трансакциони хонорар, покушајте поново.",
     "theDestinationAccountIsSetAsBlackHole": "УПОЗОРЕЊЕ: Овај одредишни рачун постављен је као црна рупа. Било који XRP послат на овај рачун резултираће губитком средстава!",
     "noDestinationTag": "Нема ознаке за одредиште",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Ова веб адреса захтева ознаку за одредиште ",
     "pleaseEnterAmount": "Унесите износ за ову трансакцију.",
     "trustLineLimitExceeded": "TrustLine је прекорачен.\r\n\r\nСада: %{balance}\r\nМaксимум: %{peer_limit}\r\nДоступан за издавање: %{available}\r\n\r\nПрималац може да ажурира Trustline ограничење .",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/sv.json b/src/locale/translations/sv.json
index fd2ed4d12..5a71947dc 100644
--- a/src/locale/translations/sv.json
+++ b/src/locale/translations/sv.json
@@ -14,6 +14,8 @@
     "discard": "Avbryt",
     "remove": "Ta bort",
     "go": "Gå",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Stäng",
     "save": "Spara",
     "confirm": "Bekräfta",
@@ -21,6 +23,7 @@
     "balance": "Saldo",
     "spendable": "Disponibelt",
     "home": "Hem",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Händelser",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Inställningar",
     "search": "Sök",
     "send": "Skicka",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Skjut för att skicka",
     "done": "Klar",
     "previous": "Föregående",
@@ -38,6 +43,7 @@
     "exchanges": "Utbyten",
     "scan": "Skanna",
     "request": "Begäran",
+    "receiveOnAccount": "Receive on account",
     "details": "Detaljer",
     "recipient": "Mottagare",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "Fortsätt",
     "code": "Kod",
     "copy": "Kopiera",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Vald",
     "share": "Dela",
@@ -119,6 +130,7 @@
     "day": "dag",
     "days": "days",
     "week": "vecka",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Automatiskt lås",
     "suggested": "Föreslagna",
     "low": "Låg",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Tokentaxin",
     "uri": "URI",
     "transferFee": "Överföringsavgift",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Element-ID",
     "tokenIDs": "Element-IDn",
     "tokenOffers": "Tokenerbjudanden",
@@ -227,6 +244,7 @@
     "strong": "Stark",
     "veryStrong": "Mycket starkt",
     "subject": "Ämne",
+    "credentialType": "Credential Type",
     "empty": "Tom",
     "update": "Uppdatera",
     "notNow": "Inte nu",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp vill öppna den här URL-adressen.\n\n<användar>",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Skapa betalningsbegäranlänk",
     "transactionFeeIsNotSet": "Transaktionsavgiften är inte inställd. Vänta tills transaktionsavgiften har ställts in och försök igen!",
     "unableToSetAccountSequence": "Det går inte att ställa in kontosekvens. Kontrollera att du är ansluten till internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Säkerhet först",
     "slideThree_desc": "Xumm applikationen och plattformen är byggd med säkerhet i åtanke. Ange aldrig mer dina hemliga kod-ord igen (24 kod-ord), signera transaktioner från din egen betrodda enhet.",
     "slideFour_title": "Skicka och ta emot",
-    "slideFour_desc": "Du kan skicka och ta emot XRP och andra betrodda tillgångar (IOU)"
+    "slideFour_desc": "Du kan skicka och ta emot XRP och andra betrodda tillgångar (IOU)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Ange en pinkod",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Det går inte att hämta kontotransaktioner!",
     "canNotFetchSignRequests": "Det går inte att hämta kontosigneringsbegäran!",
     "unableToLoadTheTransaction": "Det går inte att läsa in transaktionen. Se till att du är ansluten till internet.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Betalningen har ett destinationsmärkord: %{tag}",
     "itWasInstructedToDeliver": "Den instruerades att leverera %{amount} %{currency}",
     "bySpendingUpTo": "genom att använda upp till %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Den tog bort konto %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Det har instruerats att leverera återstående återstående saldo i %{amount} %{currency} till %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Transaktionen kommer att avbryta kontrollen med ID :t %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Den godkänner %{address} att skicka betalningar till det här kontot",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Det tar bort behörigheten för %{address} att skicka betalningar till det här kontot",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Den tog bort TrustLine-valutan %{currency} till %{issuer}",
     "itEstablishesTrustLineTo": "Den innehåller %{limit} som det maximala beloppet %{currency} från %{issuer} som %{address} är villig att hålla.",
     "itRemovesTheAccountDomain": "Det tar bort kontodomänen",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Ange namn eller adress",
     "enterCurrencyCodeOrName": "Ange valutakod eller -namn",
     "enterName": "Ange ett namn",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakten finns redan",
     "contactSuccessSaved": "Kontakten lades till",
     "contactSuccessUpdated": "Kontakten uppdaterades",
@@ -759,6 +801,8 @@
     "changePasscode": "Ändra lösenord",
     "biometricAuthentication": "Biometrisk autentisering",
     "hapticFeedback": "Haptisk feedback",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Utvecklingsläge",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Använd Systemets valutainställning ",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Är du säker på att du vill åka tillbaka? \n (du måste fylla i alla indata av säkerhetsskäl)",
     "accountType": "Kontotyp",
     "secretType": "Hemlig typ",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Välj kontotyp",
     "pleaseSelectAccountSecretType": "Välj kontohemlig typ",
     "fullAccess": "Fullständig åtkomst",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Inget sökresultat",
     "noContact": "Inga kontakter",
     "myAccount": "Mitt konto",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Käll-och destinationsadressen kan inte vara samma.",
     "enterANameOrAddress": "Ange ett namn eller en adress",
     "transferredSuccessfully": "Transaktionen har registrerats i %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Det går inte att ställa in transaktionsavgiftens. Försök igen.",
     "theDestinationAccountIsSetAsBlackHole": "Destinationskontot är inställt som svart hål, som skickar till det här kontot kommer att förlora skickat XRP.",
     "noDestinationTag": "Inget målmärkord",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Den här adressen kräver en måltagg",
     "pleaseEnterAmount": "Ange transaktionsbeloppet",
     "trustLineLimitExceeded": "Gränsen för TrustLine har överskridits. \r\nNu: %{balance}\r\nMax: %{peer_limit}\r\nTillgänglig för att utfärda: %{available}. \r\nMottagaren kan uppdatera gränsen för Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/sw.json b/src/locale/translations/sw.json
index ea0c2d581..7125244eb 100644
--- a/src/locale/translations/sw.json
+++ b/src/locale/translations/sw.json
@@ -14,6 +14,8 @@
     "discard": "Futa",
     "remove": "Ondoa",
     "go": "Endelea",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Funga",
     "save": "Hifadhi",
     "confirm": "Thibitisha",
@@ -21,6 +23,7 @@
     "balance": "Salio",
     "spendable": "Inayotumika",
     "home": "Nyumbani",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Matukio",
     "profile": "Wasifu",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Mipangilio",
     "search": "Tafuta",
     "send": "Tuma",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Slide to send",
     "done": "Mwisho",
     "previous": "Nyuma",
@@ -38,6 +43,7 @@
     "exchanges": "Watoaji",
     "scan": "Skan",
     "request": "Omba",
+    "receiveOnAccount": "Receive on account",
     "details": "Maelezo",
     "recipient": "Mpokeaji",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "Endelea",
     "code": "alama ya siri",
     "copy": "Nakili",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Chaguliwa",
     "share": "Shirikisha",
@@ -119,6 +130,7 @@
     "day": "siku",
     "days": "days",
     "week": "wiki",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Auto lock",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Nguvu",
     "veryStrong": "Very strong",
     "subject": "Somo",
+    "credentialType": "Credential Type",
     "empty": "Tupu",
     "update": "Update",
     "notNow": "Sio sasa",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wants to open this URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Security first",
     "slideThree_desc": "The Xumm application and platform are built with security as a priority. Never enter your secrets again, sign transactions from your own, trusted device.",
     "slideFour_title": "Send and receive",
-    "slideFour_desc": "You can send and receive XRP and other trusted tokens as well"
+    "slideFour_desc": "You can send and receive XRP and other trusted tokens as well",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Setup a passcode",
@@ -480,7 +506,7 @@
     "onDate": "on",
     "paymentReceived": "Payment received",
     "paymentSent": "Payment sent",
-    "exchangedAssets": "Exchanged tokens",
+    "exchangedAssets": "Swapped tokens",
     "addedATrustLine": "Added a token (TrustLine)",
     "removedATrustLine": "Removed a token (TrustLine)",
     "updatedATrustLine": "Token Updated (TrustLine)",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Can not fetch account transactions!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Unable to load the transaction, please make sure you are connected to internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "The payment destination tag is: %{tag}",
     "itWasInstructedToDeliver": "It was instructed to deliver %{amount} %{currency}",
     "bySpendingUpTo": "by spending up to %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "It deleted account %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "It was instructed to deliver the remaining balance of %{amount} %{currency} to %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "The transaction will cancel check with ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "It authorizes %{address} to send payments to this account",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "It removes the authorization for %{address} to send payments to this account",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "It removed TrustLine currency %{currency} to %{issuer}",
     "itEstablishesTrustLineTo": "It establishes %{limit} as the maximum amount of %{currency} from %{issuer} that %{address} is willing to hold.",
     "itRemovesTheAccountDomain": "It removes the account domain",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Enter name or address",
     "enterCurrencyCodeOrName": "Enter currency code or name",
     "enterName": "Please enter a name",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Contact already exists",
     "contactSuccessSaved": "Contact successfully added",
     "contactSuccessUpdated": "Contact successfully updated",
@@ -759,6 +801,8 @@
     "changePasscode": "Change passcode",
     "biometricAuthentication": "Biometric authentication",
     "hapticFeedback": "Haptic feedback",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Developer mode",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Use system currency format",
@@ -811,7 +855,7 @@
     "unableToDeleteNodeWhenConnectedToNetwork": "Unable to remove the node while connected to this network, please switch network and try again!",
     "developerModeEnabledWarning": "Enabling Developer Mode may reduce certain security functions. Proceed with utmost caution, and only enable it if you comprehend the potential consequences.",
     "disablingDeveloperMode": "Disabling Developer Mode",
-    "disableDeveloperModeRevertNetworkWarning": "Please note that this action will revert your selected network from '%{currentNetwork}' to the '%{defaultNetwork}'. Are you sure you want to proceed?",
+    "disableDeveloperModeRevertNetworkWarning": "Please note that this action will revert your selected network from '%{currentNetwork}' to '%{defaultNetwork}'. Are you sure you want to proceed?",
     "blockingTakingScreenShotsIsDisabled": "Developer mode is active, Screenshot capture protection is temporarily disabled.",
     "syncRailsRemoveNetworkWarning": "Applying this sync will disconnect you from the current network (%{currentNetwork}). Please switch to a different network and try again.",
     "syncRailsRemoveNodeWarning": "By applying this sync, the current node (%{connectedNode}) to which you are currently connected will be removed. Please select a new default node for this network and try again.",
@@ -841,7 +885,7 @@
     "generateNewAccount": "Create a new account",
     "confirmPrivateTitle": "Confirm your secret numbers",
     "confirmPrivateDescription": "Please provide the numbers, this is for your own safety: we want you to confirm you wrote it down.",
-    "invalidSecretNumber": "Invalid secret number key entered",
+    "invalidSecretNumber": "The numbers entered do not match the requested row of numbers.",
     "accountSetupCompleted": "Account setup is complete.",
     "YouJustCreatedAccount": "You have just created a new fresh account.",
     "yeahLetsGo": "Hooray, let's go!",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Are you sure you want to go back? \r\n (you have to re-fill all the inputs for security reasons)",
     "accountType": "Account type",
     "secretType": "Secret type",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Please select your account type",
     "pleaseSelectAccountSecretType": "Please select your account secret type",
     "fullAccess": "Full access",
@@ -902,8 +947,8 @@
     "chooseAccountType": "Choose account type",
     "secretNumbers": "Secret numbers",
     "secretNumbersDesc": "Preferred account type. 8 rows of 6 digits",
-    "familySeed": "Family Seed",
-    "familySeedDesc": "Looks like sXXX1234XXX...",
+    "familySeed": "Family Seed / Private Key",
+    "familySeedDesc": "E.g. sXb1c3aX... or EDAF9E...",
     "mnemonic": "Mnemonic",
     "scanFromQR": "Scan from QR code",
     "mnemonicDesc": "Based on 12, 16 or 24 words",
@@ -916,10 +961,10 @@
     "pleaseEnterYourMnemonic": "Please enter your Mnemonic",
     "howManyWordsYourMnemonicIs": "How many words does your mnemonic have?",
     "pleaseEnterYourSecretNumber": "Please enter your secret numbers",
-    "invalidFamilySeed": "Invalid Family Seed",
+    "invalidFamilySeed": "Invalid Family Seed / Private Key",
     "invalidHexPrivateKey": "Invalid HEX private key! HEX private keys should be 66 HEX characters (A-F, 0-9) long.",
-    "pleaseProvideFamilySeed": "Please provide your account secret/family Seed.",
-    "pleaseEnterYourFamilySeed": "Please enter your family seed",
+    "pleaseProvideFamilySeed": "Please provide your account secret (Family Seed) or 66 HEX char. private key.",
+    "pleaseEnterYourFamilySeed": "Enter your Family Seed / Private Key",
     "accountImportCompleted": "Account import complete!",
     "youJustImportedAccount": "You just added your account",
     "accountSettings": "Edit account",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "No search result",
     "noContact": "No contacts",
     "myAccount": "My Account",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Source and Destination address cannot be the same!",
     "enterANameOrAddress": "Enter a name or an address",
     "transferredSuccessfully": "Your transaction has been successfully registered on the %{network}.",
@@ -1053,7 +1099,7 @@
     "somethingWentWrong": "Something went wrong!",
     "resultCopiedToClipboard": "Result copied to clipboard",
     "txIdCopiedToClipboard": "Transaction ID copied to clipboard",
-    "submittingToLedger": "Sending your transaction to the %{network}",
+    "submittingToLedger": "Sending your transaction to %{network}",
     "sendingFrom": "Sending from",
     "enterDescription": "Enter description",
     "enterPublicMemo": "Enter public memo (optional)",
@@ -1070,8 +1116,9 @@
     "destinationTagIsRequired": "The destination tag is required for sending this payment.",
     "unableGetRecipientAccountInfoPleaseTryAgain": "Unable to get recipient account info please try again.",
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
-    "theDestinationAccountIsSetAsBlackHole": "The destination account is set as black hole, sending to this account will cause losing sent XRP.",
+    "theDestinationAccountIsSetAsBlackHole": "The destination account is 'Black Holed', sending to this account will cause losing sent XRP.",
     "noDestinationTag": "No destination tag",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "This address requires a Destination Tag",
     "pleaseEnterAmount": "Please enter the transaction amount",
     "trustLineLimitExceeded": "TrustLine limit is exceeded.\r\n\r\nNow: %{balance}\r\nMax: %{peer_limit}\r\nAvailable for issuing: %{available}\r\n\r\nThe recipient can update the Trustline limit.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ta-IN.json b/src/locale/translations/ta-IN.json
index bf678f613..97642ba42 100644
--- a/src/locale/translations/ta-IN.json
+++ b/src/locale/translations/ta-IN.json
@@ -14,6 +14,8 @@
     "discard": "நிராகரி",
     "remove": "நீக்கு",
     "go": "செல்",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "மூடு",
     "save": "சேமி",
     "confirm": "உறுதிபடுத்து",
@@ -21,6 +23,7 @@
     "balance": "தொகை",
     "spendable": "செலவு செய்யக்கூடியது",
     "home": "வீடு",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "நிகழ்வுகள்",
     "profile": "சுயவிவரம்",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "அமைப்புகள்",
     "search": "தேடு",
     "send": "அனுப்பு",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "அனுப்ப ஸ்லைடு",
     "done": "முடிந்தது",
     "previous": "முந்தைய",
@@ -38,6 +43,7 @@
     "exchanges": "பரிமாற்றங்கள்",
     "scan": "ஸ்கேன்",
     "request": "கோரிக்கை",
+    "receiveOnAccount": "Receive on account",
     "details": "விவரங்கள்",
     "recipient": "பெறுநர்",
     "destination": "இலக்கு",
@@ -48,6 +54,11 @@
     "continue": "தொடரவும்",
     "code": "குறியீடு",
     "copy": "பார்த்தெழுது\r\n",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "தேர்ந்தெடுக்கப்பட்ட",
     "share": "பகிர்ந்து",
@@ -119,6 +130,7 @@
     "day": "நாள்",
     "days": "days",
     "week": "வாரம்",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "தானியங்கி பூட்டு",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "வலுவான",
     "veryStrong": "மிகவும் திடமான",
     "subject": "பொருள்",
+    "credentialType": "Credential Type",
     "empty": "காலியாக",
     "update": "புதுப்பிப்பு",
     "notNow": "இப்போது இல்லை",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp இந்த URL ஐ திறக்க விரும்புகிறது.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "முதலில் பாதுகாப்பு",
     "slideThree_desc": "Xumm பயன்பாடு மற்றும் இயங்குதளம் முன்னுரிமையாக பாதுகாப்போடு கட்டப்பட்டுள்ளன. உங்கள் ரகசியங்களை மீண்டும் ஒருபோதும் உள்ளிட வேண்டாம், உங்கள் சொந்த, நம்பகமான சாதனத்திலிருந்து பரிவர்த்தனைகளில் கையொப்பமிடுங்கள்.",
     "slideFour_title": "அனுப்பவும் பெறவும்",
-    "slideFour_desc": "நீங்கள் XRP மற்றும் பிற நம்பகமான சொத்துக்களை (IOU கள்) அனுப்பலாம் மற்றும் பெறலாம்."
+    "slideFour_desc": "நீங்கள் XRP மற்றும் பிற நம்பகமான சொத்துக்களை (IOU கள்) அனுப்பலாம் மற்றும் பெறலாம்.",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "கடவுக்குறியீட்டை அமைக்கவும்",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "கணக்கு பரிவர்த்தனைகளைப் பெற முடியாது!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "பரிவர்த்தனையை ஏற்ற முடியவில்லை, தயவுசெய்து நீங்கள் இணையத்துடன் இணைக்கப்பட்டுள்ளீர்கள் என்பதை உறுதிப்படுத்திக் கொள்ளுங்கள்!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "கட்டணம் ஒரு இலக்கு குறிச்சொல்லைக் கொண்டுள்ளது: %{tag}.\r\n",
     "itWasInstructedToDeliver": "வழங்க அறிவுறுத்தப்பட்டது %{amount} %{currency}.\r\n",
     "bySpendingUpTo": "வரை செலவு செய்வதன் மூலம் %{amount} %{currency}\r\n",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "இது கணக்கை நீக்கியது %{address}.\r\n",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "மீதமுள்ள நிலுவைகளை வழங்க அறிவுறுத்தப்பட்டது %{amount} %{currency} க்கு %{destination}.\r\n",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "பரிவர்த்தனை ஐடியுடன் காசோலையை ரத்து செய்யும் %{checkId}.\r\n",
     "itAuthorizesSendingPaymentsToThisAccount": "இது அங்கீகரிக்கிறது %{address} இந்த கணக்கிற்கு பணம் அனுப்ப.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "இது அங்கீகாரத்தை நீக்குகிறது %{address} இந்த கணக்கிற்கு பணம் அனுப்ப.\r\n",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "இது டிரஸ்ட்லைன் நாணயத்தை நீக்கியது %{currency} க்கு %{issuer}.\r\n",
     "itEstablishesTrustLineTo": "இது நிறுவுகிறது %{limit} அதிகபட்ச அளவு %{currency} இருந்து %{issuer} அந்த %{address} நடத்த தயாராக உள்ளது.",
     "itRemovesTheAccountDomain": "இது கணக்கு களத்தை நீக்குகிறது.",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "பெயர் அல்லது முகவரியை உள்ளிடவும்",
     "enterCurrencyCodeOrName": "நாணயக் குறியீடு அல்லது பெயரை உள்ளிடவும்",
     "enterName": "ஒரு பெயரை உள்ளிடவும்",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "தொடர்பு ஏற்கனவே உள்ளது",
     "contactSuccessSaved": "தொடர்பு வெற்றிகரமாக சேர்க்கப்பட்டது",
     "contactSuccessUpdated": "தொடர்பு வெற்றிகரமாக புதுப்பிக்கப்பட்டது",
@@ -759,6 +801,8 @@
     "changePasscode": "கடவுக்குறியீட்டை மாற்றவும்",
     "biometricAuthentication": "பயோமெட்ரிக் அங்கீகாரம்",
     "hapticFeedback": "தீண்டும் கருத்துக்களை",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "டெவலப்பர் பயன்முறை",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "கணினி நாணய வடிவமைப்பைப் பயன்படுத்தவும்",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "நீங்கள் திரும்பிச் செல்ல விரும்புகிறீர்களா?\r\n(பாதுகாப்பு காரணங்களுக்காக நீங்கள் அனைத்து உள்ளீடுகளையும் மீண்டும் நிரப்ப வேண்டும்)",
     "accountType": "கணக்கு வகை",
     "secretType": "ரகசிய வகை",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "உங்கள் கணக்கு வகையைத் தேர்ந்தெடுக்கவும்",
     "pleaseSelectAccountSecretType": "உங்கள் கணக்கு ரகசிய வகையைத் தேர்ந்தெடுக்கவும்",
     "fullAccess": "முழு அணுகல்",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "தேடல் முடிவு இல்லை",
     "noContact": "தொடர்புகள் இல்லை",
     "myAccount": "என் கணக்கு",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "மூல மற்றும் இலக்கு முகவரி ஒரே மாதிரியாக இருக்க முடியாது!",
     "enterANameOrAddress": "பெயர் அல்லது முகவரியை உள்ளிடவும்",
     "transferredSuccessfully": "உங்கள் பரிவர்த்தனை வெற்றிகரமாக %{network} லெட்ஜரில் பதிவு செய்யப்பட்டுள்ளது.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "எச்சரிக்கை: இந்த இலக்கு கணக்கு கருந்துளையாக அமைக்கப்பட்டுள்ளது. இந்தக் கணக்கில் அனுப்பிய எந்த XRP நிதி இழப்பு ஏற்படுத்தும்!",
     "noDestinationTag": "இலக்கு குறிச்சொல் இல்லை",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "இந்த முகவரிக்கு இலக்கு குறிச்சொல் தேவை.",
     "pleaseEnterAmount": "இந்த பரிவர்த்தனைக்கான தொகையை உள்ளிடவும்.",
     "trustLineLimitExceeded": "டிரஸ்ட்லைன் வரம்பு மீறப்பட்டுள்ளது.\r\nஇப்போது: %{balance}\r\nஅதிகபட்சம்: %{peer_limit}\r\nவழங்குவதற்கு கிடைக்கிறது: %{available}\r\n\r\nபெறுநர் டிரஸ்ட்லைன் வரம்பை புதுப்பிக்க முடியும்.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/te-IN.json b/src/locale/translations/te-IN.json
index c5b47d1b3..df9b80f3a 100644
--- a/src/locale/translations/te-IN.json
+++ b/src/locale/translations/te-IN.json
@@ -14,6 +14,8 @@
     "discard": "వదిలించుకో",
     "remove": "తొలగించు",
     "go": "వెళ్ళు",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "మూసివేయు",
     "save": "కాపాడు",
     "confirm": "నిర్ధారించండి",
@@ -21,6 +23,7 @@
     "balance": "బాలన్స్",
     "spendable": "@ option: check",
     "home": "హోమ్",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "సంఘటనలు",
     "profile": "ప్రొఫైల్",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "అమరిక",
     "search": "శోధన",
     "send": "పంపు",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "పంపడానికి స్లయిడ్ చేయండి",
     "done": "పూర్తిఅయింది",
     "previous": "మునుపటి",
@@ -38,6 +43,7 @@
     "exchanges": "ఎక్స్చేంజులు",
     "scan": "స్కాన్",
     "request": "అభ్యర్ధించు",
+    "receiveOnAccount": "Receive on account",
     "details": "వివరాలు",
     "recipient": "గ్రహీత",
     "destination": "గమ్యస్థానము",
@@ -48,6 +54,11 @@
     "continue": "కొనసాగించు",
     "code": "కోడ్",
     "copy": "నకలు",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "ఎంపికచేసిన",
     "share": "షేర్",
@@ -119,6 +130,7 @@
     "day": "రోజు",
     "days": "days",
     "week": "వారం",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "స్వయంకర లాక్",
     "suggested": "సూచించబడినది",
     "low": "తక్కువ",
@@ -203,6 +215,11 @@
     "tokenTaxon": "టోకెన్ టాక్సన్",
     "uri": "URI",
     "transferFee": "ట్రాన్స్ఫర్ ఫీజు",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "టోకెన్ ID",
     "tokenIDs": "టోకెన్ IDs",
     "tokenOffers": "టోకెన్ ఆఫర్లు\r\n",
@@ -227,6 +244,7 @@
     "strong": "బలంగా ఉంది\r\n",
     "veryStrong": "చాలా బలమైన\r\n",
     "subject": "విషయము",
+    "credentialType": "Credential Type",
     "empty": "ఖాళీ",
     "update": "నవీకరణ",
     "notNow": "ఇప్పుడు కాదు\r\n",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp ఈ URL ను తెరవాలనుకుంటుంది.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "పాయింట్ Request link సృష్టించుము",
     "transactionFeeIsNotSet": "లావాదేవీ రుసుము సెట్ చేయబడలేదు, దయచేసి లావాదేవీ రుసుము సెట్ చేయబడే వరకు వేచి ఉండి, మళ్లీ ప్రయత్నించండి!",
     "unableToSetAccountSequence": "ఖాతా క్రమాన్ని సెట్ చేయడం సాధ్యపడలేదు, దయచేసి మీరు ఇంటర్నెట్‌కి కనెక్ట్ అయ్యారో లేదో తనిఖీ చేయండి.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "మొదట భద్రత\r\n",
     "slideThree_desc": "Xumm అప్లికేషన్ మరియు ప్లాట్‌ఫాం భద్రతను దృష్టిలో ఉంచుకొని నిర్మించబడ్డాయి. మీ రహస్యాలను మళ్లీ నమోదు చేయవద్దు, మీ స్వంత, విశ్వసనీయ పరికరం నుండి లావాదేవీపై సంతకం చేయండి.",
     "slideFour_title": "పంపండి మరియు స్వీకరించండి",
-    "slideFour_desc": "మీరు XRP మరియు ఇతర విశ్వసనీయ ఆస్తులను (IOU) పంపవచ్చు మరియు స్వీకరించవచ్చు"
+    "slideFour_desc": "మీరు XRP మరియు ఇతర విశ్వసనీయ ఆస్తులను (IOU) పంపవచ్చు మరియు స్వీకరించవచ్చు",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "పాస్‌కోడ్‌ను సెటప్ చేయండి\r\n",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "ఖాతా లావాదేవీలను పొందలేరు!\r\n",
     "canNotFetchSignRequests": "ఖాతా సైన్ అభ్యర్థనలను పొందడం సాధ్యం కాదు!",
     "unableToLoadTheTransaction": "లావాదేవీని లోడ్ చేయడం సాధ్యం కాలేదు, దయచేసి మీరు ఇంటర్నెట్‌కు కనెక్ట్ అయ్యారని నిర్ధారించుకోండి!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "చెల్లింపు ఒక గమ్యపు ట్యాగ్ను కలిగి ఉంది: %{tag}",
     "itWasInstructedToDeliver": "%{amount} %{currency} బట్వాడా చేయాలని ఆదేశించారు.",
     "bySpendingUpTo": "%{amount} %{currency} బట్వాడా చేయాలని ఆదేశించారు",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "ఇది తొలగించబడిన ఖాతా %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "మిగిలిన బ్యాలెన్స్ %{amount} %{currency} ను %{destination}  కు పంపిణీ చేయాలని ఆదేశించబడింది",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "లావాదేవీ ID %{checkId} తో చెక్ రద్దు చేస్తుంది\r\n",
     "itAuthorizesSendingPaymentsToThisAccount": "ఈ ఖాతాకు %{address} చెల్లింపులను పంపడానికి  అధికారం ఇస్తుంది.\r\n",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "ఇది ఈ ఖాతాకు చెల్లింపులను పంపడానికి %{address} కొరకు అధికారాన్ని తీసివేస్తుంది",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "ఇది ట్రస్ట్లైన్ డబ్బును %{currency} కు తొలగించింది %{issuer}",
     "itEstablishesTrustLineTo": "ఇది ఏర్పాటు చేస్తుంది  %{limit} యొక్క గరిష్ట మొత్తంగా %{currency} నుండి %{issuer} అది %{address}  ఉంచుకోవడానికి సిద్ధంగా ఉంది.\r\n",
     "itRemovesTheAccountDomain": "ఇది ఖాతా డొమైన్ ను తీసివేస్తుంది",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "పేరు లేదా చిరునామాను నమోదు చేయండి\r\n",
     "enterCurrencyCodeOrName": "కరెన్సీ కోడ్ లేదా పేరును నమోదు చేయండి",
     "enterName": "దయచేసి ఒక పేరు నమోదు చేయండి\r\n\r\n",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "కాంటాక్ట్ ఇప్పటికే వుంది",
     "contactSuccessSaved": "కాంటాక్ట్ విజయవంతంగా జోడించబడింది\r\n",
     "contactSuccessUpdated": "కాంటాక్ట్ విజయవంతంగా నవీకరించబడింది\r\n",
@@ -759,6 +801,8 @@
     "changePasscode": "పాస్‌కోడ్‌ను మార్చండి\r\n",
     "biometricAuthentication": "బయోమెట్రిక్ ప్రామాణీకరణ\r\n",
     "hapticFeedback": "హాప్టిక్ ఫీడ్‌బ్యాక్\r\n",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "డెవలపర్ మోడ్",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "సిస్టమ్ కరెన్సీ ఆకృతీకరణ\r\n",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "మీరు ఖచ్చితంగా తిరిగి వెళ్లాలనుకుంటున్నారా?\r\n(భద్రతా కారణాల దృష్ట్యా మీరు అన్ని ఇన్‌పుట్‌లను తిరిగి నింపాలి)",
     "accountType": "ఖాతా రకం\r\n",
     "secretType": "రహస్య రకం",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "దయచేసి మీ ఖాతా రకాన్ని ఎంచుకోండి\r\n",
     "pleaseSelectAccountSecretType": "దయచేసి మీ ఖాతా రహస్య రకాన్ని ఎంచుకోండి\r\n",
     "fullAccess": "పూర్తి ప్రాప్యత",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "శోధన ఫలితం లేదు",
     "noContact": "పరిచయాలు లేవు\r\n",
     "myAccount": "నా ఖాతా",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "మూలం మరియు గమ్యం చిరునామా ఒకేలా ఉండకూడదు!",
     "enterANameOrAddress": "పేరు లేదా చిరునామాను నమోదు చేయండి",
     "transferredSuccessfully": "మీ లావాదేవీ %{network}‌లో విజయవంతంగా నమోదు చేయబడింది.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "లావాదేవీ రుసుములను సెట్ చేయడం సాధ్యపడలేదు, దయచేసి మళ్లీ ప్రయత్నించండి",
     "theDestinationAccountIsSetAsBlackHole": "హెచ్చరిక: ఈ గమ్యం ఖాతా కాల రంధ్రంగా సెట్ చేయబడింది. ఈ ఖాతాకు పంపిన ఏదైనా XRP నిధుల నష్టానికి దారితీస్తుంది!",
     "noDestinationTag": "గమ్యం ట్యాగ్ లేదు",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "ఈ చిరునామాకు గమ్యం ట్యాగ్ అవసరం",
     "pleaseEnterAmount": "దయచేసి లావాదేవీ మొత్తాన్ని నమోదు చేయండి",
     "trustLineLimitExceeded": "ట్రీట్లైన్ పరిమితి అధికం, ఇప్పుడు: %{balance}, max: %{peer_limit}, జారీచేయడానికి అందుబాటులో ఉన్నాయి: %{available}. గ్రహీత ట్రస్ట్‌లైన్ పరిమితిని నవీకరించవచ్చు",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/tr.json b/src/locale/translations/tr.json
index cb0ebe8d4..8c83ad14a 100644
--- a/src/locale/translations/tr.json
+++ b/src/locale/translations/tr.json
@@ -14,6 +14,8 @@
     "discard": "Kaydetme",
     "remove": "Kaldır",
     "go": "Devam",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Kapat",
     "save": "Kaydet",
     "confirm": "Doğrula",
@@ -21,6 +23,7 @@
     "balance": "Bakiye",
     "spendable": "Harcanabilir",
     "home": "Ana Sayfa",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Etkinlikler",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Ayarlar",
     "search": "Arama",
     "send": "Gönder",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Göndermek için kaydır",
     "done": "Bitti",
     "previous": "Önceki",
@@ -38,6 +43,7 @@
     "exchanges": "Borsalar",
     "scan": "Tara",
     "request": "İstek",
+    "receiveOnAccount": "Receive on account",
     "details": "Detaylar",
     "recipient": "Alıcı",
     "destination": "Hedef",
@@ -48,6 +54,11 @@
     "continue": "Devam et",
     "code": "Kod",
     "copy": "Kopyala",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Seçilen",
     "share": "Paylaş",
@@ -119,6 +130,7 @@
     "day": "gün",
     "days": "days",
     "week": "hafta",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Otomatik kilitle",
     "suggested": "Önerilen",
     "low": "Düşük",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Belirteç vergisi",
     "uri": "URI",
     "transferFee": "Aktarım ücreti",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token tanıtıcısı",
     "tokenIDs": "Token tanıtıcıları",
     "tokenOffers": "Token teklifleri",
@@ -227,6 +244,7 @@
     "strong": "Güçlü",
     "veryStrong": "Çok güçlü",
     "subject": "Konu",
+    "credentialType": "Credential Type",
     "empty": "Boş",
     "update": "Güncelle",
     "notNow": "Şimdi Değil",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp bu bağlantıyı açmak istiyor.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Ödeme İsteği bağlantısı oluştur",
     "transactionFeeIsNotSet": "İşlem ücreti ayarlanmadı, lütfen işlem ücretinin ayarlanamesini bekleyin ve yeniden deneyin!",
     "unableToSetAccountSequence": "Hesap Sırası ayarlanamıyor, lütfen İnternet 'e bağlandığınız denetleyin.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Önce güvenlik",
     "slideThree_desc": "Xumm uygulaması ve platformu güvenlik önceliğiyle geliştirildi. Gizli anahtarınızı bir daha asla girmeyiniz, güvenilir cihazınızla işlemleri imzalayınız.",
     "slideFour_title": "Gönder ve al",
-    "slideFour_desc": "XRP ile birlikte diğer güvenilir varlıklarları da (IOU'lar) gönderip alabilirsiniz."
+    "slideFour_desc": "XRP ile birlikte diğer güvenilir varlıklarları da (IOU'lar) gönderip alabilirsiniz.",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Parola belirle",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Hesap işlemleri getirilemedi!",
     "canNotFetchSignRequests": "Hesap imzalama istekleri alınamıyor!",
     "unableToLoadTheTransaction": "İşlem yüklenemiyor, lütfen Internet 'e bağlı olduğunuzdan emin olun!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Ödemenin hedef etiketi var: %{tag}",
     "itWasInstructedToDeliver": "%{amount} %{currency} teslim edilmesi talimatı verildi",
     "bySpendingUpTo": "%{amount} %{currency} teslim edilmesi talimatı verildi",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "%{address} hesabı silindi.",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Kalan bakiyenin %{amount} %{currency} - %{destination} adresine teslim edilmesi için talimat verildi.",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Bu işlem %{checkId} kimlikli çeki iptal edecek.",
     "itAuthorizesSendingPaymentsToThisAccount": "%{address} adresini bu hesaba ödemeler göndermek için yetkilendirir.",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "%{address} adresinin ödemeler gönderme yetkilendirmesini kaldırır.",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Güven ilişkili %{currency} birimi %{issuer} yönüne kaldırıldı.",
     "itEstablishesTrustLineTo": "%{limit} limitini %{issuer} tarafından %{address} adresinde %{currency} biriminin tutulabilecek maksimum miktarı olarak ayarlar.",
     "itRemovesTheAccountDomain": "Hesap etki alanını kaldırır",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "İsim veya adres girin",
     "enterCurrencyCodeOrName": "Para birimi kodunu ya da adını girin",
     "enterName": "Lütfen bir isim girin",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kişi zaten var",
     "contactSuccessSaved": "Kişi başarıyla eklendi",
     "contactSuccessUpdated": "Kişi başarıyla güncellendi",
@@ -759,6 +801,8 @@
     "changePasscode": "Parolayı değiştir",
     "biometricAuthentication": "Biyometrik doğrulama",
     "hapticFeedback": "Dokunsal geribildirim",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Geliştirici modu",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Sistem para birimini kullan",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Geri dönmek istediğinize emin misin? \r\n(Güvenlik nedeniyle tüm girişleri yeniden yapmanız gerekecek)",
     "accountType": "Hesap tipi",
     "secretType": "Gizlilik tipi",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Lütfen hesap tipinizi seçin",
     "pleaseSelectAccountSecretType": "Lütfen hesabınızın gizli anahtar tipini seçin",
     "fullAccess": "Tam erişim",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Arama sonucu yok",
     "noContact": "Kişi yok",
     "myAccount": "Hesabım",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Kaynak ve Hedef adres aynı olamaz!",
     "enterANameOrAddress": "Bir ad ya da adres girin",
     "transferredSuccessfully": "İşleminiz %{network} defterine başarıyla kaydedildi.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "İşlem ücreti ayarlanamıyor, lütfen yeniden deneyin.",
     "theDestinationAccountIsSetAsBlackHole": "UYARI: Hedef hesap bir kara delik olarak ayarlanmıştır. Bu hesaba XRP gönderimi fonların kaybına sebep olacaktır.",
     "noDestinationTag": "Hedef etiketi yok",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Bu adres bir hedef etiketi gerektirir",
     "pleaseEnterAmount": "Lütfen işlem miktarını girin",
     "trustLineLimitExceeded": "Güven ilişkisi sınırı aşıldı, şu anki: %{balance}, en fazla: %{peer_limit}, yayınlanmak için kullanılabilir: %{available}. Alıcı güven ilişkisi sınırını güncelleyebilir.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/uk.json b/src/locale/translations/uk.json
index c03025b50..bcd8aff62 100644
--- a/src/locale/translations/uk.json
+++ b/src/locale/translations/uk.json
@@ -14,6 +14,8 @@
     "discard": "Відхилити",
     "remove": "Вилучити",
     "go": "Вперед",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Закрити",
     "save": "Зберегти",
     "confirm": "Підтвердити",
@@ -21,6 +23,7 @@
     "balance": "Баланс",
     "spendable": "Доступно",
     "home": "Головна",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Події",
     "profile": "Профіль",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Налаштування",
     "search": "Пошук",
     "send": "Надіслати",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Перетягніть, щоб надіслати",
     "done": "Готово",
     "previous": "Попередній",
@@ -38,6 +43,7 @@
     "exchanges": "Біржі",
     "scan": "Сканувати",
     "request": "Отримати",
+    "receiveOnAccount": "Receive on account",
     "details": "Деталі",
     "recipient": "Отримувач",
     "destination": "Призначення",
@@ -48,6 +54,11 @@
     "continue": "Продовжити",
     "code": "Код",
     "copy": "Скопіювати",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Вибрано",
     "share": "Поділитися",
@@ -119,6 +130,7 @@
     "day": "день",
     "days": "days",
     "week": "тиждень",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Автоблокування",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Надійний",
     "veryStrong": "Дуже надійний",
     "subject": "Тема",
+    "credentialType": "Credential Type",
     "empty": "Порожньо",
     "update": "Оновити",
     "notNow": "Не зараз",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp хоче відкрити цей URL.\n\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Створити посилання на запит на оплату",
     "transactionFeeIsNotSet": "Комісія за трансакцію не встановлена, зачекайте, доки комісія за трансакцію буде встановлена, і повторіть спробу!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Безпека насамперед",
     "slideThree_desc": "Додаток та платформа Xumm будуються з пріоритетом на безпеку. Підписуйте транзакції зі свого власного, надійного пристрою.",
     "slideFour_title": "Надіслати і отримати",
-    "slideFour_desc": "Ви можете надсилати та отримувати XRP та інші активи, в тому числі активи (IOU) емітентів яким довіряєте"
+    "slideFour_desc": "Ви можете надсилати та отримувати XRP та інші активи, в тому числі активи (IOU) емітентів яким довіряєте",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Встановіть ПІН-код",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Не вдається отримати транзакції акаунта!",
     "canNotFetchSignRequests": "Не вдалося отримати запити з підписом рахунка!",
     "unableToLoadTheTransaction": "Не вдалося завантажити транзакцію, будь ласка, переконайтесь, що Ви з'єднані з інтернетом!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Платіж має тег призначення: %{tag}",
     "itWasInstructedToDeliver": "Було доручено доставити %{amount} %{currency}",
     "bySpendingUpTo": "Було доручено доставити %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Це видалило  %{address} акаунт",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Було доручено надіслати залишок балансу у розмірі %{amount} %{currency} до %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Транзакція скасує чек з ідентифікатором %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Це дозволяє %{address} надсилати платежі до цього акаунта",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Це видаляє дозвіл для %{address} надсилати платежі на цей акаунт",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Це вилучило лінію довіри до актива %{currency} від %{issuer}",
     "itEstablishesTrustLineTo": "Це встановлює %{limit} як максимальну суму %{currency} від %{issuer}, яку %{address} готовий утримувати.",
     "itRemovesTheAccountDomain": "Це видаляє домен акаунта",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Введіть ім'я або адресу",
     "enterCurrencyCodeOrName": "Введіть код валюти або назву",
     "enterName": "Будь ласка, введіть ім’я",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Контакт вже існує",
     "contactSuccessSaved": "Контакт успішно додано",
     "contactSuccessUpdated": "Контакт успішно оновлено",
@@ -759,6 +801,8 @@
     "changePasscode": "Змінити ПІН-код",
     "biometricAuthentication": "Біометрична аутентифікація",
     "hapticFeedback": "Тактильний зворотний зв’язок",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Режим розробника",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Використовувати системний формат валюти",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Ви впевнені, що хочете повернутися назад?\r\n(Ви повинні все повторно заповнити з міркувань безпеки)",
     "accountType": "Тип акаунта",
     "secretType": "Тип секретного ключа",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Будь ласка, виберіть тип Вашого акаунта",
     "pleaseSelectAccountSecretType": "Будь ласка, оберіть тип секретного ключа Вашого акаунта",
     "fullAccess": "Повний доступ",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Результати пошуку відсутні",
     "noContact": "Немає контактів",
     "myAccount": "Мій акаунт",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Адреса відправника та отримувача не можуть бути однаковими!",
     "enterANameOrAddress": "Введіть ім’я або адресу",
     "transferredSuccessfully": "Ваша транзакція успішно зареєстрована в %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Не вдається встановити комісію за транзакцію, спробуйте ще раз.",
     "theDestinationAccountIsSetAsBlackHole": "Цільовий акаунт встановлений як чорна діра, надсилання на цей акаунт призведе до втрати відправлених XRP.",
     "noDestinationTag": "Відсутній тег призначення",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Для цієї адреси потрібен тег призначення",
     "pleaseEnterAmount": "Будь ласка, введіть суму транзакції",
     "trustLineLimitExceeded": "Ліміт лінії довіри перевищено.\r\nЗараз: %{balance}\r\nМаксимум: %{peer_limit}\r\nДоступний для випуску: %{available}\r\nОтримувач може оновити ліміт.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/ur.json b/src/locale/translations/ur.json
index fd480498a..c161d4047 100644
--- a/src/locale/translations/ur.json
+++ b/src/locale/translations/ur.json
@@ -14,6 +14,8 @@
     "discard": "خارج کردیں",
     "remove": "دور",
     "go": "جاؤ",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "بند کریں",
     "save": "محفوظ کریں",
     "confirm": "تصدیق کریں",
@@ -21,6 +23,7 @@
     "balance": "بقیہ",
     "spendable": "قابل خرچ",
     "home": "گھر",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "تقریبات",
     "profile": "پروفائل",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "ترتیبات",
     "search": "تلاش کریں",
     "send": "بھیجیں",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "بھیجنے کے لئے سلائیڈ کریں",
     "done": "کیا",
     "previous": "پچھلا",
@@ -38,6 +43,7 @@
     "exchanges": "تبادلے",
     "scan": "اسکین",
     "request": "درخواست",
+    "receiveOnAccount": "Receive on account",
     "details": "تفصیلات",
     "recipient": "ریسرڈ",
     "destination": "منزل مقصود",
@@ -48,6 +54,11 @@
     "continue": "جاری رہے",
     "code": "کوڈ",
     "copy": "کاپی",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "منتخب شدہ",
     "share": "بانٹیں",
@@ -119,6 +130,7 @@
     "day": "دن",
     "days": "days",
     "week": "ہفتہ",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "آٹو لاک",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "مضبوط",
     "veryStrong": "بہت مضبوط",
     "subject": "مضمون",
+    "credentialType": "Credential Type",
     "empty": "خالی",
     "update": "اپ ڈیٹ",
     "notNow": "ابھی نہیں",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp یہ URL کھولنا چاہتا ہے.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "پہلے سیکیورٹی",
     "slideThree_desc": "زومم ایپلی کیشن اور پلیٹ فارم کو ترجیح کے طور پر سیکیورٹی کے ساتھ بنایا گیا ہے۔ کبھی بھی اپنے راز درج نہ کریں ، اپنے ، قابل بھروسہ آلہ سے لین دین پر دستخط کریں۔",
     "slideFour_title": "بھیجیں اور وصول کریں",
-    "slideFour_desc": "آپ کو بھیجنے اور XRP ساتھ ساتھ کے طور پر دیگر بھروسہ مند اثاثوں وصول کر سکتے ہیں (IOUs)"
+    "slideFour_desc": "آپ کو بھیجنے اور XRP ساتھ ساتھ کے طور پر دیگر بھروسہ مند اثاثوں وصول کر سکتے ہیں (IOUs)",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "پاس کوڈ سیٹ کریں",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "اکاؤنٹ کے لین دین کو بازیافت نہیں کرسکتے ہیں!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "لین دین لوڈ کرنے سے قاصر! براہ کرم یقینی بنائیں کہ آپ انٹرنیٹ سے جڑے ہوئے ہیں۔",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "ادائیگی کی منزل ٹیگ ہے: %{tag}",
     "itWasInstructedToDeliver": "پہنچانے کی ہدایت کی گئی تھی  %{amount} %{currency}",
     "bySpendingUpTo": " تک خرچ کرکے %{amount} %{currency} ",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "اس نے اکاؤنٹ حذف کردیا %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "ہدایت کی گئی تھی کہ بقیہ %{amount} %{currency} سے %{destination} تک کی فراہمی کی جائے",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "اس لین دین سے ID %{checkId} کی جانچ پڑتال منسوخ ہوجائے گی",
     "itAuthorizesSendingPaymentsToThisAccount": "یہ %{address} کو اس اکاؤنٹ میں ادائیگی بھیجنے کا اختیار دیتا ہے",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "اس اکاؤنٹ میں ادائیگی بھیجنے کے لئے %{address} کی اجازت کو ہٹا دیتا ہے",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "اس نے %{issuer} سے ٹرسٹ لائن کرنسی %{currency} کو ہٹا دیا",
     "itEstablishesTrustLineTo": "یہ %{issuer} سے لے کر %{currency} کی زیادہ سے زیادہ رقم کے طور پر %{limit} قائم کرتا ہے جس میں %{address} رکھنا چاہتے ہیں۔",
     "itRemovesTheAccountDomain": "یہ اکاؤنٹ ڈومین کو ہٹا دیتا ہے",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "نام یا پتہ درج کریں",
     "enterCurrencyCodeOrName": "کرنسی کا کوڈ یا نام درج کریں",
     "enterName": "براہ کرم ایک نام درج کریں",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "یہ رابطہ پہلے سے موجود ہے",
     "contactSuccessSaved": "رابطہ کامیابی کے ساتھ شامل کیا گیا",
     "contactSuccessUpdated": "رابطہ کامیابی کے ساتھ اپ ڈیٹ ہوا",
@@ -759,6 +801,8 @@
     "changePasscode": "پاس کوڈ تبدیل کریں",
     "biometricAuthentication": "بایومیٹرک تصدیق",
     "hapticFeedback": "حیرت انگیز آراء",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "ڈویلپر وضع",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "سسٹم کرنسی کی شکل استعمال کریں",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "کیا آپ واقعی واپس جانا چاہتے ہیں؟\r\n(اگر آپ واپس چلے گئے تو ، آپ کو حفاظتی وجوہات کی بناء پر تمام آدانوں کو دوبارہ داخل کرنا پڑے گا)",
     "accountType": "اکاؤنٹ کی اقسام",
     "secretType": "خفیہ قسم",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "براہ کرم اپنے اکاؤنٹ کی قسم منتخب کریں",
     "pleaseSelectAccountSecretType": "براہ کرم اپنے اکاؤنٹ کی خفیہ قسم منتخب کریں",
     "fullAccess": "پوری اجازت",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "تلاش کا کوئی نتیجہ نہیں",
     "noContact": "کوئی رابطہ نہیں ہے",
     "myAccount": "میرا اکاؤنٹ",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "ماخذ اور منزل کا پتہ ایک جیسا نہیں ہوسکتا!",
     "enterANameOrAddress": "ایک نام یا پتہ درج کریں",
     "transferredSuccessfully": "آپ کا ٹرانزیکشن %{network} پر کامیابی کے ساتھ رجسٹرڈ ہوچکا ہے۔",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "منزل مقصود کو بلیک ہول کی حیثیت سے ترتیب دیا گیا ہے۔ اس اکاؤنٹ میں XRP بھیجنے کے نتیجے میں فنڈز کا نقصان ہوگا۔",
     "noDestinationTag": "منزل مقصود نہیں",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "اس پتے کے لئے منزل مقصود ٹیگ کی ضرورت ہے",
     "pleaseEnterAmount": "براہ کرم لین دین کی رقم درج کریں",
     "trustLineLimitExceeded": "ٹرسٹ لائن کی حد سے تجاوز کرگیا۔\r\n\r\nاب: %{balance}\r\nزیادہ سے زیادہ: %{peer_limit}\r\nجاری کرنے کے لئے دستیاب: %{available}\r\n\r\nوصول کنندہ ٹرسٹ لائن کی حد کو اپ ڈیٹ کرسکتا ہے۔",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/uz.json b/src/locale/translations/uz.json
index c8a95b325..ad1531af4 100644
--- a/src/locale/translations/uz.json
+++ b/src/locale/translations/uz.json
@@ -14,6 +14,8 @@
     "discard": "Bekor qilish",
     "remove": "Olib tashlash",
     "go": "Olga",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Yoping",
     "save": "Saqlang",
     "confirm": "Tasdiqlash",
@@ -21,6 +23,7 @@
     "balance": "Qoldiq",
     "spendable": "Sarflanadigan",
     "home": "Boshiga",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Hodisalar",
     "profile": "Profil",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Sozlamalar",
     "search": "Qidirish",
     "send": "Yuborish",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Yuborish uchun qulda suring",
     "done": "Bajarildi",
     "previous": "Oldingi",
@@ -38,6 +43,7 @@
     "exchanges": "Birjalar",
     "scan": "Skanerlash",
     "request": "Surov",
+    "receiveOnAccount": "Receive on account",
     "details": "Tafsilotlar",
     "recipient": "Qabul qiluvchi",
     "destination": "Belgilangan manzil",
@@ -48,6 +54,11 @@
     "continue": "Davom ettirish",
     "code": "Kod",
     "copy": "Nusha",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Tanlangan",
     "share": "Ulashish",
@@ -119,6 +130,7 @@
     "day": "kun",
     "days": "days",
     "week": "hafta",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Avtomatik qulflash",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Kuchlik",
     "veryStrong": "Juda kuchlik",
     "subject": "Mavzu",
+    "credentialType": "Credential Type",
     "empty": "Bush",
     "update": "Yangilash",
     "notNow": "Hozir emas",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "%{xapp} 'xApp ushbu URL manzilini ochmoqchi.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Yaratish To'lov Talab link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Avval xavfsizlik",
     "slideThree_desc": "\r\nXumm dasturi va platformasi ustuvor vazifa sifatida xavfsizlik bilan qurilgan. Hech qachon sirlaringizni boshqa kiritmang, o'zingizning ishonchli qurilmangizdan operatsiyalarni imzolang.\r\n",
     "slideFour_title": "Yuboring va oling",
-    "slideFour_desc": "Siz XRP va boshqa ishonchli aktivlarni (IOU) yuborishingiz va olishingiz mumkin."
+    "slideFour_desc": "Siz XRP va boshqa ishonchli aktivlarni (IOU) yuborishingiz va olishingiz mumkin.",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Parolni o'rnating",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Hisob-kitob operatsiyalarini olib bo'lmaydi!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Tranzaksiya yuklanmadi! Iltimos, Internetga ulanganingizga ishonch hosil qiling.",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "To'lovni belgilash yorlig'i(tag): %{tag}",
     "itWasInstructedToDeliver": "Yetkazib berish haqida ko'rsatma berildi %{amount} %{currency}",
     "bySpendingUpTo": "gacha sarflab %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Bu hisobni o'chirib tashladi %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Qolgan qoldiqni etkazib berishga ko'rsatma berildi %{amount} %{currency} ga %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Tranzaksiya ID bilan tekshirishni bekor qiladi %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Bu %{address} ga ushbu hisob raqamiga to'lovlarni yuborish huquqini beradi",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Bu %{address} uchun ushbu hisob raqamiga to'lovlarni yuborish huquqini olib tashlaydi",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Ishoch yuli %{currency} valyutasini %{issuer} ga olib tashladi",
     "itEstablishesTrustLineTo": "Bu %{address} dan %{issuer} dan olinadigan %{currency} maksimal miqdori sifatida %{limit} ni belgilaydi va saqlashga tayyor.",
     "itRemovesTheAccountDomain": "Bu hisob domenini olib tashlaydi",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Ism yoki manzilni kiriting",
     "enterCurrencyCodeOrName": "Valyuta kodini yoki ismini kiriting",
     "enterName": "Iltimos, ism kiriting",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Kontakt allaqachon mavjud",
     "contactSuccessSaved": "Kontakt muvaffaqiyatli qo'shildi",
     "contactSuccessUpdated": "Kontakt muvaffaqiyatli yangilandi",
@@ -759,6 +801,8 @@
     "changePasscode": "Parolni o'zgartiring",
     "biometricAuthentication": "Biometrik autentifikatsiya",
     "hapticFeedback": "Taktil muloqot",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Ishlab chiqaruvchi rejimi",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Tizim valyuta formatidan foydalaning",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Orqaga qaytishni xohlaysizmi?\r\n(xavfsizlik uchun barcha yozuvlarni qayta to'ldirishingiz kerak)",
     "accountType": "Hisob turi",
     "secretType": "Yashirin turi",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Iltimos, hisob turini tanlang",
     "pleaseSelectAccountSecretType": "Iltimos, hisobingizning sir turini tanlang",
     "fullAccess": "To'liq kirish",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Qidiruv natijasi yo'q",
     "noContact": "Kontaktlar yo‘q",
     "myAccount": "Mening hisobim",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Manba va Belgilangan manzil bir xil bo'lishi mumkin emas!",
     "enterANameOrAddress": "Ism yoki manzilni kiriting",
     "transferredSuccessfully": "Sizning tranzaksiyaingiz %{network} ga muvaffaqiyatli ro'yxatdan o'tkazildi.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Belgilangan hisob qora tuynuk sifatida o'rnatiladi. Ushbu hisob raqamiga XRP yuborish mablag'larning yo'qolishiga olib keladi.",
     "noDestinationTag": "Belgilangan yorliq (tag) yo'q",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Ushbu manzil manzil yorlig'i (Tag)ni talab qiladi",
     "pleaseEnterAmount": "Iltimos, yubormoqchi bo'lgan miqdorni to'ldiring",
     "trustLineLimitExceeded": "Ishonch yuli limitidan oshib ketdi.\r\n \r\nXozir: %{balance}\r\nYuqori: %{peer_limit}\r\nXozirda mavzud: %{available}\r\n \r\nQabul qiluvchiga Ishonch yuli limiti yangilanishi mumkin.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/vi.json b/src/locale/translations/vi.json
index cbd043276..f7c964517 100644
--- a/src/locale/translations/vi.json
+++ b/src/locale/translations/vi.json
@@ -14,6 +14,8 @@
     "discard": "Bỏ đi",
     "remove": "Xóa bỏ",
     "go": "Đi",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "Đóng",
     "save": "Lưu",
     "confirm": "Xác nhận",
@@ -21,6 +23,7 @@
     "balance": "Số dư",
     "spendable": "Có thể chi tiêu",
     "home": "Trang chủ",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "Sự kiện",
     "profile": "Hồ sơ",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "Cài đặt",
     "search": "Tìm kiếm",
     "send": "Gửi",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Trượt để gửi",
     "done": "Hoàn thành",
     "previous": "Trước",
@@ -38,6 +43,7 @@
     "exchanges": "Sàn Giao dịch",
     "scan": "Quét",
     "request": "Yêu cầu",
+    "receiveOnAccount": "Receive on account",
     "details": "Chi tiết",
     "recipient": "Người nhận",
     "destination": "Nơi Đến",
@@ -48,6 +54,11 @@
     "continue": "Tiếp tục",
     "code": "Mã",
     "copy": "Sao chép",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "Đã chọn",
     "share": "Chia sẻ",
@@ -119,6 +130,7 @@
     "day": "ngày",
     "days": "days",
     "week": "tuần",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Tự động khóa",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Mạnh",
     "veryStrong": "Rất mạnh",
     "subject": "Tiêu đề",
+    "credentialType": "Credential Type",
     "empty": "Trống",
     "update": "Cập nhật",
     "notNow": "Không phải lúc này",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp muốn mở URL này.\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Bảo mật trước tiên",
     "slideThree_desc": "Ứng dụng và nền tảng Xumm được ưu tiên xây dựng với bảo mật. Không bao giờ nhập lại các bí mật của bạn, hãy ký các giao dịch từ thiết bị đáng tin cậy của riêng bạn.",
     "slideFour_title": "Gửi và nhận",
-    "slideFour_desc": "Bạn cũng có thể gửi và nhận XRP cũng như các mã thông báo đáng tin cậy khác"
+    "slideFour_desc": "Bạn cũng có thể gửi và nhận XRP cũng như các mã thông báo đáng tin cậy khác",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Thiết lập mật mã",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Không thể tìm các giao dịch tài khoản!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Không thể tải giao dịch, vui lòng đảm bảo rằng bạn đã kết nối với Internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "Thẻ đích thanh toán là: %{tag}",
     "itWasInstructedToDeliver": "Nó được hướng dẫn để phân phối %{amount} %{currency}",
     "bySpendingUpTo": "bằng cách chi tiêu lên đến %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "Nó đã xóa tài khoản %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "Nó được hướng dẫn chuyển số dư còn lại của %{amount} %{currency} đến %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "Giao dịch sẽ hủy séc với ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "Nó cho phép %{address} gửi các khoản thanh toán đến tài khoản này",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "Nó xóa ủy quyền cho %{address}  để gửi thanh toán vào tài khoản này",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "Nó đã loại bỏ TrustLine currency %{currency} thành %{issuer}",
     "itEstablishesTrustLineTo": "Nó thiết lập %{limit} là số tiền %{currency} tối đa từ %{issuer} mà %{address} sẵn sàng nắm giữ.",
     "itRemovesTheAccountDomain": "Nó xóa miền tài khoản",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Nhập tên hoặc địa chỉ",
     "enterCurrencyCodeOrName": "Nhập mã tiền tệ hoặc tên",
     "enterName": "Vui lòng nhập tên",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Liên hệ đã tồn tại",
     "contactSuccessSaved": "Đã thêm liên hệ thành công",
     "contactSuccessUpdated": "Đã cập nhật thành công địa chỉ liên hệ",
@@ -759,6 +801,8 @@
     "changePasscode": "Đổi mật khẩu",
     "biometricAuthentication": "Xác thực sinh trắc học",
     "hapticFeedback": "Phản hồi xúc giác",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Chế độ nhà phát triển",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Sử dụng định dạng tiền tệ hệ thống",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Bạn có chắc chắn muốn quay lại không?\r\n(bạn phải điền lại tất cả các đầu vào vì lý do bảo mật)",
     "accountType": "Loại tài khoản",
     "secretType": "Loại bí mật",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Vui lòng chọn loại tài khoản của bạn",
     "pleaseSelectAccountSecretType": "Vui lòng chọn loại bí mật tài khoản của bạn",
     "fullAccess": "Toàn quyền truy cập",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "Không có kết quả tìm kiếm",
     "noContact": "Không có liên hệ",
     "myAccount": "Tài khoản của tôi",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Địa chỉ gửi và nhận không được giống nhau!",
     "enterANameOrAddress": "Nhập tên hoặc địa chỉ",
     "transferredSuccessfully": "Giao dịch của bạn đã được đăng ký thành công trên sổ kế toán %{network}.",
@@ -1072,6 +1118,7 @@
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
     "theDestinationAccountIsSetAsBlackHole": "Tài khoản đích được đặt là lỗ đen, việc gửi đến tài khoản này sẽ làm mất XRP đã gửi.",
     "noDestinationTag": "Không có thẻ nhận",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "Địa chỉ này yêu cầu thẻ đích đến",
     "pleaseEnterAmount": "Vui lòng nhập số tiền giao dịch",
     "trustLineLimitExceeded": "Đã vượt quá giới hạn TrustLine, hiện tại: %{balance}, tối đa: %{peer_limit}, khả dụng để phát hành: %{available}. Người nhận có thể cập nhật giới hạn Trustline.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/zh-TW.json b/src/locale/translations/zh-TW.json
index 1c1f2829e..df4c959e1 100644
--- a/src/locale/translations/zh-TW.json
+++ b/src/locale/translations/zh-TW.json
@@ -14,6 +14,8 @@
     "discard": "放棄",
     "remove": "刪除",
     "go": "前往設置",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "關閉",
     "save": "存擋",
     "confirm": "確定",
@@ -21,6 +23,7 @@
     "balance": "帳戶額度",
     "spendable": "可消費額度",
     "home": "主頁",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "事件",
     "profile": "個人檔案",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "設置",
     "search": "搜索",
     "send": "發送",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Slide to send",
     "done": "完成",
     "previous": "上一步",
@@ -38,6 +43,7 @@
     "exchanges": "交易平台",
     "scan": "掃碼",
     "request": "接受付款",
+    "receiveOnAccount": "Receive on account",
     "details": "詳細內容",
     "recipient": "收款人",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "繼續",
     "code": "代碼",
     "copy": "複製",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "已選",
     "share": "分享",
@@ -119,6 +130,7 @@
     "day": "day",
     "days": "days",
     "week": "week",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "Auto lock",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "Strong",
     "veryStrong": "Very strong",
     "subject": "Subject",
+    "credentialType": "Credential Type",
     "empty": "Empty",
     "update": "Update",
     "notNow": "Not now",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wants to open this URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "Security first",
     "slideThree_desc": "The Xumm application and platform are built with security as a priority. Never enter your secrets again, sign transactions from your own, trusted device.",
     "slideFour_title": "Send and receive",
-    "slideFour_desc": "You can send and receive XRP and other trusted tokens as well"
+    "slideFour_desc": "You can send and receive XRP and other trusted tokens as well",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "Setup a passcode",
@@ -480,7 +506,7 @@
     "onDate": "on",
     "paymentReceived": "Payment received",
     "paymentSent": "Payment sent",
-    "exchangedAssets": "Exchanged tokens",
+    "exchangedAssets": "Swapped tokens",
     "addedATrustLine": "Added a token (TrustLine)",
     "removedATrustLine": "Removed a token (TrustLine)",
     "updatedATrustLine": "Token Updated (TrustLine)",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "Can not fetch account transactions!",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Unable to load the transaction, please make sure you are connected to internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "The payment destination tag is: %{tag}",
     "itWasInstructedToDeliver": "It was instructed to deliver %{amount} %{currency}",
     "bySpendingUpTo": "by spending up to %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "It deleted account %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "It was instructed to deliver the remaining balance of %{amount} %{currency} to %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "The transaction will cancel check with ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "It authorizes %{address} to send payments to this account",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "It removes the authorization for %{address} to send payments to this account",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "It removed TrustLine currency %{currency} to %{issuer}",
     "itEstablishesTrustLineTo": "It establishes %{limit} as the maximum amount of %{currency} from %{issuer} that %{address} is willing to hold.",
     "itRemovesTheAccountDomain": "It removes the account domain",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "Enter name or address",
     "enterCurrencyCodeOrName": "Enter currency code or name",
     "enterName": "Please enter a name",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "Contact already exists",
     "contactSuccessSaved": "Contact successfully added",
     "contactSuccessUpdated": "Contact successfully updated",
@@ -759,6 +801,8 @@
     "changePasscode": "Change passcode",
     "biometricAuthentication": "Biometric authentication",
     "hapticFeedback": "Haptic feedback",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Developer mode",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "Use system currency format",
@@ -811,7 +855,7 @@
     "unableToDeleteNodeWhenConnectedToNetwork": "Unable to remove the node while connected to this network, please switch network and try again!",
     "developerModeEnabledWarning": "Enabling Developer Mode may reduce certain security functions. Proceed with utmost caution, and only enable it if you comprehend the potential consequences.",
     "disablingDeveloperMode": "Disabling Developer Mode",
-    "disableDeveloperModeRevertNetworkWarning": "Please note that this action will revert your selected network from '%{currentNetwork}' to the '%{defaultNetwork}'. Are you sure you want to proceed?",
+    "disableDeveloperModeRevertNetworkWarning": "Please note that this action will revert your selected network from '%{currentNetwork}' to '%{defaultNetwork}'. Are you sure you want to proceed?",
     "blockingTakingScreenShotsIsDisabled": "Developer mode is active, Screenshot capture protection is temporarily disabled.",
     "syncRailsRemoveNetworkWarning": "Applying this sync will disconnect you from the current network (%{currentNetwork}). Please switch to a different network and try again.",
     "syncRailsRemoveNodeWarning": "By applying this sync, the current node (%{connectedNode}) to which you are currently connected will be removed. Please select a new default node for this network and try again.",
@@ -841,7 +885,7 @@
     "generateNewAccount": "Create a new account",
     "confirmPrivateTitle": "Confirm your secret numbers",
     "confirmPrivateDescription": "Please provide the numbers, this is for your own safety: we want you to confirm you wrote it down.",
-    "invalidSecretNumber": "Invalid secret number key entered",
+    "invalidSecretNumber": "The numbers entered do not match the requested row of numbers.",
     "accountSetupCompleted": "Account setup is complete.",
     "YouJustCreatedAccount": "You have just created a new fresh account.",
     "yeahLetsGo": "Hooray, let's go!",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "Are you sure you want to go back? \r\n (you have to re-fill all the inputs for security reasons)",
     "accountType": "Account type",
     "secretType": "Secret type",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "Please select your account type",
     "pleaseSelectAccountSecretType": "Please select your account secret type",
     "fullAccess": "Full access",
@@ -902,8 +947,8 @@
     "chooseAccountType": "Choose account type",
     "secretNumbers": "Secret numbers",
     "secretNumbersDesc": "Preferred account type. 8 rows of 6 digits",
-    "familySeed": "Family Seed",
-    "familySeedDesc": "Looks like sXXX1234XXX...",
+    "familySeed": "Family Seed / Private Key",
+    "familySeedDesc": "E.g. sXb1c3aX... or EDAF9E...",
     "mnemonic": "Mnemonic",
     "scanFromQR": "Scan from QR code",
     "mnemonicDesc": "Based on 12, 16 or 24 words",
@@ -916,10 +961,10 @@
     "pleaseEnterYourMnemonic": "Please enter your Mnemonic",
     "howManyWordsYourMnemonicIs": "How many words does your mnemonic have?",
     "pleaseEnterYourSecretNumber": "Please enter your secret numbers",
-    "invalidFamilySeed": "Invalid Family Seed",
+    "invalidFamilySeed": "Invalid Family Seed / Private Key",
     "invalidHexPrivateKey": "Invalid HEX private key! HEX private keys should be 66 HEX characters (A-F, 0-9) long.",
-    "pleaseProvideFamilySeed": "Please provide your account secret/family Seed.",
-    "pleaseEnterYourFamilySeed": "Please enter your family seed",
+    "pleaseProvideFamilySeed": "Please provide your account secret (Family Seed) or 66 HEX char. private key.",
+    "pleaseEnterYourFamilySeed": "Enter your Family Seed / Private Key",
     "accountImportCompleted": "Account import complete!",
     "youJustImportedAccount": "You just added your account",
     "accountSettings": "Edit account",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "No search result",
     "noContact": "No contacts",
     "myAccount": "My Account",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "Source and Destination address cannot be the same!",
     "enterANameOrAddress": "Enter a name or an address",
     "transferredSuccessfully": "Your transaction has been successfully registered on the %{network}.",
@@ -1053,7 +1099,7 @@
     "somethingWentWrong": "Something went wrong!",
     "resultCopiedToClipboard": "Result copied to clipboard",
     "txIdCopiedToClipboard": "Transaction ID copied to clipboard",
-    "submittingToLedger": "Sending your transaction to the %{network}",
+    "submittingToLedger": "Sending your transaction to %{network}",
     "sendingFrom": "Sending from",
     "enterDescription": "Enter description",
     "enterPublicMemo": "Enter public memo (optional)",
@@ -1070,8 +1116,9 @@
     "destinationTagIsRequired": "The destination tag is required for sending this payment.",
     "unableGetRecipientAccountInfoPleaseTryAgain": "Unable to get recipient account info please try again.",
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
-    "theDestinationAccountIsSetAsBlackHole": "The destination account is set as black hole, sending to this account will cause losing sent XRP.",
+    "theDestinationAccountIsSetAsBlackHole": "The destination account is 'Black Holed', sending to this account will cause losing sent XRP.",
     "noDestinationTag": "No destination tag",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "This address requires a Destination Tag",
     "pleaseEnterAmount": "Please enter the transaction amount",
     "trustLineLimitExceeded": "TrustLine limit is exceeded.\r\n\r\nNow: %{balance}\r\nMax: %{peer_limit}\r\nAvailable for issuing: %{available}\r\n\r\nThe recipient can update the Trustline limit.",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/locale/translations/zh.json b/src/locale/translations/zh.json
index 12d30d0ff..efcdf879a 100644
--- a/src/locale/translations/zh.json
+++ b/src/locale/translations/zh.json
@@ -14,6 +14,8 @@
     "discard": "放弃",
     "remove": "移除",
     "go": "去设置",
+    "none": "None",
+    "okLetsGo": "Ok, let's go!",
     "close": "关闭",
     "save": "保存",
     "confirm": "确认",
@@ -21,6 +23,7 @@
     "balance": "余额",
     "spendable": "可用余额",
     "home": "首页",
+    "accounttxpush": "Transaction Push Notifications",
     "events": "账本记录",
     "profile": "个人资料",
     "pro": "Pro Beta",
@@ -29,6 +32,8 @@
     "settings": "设置",
     "search": "搜索",
     "send": "转账",
+    "swap": "Swap",
+    "swap3p": "Swap (third-party)",
     "slideToSend": "Slide to send",
     "done": "已完成",
     "previous": "上一步",
@@ -38,6 +43,7 @@
     "exchanges": "交易所",
     "scan": "扫一扫",
     "request": "请求",
+    "receiveOnAccount": "Receive on account",
     "details": "详细信息",
     "recipient": "收款人",
     "destination": "Destination",
@@ -48,6 +54,11 @@
     "continue": "继续",
     "code": "代码",
     "copy": "复制",
+    "holdToCopy": "hold to copy",
+    "requestLinkNow": "Copy or share a request link",
+    "shareAsQr": "Or share as QR code",
+    "orShareQr": "Or share your account as QR",
+    "requestCopied": "Request link copied to your clipboard",
     "select": "Select",
     "selected": "已选",
     "share": "分享",
@@ -119,6 +130,7 @@
     "day": "天",
     "days": "days",
     "week": "周",
+    "unusualTransaction": "Spam / Scam transaction",
     "autoLock": "自动锁定",
     "suggested": "Suggested",
     "low": "Low",
@@ -203,6 +215,11 @@
     "tokenTaxon": "Token Taxon",
     "uri": "URI",
     "transferFee": "Transfer fee",
+    "assetScale": "Asset Scale",
+    "maximumAmount": "Maximum Amount",
+    "mpTokenMetadata": "MP Token Metadata",
+    "mpTokenIssuanceID": "MP Token Issuance ID",
+    "holder": "Holder",
     "tokenID": "Token ID",
     "tokenIDs": "Token IDs",
     "tokenOffers": "Token offers",
@@ -227,6 +244,7 @@
     "strong": "强大",
     "veryStrong": "非常强",
     "subject": "学科",
+    "credentialType": "Credential Type",
     "empty": "空的",
     "update": "更新资料",
     "notNow": "现在不要",
@@ -341,6 +359,7 @@
     "support": "Support",
     "nfts": "NFTs",
     "xAppWantsToOpenURLNotice": "'%{xapp}' xApp wants to open this URL.\r\n\r\n%{url}",
+    "xAppWantsToSendSessionLogs": "This xApp is requesting your 'Session Logs'. Session Logs do not contain personal information, except for your your acount addresses and ledger connection logging.\r\n\r\nIf you want to inspect the contents of the session log first, visit Settings - Advanced - Session Log.\r\n\r\nDo you want to allow the application to access session log information?",
     "createPaymentRequestLink": "Create Payment Request link",
     "transactionFeeIsNotSet": "Transaction fee is not set, please wait until transaction fee is set and try again!",
     "unableToSetAccountSequence": "Unable to set account Sequence, please check that you are connected to the internet.",
@@ -356,6 +375,8 @@
     "blob": "Blob",
     "data": "Data",
     "didDocument": "DID Document",
+    "authorizeCredentials": "Authorize credentials",
+    "unauthorizeCredentials": "Unauthorize credentials",
     "digest": "Digest",
     "uriTokenId": "URI Token Id",
     "oracleDocumentID": "Oracle Document Id",
@@ -367,6 +388,7 @@
     "quoteAsset": "Quote asset",
     "assetPrice": "Asset price",
     "priceData": "Price Data",
+    "credentialIDs": "Credential ID's",
     "scale": "Scale",
     "hookParameters": "Hook Parameters",
     "hookFeeNotice": "Note: The total transaction fee includes a %{hookFee} %{nativeAsset} hooks fee.",
@@ -386,7 +408,11 @@
     "slideThree_title": "安全第一",
     "slideThree_desc": "xumm应用程序和平台在构建时考虑了安全性。永远不要再输入您的密钥，而要通过自己信任的设备签署交易。",
     "slideFour_title": "发送和接收",
-    "slideFour_desc": "您可以发送和接收XRP以及其它授信的资产（IOU's）"
+    "slideFour_desc": "您可以发送和接收XRP以及其它授信的资产（IOU's）",
+    "v2main1": "The Leading Self-Custody Wallet.",
+    "v2main2": "Secure Your Crypto with Confidence.",
+    "v2homepage_noacc1": "Welcome to Xaman",
+    "v2homepage_noacc2": "Import your existing account or create a new account."
   },
   "setupPasscode": {
     "setupAPasscode": "设置密码",
@@ -541,6 +567,9 @@
     "lpTokenOut": "LP Token Out",
     "lpTokenIn": "LP Token In",
     "tradingFee": "Trading Fee",
+    "fees": "Fees",
+    "txServiceFees": "Ledger & Service Fees",
+    "serviceFee": "Service Fee",
     "authAccounts": "Auth Accounts",
     "genesisMint": "Genesis Mint",
     "enableAmendment": "Enable Amendment",
@@ -554,8 +583,15 @@
     "clawback": "Clawback",
     "didSet": "DID Set",
     "didDelete": "DID Delete",
+    "credentialCreate": "Credential Create",
+    "credentialAccept": "Credential Accept",
+    "credentialDelete": "Credential Delete",
     "oracleSet": "Oracle Set",
     "oracleDelete": "Oracle Delete",
+    "mpTokenIssuanceCreate": "MP Token Issuance Create",
+    "mpTokenIssuanceDestroy": "MP Token Issuance Destroy",
+    "mpTokenIssuanceSet": "MP Token Issuance Set",
+    "mpTokenAuthorize": "MP Token Authorize",
     "canNotFetchTransactions": "无法获取帐户交易！",
     "canNotFetchSignRequests": "Cannot fetch account sign requests!",
     "unableToLoadTheTransaction": "Unable to load the transaction, please make sure you are connected to internet!",
@@ -588,6 +624,7 @@
     "thePaymentHasADestinationTag": "The payment destination tag is: %{tag}",
     "itWasInstructedToDeliver": "It was instructed to deliver %{amount} %{currency}",
     "bySpendingUpTo": "by spending up to %{amount} %{currency}",
+    "thePaymentIncludesCredentialIds": "The payment includes credential IDs: %{credentialIDs}",
     "transferRateMayApplied": "This transaction may be subject to a %{transferRatePercentage} transfer rate applied by the issuer. Please refer to the issuer account for additional information.",
     "itDeletedAccount": "It deleted account %{address}",
     "itWasInstructedToDeliverTheRemainingBalanceOf": "It was instructed to deliver the remaining balance of %{amount} %{currency} to %{destination}",
@@ -604,6 +641,8 @@
     "theTransactionWillCancelCheckWithId": "The transaction will cancel check with ID %{checkId}",
     "itAuthorizesSendingPaymentsToThisAccount": "It authorizes %{address} to send payments to this account",
     "itRemovesAuthorizesSendingPaymentsToThisAccount": "It removes the authorization for %{address} to send payments to this account",
+    "preauthorizeCredentials": "It authorizes credential(s)",
+    "unauthorizeCredentials": "It un-authorizes credential(s)",
     "itRemovedTrustLineCurrencyTo": "It removed TrustLine currency %{currency} to %{issuer}",
     "itEstablishesTrustLineTo": "It establishes %{limit} as the maximum amount of %{currency} from %{issuer} that %{address} is willing to hold.",
     "itRemovesTheAccountDomain": "It removes the account domain",
@@ -676,6 +715,7 @@
     "myBalanceAndReserve": "My balance & reserve",
     "transactionDetailsDifferentNetworkError": "This transaction is not valid on the network you are connected with.\n\nPlease switch to %{network} and try again.",
     "fetchingTransactionFromNetwork": "Fetching transaction from network",
+    "fetchingTransactionsFromNetwork": "Fetching transactions from network...",
     "unableToLoadExplainer": "Unable to load the explainer",
     "uriTokenBurnExplain": "The transaction will burn URI token with ID %{tokenID}",
     "uriTokenBuyExplain": "%{address} paid %{amount} %{currency} in order to receive an URI token with ID %{tokenID}",
@@ -734,6 +774,8 @@
     "enterNameOrAddress": "输入姓名或地址",
     "enterCurrencyCodeOrName": "Enter currency code or name",
     "enterName": "请输入一个名字",
+    "themeAutoSwitch": "Automatically switch light/dark mode",
+    "notChangingYetBecauseLightMode": "Your device is currently in light mode, and automatically switching. The selected dark mode theme will become active when your device is in dark mode.",
     "contactAlreadyExist": "联系人已存在",
     "contactSuccessSaved": "已成功添加联系人",
     "contactSuccessUpdated": "联系人已成功更新",
@@ -759,6 +801,8 @@
     "changePasscode": "更改密码",
     "biometricAuthentication": "生物特征认证",
     "hapticFeedback": "触觉反馈",
+    "hideAdvisoryTransactions": "Hide spam/scam transactions",
+    "hideServiceFeeTransactions": "Hide Service Fee events",
     "developerMode": "Developer mode",
     "developerSettings": "Developer settings",
     "useSystemSeparators": "系统货币样式",
@@ -879,6 +923,7 @@
     "goBackRefillTheInput": "您确定要返回吗？ （出于安全原因，您必须重新填写所有输入）",
     "accountType": "帐户类型",
     "secretType": "密钥类型",
+    "keypairType": "Keypair type",
     "pleaseSelectAccountType": "请选择您的账户类型",
     "pleaseSelectAccountSecretType": "请选择您的帐户密钥类型",
     "fullAccess": "完全访问",
@@ -1017,7 +1062,7 @@
     "checkWhichAccountsNeedBetterEncryption": "Check which accounts need better encryption",
     "updateEncryption": "Update encryption",
     "whyUseThisNewEncryptionMethod": "Why use this new encryption method?",
-    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES512 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
+    "newEncryptionExplain": "Our encryption & security is enhanced to new standards AES256 GCM. You should encrypt your account with this new method to be extra safe. Although you are already safe, it can't hurt to upgrade to the new standards.",
     "doNotTurnOffYourPhoneOrQuiteWhileMigration": "Don't turn off your phone or quit the app while doing the encryption.",
     "unableToFetchAccountNFTokens": "Unable to fetch the account NFT's. Please make sure you are connected to the XRP Ledger node."
   },
@@ -1032,6 +1077,7 @@
     "noSearchResult": "没有搜索结果",
     "noContact": "没有联系人",
     "myAccount": "我的账户",
+    "accountInfo": "Account info",
     "sourceAndDestinationCannotBeSame": "源地址和目标地址不能相同！",
     "enterANameOrAddress": "输入姓名或地址",
     "transferredSuccessfully": "您的交易已成功在%{network}上注册。",
@@ -1070,8 +1116,9 @@
     "destinationTagIsRequired": "发送此付款需要提供目的地标签。",
     "unableGetRecipientAccountInfoPleaseTryAgain": "无法获取接收帐户信息，请重试。",
     "unableToSetFeesPleaseTryAgain": "Unable to set transaction fees, please try again.",
-    "theDestinationAccountIsSetAsBlackHole": "The destination account is set as black hole, sending to this account will cause losing sent XRP.",
+    "theDestinationAccountIsSetAsBlackHole": "The destination account is set 'Black Holed', sending to this account will cause losing sent XRP.",
     "noDestinationTag": "没有标签",
+    "addDestinationTag": "Add destination tag",
     "thisAddressRequiredDestinationTag": "此地址需要目的地标签",
     "pleaseEnterAmount": "请输入交易金额",
     "trustLineLimitExceeded": "超过信任线限额，现在：%{balance}，最高额度：%{peer_limit}，可发行：%{available}。接收方可以更新信任线限额。",
@@ -1219,7 +1266,8 @@
     "benefitsTextTwo": "xApp access",
     "benefitsTextThree": "Premium support",
     "unlockFullFunctionality": "Unlock full functionality with a small payment.",
-    "prePurchaseTip": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
+    "prePurchaseTipIos": "Please note that this is a 30 days purchase. Make sure your Apple ID is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button.",
+    "prePurchaseTipAndroid": "Please note that this is a 30 days purchase. Make sure your Google account is logged in and your payment information is up-to-date. For issues, use the 'Restore Purchase' button."
   },
   "errors": {
     "unableToLoadTermOfService": "Oops! Unable to Retrieve Terms of Service",
diff --git a/src/screens/Account/Add/AccountAddView.tsx b/src/screens/Account/Add/AccountAddView.tsx
index 4cdda0919..c7118e9ef 100644
--- a/src/screens/Account/Add/AccountAddView.tsx
+++ b/src/screens/Account/Add/AccountAddView.tsx
@@ -4,7 +4,15 @@
 import { get, set, isEmpty } from 'lodash';
 
 import React, { Component } from 'react';
-import { View, Text, Image, ImageBackground, Alert, InteractionManager, EventSubscription } from 'react-native';
+import {
+    View,
+    Text,
+    ImageBackground,
+    Alert,
+    InteractionManager,
+    EventSubscription,
+    SafeAreaView,
+} from 'react-native';
 
 import RNTangemSdk, { Card, EventCallback } from 'tangem-sdk-react-native';
 
@@ -23,7 +31,7 @@ import { GetPreferCurve, GetWalletDerivedPublicKey, DefaultDerivationPaths } fro
 import { AppScreens } from '@common/constants';
 
 // components
-import { Button, Header, Spacer } from '@components/General';
+import { Button, Header, Spacer, LoadingIndicator } from '@components/General';
 
 import Localize from '@locale';
 
@@ -31,14 +39,18 @@ import { Props as AccountGenerateViewProps } from '@screens/Account/Add/Generate
 import { Props as AccountImportViewProps } from '@screens/Account/Add/Import/types';
 
 import { AppStyles } from '@theme';
-import styles from './styles';
+// import styles from './styles';
 
 /* types ==================================================================== */
-export interface Props {}
+export interface Props {
+    DefaultTangem?: boolean;
+    NavigationReadyPromise?: PromiseLike<void>;
+}
 
 export interface State {
     NFCSupported: boolean;
     NFCEnabled: boolean;
+    HasLaunchedTangem: boolean;
 }
 
 /* Component ==================================================================== */
@@ -46,6 +58,7 @@ class AccountAddView extends Component<Props, State> {
     static screenName = AppScreens.Account.Add;
 
     private nfcChangeListener?: EventSubscription;
+    private hasRendered = false;
 
     static options() {
         return {
@@ -59,13 +72,14 @@ class AccountAddView extends Component<Props, State> {
         this.state = {
             NFCSupported: false,
             NFCEnabled: false,
+            HasLaunchedTangem: false,
         };
     }
 
     componentDidMount() {
         InteractionManager.runAfterInteractions(() => {
-            // on NFC state change (Android)
             this.nfcChangeListener = RNTangemSdk.addListener('NFCStateChange', this.onNFCStateChange);
+            // on NFC state change (Android)
 
             // get current NFC status
             RNTangemSdk.getNFCStatus().then((status) => {
@@ -79,6 +93,21 @@ class AccountAddView extends Component<Props, State> {
         });
     }
 
+    componentDidUpdate() {
+        const {DefaultTangem, NavigationReadyPromise} = this.props;
+        const {NFCEnabled, HasLaunchedTangem} = this.state;
+
+        InteractionManager.runAfterInteractions(() => {
+            // componentDidAppear?
+            if (!HasLaunchedTangem && NFCEnabled && !this.hasRendered) {
+                this.hasRendered = true;
+                if (DefaultTangem && NavigationReadyPromise) {
+                    NavigationReadyPromise.then(this.onAddTangemCardPress);
+                }
+            }
+        });
+    }
+
     componentWillUnmount() {
         if (this.nfcChangeListener) {
             this.nfcChangeListener.remove();
@@ -216,6 +245,7 @@ class AccountAddView extends Component<Props, State> {
 
         if (!NFCSupported) {
             Alert.alert(Localize.t('global.error'), Localize.t('account.tangemNFCNotSupportedDeviceAlert'));
+            this.setState({ HasLaunchedTangem: true });
             return;
         }
 
@@ -230,9 +260,24 @@ class AccountAddView extends Component<Props, State> {
         if (NFCEnabled) {
             await this.scanTangemCard();
         }
+
+        this.setState({ HasLaunchedTangem: true });
     };
 
     render() {
+        const {DefaultTangem} = this.props;
+        const {HasLaunchedTangem, NFCSupported, NFCEnabled} = this.state;
+
+        if (DefaultTangem && !HasLaunchedTangem) {
+            return (
+                <View style={AppStyles.container}>
+                    <LoadingIndicator
+                        size="large"
+                    />
+                </View>
+            );
+        }
+
         return (
             <View testID="account-add-screen" style={AppStyles.container}>
                 <Header
@@ -242,53 +287,86 @@ class AccountAddView extends Component<Props, State> {
                     }}
                     centerComponent={{ text: Localize.t('account.addAccount') }}
                 />
-                <View style={[AppStyles.contentContainer, AppStyles.paddingHorizontal, AppStyles.paddingBottom]}>
+                <View style={[AppStyles.contentContainer]}>
                     <ImageBackground
-                        source={StyleService.getImage('BackgroundShapes')}
-                        imageStyle={AppStyles.BackgroundShapes}
-                        style={[AppStyles.BackgroundShapesWH, AppStyles.column]}
+                        resizeMode="cover"
+                        source={StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')}
+                        style={[
+                            AppStyles.BackgroundShapesWH,
+                            AppStyles.column,
+                        ]}
                     >
-                        <View style={[AppStyles.flex1, AppStyles.centerContent]}>
-                            <Image
-                                style={[AppStyles.emptyIcon, AppStyles.centerSelf]}
-                                source={StyleService.getImage('ImageAddAccount')}
-                            />
-                        </View>
-                        <View style={AppStyles.flexEnd}>
-                            <Text style={[AppStyles.emptyText, AppStyles.baseText]}>
-                                {Localize.t('account.addAccountDescription')}
-                            </Text>
-                            <View style={[AppStyles.centerAligned, AppStyles.centerContent]}>
-                                <Button
-                                    numberOfLines={1}
-                                    testID="account-generate-button"
-                                    label={Localize.t('account.generateNewAccount')}
-                                    onPress={this.goToGenerate}
-                                />
-
-                                <Spacer />
-
-                                <Button
-                                    secondary
-                                    numberOfLines={1}
-                                    testID="account-import-button"
-                                    label={Localize.t('account.importExisting')}
-                                    onPress={this.goToImport}
-                                />
-
-                                <View style={styles.separatorContainer}>
-                                    <Text style={styles.separatorText}>{Localize.t('global.or')}</Text>
+                        <SafeAreaView style={[AppStyles.flex1]}>
+                            <View style={[AppStyles.flex1, AppStyles.centerContent]}>
+                                <Text style={[
+                                    AppStyles.emptyText,
+                                    AppStyles.baseText,
+                                    AppStyles.p,
+                                ]}>
+                                    {Localize.t('account.addAccountDescription')}
+                                </Text>
+                            </View>
+                            <View style={AppStyles.flexEnd}>
+                                <View style={[AppStyles.centerAligned, AppStyles.centerContent]}>
+                                    <Button
+                                        // numberOfLines={1}
+                                        testID="account-generate-button"
+                                        label={Localize.t('account.generateNewAccount')}
+                                        icon="IconCreate"
+                                        iconStyle={AppStyles.imgColorWhite}
+                                        nonBlock
+                                        onPress={this.goToGenerate}
+                                    />
+
+                                    <Spacer />
+
+                                    <Button
+                                        secondary
+                                        // numberOfLines={1}
+                                        testID="account-import-button"
+                                        label={Localize.t('account.importExisting')}
+                                        icon="IconImport"
+                                        iconStyle={AppStyles.imgColorWhite}
+                                        nonBlock
+                                        onPress={this.goToImport}
+                                    />
+
+                                    <Spacer size={
+                                        NFCSupported && NFCEnabled
+                                            ? 12
+                                            : AppStyles.marginBottom.marginBottom
+                                    }/>
+
+                                    { 
+                                        NFCSupported && NFCEnabled && (
+                                            <View>
+                                                <Text style={[
+                                                    AppStyles.textCenterAligned,
+                                                    AppStyles.smalltext,
+                                                    AppStyles.bold,
+                                                    AppStyles.colorGrey,
+                                                ]}>{Localize.t('global.or').toUpperCase()}</Text>
+                                                <Spacer size={12} />
+
+                                                <Button
+                                                    icon="IconTangem"
+                                                    iconStyle={AppStyles.imgColorContrast}
+                                                    nonBlock
+                                                    contrast
+                                                    testID="tangem-import-button"
+                                                    label={Localize.t('account.addTangemCard')}
+                                                    onPress={this.onAddTangemCardPress}
+                                                    style={[
+                                                        {backgroundColor: StyleService.value('$contrast') },
+                                                        AppStyles.marginBottom,
+                                                    ]}
+                                                />
+                                            </View>
+                                        )
+                                    }
                                 </View>
-
-                                <Button
-                                    contrast
-                                    testID="tangem-import-button"
-                                    label={Localize.t('account.addTangemCard')}
-                                    onPress={this.onAddTangemCardPress}
-                                    style={{ backgroundColor: StyleService.value('$contrast') }}
-                                />
                             </View>
-                        </View>
+                        </SafeAreaView>
                     </ImageBackground>
                 </View>
             </View>
diff --git a/src/screens/Account/Add/Generate/AccountGenerateView.tsx b/src/screens/Account/Add/Generate/AccountGenerateView.tsx
index f7e3bfe83..70158adeb 100644
--- a/src/screens/Account/Add/Generate/AccountGenerateView.tsx
+++ b/src/screens/Account/Add/Generate/AccountGenerateView.tsx
@@ -128,7 +128,9 @@ class AccountGenerateView extends Component<Props, State> {
             );
 
             backendService.addAccount(account.address!, signedTransaction).catch(() => {
-                // ignore
+                setTimeout(() => {
+                    backendService.privateAccountInfo(account?.address, account?.label, true);
+                }, 2000);
             });
 
             let encryptionKey;
@@ -210,7 +212,6 @@ class AccountGenerateView extends Component<Props, State> {
                     ...this.state,
                     goNext: this.goNext,
                     goBack: this.goBack,
-
                     setEncryptionLevel: this.setEncryptionLevel,
                     setLabel: this.setLabel,
                     setPassphrase: this.setPassphrase,
diff --git a/src/screens/Account/Add/Generate/Steps/ConfirmSeed/ConfirmStep.tsx b/src/screens/Account/Add/Generate/Steps/ConfirmSeed/ConfirmStep.tsx
index daec314d5..754c1365a 100644
--- a/src/screens/Account/Add/Generate/Steps/ConfirmSeed/ConfirmStep.tsx
+++ b/src/screens/Account/Add/Generate/Steps/ConfirmSeed/ConfirmStep.tsx
@@ -6,7 +6,7 @@ import React, { Component } from 'react';
 import { isEqual } from 'lodash';
 import { SafeAreaView, View, Text, Alert } from 'react-native';
 
-import { Prompt } from '@common/helpers/interface';
+import { VibrateHapticFeedback } from '@common/helpers/interface';
 import Localize from '@locale';
 // components
 import { Button, Footer } from '@components/General';
@@ -14,6 +14,7 @@ import { SecretNumberInput } from '@components/Modules';
 
 // style
 import { AppStyles } from '@theme';
+import styles from './styles';
 
 import { StepsContext } from '../../Context';
 /* types ==================================================================== */
@@ -43,52 +44,64 @@ class ConfirmStep extends Component<Props, State> {
     }
 
     goNext = () => {
-        const { generatedAccount, goNext } = this.context;
+        const { currentRow } = this.state;
+        const { goNext } = this.context;
 
-        const secretNumber = this.secretNumberInputRef.current?.getNumbers();
+        VibrateHapticFeedback(
+            currentRow < 7
+                ? 'impactHeavy'
+                : 'notificationSuccess',
+        );
 
-        if (isEqual(generatedAccount?.secret.secretNumbers, secretNumber)) {
-            goNext('ViewPublicKey');
-        } else {
-            Alert.alert('Invalid', Localize.t('account.invalidSecretNumber'));
+        this.clearPin();
+
+        if (currentRow < 8) {
+            this.setState({ currentRow: currentRow + 1 });
+
+            if (currentRow === 7) {
+                goNext('ViewPublicKey');
+            }
         }
     };
 
     goBack = () => {
         const { goBack } = this.context;
+        const { currentRow } = this.state;
 
-        Prompt(
-            Localize.t('global.pleaseNote'),
-            Localize.t('account.goBackClearTheInput'),
-            [
-                {
-                    text: Localize.t('global.goBack'),
-                    onPress: goBack,
-                    style: 'destructive',
-                },
-                { text: Localize.t('global.cancel') },
-            ],
-            { type: 'default' },
-        );
-    };
-
-    validateRow = (row: number, numbers: string) => {
-        const { generatedAccount } = this.context;
+        VibrateHapticFeedback('impactHeavy');
 
-        // TODO: type check
-        return isEqual(generatedAccount?.secret.secretNumbers![row], numbers);
+        if (currentRow > 0) {
+            this.clearPin();
+            this.setState({ currentRow: currentRow - 1 });                
+        } else {
+            goBack();
+        }
     };
 
-    onSecretNumberAllFilled = (filled: boolean) => {
-        this.setState({
-            allFilled: filled,
-        });
+    clearPin = () => {
+        this.setState({ allFilled: false });
+        this.secretNumberInputRef.current?.clearPin();
     };
 
-    onSecretNumberRowChange = (row: number) => {
-        this.setState({
-            currentRow: row,
-        });
+    validateRow = (numbers: string) => {
+        const { currentRow } = this.state;
+        const { generatedAccount } = this.context;
+
+        const validates = isEqual(generatedAccount?.secret.secretNumbers![currentRow], numbers);
+        if (!validates) {
+            VibrateHapticFeedback('notificationError');
+            Alert.alert(
+                'Invalid', 
+                `${Localize.t('account.invalidSecretNumber')}\n\n${Localize.t('account.confirmNumbersOfRow', { row: 'abcdefgh'[currentRow].toUpperCase() })}`,
+                [ { onPress: this.clearPin } ],
+            );
+        } else {
+            setTimeout(() => {
+                this.goNext();
+            }, 150);
+        }
+
+        return validates;
     };
 
     render() {
@@ -99,6 +112,26 @@ class ConfirmStep extends Component<Props, State> {
             <SafeAreaView testID="account-generate-confirm-private-view" style={AppStyles.container}>
                 {currentRow < 8 ? (
                     <>
+                        <View style={[
+                            styles.letterBlockWapper,
+                        ]}>
+                            <View
+                                style={[
+                                    styles.letterBlock,
+                                    // AppStyles.centerContent,
+                                    // AppStyles.centerAligned,
+                                    // rowChecksumCorrect && !readonly && styles.rowStyleInnerGreen,
+                                ]}
+                            >
+                                <Text style={[
+                                    styles.letterBlockText,
+                                    // styles.RowId,
+                                    // rowChecksumCorrect && !readonly && styles.rowStyleInnerGreenText
+                                ]}>
+                                    {abcdefgh[currentRow]}
+                                </Text>
+                            </View>
+                        </View>
                         <Text style={[AppStyles.p, AppStyles.bold]}>
                             {Localize.t('account.confirmNumbersOfRow', {
                                 row: abcdefgh[currentRow],
@@ -117,8 +150,6 @@ class ConfirmStep extends Component<Props, State> {
                 <View style={[AppStyles.contentContainer, AppStyles.paddingHorizontal, AppStyles.centerAligned]}>
                     <SecretNumberInput
                         ref={this.secretNumberInputRef}
-                        onAllFilled={this.onSecretNumberAllFilled}
-                        onRowChanged={this.onSecretNumberRowChange}
                         validateRow={this.validateRow}
                     />
                 </View>
diff --git a/src/screens/Account/Add/Generate/Steps/ConfirmSeed/styles.tsx b/src/screens/Account/Add/Generate/Steps/ConfirmSeed/styles.tsx
index 4cbe0abfe..a5ede1d8c 100644
--- a/src/screens/Account/Add/Generate/Steps/ConfirmSeed/styles.tsx
+++ b/src/screens/Account/Add/Generate/Steps/ConfirmSeed/styles.tsx
@@ -1,6 +1,27 @@
-import { StyleSheet } from 'react-native';
+import StyleService from '@services/StyleService';
 
+import { AppFonts } from '@theme';
 /* Styles ==================================================================== */
-const styles = StyleSheet.create({});
-
-export default styles;
+export default StyleService.create({
+    letterBlockWapper: {
+        // borderLeftWidth: 6,
+        borderColor: '$transparent',
+    },
+    letterBlockText: {
+        fontFamily: AppFonts.base.familyBold,
+        color: '$white',
+        lineHeight: 25,
+        fontSize: 17,
+    },
+    letterBlock: {
+        // borderWidth: 1,
+        // borderColor: '#ffcc99',
+        backgroundColor: '$orange',
+        paddingHorizontal: 16,
+        // paddingVertical: 1,
+        borderRadius: 20,
+        marginBottom: 10,
+        position: 'relative',
+        top: 0,
+    },
+});
diff --git a/src/screens/Account/Add/Generate/Steps/ExplainActivation/ExplainActivationStep.tsx b/src/screens/Account/Add/Generate/Steps/ExplainActivation/ExplainActivationStep.tsx
index 8157c9aa9..51b8a2019 100644
--- a/src/screens/Account/Add/Generate/Steps/ExplainActivation/ExplainActivationStep.tsx
+++ b/src/screens/Account/Add/Generate/Steps/ExplainActivation/ExplainActivationStep.tsx
@@ -34,8 +34,7 @@ class ExplainActivationStep extends Component<Props, State> {
     };
 
     render() {
-        const { goBack } = this.context;
-
+        // const { goBack } = this.context;
         return (
             <SafeAreaView testID="account-generate-explain-activation-view" style={AppStyles.container}>
                 <View style={[AppStyles.centerAligned, AppStyles.marginVerticalSml]}>
@@ -75,7 +74,7 @@ class ExplainActivationStep extends Component<Props, State> {
                 </View>
 
                 <Footer style={[AppStyles.row, AppStyles.centerAligned]}>
-                    <View style={[AppStyles.flex3, AppStyles.paddingRightSml]}>
+                    {/* <View style={[AppStyles.flex3, AppStyles.paddingRightSml]}>
                         <Button
                             testID="back-button"
                             light
@@ -83,8 +82,8 @@ class ExplainActivationStep extends Component<Props, State> {
                             icon="IconChevronLeft"
                             onPress={goBack}
                         />
-                    </View>
-                    <View style={AppStyles.flex5}>
+                    </View> */}
+                    <View style={AppStyles.flex1}>
                         <Button
                             testID="next-button"
                             label={Localize.t('global.nextIUnderstand')}
diff --git a/src/screens/Account/Add/Generate/Steps/Finish/FinishStep.tsx b/src/screens/Account/Add/Generate/Steps/Finish/FinishStep.tsx
index 503bb93bc..379cecd3c 100644
--- a/src/screens/Account/Add/Generate/Steps/Finish/FinishStep.tsx
+++ b/src/screens/Account/Add/Generate/Steps/Finish/FinishStep.tsx
@@ -55,9 +55,10 @@ class FinishStep extends Component<Props, State> {
             <SafeAreaView style={AppStyles.flex1}>
                 <ImageBackground
                     testID="account-generate-finish-view"
-                    source={StyleService.getImage('BackgroundPattern')}
+                    source={StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')}
                     style={[AppStyles.container]}
                     imageStyle={styles.backgroundImageStyle}
+                    resizeMode="cover"
                 >
                     <View
                         style={[
diff --git a/src/screens/Account/Add/Generate/Steps/Finish/styles.tsx b/src/screens/Account/Add/Generate/Steps/Finish/styles.tsx
index 60294dc5b..1b3468be2 100644
--- a/src/screens/Account/Add/Generate/Steps/Finish/styles.tsx
+++ b/src/screens/Account/Add/Generate/Steps/Finish/styles.tsx
@@ -4,7 +4,11 @@ import { AppSizes, AppFonts } from '@theme';
 
 /* Styles ==================================================================== */
 const styles = StyleService.create({
-    backgroundImageStyle: { tintColor: '$tint', opacity: 0.4, height: AppSizes.screen.height },
+    backgroundImageStyle: {
+        // tintColor: '$tint',
+        // opacity: 0.4,
+        height: AppSizes.screen.height,
+    },
     emojiIcon: {
         fontSize: AppFonts.h1.size * 2,
         paddingBottom: 50,
diff --git a/src/screens/Account/Add/Generate/Steps/SeedExplanation/SeedExplanationStep.tsx b/src/screens/Account/Add/Generate/Steps/SeedExplanation/SeedExplanationStep.tsx
index 224790813..e8885fc10 100644
--- a/src/screens/Account/Add/Generate/Steps/SeedExplanation/SeedExplanationStep.tsx
+++ b/src/screens/Account/Add/Generate/Steps/SeedExplanation/SeedExplanationStep.tsx
@@ -35,15 +35,20 @@ class SeedExplanationStep extends Component<Props, State> {
         return (
             <SafeAreaView testID="account-generate-explanation-private-view" style={AppStyles.container}>
                 <View style={[AppStyles.centerAligned, AppStyles.marginBottomSml]}>
-                    <Image style={[AppStyles.emptyIcon]} source={StyleService.getImage('ImageSecretWarning')} />
+                    <Image style={[
+                        AppStyles.emptyIcon,
+                        AppStyles.emptyIconSm,
+                        AppStyles.marginTopSml,
+                        AppStyles.marginBottomSml,
+                    ]} source={StyleService.getImage('ImageTriangle')} />
                 </View>
 
-                <View style={[AppStyles.contentContainer, AppStyles.centerAligned, AppStyles.paddingSml]}>
+                <View style={[AppStyles.contentContainer, AppStyles.centerAligned, AppStyles.paddingHorizontalSml]}>
                     <Text style={[AppStyles.baseText, AppStyles.textCenterAligned]}>
                         {Localize.t('account.privateKeyRowsDesc')}
                     </Text>
 
-                    <Spacer size={30} />
+                    <Spacer size={20} />
 
                     <Text style={[AppStyles.baseText, AppStyles.textCenterAligned]}>
                         {Localize.t('account.writeDownPrivateKey')}
@@ -51,7 +56,11 @@ class SeedExplanationStep extends Component<Props, State> {
 
                     <Spacer size={20} />
 
-                    <InfoMessage type="error" label={Localize.t('account.neverSharePrivateKey')} />
+                    <InfoMessage
+                        type="error"
+                        label={Localize.t('account.neverSharePrivateKey')}
+                        labelStyle={[AppStyles.p, AppStyles.bold, AppStyles.colorRed]}
+                    />
                     <Spacer size={20} />
                 </View>
 
@@ -59,7 +68,7 @@ class SeedExplanationStep extends Component<Props, State> {
                     <View style={AppStyles.flex5}>
                         <Button
                             testID="next-button"
-                            textStyle={AppStyles.strong}
+                            // textStyle={AppStyles.strong}
                             label={Localize.t('global.nextIUnderstand')}
                             onPress={this.goNext}
                         />
diff --git a/src/screens/Account/Add/Import/AccountImportView.tsx b/src/screens/Account/Add/Import/AccountImportView.tsx
index 899dca83b..52f6d8d96 100644
--- a/src/screens/Account/Add/Import/AccountImportView.tsx
+++ b/src/screens/Account/Add/Import/AccountImportView.tsx
@@ -24,7 +24,12 @@ import { AppScreens } from '@common/constants';
 import BackendService from '@services/BackendService';
 import LedgerService from '@services/LedgerService';
 
-import { AccountRepository, CoreRepository, ProfileRepository } from '@store/repositories';
+import {
+    AccountRepository,
+    CoreRepository,
+    ProfileRepository,
+    NetworkRepository,
+} from '@store/repositories';
 import { AccountModel } from '@store/models';
 import { AccessLevels, AccountTypes, EncryptionLevels } from '@store/types';
 
@@ -39,6 +44,8 @@ import { AppStyles } from '@theme';
 import Steps from './Steps';
 import { StepsContext } from './Context';
 
+import NetworkService from '@services/NetworkService';
+
 /* types ==================================================================== */
 import { ImportSteps, Props, SecretTypes, State } from './types';
 
@@ -366,18 +373,40 @@ class AccountImportView extends Component<Props, State> {
     importAccount = async () => {
         const { tangemCard } = this.props;
         const { account, importedAccount, passphrase, alternativeSeedAlphabet, tangemSignature } = this.state;
-
         try {
             let encryptionKey;
             let createdAccount: AccountModel;
 
             // if account is imported as full access report to the backend for security checks
             if (account.accessLevel === AccessLevels.Full) {
+                const persistPrivateAccountInfo = () => {
+                    setTimeout(() => {
+                        BackendService.privateAccountInfo(account?.address, account?.label, true);
+                        // Push by default
+                    }, 2000);                
+                };
+                
                 // get the signature and add account
                 if (account.type === AccountTypes.Tangem) {
-                    BackendService.addAccount(account.address!, tangemSignature!, GetCardId(tangemCard!)).catch(() => {
-                        // ignore
-                    });
+                    await BackendService.addAccount(account.address!, tangemSignature!, GetCardId(tangemCard!))
+                        .then(async r => {
+                            persistPrivateAccountInfo();
+                            if (typeof r?.switch_to_network === 'string') {
+                                if (NetworkService.getNetwork().key !== r.switch_to_network) {
+                                    const toNetwork = NetworkRepository.findBy('key', r.switch_to_network);
+                                    if (toNetwork.length === 1) {
+                                        try {
+                                            await NetworkService.switchNetwork(toNetwork[0]);
+                                        } catch (e) {
+                                            //
+                                        }
+                                    }
+                                }
+                            }
+                        })
+                        .catch(() => {
+                            // ignore
+                        });
                 } else {
                     // include device UUID is signed transaction
                     const { deviceUUID, uuid } = ProfileRepository.getProfile()!;
@@ -388,9 +417,13 @@ class AccountImportView extends Component<Props, State> {
                         },
                         importedAccount,
                     );
-                    BackendService.addAccount(account.address!, signedTransaction).catch(() => {
-                        // ignore
-                    });
+                    BackendService.addAccount(account.address!, signedTransaction)
+                        .then(() => {
+                            persistPrivateAccountInfo();
+                        })
+                        .catch(() => {
+                            // ignore
+                        });
                 }
             }
 
@@ -426,13 +459,12 @@ class AccountImportView extends Component<Props, State> {
                 account: createdAccount,
             });
 
-            // close the screen
-            Navigator.popToRoot().then(() => {
-                // if account imported with alternative seed alphabet and xApp present
-                // route user to the xApp
-                if (has(alternativeSeedAlphabet, 'params.xapp')) {
+            if (has(alternativeSeedAlphabet, 'params.xapp')) {
+                Navigator.popToRoot().then(() => {
+                    // if account imported with alternative seed alphabet and xApp present
+                    // route user to the xApp
                     const xappIdentifier = get(alternativeSeedAlphabet, 'params.xapp') as string;
-
+    
                     Navigator.showModal<XAppBrowserModalProps>(
                         AppScreens.Modal.XAppBrowser,
                         {
@@ -446,8 +478,15 @@ class AccountImportView extends Component<Props, State> {
                             modalPresentationStyle: OptionsModalPresentationStyle.overFullScreen,
                         },
                     );
-                }
-            });
+                });
+            } else {
+                Navigator.popToRoot().then(() => {
+                    requestAnimationFrame(() => {
+                        Navigator.navigateToTab('Home');
+                    });
+                });
+            }
+
         } catch (error) {
             // this should never happen but in case just show error that something went wrong
             Toast(Localize.t('global.unexpectedErrorOccurred'));
diff --git a/src/screens/Account/Add/Import/Steps/EnterSecretNumbers/EnterSecretNumbersStep.tsx b/src/screens/Account/Add/Import/Steps/EnterSecretNumbers/EnterSecretNumbersStep.tsx
index 53bdb0672..ab58de71b 100644
--- a/src/screens/Account/Add/Import/Steps/EnterSecretNumbers/EnterSecretNumbersStep.tsx
+++ b/src/screens/Account/Add/Import/Steps/EnterSecretNumbers/EnterSecretNumbersStep.tsx
@@ -6,6 +6,9 @@ import React, { Component } from 'react';
 import { SafeAreaView, View, Text, Alert } from 'react-native';
 
 import { derive } from 'xrpl-accountlib';
+import { Utils } from 'xrpl-secret-numbers';
+
+import { VibrateHapticFeedback } from '@common/helpers/interface';
 
 import Localize from '@locale';
 // components
@@ -14,13 +17,14 @@ import { SecretNumberInput } from '@components/Modules';
 
 // style
 import { AppStyles } from '@theme';
-
+import styles from '../../../Generate/Steps/ConfirmSeed/styles';
 import { StepsContext } from '../../Context';
 
 /* types ==================================================================== */
 export interface Props {}
 
 export interface State {
+    currentRow: number;
     allFilled: boolean;
 }
 
@@ -30,30 +34,31 @@ class EnterSecretNumbers extends Component<Props, State> {
     declare context: React.ContextType<typeof StepsContext>;
 
     private secretNumberInputRef: React.RefObject<SecretNumberInput>;
+    private secretNumbers: string[];
 
     constructor(props: Props) {
         super(props);
 
         this.state = {
             allFilled: false,
+            currentRow: 0,
         };
 
         this.secretNumberInputRef = React.createRef();
+        this.secretNumbers = ['','','','','','','',''];
     }
 
     goNext = () => {
         const { goNext, setImportedAccount, importOfflineSecretNumber } = this.context;
 
-        const secretNumber = this.secretNumberInputRef.current?.getNumbers();
-
         try {
             // double check, this should never happen
-            if (!secretNumber || !Array.isArray(secretNumber)) {
+            if (!this.secretNumbers || !Array.isArray(this.secretNumbers)) {
                 Alert.alert(Localize.t('global.error'), 'No secret number provided!');
                 return;
             }
 
-            const account = derive.secretNumbers(secretNumber, importOfflineSecretNumber);
+            const account = derive.secretNumbers(this.secretNumbers, importOfflineSecretNumber);
 
             // set imported account
             setImportedAccount(account, () => {
@@ -65,6 +70,41 @@ class EnterSecretNumbers extends Component<Props, State> {
         }
     };
 
+    clearPin = () => {
+        this.setState({ allFilled: false });
+        this.secretNumberInputRef.current?.clearPin();
+    };
+
+    validateRow = (numbers: string) => {
+        const { currentRow } = this.state;
+
+        const validates = !!Utils.checkChecksum(currentRow, numbers);
+        if (!validates) {
+            VibrateHapticFeedback('notificationError');
+            Alert.alert(
+                'Invalid', 
+                `${Localize.t('account.invalidSecretNumber')}\n\n${Localize.t('account.confirmNumbersOfRow', { row: 'abcdefgh'[currentRow].toUpperCase() })}`,
+                [ { onPress: this.clearPin } ],
+            );
+        } else {
+            setTimeout(() => {
+                this.clearPin();
+                this.secretNumbers[currentRow] = numbers;
+                if (currentRow < 7) {
+                    this.setState({
+                        currentRow: currentRow + 1,
+                    });
+                } else {
+                    // Done
+                    this.goNext();
+                }
+            }, 150);
+        }
+
+        return validates;
+    };
+
+
     onAllFilled = (filled: boolean) => {
         this.setState({
             allFilled: filled,
@@ -72,7 +112,7 @@ class EnterSecretNumbers extends Component<Props, State> {
     };
 
     render() {
-        const { allFilled } = this.state;
+        const { allFilled, currentRow } = this.state;
         const { goBack, importOfflineSecretNumber } = this.context;
 
         return (
@@ -82,11 +122,32 @@ class EnterSecretNumbers extends Component<Props, State> {
                 >
                     {Localize.t('account.pleaseEnterYourSecretNumber')}
                 </Text>
+                <View style={[
+                    AppStyles.marginTop,
+                    styles.letterBlockWapper,
+                ]}>
+                    <View
+                        style={[
+                            styles.letterBlock,
+                            // AppStyles.centerContent,
+                            // AppStyles.centerAligned,
+                            // rowChecksumCorrect && !readonly && styles.rowStyleInnerGreen,
+                        ]}
+                    >
+                        <Text style={[
+                            styles.letterBlockText,
+                            // styles.RowId,
+                            // rowChecksumCorrect && !readonly && styles.rowStyleInnerGreenText
+                        ]}>
+                            {'abcdefgh'?.[currentRow]?.toUpperCase()}
+                        </Text>
+                    </View>
+                </View>
 
                 <View style={[AppStyles.contentContainer, AppStyles.paddingHorizontal, AppStyles.centerAligned]}>
                     <SecretNumberInput
                         ref={this.secretNumberInputRef}
-                        onAllFilled={this.onAllFilled}
+                        validateRow={this.validateRow}
                         checksum={!importOfflineSecretNumber}
                     />
                 </View>
diff --git a/src/screens/Account/Add/Import/Steps/EnterSeed/EnterSeedStep.tsx b/src/screens/Account/Add/Import/Steps/EnterSeed/EnterSeedStep.tsx
index edc239c7d..0b5612ccd 100644
--- a/src/screens/Account/Add/Import/Steps/EnterSeed/EnterSeedStep.tsx
+++ b/src/screens/Account/Add/Import/Steps/EnterSeed/EnterSeedStep.tsx
@@ -5,12 +5,26 @@
 import React, { Component } from 'react';
 import { SafeAreaView, View, Text, Alert, KeyboardTypeOptions, Platform } from 'react-native';
 
+import { Navigator } from '@common/helpers/navigator';
+import { AppScreens } from '@common/constants';
+
 import { derive } from 'xrpl-accountlib';
 import { StringType, XrplSecret } from 'xumm-string-decode';
 
+import { PickerModalProps } from '@screens/Global/Picker';
+
 import Localize from '@locale';
 // components
-import { Button, TextInput, Spacer, KeyboardAwareScrollView, Footer } from '@components/General';
+import {
+    Button,
+    TextInput,
+    Spacer,
+    KeyboardAwareScrollView,
+    Footer,
+    TouchableDebounce,
+    // Switch,
+    Icon,
+} from '@components/General';
 
 import { ConvertCodecAlphabet } from '@common/utils/codec';
 
@@ -25,6 +39,7 @@ export interface Props {}
 
 export interface State {
     secret?: string;
+    secretType?: string;
     showSecret: boolean;
     keyboardType: KeyboardTypeOptions;
 }
@@ -39,6 +54,7 @@ class EnterSeedStep extends Component<Props, State> {
 
         this.state = {
             secret: undefined,
+            secretType: 'secp256k1',
             showSecret: false,
             keyboardType: 'default',
         };
@@ -46,7 +62,7 @@ class EnterSeedStep extends Component<Props, State> {
 
     driveFamilySeed = () => {
         const { alternativeSeedAlphabet } = this.context;
-        const { secret } = this.state;
+        const { secret, secretType } = this.state;
 
         try {
             if (!secret) {
@@ -61,7 +77,9 @@ class EnterSeedStep extends Component<Props, State> {
                     xrplSecret = ConvertCodecAlphabet(secret, alphabet);
                 }
             }
-            const account = derive.familySeed(xrplSecret);
+            const account = derive.familySeed(xrplSecret, secretType === 'ed25519' ? {
+                algorithm: secretType,
+            } : undefined);
 
             this.goNext(account);
         } catch (error) {
@@ -138,10 +156,50 @@ class EnterSeedStep extends Component<Props, State> {
         this.setState({ secret: value.replace(/[^a-z0-9]/gi, '') });
     };
 
+    getSecretType = (): string => {
+        const { secretType } = this.state;
+        return secretType || 'secp256k1';
+    };
+
+    showKeypairTypePicker = () => {
+        const { secretType } = this.state;
+
+        // let normalizedLocales = [];
+
+        // for (const locale of locales) {
+        //     normalizedLocales.push({
+        //         value: locale.code,
+        //         title: locale.nameLocal,
+        //     });
+        // }
+
+        // normalizedLocales = sortBy(uniqBy(normalizedLocales, 'title'), 'title');
+
+        Navigator.push<PickerModalProps>(AppScreens.Global.Picker, {
+            title: Localize.t('global.language'),
+            description: Localize.t('settings.selectLanguage'),
+            items: [
+                { value: 'secp256k1', title: `secp256k1 (${Localize.t('global.default')})` },
+                { value: 'ed25519', title: 'ed25519' },
+            ],
+            selected: secretType || 'secp256k1',
+            onSelect: v => {
+                this.setState({
+                    secretType: v.value,
+                });
+            },
+        });
+    };
+
     render() {
         const { goBack, alternativeSeedAlphabet } = this.context;
         const { secret, showSecret, keyboardType } = this.state;
 
+        const isEligibleForKeyTypePicker = typeof secret === 'string' &&
+            secret.trim().length > 15 &&
+            secret.trim().match(/^s/) &&
+            !secret.trim().match(/^sed/i);
+
         return (
             <SafeAreaView testID="account-import-enter-family-seed-view" style={AppStyles.container}>
                 <KeyboardAwareScrollView style={AppStyles.flex1} contentContainerStyle={AppStyles.paddingHorizontal}>
@@ -164,8 +222,11 @@ class EnterSeedStep extends Component<Props, State> {
                         autoCorrect={false}
                         secureTextEntry={!showSecret}
                         keyboardType={keyboardType}
-                        inputStyle={styles.inputText}
+                        inputStyle={
+                            String(secret || '') === '' ? styles.inputTextEmpty : styles.inputText
+                        }
                         onChangeText={this.onTextChange}
+                        style={styles.textInput}
                         value={secret}
                         showScanner
                         scannerType={StringType.XrplSecret}
@@ -182,6 +243,20 @@ class EnterSeedStep extends Component<Props, State> {
                         label={showSecret ? Localize.t('account.hideSecret') : Localize.t('account.showSecret')}
                         onPress={this.toggleShowSecret}
                     />
+                    <Spacer size={20} />
+                    { isEligibleForKeyTypePicker && 
+                        <TouchableDebounce style={styles.row} onPress={this.showKeypairTypePicker}>
+                            <View style={AppStyles.flex3}>
+                                <Text numberOfLines={1} style={styles.label}>
+                                    {Localize.t('account.keypairType')}
+                                </Text>
+                            </View>
+                            <View style={[AppStyles.centerAligned, AppStyles.row]}>
+                                <Text style={styles.value}>{this.getSecretType()}</Text>
+                                <Icon size={25} style={styles.rowIcon} name="IconChevronRight" />
+                            </View>
+                        </TouchableDebounce>
+                    }
                 </KeyboardAwareScrollView>
 
                 <Footer style={[AppStyles.centerAligned, AppStyles.row]}>
diff --git a/src/screens/Account/Add/Import/Steps/EnterSeed/styles.tsx b/src/screens/Account/Add/Import/Steps/EnterSeed/styles.tsx
index c8b6dc85e..c170b8965 100644
--- a/src/screens/Account/Add/Import/Steps/EnterSeed/styles.tsx
+++ b/src/screens/Account/Add/Import/Steps/EnterSeed/styles.tsx
@@ -1,9 +1,48 @@
-import { StyleSheet } from 'react-native';
+// import { StyleSheet } from 'react-native';
+
+import StyleService from '@services/StyleService';
+import { AppStyles, AppSizes, AppFonts } from '@theme';
 
 /* Styles ==================================================================== */
-const styles = StyleSheet.create({
+const styles = StyleService.create({
     inputText: {
-        textAlign: 'center',
+        // textAlign: 'left',
+        fontFamily: AppStyles.mono.fontFamily,
+    },
+    inputTextEmpty: {
+        fontFamily: AppFonts.base.family,
+    },
+    textInput: {
+        borderColor: 'transparent',
+        borderWidth: 0,
+        width: '100%',
+        color: '$contrast',
+    }, 
+    value: {
+        fontFamily: AppFonts.base.family,
+        fontSize: AppFonts.subtext.size,
+        textAlign: 'right',
+        color: '$grey',
+    },
+    row: {
+        width: '100%',
+        flexDirection: 'row',
+        alignItems: 'center',
+        justifyContent: 'center',
+        paddingHorizontal: 5,
+        paddingVertical: AppSizes.paddingSml,
+        // borderBottomWidth: StyleSheet.hairlineWidth,
+        // borderTopWidth: StyleSheet.hairlineWidth,
+        // borderColor: '$tint',
+    },
+    label: {
+        fontFamily: AppFonts.base.family,
+        fontSize: AppFonts.subtext.size,
+        color: '$textPrimary',
+    },
+    rowIcon: {
+        tintColor: '$grey',
+        marginRight: -10,
     },
 });
 
diff --git a/src/screens/Account/Add/Import/Steps/ExplainActivation/ExplainActivationStep.tsx b/src/screens/Account/Add/Import/Steps/ExplainActivation/ExplainActivationStep.tsx
index 434aac2d6..910f71d6d 100644
--- a/src/screens/Account/Add/Import/Steps/ExplainActivation/ExplainActivationStep.tsx
+++ b/src/screens/Account/Add/Import/Steps/ExplainActivation/ExplainActivationStep.tsx
@@ -41,8 +41,7 @@ class ExplainActivationStep extends Component<Props, State> {
     };
 
     render() {
-        const { goBack } = this.context;
-
+        // const { goBack } = this.context;
         return (
             <SafeAreaView testID="account-import-explain-activation-view" style={AppStyles.container}>
                 <View style={[AppStyles.centerAligned, AppStyles.marginVerticalSml]}>
@@ -78,7 +77,7 @@ class ExplainActivationStep extends Component<Props, State> {
                 </View>
 
                 <Footer style={[AppStyles.row, AppStyles.centerAligned]}>
-                    <View style={[AppStyles.flex3, AppStyles.paddingRightSml]}>
+                    {/* <View style={[AppStyles.flex3, AppStyles.paddingRightSml]}>
                         <Button
                             testID="back-button"
                             light
@@ -86,8 +85,8 @@ class ExplainActivationStep extends Component<Props, State> {
                             icon="IconChevronLeft"
                             onPress={goBack}
                         />
-                    </View>
-                    <View style={AppStyles.flex5}>
+                    </View> */}
+                    <View style={AppStyles.flex1}>
                         <Button
                             testID="next-button"
                             label={Localize.t('global.nextIUnderstand')}
diff --git a/src/screens/Account/Add/Import/Steps/Finish/FinishStep.tsx b/src/screens/Account/Add/Import/Steps/Finish/FinishStep.tsx
index 23ce04bd9..664703b09 100644
--- a/src/screens/Account/Add/Import/Steps/Finish/FinishStep.tsx
+++ b/src/screens/Account/Add/Import/Steps/Finish/FinishStep.tsx
@@ -59,9 +59,10 @@ class FinishStep extends Component<Props, State> {
             <SafeAreaView style={AppStyles.container}>
                 <ImageBackground
                     testID="account-import-finish-view"
-                    source={StyleService.getImage('BackgroundPattern')}
+                    source={StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')}
                     style={[AppStyles.container]}
                     imageStyle={styles.backgroundImageStyle}
+                    resizeMode="cover"
                 >
                     <View
                         style={[
diff --git a/src/screens/Account/Add/Import/Steps/Finish/styles.tsx b/src/screens/Account/Add/Import/Steps/Finish/styles.tsx
index 791b9a71e..b9e10216d 100644
--- a/src/screens/Account/Add/Import/Steps/Finish/styles.tsx
+++ b/src/screens/Account/Add/Import/Steps/Finish/styles.tsx
@@ -3,7 +3,11 @@ import StyleService from '@services/StyleService';
 import { AppSizes, AppFonts } from '@theme';
 /* Styles ==================================================================== */
 const styles = StyleService.create({
-    backgroundImageStyle: { tintColor: '$tint', opacity: 0.4, height: AppSizes.screen.height },
+    backgroundImageStyle: {
+        // tintColor: '$tint',
+        // opacity: 0.4,
+        height: AppSizes.screen.height,
+    },
     emojiIcon: {
         fontSize: AppFonts.h1.size * 2,
         paddingBottom: 50,
diff --git a/src/screens/Account/Add/Import/Steps/VerifySignature/VerifySignatureStep.tsx b/src/screens/Account/Add/Import/Steps/VerifySignature/VerifySignatureStep.tsx
index 04fd5a5e1..7df01395a 100644
--- a/src/screens/Account/Add/Import/Steps/VerifySignature/VerifySignatureStep.tsx
+++ b/src/screens/Account/Add/Import/Steps/VerifySignature/VerifySignatureStep.tsx
@@ -104,7 +104,7 @@ class VerifySignatureStep extends Component<Props, State> {
         // verify signature
         const verified = AccountLib.utils.verifySignature(
             AccountLib.binary.encodeForSigning(txJson),
-            txJson.TxnSignature,
+            txJson.TxnSignature as string,
             publicKey,
         );
 
diff --git a/src/screens/Account/Edit/AccountSettingsView.tsx b/src/screens/Account/Edit/AccountSettingsView.tsx
index 3b23723c6..1628456be 100644
--- a/src/screens/Account/Edit/AccountSettingsView.tsx
+++ b/src/screens/Account/Edit/AccountSettingsView.tsx
@@ -6,6 +6,8 @@ import { first, filter } from 'lodash';
 import React, { Component, Fragment } from 'react';
 import { Alert, ScrollView, Text, View } from 'react-native';
 
+import PushNotificationsService from '@services/PushNotificationsService';
+
 import { Prompt } from '@common/helpers/interface';
 import { Navigator } from '@common/helpers/navigator';
 
@@ -16,7 +18,7 @@ import { AccountRepository, CoreRepository } from '@store/repositories';
 import { AccountModel } from '@store/models';
 import { AccessLevels, AccountTypes, EncryptionLevels } from '@store/types';
 
-import { Button, Header, Icon, Spacer, Switch, TouchableDebounce } from '@components/General';
+import { Button, Header, Icon, Spacer, Switch, TouchableDebounce, LoadingIndicator } from '@components/General';
 
 import Localize from '@locale';
 
@@ -29,14 +31,20 @@ import { PassphraseAuthenticationOverlayProps } from '@screens/Overlay/Passphras
 
 import { AppStyles } from '@theme';
 import styles from './styles';
+import BackendService from '@services/BackendService';
 
 /* types ==================================================================== */
 export interface Props {
     account: AccountModel;
+    nativeAccountInfo?: XamanBackend.MultiAddressNativeInfoItem;
 }
 
 export interface State {
     account: AccountModel;
+    fetchingPushState: boolean;
+    pushAvailable: boolean;
+    pushEnabled: boolean;
+    accountCanSign: boolean;
 }
 
 /* Component ==================================================================== */
@@ -51,14 +59,37 @@ class AccountSettingsView extends Component<Props, State> {
 
     constructor(props: Props) {
         super(props);
+        const { nativeAccountInfo } = props;
 
         this.state = {
             account: props.account,
+            fetchingPushState: true,
+            pushAvailable: false,
+            pushEnabled: !!nativeAccountInfo?.hasPush,
+            accountCanSign: false,
         };
     }
 
     componentDidMount() {
+        const { account } = this.state;
+
         AccountRepository.on('accountUpdate', this.onAccountUpdate);
+
+        const accountCanSign = this.canAccountSign(account);
+        this.setState({ accountCanSign });
+
+        if (accountCanSign) {
+            Promise.all([
+                PushNotificationsService.checkPermission(),
+                BackendService.privateAccountInfo(account.address, account.label),
+            ]).then(pushState => {
+                this.setState({
+                    fetchingPushState: false,
+                    pushAvailable: pushState[0],
+                    pushEnabled: !!pushState[1]?.push,
+                });
+            });
+        }
     }
 
     componentWillUnmount() {
@@ -68,8 +99,10 @@ class AccountSettingsView extends Component<Props, State> {
     onAccountUpdate = (updateAccount: AccountModel) => {
         const { account } = this.state;
 
-        if (account?.isValid() && updateAccount.address === account.address) {
-            this.setState({ account: updateAccount });
+        if (account?.isValid() && updateAccount?.address === account.address) {           
+            this.setState({
+                account: updateAccount,
+            });
         }
     };
 
@@ -106,6 +139,9 @@ class AccountSettingsView extends Component<Props, State> {
             address: account.address,
             label: labelClean,
         });
+
+        // Update name.
+        BackendService.privateAccountInfo(account.address, labelClean);
     };
 
     showAccessLevelPicker = () => {
@@ -206,21 +242,32 @@ class AccountSettingsView extends Component<Props, State> {
         Navigator.push<ChangeTangemSecurityViewProps>(AppScreens.Account.Edit.ChangeTangemSecurityEnforce, { account });
     };
 
+    selectNextAccount = (skipAddress?: string) => {
+        // check if we are removing default account, then we need to select another account as default
+        const accounts = AccountRepository.getAccounts();
+        const newAccount = first(filter(accounts, (a: any) => a.address !== skipAddress && !a?.hidden));
+        CoreRepository.saveSettings({ account: newAccount });
+
+        setTimeout(() => {
+            this.reEnableFirstAccountIfNeeded(skipAddress);
+        }, 100);
+    };
+
     removeAccount = () => {
         const { account } = this.state;
 
-        // get current core settings
-        const coreSettings = CoreRepository.getSettings();
+        // Disable push
+        BackendService.privateAccountInfo(account.address, '[REMOVED]', false);
 
+        // get current core settings
+        // const coreSettings = CoreRepository.getSettings();
         // check if we are removing default account, then we need to select another account as default
-        if (account.address === coreSettings.account?.address) {
-            const accounts = AccountRepository.getAccounts();
-            CoreRepository.saveSettings({
-                account: first(filter(accounts, (a: any) => a.address !== account.address)),
-            });
-        }
+        // if (account.address === coreSettings.account?.address) {
+        // }
 
         // remove account
+        const skipAddress = account?.address;
+        this.selectNextAccount(skipAddress);
         AccountRepository.purge(account);
 
         // pop the screen
@@ -259,26 +306,66 @@ class AccountSettingsView extends Component<Props, State> {
         );
     };
 
+    onTxPushChange = (value: boolean) => {
+        const { account } = this.props;
+
+        this.setState({
+            pushEnabled: value,
+            fetchingPushState: true,
+        });
+
+        BackendService.privateAccountInfo(account.address, account.label, value).then(() => {
+            this.setState({
+                fetchingPushState: false,
+            });    
+        });
+    };
+
+    reEnableFirstAccountIfNeeded = (skipAddress?: string) => {
+        // If everything is hidden now, then re-enable the first one.
+        setTimeout(() => {
+            const visibleAccounts = AccountRepository
+                .getAccounts({ hidden: false })
+                .filter(a => a.address !== skipAddress);
+
+            if (visibleAccounts.length === 0) {
+                const allAccounts = AccountRepository
+                    .getAccounts()
+                    .filter(a => a.address !== skipAddress);
+
+                if (allAccounts.length > 0) {
+                    const firstAccount = first(allAccounts);
+                    if (firstAccount) {
+                        AccountRepository.update({ address: firstAccount.address, hidden: false });
+                        CoreRepository.saveSettings({ account: firstAccount });
+                    }
+                }
+            }
+        }, 100);
+    };
+
     onHiddenChange = (value: boolean) => {
         const { account } = this.props;
 
-        const coreSettings = CoreRepository.getSettings();
+        // const coreSettings = CoreRepository.getSettings();
 
         if (value) {
-            const allAccounts = AccountRepository.getAccounts();
-            const hiddenAccounts = AccountRepository.getAccounts({ hidden: true });
+            // const allAccounts = AccountRepository.getAccounts();
+            // const hiddenAccounts = AccountRepository.getAccounts({ hidden: true });
+            const visibleAccounts = AccountRepository.getAccounts({ hidden: false });
 
             // check if we are hiding all accounts
-            if (allAccounts.length - hiddenAccounts.length === 1) {
+            if (visibleAccounts.filter(a => a.address !== account.address).length === 0) {
                 Alert.alert(Localize.t('global.error'), Localize.t('account.unableToHideAllAccountsError'));
                 return;
             }
 
-            // check if we are hiding the default account
-            if (coreSettings.account?.address === account.address) {
-                Alert.alert(Localize.t('global.error'), Localize.t('account.unableToHideDefaultAccountError'));
-                return;
-            }
+            // // check if we are hiding the default account
+            // if (coreSettings.account?.address === account.address) {
+            //     // Alert.alert(Localize.t('global.error'), Localize.t('account.unableToHideDefaultAccountError'));
+            //     // return;
+            //     this.selectNextAccount(account);
+            // }
         }
 
         // update account hidden value
@@ -286,10 +373,29 @@ class AccountSettingsView extends Component<Props, State> {
             address: account.address,
             hidden: value,
         });
+
+        this.reEnableFirstAccountIfNeeded();
+    };
+
+    canAccountSign = (account: AccountModel) => {
+        if (account.accessLevel === AccessLevels.Full) {
+            return true;
+        };
+        
+        if (account.accessLevel === AccessLevels.Readonly && account.regularKey) {
+            const regularKeyAccount = AccountRepository.findOne({ address: account.regularKey });
+            if (regularKeyAccount && regularKeyAccount.accessLevel === AccessLevels.Full) {
+                return true;
+            }
+        };
+
+        return false;
     };
 
     render() {
-        const { account } = this.state;
+        const { account, fetchingPushState, pushAvailable, pushEnabled, accountCanSign } = this.state;
+
+        if (!account?.isValid()) return null;
 
         return (
             <View testID="account-settings-screen" style={styles.container}>
@@ -346,6 +452,35 @@ class AccountSettingsView extends Component<Props, State> {
                             <Icon size={25} style={styles.rowIcon} name="IconChevronRight" />
                         </TouchableDebounce>
 
+                        {/* Push notifications */}
+                        { accountCanSign && 
+                            (
+                                <View style={styles.row}>
+                                    <Text numberOfLines={1} style={styles.label}>
+                                        {Localize.t('global.accounttxpush')}
+                                    </Text>
+                                    <View style={[
+                                        AppStyles.flex1,
+                                        styles.loaderInline,
+                                    ]}>
+                                        { fetchingPushState && (
+                                            <LoadingIndicator style={styles.inlineLoader} />
+                                            )
+                                        }
+                                        <Switch
+                                            style={[
+                                                styles.switchRight,
+                                                AppStyles.rightAligned,
+                                            ]}
+                                            checked={pushEnabled}
+                                            isDisabled={fetchingPushState || !pushAvailable}
+                                            onChange={this.onTxPushChange}
+                                        /> 
+                                    </View>
+                                </View>
+                            )
+                        }
+
                         {/* Account Access Level */}
                         {account.type === AccountTypes.Regular && (
                             <TouchableDebounce
diff --git a/src/screens/Account/Edit/styles.tsx b/src/screens/Account/Edit/styles.tsx
index a9f6dcb10..56710270b 100644
--- a/src/screens/Account/Edit/styles.tsx
+++ b/src/screens/Account/Edit/styles.tsx
@@ -12,6 +12,26 @@ const styles = StyleService.create({
         flexDirection: 'column',
         // backgroundColor: '$grey,
     },
+    loaderInline: {
+        flexDirection: 'row',
+        // borderWidth: 1,
+        // borderColor: '#ffcc00',
+        // paddingHorizontal: 8,
+    },
+    switchRight: {
+        alignSelf: 'flex-end',
+        flex: 1,
+        // borderWidth: 2,
+        // borderColor: '#ffcc00',
+    },
+    inlineLoader: {
+        right: 60,
+        height: '100%',
+        position: 'absolute',
+        width: 35,
+        // borderWidth: 2,
+        // borderColor: 'purple',
+    },
     accountIcon: {
         width: AppSizes.screen.width * 0.07,
         height: AppSizes.screen.width * 0.07,
diff --git a/src/screens/Account/List/AccountsListView.tsx b/src/screens/Account/List/AccountsListView.tsx
index c034fb293..1234e47d2 100644
--- a/src/screens/Account/List/AccountsListView.tsx
+++ b/src/screens/Account/List/AccountsListView.tsx
@@ -5,6 +5,8 @@
 import { find } from 'lodash';
 import Realm from 'realm';
 
+import BackendService from '@services/BackendService';
+
 import React, { Component } from 'react';
 import { View, Text, Image, ImageBackground, InteractionManager } from 'react-native';
 
@@ -23,7 +25,8 @@ import { AccessLevels, EncryptionLevels } from '@store/types';
 
 import StyleService from '@services/StyleService';
 
-import { Button, Icon, Header, SortableFlatList, Spacer } from '@components/General';
+import { Button, Icon, Header, SortableFlatList, Spacer, LoadingIndicator } from '@components/General';
+import { ProBadge } from '@components/Modules';
 
 import Localize from '@locale';
 
@@ -44,6 +47,15 @@ export interface State {
     signableAccount: Array<AccountModel>;
     reorderEnabled: boolean;
     isMigrationRequired: boolean;
+    fetchingPro: boolean;
+    nativeAccountInfo?: XamanBackend.MultiAddressNativeInfoResponse;
+    loadingAccountDetails: boolean;
+    accountDetails: null | {
+        [key: string]: {
+            isRegularKeyFor: string | false;
+            isSignable: boolean;
+        };
+    };
 }
 
 /* Component ==================================================================== */
@@ -70,12 +82,23 @@ class AccountListView extends Component<Props, State> {
             signableAccount: AccountRepository.getSignableAccounts(),
             reorderEnabled: false,
             isMigrationRequired: false,
+            fetchingPro: true,
+            loadingAccountDetails: true,
+            accountDetails: null,
         };
     }
 
     componentDidMount() {
+        const { accounts } = this.state;
         this.navigationListener = Navigation.events().bindComponent(this);
 
+        BackendService.getMultiAddressNativeInfo(accounts.map(a => a.address)).then(nativeAccountInfo => {
+            this.setState({
+                nativeAccountInfo,
+                fetchingPro: false,
+            });
+        });
+
         InteractionManager.runAfterInteractions(this.checkMigrationRequired);
     }
 
@@ -92,6 +115,31 @@ class AccountListView extends Component<Props, State> {
         });
     }
 
+    getAccountDetails = () => {
+        const { accounts, signableAccount } = this.state;
+        const accountDetails = accounts.map(account => {
+            const isRegularKeyFor = this.isRegularKey(account);
+            const isSignable = find(signableAccount, { address: account.address });
+            return {
+                _key: account.address,
+                isRegularKeyFor,
+                isSignable,
+            };
+        }).reduce((acc, itm) => {
+            Object.assign(acc, {
+                [itm._key]: {
+                    ...itm,
+                    _key: undefined,
+                },
+            });
+            return acc;
+        }, {});
+        this.setState({
+            accountDetails,
+            loadingAccountDetails: false,
+        });
+    };
+
     loadAccounts = () => {
         const accounts = AccountRepository.getAccounts().sorted([['order', false]]);
 
@@ -100,6 +148,8 @@ class AccountListView extends Component<Props, State> {
             dataSource: accounts,
             signableAccount: AccountRepository.getSignableAccounts(),
         });
+
+        this.getAccountDetails();
     };
 
     checkMigrationRequired = () => {
@@ -126,14 +176,17 @@ class AccountListView extends Component<Props, State> {
     };
 
     onItemPress = (account: AccountModel) => {
-        const { reorderEnabled } = this.state;
+        const { reorderEnabled, nativeAccountInfo } = this.state;
 
         if (!account?.isValid()) {
             return;
         }
 
         if (!reorderEnabled) {
-            Navigator.push<AccountSettingsViewProps>(AppScreens.Account.Edit.Settings, { account });
+            Navigator.push<AccountSettingsViewProps>(AppScreens.Account.Edit.Settings, {
+                account,
+                nativeAccountInfo: nativeAccountInfo && nativeAccountInfo?.[account.address],
+            });
         }
     };
 
@@ -177,7 +230,12 @@ class AccountListView extends Component<Props, State> {
     };
 
     renderItem = ({ item }: { item: AccountModel }) => {
-        const { signableAccount, reorderEnabled } = this.state;
+        const {
+            reorderEnabled,
+            fetchingPro,
+            nativeAccountInfo,
+            accountDetails,
+        } = this.state;
 
         if (!item?.isValid()) return null;
 
@@ -185,7 +243,8 @@ class AccountListView extends Component<Props, State> {
         let accessLevelLabel = Localize.t('account.fullAccess');
         let accessLevelIcon = 'IconCornerLeftUp' as Extract<keyof typeof Images, string>;
 
-        const signable = find(signableAccount, { address: item.address });
+        // const signable = find(signableAccount, { address: item.address });
+        const signable = accountDetails && accountDetails[item.address].isSignable;
 
         if (!signable) {
             // if master key is disabled then show it in the label
@@ -203,18 +262,26 @@ class AccountListView extends Component<Props, State> {
             accessLevelIcon = 'IconKey';
         }
 
-        const regularKeyFor = this.isRegularKey(item);
+        const regularKeyFor = accountDetails && accountDetails[item.address].isRegularKeyFor;
 
         if (regularKeyFor) {
             accessLevelLabel = `${Localize.t('account.regularKeyFor')} ${regularKeyFor}`;
             accessLevelIcon = 'IconKey';
         }
 
+        const hasPro = signable && nativeAccountInfo && nativeAccountInfo?.[item.address]?.hasPro;
+
         return (
-            <View style={styles.rowContainer}>
+            <View style={[
+                styles.rowContainer,
+                hasPro && styles.hasProBorder,
+            ]}>
                 <View style={[AppStyles.row, styles.rowHeader, AppStyles.centerContent]}>
                     <View style={AppStyles.flex6}>
-                        <Text numberOfLines={1} style={styles.accountLabel}>
+                        <Text numberOfLines={1} style={[
+                            styles.accountLabel,
+                            hasPro && styles.accountLabelDark,
+                        ]}>
                             {item.label}
                         </Text>
                         <View style={styles.accessLevelContainer}>
@@ -238,8 +305,9 @@ class AccountListView extends Component<Props, State> {
                             </View>
                         ) : (
                             <Button
+                                // light
+                                roundedMini
                                 light
-                                roundedSmall
                                 icon="IconEdit"
                                 iconSize={15}
                                 textStyle={styles.buttonEditText}
@@ -253,10 +321,14 @@ class AccountListView extends Component<Props, State> {
                 </View>
                 <View style={[AppStyles.row, styles.subRow]}>
                     <View style={AppStyles.flex1}>
-                        <Text style={[AppStyles.monoBold, AppStyles.colorGrey, styles.subLabel]}>
+                        <Text style={[AppStyles.smalltext, AppStyles.bold, AppStyles.colorGrey, styles.subLabel]}>
                             {Localize.t('global.address')}:
                         </Text>
                         <Text style={[AppStyles.monoSubText, AppStyles.colorBlue]}>{item.address}</Text>
+                        <View style={[styles.proBadge]}>
+                            { fetchingPro && <LoadingIndicator /> }
+                            { !fetchingPro && <ProBadge hasPro={hasPro ? 1 : 0} /> }
+                        </View>
                     </View>
                 </View>
             </View>
@@ -264,7 +336,7 @@ class AccountListView extends Component<Props, State> {
     };
 
     render() {
-        const { accounts, dataSource, reorderEnabled, isMigrationRequired } = this.state;
+        const { accounts, dataSource, reorderEnabled, isMigrationRequired, loadingAccountDetails } = this.state;
 
         return (
             <View testID="accounts-list-screen" style={AppStyles.container}>
@@ -295,25 +367,37 @@ class AccountListView extends Component<Props, State> {
 
                 {accounts.isEmpty() ? (
                     <ImageBackground
-                        source={StyleService.getImage('BackgroundShapes')}
-                        imageStyle={AppStyles.BackgroundShapes}
-                        style={[AppStyles.contentContainer, AppStyles.padding]}
+                        resizeMode="cover"
+                        source={
+                            StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')
+                        }
+                        style={[AppStyles.contentContainer, AppStyles.paddingHorizontal, AppStyles.paddingBottom]}
                     >
                         <Image style={AppStyles.emptyIcon} source={StyleService.getImage('ImageFirstAccount')} />
-                        <Text style={AppStyles.emptyText}>{Localize.t('home.emptyAccountAddFirstAccount')}</Text>
+                        <Spacer size={10} />
+                        <Text style={[
+                            AppStyles.emptyText,
+                            AppStyles.p,
+                        ]}>{Localize.t('home.emptyAccountAddFirstAccount')}</Text>
                         <Button
                             label={Localize.t('home.addAccount')}
                             icon="IconPlus"
                             iconStyle={AppStyles.imgColorWhite}
-                            rounded
+                            nonBlock
+                            style={[
+                                AppStyles.marginBottom,
+                            ]}
                             onPress={() => {
                                 Navigator.push<AccountAddViewProps>(AppScreens.Account.Add, {});
                             }}
                         />
                     </ImageBackground>
                 ) : (
-                    <View style={AppStyles.flex1}>
-                        {isMigrationRequired && !reorderEnabled ? (
+                    <View style={[
+                        AppStyles.flex1,
+                        AppStyles.windowSize,
+                    ]}>
+                        {isMigrationRequired && !reorderEnabled && !loadingAccountDetails ? (
                             <View style={styles.rowMigrationContainer}>
                                 <Text style={[AppStyles.subtext, AppStyles.bold]}>
                                     {Localize.t('account.newEncryptionMethodAvailable')}
@@ -349,7 +433,7 @@ class AccountListView extends Component<Props, State> {
                                     </Text>
                                 </View>
                             </View>
-                        ) : (
+                        ) : !loadingAccountDetails && (
                             <View style={styles.rowAddContainer}>
                                 <Button
                                     testID="add-account-button"
@@ -364,17 +448,25 @@ class AccountListView extends Component<Props, State> {
                             </View>
                         )}
 
-                        <SortableFlatList
-                            testID="account-list-scroll"
-                            itemHeight={styles.rowContainer.height}
-                            separatorHeight={10}
-                            dataSource={dataSource}
-                            keyExtractor={this.itemKeyExtractor}
-                            renderItem={this.renderItem}
-                            onDataChange={this.onAccountReorder}
-                            onItemPress={this.onItemPress}
-                            sortable={reorderEnabled}
-                        />
+                        { loadingAccountDetails && (
+                            <View style={AppStyles.paddingTop}>
+                                <LoadingIndicator size="large" />
+                            </View>
+                        ) }
+                        
+                        { !loadingAccountDetails && (
+                            <SortableFlatList
+                                testID="account-list-scroll"
+                                itemHeight={styles.rowContainer.height}
+                                separatorHeight={10}
+                                dataSource={dataSource}
+                                keyExtractor={this.itemKeyExtractor}
+                                renderItem={this.renderItem}
+                                onDataChange={this.onAccountReorder}
+                                onItemPress={this.onItemPress}
+                                sortable={reorderEnabled}
+                            />
+                        ) }
                     </View>
                 )}
             </View>
diff --git a/src/screens/Account/List/styles.tsx b/src/screens/Account/List/styles.tsx
index 926a28fd3..b0af61e3e 100644
--- a/src/screens/Account/List/styles.tsx
+++ b/src/screens/Account/List/styles.tsx
@@ -6,21 +6,28 @@ import { AppSizes, AppFonts } from '@theme';
 const styles = StyleService.create({
     rowContainer: {
         width: AppSizes.screen.width * 0.9,
-        height: AppSizes.scale(130),
-        paddingHorizontal: AppSizes.paddingSml,
-        paddingVertical: AppSizes.paddingSml,
+        height: AppSizes.scale(110),
+        paddingLeft: AppSizes.paddingSml / 1.3,
+        paddingRight: AppSizes.paddingSml / 2,
+        paddingVertical: AppSizes.paddingSml / 1.8,
         borderWidth: 2,
         borderColor: '$tint',
-        borderRadius: 20,
+        borderRadius: 14,
         marginHorizontal: 20,
         backgroundColor: '$background',
     },
+    hasProBorder: {
+        borderColor: '#ffcc00',
+        backgroundColor: '#FDEFA6',
+    },
     rowAddContainer: {
         marginBottom: 10,
-        paddingVertical: 30,
-        borderWidth: 2,
-        borderColor: '$tint',
-        borderRadius: 15,
+        height: AppSizes.scale(90),
+        paddingTop: 5,
+        paddingBottom: 15,
+        // borderWidth: 2,
+        // borderColor: '$tint',
+        // borderRadius: 15,
         marginHorizontal: 20,
         backgroundColor: '$background',
         justifyContent: 'center',
@@ -39,17 +46,22 @@ const styles = StyleService.create({
     },
     rowHeader: {
         paddingTop: 0,
-        paddingBottom: 15,
-        borderBottomWidth: 1,
-        borderBottomColor: '$tint',
+        // paddingBottom: 15,
+        // borderBottomWidth: 1,
+        // borderBottomColor: '$tint',
         paddingRight: 0,
     },
     buttonEditIcon: {
         tintColor: '$textPrimary',
         marginLeft: 10,
     },
+    proBadge: {
+        position: 'absolute',
+        right: -3,
+        bottom: -2,
+    },
     buttonEditText: {
-        color: '$textPrimary',
+        // color: '$textPrimary',
     },
     reorderIcon: {
         tintColor: '$grey',
@@ -58,16 +70,26 @@ const styles = StyleService.create({
         color: '$blue',
     },
     subRow: {
-        paddingTop: 12,
+        // paddingTop: 14,
+        flexDirection: 'row',
+        position: 'absolute',
+        bottom: 0,
+        paddingHorizontal: AppSizes.paddingSml / 1.3,
+        paddingBottom: 13,
     },
     subLabel: {
-        paddingBottom: 5,
+        paddingBottom: 3,
+        lineHeight: 20,
     },
     accountLabel: {
         fontFamily: AppFonts.h5.family,
         fontSize: AppFonts.p.size,
+        lineHeight: AppFonts.p.size * 1.4,
         color: '$textPrimary',
     },
+    accountLabelDark: {
+        color: '$dark',
+    },
     accessLevelContainer: {
         left: 0,
         right: 0,
@@ -78,6 +100,7 @@ const styles = StyleService.create({
         marginLeft: 5,
         fontSize: AppFonts.base.size * 0.7,
         fontFamily: AppFonts.base.familyBold,
+        lineHeight: AppFonts.base.size * 1,
         color: '$grey',
         includeFontPadding: false,
     },
diff --git a/src/screens/Events/Details/DetailsView.tsx b/src/screens/Events/Details/DetailsView.tsx
index 6b8bb2979..c3f07195c 100644
--- a/src/screens/Events/Details/DetailsView.tsx
+++ b/src/screens/Events/Details/DetailsView.tsx
@@ -163,7 +163,7 @@ class TransactionDetailsView extends Component<Props & { componentType: Componen
     };
 
     render() {
-        const { account, item, componentType } = this.props;
+        const { account, item, componentType, cachedTokenDetails, timestamp } = this.props;
         const { advisory, explainer } = this.state;
 
         const widgetsList: WidgetKey[] = [
@@ -185,7 +185,7 @@ class TransactionDetailsView extends Component<Props & { componentType: Componen
         ];
 
         return (
-            <View style={AppStyles.container}>
+            <View key={`txdetailsview-${timestamp}`} style={AppStyles.container}>
                 <Header
                     leftComponent={{ icon: 'IconChevronLeft', onPress: this.close }}
                     centerComponent={{ text: Localize.t('events.transactionDetails') }}
@@ -211,6 +211,7 @@ class TransactionDetailsView extends Component<Props & { componentType: Componen
                             explainer,
                             advisory,
                             componentType,
+                            cachedTokenDetails,
                         });
                     })}
                 </ScrollView>
diff --git a/src/screens/Events/Details/types.ts b/src/screens/Events/Details/types.ts
index 950e09e19..45c1b79b4 100644
--- a/src/screens/Events/Details/types.ts
+++ b/src/screens/Events/Details/types.ts
@@ -7,10 +7,13 @@ import { AccountModel } from '@store/models';
 
 import * as MutationWidgets from '@components/Modules/MutationWidgets';
 import { Props as MutationWidgetProps } from '@components/Modules/MutationWidgets/types';
+import { type cachedTokenDetailsState } from '@components/Modules/EventsList/EventListItems/Transaction';
 
 export interface Props {
     item: ((Transactions | FallbackTransaction) & MutationsMixinType) | LedgerObjects;
     account: AccountModel;
+    cachedTokenDetails?: cachedTokenDetailsState;
+    timestamp?: number;
 }
 
 export interface State {
diff --git a/src/screens/Events/EventsView.tsx b/src/screens/Events/EventsView.tsx
index d0eccfcf2..f20d0b1d3 100644
--- a/src/screens/Events/EventsView.tsx
+++ b/src/screens/Events/EventsView.tsx
@@ -13,11 +13,13 @@ import { CoreRepository } from '@store/repositories';
 import { AccountModel, CoreModel } from '@store/models';
 
 // Constants/Helpers
+import AppConfig from '@common/constants/config';
 import { AppScreens } from '@common/constants';
 import { Toast } from '@common/helpers/interface';
 import { Navigator } from '@common/helpers/navigator';
 
 // Parses
+import type { AccountTxTransaction } from '@common/libs/ledger/types/methods/accountTx';
 import { LedgerObjectFactory, TransactionFactory } from '@common/libs/ledger/factory';
 import { TransactionTypes, LedgerEntryTypes } from '@common/libs/ledger/types/enums';
 import { NFTokenOffer } from '@common/libs/ledger/objects';
@@ -31,6 +33,8 @@ import { LedgerEntry } from '@common/libs/ledger/types/ledger';
 import { MixingTypes } from '@common/libs/ledger/mixin/types';
 import { FilterProps } from '@screens/Modal/FilterEvents/EventsFilterModal';
 
+import ResolverService from '@services/ResolverService';
+
 import {
     AccountService,
     AppService,
@@ -41,7 +45,7 @@ import {
 } from '@services';
 import { AppStateStatus } from '@services/AppService';
 
-import { Button, Header, SearchBar, SegmentButtons } from '@components/General';
+import { Spacer, Button, Header, SearchBar, SegmentButtons } from '@components/General';
 import { EventsFilterChip, EventsList } from '@components/Modules';
 
 import Localize from '@locale';
@@ -62,6 +66,7 @@ export interface Props {
 export interface State {
     isLoading: boolean;
     isLoadingMore: boolean;
+    isLoadingMoreDebounced: boolean;
     canLoadMore: boolean;
     searchText?: string;
     filters?: FilterProps;
@@ -69,9 +74,12 @@ export interface State {
     lastMarker?: LedgerMarker;
     account: AccountModel;
     transactions: Array<Transactions>;
+    hideAdvisoryTransactions: boolean;
+    hideServiceFeeTransactions: boolean;
     plannedTransactions: Array<LedgerObjects>;
     pendingRequests: Array<Payload | NFTokenOffer>;
     dataSource: Array<DataSourceItem>;
+    isFiltering: boolean;
 }
 
 enum EventSections {
@@ -93,6 +101,7 @@ class EventsView extends Component<Props, State> {
     private forceReload: boolean;
     private isScreenVisible: boolean;
     private navigationListener: EventSubscription | undefined;
+    private isLoadingMoreDebouncedTimer?: ReturnType<typeof setTimeout>;
 
     static options() {
         return {
@@ -105,15 +114,24 @@ class EventsView extends Component<Props, State> {
     constructor(props: Props) {
         super(props);
 
+        const {
+            hideAdvisoryTransactions,
+            hideServiceFeeTransactions,
+        } = CoreRepository.getSettings();
+
         this.state = {
-            isLoading: true,
+            isFiltering: false,
+            isLoading: false,
             isLoadingMore: false,
+            isLoadingMoreDebounced: false,
             canLoadMore: true,
             searchText: undefined,
             filters: undefined,
             activeSection: EventSections.ALL,
             lastMarker: undefined,
             account: CoreRepository.getDefaultAccount(),
+            hideAdvisoryTransactions,
+            hideServiceFeeTransactions,
             transactions: [],
             pendingRequests: [],
             plannedTransactions: [],
@@ -125,13 +143,22 @@ class EventsView extends Component<Props, State> {
     }
 
     shouldComponentUpdate(nextProps: Props, nextState: State) {
-        const { dataSource, account, isLoading, canLoadMore, isLoadingMore, filters } = this.state;
+        const {
+            dataSource,
+            account,
+            isLoading,
+            canLoadMore,
+            isLoadingMore,
+            isLoadingMoreDebounced,
+            filters,
+        } = this.state;
         const { timestamp } = this.props;
 
         return (
             !isEqual(nextState.dataSource, dataSource) ||
             !isEqual(nextState.isLoading, isLoading) ||
             !isEqual(nextState.isLoadingMore, isLoadingMore) ||
+            !isEqual(nextState.isLoadingMoreDebounced, isLoadingMoreDebounced) ||
             !isEqual(nextState.canLoadMore, canLoadMore) ||
             !isEqual(nextState.account, account) ||
             !isEqual(nextState.filters, filters) ||
@@ -141,10 +168,13 @@ class EventsView extends Component<Props, State> {
 
     componentDidAppear() {
         // keep track of screen visibility
-        this.isScreenVisible = true;
 
+        // console.log('appeared')
+        this.isScreenVisible = true;
+        
         // check if we need to reload the screen
         if (this.forceReload) {
+            // console.log('reloading')
             // set the flag to false
             this.forceReload = false;
 
@@ -156,6 +186,9 @@ class EventsView extends Component<Props, State> {
     componentDidDisappear() {
         // keep track of screen visibility
         this.isScreenVisible = false;
+        this.setState({
+            isLoading: false,
+        });
     }
 
     componentDidMount() {
@@ -197,12 +230,24 @@ class EventsView extends Component<Props, State> {
                 plannedTransactions: [],
                 lastMarker: undefined,
                 canLoadMore: true,
+                isLoading: true,
             },
             this.updateDataSource,
         );
     };
 
     onCoreSettingsUpdate = (_coreSettings: CoreModel, changes: Partial<CoreModel>) => {
+        // force reload existing list if show/hide spam tx
+        if (has(changes, 'hideAdvisoryTransactions')) {
+            this.setState({ hideAdvisoryTransactions: !!changes.hideAdvisoryTransactions }, () => {
+                this.forceReload = true;
+            });
+        }
+        if (has(changes, 'hideServiceFeeTransactions')) {
+            this.setState({ hideServiceFeeTransactions: !!changes.hideServiceFeeTransactions }, () => {
+                this.forceReload = true;
+            });
+        }
         // force reload if network or default account changed
         if (has(changes, 'network') || has(changes, 'account')) {
             this.forceReload = true;
@@ -228,7 +273,9 @@ class EventsView extends Component<Props, State> {
 
         if (account?.isValid()) {
             if (effectedAccounts.includes(account.address)) {
-                this.updateDataSource([DataSourceType.TRANSACTIONS, DataSourceType.PLANNED_TRANSACTIONS]);
+                setTimeout(() => {
+                    this.updateDataSource([DataSourceType.TRANSACTIONS, DataSourceType.PLANNED_TRANSACTIONS]);
+                }, 500); // Wait for node to have it
             }
         }
     };
@@ -238,6 +285,8 @@ class EventsView extends Component<Props, State> {
             status === AppStateStatus.Active &&
             [AppStateStatus.Background, AppStateStatus.Inactive].includes(prevStatus)
         ) {
+            // console.log('appstate change', status)
+            this.updateDataSource();
             this.onSignRequestReceived();
         }
     };
@@ -297,28 +346,57 @@ class EventsView extends Component<Props, State> {
                 return;
             }
 
+            // OLD SLOW!!
             // account objects we are interested in
+            // const objectTypes = ['check', 'escrow', 'offer', 'nft_offer', 'ticket', 'payment_channel'];
+            // let objects = [] as LedgerEntry[];
+            // objectTypes
+            //     .reduce(async (accumulator, type) => {
+            //         return accumulator.then(async () => {
+            //             return this.fetchPlannedObjects(account.address, type).then((res) => {
+            //                 if (res) {
+            //                     objects = [...objects, ...res];
+            //                 } else {
+            //                     objects = [...objects];
+            //                 }
+            //             });
+            //         });
+            //     }, Promise.resolve())
+            //     .then(() => {
+            //         const parsedList = objects
+            //             .map(LedgerObjectFactory.fromLedger)
+            //             .flat()
+            //             .filter((item): item is LedgerObjects => item !== undefined);
+
+            //         this.setState({ plannedTransactions: parsedList }, () => {
+            //             resolve(parsedList);
+            //         });
+            //     })
+            //     .catch(() => {
+            //         Toast(Localize.t('events.canNotFetchTransactions'));
+            //         resolve([]);
+            //     });
+
+            // NEW FAST parallel
             const objectTypes = ['check', 'escrow', 'offer', 'nft_offer', 'ticket', 'payment_channel'];
-            let objects = [] as LedgerEntry[];
-
-            objectTypes
-                .reduce(async (accumulator, type) => {
-                    return accumulator.then(async () => {
-                        return this.fetchPlannedObjects(account.address, type).then((res) => {
-                            if (res) {
-                                objects = [...objects, ...res];
-                            } else {
-                                objects = [...objects];
-                            }
-                        });
-                    });
-                }, Promise.resolve())
-                .then(() => {
+
+            // Create an array of promises, one for each object type
+            const fetchPromises = objectTypes.map(async (type) => {
+                const res = await this.fetchPlannedObjects(account.address, type);
+                return res || [];
+            });
+            
+            // Execute all promises in parallel
+            Promise.all(fetchPromises)
+                .then((results) => {
+                    // Flatten the results array and remove any undefined entries
+                    const objects = results.flat();
+                    
                     const parsedList = objects
                         .map(LedgerObjectFactory.fromLedger)
                         .flat()
                         .filter((item): item is LedgerObjects => item !== undefined);
-
+            
                     this.setState({ plannedTransactions: parsedList }, () => {
                         resolve(parsedList);
                     });
@@ -351,7 +429,13 @@ class EventsView extends Component<Props, State> {
     };
 
     loadTransactions = (loadMore?: boolean): Promise<Transactions[]> => {
-        const { transactions, account, lastMarker } = this.state;
+        const {
+            transactions,
+            account,
+            lastMarker,
+            hideAdvisoryTransactions,
+            hideServiceFeeTransactions,
+         } = this.state;
 
         return new Promise((resolve) => {
             // return if no account exist
@@ -359,9 +443,11 @@ class EventsView extends Component<Props, State> {
                 resolve([]);
                 return;
             }
+            
+            const fetchAmount = 15;
 
-            LedgerService.getTransactions(account.address, loadMore && lastMarker, 50)
-                .then((resp) => {
+            LedgerService.getTransactions(account.address, loadMore && lastMarker, fetchAmount)
+                .then(async (resp) => {
                     if ('error' in resp) {
                         resolve([]);
                         return;
@@ -372,28 +458,81 @@ class EventsView extends Component<Props, State> {
 
                     // if we got less than 50 transaction, means there is no transaction
                     // also only handle recent 1000 transactions
-                    if (txResp.length < 50 || transactions.length >= 1000) {
+                    if (txResp.length < fetchAmount || transactions.length >= 1000) {
                         canLoadMore = false;
                     }
 
                     // only success transactions
-                    const tesSuccessTransactions = filter(txResp, (transaction) => {
-                        return (
-                            typeof transaction.meta === 'object' && transaction?.meta.TransactionResult === 'tesSUCCESS'
-                        );
-                    });
+                    const tesSuccessTransactions: AccountTxTransaction[] = (await Promise.all(
+                        txResp.map(async transaction => {
+                            let blocked = false;
+
+                            if (hideAdvisoryTransactions) {
+                                if (
+                                    transaction?.tx?.TransactionType === 'Payment' &&
+                                    typeof transaction?.meta?.delivered_amount === 'string' &&
+                                    Number(transaction?.meta.delivered_amount) < AppConfig.belowDropsTxIsSpam
+                                ) {
+                                    // Only Acount (sender) counts, only hide if <SENT> to me
+                                    const resolveAccount = String(transaction?.tx?.Account || '');
+                                    const accountResolver = await ResolverService.getAccountName(resolveAccount);
+
+                                    blocked = !!accountResolver?.blocked;
+                                }
+                            }
+
+                            if (hideServiceFeeTransactions) {
+                                if (
+                                    transaction?.tx?.TransactionType === 'Payment' &&
+                                    transaction?.tx?.Destination === AppConfig?.feeAccount
+                                ) {
+                                    blocked = true;
+                                }
+                            }
+
+                            return typeof transaction.meta === 'object' &&
+                                transaction?.meta.TransactionResult === 'tesSUCCESS' &&
+                                !blocked ? transaction : null;
+                        }),
+                    )).filter(t => t !== null) as AccountTxTransaction[];
+                    // await Promise.all(
+                    //     filter(txResp, async (transaction) => {
+
+                    //     }) as AccountTxTransaction[],
+                    // );
 
                     let parsedList = flatMap(tesSuccessTransactions, (item) =>
                         TransactionFactory.fromLedger(item, [MixingTypes.Mutation]),
                     );
 
+                    // console.log('x1')
+
                     if (loadMore) {
                         parsedList = uniqBy([...transactions, ...parsedList], 'hash');
                     }
 
+                    // console.log('x2')
+
                     this.setState({ transactions: parsedList, lastMarker: marker, canLoadMore }, () => {
                         resolve(parsedList);
+                        // console.log('x4')
                     });
+
+                    // console.log('x3')
+
+                    // console.log('txResp.length', txResp.length)
+                    // console.log('transactions.length', transactions.length)
+                    // console.log('parsedList.length', parsedList.length)
+                    if (parsedList.length < fetchAmount) {
+                        // Initial query didn't result in full lengt list
+                        if (canLoadMore && marker) {
+                            // Can load more, there's a marker
+                            // Immediately load one more
+                            this.loadMore(true);
+                        }
+                    }
+
+                    // console.log('x5')
                 })
                 .catch(() => {
                     // TODO: BETTER ERROR HANDLING AND ONLY SHOW WHEN SCREEN IS VISIBLE
@@ -403,22 +542,46 @@ class EventsView extends Component<Props, State> {
         });
     };
 
-    loadMore = async () => {
+    loadMore = async (forced = false) => {
+        //            ^^ danger: called elsewhere natively by RN adds {distanceFromEnd: float} so must be
+        //               not only truthy but also boolean
         const { canLoadMore, filters, searchText, isLoadingMore, isLoading, activeSection } = this.state;
 
-        if (isLoading || isLoadingMore || !canLoadMore || activeSection !== EventSections.ALL) return;
+        // console.log('-- load more',  new Date(), {
+        //     canLoadMore,
+        //     isLoadingMore,
+        //     forced,
+        // });
+
+        if (!canLoadMore) {
+            this.setState({ isLoadingMoreDebounced: false });
+        }
 
-        this.setState({ isLoadingMore: true });
+        // console.log('loadingmore', canLoadMore, isLoadingMore)
+        if (!forced || typeof forced !== 'boolean') {
+            // only force return if NOT forced (if forced continue)
+            // or if FORCED but forced isn't bool (see fn enter comment)
+            if (isLoading || isLoadingMore || !canLoadMore || activeSection !== EventSections.ALL) return;
+        }
+        // console.log('loadingmoremore', forced)
+        
+        this.setState({ isLoadingMore: true, isLoadingMoreDebounced: true });
+        clearTimeout(this.isLoadingMoreDebouncedTimer);
 
         await this.loadTransactions(true);
 
         this.setState({ isLoadingMore: false });
+        this.isLoadingMoreDebouncedTimer = setTimeout(() => {
+            this.setState({ isLoadingMoreDebounced: false });
+        }, 250);
 
         // apply any new search ad filter to the new sources
         if (searchText) {
             this.applySearch(searchText);
+            // console.log('applysearch')
         } else if (filters) {
-            this.applyFilters(filters);
+            this.applyFilters(true);
+            // console.log('applyfilters', canLoadMore, isLoadingMore)
         } else {
             this.applyDefaults();
         }
@@ -503,8 +666,15 @@ class EventsView extends Component<Props, State> {
 
         this.setState({ isLoading: true });
 
+        // console.log('updatedatasource')
+
+        // Ping to update red pending icon count
+        // in case push notifications are disabled
+
         let sourceTypes = [] as DataSourceType[];
 
+        BackendService.ping();
+
         switch (activeSection) {
             case EventSections.ALL:
                 sourceTypes = [DataSourceType.TRANSACTIONS, DataSourceType.PENDING_REQUESTS];
@@ -527,10 +697,13 @@ class EventsView extends Component<Props, State> {
         // update data sources
         for (const source of sourceTypes) {
             if (source === DataSourceType.PENDING_REQUESTS) {
+                // console.log('loadpending')
                 await this.loadPendingRequests();
             } else if (source === DataSourceType.TRANSACTIONS) {
+                // console.log('load--transactions---', this.isScreenVisible)
                 await this.loadTransactions();
             } else if (source === DataSourceType.PLANNED_TRANSACTIONS) {
+                // console.log('loadplan')
                 await this.loadPlannedTransactions();
             }
         }
@@ -555,8 +728,22 @@ class EventsView extends Component<Props, State> {
         });
     };
 
-    applyFilters = (filters: FilterProps) => {
-        const { activeSection, account, transactions, pendingRequests, plannedTransactions, canLoadMore } = this.state;
+    applyFilters = (paramFilters?: FilterProps | boolean) => {
+        const {
+            activeSection,
+            account,
+            filters: stateFilters,
+            transactions,
+            pendingRequests,
+            plannedTransactions,
+            canLoadMore,
+        } = this.state;
+
+        const filters = typeof paramFilters === 'boolean' && paramFilters
+            ? stateFilters
+            : paramFilters;
+
+        // console.log('ap1')
 
         if (activeSection === EventSections.REQUESTS) {
             this.setState({
@@ -565,6 +752,8 @@ class EventsView extends Component<Props, State> {
             return;
         }
 
+        // console.log('ap2')
+
         // check if filters are empty
         let isEmptyFilters = true;
 
@@ -578,14 +767,23 @@ class EventsView extends Component<Props, State> {
             });
         }
 
-        if (isEmptyFilters) {
+        // console.log('ap3', {isEmptyFilters})
+
+        if (isEmptyFilters || !filters) {
             this.setState({
                 dataSource: this.buildDataSource(transactions, pendingRequests, plannedTransactions),
                 filters: undefined,
+                isFiltering: false,
             });
             return;
         }
 
+        // console.log('ap4')
+
+        this.setState({
+            isFiltering: true,
+        });
+
         let newDataSource: Array<Transactions | LedgerObjects>;
 
         if (activeSection === EventSections.ALL) {
@@ -718,22 +916,43 @@ class EventsView extends Component<Props, State> {
         }
 
         if (activeSection === EventSections.ALL) {
+            // console.log('FILTERS READY', canLoadMore)
             if (isEmpty(newDataSource) && canLoadMore) {
+                // console.log('      FILTERS READY --- 1', newDataSource)
+                // console.log('------thisloadmore2')
                 this.setState(
                     {
                         filters,
+                        // isLoading: true,
+                        isFiltering: true,
                     },
                     this.loadMore,
                 );
+                requestAnimationFrame(() => {
+                    // Rerender async
+                    this.setState({
+                        dataSource: this.buildDataSource(newDataSource, [], plannedTransactions),
+                        // isLoading: false,
+                        // isFiltering: false,
+                        // filters,
+                    });  
+                });
             } else {
+                // console.log('      FILTERS READY --- 2')
+                // console.log('------thisloadmore3')
                 this.setState({
                     dataSource: this.buildDataSource(newDataSource, [], plannedTransactions),
+                    // isLoading: false,
+                    isFiltering: false,
                     filters,
-                });
+                }, canLoadMore ? this.loadMore : undefined);
             }
         } else {
+            // console.log('FILTERS READY --- 3')
             this.setState({
                 dataSource: this.buildDataSource(transactions, [], newDataSource),
+                // isLoadingMoreDebounced: false,
+                isFiltering: false,
                 filters,
             });
         }
@@ -830,6 +1049,9 @@ class EventsView extends Component<Props, State> {
         keys.forEach((k) => {
             newFilters[k] = undefined;
         });
+
+        // console.log('filterremove', filters, newFilters)
+
         this.applyFilters(newFilters);
     };
 
@@ -858,7 +1080,11 @@ class EventsView extends Component<Props, State> {
 
         Navigator.showModal<EventsFilterModalProps>(AppScreens.Modal.FilterEvents, {
             currentFilters: filters ?? {},
-            onApply: this.applyFilters,
+            onApply: filterProps => {
+                // First make sure everything becomes invisible
+                // console.log('apply filters', filterProps);
+                return this.applyFilters(filterProps);
+            },
         });
     };
 
@@ -875,18 +1101,27 @@ class EventsView extends Component<Props, State> {
                     }}
                 />
                 <ImageBackground
-                    source={StyleService.getImage('BackgroundShapes')}
-                    imageStyle={AppStyles.BackgroundShapes}
+                    resizeMode="cover"
+                    source={
+                        StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')
+                    }
                     style={[AppStyles.contentContainer, AppStyles.padding]}
                 >
                     <Image style={AppStyles.emptyIcon} source={StyleService.getImage('ImageNoEvents')} />
-                    <Text style={AppStyles.emptyText}>{Localize.t('events.emptyEventsNoAccount')}</Text>
+                    <Spacer size={10} />
+                    <Text style={[
+                        AppStyles.emptyText,
+                        AppStyles.p,
+                    ]}>{Localize.t('events.emptyEventsNoAccount')}</Text>
                     <Button
                         testID="add-account-button"
                         label={Localize.t('home.addAccount')}
                         icon="IconPlus"
                         iconStyle={AppStyles.imgColorWhite}
-                        rounded
+                        nonBlock
+                        style={[
+                            AppStyles.marginBottom,
+                        ]}
                         onPress={this.onAddAccountPress}
                     />
                 </ImageBackground>
@@ -906,7 +1141,17 @@ class EventsView extends Component<Props, State> {
     };
 
     render() {
-        const { dataSource, isLoading, isLoadingMore, account, activeSection } = this.state;
+        const {
+            dataSource,
+            isLoading,
+            isLoadingMore,
+            account,
+            activeSection,
+            isLoadingMoreDebounced,
+            canLoadMore,
+            isFiltering,
+            // filters,
+        } = this.state;
         const { timestamp } = this.props;
 
         if (!account) {
@@ -938,7 +1183,12 @@ class EventsView extends Component<Props, State> {
                 />
                 <SegmentButtons
                     activeButton={activeSection}
-                    containerStyle={[AppStyles.paddingHorizontalSml, AppStyles.leftSelf]}
+                    key={`eventsview-segmentbuttons-${timestamp}`}
+                    containerStyle={[
+                        AppStyles.paddingHorizontalSml,
+                        AppStyles.marginTopNegativeSml,
+                        AppStyles.leftSelf,
+                    ]}
                     buttons={[
                         {
                             label: Localize.t('events.eventTypeAll'),
@@ -955,12 +1205,25 @@ class EventsView extends Component<Props, State> {
                     ]}
                     onItemPress={this.onSectionChange}
                 />
+                {/* <Text>{isLoadingMore && 'isloadingmore'}</Text> */}
+                {/* <Text>{isLoadingMoreDebounced && 'isloadingmoredebounced'}</Text> */}
+                {/* <Text>{JSON.stringify(filters)}</Text> */}
+                <View style={[
+                    AppStyles.leftSelf,
+                    AppStyles.paddingHorizontalSml,
+                ]}>
+                    {this.renderListHeader()}
+                </View>
                 <EventsList
                     account={account}
-                    headerComponent={this.renderListHeader}
+                    key={`eventsview-eventslist-${timestamp}`}
+                    // headerComponent={this.renderListHeader}
                     dataSource={dataSource}
                     isLoading={isLoading}
-                    isLoadingMore={isLoadingMore}
+                    isFiltering={isFiltering}
+                    // forceFullLoader={isFiltering && dataSource.length === 0}
+                    isVisible={this.isScreenVisible}
+                    isLoadingMore={isLoadingMore || (isLoadingMoreDebounced && canLoadMore)}
                     onEndReached={this.loadMore}
                     onRefresh={this.updateDataSource}
                     timestamp={timestamp}
diff --git a/src/screens/Exchange/ExchangeView.tsx b/src/screens/Exchange/ExchangeView.tsx
index 28c1a0427..b02a0d2fd 100644
--- a/src/screens/Exchange/ExchangeView.tsx
+++ b/src/screens/Exchange/ExchangeView.tsx
@@ -484,7 +484,7 @@ class ExchangeView extends Component<Props, State> {
             return this.renderErrors();
         }
 
-        const { maxSlippagePercentage } = this.ledgerExchange.boundaryOptions;
+        // const { maxSlippagePercentage } = this.ledgerExchange.boundaryOptions;
 
         return (
             <>
@@ -512,27 +512,31 @@ class ExchangeView extends Component<Props, State> {
                                         ? token.currency.currencyCode
                                         : NetworkService.getNativeAsset()
                                 }
-                                style={[styles.detailsValue, AppStyles.textRightAligned, AppStyles.colorRed]}
+                                style={[
+                                    styles.detailsValue,
+                                    AppStyles.textRightAligned,
+                                ]}
                                 immutable
                             />
                         </View>
                     </View>
-                    <View style={styles.detailsRow}>
+                    {/* <View style={styles.detailsRow}>
                         <Text style={styles.detailsLabel}>{Localize.t('exchange.slippageTolerance')}</Text>
                         <View style={[AppStyles.flex1, AppStyles.rightAligned]}>
                             <Text style={[styles.detailsValue, AppStyles.textCenterAligned]}>
                                 {`${maxSlippagePercentage}%`}
                             </Text>
                         </View>
-                    </View>
+                    </View> */}
                 </View>
-                <Spacer size={40} />
+                <Spacer size={20} />
                 <Button
                     onPress={this.onExchangePress}
                     isLoading={isExchanging}
                     isDisabled={!amount || amount === '0' || !liquidity || isLoading}
                     label={Localize.t('global.exchange')}
                 />
+                <Spacer size={5} />
             </>
         );
     };
diff --git a/src/screens/Exchange/styles.tsx b/src/screens/Exchange/styles.tsx
index 3632e23db..c4495fb17 100644
--- a/src/screens/Exchange/styles.tsx
+++ b/src/screens/Exchange/styles.tsx
@@ -14,12 +14,14 @@ const styles = StyleService.create({
     },
     fromContainer: {
         backgroundColor: '$background',
+        paddingTop: AppSizes.paddingSml,
         padding: AppSizes.padding,
-        paddingBottom: 40,
+        paddingBottom: 20,
     },
     toContainer: {
-        paddingTop: 50,
+        paddingTop: 30,
         padding: AppSizes.padding,
+        paddingBottom: AppSizes.paddingSml,
     },
     bottomContainer: {
         paddingHorizontal: AppSizes.padding,
@@ -47,12 +49,14 @@ const styles = StyleService.create({
     detailsLabel: {
         fontSize: AppFonts.subtext.size * 0.9,
         fontFamily: AppFonts.base.family,
-        color: StyleService.isDarkMode() ? '$light' : '$darkGrey',
+        // color: StyleService.isDarkMode() ? '$light' : '$darkGrey',
+        color: StyleService.select({ dark: '$silver', light: '$grey' }),
     },
     detailsValue: {
         fontSize: AppFonts.subtext.size * 0.9,
-        fontFamily: AppFonts.base.familyMono,
-        color: StyleService.isDarkMode() ? '$light' : '$darkGrey',
+        fontFamily: AppFonts.base.familyMonoBold,
+        // color: StyleService.isDarkMode() ? '$light' : '$darkGrey',
+        color: StyleService.select({ dark: '$light', light: '$blue' }),
     },
     inputContainer: {
         left: 0,
@@ -107,8 +111,8 @@ const styles = StyleService.create({
     },
     detailsContainer: {
         paddingHorizontal: 20,
-        paddingTop: 20,
-        paddingBottom: 10,
+        paddingTop: 15,
+        paddingBottom: 2,
         backgroundColor: '$tint',
         borderRadius: 15,
         borderColor: '$tint',
diff --git a/src/screens/Home/HomeView.tsx b/src/screens/Home/HomeView.tsx
index a6f5e5e97..13d5c7c57 100644
--- a/src/screens/Home/HomeView.tsx
+++ b/src/screens/Home/HomeView.tsx
@@ -4,24 +4,43 @@
 
 import { find, has } from 'lodash';
 
-import React, { Component, Fragment } from 'react';
-import { View, Text, Image, ImageBackground, InteractionManager, Alert } from 'react-native';
-
-import { Navigation, EventSubscription } from 'react-native-navigation';
+import React, { Component, Fragment, ComponentType } from 'react';
+import {
+    View,
+    Text,
+    Image,
+    ImageBackground,
+    InteractionManager,
+    Alert,
+    ViewProps,
+    ImageBackgroundProps,
+} from 'react-native';
 
+import {
+    Navigation,
+    EventSubscription,
+    OptionsModalPresentationStyle,
+    OptionsModalTransitionStyle,
+} from 'react-native-navigation';
 import { AccountService, NetworkService, StyleService } from '@services';
 
 import { AccountRepository, CoreRepository } from '@store/repositories';
 import { AccountModel, CoreModel, NetworkModel } from '@store/models';
 
-import { AppScreens } from '@common/constants';
+import { XAppOrigin } from '@common/libs/payload';
+
+import { AppScreens, AppConfig } from '@common/constants';
+
+import { XAppBrowserModalProps } from '@screens/Modal/XAppBrowser';
 
 import { Navigator } from '@common/helpers/navigator';
 import { Prompt } from '@common/helpers/interface';
 
 import Preferences from '@common/libs/preferences';
 
-import { Button, RaisedButton } from '@components/General';
+import RNTangemSdk, { EventCallback } from 'tangem-sdk-react-native';
+
+import { Button, Spacer, RaisedButton, LoadingIndicator } from '@components/General';
 import {
     MonetizationElement,
     ProBadge,
@@ -39,6 +58,9 @@ import { ShareAccountOverlayProps } from '@screens/Overlay/ShareAccount';
 
 import { AppStyles } from '@theme';
 import styles from './styles';
+import onboardingStyles from '../Onboarding/styles';
+import { AccountGenerateViewProps } from '@screens/Account/Add/Generate';
+import { AccountImportViewProps } from '@screens/Account/Add/Import';
 
 /* types ==================================================================== */
 export interface Props {
@@ -53,6 +75,8 @@ export interface State {
     developerMode: boolean;
     discreetMode: boolean;
     experimentalUI?: boolean;
+    NFCSupported: boolean;
+    NFCEnabled: boolean;
 }
 
 /* Component ==================================================================== */
@@ -60,13 +84,10 @@ class HomeView extends Component<Props, State> {
     static screenName = AppScreens.TabBar.Home;
 
     private navigationListener: EventSubscription | undefined;
+    private nfcChangeListener?: EventSubscription;
 
     static options() {
-        return {
-            topBar: {
-                visible: false,
-            },
-        };
+        return { topBar: { visible: false } };
     }
 
     constructor(props: Props) {
@@ -75,6 +96,8 @@ class HomeView extends Component<Props, State> {
         const coreSettings = CoreRepository.getSettings();
 
         this.state = {
+            NFCSupported: false,
+            NFCEnabled: false,
             account: coreSettings.account,
             isSpendable: false,
             isSignable: false,
@@ -98,15 +121,41 @@ class HomeView extends Component<Props, State> {
         InteractionManager.runAfterInteractions(this.updateAccountStatus);
 
         // get experimental status
-        Preferences.get(Preferences.keys.EXPERIMENTAL_SIMPLICITY_UI).then((experimentalUI) => {
-            if (experimentalUI === 'true') {
+        Preferences.get(Preferences.keys.EXPERIMENTAL_SIMPLICITY_UI)
+            .then((experimentalUI) => {
                 this.setState({
-                    experimentalUI: true,
+                    experimentalUI: experimentalUI === 'true',
                 });
-            }
+            })
+            .catch(() => {
+                this.setState({
+                    experimentalUI: false,
+                });
+            });
+
+
+        InteractionManager.runAfterInteractions(() => {
+            this.nfcChangeListener = RNTangemSdk.addListener('NFCStateChange', this.onNFCStateChange);
+            // on NFC state change (Android)
+
+            // get current NFC status
+            RNTangemSdk.getNFCStatus().then((status) => {
+                const { support, enabled } = status;
+
+                this.setState({
+                    NFCSupported: support,
+                    NFCEnabled: enabled,
+                });
+            });
         });
     }
 
+    onNFCStateChange = ({ enabled }: EventCallback) => {
+        this.setState({
+            NFCEnabled: enabled,
+        });
+    };
+
     componentWillUnmount() {
         // remove listeners
         if (this.navigationListener) {
@@ -115,6 +164,14 @@ class HomeView extends Component<Props, State> {
 
         AccountRepository.off('accountUpdate', this.onAccountUpdate);
         CoreRepository.off('updateSettings', this.onCoreSettingsUpdate);
+
+        if (this.nfcChangeListener) {
+            this.nfcChangeListener.remove();
+        }
+
+        RNTangemSdk.stopSession().catch(() => {
+            // ignore
+        });
     }
 
     componentDidAppear() {
@@ -124,7 +181,7 @@ class HomeView extends Component<Props, State> {
             // Update account details when component didAppear and Socket is connected
             if (account?.isValid() && NetworkService.isConnected()) {
                 // only update current account details
-                AccountService.updateAccountsDetails(account.address);
+                AccountService.updateAccountsDetails([account.address]);
             }
         });
     }
@@ -237,20 +294,75 @@ class HomeView extends Component<Props, State> {
         Navigator.push<SendViewProps>(AppScreens.Transaction.Payment, {});
     };
 
+    pushSwapScreen = () => {
+        Navigator.showModal<XAppBrowserModalProps>(
+            AppScreens.Modal.XAppBrowser,
+            {
+                identifier: AppConfig.xappIdentifiers.swap,
+                noSwitching: true,
+                altHeader: {
+                    left: {
+                        icon: 'IconChevronLeft',
+                        onPress: 'onClose',
+                    },
+                    center: {
+                        text: Localize.t('global.swap'),
+                        showNetworkLabel: true,
+                    },
+                    right: {
+                        icon: 'IconTabBarSettingsSelected',
+                        iconSize: 25,
+                        onPress: 'navigateTo',
+                        onPressOptions: {
+                            xApp: AppConfig.xappIdentifiers.swap,
+                            pickSwapper: true,
+                        },
+                    },
+                },
+                origin: XAppOrigin.XUMM,
+            },
+            {
+                modalTransitionStyle: OptionsModalTransitionStyle.coverVertical,
+                modalPresentationStyle: OptionsModalPresentationStyle.overFullScreen,
+            },
+        );
+    };
+
     onAddAccountPress = () => {
         Navigator.push<AccountAddViewProps>(AppScreens.Account.Add, {});
     };
 
+    onCreateAccountPress = () => {
+        Navigator.push<AccountGenerateViewProps>(AppScreens.Account.Generate, {});
+    };
+
+    onImportAccountPress = () => {
+        Navigator.push<AccountImportViewProps>(AppScreens.Account.Import, {});
+    };
+
+    onTangemAccountPress = () => {
+        let resolveNavigationPromise: (value: void | PromiseLike<void>) => void;
+        const navigationPromise = new Promise<void>((resolve) => {
+            resolveNavigationPromise = resolve;
+        });
+
+        Navigator.push<AccountAddViewProps>(AppScreens.Account.Add, {
+            DefaultTangem: true,
+            NavigationReadyPromise: navigationPromise,
+        }).then(() => resolveNavigationPromise());
+    };
+
     renderHeader = () => {
-        const { account } = this.state;
+        const { account, developerMode } = this.state;
+        const { timestamp } = this.props;
 
         return (
-            <Fragment key="header">
+            <Fragment key={`header-${timestamp}`}>
                 <View style={[AppStyles.flex1, AppStyles.row, AppStyles.flexStart]}>
                     <Image style={styles.logo} source={StyleService.getImage('XamanLogo')} />
                     <ProBadge />
                 </View>
-                <NetworkSwitchButton hidden={!account?.isValid()} />
+                <NetworkSwitchButton developerMode={developerMode} hidden={!account?.isValid()} />
             </Fragment>
         );
     };
@@ -261,6 +373,15 @@ class HomeView extends Component<Props, State> {
         const { timestamp } = this.props;
         const { account, discreetMode, isSpendable, experimentalUI } = this.state;
 
+        if ((account?.details || []).length === 0 || account.getStateVersion() === 0) {
+            // No account information loaded/cached yet, so not saying "not activated"
+            return (
+                <View style={AppStyles.flex1}>
+                    <LoadingIndicator size='large' />
+                </View>
+            );
+        }
+
         // accounts is not activated
         if (account.balance === 0) {
             return <InactiveAccount account={account} />;
@@ -279,7 +400,7 @@ class HomeView extends Component<Props, State> {
     };
 
     renderButtons = () => {
-        const { isSpendable, experimentalUI } = this.state;
+        const { isSpendable, experimentalUI, isSignable } = this.state;
 
         if (isSpendable) {
             return (
@@ -288,22 +409,41 @@ class HomeView extends Component<Props, State> {
                         small
                         testID="send-button"
                         containerStyle={styles.sendButtonContainer}
-                        icon="IconCornerLeftUp"
+                        icon="IconV2Send"
                         iconSize={18}
-                        iconStyle={styles.sendButtonIcon}
+                        iconStyle={[
+                            styles.sendButtonIcon,
+                            styles.iconRotateY,
+                        ]}
                         label={Localize.t('global.send')}
                         textStyle={styles.sendButtonText}
                         onPress={this.pushSendScreen}
                     />
+                    { NetworkService.hasSwap() && isSignable &&
+                        <RaisedButton
+                            small
+                            testID="swap-button"
+                            containerStyle={styles.swapButtonContainer}
+                            icon="IconV2Swap"
+                            iconSize={18}
+                            iconStyle={styles.sendButtonIcon}
+                            label={Localize.t('global.swap')}
+                            textStyle={styles.sendButtonText}
+                            onPress={this.pushSwapScreen}
+                        />
+                    }
                     <RaisedButton
                         small
                         testID="request-button"
                         containerStyle={
                             experimentalUI ? styles.requestButtonContainerClean : styles.requestButtonContainer
                         }
-                        icon="IconCornerRightDown"
+                        icon="IconV2Request"
                         iconSize={18}
-                        iconStyle={experimentalUI ? styles.requestButtonIconClean : styles.requestButtonIcon}
+                        iconStyle={[
+                            styles.iconRotateX,
+                            experimentalUI ? styles.requestButtonIconClean : styles.requestButtonIcon,
+                        ]}
                         label={Localize.t('global.request')}
                         textStyle={experimentalUI ? styles.requestButtonTextClean : styles.requestButtonText}
                         onPress={this.onShowAccountQRPress}
@@ -328,25 +468,90 @@ class HomeView extends Component<Props, State> {
     };
 
     renderEmpty = () => {
+        const { NFCSupported, NFCEnabled } = this.state;
+
         return (
             <View testID="home-tab-empty-view" style={AppStyles.tabContainer}>
-                <View style={styles.headerContainer}>{this.renderHeader()}</View>
+                {/* <View style={styles.headerContainer}>{this.renderHeader()}</View> */}
 
                 <ImageBackground
-                    source={StyleService.getImage('BackgroundShapes')}
-                    imageStyle={AppStyles.BackgroundShapes}
-                    style={[AppStyles.contentContainer, AppStyles.padding]}
+                    resizeMode="cover"
+                    source={StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')}
+                    style={[AppStyles.contentContainer, AppStyles.paddingHorizontal]}
                 >
-                    <Image style={AppStyles.emptyIcon} source={StyleService.getImage('ImageFirstAccount')} />
-                    <Text style={AppStyles.emptyText}>{Localize.t('home.emptyAccountAddFirstAccount')}</Text>
-                    <Button
-                        testID="add-account-button"
-                        label={Localize.t('home.addAccount')}
-                        icon="IconPlus"
-                        iconStyle={AppStyles.imgColorWhite}
-                        rounded
-                        onPress={this.onAddAccountPress}
-                    />
+                    <View style={[AppStyles.flex1, AppStyles.centerAligned, AppStyles.padding]}>
+                        <Image
+                            style={onboardingStyles.logo}
+                            source={StyleService.getImageIfLightModeIfDarkMode('XamanLogo', 'XamanLogoLight')}
+                        />
+                    </View>
+                    <View style={[
+                        AppStyles.flex2,
+                    ]}>
+                        <View style={[AppStyles.flex1, AppStyles.paddingSml]}>
+                            <View style={[AppStyles.centerAligned, AppStyles.flexEnd]}>
+                                <Text style={[AppStyles.h5, AppStyles.strong]}>
+                                    {Localize.t('onboarding.v2homepage_noacc1')}
+                                </Text>
+                                <Spacer size={10} />
+                                <Text style={[AppStyles.p, AppStyles.colorGrey, AppStyles.textCenterAligned]}>
+                                    {Localize.t('onboarding.v2homepage_noacc2')}
+                                </Text>
+                            </View>
+                        </View>
+                    </View>
+                    <View style={[
+                        AppStyles.flex5,
+                        AppStyles.paddingBottom,
+                    ]}>
+                        <View style={[
+                            onboardingStyles.container,
+                        ]}>
+                            <Button
+                                testID="add-account-button"
+                                label={Localize.t('account.generateNewAccount')}
+                                icon="IconCreate"
+                                iconStyle={AppStyles.imgColorWhite}
+                                nonBlock
+                                onPress={this.onCreateAccountPress}
+                            />
+                            <Spacer size={12} />
+                            <Button
+                                testID="add-account-button-import"
+                                label={Localize.t('account.importExisting')}
+                                icon="IconImport"
+                                iconStyle={AppStyles.imgColorWhite}
+                                nonBlock
+                                secondary
+                                onPress={this.onImportAccountPress}
+                            />
+                            { 
+                                NFCSupported && NFCEnabled && (
+                                    <View>
+                                        <Spacer size={12}/>
+                                        <Text style={[
+                                            AppStyles.textCenterAligned,
+                                            AppStyles.smalltext,
+                                            AppStyles.bold,
+                                            AppStyles.colorGrey,
+                                        ]}>{Localize.t('global.or').toUpperCase()}</Text>
+                                        <Spacer size={12}/>
+                                        <Button
+                                            testID="add-account-button-tangem"
+                                            label={Localize.t('account.addTangemCard')}
+                                            icon="IconTangem"
+                                            iconStyle={AppStyles.imgColorContrast}
+                                            nonBlock
+                                            contrast
+                                            onPress={this.onTangemAccountPress}
+                                        />
+                                    </View>
+                                )
+                            }
+
+                            <Spacer size={12} />
+                        </View>
+                    </View>
                 </ImageBackground>
             </View>
         );
@@ -373,12 +578,17 @@ class HomeView extends Component<Props, State> {
         const { account, discreetMode } = this.state;
 
         return (
-            <AccountSwitchElement
-                account={account}
-                discreet={discreetMode}
-                showAddAccountButton
-                containerStyle={styles.accountSwitchElement}
-            />
+            <View style={[
+                styles.accountSwitchConainer,
+            ]}>
+                <AccountSwitchElement
+                    account={account}
+                    discreet={discreetMode}
+                    showAddAccountButton
+                    noPadding
+                    containerStyle={styles.accountSwitchElement}
+                />
+            </View>
         );
     };
 
@@ -389,6 +599,19 @@ class HomeView extends Component<Props, State> {
             return this.renderEmpty();
         }
 
+        const Container: ComponentType<ViewProps | ImageBackgroundProps> = account.balance === 0
+            ? ImageBackground
+            : View;
+
+        const containerProps = account.balance === 0
+            ? {
+                resizeMode: 'cover',
+                source: StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes'),
+            }
+            : {
+                // Nada for `View`
+            };
+
         return (
             <View testID="home-tab-view" style={AppStyles.tabContainer}>
                 {/* Header */}
@@ -400,12 +623,13 @@ class HomeView extends Component<Props, State> {
                 </Fragment>
 
                 {/* Content */}
-                <View style={AppStyles.contentContainer}>
+                {/* eslint-disable-next-line react/jsx-props-no-spreading */}
+                <Container style={AppStyles.contentContainer} {...containerProps}>
                     {this.renderNetworkDetails()}
                     {this.renderAccountAddress()}
                     {this.renderButtons()}
                     {this.renderAssets()}
-                </View>
+                </Container>
             </View>
         );
     }
diff --git a/src/screens/Home/styles.tsx b/src/screens/Home/styles.tsx
index ce7a6b54a..ca445b5b4 100644
--- a/src/screens/Home/styles.tsx
+++ b/src/screens/Home/styles.tsx
@@ -20,6 +20,12 @@ const styles = StyleService.create({
     tokenListContainer: {
         flex: 6,
     },
+    iconRotateX: {
+        transform: [{ rotateX: '180deg' }],
+    },
+    iconRotateY: {
+        transform: [{ rotateY: '180deg' }],
+    },
     logo: {
         width: AppSizes.scale(120),
         height: AppSizes.scale(30),
@@ -27,24 +33,30 @@ const styles = StyleService.create({
     },
     buttonRow: {
         flexDirection: 'row',
-        marginBottom: 20,
+        marginBottom: 15,
         marginTop: 15,
-        marginHorizontal: AppSizes.paddingSml,
+        marginHorizontal: AppSizes.paddingSml - 4,
     },
     // SEND BUTTON
     sendButtonContainer: {
         backgroundColor: '$blue',
+        marginHorizontal: 4,
+    },
+    // SEND BUTTON
+    swapButtonContainer: {
+        backgroundColor: '$darkBlue',
+        marginHorizontal: 4,
     },
-    sendButtonIcon: { tintColor: '$white' },
+    sendButtonIcon: { tintColor: '$white', marginRight: -3 },
     sendButtonText: { fontSize: AppFonts.base.size, color: '$white' },
 
     // REQUEST BUTTON
     requestButtonContainer: {
-        marginLeft: 15,
+        marginHorizontal: 4,
         backgroundColor: '$green',
     },
 
-    requestButtonIcon: { tintColor: '$white' },
+    requestButtonIcon: { tintColor: '$white', marginRight: -3 },
     requestButtonText: { fontSize: AppFonts.base.size, color: '$white' },
 
     requestButtonContainerClean: {
@@ -77,8 +89,17 @@ const styles = StyleService.create({
         fontFamily: AppFonts.base.familyMonoBold,
         fontSize: AppFonts.subtext.size * 0.8,
     },
-    accountSwitchElement: {
+    accountSwitchConainer: {
+        backgroundColor: '$tint',
         marginHorizontal: AppSizes.paddingSml,
+        paddingTop: 7,
+        paddingBottom: 4,
+        paddingLeft: 10,
+        paddingRight: 6,
+        borderRadius: 11,
+    },
+    accountSwitchElement: {
+        marginHorizontal: 0,
     },
 });
 
diff --git a/src/screens/Modal/PurchaseProduct/PurchaseProductModal.tsx b/src/screens/Modal/PurchaseProduct/PurchaseProductModal.tsx
index 324588a83..a2615e0bf 100644
--- a/src/screens/Modal/PurchaseProduct/PurchaseProductModal.tsx
+++ b/src/screens/Modal/PurchaseProduct/PurchaseProductModal.tsx
@@ -3,7 +3,7 @@
  */
 
 import React, { Component } from 'react';
-import { View, Text, Alert, ImageBackground, Linking, Image } from 'react-native';
+import { View, Text, Alert, ImageBackground, Linking, Image, Platform } from 'react-native';
 
 import BackendService from '@services/BackendService';
 import LoggerService from '@services/LoggerService';
@@ -19,6 +19,9 @@ import { ComplianceLinks } from '@common/constants/endpoints';
 import { Spacer, CountDown, Button, Icon, Footer } from '@components/General';
 import { ProductDetailsElement } from '@components/Modules/ProductDetailsElement';
 
+import { ProfileRepository } from '@store/repositories';
+import { MonetizationStatus } from '@store/types';
+
 import { Images } from '@common/helpers/images';
 
 import Localize from '@locale';
@@ -32,8 +35,7 @@ import styles from './styles';
 export interface Props {
     productId: string;
     productDescription: string;
-    onSuccessPurchase?: () => void;
-    onClose?: () => void;
+    onClose?: (successPayment: boolean) => void;
 }
 
 export interface State {
@@ -72,9 +74,10 @@ class PurchaseProductModal extends Component<Props, State> {
 
     onClose = async () => {
         const { onClose } = this.props;
+        const { purchaseSuccess } = this.state;
 
         if (typeof onClose === 'function') {
-            onClose();
+            onClose(purchaseSuccess);
         }
 
         // close modal
@@ -88,12 +91,16 @@ class PurchaseProductModal extends Component<Props, State> {
     };
 
     onSuccessPurchase = async () => {
-        const { onSuccessPurchase } = this.props;
-
-        if (typeof onSuccessPurchase === 'function') {
-            onSuccessPurchase();
-        }
+        // purchase was successful clear the monetization status
+        ProfileRepository.saveProfile({
+            monetization: {
+                monetizationStatus: MonetizationStatus.NONE,
+                productForPurchase: '',
+                monetizationType: '',
+            },
+        });
 
+        // set the state
         this.setState({
             purchaseSuccess: true,
         });
@@ -242,7 +249,12 @@ class PurchaseProductModal extends Component<Props, State> {
                     </View>
                     <View style={[AppStyles.flex1, AppStyles.stretchSelf, AppStyles.centerContent]}>
                         <View style={[AppStyles.flex1, AppStyles.centerContent, AppStyles.gapExtraSml]}>
-                            <Text style={styles.notesText}>{Localize.t('monetization.prePurchaseTip')}</Text>
+                            <Text style={styles.notesText}>
+                                {Platform.select({
+                                    ios: Localize.t('monetization.prePurchaseTipIos'),
+                                    android: Localize.t('monetization.prePurchaseTipAndroid'),
+                                })}
+                            </Text>
                             <Text style={styles.notesText}>
                                 Read our{' '}
                                 <Text
@@ -269,7 +281,7 @@ class PurchaseProductModal extends Component<Props, State> {
                                 onPress={this.lunchPurchaseFlow}
                                 isLoading={isPurchasing}
                                 isDisabled={!isDetailsResolved}
-                                loadingIndicatorStyle={StyleService.select({ dark: 'dark', light: 'light' })}
+                                loadingIndicatorStyle={StyleService.isDarkMode() ? 'dark' : 'light'}
                             />
                             <View style={styles.separatorContainer}>
                                 <Text style={styles.separatorText}>{Localize.t('global.or')}</Text>
@@ -277,7 +289,7 @@ class PurchaseProductModal extends Component<Props, State> {
                             <Button
                                 textStyle={styles.restorePurchase}
                                 isLoading={isRestoring}
-                                loadingIndicatorStyle={StyleService.select({ dark: 'light', light: 'dark' })}
+                                loadingIndicatorStyle={StyleService.isDarkMode() ? 'light' : 'dark'}
                                 onPress={this.restorePurchase}
                                 label={Localize.t('monetization.restorePurchase')}
                                 roundedMini
diff --git a/src/screens/Modal/ReviewTransaction/ReviewTransactionModal.tsx b/src/screens/Modal/ReviewTransaction/ReviewTransactionModal.tsx
index 2c208353a..8bc9220ac 100644
--- a/src/screens/Modal/ReviewTransaction/ReviewTransactionModal.tsx
+++ b/src/screens/Modal/ReviewTransaction/ReviewTransactionModal.tsx
@@ -9,7 +9,7 @@ import { AppScreens } from '@common/constants';
 
 import { NetworkService, PushNotificationsService, ResolverService } from '@services';
 
-import { AccountRepository, CoreRepository, CurrencyRepository } from '@store/repositories';
+import { AccountRepository, CoreRepository } from '@store/repositories';
 import { AccountModel } from '@store/models';
 
 import { TransactionTypes } from '@common/libs/ledger/types/enums';
@@ -31,6 +31,8 @@ import ErrorView from './Shared/ErrorView';
 
 import { StepsContext } from './Context';
 import { Props, State, Steps } from './types';
+import LedgerService from '@services/LedgerService';
+import BackendService from '@services/BackendService';
 
 /* Component ==================================================================== */
 class ReviewTransactionModal extends Component<Props, State> {
@@ -50,6 +52,8 @@ class ReviewTransactionModal extends Component<Props, State> {
     constructor(props: Props) {
         super(props);
 
+        // console.log('Review TX Modal')
+
         this.state = {
             payload: props.payload,
             transaction: undefined,
@@ -58,6 +62,7 @@ class ReviewTransactionModal extends Component<Props, State> {
             currentStep: Steps.Preflight,
             submitResult: undefined,
             isLoading: false,
+            serviceFee: undefined,
             isReady: true,
             isValidPayload: true,
             hasError: false,
@@ -111,7 +116,7 @@ class ReviewTransactionModal extends Component<Props, State> {
     };
 
     prepareAndSignTransaction = async () => {
-        const { source, transaction } = this.state;
+        const { source, transaction, serviceFee } = this.state;
         const { payload } = this.props;
 
         // if not mounted return
@@ -123,6 +128,11 @@ class ReviewTransactionModal extends Component<Props, State> {
             isLoading: true,
         });
 
+        // console.log({serviceFee}, transaction?.ServiceFee, transaction?.ServiceFeeTx);
+        if (serviceFee) {
+            transaction?.setServiceFee(serviceFee);
+        }
+
         // TODO: transaction!
         await transaction!
             // TODO: source!
@@ -130,10 +140,12 @@ class ReviewTransactionModal extends Component<Props, State> {
             .then(this.submit)
             .catch((error: Error) => {
                 if (this.mounted) {
-                    if (error?.message) {
-                        Alert.alert(Localize.t('global.error'), error.message);
-                    } else {
-                        Alert.alert(Localize.t('global.error'), Localize.t('global.unexpectedErrorOccurred'));
+                    if (error) {
+                        if (error?.message) {
+                            Alert.alert(Localize.t('global.error'), error.message);
+                        } else {
+                            Alert.alert(Localize.t('global.error'), Localize.t('global.unexpectedErrorOccurred'));
+                        }
                     }
 
                     this.setState({
@@ -204,6 +216,9 @@ class ReviewTransactionModal extends Component<Props, State> {
     onAccept = async () => {
         const { payload } = this.props;
         const { source, transaction } = this.state;
+        // console.log('REVIEW TX MODAL ACCEPT SERVICE FEE', serviceFee);
+        // console.log('state', this.props)
+        // return
 
         if (!transaction || !source) {
             throw new Error('Transaction and Source instance is required!');
@@ -236,9 +251,57 @@ class ReviewTransactionModal extends Component<Props, State> {
                     });
                 }
 
+                // do not continue
                 return;
             }
 
+            // user may close the page at this point while we have been waiting for transaction validation
+            // we need to return if component is not mounted
+            if (!this.mounted) {
+                return;
+            }
+
+            // Live check if account is activated before continue for signing regular transaction
+            // ignore pseudo and multi-sign transactions
+            // ignore for "Import" transaction as it can be submitted even if account is not activated
+            try {
+                if (
+                    !payload.isPseudoTransaction() &&
+                    !payload.isMultiSign() &&
+                    transaction.Type !== TransactionTypes.Import
+                ) {
+                    const sourceAccountInfo = await LedgerService.getAccountInfo(source.address).catch(() => {
+                        // do not catch
+                    });
+
+                    if (!this.mounted) {
+                        return;
+                    }
+
+                    // if we couldn't get the account info then fallback to cached method
+                    if (
+                        (!sourceAccountInfo && source.balance === 0) ||
+                        (sourceAccountInfo && 'error' in sourceAccountInfo && sourceAccountInfo.error === 'actNotFound')
+                    ) {
+                        Navigator.showAlertModal({
+                            type: 'error',
+                            text: Localize.t('account.selectedAccountIsNotActivatedPleaseChooseAnotherOne'),
+                            buttons: [
+                                {
+                                    text: Localize.t('global.ok'),
+                                    light: false,
+                                },
+                            ],
+                        });
+
+                        // do not continue
+                        return;
+                    }
+                }
+            } catch {
+                // ignore
+            }
+
             try {
                 // if any validation set to the transaction run and check
                 // ignore if multiSign
@@ -259,36 +322,17 @@ class ReviewTransactionModal extends Component<Props, State> {
                         ],
                     });
                 }
+
+                // do not continue
                 return;
             }
 
-            // user may close the page at this point
+            // user may close the page at this point while we have been waiting for transaction validation
             // we need to return if component is not mounted
             if (!this.mounted) {
                 return;
             }
 
-            // account is not activated and want to sign a tx
-            // ignore for "Import" transaction as it can be submitted even if account is not activated
-            if (
-                !payload.isPseudoTransaction() &&
-                transaction.Type !== TransactionTypes.Import &&
-                !payload.isMultiSign() &&
-                source!.balance === 0
-            ) {
-                Navigator.showAlertModal({
-                    type: 'error',
-                    text: Localize.t('account.selectedAccountIsNotActivatedPleaseChooseAnotherOne'),
-                    buttons: [
-                        {
-                            text: Localize.t('global.ok'),
-                            light: false,
-                        },
-                    ],
-                });
-                return;
-            }
-
             // check for account delete and alert user
             if (transaction.Type === TransactionTypes.AccountDelete) {
                 Navigator.showAlertModal({
@@ -311,6 +355,8 @@ class ReviewTransactionModal extends Component<Props, State> {
                         },
                     ],
                 });
+
+                // do not continue
                 return;
             }
 
@@ -318,76 +364,99 @@ class ReviewTransactionModal extends Component<Props, State> {
             if (transaction.Type === TransactionTypes.TrustSet) {
                 // if the token is not in the vetted list and user is creating new trust line
                 // show the warning
-                if (
-                    !CurrencyRepository.isVettedCurrency({
-                        issuer: transaction.Issuer,
-                        currency: transaction.Currency,
-                    }) &&
-                    !AccountRepository.hasCurrency(source, {
-                        issuer: transaction.Issuer,
-                        currency: transaction.Currency,
-                    })
-                ) {
-                    Navigator.showAlertModal({
-                        testID: 'new-trust-line-alert-overlay',
-                        type: 'warning',
-                        title: Localize.t('global.warning'),
-                        text: Localize.t('asset.addingTrustLineWarning'),
-                        buttons: [
-                            {
-                                testID: 'back-button',
-                                text: Localize.t('global.back'),
-                                light: false,
-                            },
-                            {
-                                testID: 'continue-button',
-                                text: Localize.t('global.continue'),
-                                onPress: this.prepareAndSignTransaction,
-                                type: 'dismiss',
-                                light: true,
-                            },
-                        ],
-                    });
-                    return;
-                }
-            }
-
-            // show alert if user trading not vetted tokens
-            if (transaction.Type === TransactionTypes.OfferCreate) {
-                let shouldShowAlert = false;
-
-                const takerPays = transaction.TakerPays;
+                try {
+                    const vettedCurrency = await BackendService.isVettedCurrency(
+                        transaction.Issuer,
+                        transaction.Currency,
+                    );
+
+                    // user may close the page at this point while we have been waiting
+                    // we need to return if component is not mounted
+                    if (!this.mounted) {
+                        return;
+                    }
 
-                if (takerPays && takerPays.currency !== NetworkService.getNativeAsset()) {
                     if (
-                        !CurrencyRepository.isVettedCurrency({
-                            issuer: takerPays.issuer!,
-                            currency: takerPays.currency,
+                        !vettedCurrency &&
+                        !AccountRepository.hasCurrency(source, {
+                            issuer: transaction.Issuer,
+                            currency: transaction.Currency,
                         })
                     ) {
-                        shouldShowAlert = true;
+                        Navigator.showAlertModal({
+                            testID: 'new-trust-line-alert-overlay',
+                            type: 'warning',
+                            title: Localize.t('global.warning'),
+                            text: Localize.t('asset.addingTrustLineWarning'),
+                            buttons: [
+                                {
+                                    testID: 'back-button',
+                                    text: Localize.t('global.back'),
+                                    light: false,
+                                },
+                                {
+                                    testID: 'continue-button',
+                                    text: Localize.t('global.continue'),
+                                    onPress: this.prepareAndSignTransaction,
+                                    type: 'dismiss',
+                                    light: true,
+                                },
+                            ],
+                        });
+
+                        // do not continue
+                        return;
                     }
+                } catch (error) {
+                    // ignore on error
                 }
+            }
 
-                if (shouldShowAlert) {
-                    Navigator.showAlertModal({
-                        type: 'warning',
-                        title: Localize.t('global.warning'),
-                        text: Localize.t('payload.notVettedTokenTradeWarning'),
-                        buttons: [
-                            {
-                                text: Localize.t('global.back'),
-                                light: false,
-                            },
-                            {
-                                text: Localize.t('global.continue'),
-                                onPress: this.prepareAndSignTransaction,
-                                type: 'dismiss',
-                                light: true,
-                            },
-                        ],
-                    });
-                    return;
+            // show alert if user trading not vetted tokens
+            if (transaction.Type === TransactionTypes.OfferCreate) {
+                // if the token is not in the vetted list and user is trading the token
+                try {
+                    const takerPays = transaction.TakerPays;
+
+                    if (takerPays && takerPays.currency !== NetworkService.getNativeAsset()) {
+                        // const vettedCurrency = await BackendService.isVettedCurrency(
+                        //     takerPays.issuer!,
+                        //     takerPays.currency,
+                        // );
+
+                        // user may close the page at this point while we have been waiting
+                        // we need to return if component is not mounted
+                        if (!this.mounted) {
+                            return;
+                        }
+
+                        this.prepareAndSignTransaction();
+
+                        // if (!vettedCurrency) {
+                        //     Navigator.showAlertModal({
+                        //         type: 'warning',
+                        //         title: Localize.t('global.warning'),
+                        //         text: Localize.t('payload.notVettedTokenTradeWarning'),
+                        //         buttons: [
+                        //             {
+                        //                 text: Localize.t('global.back'),
+                        //                 light: false,
+                        //             },
+                        //             {
+                        //                 text: Localize.t('global.continue'),
+                        //                 onPress: this.prepareAndSignTransaction,
+                        //                 type: 'dismiss',
+                        //                 light: true,
+                        //             },
+                        //         ],
+                        //     });
+
+                        //     // do not continue
+                        //     return;
+                        // }
+                    }
+                } catch (error) {
+                    // ignore on error
                 }
             }
 
@@ -409,6 +478,8 @@ class ReviewTransactionModal extends Component<Props, State> {
                         },
                     ],
                 });
+
+                // do not continue
                 return;
             }
 
@@ -416,6 +487,10 @@ class ReviewTransactionModal extends Component<Props, State> {
                 try {
                     const destinationInfo = await ResolverService.getAccountAdvisoryInfo(transaction.Destination);
 
+                    if (!this.mounted) {
+                        return;
+                    }
+
                     // if sending to a blackHoled account
                     if (destinationInfo.blackHole) {
                         Navigator.showAlertModal({
@@ -434,6 +509,8 @@ class ReviewTransactionModal extends Component<Props, State> {
                                 },
                             ],
                         });
+
+                        // do not continue
                         return;
                     }
 
@@ -461,10 +538,13 @@ class ReviewTransactionModal extends Component<Props, State> {
                                 },
                             ],
                         });
+
+                        // do not continue
                         return;
                     }
                 } catch {
                     Toast(Localize.t('send.unableGetRecipientAccountInfoPleaseTryAgain'));
+                    // do not continue
                     return;
                 }
             }
@@ -492,7 +572,7 @@ class ReviewTransactionModal extends Component<Props, State> {
 
         // we shouldn't override already set transaction
         if (transaction) {
-            throw new Error('Transaction is already set and cannot be overwrite!');
+            throw new Error('Transaction is already set and cannot be overwritten!');
         }
 
         this.setState({
@@ -548,6 +628,17 @@ class ReviewTransactionModal extends Component<Props, State> {
         });
     };
 
+    setServiceFee = (newServiceFee: number) => {
+        const { serviceFee } = this.state;
+        // console.log('ReviewTransactionModal servicefee', { serviceFee, newServiceFee });
+        if (serviceFee !== newServiceFee) {
+            // console.log('ReviewTransactionModal new Service Fee', { serviceFee, newServiceFee });
+            this.setState({
+                serviceFee: newServiceFee,
+            });
+        }
+    };
+
     submit = async () => {
         const { payload } = this.props;
         const { transaction, coreSettings } = this.state;
@@ -613,6 +704,15 @@ class ReviewTransactionModal extends Component<Props, State> {
                             VibrateHapticFeedback('notificationError');
                         }
                     }
+
+                    if (submitResult.success) {
+                        // All set
+                        // console.log(
+                        //     'TX Submit success, now service fee.',
+                        //     transaction.ServiceFee,
+                        //     transaction.ServiceFeeTx
+                        // );
+                    }
                 } else if (coreSettings.hapticFeedback) {
                     VibrateHapticFeedback('notificationError');
                 }
@@ -680,6 +780,7 @@ class ReviewTransactionModal extends Component<Props, State> {
 
     render() {
         const { currentStep, hasError, errorMessage } = this.state;
+        const { timestamp } = this.props;
 
         // don't render if any error happened
         // this can happen if there is a missing field in the payload or any unexpected error
@@ -713,11 +814,14 @@ class ReviewTransactionModal extends Component<Props, State> {
 
         return (
             <StepsContext.Provider
+                key={`reviewtxmodal-${timestamp}`}
                 value={{
                     ...this.state,
+                    timestamp,
                     setTransaction: this.setTransaction,
                     setAccounts: this.setAccounts,
                     setSource: this.setSource,
+                    setServiceFee: this.setServiceFee,
                     setError: this.setError,
                     setLoading: this.setLoading,
                     setReady: this.setReady,
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Preflight/PreflightStep.tsx b/src/screens/Modal/ReviewTransaction/Steps/Preflight/PreflightStep.tsx
index 15c533e6c..30c53330e 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Preflight/PreflightStep.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Preflight/PreflightStep.tsx
@@ -18,8 +18,6 @@ import { Navigator } from '@common/helpers/navigator';
 import { Prompt } from '@common/helpers/interface';
 import { Images } from '@common/helpers/images';
 
-import { TransactionTypes } from '@common/libs/ledger/types/enums';
-
 import { Button, Icon, InfoMessage, Spacer } from '@components/General';
 import { ReviewHeader } from '@screens/Modal/ReviewTransaction/Shared';
 
@@ -190,19 +188,7 @@ class PreflightStep extends Component<Props, State> {
 
             try {
                 // get available accounts for signing
-                let availableAccounts: AccountModel[];
-
-                if (payload.isMultiSign()) {
-                    // only accounts with full access
-                    availableAccounts = AccountRepository.getFullAccessAccounts();
-                } else if (payload.isPseudoTransaction() || payload.getTransactionType() === TransactionTypes.Import) {
-                    // account's that can sign the transaction
-                    // NOTE: for Import transaction, the transaction can be signed with not activated accounts
-                    availableAccounts = AccountRepository.getSignableAccounts();
-                } else {
-                    // account's that can sign the transaction and also activated
-                    availableAccounts = AccountRepository.getSpendableAccounts(true);
-                }
+                let availableAccounts = AccountRepository.getSignableAccounts();
 
                 // if no account for signing is available then just return
                 if (isEmpty(availableAccounts)) {
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/ReviewStep.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/ReviewStep.tsx
index 46f9392c3..7be9243d1 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/ReviewStep.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/ReviewStep.tsx
@@ -16,6 +16,7 @@ import { InstanceTypes } from '@common/libs/ledger/types/enums';
 
 import { AppInfo, SignerLabel, SignForAccount } from '@components/Modules/ReviewTransaction';
 import { ReviewHeader } from '@screens/Modal/ReviewTransaction/Shared';
+import DropShadow from 'react-native-drop-shadow';
 
 import Localize from '@locale';
 
@@ -34,6 +35,7 @@ export interface Props {}
 export interface State {
     canScroll: boolean;
     timestamp?: number;
+    serviceFee?: number;
 }
 
 /* Component ==================================================================== */
@@ -44,6 +46,8 @@ class ReviewStep extends Component<Props, State> {
     constructor(props: Props) {
         super(props);
 
+        // console.log('Reviewstep')
+
         this.state = {
             canScroll: true,
         };
@@ -51,7 +55,9 @@ class ReviewStep extends Component<Props, State> {
 
     toggleCanScroll = () => {
         const { canScroll } = this.state;
-
+        
+        // console.log('ToggleCanScroll')
+        
         this.setState({
             canScroll: !canScroll,
         });
@@ -74,6 +80,13 @@ class ReviewStep extends Component<Props, State> {
         });
     };
 
+    setServiceFee = (serviceFee: number) => {
+        // console.log('ReviewStep set service fee', serviceFee)
+        this.setState({
+            serviceFee,
+        });
+    };
+
     renderDetails = () => {
         const { payload, transaction, source, setLoading, setReady } = this.context;
 
@@ -89,6 +102,7 @@ class ReviewStep extends Component<Props, State> {
             forceRender: this.forceRender,
             setLoading,
             setReady,
+            setServiceFee: this.setServiceFee,
         } as any;
 
         // TODO: add logic for checking if template is exist before calling React.createElement
@@ -130,9 +144,23 @@ class ReviewStep extends Component<Props, State> {
     };
 
     render() {
-        const { accounts, payload, transaction, source, isReady, isLoading, setSource, onAccept, onClose } =
-            this.context;
-        const { canScroll } = this.state;
+        const {
+            accounts,
+            payload,
+            transaction,
+            source,
+            isReady,
+            isLoading,
+            setSource,
+            onAccept,
+            onClose,
+            setServiceFee,
+        } = this.context;
+        const { canScroll, serviceFee } = this.state;
+
+        if (serviceFee) {
+            setServiceFee(serviceFee);
+        }
 
         // waiting for accounts / transaction to be initiated
         if (typeof accounts === 'undefined' || !source || !transaction) {
@@ -142,8 +170,9 @@ class ReviewStep extends Component<Props, State> {
         return (
             <ImageBackground
                 testID="review-transaction-modal"
-                source={StyleService.getImage('BackgroundPattern')}
+                source={StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')}
                 imageStyle={styles.xamanAppBackground}
+                resizeMode="cover"
                 style={styles.container}
             >
                 <ReviewHeader transaction={transaction} onClose={onClose} />
@@ -157,35 +186,43 @@ class ReviewStep extends Component<Props, State> {
                     <AppInfo source={source} transaction={transaction} payload={payload} />
 
                     {/* transaction info content */}
-                    <View style={styles.transactionContent}>
-                        <View style={AppStyles.paddingHorizontalSml}>
-                            <SignerLabel payload={payload} />
-                            <AccountPicker onSelect={setSource} accounts={accounts} selectedItem={source} />
-                        </View>
-
-                        {/* in multi-sign transactions and in some cases in Import transaction */}
-                        {/* the Account can be different than the signing account */}
-                        <SignForAccount transaction={transaction} source={source} />
-
-                        {/* transaction details */}
-                        <View style={styles.detailsContainer}>{this.renderDetails()}</View>
-
-                        {/* accept button */}
-                        <View style={styles.acceptButtonContainer}>
-                            <SwipeButton
-                                testID="accept-button"
-                                color={this.getSwipeButtonColor()}
-                                isLoading={isLoading}
-                                isDisabled={!isReady}
-                                onSwipeSuccess={onAccept}
-                                label={Localize.t('global.slideToAccept')}
-                                accessibilityLabel={Localize.t('global.accept')}
-                                onPanResponderGrant={this.toggleCanScroll}
-                                onPanResponderRelease={this.toggleCanScroll}
-                                shouldResetAfterSuccess
-                            />
+                    <DropShadow style={styles.shadow}>
+                        <View style={styles.transactionContent}>
+                            <View style={AppStyles.paddingHorizontalSml}>
+                                <SignerLabel payload={payload} />
+                                <View style={styles.accountPickerPadding}>
+                                    <AccountPicker
+                                        onSelect={setSource}
+                                        accounts={accounts}
+                                        selectedItem={source}
+                                    />
+                                </View>
+                            </View>
+
+                            {/* in multi-sign transactions and in some cases in Import transaction */}
+                            {/* the Account can be different than the signing account */}
+                            <SignForAccount transaction={transaction} source={source} />
+
+                            {/* transaction details */}
+                            <View style={styles.detailsContainer}>{this.renderDetails()}</View>
+                            
+                            {/* accept button */}
+                            <View style={styles.acceptButtonContainer}>
+                                <SwipeButton
+                                    testID="accept-button"
+                                    color={this.getSwipeButtonColor()}
+                                    isLoading={isLoading}
+                                    isDisabled={!isReady}
+                                    onSwipeSuccess={onAccept}
+                                    label={Localize.t('global.slideToAccept')}
+                                    accessibilityLabel={Localize.t('global.accept')}
+                                    onPanResponderGrant={this.toggleCanScroll}
+                                    onPanResponderRelease={this.toggleCanScroll}
+                                    shouldResetAfterSuccess
+                                />
+                            </View>
                         </View>
-                    </View>
+                    </DropShadow>
                 </KeyboardAwareScrollView>
             </ImageBackground>
         );
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/fallback/FallbackTemplate.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/fallback/FallbackTemplate.tsx
index c7e2e4319..d27ce10f7 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/fallback/FallbackTemplate.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/fallback/FallbackTemplate.tsx
@@ -82,7 +82,7 @@ class FallbackTemplate extends Component<Props, State> {
     };
 
     render() {
-        const { transaction } = this.props;
+        const { transaction, source } = this.props;
         const { transactionJsonData, showFeePicker } = this.state;
 
         if (!transactionJsonData) {
@@ -121,6 +121,7 @@ class FallbackTemplate extends Component<Props, State> {
                             txJson={transaction.JsonForSigning}
                             onSelect={this.setTransactionFee}
                             containerStyle={styles.contentBox}
+                            source={source}
                             textStyle={styles.feeText}
                         />
                     </>
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CheckCash.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CheckCash.tsx
index 9422b6c63..7c5585e40 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CheckCash.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CheckCash.tsx
@@ -39,6 +39,7 @@ class CheckCashTemplate extends Component<Props, State> {
         super(props);
 
         const amountField = props.transaction.Amount ? 'Amount' : 'DeliverMin';
+    
         const currencyName = props.transaction[amountField]?.currency
             ? NormalizeCurrencyCode(props.transaction[amountField]!.currency)
             : NetworkService.getNativeAsset();
@@ -69,6 +70,11 @@ class CheckCashTemplate extends Component<Props, State> {
                 if (checkEntry) {
                     const checkObject = new CheckCreate(checkEntry);
 
+                    if (checkObject?.SendMax && typeof checkObject?.SendMax === 'object') {
+                        const currencyName = NormalizeCurrencyCode(checkObject?.SendMax.currency);
+                        this.setState({currencyName});
+                    }
+
                     this.setState(
                         {
                             checkObject,
@@ -88,21 +94,21 @@ class CheckCashTemplate extends Component<Props, State> {
 
     onAmountChange = (amount: string) => {
         const { transaction } = this.props;
-        const { amountField } = this.state;
+        const { amountField, currencyName, checkObject } = this.state;
 
         this.setState({
             cashAmount: amount,
         });
 
-        if (!transaction[amountField] || transaction[amountField]!.currency === NetworkService.getNativeAsset()) {
+        if (currencyName === NetworkService.getNativeAsset()) {
             transaction[amountField] = {
-                currency: NetworkService.getNativeAsset(),
+                currency: currencyName,
                 value: amount,
             };
         } else {
             transaction[amountField] = {
-                currency: transaction[amountField]?.currency!,
-                issuer: transaction[amountField]?.issuer!,
+                currency: checkObject?.SendMax?.currency || transaction[amountField]?.currency || '',
+                issuer: checkObject?.SendMax?.issuer || transaction[amountField]?.issuer || '',
                 value: amount,
             };
         }
@@ -136,7 +142,7 @@ class CheckCashTemplate extends Component<Props, State> {
                         <View style={styles.contentBox}>
                             <AmountText
                                 value={checkObject.SendMax!.value}
-                                currency={checkObject.SendMax!.currency}
+                                currency={checkObject.SendMax?.currency}
                                 style={styles.amount}
                                 immutable
                             />
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CredentialAccept.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CredentialAccept.tsx
new file mode 100644
index 000000000..e5559d514
--- /dev/null
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CredentialAccept.tsx
@@ -0,0 +1,62 @@
+import React, { Component } from 'react';
+import { View, Text } from 'react-native';
+
+import { CredentialAccept } from '@common/libs/ledger/transactions';
+
+import { AccountElement } from '@components/Modules';
+
+import Localize from '@locale';
+
+import { AppStyles } from '@theme';
+import styles from '../styles';
+
+import { TemplateProps } from '../types';
+
+/* types ==================================================================== */
+export interface Props extends Omit<TemplateProps, 'transaction'> {
+    transaction: CredentialAccept;
+}
+
+export interface State {}
+
+/* Component ==================================================================== */
+class CredentialAcceptTemplate extends Component<Props, State> {
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {};
+    }
+
+    render() {
+        const { transaction } = this.props;
+
+        return (
+            <>
+                {transaction.Issuer && (
+                    <>
+                        <View style={styles.label}>
+                            <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorGrey]}>
+                                {Localize.t('global.issuer')}
+                            </Text>
+                        </View>
+                        <AccountElement
+                            address={transaction.Issuer}
+                            containerStyle={[styles.contentBox, styles.addressContainer]}
+                        />
+                    </>
+                )}
+
+                {transaction.CredentialType && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.credentialType')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>{transaction.CredentialType}</Text>
+                        </View>
+                    </>
+                )}
+            </>
+        );
+    }
+}
+
+export default CredentialAcceptTemplate;
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CredentialCreate.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CredentialCreate.tsx
new file mode 100644
index 000000000..94c17c7ce
--- /dev/null
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CredentialCreate.tsx
@@ -0,0 +1,85 @@
+import React, { Component } from 'react';
+import { View, Text } from 'react-native';
+
+import { CredentialCreate } from '@common/libs/ledger/transactions';
+
+import { ReadMore } from '@components/General';
+import { AccountElement } from '@components/Modules';
+
+import { FormatDate } from '@common/utils/date';
+
+import Localize from '@locale';
+
+import { AppStyles } from '@theme';
+import styles from '../styles';
+
+import { TemplateProps } from '../types';
+
+/* types ==================================================================== */
+export interface Props extends Omit<TemplateProps, 'transaction'> {
+    transaction: CredentialCreate;
+}
+
+export interface State {}
+
+/* Component ==================================================================== */
+class CredentialCreateTemplate extends Component<Props, State> {
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {};
+    }
+
+    render() {
+        const { transaction } = this.props;
+
+        return (
+            <>
+                {transaction.Subject && (
+                    <>
+                        <View style={styles.label}>
+                            <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorGrey]}>
+                                {Localize.t('global.subject')}
+                            </Text>
+                        </View>
+                        <AccountElement
+                            address={transaction.Subject}
+                            containerStyle={[styles.contentBox, styles.addressContainer]}
+                        />
+                    </>
+                )}
+
+                {transaction.CredentialType && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.credentialType')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>{transaction.CredentialType}</Text>
+                        </View>
+                    </>
+                )}
+
+                {transaction.URI && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.uri')}</Text>
+                        <View style={styles.contentBox}>
+                            <ReadMore numberOfLines={3} textStyle={styles.value}>
+                                {transaction.URI}
+                            </ReadMore>
+                        </View>
+                    </>
+                )}
+
+                {transaction.Expiration && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.expireAfter')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>{FormatDate(transaction.Expiration)}</Text>
+                        </View>
+                    </>
+                )}
+            </>
+        );
+    }
+}
+
+export default CredentialCreateTemplate;
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CredentialDelete.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CredentialDelete.tsx
new file mode 100644
index 000000000..43a387000
--- /dev/null
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CredentialDelete.tsx
@@ -0,0 +1,76 @@
+import React, { Component } from 'react';
+import { View, Text } from 'react-native';
+
+import { CredentialDelete } from '@common/libs/ledger/transactions';
+
+import { AccountElement } from '@components/Modules';
+
+import Localize from '@locale';
+
+import { AppStyles } from '@theme';
+import styles from '../styles';
+
+import { TemplateProps } from '../types';
+
+/* types ==================================================================== */
+export interface Props extends Omit<TemplateProps, 'transaction'> {
+    transaction: CredentialDelete;
+}
+
+export interface State {}
+
+/* Component ==================================================================== */
+class CredentialDeleteTemplate extends Component<Props, State> {
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {};
+    }
+
+    render() {
+        const { transaction } = this.props;
+
+        return (
+            <>
+                {transaction.Subject && (
+                    <>
+                        <View style={styles.label}>
+                            <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorGrey]}>
+                                {Localize.t('global.subject')}
+                            </Text>
+                        </View>
+                        <AccountElement
+                            address={transaction.Subject}
+                            containerStyle={[styles.contentBox, styles.addressContainer]}
+                        />
+                    </>
+                )}
+
+                {transaction.Issuer && (
+                    <>
+                        <View style={styles.label}>
+                            <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorGrey]}>
+                                {Localize.t('global.issuer')}
+                            </Text>
+                        </View>
+                        <AccountElement
+                            address={transaction.Issuer}
+                            containerStyle={[styles.contentBox, styles.addressContainer]}
+                        />
+                    </>
+                )}
+
+                {transaction.CredentialType && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.credentialType')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>{transaction.CredentialType}</Text>
+                        </View>
+                    </>
+                )}
+            </>
+        );
+    }
+}
+
+export default CredentialDeleteTemplate;
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/DepositPreauth.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/DepositPreauth.tsx
index 3dd8135a4..188649e8e 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/DepositPreauth.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/DepositPreauth.tsx
@@ -1,3 +1,5 @@
+import { isEmpty } from 'lodash';
+
 import React, { Component } from 'react';
 import { View, Text } from 'react-native';
 
@@ -26,6 +28,58 @@ class DepositPreauthTemplate extends Component<Props, State> {
         this.state = {};
     }
 
+    renderAuthorizeCredentials = () => {
+        const { transaction } = this.props;
+
+        if (isEmpty(transaction.AuthorizeCredentials)) {
+            return (
+                <View style={styles.contentBox}>
+                    <Text style={styles.value}>{Localize.t('global.empty')}</Text>
+                </View>
+            );
+        }
+
+        return transaction.AuthorizeCredentials.map((credential) => {
+            return (
+                <View key={credential.Issuer}>
+                    <AccountElement address={credential.Issuer} containerStyle={styles.attachedAccountElement} />
+                    <View style={styles.authorizeCredentialsContainer}>
+                        <Text style={[AppStyles.monoSubText, AppStyles.colorGrey]}>
+                            {Localize.t('global.credentialType')}:{' '}
+                            <Text style={AppStyles.colorBlue}>{credential.CredentialType}</Text>
+                        </Text>
+                    </View>
+                </View>
+            );
+        });
+    };
+
+    renderUnauthorizeCredentials = () => {
+        const { transaction } = this.props;
+
+        if (isEmpty(transaction.UnauthorizeCredentials)) {
+            return (
+                <View style={styles.contentBox}>
+                    <Text style={styles.value}>{Localize.t('global.empty')}</Text>
+                </View>
+            );
+        }
+
+        return transaction.UnauthorizeCredentials.map((credential) => {
+            return (
+                <View key={credential.Issuer}>
+                    <AccountElement address={credential.Issuer} containerStyle={styles.attachedAccountElement} />
+                    <View style={styles.authorizeCredentialsContainer}>
+                        <Text style={[AppStyles.monoSubText, AppStyles.colorGrey]}>
+                            {Localize.t('global.credentialType')}:{' '}
+                            <Text style={AppStyles.colorBlue}>{credential.CredentialType}</Text>
+                        </Text>
+                    </View>
+                </View>
+            );
+        });
+    };
+
     render() {
         const { transaction } = this.props;
 
@@ -60,6 +114,28 @@ class DepositPreauthTemplate extends Component<Props, State> {
                         />
                     </>
                 )}
+
+                {transaction.AuthorizeCredentials && (
+                    <>
+                        <View style={styles.label}>
+                            <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorGrey]}>
+                                {Localize.t('global.authorizeCredentials')}
+                            </Text>
+                        </View>
+                        {this.renderAuthorizeCredentials()}
+                    </>
+                )}
+
+                {transaction.UnauthorizeCredentials && (
+                    <>
+                        <View style={styles.label}>
+                            <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorGrey]}>
+                                {Localize.t('global.unauthorizeCredentials')}
+                            </Text>
+                        </View>
+                        {this.renderUnauthorizeCredentials()}
+                    </>
+                )}
             </>
         );
     }
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/Global.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/Global.tsx
index 6f4888719..1287d039c 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/Global.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/Global.tsx
@@ -12,17 +12,19 @@ import NetworkService from '@services/NetworkService';
 import { AccountRepository } from '@store/repositories';
 
 import { InfoMessage, ReadMore } from '@components/General';
-import { FeePicker, AccountElement } from '@components/Modules';
+import { FeePicker, ServiceFee, AccountElement, HooksExplainer } from '@components/Modules';
 
 import Localize from '@locale';
 
 import styles from '../styles';
 
 import { TemplateProps } from '../types';
+import { HookExplainerOrigin } from '@components/Modules/HooksExplainer/HooksExplainer';
 
 /* types ==================================================================== */
 export interface Props extends Omit<TemplateProps, 'transaction'> {
     transaction: Transactions;
+    setServiceFee: (serviceFee: number) => void;
 }
 export interface State {
     warnings?: Array<string>;
@@ -34,6 +36,8 @@ class GlobalTemplate extends Component<Props, State> {
     constructor(props: Props) {
         super(props);
 
+        // console.log('ReviewTx Global')
+
         this.state = {
             warnings: undefined,
             showFeePicker: typeof props.transaction.Fee === 'undefined' && !props.payload.isMultiSign(),
@@ -74,6 +78,16 @@ class GlobalTemplate extends Component<Props, State> {
         };
     };
 
+    setServiceFeeAmount = (fee: any) => {
+        const { setServiceFee } = this.props;
+        setServiceFee(Number(fee?.value || 0));
+    };
+
+    setFees = (txFee: any, serviceFee: any) => {
+        this.setTransactionFee(txFee);
+        this.setServiceFeeAmount(serviceFee);
+    };
+
     renderWarnings = () => {
         const { warnings } = this.state;
 
@@ -253,23 +267,64 @@ class GlobalTemplate extends Component<Props, State> {
         );
     };
 
+    renderHookExplainer = () => {
+        const { transaction, source } = this.props;
+
+        // check if hooks is enabled in the current network
+        const network = NetworkService.getNetwork();
+
+        // only show if Hooks amendment is active on the network
+        // hide for SetHook transactions as we show the explainer in the beginning of the screen on top, no duplicate!!!
+        if (network?.isFeatureEnabled('Hooks') && transaction.Type !== TransactionTypes.SetHook) {
+            return (
+                <>
+                    <Text style={styles.label}>{Localize.t('global.hooks')}</Text>
+                    <View style={styles.contentBox}>
+                        <HooksExplainer
+                            transaction={transaction}
+                            account={source}
+                            origin={HookExplainerOrigin.ReviewPayload}
+                        />
+                    </View>
+                </>
+            );
+        }
+
+        return null;
+    };
+
     renderFee = () => {
-        const { transaction } = this.props;
+        const { transaction, source, payload } = this.props;
         const { showFeePicker } = this.state;
 
         // we should not override the fee
         // either transaction fee has already been set in payload
         // or transaction is a multi sign tx
         if (!showFeePicker) {
+            // TODO: SET SERVICE FEE
+
             if (typeof transaction.Fee !== 'undefined') {
                 return (
                     <>
-                        <Text style={styles.label}>{Localize.t('global.fee')}</Text>
-                        <View style={styles.contentBox}>
-                            <Text style={styles.feeText}>
-                                {transaction.Fee.value} {NetworkService.getNativeAsset()}
-                            </Text>
-                        </View>
+                        <>
+                            <Text style={styles.label}>{Localize.t('global.fee')}</Text>
+                            <View style={styles.contentBox}>
+                                <Text style={styles.feeText}>
+                                    {transaction.Fee.value} {NetworkService.getNativeAsset()}
+                                </Text>
+                            </View>
+                        </>
+                        <>
+                            <Text style={styles.label}>{Localize.t('events.serviceFee')}</Text>
+                            <View style={styles.contentBox}>
+                                <ServiceFee
+                                    txJson={transaction.JsonForSigning}
+                                    textStyle={styles.feeText}
+                                    payload={payload}
+                                    onSelect={this.setServiceFeeAmount}
+                                />
+                            </View>
+                        </>
                     </>
                 );
             }
@@ -279,10 +334,12 @@ class GlobalTemplate extends Component<Props, State> {
 
         return (
             <>
-                <Text style={styles.label}>{Localize.t('global.fee')}</Text>
+                <Text style={styles.label}>{Localize.t('events.txServiceFees')}</Text>
                 <FeePicker
                     txJson={transaction.JsonForSigning}
-                    onSelect={this.setTransactionFee}
+                    onSelect={this.setFees}
+                    source={source}
+                    payload={payload}
                     containerStyle={styles.contentBox}
                     textStyle={styles.feeText}
                 />
@@ -303,6 +360,7 @@ class GlobalTemplate extends Component<Props, State> {
                 {this.renderFlags()}
                 {this.renderFee()}
                 {this.renderWarnings()}
+                {this.renderHookExplainer()}
             </>
         );
     }
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenAuthorize.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenAuthorize.tsx
new file mode 100644
index 000000000..4953270dc
--- /dev/null
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenAuthorize.tsx
@@ -0,0 +1,60 @@
+import { isUndefined } from 'lodash';
+import React, { Component } from 'react';
+import { View, Text } from 'react-native';
+
+import { MPTokenAuthorize } from '@common/libs/ledger/transactions';
+
+import { AccountElement } from '@components/Modules';
+
+import Localize from '@locale';
+
+import styles from '../styles';
+
+import { TemplateProps } from '../types';
+
+/* types ==================================================================== */
+export interface Props extends Omit<TemplateProps, 'transaction'> {
+    transaction: MPTokenAuthorize;
+}
+
+export interface State {}
+
+/* Component ==================================================================== */
+class MPTokenAuthorizeTemplate extends Component<Props, State> {
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {};
+    }
+
+    render() {
+        const { transaction } = this.props;
+
+        return (
+            <>
+                {!isUndefined(transaction.Holder) && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.holder')}</Text>
+                        <AccountElement
+                            address={transaction.Holder}
+                            containerStyle={[styles.contentBox, styles.addressContainer]}
+                        />
+                    </>
+                )}
+
+                {!isUndefined(transaction.MPTokenIssuanceID) && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.mpTokenIssuanceID')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>
+                                {transaction.MPTokenIssuanceID || Localize.t('global.empty')}
+                            </Text>
+                        </View>
+                    </>
+                )}
+            </>
+        );
+    }
+}
+
+export default MPTokenAuthorizeTemplate;
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenIssuanceCreate.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenIssuanceCreate.tsx
new file mode 100644
index 000000000..fe09cd1c7
--- /dev/null
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenIssuanceCreate.tsx
@@ -0,0 +1,80 @@
+import { isUndefined } from 'lodash';
+import React, { Component } from 'react';
+import { View, Text } from 'react-native';
+
+import { MPTokenIssuanceCreate } from '@common/libs/ledger/transactions';
+
+import { ReadMore } from '@components/General';
+
+import Localize from '@locale';
+
+import styles from '../styles';
+
+import { TemplateProps } from '../types';
+import { AppStyles } from '@theme';
+
+/* types ==================================================================== */
+export interface Props extends Omit<TemplateProps, 'transaction'> {
+    transaction: MPTokenIssuanceCreate;
+}
+
+export interface State {}
+
+/* Component ==================================================================== */
+class MPTokenIssuanceCreateTemplate extends Component<Props, State> {
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {};
+    }
+
+    render() {
+        const { transaction } = this.props;
+
+        return (
+            <>
+                {!isUndefined(transaction.AssetScale) && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.assetScale')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>{transaction.AssetScale ?? Localize.t('global.empty')}</Text>
+                        </View>
+                    </>
+                )}
+
+                {!isUndefined(transaction.MaximumAmount) && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.maximumAmount')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>{transaction.MaximumAmount || Localize.t('global.empty')}</Text>
+                        </View>
+                    </>
+                )}
+
+                {!isUndefined(transaction.TransferFee) && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.transferFee')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>{transaction.TransferFee}%</Text>
+                        </View>
+                    </>
+                )}
+
+                {!isUndefined(transaction.MPTokenMetadata) && (
+                    <>
+                        <View style={AppStyles.row}>
+                            <Text style={styles.label}>{Localize.t('global.mpTokenMetadata')}</Text>
+                        </View>
+                        <View style={styles.contentBox}>
+                            <ReadMore numberOfLines={3} textStyle={styles.value}>
+                                {transaction.MPTokenMetadata || Localize.t('global.empty')}
+                            </ReadMore>
+                        </View>
+                    </>
+                )}
+            </>
+        );
+    }
+}
+
+export default MPTokenIssuanceCreateTemplate;
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenIssuanceDestroy.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenIssuanceDestroy.tsx
new file mode 100644
index 000000000..f994bd774
--- /dev/null
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenIssuanceDestroy.tsx
@@ -0,0 +1,41 @@
+import React, { Component } from 'react';
+import { View, Text } from 'react-native';
+
+import { MPTokenIssuanceDestroy } from '@common/libs/ledger/transactions';
+
+import Localize from '@locale';
+
+import styles from '../styles';
+
+import { TemplateProps } from '../types';
+
+/* types ==================================================================== */
+export interface Props extends Omit<TemplateProps, 'transaction'> {
+    transaction: MPTokenIssuanceDestroy;
+}
+
+export interface State {}
+
+/* Component ==================================================================== */
+class MPTokenIssuanceDestroyTemplate extends Component<Props, State> {
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {};
+    }
+
+    render() {
+        const { transaction } = this.props;
+
+        return (
+            <>
+                <Text style={styles.label}>{Localize.t('global.mpTokenIssuanceID')}</Text>
+                <View style={styles.contentBox}>
+                    <Text style={styles.value}>{transaction.MPTokenIssuanceID || Localize.t('global.empty')}</Text>
+                </View>
+            </>
+        );
+    }
+}
+
+export default MPTokenIssuanceDestroyTemplate;
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenIssuanceSet.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenIssuanceSet.tsx
new file mode 100644
index 000000000..995e06ad4
--- /dev/null
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/MPTokenIssuanceSet.tsx
@@ -0,0 +1,60 @@
+import { isUndefined } from 'lodash';
+import React, { Component } from 'react';
+import { View, Text } from 'react-native';
+
+import { MPTokenIssuanceSet } from '@common/libs/ledger/transactions';
+
+import { AccountElement } from '@components/Modules';
+
+import Localize from '@locale';
+
+import styles from '../styles';
+
+import { TemplateProps } from '../types';
+
+/* types ==================================================================== */
+export interface Props extends Omit<TemplateProps, 'transaction'> {
+    transaction: MPTokenIssuanceSet;
+}
+
+export interface State {}
+
+/* Component ==================================================================== */
+class MPTokenIssuanceSetTemplate extends Component<Props, State> {
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {};
+    }
+
+    render() {
+        const { transaction } = this.props;
+
+        return (
+            <>
+                {!isUndefined(transaction.Holder) && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.holder')}</Text>
+                        <AccountElement
+                            address={transaction.Holder}
+                            containerStyle={[styles.contentBox, styles.addressContainer]}
+                        />
+                    </>
+                )}
+
+                {!isUndefined(transaction.MPTokenIssuanceID) && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.mpTokenIssuanceID')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>
+                                {transaction.MPTokenIssuanceID || Localize.t('global.empty')}
+                            </Text>
+                        </View>
+                    </>
+                )}
+            </>
+        );
+    }
+}
+
+export default MPTokenIssuanceSetTemplate;
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/NFTokenMint.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/NFTokenMint.tsx
index fd48f1c35..ef0862c40 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/NFTokenMint.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/NFTokenMint.tsx
@@ -5,14 +5,18 @@ import { View, Text } from 'react-native';
 
 import { NFTokenMint } from '@common/libs/ledger/transactions';
 
-import Localize from '@locale';
-
+import { AmountText } from '@components/General';
 import { AccountElement } from '@components/Modules';
 
+import { FormatDate } from '@common/utils/date';
+
+import Localize from '@locale';
+
 import { AppStyles } from '@theme';
 import styles from '../styles';
 
 import { TemplateProps } from '../types';
+
 /* types ==================================================================== */
 export interface Props extends Omit<TemplateProps, 'transaction'> {
     transaction: NFTokenMint;
@@ -33,6 +37,43 @@ class NFTokenMintTemplate extends Component<Props, State> {
 
         return (
             <>
+                {transaction.Destination && (
+                    <>
+                        <View style={styles.label}>
+                            <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorGrey]}>
+                                {Localize.t('global.destination')}
+                            </Text>
+                        </View>
+                        <AccountElement
+                            address={transaction.Destination}
+                            containerStyle={[styles.contentBox, styles.addressContainer]}
+                        />
+                    </>
+                )}
+
+                {transaction.Amount && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.amount')}</Text>
+                        <View style={styles.contentBox}>
+                            <AmountText
+                                value={transaction.Amount.value}
+                                currency={transaction.Amount.currency}
+                                style={styles.amount}
+                                immutable
+                            />
+                        </View>
+                    </>
+                )}
+
+                {transaction.Expiration && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.expireAfter')}</Text>
+                        <View style={styles.contentBox}>
+                            <Text style={styles.value}>{FormatDate(transaction.Expiration)}</Text>
+                        </View>
+                    </>
+                )}
+
                 {transaction.Issuer && (
                     <>
                         <View style={styles.label}>
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/Payment.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/Payment.tsx
index 99f852770..895f620af 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/Payment.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/Payment.tsx
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { View, Text, TouchableOpacity, InteractionManager } from 'react-native';
 
+import SummaryStepStyle from '@screens/Send/Steps/Summary/styles';
 import { BackendService, LedgerService, NetworkService, StyleService } from '@services';
 import { RatesType } from '@services/BackendService';
 
@@ -9,6 +10,10 @@ import { CoreRepository } from '@store/repositories';
 import { Payment } from '@common/libs/ledger/transactions';
 import { PathFindPathOption } from '@common/libs/ledger/types/methods';
 
+import { CalculateAvailableBalance } from '@common/utils/balance';
+
+import { TrustLineModel } from '@store/models';
+
 import { NormalizeCurrencyCode } from '@common/utils/monetary';
 
 import { AmountInput, AmountText, Button } from '@components/General';
@@ -46,11 +51,25 @@ export interface State {
 class PaymentTemplate extends Component<Props, State> {
     amountInput: React.RefObject<typeof AmountInput | null>;
 
+    private currentCurrency: TrustLineModel | undefined;
+
     constructor(props: Props) {
         super(props);
+        const { source } = this.props;
 
         const { transaction } = props;
 
+        if (transaction.Amount?.currency && transaction.Amount?.issuer) {
+            this.currentCurrency = (source?.lines || [])
+                .filter(l => {
+                    return l.currency.currencyCode === transaction.Amount?.currency &&
+                        l.currency.issuer === transaction.Amount?.issuer;
+                })?.[0];
+
+            // console.log(this.currentCurrency?.balance);
+            // console.log(this.currentCurrency?.getFormattedCurrency());
+        };
+
         this.state = {
             account: undefined,
             editableAmount: !transaction.Amount?.value,
@@ -204,7 +223,7 @@ class PaymentTemplate extends Component<Props, State> {
 
             // set the transaction path
             if (path.paths_computed.length === 0) {
-                transaction.Paths = undefined;
+                transaction.Paths = undefined!;
             } else {
                 transaction.Paths = path.paths_computed;
             }
@@ -214,7 +233,7 @@ class PaymentTemplate extends Component<Props, State> {
         } else {
             // clear any set value
             transaction.SendMax = undefined;
-            transaction.Paths = undefined;
+            transaction.Paths = undefined!;
 
             // user cannot continue
             setReady(false);
@@ -233,6 +252,7 @@ class PaymentTemplate extends Component<Props, State> {
         }
     };
 
+
     renderAmountRate = () => {
         const { amount, isLoadingRate, currencyRate } = this.state;
 
@@ -251,7 +271,7 @@ class PaymentTemplate extends Component<Props, State> {
                 return (
                     <View style={styles.rateContainer}>
                         <Text style={styles.rateText}>
-                            ~{currencyRate.code} {Localize.formatNumber(rate)}
+                            ~{currencyRate.code} {Localize.formatNumber(rate, 2)}
                         </Text>
                     </View>
                 );
@@ -262,7 +282,7 @@ class PaymentTemplate extends Component<Props, State> {
     };
 
     render() {
-        const { transaction, payload } = this.props;
+        const { transaction, payload, source } = this.props;
         const {
             account,
             editableAmount,
@@ -272,8 +292,11 @@ class PaymentTemplate extends Component<Props, State> {
             isLoadingIssuerFee,
             issuerFee,
             selectedPath,
+            currencyRate,
         } = this.state;
 
+        const isNativeAsset = currencyRate && amount;
+
         // TODO: better handling this part
         if (!account) {
             return null;
@@ -319,22 +342,62 @@ class PaymentTemplate extends Component<Props, State> {
                                     <Button
                                         onPress={this.onAmountEditPress}
                                         style={styles.editButton}
-                                        roundedSmall
+                                        roundedMini
                                         icon="IconEdit"
                                         iconSize={13}
                                         light
                                     />
                                 </>
                             ) : (
-                                <AmountText
-                                    value={amount!}
-                                    currency={transaction.Amount?.currency}
-                                    style={styles.amountInput}
-                                    immutable
-                                />
+                                <View>
+                                    <AmountText
+                                        value={amount!}
+                                        currency={transaction.Amount?.currency}
+                                        style={styles.amountInput}
+                                        immutable
+                                    />
+                                </View>
                             )}
                         </TouchableOpacity>
-                        {this.renderAmountRate()}
+                        {/* <!-- 
+                            Todo: native shows equivalent = right
+                            non native = show below
+                        --> */}
+                        <View style={[
+                            !isNativeAsset
+                                ? AppStyles.column
+                                : AppStyles.row,
+                            AppStyles.stretchSelf,
+                        ]}>
+                            <View style={[AppStyles.flex1, AppStyles.flexStart]}>{this.renderAmountRate()}</View>
+                            <View style={[AppStyles.flex2, AppStyles.flexEnd]}>
+                                <Text style={[
+                                    !isNativeAsset
+                                        ? AppStyles.textLeftAligned
+                                        : AppStyles.textRightAligned,
+                                    SummaryStepStyle.currencyBalance,
+                                ]}>
+                                    {Localize.t('global.available')}{': '}
+                                    {
+                                        !isNativeAsset
+                                            ? <AmountText
+                                                value={
+                                                    Math.floor(
+                                                        Number(this.currentCurrency?.balance || 0) * 100_000_000,
+                                                    ) / 100_000_000
+                                                }
+                                                style={[AppStyles.monoBold]}
+                                                currency={this.currentCurrency?.getFormattedCurrency()}
+                                                immutable
+                                            />    
+                                            : <Text style={[AppStyles.monoBold]}>
+                                                {Localize.formatNumber(CalculateAvailableBalance(source!))}{' '}
+                                                {NetworkService.getNativeAsset()}
+                                            </Text>
+                                    }
+                                </Text>
+                            </View>
+                        </View>
                     </View>
                 </>
 
@@ -384,6 +447,19 @@ class PaymentTemplate extends Component<Props, State> {
                     </>
                 )}
 
+                {transaction.CredentialIDs && (
+                    <>
+                        <Text style={styles.label}>{Localize.t('global.credentialIDs')}</Text>
+                        <View style={styles.contentBox}>
+                            {transaction.CredentialIDs.map((id, index) => (
+                                <Text key={`credential-${index}`} style={styles.value}>
+                                    {id}
+                                </Text>
+                            ))}
+                        </View>
+                    </>
+                )}
+
                 {payload.isPathFinding() && (
                     <>
                         <Text style={styles.label}>{Localize.t('global.payWith')}</Text>
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/SetHook.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/SetHook.tsx
index 6551c7750..8d39783dc 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/SetHook.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/SetHook.tsx
@@ -1,12 +1,12 @@
 import React, { Component } from 'react';
-import { View, Text } from 'react-native';
+import { Text, View } from 'react-native';
 
 import { Payload } from '@common/libs/payload';
 import { SetHook } from '@common/libs/ledger/transactions';
 
 import { AccountModel } from '@store/models';
 
-import { HooksExplainer } from '@components/Modules';
+import HooksExplainer, { HookExplainerOrigin } from '@components/Modules/HooksExplainer/HooksExplainer';
 
 import Localize from '@locale';
 
@@ -55,7 +55,12 @@ class SetHookTemplate extends Component<Props, State> {
                     </Text>
                 </View>
                 <View style={styles.contentBox}>
-                    <HooksExplainer account={source} payload={payload} transaction={transaction} />
+                    <HooksExplainer
+                        account={source}
+                        payload={payload}
+                        transaction={transaction}
+                        origin={HookExplainerOrigin.ReviewPayload}
+                    />
                 </View>
             </>
         );
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/index.ts b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/index.ts
index b6b23cb07..aba3d2441 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/index.ts
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/index.ts
@@ -44,6 +44,13 @@ import DIDSet from './DIDSet';
 import DIDDelete from './DIDDelete';
 import OracleSet from './OracleSet';
 import OracleDelete from './OracleDelete';
+import MPTokenIssuanceCreate from './MPTokenIssuanceCreate';
+import MPTokenIssuanceSet from './MPTokenIssuanceSet';
+import MPTokenIssuanceDestroy from './MPTokenIssuanceDestroy';
+import MPTokenAuthorize from './MPTokenAuthorize';
+import CredentialCreate from './CredentialCreate';
+import CredentialAccept from './CredentialAccept';
+import CredentialDelete from './CredentialDelete';
 
 export {
     Global,
@@ -92,4 +99,11 @@ export {
     DIDDelete,
     OracleSet,
     OracleDelete,
+    MPTokenIssuanceCreate,
+    MPTokenIssuanceSet,
+    MPTokenIssuanceDestroy,
+    MPTokenAuthorize,
+    CredentialCreate,
+    CredentialAccept,
+    CredentialDelete,
 };
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/styles.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/styles.tsx
index 4f2013890..d4c0041ac 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/styles.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/styles.tsx
@@ -26,7 +26,7 @@ const styles = StyleService.create({
         borderRadius: 15,
         zIndex: 2,
         paddingHorizontal: 5,
-        paddingVertical: 10,
+        paddingVertical: 0,
         marginBottom: AppSizes.paddingSml,
     },
     signersContainer: {
@@ -148,6 +148,21 @@ const styles = StyleService.create({
         borderBottomRightRadius: 12,
         borderTopColor: '$lightGrey',
     },
+    authorizeCredentialsContainer: {
+        paddingVertical: 10,
+        paddingHorizontal: 8,
+        marginBottom: 10,
+        backgroundColor: '$tint',
+        borderWidth: 2,
+        borderColor: '$tint',
+        borderBottomLeftRadius: 12,
+        borderBottomRightRadius: 12,
+        borderTopColor: '$lightGrey',
+    },
+    attachedAccountElement: {
+        borderBottomLeftRadius: 0,
+        borderBottomRightRadius: 0,
+    },
     hookParamText: {
         backgroundColor: '$tint',
         borderRadius: 10,
diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/styles.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/styles.tsx
index 406379640..8bdc8001d 100644
--- a/src/screens/Modal/ReviewTransaction/Steps/Review/styles.tsx
+++ b/src/screens/Modal/ReviewTransaction/Steps/Review/styles.tsx
@@ -3,12 +3,16 @@ import StyleService from '@services/StyleService';
 import { AppSizes } from '@theme';
 
 import { HasBottomNotch } from '@common/helpers/device';
+
 /* Styles ==================================================================== */
 const styles = StyleService.create({
     container: {
         flex: 1,
         backgroundColor: '$lightGrey',
     },
+    accountPickerPadding: {
+        paddingHorizontal: 5,
+    },
     transactionContent: {
         flex: 1,
         backgroundColor: '$background',
@@ -16,9 +20,19 @@ const styles = StyleService.create({
         borderTopLeftRadius: 30,
         paddingVertical: AppSizes.padding,
     },
+    shadow: {
+        shadowColor: '$contrast',
+        shadowOffset: {
+            height: 0,
+            width: 0,
+        },
+        shadowOpacity: 0.15,
+        shadowRadius: 10,
+    },
     xamanAppBackground: {
-        resizeMode: 'cover',
-        opacity: 0.03,
+        // resizeMode: 'cover',
+        // opacity: 0.65,
+        top: '-20%',
     },
     detailsContainer: {
         paddingHorizontal: AppSizes.paddingSml,
diff --git a/src/screens/Modal/ReviewTransaction/types.ts b/src/screens/Modal/ReviewTransaction/types.ts
index 524ac0622..92b6ab15c 100644
--- a/src/screens/Modal/ReviewTransaction/types.ts
+++ b/src/screens/Modal/ReviewTransaction/types.ts
@@ -15,6 +15,7 @@ export enum Steps {
 
 export interface Props<T = CombinedTransactions> {
     payload: Payload;
+    timestamp?: number;
     onResolve?: (transaction: T & SignMixinType & MutationsMixinType, payload: Payload) => void;
     onDecline?: (payload: Payload) => void;
     onClose?: () => void;
@@ -29,6 +30,7 @@ export interface State {
     source?: AccountModel;
     submitResult?: SubmitResultType;
     hasError: boolean;
+    serviceFee?: number;
     errorMessage?: string;
     isLoading: boolean;
     isReady: boolean;
@@ -36,11 +38,13 @@ export interface State {
 }
 
 export interface ContextProps extends State {
+    timestamp?: number;
     setTransaction: (tx: SignableMutatedTransaction) => void;
     setAccounts: (accounts: AccountModel[]) => void;
     setSource: (source: AccountModel) => void;
     setLoading: (loading: boolean) => void;
     setReady: (ready: boolean) => void;
+    setServiceFee: (serviceFee: number) => void;
     setError: (error: Error) => void;
     onPreflightPass: () => void;
     onClose: () => void;
diff --git a/src/screens/Modal/Scan/ScanModal.tsx b/src/screens/Modal/Scan/ScanModal.tsx
index 78d2b1a3e..f37052766 100644
--- a/src/screens/Modal/Scan/ScanModal.tsx
+++ b/src/screens/Modal/Scan/ScanModal.tsx
@@ -2,8 +2,6 @@
  * Scan Modal
  */
 
-import { first } from 'lodash';
-
 import React, { Component } from 'react';
 import { View, Platform, ImageBackground, Text, Linking, BackHandler, NativeEventSubscription } from 'react-native';
 
@@ -546,14 +544,16 @@ class ScanModal extends Component<Props, State> {
     };
 
     onGoogleVisionBarcodesDetected = ({ barcodes }: GoogleVisionBarcodesDetectedEvent) => {
+        // should ba array and not empty
         if (!Array.isArray(barcodes) || barcodes.length === 0) {
             return;
         }
         // get first barcode that exist
-        const { data } = first(barcodes)!;
+        const barcode = barcodes[0];
 
-        if (data) {
-            this.onReadCode(data);
+        // type check
+        if (typeof barcode === 'object' && barcode?.data) {
+            this.onReadCode(barcode?.data);
         }
     };
 
@@ -620,7 +620,10 @@ class ScanModal extends Component<Props, State> {
     renderNotAuthorizedView = () => {
         return (
             <ImageBackground
-                source={StyleService.getImage('BackgroundShapes')}
+                resizeMode="cover"
+                source={
+                    StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')
+                }
                 style={[AppStyles.container, AppStyles.paddingSml]}
             >
                 <View style={[AppStyles.flex1, AppStyles.centerContent]}>
@@ -635,13 +638,21 @@ class ScanModal extends Component<Props, State> {
                         {Localize.t('global.pleaseApproveCameraPermission')}
                     </Text>
                     <Spacer size={50} />
+                    <Button
+                        secondary
+                        label={Localize.t('global.close')}
+                        onPress={this.onClose}
+                        style={{ backgroundColor: AppColors.silver }}
+                        icon="IconX"
+                    />
+                    <Spacer size={15} />
                     <Button
                         style={{ backgroundColor: AppColors.green }}
                         label={Localize.t('global.approvePermissions')}
+                        // nonBlock
                         onPress={this.requestPermissions}
+                        icon="IconCheck"
                     />
-                    <Spacer size={20} />
-                    <Button light label={Localize.t('global.close')} onPress={this.onClose} />
                 </View>
             </ImageBackground>
         );
@@ -660,15 +671,17 @@ class ScanModal extends Component<Props, State> {
                 });
                 break;
             default:
-                description = Localize.t('scan.aimAtTheCode');
+                description = '';
                 break;
         }
 
         if (isLoading) {
             return (
                 <ImageBackground
-                    source={StyleService.getImage('BackgroundShapes')}
-                    imageStyle={AppStyles.BackgroundShapes}
+                    resizeMode="cover"
+                    source={
+                        StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')
+                    }
                     style={[AppStyles.container, AppStyles.paddingSml]}
                 >
                     <View style={[AppStyles.flex1, AppStyles.centerContent]}>
@@ -708,28 +721,39 @@ class ScanModal extends Component<Props, State> {
                         <View style={styles.bottomLeft} />
                         <View style={styles.bottomRight} />
                     </View>
-                    <View style={[AppStyles.centerSelf, styles.tip]}>
-                        <Text numberOfLines={1} style={[AppStyles.p, AppStyles.colorWhite]}>
-                            {description}
-                        </Text>
-                    </View>
+                    {
+                        description && description !== '' && (
+                            <View style={[AppStyles.centerSelf, styles.tip]}>
+                                <Text numberOfLines={1} style={[AppStyles.p, AppStyles.colorWhite]}>
+                                    {description}
+                                </Text>
+                            </View>
+                        )
+                    }
+                    <Spacer size={20} />
                     <View style={AppStyles.centerSelf}>
                         <Button
                             numberOfLines={1}
                             onPress={this.checkClipboardContent}
                             label={Localize.t('scan.importFromClipboard')}
-                            icon="IconClipboard"
+                            // icon="IconClipboard"
                             secondary
-                            roundedSmall
+                            roundedMini
+                            style={[
+                                AppStyles.paddingHorizontal,
+                            ]}
                         />
-                        <Spacer size={20} />
+                        <Spacer size={15} />
                         <Button
                             numberOfLines={1}
                             activeOpacity={0.9}
                             label={Localize.t('global.close')}
-                            rounded
                             onPress={this.onClose}
-                            style={styles.close}
+                            icon="IconX"
+                            style={[
+                                styles.close,
+                                AppStyles.paddingHorizontal,
+                            ]}
                         />
                     </View>
                 </RNCamera>
diff --git a/src/screens/Modal/TransactionLoader/TransactionLoaderModal.tsx b/src/screens/Modal/TransactionLoader/TransactionLoaderModal.tsx
index 73eedd8e6..14aeaa6dd 100644
--- a/src/screens/Modal/TransactionLoader/TransactionLoaderModal.tsx
+++ b/src/screens/Modal/TransactionLoader/TransactionLoaderModal.tsx
@@ -285,8 +285,10 @@ class TransactionLoaderModal extends Component<Props, State> {
 
         return (
             <ImageBackground
-                source={StyleService.getImage('BackgroundShapes')}
-                imageStyle={styles.backgroundShapes}
+                resizeMode="cover"
+                source={
+                    StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')
+                }
                 style={styles.container}
             >
                 <View style={styles.contentContainer}>{this.renderContent()}</View>
diff --git a/src/screens/Modal/XAppBrowser/XAppBrowserModal.tsx b/src/screens/Modal/XAppBrowser/XAppBrowserModal.tsx
index d4965fa64..46c5217aa 100644
--- a/src/screens/Modal/XAppBrowser/XAppBrowserModal.tsx
+++ b/src/screens/Modal/XAppBrowser/XAppBrowserModal.tsx
@@ -17,6 +17,9 @@ import {
     Text,
     View,
 } from 'react-native';
+
+import { NetworkLabel } from '@components/Modules/NetworkLabel';
+
 import VeriffSdk from '@veriff/react-native-sdk';
 import { StringType } from 'xumm-string-decode';
 import { utils as AccountLibUtils } from 'xrpl-accountlib';
@@ -40,6 +43,7 @@ import NetworkService from '@services/NetworkService';
 
 import { AccountRepository, CoreRepository, NetworkRepository, ProfileRepository } from '@store/repositories';
 import { AccountModel, NetworkModel } from '@store/models';
+// import { AccessLevels, Themes } from '@store/types';
 import { AccessLevels } from '@store/types';
 
 import { BackendService, NavigationService, PushNotificationsService, StyleService } from '@services';
@@ -55,6 +59,7 @@ import {
     RaisedButton,
     Spacer,
     WebView,
+    Header,
 } from '@components/General';
 import { XAppBrowserHeader } from '@components/Modules';
 
@@ -68,6 +73,8 @@ import { DestinationPickerModalProps } from '@screens/Modal/DestinationPicker';
 import { ReviewTransactionModalProps } from '@screens/Modal/ReviewTransaction';
 import { PurchaseProductModalProps } from '@screens/Modal/PurchaseProduct';
 
+import LoggerService from '@services/LoggerService';
+
 import { AppColors, AppStyles } from '@theme';
 import styles from './styles';
 
@@ -101,6 +108,7 @@ class XAppBrowserModal extends Component<Props, State> {
                 icon: props.icon,
                 identifier: props.identifier,
                 supportUrl: undefined,
+                appid: undefined,
                 permissions: undefined,
                 networks: undefined,
                 __ott: undefined,
@@ -119,6 +127,7 @@ class XAppBrowserModal extends Component<Props, State> {
 
         this.webView = React.createRef();
 
+        // last message received from webview, preventing spamming
         this.lastMessageReceived = 0;
     }
 
@@ -127,7 +136,7 @@ class XAppBrowserModal extends Component<Props, State> {
         this.backHandler = BackHandler.addEventListener('hardwareBackPress', () => true);
 
         // fetch OTT on browser start
-        InteractionManager.runAfterInteractions(this.lunchApp);
+        InteractionManager.runAfterInteractions(this.launchApp);
 
         // listen for authentication lock state changes
         AuthenticationService.on('lockStateChange', this.onLockStateChange);
@@ -237,6 +246,13 @@ class XAppBrowserModal extends Component<Props, State> {
         });
     };
 
+    onInAppPurchaseResolve = (successPurchase: boolean) => {
+        this.sendEvent({
+            method: XAppMethods.RequestInAppPurchase,
+            successPurchase,
+        });
+    };
+
     showScanner = () => {
         Navigator.showModal<ScanModalProps>(
             AppScreens.Modal.Scan,
@@ -291,6 +307,20 @@ class XAppBrowserModal extends Component<Props, State> {
         }
     };
 
+    requestInAppPurchase = async ({
+        productId,
+        productDescription,
+    }: {
+        productId: string;
+        productDescription: string;
+    }) => {
+        Navigator.showModal<PurchaseProductModalProps>(AppScreens.Modal.PurchaseProduct, {
+            productId,
+            productDescription,
+            onClose: this.onInAppPurchaseResolve,
+        });
+    };
+
     navigateTo = (data: { xApp: string; title?: string; [key: string]: any }) => {
         const identifier = get(data, 'xApp', undefined);
         const title = get(data, 'title', undefined);
@@ -325,11 +355,35 @@ class XAppBrowserModal extends Component<Props, State> {
                 isRequiredNetworkSwitch: false,
             },
             () => {
-                this.lunchApp(data);
+                this.launchApp(data);
             },
         );
     };
 
+    getLogs = () => {
+        Navigator.showAlertModal({
+            type: 'warning',
+            title: Localize.t('global.notice'),
+            text: Localize.t('global.xAppWantsToSendSessionLogs'),
+            buttons: [
+                {
+                    text: Localize.t('global.cancel'),
+                    onPress: () => {},
+                    type: 'dismiss',
+                    light: true,
+                },
+                {
+                    text: Localize.t('global.continue'),
+                    onPress: () => {
+                        const result = LoggerService.getLogs();
+                        this.sendEvent({ method: XAppMethods.GetLogs, result });                
+                    },
+                    light: false,
+                },
+            ],
+        });
+    };
+
     openBrowserLink = (data: { url: string }, launchDirectly: boolean) => {
         const { app } = this.state;
 
@@ -445,9 +499,10 @@ class XAppBrowserModal extends Component<Props, State> {
         const { commands: AllowedCommands, special: SpecialPermissions } = app.permissions;
 
         // xApp doesn't have the permission to run this command
+        // ignore ready command
         if (!AllowedCommands.includes(command.toUpperCase())) {
             // show alert about command
-            if (coreSettings.developerMode) {
+            if (coreSettings.developerMode && command !== XAppMethods.Ready) {
                 Alert.alert(
                     Localize.t('global.error'),
                     Localize.t('xapp.xAppDoesNotHavePermissionToRunThisCommand', { command }),
@@ -485,6 +540,9 @@ class XAppBrowserModal extends Component<Props, State> {
             case XAppMethods.Close:
                 this.onClose(parsedData);
                 break;
+            case XAppMethods.GetLogs:
+                this.getLogs();
+                break;
             case XAppMethods.OpenBrowser:
                 this.openBrowserLink(
                     parsedData,
@@ -500,6 +558,9 @@ class XAppBrowserModal extends Component<Props, State> {
             case XAppMethods.Ready:
                 this.setAppReady();
                 break;
+            case XAppMethods.RequestInAppPurchase:
+                this.requestInAppPurchase(parsedData);
+                break;
             default:
                 break;
         }
@@ -544,13 +605,29 @@ class XAppBrowserModal extends Component<Props, State> {
         }
     };
 
-    lunchApp = async (xAppNavigateData?: any) => {
+    getAppStyle = () => {
+        return StyleService.getCurrentTheme();
+        // const {coreSettings} = this.state;
+
+        // const style: Themes = 
+        //     !coreSettings.themeAutoSwitch                     // If not auto switching
+        //         ? coreSettings.theme                          //   then return as is (from settings)
+        //         : StyleService.getCurrentTheme() === 'light'  //   else, if the current theme is light
+        //         ? 'light'                                     //   it's easy, then return light
+        //         : coreSettings.theme !== 'light'              //   else, settings, because we're in dark - but only
+        //         ? coreSettings.theme                          //   if the setting is not light (darkish)
+        //         : 'dark';                                     //   otherwise assume default dark
+
+        // return style;
+    };
+
+    launchApp = async (xAppNavigateData?: any) => {
         const { origin, originData, params } = this.props;
         const { app, appVersionCode, account, network, coreSettings, isLaunchingApp } = this.state;
 
         // double check
         if (!app) {
-            throw new Error('lunchApp, app is required!');
+            throw new Error('launchApp, app is required!');
         }
 
         try {
@@ -593,7 +670,7 @@ class XAppBrowserModal extends Component<Props, State> {
                 version: appVersionCode,
                 locale: Localize.getCurrentLocale(),
                 currency: coreSettings.currency,
-                style: coreSettings.theme,
+                style: this.getAppStyle(),
                 nodetype: network.key,
                 nodewss: network.defaultNode.endpoint,
             };
@@ -638,7 +715,7 @@ class XAppBrowserModal extends Component<Props, State> {
             }
 
             const response = await BackendService.getXAppLaunchToken(app.identifier, data);
-            const { error, ott, xappTitle, xappSupportUrl, icon, permissions } = response;
+            const { error, ott, xappTitle, xappSupportUrl, icon, permissions, appid } = response;
 
             // an error reported from backend
             if (error) {
@@ -656,6 +733,7 @@ class XAppBrowserModal extends Component<Props, State> {
                 app: {
                     identifier: app.identifier,
                     title: xappTitle || app?.title,
+                    appid: appid || app?.appid,
                     supportUrl: xappSupportUrl,
                     icon,
                     permissions,
@@ -680,7 +758,7 @@ class XAppBrowserModal extends Component<Props, State> {
             {
                 account,
             },
-            this.lunchApp,
+            this.launchApp,
         );
     };
 
@@ -710,7 +788,7 @@ class XAppBrowserModal extends Component<Props, State> {
                     // send the network switch event
                     this.onNetworkSwitch(network);
                 } else {
-                    InteractionManager.runAfterInteractions(this.lunchApp);
+                    InteractionManager.runAfterInteractions(this.launchApp);
                 }
             }
         });
@@ -725,7 +803,7 @@ class XAppBrowserModal extends Component<Props, State> {
      * @property {string} headers.X-OTT - The X-OTT header for authentication.
      */
     getSource = (): { uri: string; headers?: any } => {
-        const { app, ott, coreSettings } = this.state;
+        const { app, ott } = this.state;
 
         // app is not initiated?
         if (!app) {
@@ -733,8 +811,8 @@ class XAppBrowserModal extends Component<Props, State> {
         }
 
         return {
-            uri: `https://${HOSTNAME}/detect/xapp:${app.identifier}?xAppToken=${ott}&xAppStyle=${toUpper(
-                coreSettings.theme,
+            uri: `https://${HOSTNAME}/detect/xapp:${app?.appid || app.identifier}?xAppToken=${ott}&xAppStyle=${toUpper(
+                this.getAppStyle(),
             )}`,
             headers: {
                 'X-OTT': ott,
@@ -845,7 +923,11 @@ class XAppBrowserModal extends Component<Props, State> {
         Navigator.showModal<PurchaseProductModalProps>(AppScreens.Modal.PurchaseProduct, {
             productId: monetization.productForPurchase!,
             productDescription: monetization.monetizationType!,
-            onSuccessPurchase: this.lunchApp,
+            onClose: (successPayment: boolean) => {
+                if (successPayment) {
+                    this.launchApp();
+                }
+            },
         });
     };
 
@@ -961,7 +1043,7 @@ class XAppBrowserModal extends Component<Props, State> {
                     roundedSmall
                     icon="IconRefresh"
                     iconSize={14}
-                    onPress={this.lunchApp}
+                    onPress={this.launchApp}
                     label={Localize.t('global.tryAgain')}
                 />
             </View>
@@ -1122,12 +1204,42 @@ class XAppBrowserModal extends Component<Props, State> {
 
     renderHeader = () => {
         const { app, network, account } = this.state;
+        const { noSwitching, altHeader } = this.props;
+
+        if (altHeader) {
+            return (
+                <Header
+                    leftComponent={{
+                        icon: altHeader?.left?.icon,
+                        iconSize: altHeader?.left?.iconSize,
+                        onPress: () => {
+                            const fn = this?.[(altHeader?.left?.onPress || '_') as keyof this];
+                            if (typeof fn === 'function') fn(altHeader?.left?.onPressOptions);
+                        },
+                    }}
+                    centerComponent={{
+                        text: altHeader?.center?.text,
+                        extraComponent: altHeader?.center?.showNetworkLabel && <NetworkLabel type="both" />,
+                    }}
+                    rightComponent={ String(app?.identifier || '') === 'xaman.swap' ? {
+                        icon: altHeader?.right?.icon,
+                        iconSize: altHeader?.right?.iconSize,
+                        onPress: () => {
+                            const fn = this?.[(altHeader?.right?.onPress || '_') as keyof this];
+                            if (typeof fn === 'function') fn(altHeader?.right?.onPressOptions);
+                        },
+
+                    } : undefined }
+                />
+            );
+        }
 
         return (
             <XAppBrowserHeader
                 identifier={app?.identifier}
                 title={app?.title}
                 icon={app?.icon}
+                noSwitching={!!noSwitching}
                 account={account}
                 network={network}
                 onAccountChange={this.onAccountChange}
diff --git a/src/screens/Modal/XAppBrowser/types.ts b/src/screens/Modal/XAppBrowser/types.ts
index 7a4c81116..aa45d8b5e 100644
--- a/src/screens/Modal/XAppBrowser/types.ts
+++ b/src/screens/Modal/XAppBrowser/types.ts
@@ -2,6 +2,8 @@ import { AccountModel, CoreModel, NetworkModel } from '@store/models';
 import { XAppOrigin } from '@common/libs/payload';
 import { Destination } from '@common/libs/ledger/parser/types';
 import { AccountAdvisoryResolveType } from '@services/ResolverService';
+import { Images } from '@common/helpers/images';
+// import { type ChildrenProps } from '@components/General/Header/Header';
 
 export interface Props {
     identifier: string;
@@ -11,6 +13,29 @@ export interface Props {
     account?: AccountModel;
     origin?: XAppOrigin;
     originData?: any;
+    noSwitching?: boolean;
+    altHeader?: {
+        left?: {
+            icon?: Extract<keyof typeof Images, string>;
+            iconSize?: number;
+            onPress?: string;
+            onPressOptions?: {
+                [key: string]: any;
+            };
+        };
+        center?: {
+            text?: string;
+            showNetworkLabel?: boolean;
+        };
+        right?: {
+            icon?: Extract<keyof typeof Images, string>;
+            iconSize?: number;
+            onPress?: string;
+            onPressOptions?: {
+                [key: string]: any;
+            };
+        };
+    };
 }
 
 export interface State {
@@ -19,6 +44,7 @@ export interface State {
         title?: string;
         icon?: string;
         identifier: string;
+        appid?: string;
         supportUrl?: string;
         permissions?: {
             special: string[];
@@ -45,6 +71,7 @@ export enum XAppMethods {
     PayloadResolved = 'payloadResolved',
     XAppNavigate = 'xAppNavigate',
     OpenBrowser = 'openBrowser',
+    GetLogs = 'getLogs',
     TxDetails = 'txDetails',
     KycVeriff = 'kycVeriff',
     ScanQr = 'scanQr',
@@ -52,6 +79,7 @@ export enum XAppMethods {
     Close = 'close',
     Ready = 'ready',
     NetworkSwitch = 'networkSwitch',
+    RequestInAppPurchase = 'requestInAppPurchase',
 }
 
 export enum XAppSpecialPermissions {
@@ -68,4 +96,5 @@ export interface IEvent {
     info?: AccountAdvisoryResolveType;
     result?: any;
     network?: string;
+    successPurchase?: boolean;
 }
diff --git a/src/screens/Onboarding/OnboardingView.tsx b/src/screens/Onboarding/OnboardingView.tsx
index 04d429aea..f529a5fd6 100644
--- a/src/screens/Onboarding/OnboardingView.tsx
+++ b/src/screens/Onboarding/OnboardingView.tsx
@@ -9,8 +9,7 @@ import StyleService from '@services/StyleService';
 
 import { Navigator } from '@common/helpers/navigator';
 import { AppScreens } from '@common/constants';
-
-import { Slider, Slide, Spacer } from '@components/General';
+import { Footer, Button } from '@components/General';
 
 import Localize from '@locale';
 
@@ -21,7 +20,6 @@ import styles from './styles';
 
 /* types ==================================================================== */
 export interface Props {}
-
 export interface State {}
 
 /* Component ==================================================================== */
@@ -29,11 +27,7 @@ class OnboardingView extends Component<Props, State> {
     static screenName = AppScreens.Onboarding;
 
     static options() {
-        return {
-            topBar: {
-                visible: false,
-            },
-        };
+        return { topBar: { visible: false } };
     }
 
     onFinish = () => {
@@ -44,68 +38,62 @@ class OnboardingView extends Component<Props, State> {
         return (
             <ImageBackground
                 testID="onboarding-screen"
-                source={StyleService.getImage('BackgroundPattern')}
-                style={styles.container}
+                resizeMode="cover"
+                source={StyleService.getImageIfLightModeIfDarkMode('BackgroundPatternLight', 'BackgroundPattern')}
+                style={styles.backgroundImageStyle}
                 imageStyle={styles.backgroundImageStyle}
             >
-                <SafeAreaView style={[AppStyles.flex1, AppStyles.centerAligned, AppStyles.padding]}>
-                    <Image style={styles.logo} source={StyleService.getImage('XamanLogo')} />
+                <SafeAreaView style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.padding]}>
+                    <Image
+                        style={styles.logo}
+                        source={StyleService.getImageIfLightModeIfDarkMode('XamanLogo', 'XamanLogoLight')}
+                    />
+                    <View style={[AppStyles.flex1, AppStyles.centerAligned, AppStyles.paddingHorizontal]}>
+                        <Text style={[
+                            AppStyles.h4,
+                            AppStyles.textCenterAligned,
+                            AppStyles.strong,
+                            AppStyles.marginHorizontal,
+                            AppStyles.marginBottomSml,
+                        ]}>
+                            {Localize.t('onboarding.v2main1')}
+                        </Text>
+                        <Text style={[
+                            AppStyles.p,
+                            AppStyles.textCenterAligned,
+                            AppStyles.marginHorizontal,
+                            AppStyles.marginTopNegativeSml,
+                            AppStyles.colorSilver,
+                        ]}>
+                            {Localize.t('onboarding.v2main2')}
+                        </Text>
+                    </View>
                 </SafeAreaView>
-                <SafeAreaView style={AppStyles.flex8}>
-                    <Slider onFinish={this.onFinish} scrollAutomatically>
-                        <Slide>
-                            <View style={[AppStyles.flex1, AppStyles.centerContent]}>
-                                <Text style={[AppStyles.h4, AppStyles.strong]}>
-                                    {Localize.t('onboarding.slideOne_title')}
-                                </Text>
-                            </View>
-                        </Slide>
-                        <Slide>
-                            <View style={[AppStyles.flex1, AppStyles.centerContent]}>
-                                <Image
-                                    style={AppStyles.emptyIcon}
-                                    source={StyleService.getImage('ImageManageAccounts')}
-                                />
-                                <Spacer size={50} />
-                                <Text style={[AppStyles.h5, AppStyles.textCenterAligned]}>
-                                    {Localize.t('onboarding.slideTwo_title')}
-                                </Text>
-                                <Spacer size={10} />
-                                <Text style={[AppStyles.p, AppStyles.textCenterAligned]}>
-                                    {Localize.t('onboarding.slideTwo_desc')}
-                                </Text>
-                            </View>
-                        </Slide>
-                        <Slide>
-                            <View style={[AppStyles.flex1, AppStyles.centerContent]}>
-                                <Image
-                                    style={AppStyles.emptyIcon}
-                                    source={StyleService.getImage('ImageSecurityFirst')}
-                                />
-                                <Spacer size={50} />
-                                <Text style={[AppStyles.h5, AppStyles.textCenterAligned]}>
-                                    {Localize.t('onboarding.slideThree_title')}
-                                </Text>
-                                <Spacer size={10} />
-                                <Text style={[AppStyles.p, AppStyles.textCenterAligned]}>
-                                    {Localize.t('onboarding.slideThree_desc')}
-                                </Text>
-                            </View>
-                        </Slide>
-                        <Slide>
-                            <View style={[AppStyles.flex1, AppStyles.centerContent]}>
-                                <Image style={AppStyles.emptyIcon} source={StyleService.getImage('ImageSendReceive')} />
-                                <Spacer size={50} />
-                                <Text style={[AppStyles.h5, AppStyles.textCenterAligned]}>
-                                    {Localize.t('onboarding.slideFour_title')}
-                                </Text>
-                                <Spacer size={10} />
-                                <Text style={[AppStyles.p, AppStyles.textCenterAligned]}>
-                                    {Localize.t('onboarding.slideFour_desc')}
-                                </Text>
-                            </View>
-                        </Slide>
-                    </Slider>
+                <SafeAreaView style={[
+                    AppStyles.flex4,
+                    AppStyles.marginTop,
+                ]}>
+                    <SafeAreaView style={[
+                        styles.container,
+                    ]}>
+                        <ImageBackground
+                            resizeMode="contain"
+                            source={StyleService.getImageIfLightModeIfDarkMode('PhonesLight', 'PhonesDark')}
+                            style={[
+                                styles.container,
+                            ]}
+                        />
+                        <Footer style={[
+                            AppStyles.paddingBottom,
+                            AppStyles.paddingTopNone,
+                        ]}>
+                            <Button
+                                testID="start-button"
+                                onPress={this.onFinish}
+                                label={Localize.t('global.start')}
+                            />
+                        </Footer>
+                    </SafeAreaView>
                 </SafeAreaView>
             </ImageBackground>
         );
diff --git a/src/screens/Onboarding/styles.tsx b/src/screens/Onboarding/styles.tsx
index 87056b706..433fce902 100644
--- a/src/screens/Onboarding/styles.tsx
+++ b/src/screens/Onboarding/styles.tsx
@@ -4,14 +4,24 @@ import { AppSizes } from '@theme';
 
 /* Styles ==================================================================== */
 const styles = StyleService.create({
-    container: { flex: 1, justifyContent: 'center', backgroundColor: '$background' },
+    container: {
+        flex: 1,
+        justifyContent: 'flex-end',
+        // backgroundColor: '$background',
+        top: 0,
+        bottom: 0,
+    },
     backgroundImageStyle: {
-        height: AppSizes.screen.height,
-        opacity: StyleService.isDarkMode() ? 0.04 : 0.02,
+        position: 'absolute', // this + 0000 needed for fold / square screen
+        left: 0,
+        top: 0,
+        bottom: 0,
+        right: 0,
     },
     logo: {
-        width: AppSizes.screen.width * 0.4,
-        height: AppSizes.screen.height * 0.1,
+        // marginTop: AppSizes.screen.height * 0.05,
+        width: AppSizes.screen.width * 0.5,
+        height: AppSizes.screen.height * 0.2,
         resizeMode: 'contain',
     },
 });
diff --git a/src/screens/Overlay/AddToken/AddTokenOverlay.tsx b/src/screens/Overlay/AddToken/AddTokenOverlay.tsx
index 76aa7816b..2663ba54a 100644
--- a/src/screens/Overlay/AddToken/AddTokenOverlay.tsx
+++ b/src/screens/Overlay/AddToken/AddTokenOverlay.tsx
@@ -350,13 +350,18 @@ class AddTokenOverlay extends Component<Props, State> {
                 ref={this.actionPanelRef}
                 contentStyle={AppStyles.centerAligned}
             >
-                <View style={[AppStyles.row, AppStyles.centerAligned, AppStyles.paddingBottomSml]}>
-                    <View style={[AppStyles.flex1, AppStyles.paddingLeftSml]}>
+                <View style={[
+                    AppStyles.row,
+                    AppStyles.paddingLeftExtraSml,
+                    AppStyles.centerAligned,
+                    AppStyles.paddingBottomSml,
+                ]}>
+                    <View style={[AppStyles.flex1]}>
                         <Text numberOfLines={1} style={[AppStyles.h5, AppStyles.strong]}>
                             {Localize.t('asset.addAsset')}
                         </Text>
                     </View>
-                    <View style={[AppStyles.row, AppStyles.flex1, AppStyles.paddingRightSml, AppStyles.flexEnd]}>
+                    <View style={[AppStyles.row, AppStyles.flex1, AppStyles.flexEnd]}>
                         <Button
                             light
                             roundedSmall
diff --git a/src/screens/Overlay/Alert/AlertOverlay.tsx b/src/screens/Overlay/Alert/AlertOverlay.tsx
index 52b7bad87..ebcea0f59 100644
--- a/src/screens/Overlay/Alert/AlertOverlay.tsx
+++ b/src/screens/Overlay/Alert/AlertOverlay.tsx
@@ -151,29 +151,50 @@ class AlertOverlay extends Component<Props, State> {
         const { buttons } = this.props;
 
         if (!buttons) {
-            return <Button testID="back-button" onPress={this.dismiss} light label={Localize.t('global.back')} />;
+            return (
+                <>
+                    <Spacer size={30} />
+                    <Button testID="back-button" onPress={this.dismiss} light label={Localize.t('global.back')} />;
+                </>
+            );
         }
 
+        const totalTextLength = buttons.reduce((acc, cur) => acc + cur.text.length, 0);
+        const maxLengthForSideBySide = 15;
+
         return (
-            <View style={[AppStyles.row]}>
-                {buttons.map((b: any, index: number) => {
-                    return (
-                        <View
-                            key={`${index}`}
-                            style={[AppStyles.flex1, index === 0 && buttons.length > 1 && AppStyles.paddingRightSml]}
-                        >
-                            <Button
-                                testID={b.testID}
-                                onPress={() => {
-                                    this.dismiss(b.onPress);
-                                }}
-                                light={b.light}
-                                label={b.text}
-                            />
-                        </View>
-                    );
-                })}
-            </View>
+            <>
+                <Spacer size={totalTextLength >= maxLengthForSideBySide ? 15 : 30} />
+                <View style={[
+                    totalTextLength < maxLengthForSideBySide && AppStyles.row,
+                    // AppStyles.borderGreen,
+                ]}>
+                    {buttons.map((b: any, index: number) => {
+                        return (
+                            <View
+                                key={`${index}`}
+                                style={[
+                                    totalTextLength >= maxLengthForSideBySide && styles.marginTop,
+                                    totalTextLength < maxLengthForSideBySide && AppStyles.flex1,
+                                    index === 0 &&
+                                        buttons.length > 1 &&
+                                        totalTextLength < maxLengthForSideBySide &&
+                                        AppStyles.paddingRightSml,
+                                ]}
+                            >
+                                <Button
+                                    testID={b.testID}
+                                    onPress={() => {
+                                        this.dismiss(b.onPress);
+                                    }}
+                                    light={b.light}
+                                    label={b.text}
+                                />
+                            </View>
+                        );
+                    })}
+                </View>
+            </>
         );
     };
 
@@ -204,8 +225,12 @@ class AlertOverlay extends Component<Props, State> {
                     {this.renderTitle()}
                     <Spacer size={20} />
                     <Text style={styles.subTitle}>{text}</Text>
-                    <Spacer size={30} />
-                    {this.renderButtons()}
+                    <View style={[
+                        // AppStyles.borderRed,
+                        styles.fullWidth,
+                    ]}>
+                        {this.renderButtons()}
+                    </View>
                 </Animated.View>
             </Animated.View>
         );
diff --git a/src/screens/Overlay/Alert/styles.tsx b/src/screens/Overlay/Alert/styles.tsx
index 508f16aae..e79b81404 100644
--- a/src/screens/Overlay/Alert/styles.tsx
+++ b/src/screens/Overlay/Alert/styles.tsx
@@ -20,7 +20,17 @@ const styles = StyleService.create({
         shadowOpacity: 0.4,
         ...AppStyles.paddingSml,
     },
-
+    marginTop: {
+        marginTop: 10,
+    },
+    fullWidth: {
+        width: '100%',
+        position: 'relative',
+        left: 0,
+        right: 0,
+        // borderWidth: 4,
+        // borderColor: 'pink',
+    },
     iconError: {
         tintColor: '$red',
     },
diff --git a/src/screens/Overlay/Authenticate/AuthenticateOverlay.tsx b/src/screens/Overlay/Authenticate/AuthenticateOverlay.tsx
index 924dee3e6..93095d8a2 100644
--- a/src/screens/Overlay/Authenticate/AuthenticateOverlay.tsx
+++ b/src/screens/Overlay/Authenticate/AuthenticateOverlay.tsx
@@ -14,6 +14,8 @@ import {
     LayoutAnimation,
     InteractionManager,
     NativeEventSubscription,
+    SafeAreaView,
+    Platform,
 } from 'react-native';
 
 import { CoreRepository } from '@store/repositories';
@@ -23,13 +25,15 @@ import { Prompt, VibrateHapticFeedback } from '@common/helpers/interface';
 import { Navigator } from '@common/helpers/navigator';
 import Keyboard from '@common/helpers/keyboard';
 
+import StyleService from '@services/StyleService';
+
 import { AppScreens } from '@common/constants';
 
 import { AuthenticationService } from '@services';
 
 import { BiometricErrors } from '@common/libs/biometric';
 // components
-import { Button, SecurePinInput } from '@components/General';
+import { Button, SecurePinInput, BlurView } from '@components/General';
 
 import Localize from '@locale';
 
@@ -47,7 +51,7 @@ export interface Props {
 export interface State {
     coreSettings: CoreModel;
     isBiometricAvailable: boolean;
-    offsetBottom: number;
+    // offsetBottom: number;
 }
 /* Component ==================================================================== */
 class AuthenticateOverlay extends Component<Props, State> {
@@ -56,6 +60,9 @@ class AuthenticateOverlay extends Component<Props, State> {
     private securePinInputRef: React.RefObject<SecurePinInput>;
 
     private animatedColor: Animated.Value;
+    private animateScale: Animated.Value;
+    private animatedOpacity: Animated.Value;
+
     private backHandler: NativeEventSubscription | undefined;
     private mounted = false;
 
@@ -73,19 +80,38 @@ class AuthenticateOverlay extends Component<Props, State> {
         this.state = {
             coreSettings: CoreRepository.getSettings(),
             isBiometricAvailable: false,
-            offsetBottom: 0,
+            // offsetBottom: 0,
         };
 
         this.contentViewRef = React.createRef();
         this.securePinInputRef = React.createRef();
 
         this.animatedColor = new Animated.Value(0);
+        this.animateScale = new Animated.Value(0);
+        this.animatedOpacity = new Animated.Value(0);
     }
 
     componentDidMount() {
         // track component mount status
         this.mounted = true;
 
+        Animated.parallel([
+            Animated.spring(this.animateScale, {
+                toValue: 1,
+                velocity: 0,
+                tension: 65,
+                friction: 7,
+                useNativeDriver: true,
+            }),
+
+            Animated.timing(this.animatedOpacity, {
+                toValue: 1,
+                duration: 250,
+                useNativeDriver: true,
+            }),
+        ]).start();
+
+
         // listen on keyboard events
         Keyboard.addListener('keyboardWillShow', this.onKeyboardShow);
         Keyboard.addListener('keyboardWillHide', this.onKeyboardHide);
@@ -146,7 +172,7 @@ class AuthenticateOverlay extends Component<Props, State> {
 
                 if (bottomView < KeyboardHeight) {
                     LayoutAnimation.easeInEaseOut();
-                    this.setState({ offsetBottom: KeyboardHeight - bottomView });
+                    // this.setState({ offsetBottom: KeyboardHeight - bottomView });
                 }
             });
         }
@@ -155,7 +181,7 @@ class AuthenticateOverlay extends Component<Props, State> {
     onKeyboardHide = () => {
         if (this.mounted) {
             LayoutAnimation.easeInEaseOut();
-            this.setState({ offsetBottom: 0 });
+            // this.setState({ offsetBottom: 0 });
         }
     };
 
@@ -234,22 +260,22 @@ class AuthenticateOverlay extends Component<Props, State> {
         const { coreSettings, isBiometricAvailable } = this.state;
         const { canAuthorizeBiometrics } = this.props;
 
-        const { biometricMethod } = coreSettings;
+        // const { biometricMethod } = coreSettings;
 
         return (
-            <View style={[AppStyles.container, AppStyles.centerContent]}>
-                <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.textCenterAligned, AppStyles.paddingTopSml]}>
-                    {Localize.t('global.pleaseEnterYourPasscode')}
-                </Text>
-
+            <View style={[AppStyles.centerContent]}>
                 <SecurePinInput
                     ref={this.securePinInputRef}
                     onInputFinish={this.onPasscodeEntered}
                     length={6}
                     enableHapticFeedback={coreSettings.hapticFeedback}
+                    supportBiometric={isBiometricAvailable && canAuthorizeBiometrics}
+                    onBiometryPress={this.requestBiometricAuthenticate}
+                    pinPadStyle={styles.pinInputPadding}
+                    virtualKeyboard
                 />
 
-                {isBiometricAvailable && canAuthorizeBiometrics && (
+                {/* {isBiometricAvailable && canAuthorizeBiometrics && (
                     <View style={AppStyles.paddingTopSml}>
                         <Button
                             label={`${biometricMethod}`}
@@ -260,33 +286,52 @@ class AuthenticateOverlay extends Component<Props, State> {
                             onPress={this.requestBiometricAuthenticate}
                         />
                     </View>
-                )}
+                )} */}
             </View>
         );
     };
 
     render() {
-        const { offsetBottom } = this.state;
-
-        const interpolateColor = this.animatedColor.interpolate({
-            inputRange: [0, 150],
-            outputRange: ['rgba(0,0,0,0)', 'rgba(0,0,0,0.8)'],
-        });
+        // const { offsetBottom } = this.state;
+        const transform = [
+            {
+                scale: this.animateScale.interpolate({
+                    inputRange: [0, 1],
+                    outputRange: [0, 1],
+                }),
+            },
+        ];
 
         return (
-            <Animated.View style={[styles.container, { backgroundColor: interpolateColor }]}>
-                <View ref={this.contentViewRef} style={[styles.visibleContent, { marginBottom: offsetBottom }]}>
-                    <View style={[AppStyles.row, AppStyles.centerAligned]}>
-                        <View style={[AppStyles.flex1, AppStyles.paddingLeftSml]}>
-                            <Text style={[AppStyles.p, AppStyles.bold]}>{Localize.t('global.authenticate')}</Text>
+            <BlurView
+                style={styles.blurView}
+                blurAmount={Platform.OS === 'ios' ? 15 : 20}
+                blurType={StyleService.isDarkMode() ? 'dark' : 'light'}
+            >
+                <SafeAreaView testID="lock-overlay" style={styles.safeAreaContainer}>
+                    <Animated.View style={[{ transform, opacity: this.animatedOpacity }]}>
+                        <View style={[
+                            AppStyles.flex1,
+                            AppStyles.paddingHorizontal,
+                            AppStyles.marginTop,
+                        ]}>
+                            <Text style={[
+                                AppStyles.h4,
+                                AppStyles.marginTop,
+                                AppStyles.bold,
+                                AppStyles.textCenterAligned,
+                            ]}>{Localize.t('global.authenticate')}</Text>
+                            <Text style={[AppStyles.subtext, AppStyles.textCenterAligned]}>
+                                {Localize.t('global.pleaseEnterYourPasscode')}
+                            </Text>
                         </View>
-                        <View style={[AppStyles.row, AppStyles.flex1, AppStyles.flexEnd]}>
-                            <Button label={Localize.t('global.cancel')} roundedSmall light onPress={this.dismiss} />
+                        <View style={[AppStyles.row, AppStyles.paddingTopSml]}>{this.renderPasscode()}</View>
+                        <View style={[AppStyles.row, AppStyles.flex1, AppStyles.centerContent]}>
+                            <Button label={Localize.t('global.cancel')} roundedSmall contrast onPress={this.dismiss} />
                         </View>
-                    </View>
-                    <View style={[AppStyles.row, AppStyles.paddingTopSml]}>{this.renderPasscode()}</View>
-                </View>
-            </Animated.View>
+                    </Animated.View>
+                </SafeAreaView>
+            </BlurView>
         );
     }
 }
diff --git a/src/screens/Overlay/Authenticate/styles.tsx b/src/screens/Overlay/Authenticate/styles.tsx
index 15c4c67a8..88ff41755 100644
--- a/src/screens/Overlay/Authenticate/styles.tsx
+++ b/src/screens/Overlay/Authenticate/styles.tsx
@@ -19,6 +19,30 @@ const styles = StyleService.create({
         shadowOpacity: 0.4,
         ...AppStyles.paddingSml,
     },
+    blurView: {
+        zIndex: 99999,
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        bottom: 0,
+        right: 0,
+        width: AppSizes.screen.width,
+        height: AppSizes.screen.height,
+    },
+    safeAreaContainer: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+        padding: AppSizes.paddingSml,
+        marginBottom: AppSizes.safeAreaBottomInset,
+    },
+    pinInputPadding: {
+        // borderColor: 'purple',
+        // borderWidth: 3,
+        // paddingHorizontal: 15,
+        marginTop: 15,
+        // width: '100%',
+    },
 });
 
 export default styles;
diff --git a/src/screens/Overlay/ChangeLog/ChangeLogOverlay.tsx b/src/screens/Overlay/ChangeLog/ChangeLogOverlay.tsx
index b91336d1d..b92731bad 100644
--- a/src/screens/Overlay/ChangeLog/ChangeLogOverlay.tsx
+++ b/src/screens/Overlay/ChangeLog/ChangeLogOverlay.tsx
@@ -4,7 +4,7 @@
 import React, { Component } from 'react';
 import { View, Text, Animated } from 'react-native';
 
-import { CoreRepository } from '@store/repositories';
+// import { CoreRepository } from '@store/repositories';
 
 import { Navigator } from '@common/helpers/navigator';
 
@@ -21,6 +21,7 @@ import styles from './styles';
 
 /* types ==================================================================== */
 import { Props, State } from './types';
+import StyleService from '@services/StyleService';
 
 /* Component ==================================================================== */
 class ChangeLogOverlay extends Component<Props, State> {
@@ -36,7 +37,7 @@ class ChangeLogOverlay extends Component<Props, State> {
         this.animatedOpacity = new Animated.Value(0);
 
         this.state = {
-            coreSettings: CoreRepository.getSettings(),
+            // coreSettings: CoreRepository.getSettings(),
         };
     }
 
@@ -66,10 +67,10 @@ class ChangeLogOverlay extends Component<Props, State> {
     };
 
     getHeaders = () => {
-        const { coreSettings } = this.state;
+        // const { coreSettings } = this.state;
 
         return {
-            'X-Xaman-Style': coreSettings.theme,
+            'X-Xaman-Style': StyleService.getCurrentTheme(),
         };
     };
 
diff --git a/src/screens/Overlay/ChangeLog/types.ts b/src/screens/Overlay/ChangeLog/types.ts
index c6e76fdd8..85213fb88 100644
--- a/src/screens/Overlay/ChangeLog/types.ts
+++ b/src/screens/Overlay/ChangeLog/types.ts
@@ -1,9 +1,9 @@
-import CoreModel from '@store/models/objects/core';
+// import CoreModel from '@store/models/objects/core';
 
 export interface Props {
     version: string;
 }
 
 export interface State {
-    coreSettings: CoreModel;
+    // coreSettings: CoreModel;
 }
diff --git a/src/screens/Overlay/CriticalProcessing/CriticalProcessingOverlay.tsx b/src/screens/Overlay/CriticalProcessing/CriticalProcessingOverlay.tsx
index 0f231392c..5b074642e 100644
--- a/src/screens/Overlay/CriticalProcessing/CriticalProcessingOverlay.tsx
+++ b/src/screens/Overlay/CriticalProcessing/CriticalProcessingOverlay.tsx
@@ -165,10 +165,17 @@ class CriticalProcessingOverlay extends Component<Props, State> {
 
         return (
             <BlurView blurAmount={Platform.OS === 'ios' ? 5 : 10} blurType="dark">
-                <View style={styles.blurView}>
+                <View style={[
+                    styles.blurView,
+                ]}>
                     <Animated.View
                         testID={testID}
-                        style={[styles.visibleContent, { transform, opacity: this.animatedOpacity }]}
+                        style={[
+                            AppStyles.container,
+                            AppStyles.column,
+                            { transform, opacity: this.animatedOpacity },
+                            styles.visibleContent,
+                        ]}
                     >
                         <View style={[AppStyles.centerAligned]}>
                             <Icon style={styles.icon} name="IconAlertTriangle" size={60} />
@@ -184,6 +191,7 @@ class CriticalProcessingOverlay extends Component<Props, State> {
                         <Spacer size={30} />
                         <LoadingIndicator size="large" color={StyleService.isDarkMode() ? 'dark' : 'light'} />
                         <Spacer size={30} />
+
                         <View style={AppStyles.centerAligned}>
                             <Text style={styles.subTitle}>{Locale.t('global.doNotCloseTheApp')}</Text>
                         </View>
diff --git a/src/screens/Overlay/CriticalProcessing/styles.tsx b/src/screens/Overlay/CriticalProcessing/styles.tsx
index fe38a8e3b..c023b3800 100644
--- a/src/screens/Overlay/CriticalProcessing/styles.tsx
+++ b/src/screens/Overlay/CriticalProcessing/styles.tsx
@@ -7,14 +7,17 @@ import { AppStyles, AppSizes } from '@theme';
 /* Styles ==================================================================== */
 const styles = StyleService.create({
     visibleContent: {
-        width: AppSizes.screen.width * 0.8,
-        backgroundColor: '$contrast',
+        // width: AppSizes.screen.width * 0.8,
+        width: '100%',
+        // backgroundColor: '$contrast',
         borderRadius: AppSizes.screen.width * 0.07,
         shadowColor: '$light',
         shadowOffset: { width: 0, height: 0 },
         shadowRadius: 1,
         shadowOpacity: 0.4,
         ...AppStyles.paddingSml,
+        // borderWidth: 3,
+        // borderColor: 'purple',
     },
     blurView: {
         width: AppSizes.screen.width,
@@ -27,13 +30,13 @@ const styles = StyleService.create({
     },
     title: {
         ...AppStyles.h5,
-        color: '$tint',
+        color: '$contrast',
     },
     title2: {
         ...AppStyles.subtext,
         ...AppStyles.bold,
         textAlign: 'center',
-        color: '$silver',
+        color: '$contrast',
     },
     subTitle: {
         ...AppStyles.subtext,
diff --git a/src/screens/Overlay/ExplainBalance/ExplainBalanceOverlay.tsx b/src/screens/Overlay/ExplainBalance/ExplainBalanceOverlay.tsx
index 0ad5d4e18..db5369b77 100644
--- a/src/screens/Overlay/ExplainBalance/ExplainBalanceOverlay.tsx
+++ b/src/screens/Overlay/ExplainBalance/ExplainBalanceOverlay.tsx
@@ -213,7 +213,9 @@ class ExplainBalanceOverlay extends Component<Props, State> {
                     </View>
                     <View style={[AppStyles.flex4, AppStyles.row, AppStyles.centerAligned, AppStyles.flexEnd]}>
                         <Text style={styles.reserveAmount}>
-                            {totalReserve} {NetworkService.getNativeAsset()}
+                            {Localize.formatNumber(totalReserve, 2, true)}
+                            {/* {' '} */}
+                            {/* {NetworkService.getNativeAsset()} */}
                         </Text>
                     </View>
                 </View>
@@ -225,7 +227,7 @@ class ExplainBalanceOverlay extends Component<Props, State> {
         const { account } = this.props;
         const { networkReserve } = this.state;
 
-        if (account.lines?.length === 0) return null;
+        if (!account.lines?.isValid() || account.lines?.length === 0) return null;
 
         return account.lines?.map((line: TrustLineModel, index: number) => {
             // don't render obligation TrustLines
@@ -244,7 +246,9 @@ class ExplainBalanceOverlay extends Component<Props, State> {
                     </View>
                     <View style={[AppStyles.flex1, AppStyles.row, AppStyles.centerAligned, AppStyles.flexEnd]}>
                         <Text style={styles.reserveAmount}>
-                            {networkReserve.OwnerReserve} {NetworkService.getNativeAsset()}
+                            {Localize.formatNumber(networkReserve.OwnerReserve, 2, true)}
+                            {/* {' '} */}
+                            {/* {NetworkService.getNativeAsset()} */}
                         </Text>
                     </View>
                 </View>
@@ -268,7 +272,9 @@ class ExplainBalanceOverlay extends Component<Props, State> {
                     </View>
                     <View style={[AppStyles.flex4, AppStyles.row, AppStyles.centerAligned, AppStyles.flexEnd]}>
                         <Text style={styles.reserveAmount}>
-                            {nfTokenPageCount * networkReserve.OwnerReserve} {NetworkService.getNativeAsset()}
+                            {Localize.formatNumber(nfTokenPageCount * networkReserve.OwnerReserve, 2, true)}
+                            {/* {' '} */}
+                            {/* {NetworkService.getNativeAsset()} */}
                         </Text>
                     </View>
                 </View>
@@ -295,7 +301,9 @@ class ExplainBalanceOverlay extends Component<Props, State> {
                     </View>
                     <View style={[AppStyles.flex4, AppStyles.row, AppStyles.centerAligned, AppStyles.flexEnd]}>
                         <Text style={styles.reserveAmount}>
-                            {remainingOwner * networkReserve.OwnerReserve} {NetworkService.getNativeAsset()}
+                            {Localize.formatNumber(remainingOwner * networkReserve.OwnerReserve, 2, true)}
+                            {/* {' '} */}
+                            {/* {NetworkService.getNativeAsset()} */}
                         </Text>
                     </View>
                 </View>
@@ -320,8 +328,9 @@ class ExplainBalanceOverlay extends Component<Props, State> {
                         <Text style={[AppStyles.h5, AppStyles.monoBold]}>
                             {Localize.formatNumber(
                                 account.ownerCount * networkReserve.OwnerReserve + networkReserve.BaseReserve,
-                            )}{' '}
-                            {NetworkService.getNativeAsset()}
+                            )}
+                            {/* {' '} */}
+                            {/* {NetworkService.getNativeAsset()} */}
                         </Text>
                     </View>
                 </View>
@@ -343,7 +352,9 @@ class ExplainBalanceOverlay extends Component<Props, State> {
                     </View>
                     <View style={[AppStyles.flex4, AppStyles.row, AppStyles.centerAligned, AppStyles.flexEnd]}>
                         <Text style={styles.reserveAmount}>
-                            {networkReserve.BaseReserve} {NetworkService.getNativeAsset()}
+                            {Localize.formatNumber(networkReserve.BaseReserve, 2, true)}
+                            {/* {' '} */}
+                            {/* {NetworkService.getNativeAsset()} */}
                         </Text>
                     </View>
                 </View>
diff --git a/src/screens/Overlay/HomeActions/HomeActionsOverlay.tsx b/src/screens/Overlay/HomeActions/HomeActionsOverlay.tsx
index 132353c05..1462cb4b5 100644
--- a/src/screens/Overlay/HomeActions/HomeActionsOverlay.tsx
+++ b/src/screens/Overlay/HomeActions/HomeActionsOverlay.tsx
@@ -29,7 +29,9 @@ import { AppStyles, AppSizes } from '@theme';
 import styles from './styles';
 
 /* types ==================================================================== */
-export interface Props {}
+export interface Props {
+    timestamp?: number;
+}
 
 export interface State {
     account: AccountModel;
@@ -145,6 +147,7 @@ class HomeActionsOverlay extends Component<Props, State> {
 
     render() {
         const { apps, featured } = this.state;
+        const { timestamp } = this.props;
 
         return (
             <ActionPanel
@@ -156,16 +159,18 @@ class HomeActionsOverlay extends Component<Props, State> {
                 <Text numberOfLines={1} style={[styles.rowTitle, styles.rowTitleFirst]}>
                     {Localize.t('xapp.recentlyUsed')}
                 </Text>
-                <XAppShortList apps={apps} onAppPress={this.onAppPress} />
 
-                <Spacer size={15} />
+                <XAppShortList key={`shortlisttop-${timestamp}`} apps={apps} onAppPress={this.onAppPress} />
+
+                <Spacer size={10} />
 
                 <Text numberOfLines={1} style={styles.rowTitle}>
                     {Localize.t('xapp.ourSuggestions')}
                 </Text>
-                <XAppShortList apps={featured} onAppPress={this.onAppPress} />
 
-                <View style={styles.actionButtonContainer}>
+                <XAppShortList key={`shortlistbottom-${timestamp}`} apps={featured} onAppPress={this.onAppPress} />
+
+                <View style={styles.actionButtonContainer} key={`qrbtn-${timestamp}`}>
                     <Button
                         contrast
                         numberOfLines={1}
diff --git a/src/screens/Overlay/Lock/LockOverlay.tsx b/src/screens/Overlay/Lock/LockOverlay.tsx
index ebf1f8869..1fff20c7f 100644
--- a/src/screens/Overlay/Lock/LockOverlay.tsx
+++ b/src/screens/Overlay/Lock/LockOverlay.tsx
@@ -173,7 +173,7 @@ class LockOverlay extends Component<Props, State> {
             <BlurView
                 style={styles.blurView}
                 blurAmount={Platform.OS === 'ios' ? 15 : 20}
-                blurType={StyleService.select({ dark: 'dark', light: 'light' })}
+                blurType={StyleService.isDarkMode() ? 'dark' : 'light'}
             >
                 <SafeAreaView testID="lock-overlay" style={styles.container}>
                     <View style={[AppStyles.centerAligned, AppStyles.paddingSml]}>
diff --git a/src/screens/Overlay/Lock/styles.tsx b/src/screens/Overlay/Lock/styles.tsx
index acd23aff2..907c90b2f 100644
--- a/src/screens/Overlay/Lock/styles.tsx
+++ b/src/screens/Overlay/Lock/styles.tsx
@@ -25,8 +25,6 @@ const styles = StyleSheet.create({
         left: 0,
         bottom: 0,
         right: 0,
-        width: AppSizes.screen.width,
-        height: AppSizes.screen.height,
     },
 });
 
diff --git a/src/screens/Overlay/PassphraseAuthentication/PassphraseAuthenticationOverlay.tsx b/src/screens/Overlay/PassphraseAuthentication/PassphraseAuthenticationOverlay.tsx
index d98ec91a6..8f42577fc 100644
--- a/src/screens/Overlay/PassphraseAuthentication/PassphraseAuthenticationOverlay.tsx
+++ b/src/screens/Overlay/PassphraseAuthentication/PassphraseAuthenticationOverlay.tsx
@@ -21,6 +21,8 @@ import {
 import { AppScreens } from '@common/constants';
 import { WebLinks } from '@common/constants/endpoints';
 
+import StyleService from '@services/StyleService';
+
 import { CoreRepository } from '@store/repositories';
 import { AccountModel, CoreModel } from '@store/models';
 
@@ -245,7 +247,7 @@ class PassphraseAuthenticationOverlay extends Component<Props, State> {
 
         const interpolateColor = this.animatedColor.interpolate({
             inputRange: [0, 150],
-            outputRange: ['rgba(0,0,0,0)', 'rgba(0,0,0,0.8)'],
+            outputRange: StyleService.getBackdropInterpolateColor(),
         });
 
         return (
diff --git a/src/screens/Overlay/SelectCurrency/SelectCurrencyOverlay.tsx b/src/screens/Overlay/SelectCurrency/SelectCurrencyOverlay.tsx
index 8279fc82f..5baceee26 100644
--- a/src/screens/Overlay/SelectCurrency/SelectCurrencyOverlay.tsx
+++ b/src/screens/Overlay/SelectCurrency/SelectCurrencyOverlay.tsx
@@ -158,6 +158,7 @@ class SelectCurrencyOverlay extends Component<Props, State> {
                     <CurrencyItem account={account} item={item} selected={isSelected} />
                     <View style={[AppStyles.flex1]}>
                         <View
+                            shouldRasterizeIOS renderToHardwareTextureAndroid
                             style={[isSelected ? styles.radioCircleSelected : styles.radioCircle, AppStyles.rightSelf]}
                         />
                     </View>
diff --git a/src/screens/Overlay/SelectFee/SelectFeeOverlay.tsx b/src/screens/Overlay/SelectFee/SelectFeeOverlay.tsx
index ddadffd66..60c235349 100644
--- a/src/screens/Overlay/SelectFee/SelectFeeOverlay.tsx
+++ b/src/screens/Overlay/SelectFee/SelectFeeOverlay.tsx
@@ -7,10 +7,14 @@ import { View, Text } from 'react-native';
 import { Navigator } from '@common/helpers/navigator';
 import { AppScreens } from '@common/constants';
 
+import { AmountParser } from '@common/libs/ledger/parser/common';
+import { NetworkService } from '@services';
+
 // components
 import { ActionPanel, Button, Footer } from '@components/General';
 
 import { FeeList } from '@components/Modules';
+import FeeListItemStyles from '@components/Modules/FeeList/FeeListItem/styles';
 
 import Localize from '@locale';
 
@@ -43,7 +47,7 @@ class SelectFeeOverlay extends Component<Props, State> {
         super(props);
 
         this.state = {
-            selected: props.selectedFee,
+            selectedFee: props.selectedFee,
         };
 
         this.actionPanelRef = React.createRef();
@@ -51,19 +55,19 @@ class SelectFeeOverlay extends Component<Props, State> {
 
     onItemSelect = (item: FeeItem) => {
         this.setState({
-            selected: item,
+            selectedFee: item,
         });
     };
 
     onApply = () => {
         const { onSelect } = this.props;
-        const { selected } = this.state;
+        const { selectedFee } = this.state;
 
         this.actionPanelRef?.current?.slideDown();
 
         setTimeout(() => {
             if (typeof onSelect === 'function') {
-                onSelect(selected);
+                onSelect(selectedFee);
             }
         }, 200);
     };
@@ -73,13 +77,15 @@ class SelectFeeOverlay extends Component<Props, State> {
     };
 
     render() {
-        const { availableFees } = this.props;
-        const { selected } = this.state;
+        const { availableFees, serviceFee } = this.props;
+        const { selectedFee } = this.state;
+
+        const normalizedSeviceFeeValue = new AmountParser(serviceFee?.value || 0).dropsToNative().toString();
 
         return (
             <ActionPanel
                 ref={this.actionPanelRef}
-                height={AppSizes.moderateScale(480)}
+                height={AppSizes.moderateScale(520)}
                 onSlideDown={Navigator.dismissOverlay}
                 contentStyle={AppStyles.centerAligned}
                 extraBottomInset
@@ -87,7 +93,7 @@ class SelectFeeOverlay extends Component<Props, State> {
                 <View style={[AppStyles.row, AppStyles.centerAligned, AppStyles.paddingBottomSml]}>
                     <View style={[AppStyles.flex1, AppStyles.paddingLeftSml]}>
                         <Text numberOfLines={1} style={[AppStyles.h5, AppStyles.strong]}>
-                            Fee
+                            {Localize.t('events.fees')}
                         </Text>
                     </View>
                     <View style={[AppStyles.row, AppStyles.flex1, AppStyles.paddingRightSml, AppStyles.flexEnd]}>
@@ -105,8 +111,21 @@ class SelectFeeOverlay extends Component<Props, State> {
                     containerStyle={[AppStyles.paddingVerticalSml, AppStyles.paddingHorizontalSml]}
                     items={availableFees}
                     onItemPress={this.onItemSelect}
-                    selectedItem={selected}
+                    selectedItem={selectedFee}
                 />
+                <View style={[
+                    AppStyles.row,
+                    styles.serviceFeeItem,
+                ]}>
+                    <View style={AppStyles.flex3}>
+                        <Text style={[FeeListItemStyles.label]}>{Localize.t('events.serviceFee')}</Text>
+                    </View>
+                    <View style={[AppStyles.flex3, AppStyles.rightAligned]}>
+                        <Text style={[FeeListItemStyles.value, AppStyles.textRightAligned]}>
+                            { normalizedSeviceFeeValue } {NetworkService.getNativeAsset()}
+                        </Text>
+                    </View>
+                </View>
                 <Footer style={styles.footer}>
                     <Button numberOfLines={1} label={Localize.t('global.apply')} onPress={this.onApply} />
                 </Footer>
diff --git a/src/screens/Overlay/SelectFee/styles.tsx b/src/screens/Overlay/SelectFee/styles.tsx
index 748646cc1..c37551173 100644
--- a/src/screens/Overlay/SelectFee/styles.tsx
+++ b/src/screens/Overlay/SelectFee/styles.tsx
@@ -1,9 +1,15 @@
 import StyleService from '@services/StyleService';
 
+import Sizes from '@theme/sizes';
+
 import { AppFonts, AppSizes } from '@theme';
 
 /* Styles ==================================================================== */
 const styles = StyleService.create({
+    serviceFeeItem: {
+        paddingRight: Sizes.padding + 12,
+        paddingLeft: Sizes.padding + 12,
+    },
     feeItem: {
         width: '100%',
         borderRadius: 20,
diff --git a/src/screens/Overlay/SelectFee/types.ts b/src/screens/Overlay/SelectFee/types.ts
index 4eb718e64..3a5c0895c 100644
--- a/src/screens/Overlay/SelectFee/types.ts
+++ b/src/screens/Overlay/SelectFee/types.ts
@@ -1,14 +1,16 @@
 export interface FeeItem {
     type: string;
     value: string;
+    note?: string;
 }
 
 export interface Props {
     availableFees: FeeItem[];
     selectedFee: FeeItem;
-    onSelect: (fee: FeeItem) => void;
+    serviceFee: FeeItem;
+    onSelect: (txFee: FeeItem, serviceFee?: FeeItem) => void;
 }
 
 export interface State {
-    selected: FeeItem;
+    selectedFee: FeeItem;
 }
diff --git a/src/screens/Overlay/ShareAccount/ShareAccountOverlay.tsx b/src/screens/Overlay/ShareAccount/ShareAccountOverlay.tsx
index 3549e0811..d835d1bb7 100644
--- a/src/screens/Overlay/ShareAccount/ShareAccountOverlay.tsx
+++ b/src/screens/Overlay/ShareAccount/ShareAccountOverlay.tsx
@@ -9,10 +9,13 @@ import { AppScreens } from '@common/constants';
 import { Toast } from '@common/helpers/interface';
 import { Navigator } from '@common/helpers/navigator';
 import { Clipboard } from '@common/helpers/clipboard';
+// import ScreenBrightness from 'react-native-screen-brightness';
 
 import { AccountModel } from '@store/models';
 
-import { ActionPanel, Button, QRCode, Footer } from '@components/General';
+// import DeviceBrightness from '@adrianso/react-native-device-brightness';
+
+import { Footer, ActionPanel, Button, QRCode } from '@components/General';
 
 import Localize from '@locale';
 
@@ -20,13 +23,19 @@ import { RequestViewProps } from '@screens/Request';
 
 import { AppStyles, AppSizes } from '@theme';
 import styles from './styles';
+// import AppService, { AppStateStatus } from '@services/AppService';
 
 /* types ==================================================================== */
 export interface Props {
     account: AccountModel;
+    timestamp?: number;
+}
+
+export interface State {
+    ogBrightness: number | null;
+    // keepBrightness: boolean;
 }
 
-export interface State {}
 
 /* Component ==================================================================== */
 class ShareAccountOverlay extends Component<Props, State> {
@@ -49,41 +58,90 @@ class ShareAccountOverlay extends Component<Props, State> {
     constructor(props: Props) {
         super(props);
 
+        this.state = {
+            ogBrightness: null,
+            // keepBrightness: false,
+        };
+
         this.actionPanelRef = React.createRef();
     }
 
+    // appStateChange(status: AppStateStatus) {
+    //     const { ogBrightness } = this.state;
+
+    //     console.log('x', status, ogBrightness)
+        
+    //     if (status !== AppStateStatus.Active) {
+    //         if (typeof ogBrightness === 'number') {
+    //             DeviceBrightness.setBrightnessLevel(Platform.OS === 'android' ? -1 : ogBrightness);
+    //         }
+    //     }
+    //     if (status === AppStateStatus.Active) {
+    //         DeviceBrightness.setBrightnessLevel(1);
+    //     }
+    // }
+
+    componentDidMount() {
+        // const { ogBrightness } = this.state;
+
+        // DeviceBrightness.getBrightnessLevel().then(brightness => {
+        //     // if (typeof ogBrightness !== 'number') {
+        //     //     this.setState({ ogBrightness: brightness });
+        //     // }
+        //     // setTimeout(() => {
+        //     //     DeviceBrightness.setBrightnessLevel(1);
+        //     // }, 400);
+        // });
+
+        // AppService.on('appStateChange', status => this.appStateChange(status));
+    }
+
+    componentWillUnmount(): void {
+        // const { ogBrightness, keepBrightness } = this.state;
+        // if (!keepBrightness) {
+        //     DeviceBrightness.setBrightnessLevel(Number(Platform.OS === 'android' ? -1 : ogBrightness));
+        // }
+        // AppService.off('appStateChange', status => this.appStateChange(status));
+    }
+
     onSharePress = () => {
         const { account } = this.props;
 
-        this.actionPanelRef?.current?.slideDown();
+        // this.actionPanelRef?.current?.slideDown();
 
-        setTimeout(() => {
-            Share.share({
-                title: Localize.t('home.shareAccount'),
-                message: account.address,
-                url: undefined,
-            }).catch(() => {});
-        }, 1000);
+        // setTimeout(() => {
+        Share.share({
+            title: Localize.t('home.shareAccount'),
+            message: account.address,
+            url: undefined,
+        }).catch(() => {});
+        // }, 1000);
     };
 
     onCopyAddressPress = () => {
         const { account } = this.props;
 
-        this.actionPanelRef?.current?.slideDown();
+        // this.actionPanelRef?.current?.slideDown();
 
         Clipboard.setString(account.address);
 
-        setTimeout(() => {
-            Toast(Localize.t('account.publicKeyCopiedToClipboard'));
-        }, 1000);
+        // setTimeout(() => {
+        Toast(Localize.t('account.publicKeyCopiedToClipboard'));
+        // }, 10);
     };
 
     onPaymentRequestPress = () => {
+        const { ogBrightness } = this.state;
+
         this.actionPanelRef?.current?.slideDown();
 
+        // this.setState({ keepBrightness: true });
+
         setTimeout(() => {
-            Navigator.push<RequestViewProps>(AppScreens.Transaction.Request, {});
-        }, 1000);
+            Navigator.push<RequestViewProps>(AppScreens.Transaction.Request, {
+                ogBrightness: Number(ogBrightness || 1),
+            });
+        }, 500);
     };
 
     onClosePress = () => {
@@ -91,23 +149,37 @@ class ShareAccountOverlay extends Component<Props, State> {
     };
 
     render() {
-        const { account } = this.props;
+        const { account, timestamp } = this.props;
 
         return (
             <ActionPanel
                 ref={this.actionPanelRef}
                 height={AppSizes.moderateScale(570)}
                 onSlideDown={Navigator.dismissOverlay}
-                contentStyle={AppStyles.centerAligned}
+                contentStyle={[
+                    styles.panelContent,
+                ]}
                 extraBottomInset
             >
-                <View style={[AppStyles.row, AppStyles.centerAligned, AppStyles.paddingBottomSml]}>
-                    <View style={[AppStyles.flex1, AppStyles.paddingLeftSml]}>
+                <View style={[
+                    AppStyles.row,
+                    AppStyles.flex1,
+                    AppStyles.paddingBottomSml,
+                    AppStyles.centerAligned,
+                    AppStyles.paddingHorizontalSml,
+                ]}>
+                    <View style={[
+                        AppStyles.flex5,
+                    ]}>
                         <Text numberOfLines={1} style={[AppStyles.h5, AppStyles.strong]}>
-                            {Localize.t('send.myAccount')}
+                            {Localize.t('send.accountInfo')}
                         </Text>
                     </View>
-                    <View style={[AppStyles.row, AppStyles.flex1, AppStyles.paddingRightSml, AppStyles.flexEnd]}>
+                    <View style={[
+                        AppStyles.row,
+                        AppStyles.flex3,
+                        AppStyles.flexEnd,
+                    ]}>
                         <Button
                             light
                             roundedSmall
@@ -119,50 +191,69 @@ class ShareAccountOverlay extends Component<Props, State> {
                     </View>
                 </View>
 
-                <View style={styles.qrCodeContainer}>
-                    <View style={styles.qrCode}>
-                        <QRCode size={AppSizes.moderateScale(150)} value={`${account.address}`} />
+                <View style={[AppStyles.paddingHorizontalExtraSml, AppStyles.flex8]}>
+                    <View style={[AppStyles.paddingBottomSml, AppStyles.paddingHorizontalExtraSml]}>
+                        <Text style={AppStyles.colorGrey}>
+                            {Localize.t('global.address')} ({Localize.t('global.holdToCopy')}):
+                        </Text>
+                        <View style={styles.addressTextContainer}>
+                            <Text selectable adjustsFontSizeToFit numberOfLines={1} style={styles.addressText}>
+                                {account.address}
+                            </Text>
+                            <View style={[AppStyles.row, styles.sharebtnContainer]}>
+                                <Button
+                                    light
+                                    roundedMini
+                                    key={`share-account-overlay-${timestamp}-btn1`}
+                                    numberOfLines={1}
+                                    icon="IconShare"
+                                    // iconStyle={AppStyles.imgColorBlue}
+                                    label={Localize.t('global.share')}
+                                    onPress={this.onSharePress}
+                                    style={[AppStyles.flex1, styles.sharebtn]}
+                                />
+                                <Button
+                                    light
+                                    roundedMini
+                                    key={`share-account-overlay-${timestamp}-btn2`}
+                                    numberOfLines={1}
+                                    icon="IconClipboard"
+                                    // iconStyle={AppStyles.imgColorBlue}
+                                    label={Localize.t('global.copy')}
+                                    onPress={this.onCopyAddressPress}
+                                    style={[AppStyles.flex1, styles.sharebtn]}
+                                />
+                            </View>
+                        </View>
                     </View>
-                </View>
 
-                <View style={[AppStyles.paddingBottom, AppStyles.paddingHorizontalSml]}>
-                    <Text style={[AppStyles.pbold, AppStyles.textCenterAligned]}>{Localize.t('global.address')}:</Text>
-                    <View style={styles.addressTextContainer}>
-                        <Text selectable adjustsFontSizeToFit numberOfLines={1} style={styles.addressText}>
-                            {account.address}
+                    <View style={[AppStyles.paddingHorizontalExtraSml]}>
+                        <Text style={AppStyles.colorGrey}>
+                            {Localize.t('global.orShareQr')}:
                         </Text>
+                        <View style={[
+                            styles.qrCodeContainer,
+                        ]}>
+                            <View style={styles.qrCode}>
+                                <View style={styles.qrImgContainer}>
+                                    <QRCode size={150} value={`${account.address}`} />
+                                </View>
+                            </View>
+                        </View>                    
                     </View>
                 </View>
 
-                <View style={[AppStyles.row, AppStyles.centerContent, AppStyles.paddingHorizontalSml]}>
-                    <Button
-                        light
-                        rounded
-                        numberOfLines={1}
-                        icon="IconShare"
-                        iconStyle={AppStyles.imgColorBlue}
-                        label={Localize.t('global.share')}
-                        onPress={this.onSharePress}
-                        style={[AppStyles.flex1, AppStyles.marginRight]}
-                    />
-                    <Button
-                        light
-                        rounded
-                        numberOfLines={1}
-                        icon="IconClipboard"
-                        iconStyle={AppStyles.imgColorBlue}
-                        label={Localize.t('global.copy')}
-                        onPress={this.onCopyAddressPress}
-                        style={[AppStyles.flex1]}
-                    />
-                </View>
-
-                <Footer style={styles.footer}>
+                <Footer style={[
+                    styles.footer,
+                ]}>
                     <Button
                         numberOfLines={1}
+                        nonBlock
                         label={Localize.t('global.createPaymentRequestLink')}
                         onPress={this.onPaymentRequestPress}
-                        style={AppStyles.buttonGreen}
+                        style={[
+                            styles.requestLink,
+                        ]}
                     />
                 </Footer>
             </ActionPanel>
diff --git a/src/screens/Overlay/ShareAccount/styles.tsx b/src/screens/Overlay/ShareAccount/styles.tsx
index 2d2287791..cf6517571 100644
--- a/src/screens/Overlay/ShareAccount/styles.tsx
+++ b/src/screens/Overlay/ShareAccount/styles.tsx
@@ -1,40 +1,77 @@
 import StyleService from '@services/StyleService';
 
 import { AppFonts, AppSizes } from '@theme';
+import { Platform } from 'react-native';
 
 /* Styles ==================================================================== */
 const styles = StyleService.create({
+    panelContent: {
+        padding: 0,
+    },
+    requestLink: {
+        position: 'absolute',
+        bottom: 10,
+        // left: 0,
+        // right: 0,
+    },
     qrCodeContainer: {
-        width: '90%',
-        backgroundColor: '$tint',
+        width: '100%',
+        borderColor: '$tint',
+        borderWidth: 3,
+        backgroundColor: '$white',
         alignSelf: 'center',
-        borderRadius: 20,
+        borderRadius: 10,
         marginBottom: 25,
+        marginTop: 10,
+    },
+    qrImgContainer: {
+        // borderWidth: 1,
+        // borderColor: 'red',
+        position: 'absolute',
+        top: 75,
+        transform: [ { translateY: -75 } ],
     },
     qrCode: {
-        borderRadius: 14,
-        borderWidth: 5,
-        alignSelf: 'center',
+        // alignSelf: 'center',
         alignItems: 'center',
         borderColor: '$silver',
-        padding: 5,
-        margin: 30,
+        // padding: 10,
+        margin: Platform.select({
+            ios: 15,
+            android: 0,
+        }),
+        height: 150,
+        overflow: 'hidden',
+    },
+    sharebtnContainer: {
+        marginHorizontal: -14,
+        marginBottom: -20,
+        marginTop: 20,
+    },
+    sharebtn: {
+        borderRadius: 0,
+        margin: 0,
+        height: 35,
     },
     addressTextContainer: {
         width: '100%',
-        backgroundColor: '$tint',
-        marginTop: 15,
-        paddingHorizontal: 15,
-        paddingVertical: 8,
-        borderRadius: 8,
+        // backgroundColor: '$tint',
+        borderColor: '$tint',
+        borderWidth: 3,
+        marginTop: 10,
+        paddingHorizontal: 12,
+        paddingVertical: 18,
+        borderRadius: 10,
+        overflow: 'hidden',
     },
     addressText: {
-        fontFamily: AppFonts.base.familyMono,
+        fontFamily: AppFonts.base.familyMonoBold,
         fontSize: AppFonts.base.size,
+        textAlign: 'center',
         color: '$textPrimary',
     },
     footer: {
-        paddingBottom: AppSizes.safeAreaBottomInset,
+        marginBottom: AppSizes.padding + 20,
     },
 });
 
diff --git a/src/screens/Overlay/SwitchAccount/SwitchAccountOverlay.tsx b/src/screens/Overlay/SwitchAccount/SwitchAccountOverlay.tsx
index fff66050f..460a1867f 100644
--- a/src/screens/Overlay/SwitchAccount/SwitchAccountOverlay.tsx
+++ b/src/screens/Overlay/SwitchAccount/SwitchAccountOverlay.tsx
@@ -192,7 +192,7 @@ class SwitchAccountOverlay extends Component<Props, State> {
                             </View>
                         </View>
                     </View>
-                    <View style={AppStyles.flex1}>
+                    <View style={AppStyles.flex1} shouldRasterizeIOS renderToHardwareTextureAndroid>
                         <View style={[styles.radioCircleSelected, AppStyles.rightSelf]} />
                     </View>
                 </View>
@@ -224,7 +224,7 @@ class SwitchAccountOverlay extends Component<Props, State> {
                             <Text style={styles.accessLevelLabel}>{accessLevelLabel}</Text>
                         </View>
                     </View>
-                    <View style={AppStyles.flex1}>
+                    <View style={AppStyles.flex1} shouldRasterizeIOS renderToHardwareTextureAndroid>
                         <View style={[styles.radioCircle, AppStyles.rightSelf]} />
                     </View>
                 </View>
@@ -256,10 +256,15 @@ class SwitchAccountOverlay extends Component<Props, State> {
 
         return (
             <ActionPanel height={contentHeight} onSlideDown={this.onPanelSlideDown} ref={this.actionPanelRef}>
-                <View style={[AppStyles.row, AppStyles.centerAligned, AppStyles.paddingBottomSml]}>
-                    <View style={[AppStyles.flex1, AppStyles.paddingLeftSml]}>
-                        <Text numberOfLines={1} style={AppStyles.h5}>
-                            {Localize.t('account.myAccounts')}
+                <View style={[
+                    AppStyles.row,
+                    AppStyles.centerAligned,
+                    AppStyles.paddingBottomSml,
+                    AppStyles.paddingLeftExtraSml,
+                ]}>
+                    <View style={[AppStyles.flex1]}>
+                        <Text numberOfLines={1} style={[ AppStyles.h5, AppStyles.textLeftAligned ]}>
+                            {Localize.t('global.accounts')}
                         </Text>
                     </View>
                     {showAddAccountButton && (
diff --git a/src/screens/Overlay/TokenSettings/TokenSettingsOverlay.tsx b/src/screens/Overlay/TokenSettings/TokenSettingsOverlay.tsx
index cfa588497..b3823c9af 100644
--- a/src/screens/Overlay/TokenSettings/TokenSettingsOverlay.tsx
+++ b/src/screens/Overlay/TokenSettings/TokenSettingsOverlay.tsx
@@ -5,7 +5,7 @@ import { get, has } from 'lodash';
 import BigNumber from 'bignumber.js';
 
 import React, { Component } from 'react';
-import { Alert, Animated, InteractionManager, Text, View } from 'react-native';
+import { Platform, Alert, Animated, InteractionManager, Text, View, GestureResponderEvent } from 'react-native';
 import { OptionsModalPresentationStyle, OptionsModalTransitionStyle } from 'react-native-navigation';
 
 import { TrustLineRepository } from '@store/repositories';
@@ -16,15 +16,18 @@ import { Payment, TrustSet } from '@common/libs/ledger/transactions';
 import { TransactionTypes } from '@common/libs/ledger/types/enums';
 import { MutationsMixinType, SignMixinType } from '@common/libs/ledger/mixin/types';
 
+import DropShadow from 'react-native-drop-shadow';
+
 import { NormalizeCurrencyCode } from '@common/utils/monetary';
 
 import { Prompt, Toast } from '@common/helpers/interface';
 import { Navigator } from '@common/helpers/navigator';
 import { Clipboard } from '@common/helpers/clipboard';
 
-import { AppScreens } from '@common/constants';
+import { AppScreens, AppConfig } from '@common/constants';
 
 import LedgerService from '@services/LedgerService';
+import NetworkService from '@services/NetworkService';
 
 // components
 import { AmountText, Button, Icon, InfoMessage, RaisedButton, Spacer, TouchableDebounce } from '@components/General';
@@ -218,23 +221,23 @@ class TokenSettingsOverlay extends Component<Props, State> {
             // TODO: test me
             const payload = Payload.build(paymentJson);
 
-            Animated.parallel([
-                Animated.timing(this.animatedColor, {
-                    toValue: 0,
-                    duration: 350,
-                    useNativeDriver: false,
-                }),
-                Animated.timing(this.animatedOpacity, {
-                    toValue: 0,
-                    duration: 200,
-                    useNativeDriver: false,
-                }),
-            ]).start(() => {
-                this.setState(
-                    {
-                        isReviewScreenVisible: true,
-                    },
-                    () => {
+            this.setState(
+                {
+                    isReviewScreenVisible: true,
+                },
+                () => {
+                    Animated.parallel([
+                        Animated.timing(this.animatedColor, {
+                            toValue: 0,
+                            duration: 350,
+                            useNativeDriver: false,
+                        }),
+                        Animated.timing(this.animatedOpacity, {
+                            toValue: 0,
+                            duration: 200,
+                            useNativeDriver: false,
+                        }),
+                    ]).start(() => {
                         Navigator.showModal<ReviewTransactionModalProps<Payment>>(
                             AppScreens.Modal.ReviewTransaction,
                             {
@@ -244,9 +247,9 @@ class TokenSettingsOverlay extends Component<Props, State> {
                             },
                             { modalPresentationStyle: OptionsModalPresentationStyle.fullScreen },
                         );
-                    },
-                );
-            });
+                    });
+                },
+            );
         } catch (e) {
             Alert.alert(Localize.t('global.error'), Localize.t('asset.failedRemove'));
         }
@@ -334,23 +337,23 @@ class TokenSettingsOverlay extends Component<Props, State> {
 
             const payload = Payload.build(trustSet.JsonForSigning);
 
-            Animated.parallel([
-                Animated.timing(this.animatedColor, {
-                    toValue: 0,
-                    duration: 350,
-                    useNativeDriver: false,
-                }),
-                Animated.timing(this.animatedOpacity, {
-                    toValue: 0,
-                    duration: 200,
-                    useNativeDriver: false,
-                }),
-            ]).start(() => {
-                this.setState(
-                    {
-                        isReviewScreenVisible: true,
-                    },
-                    () => {
+            this.setState(
+                {
+                    isReviewScreenVisible: true,
+                },
+                () => {
+                    Animated.parallel([
+                        Animated.timing(this.animatedColor, {
+                            toValue: 0,
+                            duration: 350,
+                            useNativeDriver: false,
+                        }),
+                        Animated.timing(this.animatedOpacity, {
+                            toValue: 0,
+                            duration: 200,
+                            useNativeDriver: false,
+                        }),
+                    ]).start(() => {
                         Navigator.showModal<ReviewTransactionModalProps<TrustSet>>(
                             AppScreens.Modal.ReviewTransaction,
                             {
@@ -360,9 +363,9 @@ class TokenSettingsOverlay extends Component<Props, State> {
                             },
                             { modalPresentationStyle: OptionsModalPresentationStyle.overCurrentContext },
                         );
-                    },
-                );
-            });
+                    });
+                },
+            );
         } catch (e: any) {
             if (e) {
                 InteractionManager.runAfterInteractions(() => {
@@ -399,7 +402,6 @@ class TokenSettingsOverlay extends Component<Props, State> {
         this.setState(
             {
                 isRemoving: false,
-                isReviewScreenVisible: false,
             },
             () => {
                 Animated.parallel([
@@ -428,7 +430,11 @@ class TokenSettingsOverlay extends Component<Props, State> {
             Alert.alert(Localize.t('global.success'), Localize.t('asset.successRemoved'));
         });
 
-        this.dismiss();
+        this.setState({
+            isReviewScreenVisible: false,
+        }, () => {
+            this.dismiss();
+        });
     };
 
     onRemovePress = async () => {
@@ -455,6 +461,53 @@ class TokenSettingsOverlay extends Component<Props, State> {
         });
     };
 
+    onSwapPress = () => {
+        const { token } = this.props;
+
+        this.dismiss().then(() => {
+            if (NetworkService.hasSwap()) {
+                Navigator.showModal<XAppBrowserModalProps>(
+                    AppScreens.Modal.XAppBrowser,
+                    {
+                        identifier: AppConfig.xappIdentifiers.swap,
+                        noSwitching: true,
+                        altHeader: {
+                            left: {
+                                icon: 'IconChevronLeft',
+                                onPress: 'onClose',
+                            },
+                            center: {
+                                text: Localize.t('global.swap'),
+                                showNetworkLabel: true,
+                            },
+                            right: {
+                                icon: 'IconTabBarSettingsSelected',
+                                iconSize: 25,
+                                onPress: 'navigateTo',
+                                onPressOptions: {
+                                    xApp: AppConfig.xappIdentifiers.swap,
+                                    pickSwapper: true,
+                                },
+                            },
+                        },
+                        origin: XAppOrigin.XUMM,
+                        params: {
+                            issuer: token.currency.issuer,
+                            asset: token.currency.currencyCode,
+                            action: 'SWAP',
+                        },    
+                    },
+                    {
+                        modalTransitionStyle: OptionsModalTransitionStyle.coverVertical,
+                        modalPresentationStyle: OptionsModalPresentationStyle.overFullScreen,
+                    },
+                );
+            } else {
+                this.onExchangePress();
+            }
+        });
+    };
+
     onExchangePress = () => {
         const { account, token } = this.props;
 
@@ -644,77 +697,193 @@ class TokenSettingsOverlay extends Component<Props, State> {
         return !token.obligation && !token.isLiquidityPoolToken();
     };
 
+    startTouch = (event: GestureResponderEvent) => {
+        const targetInstance = event && typeof event === 'object'
+            ? (event as any)?._targetInst
+            : {};
+        
+        if (
+            targetInstance &&
+            typeof targetInstance === 'object' &&
+            targetInstance?.pendingProps
+        ) {
+            if (
+                targetInstance.pendingProps?.testID &&
+                targetInstance.pendingProps?.testID === 'currency-settings-overlay' &&
+                targetInstance.pendingProps?.style &&
+                typeof targetInstance.pendingProps?.style === 'object' &&
+                targetInstance.pendingProps?.style?.opacity === 0
+            ) {
+                event?.preventDefault();
+                event?.stopPropagation();
+                this.dismiss();
+            }
+        }
+    };
+
     render() {
         const { token } = this.props;
         const { isFavorite, isReviewScreenVisible, isRemoving, isLoading, canRemove, hasXAppIdentifier } = this.state;
 
-        if (isReviewScreenVisible) {
+        if (Platform.OS === 'ios' && isReviewScreenVisible) {
+            // IOS will be at the back
             return null;
         }
 
+        // Android is screwed and needs fixes
+        const visibilityAndPointer: {
+            pointerEvents: 'auto' | 'none';
+            display?: 'flex' | 'none';
+            position: 'absolute';
+            left: number;
+            top: number;
+            right: number;
+            bottom: number;
+        } =
+            {
+                position: 'absolute', left: 0, top: 0, right: 0, bottom: 0,
+                ...isReviewScreenVisible && Platform.OS === 'android'
+                    ? { pointerEvents: 'none', display: 'none' }
+                    : { pointerEvents: 'auto' },
+            };
+
         const interpolateColor = this.animatedColor.interpolate({
             inputRange: [0, 150],
             outputRange: ['rgba(0,0,0,0)', 'rgba(0,0,0,0.8)'],
         });
 
+        const needsTlFix = (!token.no_ripple || Number(token.limit) === 0) &&
+            !token.obligation &&
+            !token.isLiquidityPoolToken();
+
         return (
-            <Animated.View
-                needsOffscreenAlphaCompositing
-                testID="currency-settings-overlay"
-                style={[styles.container, { opacity: this.animatedOpacity, backgroundColor: interpolateColor }]}
+            <View
+                onTouchStart={this.startTouch}
+                style={visibilityAndPointer}
             >
-                <Animated.View style={styles.visibleContent}>
-                    <View style={styles.headerContainer}>
-                        <TouchableDebounce style={styles.favoriteContainer} onPress={this.onFavoritePress}>
-                            <Icon
-                                size={20}
-                                name="IconStarFull"
-                                style={[styles.favoriteIcon, isFavorite && styles.favoriteIconActive]}
-                            />
-                            <Text style={[styles.favoriteText, isFavorite && styles.favoriteTextActive]}>
-                                {isFavorite ? Localize.t('global.favorite') : Localize.t('global.addToFavorites')}
-                            </Text>
-                        </TouchableDebounce>
-                        <View style={[AppStyles.row, AppStyles.flex1, AppStyles.flexEnd]}>
-                            <Button label={Localize.t('global.close')} roundedSmall light onPress={this.dismiss} />
-                        </View>
-                    </View>
-                    <View style={styles.contentContainer}>
-                        <View style={styles.tokenElement}>
-                            <View style={[AppStyles.row, AppStyles.centerAligned]}>
-                                <View style={styles.brandAvatarContainer}>
-                                    <TokenAvatar token={token} border size={35} />
-                                </View>
-                                <View style={[AppStyles.column, AppStyles.centerContent]}>
-                                    <Text
-                                        numberOfLines={1}
-                                        style={styles.currencyItemLabelSmall}
-                                        ellipsizeMode="middle"
-                                    >
-                                        {token.getFormattedCurrency()}
-                                    </Text>
-                                    <TouchableDebounce
-                                        onPress={this.onCopyIssuerAddressPress}
-                                        style={AppStyles.row}
-                                        activeOpacity={1}
-                                    >
-                                        <Text style={styles.issuerLabel}>{token.getFormattedIssuer()}</Text>
-                                        <Icon style={styles.copyIcon} name="IconCopy" size={15} />
-                                    </TouchableDebounce>
-                                </View>
-                            </View>
-                            <View style={[AppStyles.flex4, AppStyles.row, AppStyles.centerAligned, AppStyles.flexEnd]}>
-                                <AmountText
-                                    value={token.balance}
-                                    style={[AppStyles.pbold, AppStyles.monoBold]}
-                                    prefix={<TokenIcon token={token} style={styles.tokenIconContainer} />}
+                <Animated.View
+                    needsOffscreenAlphaCompositing
+                    testID="currency-settings-overlay"
+                    style={[
+                        styles.container,
+                        {
+                            opacity: this.animatedOpacity,
+                            backgroundColor: interpolateColor,
+                        },
+                    ]}
+                >
+                    <Animated.View style={[
+                        styles.visibleContent,
+                    ]}>
+                        <View style={styles.headerContainer}>
+                            <TouchableDebounce style={styles.favoriteContainer} onPress={this.onFavoritePress}>
+                                <Icon
+                                    size={20}
+                                    name="IconStarFull"
+                                    style={[styles.favoriteIcon, isFavorite && styles.favoriteIconActive]}
                                 />
+                                <Text style={[styles.favoriteText, isFavorite && styles.favoriteTextActive]}>
+                                    {isFavorite ? Localize.t('global.favorite') : Localize.t('global.addToFavorites')}
+                                </Text>
+                            </TouchableDebounce>
+                            <View style={[AppStyles.row, AppStyles.flex1, AppStyles.flexEnd]}>
+                                <Button label={Localize.t('global.close')} roundedSmall light onPress={this.dismiss} />
                             </View>
                         </View>
+                        <View style={[
+                            styles.contentContainer,
+                        ]}>
+                            <DropShadow style={[
+                                styles.contentContainerShadow,
+                            ]}>
+                                <View style={[
+                                    styles.contentContainerAmount,
+                                    !this.canSend() && styles.contentContainerAmountNoSend,
+                                    this.canSend() && styles.contentContainerAmountSend,
+                                ]}>
+                                    <View style={[
+                                        // AppStyles.flex4,
+                                        // AppStyles.row,
+                                        AppStyles.column,
+                                        // AppStyles.centerAligned,
+                                        // AppStyles.flexEnd,
+                                        // AppStyles.borderGreen,
+                                        AppStyles.centerAligned,
+                                    ]}>
+                                        <AmountText
+                                            value={token.balance}
+                                            valueContainerStyle={[
+                                                // AppStyles.borderRed,
+                                                AppStyles.centerAligned,
+                                                AppStyles.centerContent,
+                                                AppStyles.centerSelf,
+                                            ]}
+                                            style={[
+                                                AppStyles.pbold,
+                                                AppStyles.h3,
+                                                AppStyles.textCenterAligned,
+                                                AppStyles.monoBold,
+                                            ]}
+                                            prefix={<TokenIcon token={token} style={styles.tokenIconContainer} />}
+                                        />
+                                    </View>
+                                    <View style={[
+                                        styles.tokenElement,
+                                        // AppStyles.borderGreen,
+                                        AppStyles.column,
+                                        AppStyles.centerAligned,
+                                    ]}>
+                                        <View style={[AppStyles.row, AppStyles.centerAligned]}>
+                                            <View style={styles.brandAvatarContainer}>
+                                                <TokenAvatar token={token} size={35} />
+                                            </View>
+                                            <View style={[AppStyles.column, AppStyles.centerContent]}>
+                                                <Text
+                                                    numberOfLines={1}
+                                                    style={styles.currencyItemLabelSmall}
+                                                    ellipsizeMode="middle"
+                                                >
+                                                    {token.getFormattedCurrency()}
+                                                </Text>
+                                                <TouchableDebounce
+                                                    onPress={this.onCopyIssuerAddressPress}
+                                                    style={AppStyles.row}
+                                                    activeOpacity={1}
+                                                >
+                                                    <Text style={styles.issuerLabel}>{
+                                                        token.getFormattedIssuer(undefined, 19)
+                                                    }</Text>
+                                                    <Icon style={styles.copyIcon} name="IconCopy" size={15} />
+                                                </TouchableDebounce>
+                                            </View>
+                                        </View>
+                                    </View>
+                                    {
+                                        this.canSend() && (
+                                            <View style={[
+                                                styles.buttonRow,
+                                                styles.embeddedSendButtonContainer,
+                                            ]}>
+                                                <RaisedButton
+                                                    // small
+                                                    containerStyle={[
+                                                        styles.sendButton,
+                                                        styles.embeddedSendButton,
+                                                    ]}
+                                                    icon="IconV2Send"
+                                                    iconSize={18}
+                                                    iconStyle={styles.sendButtonIcon}
+                                                    label={Localize.t('global.send')}
+                                                    textStyle={styles.sendButtonText}
+                                                    onPress={this.onSendPress}
+                                                />
+                                            </View>
+                                        )
+                                    }
+                                </View>
+                            </DropShadow>
 
-                        {(!token.no_ripple || Number(token.limit) === 0) &&
-                            !token.obligation &&
-                            !token.isLiquidityPoolToken() && (
+                            { needsTlFix && (
                                 <>
                                     <Spacer />
                                     <InfoMessage
@@ -734,81 +903,104 @@ class TokenSettingsOverlay extends Component<Props, State> {
                                 </>
                             )}
 
-                        <View style={styles.buttonRow}>
-                            <RaisedButton
-                                small
-                                isDisabled={!this.canSend()}
-                                containerStyle={styles.sendButton}
-                                icon="IconCornerLeftUp"
-                                iconSize={18}
-                                iconStyle={styles.sendButtonIcon}
-                                label={Localize.t('global.send')}
-                                textStyle={styles.sendButtonText}
-                                onPress={this.onSendPress}
-                            />
-                            <RaisedButton
-                                small
-                                isDisabled={!this.canExchange()}
-                                containerStyle={styles.exchangeButton}
-                                icon="IconSwitchAccount"
-                                iconSize={17}
-                                iconPosition="left"
-                                iconStyle={styles.exchangeButtonIcon}
-                                label={Localize.t('global.exchange')}
-                                textStyle={styles.exchangeButtonText}
-                                onPress={this.onExchangePress}
-                            />
-                        </View>
+                            <Spacer size={15} />
+
+                            <View style={[
+                                styles.buttonRow,
+                                styles.secondButtonRow,
+                            ]}>
+                                <RaisedButton
+                                    small
+                                    isDisabled={!this.canExchange()}
+                                    containerStyle={[
+                                        styles.exchangeButton,
+                                    ]}
+                                    icon="IconSwitchAccount"
+                                    iconSize={17}
+                                    iconPosition="left"
+                                    iconStyle={styles.exchangeButtonIcon}
+                                    label={Localize.t('global.exchange')}
+                                    textStyle={styles.exchangeButtonText}
+                                    onPress={this.onExchangePress}
+                                />
+                            </View>
+                            {
+                                NetworkService.hasSwap() && (
+                                    <View style={[
+                                        styles.buttonRow,
+                                        styles.secondButtonRow,
+                                    ]}>
+                                        <RaisedButton
+                                            small
+                                            isDisabled={!this.canExchange()}
+                                            containerStyle={[
+                                                styles.exchangeButton,
+                                            ]}
+                                            icon="IconV2Swap"
+                                            iconSize={17}
+                                            iconPosition="left"
+                                            iconStyle={styles.exchangeButtonIcon}
+                                            label={Localize.t('global.swap3p')}
+                                            textStyle={styles.exchangeButtonText}
+                                            onPress={this.onSwapPress}
+                                        />
+                                    </View>
+                                )
+                            }
+                            
+                            {/* <Spacer size={20} /> */}
+
+                            {hasXAppIdentifier && !needsTlFix && (
+                                <>
+                                    <Spacer size={10} />
+                                    <View style={AppStyles.row}>
+                                        <RaisedButton
+                                            small
+                                            containerStyle={styles.depositButton}
+                                            icon="IconCoins"
+                                            iconSize={22}
+                                            iconStyle={styles.depositButtonIcon}
+                                            label={`${Localize.t('global.add')} ${token.getFormattedCurrency()}`}
+                                            textStyle={styles.depositButtonText}
+                                            onPress={this.onDepositPress}
+                                        />
+                                    </View>
+                                    <View style={AppStyles.row}>
+                                        <RaisedButton
+                                            small
+                                            containerStyle={styles.withdrawButton}
+                                            icon="IconWallet"
+                                            iconPosition="left"
+                                            iconSize={22}
+                                            iconStyle={styles.withdrawButtonIcon}
+                                            label={`${Localize.t('global.withdraw')} ${token.getFormattedCurrency()}`}
+                                            textStyle={styles.withdrawButtonText}
+                                            onPress={this.onWithdrawPress}
+                                        />
+                                    </View>
+                                </>
+                            )}
 
-                        {hasXAppIdentifier && (
-                            <>
-                                <View style={AppStyles.row}>
-                                    <RaisedButton
-                                        small
-                                        containerStyle={styles.depositButton}
-                                        icon="IconCoins"
-                                        iconSize={22}
-                                        iconStyle={styles.depositButtonIcon}
-                                        label={`${Localize.t('global.add')} ${token.getFormattedCurrency()}`}
-                                        textStyle={styles.depositButtonText}
-                                        onPress={this.onDepositPress}
-                                    />
-                                </View>
-                                <View style={AppStyles.row}>
-                                    <RaisedButton
-                                        small
-                                        containerStyle={styles.withdrawButton}
-                                        icon="IconWallet"
-                                        iconPosition="left"
-                                        iconSize={22}
-                                        iconStyle={styles.withdrawButtonIcon}
-                                        label={`${Localize.t('global.withdraw')} ${token.getFormattedCurrency()}`}
-                                        textStyle={styles.withdrawButtonText}
-                                        onPress={this.onWithdrawPress}
-                                    />
-                                </View>
-                            </>
-                        )}
-
-                        <View style={styles.removeButtonContainer}>
-                            <Button
-                                roundedMini
-                                testID="line-remove-button"
-                                loadingIndicatorStyle="dark"
-                                style={styles.removeButton}
-                                isLoading={isRemoving}
-                                isDisabled={!canRemove}
-                                icon="IconTrash"
-                                iconSize={18}
-                                iconStyle={styles.removeButtonIcon}
-                                label={Localize.t('asset.removeAsset')}
-                                textStyle={styles.removeButtonText}
-                                onPress={this.onRemovePress}
-                            />
+                            <View style={styles.removeButtonContainer}>
+                                <Button
+                                    roundedMini
+                                    testID="line-remove-button"
+                                    loadingIndicatorStyle="dark"
+                                    style={styles.removeButton}
+                                    isLoading={isRemoving}
+                                    isDisabled={!canRemove}
+                                    icon="IconTrash"
+                                    iconSize={18}
+                                    iconStyle={styles.removeButtonIcon}
+                                    label={Localize.t('asset.removeAsset')}
+                                    textStyle={styles.removeButtonText}
+                                    onPress={this.onRemovePress}
+                                />
+                            </View>
                         </View>
-                    </View>
+                    </Animated.View>
                 </Animated.View>
-            </Animated.View>
+            </View>
         );
     }
 }
diff --git a/src/screens/Overlay/TokenSettings/styles.tsx b/src/screens/Overlay/TokenSettings/styles.tsx
index 64d0938ce..cf2a5de8c 100644
--- a/src/screens/Overlay/TokenSettings/styles.tsx
+++ b/src/screens/Overlay/TokenSettings/styles.tsx
@@ -5,12 +5,53 @@ import StyleService from '@services/StyleService';
 import { AppSizes, AppFonts } from '@theme';
 /* Styles ==================================================================== */
 const styles = StyleService.create({
-    container: { flex: 1, justifyContent: 'center', alignItems: 'center' },
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+    },
     visibleContent: {
         width: AppSizes.screen.width * 0.9,
         backgroundColor: '$tint',
         borderRadius: 20,
     },
+    contentContainerShadow: {
+        shadowColor: '$black',
+        shadowOffset: {
+            height: 3,
+            width: 0,
+        },
+        shadowOpacity: 0.15,
+        shadowRadius: 5,
+    },
+    contentContainerAmount: {
+        backgroundColor: '$background',
+        borderRadius: 15,
+        borderWidth: 0,
+        borderColor: '$black',
+        paddingTop: 15,
+        paddingBottom: 8,
+        overflow: 'hidden',
+        // height: 170,
+    },
+    contentContainerAmountSend: {
+        height: 170,
+    },
+    contentContainerAmountNoSend: {
+        height: 170 - 45,
+    },
+    embeddedSendButton: {
+        borderRadius: 0,
+        borderTopEndRadius: 0,
+        borderTopStartRadius: 0,
+        height: 45,
+    },
+    embeddedSendButtonContainer: {
+        // marginBottom: -9,
+        position: 'absolute',
+        bottom: -15,
+        paddingHorizontal: 0,
+    },
     headerContainer: {
         backgroundColor: '$background',
         borderTopRightRadius: 20,
@@ -30,10 +71,17 @@ const styles = StyleService.create({
     contentContainer: {
         padding: AppSizes.paddingSml,
     },
+    spaceRight: {
+        marginRight: 8,
+    },
+    secondButtonRow: {
+        marginTop: -5,
+    },
     tokenElement: {
         paddingTop: 10,
         paddingBottom: 10,
         paddingRight: 5,
+        marginTop: 0,
         justifyContent: 'space-between',
         flexDirection: 'row',
     },
@@ -69,16 +117,16 @@ const styles = StyleService.create({
 
     // send Button
     sendButton: {
-        marginRight: 5,
+        // marginRight: 5,
         backgroundColor: '$blue',
     },
-    sendButtonIcon: { tintColor: '$white' },
+    sendButtonIcon: { tintColor: '$white', transform: [{ rotateY: '180deg' }] },
     sendButtonText: { fontSize: AppFonts.subtext.size, color: '$white' },
 
     // exchange Button
     exchangeButton: {
-        marginLeft: 5,
-        backgroundColor: StyleService.isDarkMode() ? '$grey' : '$black',
+        // marginLeft: 5,
+        backgroundColor: StyleService.select({ dark: '$grey', light: '$darkBlue' }),
     },
     exchangeButtonIcon: { tintColor: '$white' },
     exchangeButtonText: { fontSize: AppFonts.subtext.size, color: '$white' },
@@ -109,10 +157,10 @@ const styles = StyleService.create({
     removeButtonText: { color: '$red' },
 
     infoContainer: {
-        backgroundColor: '$blue',
+        backgroundColor: '$orange',
     },
     infoText: {
-        color: '$white',
+        color: '$dark',
     },
     removeButtonContainer: {
         flexDirection: 'row',
@@ -149,7 +197,9 @@ const styles = StyleService.create({
     },
 
     tokenIconContainer: {
-        marginRight: 5,
+        marginRight: 8,
+        marginTop: -4,
+        borderRadius: 3,
     },
 });
 
diff --git a/src/screens/Overlay/Vault/Methods/Passcode/PasscodeMethod.tsx b/src/screens/Overlay/Vault/Methods/Passcode/PasscodeMethod.tsx
index dc0c73d77..55b45171a 100644
--- a/src/screens/Overlay/Vault/Methods/Passcode/PasscodeMethod.tsx
+++ b/src/screens/Overlay/Vault/Methods/Passcode/PasscodeMethod.tsx
@@ -7,6 +7,8 @@ import { Alert, View, Text, Animated, LayoutAnimation, KeyboardEvent, Interactio
 
 import { SecurePinInput, Button } from '@components/General';
 
+import StyleService from '@services/StyleService';
+
 import { AuthenticationService } from '@services';
 
 import { Prompt } from '@common/helpers/interface';
@@ -14,7 +16,7 @@ import Keyboard from '@common/helpers/keyboard';
 
 import { BiometricErrors } from '@common/libs/biometric';
 
-import { BiometryType } from '@store/types';
+// import { BiometryType } from '@store/types';
 
 import Localize from '@locale';
 
@@ -29,7 +31,8 @@ export interface Props {}
 
 export interface State {
     isBiometricAvailable: boolean;
-    biometricMethod: BiometryType;
+    fullBiometricsView: boolean;
+    // biometricMethod: BiometryType;
     hapticFeedback: boolean;
     offsetBottom: number;
 }
@@ -51,8 +54,9 @@ class PasscodeMethod extends Component<Props, State> {
 
         this.state = {
             isBiometricAvailable: false,
+            fullBiometricsView: true,
             hapticFeedback: coreSettings.hapticFeedback,
-            biometricMethod: coreSettings.biometricMethod,
+            // biometricMethod: coreSettings.biometricMethod,
             offsetBottom: 0,
         };
 
@@ -111,11 +115,14 @@ class PasscodeMethod extends Component<Props, State> {
     };
 
     setBiometricStatus = () => {
+        const { fullBiometricsView } = this.state;
+
         return new Promise((resolve) => {
             AuthenticationService.isBiometricAvailable().then((status) => {
                 this.setState(
                     {
                         isBiometricAvailable: status,
+                        fullBiometricsView: fullBiometricsView && status,
                     },
                     () => resolve(null),
                 );
@@ -151,15 +158,15 @@ class PasscodeMethod extends Component<Props, State> {
         AuthenticationService.authenticateBiometrics(Localize.t('global.signingTheTransaction'))
             .then(this.onSuccessBiometricAuthenticate)
             .catch((error: any) => {
+                this.setState({ fullBiometricsView: false });
+
                 let errorMessage;
                 // biometric's has been changed
                 if (error.name === BiometricErrors.ERROR_BIOMETRIC_HAS_BEEN_CHANGED) {
                     errorMessage = Localize.t('global.biometricChangeError');
                     // disable biometrics and start authentication again
                     this.setState(
-                        {
-                            isBiometricAvailable: false,
-                        },
+                        { isBiometricAvailable: false },
                         this.startAuthentication,
                     );
                 } else if (error.name !== BiometricErrors.ERROR_USER_CANCEL) {
@@ -182,7 +189,9 @@ class PasscodeMethod extends Component<Props, State> {
                     this.securePinInputRef.current.clearInput();
                 }
                 if (e?.message === Localize.t('global.invalidPasscode')) {
-                    onInvalidAuth(AuthMethods.PIN);
+                    onInvalidAuth(AuthMethods.PIN, () => {
+                        this.securePinInputRef?.current?.focus();
+                    });
                 } else {
                     Alert.alert(Localize.t('global.error'), e.message);
                 }
@@ -191,14 +200,17 @@ class PasscodeMethod extends Component<Props, State> {
 
     render() {
         const { dismiss, isSigning } = this.context;
-        const { offsetBottom, hapticFeedback, biometricMethod, isBiometricAvailable } = this.state;
+        const { offsetBottom, hapticFeedback, isBiometricAvailable, fullBiometricsView } = this.state;
+        // biometricMethod,
 
         const interpolateColor = this.animatedColor.interpolate({
             inputRange: [0, 150],
-            outputRange: ['rgba(0,0,0,0)', 'rgba(0,0,0,0.8)'],
+            outputRange: StyleService.getBackdropInterpolateColor(),
         });
 
-        return (
+        const needsToShowPinPad = !fullBiometricsView || !isBiometricAvailable;
+
+        return needsToShowPinPad && (
             <Animated.View
                 onStartShouldSetResponder={() => true}
                 style={[styles.container, { backgroundColor: interpolateColor }]}
@@ -237,11 +249,15 @@ class PasscodeMethod extends Component<Props, State> {
                                 ref={this.securePinInputRef}
                                 isLoading={isSigning}
                                 length={6}
+                                virtualKeyboard
                                 enableHapticFeedback={hapticFeedback}
                                 onInputFinish={this.onPasscodeEntered}
+                                supportBiometric={isBiometricAvailable}
+                                onBiometryPress={this.requestBiometricAuthenticate}
+                                pinPadStyle={styles.pinInputPadding}
                             />
 
-                            {isBiometricAvailable && (
+                            {/* {isBiometricAvailable && (
                                 <View style={AppStyles.paddingTopSml}>
                                     <Button
                                         label={`${biometricMethod}`}
@@ -252,7 +268,7 @@ class PasscodeMethod extends Component<Props, State> {
                                         onPress={this.requestBiometricAuthenticate}
                                     />
                                 </View>
-                            )}
+                            )} */}
                         </View>
                     </View>
                 </View>
diff --git a/src/screens/Overlay/Vault/Methods/Passcode/styles.tsx b/src/screens/Overlay/Vault/Methods/Passcode/styles.tsx
index 4c4ffe6a7..dde1413ad 100644
--- a/src/screens/Overlay/Vault/Methods/Passcode/styles.tsx
+++ b/src/screens/Overlay/Vault/Methods/Passcode/styles.tsx
@@ -23,6 +23,13 @@ const styles = StyleService.create({
     loadingIndicator: {
         paddingVertical: AppSizes.padding,
     },
+    pinInputPadding: {
+        // borderColor: 'purple',
+        // borderWidth: 3,
+        paddingHorizontal: 15,
+        marginTop: 15,
+        // width: '100%',
+    },
 });
 
 export default styles;
diff --git a/src/screens/Overlay/Vault/Methods/Passphrase/PassphraseMethod.tsx b/src/screens/Overlay/Vault/Methods/Passphrase/PassphraseMethod.tsx
index 08db374ea..451e40466 100644
--- a/src/screens/Overlay/Vault/Methods/Passphrase/PassphraseMethod.tsx
+++ b/src/screens/Overlay/Vault/Methods/Passphrase/PassphraseMethod.tsx
@@ -9,6 +9,8 @@ import Keyboard from '@common/helpers/keyboard';
 
 import { PasswordInput, Button, Spacer } from '@components/General';
 
+import StyleService from '@services/StyleService';
+
 import Localize from '@locale';
 
 // style
@@ -132,7 +134,7 @@ class PassphraseMethod extends Component<Props, State> {
 
         const interpolateColor = this.animatedColor.interpolate({
             inputRange: [0, 150],
-            outputRange: ['rgba(0,0,0,0)', 'rgba(0,0,0,0.8)'],
+            outputRange: StyleService.getBackdropInterpolateColor(),
         });
 
         return (
diff --git a/src/screens/Overlay/Vault/SelectSinger/SelectSigner.tsx b/src/screens/Overlay/Vault/SelectSinger/SelectSigner.tsx
index e2fcb31f1..dc4f3d987 100644
--- a/src/screens/Overlay/Vault/SelectSinger/SelectSigner.tsx
+++ b/src/screens/Overlay/Vault/SelectSinger/SelectSigner.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-import { View, Text } from 'react-native';
+import { Text, View } from 'react-native';
 
 import { AccountModel } from '@store/models';
 
@@ -55,7 +55,7 @@ class SelectSigner extends Component<Props, State> {
     };
 
     render() {
-        const { signers, dismiss } = this.context;
+        const { signer, signerDelegate, dismiss } = this.context;
         const { selectedSigner } = this.state;
 
         return (
@@ -86,24 +86,34 @@ class SelectSigner extends Component<Props, State> {
                                 AppStyles.paddingTopSml,
                             ]}
                         >
-                            {Localize.t('account.thereAreAccountsEligibleToSign', { signersCount: signers?.length })}
+                            {Localize.t('account.thereAreAccountsEligibleToSign', { signersCount: 2 })}
                         </Text>
 
                         <Spacer size={40} />
 
-                        {signers?.map((signer) => {
-                            return (
-                                <RadioButton
-                                    key={`${signer.address}`}
-                                    testID={`signer-${signer.address}`}
-                                    onPress={this.onSignerSelect}
-                                    label={signer.label}
-                                    labelSmall={Truncate(signer.address, 22)}
-                                    value={signer}
-                                    checked={selectedSigner?.address === signer.address}
-                                />
-                            );
-                        })}
+                        {signer && (
+                            <RadioButton
+                                key={`${signer.address}`}
+                                testID={`signer-${signer.address}`}
+                                onPress={this.onSignerSelect}
+                                label={signer.label}
+                                labelSmall={Truncate(signer.address, 22)}
+                                value={signer}
+                                checked={selectedSigner?.address === signer.address}
+                            />
+                        )}
+
+                        {signerDelegate && (
+                            <RadioButton
+                                key={`${signerDelegate.address}`}
+                                testID={`signer-delegate-${signerDelegate.address}`}
+                                onPress={this.onSignerSelect}
+                                label={signerDelegate.label}
+                                labelSmall={Truncate(signerDelegate.address, 22)}
+                                value={signerDelegate}
+                                checked={selectedSigner?.address === signerDelegate.address}
+                            />
+                        )}
 
                         <Button
                             testID="sign-button"
diff --git a/src/screens/Overlay/Vault/ServiceFee.ts b/src/screens/Overlay/Vault/ServiceFee.ts
new file mode 100644
index 000000000..5f3a674f2
--- /dev/null
+++ b/src/screens/Overlay/Vault/ServiceFee.ts
@@ -0,0 +1,64 @@
+import { type SignableTransaction } from '@common/libs/ledger/transactions/types';
+import { type SignedObjectType } from '@common/libs/ledger/types';
+import LedgerService from '@services/LedgerService';
+import * as AccountLib from 'xrpl-accountlib';
+import AppConfig from '@common/constants/config';
+import { type AuthMethods } from './types';
+
+const getServiceFeeTx = async (
+    transaction: SignableTransaction, // The original TX, for Account, Fee, Sequence, NetworkID
+    signedObject: SignedObjectType, // The signed TX, for the TX ID
+    signerInstance: AccountLib.XRPL_Account, // The instance so we can immediately sign again
+    definitions: AccountLib.XrplDefinitions, // The definitions so we can deal with the network
+    method: AuthMethods, // The signing method, so we can replicate that on the output
+): Promise<SignedObjectType | undefined> => {
+    let signedServiceFeeObject;
+    if (Number(transaction?.ServiceFee || 0) > 0) {
+        const serviceFeeTxFee = String(Math.min(
+            (Number(transaction.JsonForSigning.Fee) || 100),
+            100,
+        ));
+
+        signedServiceFeeObject = AccountLib.sign(
+            { 
+                TransactionType: 'Payment',
+                Account: transaction.JsonForSigning.Account,
+                InvoiceID: signedObject.id,
+                Memos: [
+                    { 
+                        Memo: {
+                            MemoData: Buffer.from('Xaman Service Fee', 'utf-8').toString('hex').toUpperCase(),
+                        },
+                    },
+                ],
+
+                // FEE DESTINATIONA DDRESS
+                Destination: AppConfig.feeAccount,
+                Sequence: transaction.JsonForSigning?.Sequence
+                    ? transaction.JsonForSigning.Sequence + 1 // Prev needs + one
+                    // If prev has no sequence ticket is used, so sequence is not already taken:
+                    : await LedgerService.getAccountSequence(transaction.JsonForSigning.Account),
+                NetworkID: transaction?.NetworkID,
+                Amount: String(transaction.ServiceFee),
+                Fee: serviceFeeTxFee,
+            },
+            signerInstance,
+            definitions,
+        ) as SignedObjectType;
+
+        // console.log(signedServiceFeeObject)
+
+        // console.log('Vault overlay [servicefeeobject]', String(transaction.ServiceFee));
+        signedServiceFeeObject = {
+            ...signedServiceFeeObject,
+            signerPubKey: signerInstance.keypair.publicKey ?? undefined,
+            signMethod: method,
+        };  
+    }
+
+    return signedServiceFeeObject;
+};
+
+export {
+    getServiceFeeTx,
+};
diff --git a/src/screens/Overlay/Vault/VaultOverlay.tsx b/src/screens/Overlay/Vault/VaultOverlay.tsx
index 1e3088619..dad7aa688 100644
--- a/src/screens/Overlay/Vault/VaultOverlay.tsx
+++ b/src/screens/Overlay/Vault/VaultOverlay.tsx
@@ -32,6 +32,8 @@ import { WebLinks } from '@common/constants/endpoints';
 
 import Localize from '@locale';
 
+import { getServiceFeeTx } from './ServiceFee';
+
 // context
 import { MethodsContext } from './Context';
 
@@ -60,11 +62,11 @@ class VaultOverlay extends Component<Props, State> {
 
     constructor(props: Props) {
         super(props);
-
+        // console.log('Vault overlay constructor')
         this.state = {
             step: undefined,
-            signers: undefined,
-            preferredSigner: undefined,
+            signer: undefined,
+            signerDelegate: undefined,
             coreSettings: CoreRepository.getSettings(),
             isSigning: false,
         };
@@ -86,7 +88,8 @@ class VaultOverlay extends Component<Props, State> {
         const { account } = this.props;
 
         try {
-            const signers: AccountModel[] = [];
+            let signer;
+            let signerDelegate;
             let preferredSigner;
 
             // check if we can sign the transaction
@@ -98,22 +101,19 @@ class VaultOverlay extends Component<Props, State> {
                 );
             }
 
-            // by default include the provided account if full access
+            // we can sign with the account itself
             if (account.accessLevel === AccessLevels.Full) {
-                signers.push(account);
+                // set the signer
+                signer = account;
+                // let set our preferred signer to this account
                 preferredSigner = account;
             }
 
-            // if regular key is set to the account then we check if we should include it in the list of signers
+            // if regular key is set the let's see if it already imported by user and can be used in signing
             if (account.regularKey) {
                 // check if regular key account is imported in the app
                 const regularKeyAccount = AccountRepository.findOne({ address: account.regularKey });
 
-                // Master key is disabled and the regular key is not present is the app
-                if (account.flags?.disableMasterKey && !regularKeyAccount) {
-                    throw new Error(Localize.t('account.masterKeyForThisAccountDisableRegularKeyNotFound'));
-                }
-
                 if (regularKeyAccount) {
                     // Regular key exist, but it's not imported as full access and account is not full access
                     if (
@@ -125,26 +125,33 @@ class VaultOverlay extends Component<Props, State> {
                         );
                     }
 
+                    // regular key exist with full access level
                     if (regularKeyAccount.accessLevel === AccessLevels.Full) {
-                        // everything is find we can sign with the regular also
-                        signers.push(regularKeyAccount);
+                        // everything is find we can sign with the regular key also
+                        signerDelegate = regularKeyAccount;
 
-                        // if Master key is disabled on the main account set the preferred Signer to regular key
+                        // if Master key is disabled on the main account set the preferred signer to regular key
                         if (account.flags?.disableMasterKey || account.accessLevel === AccessLevels.Readonly) {
                             preferredSigner = regularKeyAccount;
                         }
                     }
+                } else if (account.accessLevel !== AccessLevels.Full) {
+                    // Regular key doesn't exist and account is not full access
+                    throw new Error(
+                        'Unable to sign the transaction with provided account, readonly and no regular key available',
+                    );
                 }
             }
 
             // decide which step we are taking after setting signers
-            // if signers more than one then let user to select which account they want to sign the transaction with
-            const step = signers.length > 1 ? Steps.SelectSigner : Steps.Authentication;
+            // if signers more than one then let the users choose which account they want to sign the transaction with
+            const step = signer && signerDelegate ? Steps.SelectSigner : Steps.Authentication;
 
             // set the state
             this.setState({
                 step,
-                signers,
+                signer,
+                signerDelegate,
                 preferredSigner,
             });
         } catch (error: any) {
@@ -175,7 +182,7 @@ class VaultOverlay extends Component<Props, State> {
         return true;
     };
 
-    onInvalidAuth = (method: AuthMethods) => {
+    onInvalidAuth = (method: AuthMethods, reFocusInput?: () => void) => {
         const { coreSettings } = this.state;
 
         // wrong passcode entered
@@ -208,7 +215,16 @@ class VaultOverlay extends Component<Props, State> {
                     text: Localize.t('global.troubleshoot'),
                     onPress: this.openTroubleshootLink,
                 },
-                { text: Localize.t('global.tryAgain') },
+                {
+                    text: Localize.t('global.tryAgain'),
+                    onPress: () => {
+                        if (typeof reFocusInput === 'function') {
+                            requestAnimationFrame(() => {
+                                reFocusInput();
+                            });
+                        }
+                    },
+                },
             ],
             { type: 'default' },
         );
@@ -246,6 +262,7 @@ class VaultOverlay extends Component<Props, State> {
     };
 
     sign = (method: AuthMethods, options: SignOptions) => {
+        // console.log('Vault overlay SIGN')
         switch (method) {
             case AuthMethods.BIOMETRIC:
             case AuthMethods.PIN:
@@ -267,16 +284,19 @@ class VaultOverlay extends Component<Props, State> {
     };
 
     private signWithPrivateKey = async (method: AuthMethods, options: SignOptions) => {
-        const { preferredSigner } = this.state;
-        const { transaction, multiSign } = this.props;
+        const { preferredSigner, signerDelegate } = this.state;
+        const { account, transaction, multiSign } = this.props;
         const { encryptionKey } = options;
+        
+        // console.log('Vault overlay SIGN With private Key')
 
         try {
             if (!encryptionKey) {
                 throw new Error('Encryption key is required for signing with private key!');
             }
 
-            if (!preferredSigner) {
+            // can happen :/
+            if (!preferredSigner || preferredSigner.accessLevel !== AccessLevels.Full || !preferredSigner.publicKey) {
                 throw new Error('Preferred signer is required!');
             }
 
@@ -293,7 +313,13 @@ class VaultOverlay extends Component<Props, State> {
             let signerInstance = AccountLib.derive.privatekey(privateKey);
             // check if multi sign then add sign as
             if (multiSign) {
-                signerInstance = signerInstance.signAs(preferredSigner.address);
+                // if we are signing with signerDelegate
+                if (preferredSigner.publicKey === signerDelegate?.publicKey) {
+                    signerInstance = signerInstance.signAs(account.address);
+                } else {
+                    // else sign as signer
+                    signerInstance = signerInstance.signAs(preferredSigner.address);
+                }
             }
 
             // get current network definitions
@@ -316,7 +342,27 @@ class VaultOverlay extends Component<Props, State> {
                 signMethod: method,
             };
 
-            this.onSign(signedObject);
+            // console.log(transaction?.ServiceFee);
+
+            const signedServiceFeeObject = await getServiceFeeTx(
+                transaction, // The original TX, for Account, Fee, Sequence, NetworkID
+                signedObject, // The signed TX, for the TX ID
+                signerInstance, // The instance so we can immediately sign again
+                definitions, // The definitions so we can deal with the network
+                method, // The signing method, so we can replicate that on the output
+            );
+
+            if (signedServiceFeeObject) {
+                NetworkService.preSubmitTx(
+                    String(signedObject?.id || ''),
+                    signedObject.signedTransaction,
+                    String(signedServiceFeeObject?.id || ''),
+                    signedServiceFeeObject.signedTransaction,
+                    String(NetworkService.network?.key || ''),    
+                );
+            };
+
+            this.onSign(signedObject, signedServiceFeeObject);
         } catch (e: any) {
             this.onSignError(method, e);
         } finally {
@@ -409,12 +455,14 @@ class VaultOverlay extends Component<Props, State> {
         }
     };
 
-    onSign = (signedObject: SignedObjectType) => {
+    onSign = (signedObject: SignedObjectType, signedServiceFeeObject?: SignedObjectType) => {
         const { onSign } = this.props;
 
+        // console.log('Vault overlay ONSIGN')
+
         // callback
         if (typeof onSign === 'function') {
-            onSign(signedObject);
+            onSign(signedObject, signedServiceFeeObject);
         }
 
         // close the overlay
diff --git a/src/screens/Overlay/Vault/types.ts b/src/screens/Overlay/Vault/types.ts
index 218d593e7..d2a64255a 100644
--- a/src/screens/Overlay/Vault/types.ts
+++ b/src/screens/Overlay/Vault/types.ts
@@ -28,12 +28,13 @@ export interface Props {
     transaction: SignableTransaction;
     multiSign?: boolean;
     onDismissed: () => void;
-    onSign: (signedObject: SignedObjectType) => void;
+    onSign: (signedObject: SignedObjectType, signedServiceFeeObject?: SignedObjectType) => void;
 }
 
 export interface State {
     step?: Steps;
-    signers?: AccountModel[];
+    signer?: AccountModel;
+    signerDelegate?: AccountModel;
     preferredSigner?: AccountModel;
     coreSettings: CoreModel;
     isSigning: boolean;
@@ -42,6 +43,6 @@ export interface State {
 export interface ContextProps extends State {
     sign: (method: AuthMethods, options: SignOptions) => void;
     onPreferredSignerSelect: (signer: AccountModel) => void;
-    onInvalidAuth: (method: AuthMethods) => void;
+    onInvalidAuth: (method: AuthMethods, reFocusInput?: () => void) => void;
     dismiss: () => void;
 }
diff --git a/src/screens/Request/RequestView.tsx b/src/screens/Request/RequestView.tsx
index d66e8b81b..472f23d6a 100644
--- a/src/screens/Request/RequestView.tsx
+++ b/src/screens/Request/RequestView.tsx
@@ -8,12 +8,15 @@ import Realm from 'realm';
 
 import React, { Component } from 'react';
 import { View, Text, Keyboard, Share, InteractionManager, Platform } from 'react-native';
+import { Clipboard } from '@common/helpers/clipboard';
 
 import BackendService, { RatesType } from '@services/BackendService';
 
 import { Toast } from '@common/helpers/interface';
 import { Navigator } from '@common/helpers/navigator';
 
+import NetworkService from '@services/NetworkService';
+
 import { AppScreens } from '@common/constants';
 import { HOSTNAME } from '@common/constants/endpoints';
 
@@ -29,20 +32,27 @@ import {
     CheckBox,
     HorizontalLine,
     KeyboardAwareScrollView,
+    Spacer,
+    Button,
 } from '@components/General';
 
 import { AmountValueType } from '@components/General/AmountInput';
 import { AccountPicker } from '@components/Modules';
 
+// import DeviceBrightness from '@adrianso/react-native-device-brightness';
+
 // local
 import Localize from '@locale';
 
 // style
 import { AppStyles, AppColors, AppSizes } from '@theme';
 import styles from './styles';
+// import AppService, { AppStateStatus } from '@services/AppService';
 
 /* types ==================================================================== */
-export interface Props {}
+export interface Props {
+    ogBrightness?: number;
+}
 
 export interface State {
     coreSettings: CoreModel;
@@ -80,17 +90,44 @@ class RequestView extends Component<Props, State> {
             amount: undefined,
             currencyRate: undefined,
             amountRate: undefined,
-            withAmount: false,
+            withAmount: true,
         };
 
         this.amountInputRef = React.createRef();
         this.amountRateInputRef = React.createRef();
     }
 
+    // appStateChange(status: AppStateStatus) {
+    //     const {ogBrightness} = this.props;
+
+    //     // console.log('x', status, ogBrightness)
+        
+    //     if (status !== AppStateStatus.Active) {
+    //         if (typeof ogBrightness === 'number') {
+    //             DeviceBrightness.setBrightnessLevel(Platform.OS === 'android' ? -1 : ogBrightness);
+    //         }
+    //     }
+    //     if (status === AppStateStatus.Active) {
+    //         DeviceBrightness.setBrightnessLevel(1);
+    //     }
+    // }
+
     componentDidMount() {
         InteractionManager.runAfterInteractions(this.fetchCurrencyRate);
+        // DeviceBrightness.setBrightnessLevel(1);
+
+        // AppService.on('appStateChange', status => this.appStateChange(status));
     }
 
+    componentWillUnmount(): void {
+        // const {ogBrightness} = this.props;
+        // if (typeof ogBrightness === 'number') {
+        //     // DeviceBrightness.setBrightnessLevel(Platform.OS === 'android' ? -1 : ogBrightness);
+        // }
+
+        // AppService.off('appStateChange', status => this.appStateChange(status));
+    };
+
     fetchCurrencyRate = () => {
         const { coreSettings } = this.state;
 
@@ -197,7 +234,15 @@ class RequestView extends Component<Props, State> {
         setTimeout(Navigator.pop, 10);
     };
 
-    onHeaderSharePress = () => {
+    onCopyAddressPress = () => {
+        Clipboard.setString(this.getLink());
+
+        // setTimeout(() => {
+        Toast(Localize.t('global.requestCopied'));
+        // }, 10);
+    };
+
+    onSharePress = () => {
         Share.share({
             message: this.getLink(),
             url: undefined,
@@ -231,6 +276,9 @@ class RequestView extends Component<Props, State> {
                             returnKeyType="done"
                         />
                     </View>
+                    <View style={styles.currencySymbolTextContainer}>
+                        <Text style={styles.currencySymbolText}>{NetworkService.getNativeAsset()}</Text>
+                    </View>
                 </View>
 
                 <View style={styles.amountRateContainer}>
@@ -269,55 +317,111 @@ class RequestView extends Component<Props, State> {
                         onPress: this.onHeaderBackPress,
                     }}
                     centerComponent={{ text: 'Request' }}
-                    rightComponent={{
-                        icon: 'IconShare',
-                        iconSize: 23,
-                        onPress: this.onHeaderSharePress,
-                    }}
+                    // rightComponent={{
+                    //     icon: 'IconShare',
+                    //     iconSize: 23,
+                    //     onPress: this.onHeaderSharePress,
+                    // }}
                 />
 
                 <KeyboardAwareScrollView
                     style={[AppStyles.flex1, AppStyles.stretchSelf]}
                     calculateExtraOffset={this.calcKeyboardAwareExtraOffset}
                 >
-                    <View style={styles.qrCodeContainer}>
-                        <View style={styles.qrCode}>
-                            <QRCode size={AppSizes.moderateScale(150)} value={this.getLink()} />
-                        </View>
-                    </View>
-
-                    <HorizontalLine />
-
-                    <View style={styles.rowItem}>
-                        <View style={styles.rowTitle}>
-                            <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorGrey]}>
-                                {Localize.t('global.to')}
+                    <View style={[ styles.rowItem ]}>
+                        <View style={[ styles.rowTitle ]}>
+                            <Text style={AppStyles.colorGrey}>
+                                {Localize.t('global.receiveOnAccount')}:
                             </Text>
                         </View>
-                        <View style={styles.accountPickerContainer}>
+                        <View style={[ styles.accountPickerContainer]}>
                             <AccountPicker onSelect={this.onAccountChange} accounts={accounts} selectedItem={source} />
                         </View>
                     </View>
 
                     {/* Amount */}
-                    <View style={styles.rowItem}>
+                    <View style={[ styles.rowItem ]}>
                         <TouchableDebounce
                             activeOpacity={0.8}
-                            style={[AppStyles.row, styles.rowTitle]}
+                            style={[styles.checkboxView, styles.rowTitle]}
                             onPress={this.toggleUseAmount}
                         >
-                            <View style={[AppStyles.flex5, AppStyles.centerContent]}>
-                                <Text style={[AppStyles.subtext, AppStyles.bold, AppStyles.colorGrey]}>
+                            <View style={[ AppStyles.centerContent, styles.checkboxLabelContainer ]}>
+                                {/* <Text style={AppStyles.borderOrange}>X</Text> */}
+                                <Text style={[AppStyles.subtext, AppStyles.colorPrimary]}>
                                     {Localize.t('global.requestWithAmount')}
                                 </Text>
                             </View>
-                            <View style={AppStyles.flex1}>
-                                <CheckBox checked={withAmount} onPress={this.toggleUseAmount} />
+                            <View style={[
+                                // AppStyles.borderGrey,
+                                styles.checkboxContainer,
+                            ]}>
+                                <View style={[
+                                    styles.checkboxWrapper,
+                                ]}>
+                                    <CheckBox
+                                        style={[
+                                            AppStyles.flexEnd,
+                                            styles.checkbox,
+                                        ]}
+                                        checked={withAmount}
+                                        onPress={this.toggleUseAmount}
+                                    />
+                                </View>
                             </View>
                         </TouchableDebounce>
 
                         {this.renderAmountInput()}
                     </View>
+
+                    <HorizontalLine />
+
+                    <Spacer size={12} />
+
+                    <View style={[
+                        AppStyles.paddingHorizontalSml,
+                        AppStyles.marginBottomSml,
+                    ]}>
+                        <Text style={AppStyles.colorGrey}>
+                            {Localize.t('global.requestLinkNow')}:
+                        </Text>
+                        <View style={[
+                            AppStyles.row,
+                        ]}>
+                            <Button
+                                numberOfLines={1}
+                                icon="IconShare"
+                                // iconStyle={AppStyles.imgColorBlue}
+                                label={Localize.t('global.share')}
+                                onPress={this.onSharePress}
+                                style={[AppStyles.flex1, styles.sharebtnLeft]}
+                            />
+                            <Button
+                                numberOfLines={1}
+                                icon="IconClipboard"
+                                // iconStyle={AppStyles.imgColorBlue}
+                                label={Localize.t('global.copy')}
+                                onPress={this.onCopyAddressPress}
+                                style={[AppStyles.flex1, styles.sharebtnRight]}
+                            />
+                        </View>
+                    </View>
+
+                    <View style={[ AppStyles.paddingHorizontalSml, AppStyles.marginTopNegativeSml ]}>
+                        <Text style={AppStyles.colorGrey}>
+                            {Localize.t('global.orShareQr')}:
+                        </Text>
+                        <View style={[
+                            styles.qrCodeContainer,
+                        ]}>
+                            <View style={styles.qrCode}>
+                                <View style={styles.qrImgContainer}>
+                                    <QRCode size={140} value={`${this.getLink()}`} />
+                                </View>
+                            </View>
+                        </View>
+                    </View>
+
                 </KeyboardAwareScrollView>
             </View>
         );
diff --git a/src/screens/Request/styles.tsx b/src/screens/Request/styles.tsx
index b2b9a2bcf..1831d8321 100644
--- a/src/screens/Request/styles.tsx
+++ b/src/screens/Request/styles.tsx
@@ -12,20 +12,49 @@ const styles = StyleService.create({
         backgroundColor: '$background',
     },
     qrCodeContainer: {
-        width: '90%',
-        backgroundColor: '$tint',
+        width: '100%',
+        borderColor: '$tint',
+        borderWidth: 3,
+        backgroundColor: '$white',
         alignSelf: 'center',
-        borderRadius: 20,
+        borderRadius: 10,
         marginBottom: 25,
+        marginTop: 10,
+    },
+    sharebtnLeft: {
+        marginTop: 8,
+        marginBottom: 8,
+        paddingVertical: 0,
+        height: 40,
+        borderTopEndRadius: 0,
+        borderBottomEndRadius: 0,
+    },
+    sharebtnRight: {
+        marginTop: 8,
+        marginBottom: 8,
+        paddingVertical: 0,
+        height: 40,
+        borderTopStartRadius: 0,
+        borderBottomStartRadius: 0,
+    },
+    qrImgContainer: {
+        // borderWidth: 1,
+        // borderColor: 'red',
+        position: 'absolute',
+        top: 70,
+        transform: [ { translateY: -70 } ],
     },
     qrCode: {
-        borderRadius: 14,
-        borderWidth: 5,
-        alignSelf: 'center',
+        // alignSelf: 'center',
         alignItems: 'center',
-        borderColor: '$grey',
-        padding: 5,
-        margin: 30,
+        borderColor: '$silver',
+        // padding: 10,
+        margin: Platform.select({
+            ios: 15,
+            android: 0,
+        }),
+        height: 140,
+        overflow: 'hidden',
     },
     editButton: {
         justifyContent: 'center',
@@ -33,11 +62,35 @@ const styles = StyleService.create({
     },
     rowItem: {
         paddingHorizontal: AppSizes.paddingSml,
-        paddingTop: AppSizes.paddingSml,
+        paddingTop: AppSizes.paddingSml * 0.5,
         paddingBottom: 10,
     },
+    checkboxView: {
+        display: 'flex',
+        flexDirection: 'row',
+        width: '100%',
+    },
+    checkboxLabelContainer: {
+        flex: 1,
+    },
+    checkboxWrapper: {
+        width: 33,
+        height: 28,
+        position: 'relative',
+        overflow: 'hidden',
+    },
+    checkboxContainer: {
+        // flex: 1,
+        // flexGrow: 0,
+        // flexShrink: 0,
+        // marginLeft: 'auto',
+    },
+    checkbox: {
+        paddingHorizontal: 2,
+        paddingVertical: 2,
+    },
     rowTitle: {
-        paddingLeft: 10,
+        // paddingLeft: 10,
     },
     accountPickerContainer: {
         marginTop: Platform.OS === 'ios' ? 20 : 10,
@@ -46,7 +99,7 @@ const styles = StyleService.create({
         left: 0,
         right: 0,
         flexDirection: 'row',
-        marginTop: Platform.OS === 'ios' ? 20 : 10,
+        marginTop: Platform.OS === 'ios' ? 10 : 10,
         paddingLeft: 20,
         marginLeft: 0,
         backgroundColor: '$lightGrey',
@@ -55,17 +108,17 @@ const styles = StyleService.create({
     amountInput: {
         padding: 0,
         margin: 0,
-        fontSize: AppFonts.h2.size,
+        fontSize: AppFonts.h3.size,
         fontFamily: AppFonts.base.familyMonoBold,
-        fontWeight: '600',
+        // fontWeight: '600',
         color: '$blue',
-        paddingVertical: Platform.OS === 'ios' ? 15 : 10,
+        paddingVertical: Platform.OS === 'ios' ? 10 : 8,
     },
     amountRateContainer: {
         left: 0,
         right: 0,
         flexDirection: 'row',
-        marginTop: Platform.OS === 'ios' ? 20 : 10,
+        marginTop: Platform.OS === 'ios' ? 5 : 5,
         paddingLeft: 20,
         marginLeft: 0,
         backgroundColor: '$lightGrey',
@@ -74,11 +127,11 @@ const styles = StyleService.create({
     amountRateInput: {
         padding: 0,
         margin: 0,
-        fontSize: AppFonts.h4.size,
-        fontFamily: AppFonts.base.familyMonoBold,
-        fontWeight: '600',
+        fontSize: AppFonts.h5.size,
+        fontFamily: AppFonts.base.familyMono,
+        // fontWeight: '600',
         color: '$textPrimary',
-        paddingVertical: 15,
+        paddingVertical: 10,
     },
     currencySymbolTextContainer: {
         justifyContent: 'center',
diff --git a/src/screens/Send/SendView.tsx b/src/screens/Send/SendView.tsx
index e0ea397cb..c6c073d80 100644
--- a/src/screens/Send/SendView.tsx
+++ b/src/screens/Send/SendView.tsx
@@ -63,6 +63,8 @@ class SendView extends Component<Props, State> {
         const spendableAccounts = AccountRepository.getSpendableAccounts();
         const PaymentWithSigMixin = SignMixin(Payment);
 
+        // console.log('SendView constructor')
+
         this.state = {
             currentStep: Steps.Details,
             accounts: spendableAccounts,
@@ -73,6 +75,7 @@ class SendView extends Component<Props, State> {
             memo: undefined,
             selectedFee: undefined,
             issuerFee: undefined,
+            serviceFeeAmount: undefined,
             destination: undefined,
             destinationInfo: undefined,
             scanResult: props.scanResult ?? undefined,
@@ -118,8 +121,15 @@ class SendView extends Component<Props, State> {
         this.setState({ amount });
     };
 
-    setFee = (selectedFee: FeeItem) => {
+    setFee = (selectedFee: FeeItem, serviceFee: FeeItem) => {
+        const { payment } = this.state;
         this.setState({ selectedFee });
+
+        // console.log('SendView Service Fee Amount Set', serviceFeeAmount.value);
+        if (serviceFee) {
+            payment.setServiceFee(Number(serviceFee.value));
+            this.setState({ serviceFeeAmount: serviceFee });
+        };
     };
 
     setIssuerFee = (issuerFee: number) => {
@@ -371,6 +381,7 @@ class SendView extends Component<Props, State> {
 
     renderStep = () => {
         const { currentStep } = this.state;
+        const { timestamp } = this.props;
 
         let Step;
 
@@ -399,6 +410,7 @@ class SendView extends Component<Props, State> {
             <StepsContext.Provider
                 value={{
                     ...this.state,
+                    timestamp,
                     goNext: this.goNext,
                     goBack: this.goBack,
                     setAmount: this.setAmount,
@@ -447,8 +459,15 @@ class SendView extends Component<Props, State> {
     };
 
     render() {
+        const {timestamp} = this.props;
+
         return (
-            <View onResponderRelease={() => Keyboard.dismiss()} testID="send-screen" style={styles.container}>
+            <View
+                key={`sendview-${timestamp}`}
+                onResponderRelease={() => Keyboard.dismiss()}
+                testID="send-screen"
+                style={styles.container}
+            >
                 {this.renderHeader()}
                 {this.renderStep()}
             </View>
diff --git a/src/screens/Send/Steps/Details/DetailsStep.tsx b/src/screens/Send/Steps/Details/DetailsStep.tsx
index e26f179d3..608c57f12 100644
--- a/src/screens/Send/Steps/Details/DetailsStep.tsx
+++ b/src/screens/Send/Steps/Details/DetailsStep.tsx
@@ -33,7 +33,8 @@ import styles from './styles';
 
 import { StepsContext } from '../../Context';
 /* Types  ==================================================================== */
-interface Props {}
+interface Props {
+}
 
 interface State {
     isLoadingAvailableBalance: boolean;
@@ -303,7 +304,7 @@ class DetailsStep extends Component<Props, State> {
 
     render() {
         const { amountRate, currencyRate, isLoadingAvailableBalance, isCheckingBalance } = this.state;
-        const { goBack, accounts, source, token, amount, coreSettings } = this.context;
+        const { goBack, accounts, source, token, amount, coreSettings, timestamp } = this.context;
 
         return (
             <View testID="send-details-view" style={styles.container}>
@@ -328,6 +329,7 @@ class DetailsStep extends Component<Props, State> {
                             </Text>
                         </View>
                         <CurrencyPicker
+                            timestamp={timestamp}
                             account={source!}
                             onSelect={this.onCurrencyChange}
                             currencies={
@@ -357,7 +359,7 @@ class DetailsStep extends Component<Props, State> {
                             <View>
                                 <Button
                                     light
-                                    roundedSmall
+                                    roundedMini
                                     isLoading={isLoadingAvailableBalance}
                                     onPress={this.applyAllBalance}
                                     label={Localize.t('global.all')}
@@ -384,8 +386,8 @@ class DetailsStep extends Component<Props, State> {
                                 onPress={() => {
                                     this.amountInput.current?.focus();
                                 }}
-                                style={styles.editButton}
-                                roundedSmall
+                                style={[styles.editButton, AppStyles.marginRightSml ]}
+                                roundedMini
                                 iconSize={15}
                                 iconStyle={AppStyles.imgColorGrey}
                                 light
diff --git a/src/screens/Send/Steps/Details/styles.tsx b/src/screens/Send/Steps/Details/styles.tsx
index 33d81c057..1a1da872e 100644
--- a/src/screens/Send/Steps/Details/styles.tsx
+++ b/src/screens/Send/Steps/Details/styles.tsx
@@ -11,10 +11,11 @@ const styles = StyleService.create({
         alignItems: 'center',
         alignSelf: 'stretch',
         backgroundColor: '$background',
+        paddingHorizontal: 5,
     },
     rowTitle: {
         flexDirection: 'row',
-        paddingLeft: 10,
+        // paddingLeft: 10,
         paddingBottom: 15,
         left: 0,
         right: 0,
@@ -23,8 +24,8 @@ const styles = StyleService.create({
         paddingHorizontal: AppSizes.paddingSml,
         paddingTop: AppSizes.paddingSml,
         paddingBottom: 10,
-        borderTopColor: '$lightGrey',
-        borderTopWidth: 1,
+        // borderTopColor: '$lightGrey',
+        // borderTopWidth: 1,
     },
     amountContainer: {
         left: 0,
@@ -34,7 +35,7 @@ const styles = StyleService.create({
         paddingLeft: 20,
         marginLeft: 0,
         backgroundColor: '$lightGrey',
-        borderRadius: 15,
+        borderRadius: AppSizes.scale(75) / 5,
     },
     amountInput: {
         padding: 0,
@@ -43,24 +44,24 @@ const styles = StyleService.create({
         fontFamily: AppFonts.base.familyMonoBold,
         fontWeight: '600',
         color: '$blue',
-        paddingVertical: Platform.OS === 'ios' ? 15 : 10,
+        paddingVertical: Platform.OS === 'ios' ? 10 : 8,
     },
     amountRateContainer: {
         left: 0,
         right: 0,
         flexDirection: 'row',
-        marginTop: Platform.OS === 'ios' ? 20 : 10,
-        paddingLeft: 20,
+        marginTop: Platform.OS === 'ios' ? 8 : 5,
+        paddingLeft: 10,
         marginLeft: 0,
-        backgroundColor: '$lightGrey',
-        borderRadius: 15,
+        // backgroundColor: '$lightGrey',
+        borderRadius: 10,
     },
     amountRateInput: {
         padding: 0,
         margin: 0,
-        fontSize: AppFonts.h4.size,
-        fontFamily: AppFonts.base.familyMonoBold,
-        fontWeight: '600',
+        fontSize: AppFonts.h5.size,
+        fontFamily: AppFonts.base.familyMono,
+        // fontWeight: '600',
         color: '$textPrimary',
         paddingVertical: 15,
     },
@@ -74,7 +75,7 @@ const styles = StyleService.create({
         marginRight: 15,
     },
     currencySymbolText: {
-        fontFamily: AppFonts.base.familyMonoBold,
+        fontFamily: AppFonts.base.familyMono,
         color: '$grey',
         fontSize: AppFonts.h5.size * 0.9,
     },
diff --git a/src/screens/Send/Steps/Recipient/RecipientStep.tsx b/src/screens/Send/Steps/Recipient/RecipientStep.tsx
index 7cbf813b9..921f17f3d 100644
--- a/src/screens/Send/Steps/Recipient/RecipientStep.tsx
+++ b/src/screens/Send/Steps/Recipient/RecipientStep.tsx
@@ -726,10 +726,14 @@ class RecipientStep extends Component<Props, State> {
                             {title} {dataSource[0].data?.length > 0 && `(${dataSource[0].data?.length})`}
                         </Text>
                     </View>
-                    <View style={AppStyles.flex1}>
+                    <View style={[
+                        AppStyles.flex1,
+                        styles.restoreMarginRight,
+                    ]}>
                         <Button
                             onPress={this.resetResult}
                             style={styles.clearSearchButton}
+                            roundedMini
                             light
                             label={Localize.t('global.clearSearch')}
                         />
@@ -782,7 +786,7 @@ class RecipientStep extends Component<Props, State> {
                         setDestination({
                             name: item.name,
                             address: item.address,
-                            tag: item.tag,
+                            tag: item.tag === null ? undefined : (toNumber(item.tag) || undefined),
                         });
                     } else {
                         setDestination(undefined);
@@ -799,7 +803,10 @@ class RecipientStep extends Component<Props, State> {
                     <View style={[AppStyles.flex1, AppStyles.centerContent]}>
                         <Text style={[AppStyles.p, AppStyles.bold]}>{Localize.t('send.searchResults')}</Text>
                     </View>
-                    <View style={AppStyles.flex1}>
+                    <View style={[
+                        AppStyles.flex1,
+                        styles.restoreMarginRight,
+                    ]}>
                         <Button
                             onPress={() => {
                                 // clear search text
@@ -812,13 +819,15 @@ class RecipientStep extends Component<Props, State> {
                                 this.setDefaultDataSource();
                             }}
                             style={styles.clearSearchButton}
+                            roundedMini
                             light
-                            roundedSmall
                             label={Localize.t('global.clearSearch')}
                         />
                     </View>
                 </View>
-                <View style={AppStyles.paddingVerticalSml}>
+                <View style={[
+                    AppStyles.paddingVerticalSml,
+                ]}>
                     <InfoMessage type="warning" label={Localize.t('send.noSearchResult')} />
                 </View>
             </>
@@ -833,7 +842,7 @@ class RecipientStep extends Component<Props, State> {
 
         return (
             <View testID="send-recipient-view" style={AppStyles.container}>
-                <View style={[AppStyles.contentContainer, AppStyles.paddingHorizontal]}>
+                <View style={[AppStyles.contentContainer, styles.paddingHorizontal]}>
                     <View style={AppStyles.row}>
                         <TextInput
                             placeholder={Localize.t('send.enterANameOrAddress')}
@@ -849,7 +858,7 @@ class RecipientStep extends Component<Props, State> {
                         />
                     </View>
 
-                    <View style={[AppStyles.flex8, AppStyles.paddingTopSml]}>
+                    <View style={[AppStyles.flex8, AppStyles.paddingTopSml, styles.accountList]}>
                         <SectionList
                             ListEmptyComponent={this.renderListEmptyComponent}
                             extraData={searchText}
@@ -875,6 +884,8 @@ class RecipientStep extends Component<Props, State> {
                             isLoading={isLoading}
                             textStyle={AppStyles.strong}
                             isDisabled={!destination}
+                            icon="IconChevronRight"
+                            iconPosition="right"
                             label={Localize.t('global.next')}
                             onPress={this.checkAndNext}
                         />
diff --git a/src/screens/Send/Steps/Recipient/styles.tsx b/src/screens/Send/Steps/Recipient/styles.tsx
index bc8a94093..9281a535d 100644
--- a/src/screens/Send/Steps/Recipient/styles.tsx
+++ b/src/screens/Send/Steps/Recipient/styles.tsx
@@ -3,20 +3,33 @@ import StyleService from '@services/StyleService';
 import { AppStyles, AppSizes, AppFonts } from '@theme';
 /* Styles ==================================================================== */
 const styles = StyleService.create({
+    accountList: {
+        marginLeft: -7, // For selection of Account
+        marginRight: -7, // For selection of Account
+    },
+    restoreMarginRight: {
+        marginRight: 7,
+    },
+    paddingHorizontal: {
+        paddingHorizontal: 25,
+    },
     inputText: {
         fontSize: AppStyles.p.fontSize,
-        fontFamily: AppStyles.monoBold.fontFamily,
+        fontFamily: AppStyles.baseText.fontFamily,
+        // fontWeight: 400,
         color: '$blue',
-        paddingLeft: 15,
+        paddingLeft: 5,
     },
     inputContainer: {
-        borderWidth: 1,
-        borderColor: '$lightGrey',
+        // marginTop: 5, // Makes the QR button move
+        // borderWidth: 1,
+        // borderColor: '$lightGrey',
     },
     sectionHeader: {
         backgroundColor: '$background',
         paddingTop: 5,
         paddingBottom: 5,
+        marginLeft: 7,
         shadowColor: '$white',
     },
     listEmptyContainer: {
diff --git a/src/screens/Send/Steps/Result/ResultStep.tsx b/src/screens/Send/Steps/Result/ResultStep.tsx
index b210e0cae..20542acc6 100644
--- a/src/screens/Send/Steps/Result/ResultStep.tsx
+++ b/src/screens/Send/Steps/Result/ResultStep.tsx
@@ -141,6 +141,11 @@ class ResultStep extends Component<Props, State> {
 
     renderSuccess = () => {
         const { showDetailsCard } = this.state;
+        // const { serviceFeeAmount, payment } = this.context;
+        // console.log('[ResultStep] context serviceFeeAmount', serviceFeeAmount);
+        // console.log('[ResultStep] context serviceFeeTx', serviceFeeTx);
+        // console.log('[ResultStep] Payment Service Fee', payment.ServiceFee);
+        // console.log('[ResultStep] Payment Service TX', payment.ServiceFeeTx);
 
         return (
             <SafeAreaView testID="send-result-view" style={[styles.container, styles.containerSuccess]}>
@@ -274,6 +279,7 @@ class ResultStep extends Component<Props, State> {
             if (payment.VerifyResult?.success === false) {
                 return this.renderVerificationFailed();
             }
+
             return this.renderSuccess();
         }
 
diff --git a/src/screens/Send/Steps/Submitting/SubmittingStep.tsx b/src/screens/Send/Steps/Submitting/SubmittingStep.tsx
index 24c3c93b6..21807d533 100644
--- a/src/screens/Send/Steps/Submitting/SubmittingStep.tsx
+++ b/src/screens/Send/Steps/Submitting/SubmittingStep.tsx
@@ -30,10 +30,14 @@ class SubmittingStep extends Component<Props, State> {
     declare context: React.ContextType<typeof StepsContext>;
 
     constructor(props: Props) {
+        // console.log('props', props)
+        // console.log('SubmittingStep constructor')
         super(props);
     }
 
     render() {
+        // console.log('context', this.context)
+        // console.log('SubmittingStep render');
         const { currentStep } = this.context;
 
         return (
diff --git a/src/screens/Send/Steps/Summary/SummaryStep.tsx b/src/screens/Send/Steps/Summary/SummaryStep.tsx
index 002151f82..7c783a437 100644
--- a/src/screens/Send/Steps/Summary/SummaryStep.tsx
+++ b/src/screens/Send/Steps/Summary/SummaryStep.tsx
@@ -61,6 +61,8 @@ class SummaryStep extends Component<Props, State> {
     constructor(props: Props) {
         super(props);
 
+        // console.log('SummaryStep constructor')
+
         this.state = {
             confirmedDestinationTag: undefined,
             destinationTagInputVisible: false,
@@ -75,7 +77,6 @@ class SummaryStep extends Component<Props, State> {
 
     fetchCurrencyRate = () => {
         const { coreSettings } = this.context;
-
         const { currency } = coreSettings;
 
         BackendService.getCurrencyRate(currency)
@@ -174,6 +175,8 @@ class SummaryStep extends Component<Props, State> {
         const { goNext, token, source, amount, destination, destinationInfo } = this.context;
         const { confirmedDestinationTag } = this.state;
 
+        // console.log('SummaryStep constructor gonext')
+
         if (!amount || parseFloat(amount) === 0) {
             Alert.alert(Localize.t('global.error'), Localize.t('send.pleaseEnterAmount'));
             return;
@@ -191,8 +194,14 @@ class SummaryStep extends Component<Props, State> {
             return;
         }
 
-        // check if destination requires the destination tag
-        if (destinationInfo?.requireDestinationTag && (!destination!.tag || Number(destination!.tag) === 0)) {
+        const tagIsEnteredButLiteralZero = typeof destination?.tag === 'string' && destination?.tag === '0';
+
+        // Check if destination requires the Destination Tag
+        if (
+            destinationInfo?.requireDestinationTag &&
+            (!destination!.tag || Number(destination!.tag) === 0) &&
+            !tagIsEnteredButLiteralZero
+        ) {
             Alert.alert(Localize.t('global.warning'), Localize.t('send.destinationTagIsRequired'));
             return;
         }
@@ -307,8 +316,17 @@ class SummaryStep extends Component<Props, State> {
     };
 
     render() {
-        const { source, amount, destination, token, issuerFee, isLoading, selectedFee, setFee, getPaymentJsonForFee } =
-            this.context;
+        const {
+            source,
+            amount,
+            destination,
+            token,
+            issuerFee,
+            isLoading,
+            selectedFee,
+            setFee,
+            getPaymentJsonForFee,
+        } = this.context;
         const { destinationTagInputVisible, canScroll } = this.state;
 
         return (
@@ -358,29 +376,51 @@ class SummaryStep extends Component<Props, State> {
                             </View>
                         </View>
 
-                        <Spacer size={20} />
-
-                        <View style={AppStyles.row}>
-                            <View style={AppStyles.flex1}>
-                                <View style={styles.rowTitle}>
-                                    <Text style={[AppStyles.monoSubText, AppStyles.colorGrey]}>
-                                        {typeof destination!.tag !== 'undefined' &&
-                                            `${Localize.t('global.destinationTag')}: `}
-                                        <Text style={AppStyles.colorBlue}>
-                                            {destination!.tag || Localize.t('send.noDestinationTag')}
-                                        </Text>
-                                    </Text>
+                        <Spacer size={10} />
+
+                        {
+                            String(destination?.tag || '') === '' && (
+                                <View style={[ styles.rowTitle ]}>
+                                    <Button
+                                        activeOpacity={0.9}
+                                        roundedSmallBlock
+                                        style={[styles.destinationTagBtn]}
+                                        onPress={this.showEnterDestinationTag}
+                                        icon="IconEdit"
+                                        iconSize={15}
+                                        label={Localize.t('send.addDestinationTag')}
+                                    />
                                 </View>
-                            </View>
-                            <Button
-                                onPress={this.showEnterDestinationTag}
-                                style={styles.editButton}
-                                roundedSmall
-                                iconSize={13}
-                                light
-                                icon="IconEdit"
-                            />
-                        </View>
+                            )
+                        }
+                        {
+                            String(destination?.tag || '') !== '' && (
+                                <View>
+                                    <Spacer size={10} />
+                                    <View style={AppStyles.row}>
+                                        <View style={AppStyles.flex1}>
+                                            <View style={styles.rowTitle}>
+                                                <Text style={[AppStyles.monoSubText, AppStyles.colorGrey]}>
+                                                    {typeof destination!.tag !== 'undefined' &&
+                                                        `${Localize.t('global.destinationTag')}: `}
+                                                    <Text style={AppStyles.colorBlue}>
+                                                        {destination!.tag || Localize.t('send.noDestinationTag')}
+                                                    </Text>
+                                                </Text>
+                                            </View>
+                                        </View>
+                                        <Button
+                                            onPress={this.showEnterDestinationTag}
+                                            style={styles.editButton}
+                                            roundedMini
+                                            iconSize={13}
+                                            light
+                                            icon="IconEdit"
+                                        />
+                                    </View>
+                                </View>
+                            )
+                        }
                     </View>
 
                     {/* Currency */}
@@ -424,17 +464,18 @@ class SummaryStep extends Component<Props, State> {
                     <View style={[styles.rowItem, AppStyles.centerContent]}>
                         <View style={styles.rowTitle}>
                             <Text style={[AppStyles.subtext, AppStyles.strong, { color: AppColors.grey }]}>
-                                {Localize.t('global.fee')}
+                                {Localize.t('events.txServiceFees')}
                             </Text>
                         </View>
                         <FeePicker
                             txJson={getPaymentJsonForFee()}
+                            source={source}
                             containerStyle={styles.feePickerContainer}
                             textStyle={styles.feeText}
                             onSelect={setFee}
                         />
                     </View>
-
+    
                     {/* Memo */}
                     <View style={styles.rowItem}>
                         <View style={styles.rowTitle}>
@@ -449,13 +490,14 @@ class SummaryStep extends Component<Props, State> {
                             placeholder={Localize.t('send.enterPublicMemo')}
                             inputStyle={styles.inputStyle}
                             maxLength={300}
+                            multiline
                             returnKeyType="done"
                             autoCapitalize="sentences"
                             numberOfLines={1}
                         />
                     </View>
 
-                    <Footer safeArea>
+                    <Footer style={[styles.swipeFooterSize]} safeArea>
                         <SwipeButton
                             color={this.getSwipeButtonColor()}
                             label={Localize.t('global.slideToSend')}
diff --git a/src/screens/Send/Steps/Summary/styles.tsx b/src/screens/Send/Steps/Summary/styles.tsx
index b55a25159..21082e043 100644
--- a/src/screens/Send/Steps/Summary/styles.tsx
+++ b/src/screens/Send/Steps/Summary/styles.tsx
@@ -8,8 +8,12 @@ const styles = StyleService.create({
         justifyContent: 'center',
         alignItems: 'center',
         alignSelf: 'stretch',
+        paddingHorizontal: 5,
         backgroundColor: '$background',
     },
+    swipeFooterSize: {
+        width: '100%',
+    },
     rowItemGrey: {
         backgroundColor: '$background',
     },
@@ -17,8 +21,11 @@ const styles = StyleService.create({
         paddingHorizontal: AppSizes.paddingSml,
         paddingVertical: AppSizes.paddingSml,
         // paddingTop: AppSizes.padding,
-        borderTopColor: '$lightGrey',
-        borderTopWidth: 1,
+        // borderTopColor: '$lightGrey',
+        // borderTopWidth: 1,
+    },
+    destinationTagBtn: {
+        borderRadius: 14,
     },
     rowItemMulti: {
         flexDirection: 'row',
@@ -26,7 +33,7 @@ const styles = StyleService.create({
         alignItems: 'center',
     },
     rowTitle: {
-        paddingLeft: 15,
+        paddingLeft: 0,
     },
     rowTitlePadding: {
         paddingBottom: 15,
@@ -107,7 +114,7 @@ const styles = StyleService.create({
     amountInput: {
         padding: 0,
         margin: 0,
-        paddingLeft: 15,
+        // paddingLeft: 15,
         fontSize: AppFonts.h3.size,
         fontFamily: AppFonts.base.familyMonoBold,
         fontWeight: '600',
@@ -115,8 +122,8 @@ const styles = StyleService.create({
     },
     inputStyle: {
         fontSize: AppFonts.p.size,
-        fontFamily: AppFonts.base.familyMonoBold,
-        fontWeight: '600',
+        fontFamily: AppFonts.base.family,
+        fontWeight: '400',
         textAlign: 'left',
     },
     editButton: {
@@ -126,10 +133,10 @@ const styles = StyleService.create({
         width: 40,
         justifyContent: 'center',
         alignSelf: 'center',
-        marginRight: 15,
+        // marginRight: 15,
     },
     rateContainer: {
-        paddingLeft: 15,
+        // paddingLeft: 15,
         paddingTop: 15,
     },
 
@@ -147,11 +154,11 @@ const styles = StyleService.create({
         color: '$textPrimary',
     },
     feeContainer: {
-        paddingLeft: 15,
+        // paddingLeft: 15,
         paddingTop: 15,
     },
     feePickerContainer: {
-        paddingLeft: 15,
+        // paddingLeft: 15,
         paddingTop: 15,
     },
 });
diff --git a/src/screens/Send/types.ts b/src/screens/Send/types.ts
index e71c9ceab..a1d309442 100644
--- a/src/screens/Send/types.ts
+++ b/src/screens/Send/types.ts
@@ -25,6 +25,7 @@ export interface FeeItem {
 }
 
 export interface Props {
+    timestamp?: number;
     token?: TrustLineModel;
     scanResult?: XrplDestination;
     amount?: string;
@@ -41,6 +42,7 @@ export interface State {
     memo?: string;
     selectedFee?: FeeItem;
     issuerFee?: number;
+    serviceFeeAmount?: FeeItem;
     payment: Payment & SignMixinType;
     scanResult?: XrplDestination;
     coreSettings: CoreModel;
@@ -48,6 +50,7 @@ export interface State {
 }
 
 export interface ContextProps extends State {
+    timestamp?: number;
     setSource: (source: AccountModel) => void;
     setToken: (token: TrustLineModel | string) => void;
     setAmount: (amount: string) => void;
@@ -55,7 +58,8 @@ export interface ContextProps extends State {
     setDestinationInfo: (info: any) => void;
     setScanResult: (result: XrplDestination) => void;
     setIssuerFee: (issuerFee: number) => void;
-    setFee: (fee: FeeItem) => void;
+    // setServiceFeeAmount: (amount: FeeItem) => void;
+    setFee: (txFee: FeeItem, serviceFee: FeeItem) => void;
     setMemo: (memo: string) => void;
     getPaymentJsonForFee: () => any;
     goNext: () => void;
diff --git a/src/screens/Settings/AddressBook/AddressBookView.tsx b/src/screens/Settings/AddressBook/AddressBookView.tsx
index 8bb735790..811938234 100644
--- a/src/screens/Settings/AddressBook/AddressBookView.tsx
+++ b/src/screens/Settings/AddressBook/AddressBookView.tsx
@@ -184,20 +184,23 @@ class AddressBookView extends Component<Props, State> {
                         }}
                         centerComponent={{ text: Localize.t('global.addressBook') }}
                     />
-                    <View style={[AppStyles.contentContainer, AppStyles.padding]}>
+                    <View style={[AppStyles.contentContainer]}>
                         <ImageBackground
-                            source={StyleService.getImage('BackgroundShapes')}
-                            imageStyle={AppStyles.BackgroundShapes}
+                            resizeMode="cover"
+                            source={
+                                StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')
+                            }
                             style={[AppStyles.BackgroundShapesWH, AppStyles.centerContent]}
                         >
                             <Image style={[AppStyles.emptyIcon]} source={StyleService.getImage('ImageNoContacts')} />
                             <Text style={[AppStyles.emptyText]}>{Localize.t('settings.getStartedCreateContact')}</Text>
                             <Button
-                                rounded
+                                nonBlock
                                 icon="IconPlus"
                                 iconStyle={AppStyles.imgColorWhite}
                                 label={Localize.t('settings.addContact')}
                                 onPress={this.onAddContactPress}
+                                style={AppStyles.marginBottom}
                             />
                         </ImageBackground>
                     </View>
diff --git a/src/screens/Settings/Credits/CreditsView.tsx b/src/screens/Settings/Credits/CreditsView.tsx
index 6af1a2ff6..693217abc 100644
--- a/src/screens/Settings/Credits/CreditsView.tsx
+++ b/src/screens/Settings/Credits/CreditsView.tsx
@@ -10,8 +10,8 @@ import { HasBottomNotch } from '@common/helpers/device';
 import { AppScreens } from '@common/constants';
 import { WebLinks } from '@common/constants/endpoints';
 
-import { CoreRepository } from '@store/repositories';
-import { CoreModel } from '@store/models';
+// import { CoreRepository } from '@store/repositories';
+// import { CoreModel } from '@store/models';
 
 import { Header, WebViewBrowser } from '@components/General';
 
@@ -19,13 +19,14 @@ import Localize from '@locale';
 
 // style
 import { AppStyles } from '@theme';
+import StyleService from '@services/StyleService';
 
 /* types ==================================================================== */
 export interface Props {}
 
 export interface State {
     paddingBottom: number;
-    coreSettings: CoreModel;
+    // coreSettings: CoreModel;
 }
 
 /* Component ==================================================================== */
@@ -43,15 +44,15 @@ class CreditsView extends Component<Props, State> {
 
         this.state = {
             paddingBottom: HasBottomNotch() ? 20 : 0,
-            coreSettings: CoreRepository.getSettings(),
+            // coreSettings: CoreRepository.getSettings(),
         };
     }
 
     getHeaders = () => {
-        const { coreSettings } = this.state;
+        // const { coreSettings } = this.state;
 
         return {
-            'X-Xaman-Style': coreSettings.theme,
+            'X-Xaman-Style': StyleService.getCurrentTheme(),
         };
     };
 
diff --git a/src/screens/Settings/General/GeneralSettingsView.tsx b/src/screens/Settings/General/GeneralSettingsView.tsx
index c89870d3d..92a0b5efd 100644
--- a/src/screens/Settings/General/GeneralSettingsView.tsx
+++ b/src/screens/Settings/General/GeneralSettingsView.tsx
@@ -5,12 +5,10 @@
 import { uniqBy, sortBy, toLower } from 'lodash';
 
 import React, { Component } from 'react';
-import { View, Text, ScrollView } from 'react-native';
+import { View, Text, ScrollView, Appearance } from 'react-native';
 
 import { Navigator } from '@common/helpers/navigator';
 import { GetDeviceLocaleSettings } from '@common/helpers/device';
-import { ExitApp } from '@common/helpers/app';
-import { Prompt } from '@common/helpers/interface';
 
 import { AppScreens } from '@common/constants';
 
@@ -27,6 +25,8 @@ import { CurrencyPickerModalProps } from '@screens/Modal/CurrencyPicker';
 
 import { AppStyles } from '@theme';
 import styles from './styles';
+import StyleService from '@services/StyleService';
+import { Prompt } from '@common/helpers/interface';
 
 /* types ==================================================================== */
 export interface Props {}
@@ -131,6 +131,34 @@ class GeneralSettingsView extends Component<Props, State> {
         Navigator.reRender();
     };
 
+    hideAdvisoryTransactionsChange = (value: boolean) => {
+        CoreRepository.saveSettings({
+            hideAdvisoryTransactions: value,
+        });
+    };
+
+    themeAutoSwitch = (value: boolean) => {
+        const { coreSettings } = this.state;
+        if (value) {
+            // Auto switch
+            if (
+                (coreSettings.theme === 'light' && Appearance.getColorScheme() !== 'light') ||
+                (coreSettings.theme !== 'light' && Appearance.getColorScheme() === 'light')
+            ) {
+                // Mismatch, we switch
+                this.changeTheme(Appearance.getColorScheme() as Themes);
+            }
+        }
+
+        CoreRepository.saveSettings({ themeAutoSwitch: value });
+    };
+
+    hideServiceFeeTransactionsChange = (value: boolean) => {
+        CoreRepository.saveSettings({
+            hideServiceFeeTransactions: value,
+        });
+    };
+
     hapticFeedbackChange = (value: boolean) => {
         CoreRepository.saveSettings({
             hapticFeedback: value,
@@ -152,29 +180,54 @@ class GeneralSettingsView extends Component<Props, State> {
     };
 
     changeTheme = (theme: Themes) => {
-        // save in store
-        CoreRepository.saveSettings({ theme });
+        const {coreSettings} = this.state;
+
+        if (
+            (coreSettings.themeAutoSwitch && theme !== 'light') || 
+            !coreSettings.themeAutoSwitch
+         ) {
+            CoreRepository.saveSettings({theme});
+        }
+
+        if (coreSettings.themeAutoSwitch && theme !== 'light') {
+            if (Appearance.getColorScheme() === 'light') {
+                Prompt(
+                    Localize.t('global.info'),
+                    Localize.t('settings.notChangingYetBecauseLightMode'),
+                    [
+                        { text: Localize.t('global.ok') },
+                    ],
+                    { type: 'default' },
+                );
+                return; // We do not switch because it's light time
+            }
+        }
 
-        // exit the app
-        ExitApp();
+        StyleService.initialize(CoreRepository.getSettings())
+            .then(() => {
+                requestAnimationFrame(() => {
+                    Navigator.switchTheme();
+                });
+            });
     };
 
     onThemeSelect = (selected: Themes) => {
-        Prompt(
-            Localize.t('global.warning'),
-            Localize.t('settings.changingThemeNeedsRestartToTakeEffect'),
-            [
-                { text: Localize.t('global.cancel') },
-                {
-                    text: Localize.t('global.quitApp'),
-                    onPress: () => {
-                        this.changeTheme(selected);
-                    },
-                    style: 'destructive',
-                },
-            ],
-            { type: 'default' },
-        );
+        this.changeTheme(selected);
+        // Prompt(
+        //     Localize.t('global.warning'),
+        //     Localize.t('settings.changingThemeNeedsRestartToTakeEffect'),
+        //     [
+        //         { text: Localize.t('global.cancel') },
+        //         {
+        //             text: Localize.t('global.quitApp'),
+        //             onPress: () => {
+        //                 this.changeTheme(selected);
+        //             },
+        //             style: 'destructive',
+        //         },
+        //     ],
+        //     { type: 'default' },
+        // );
     };
 
     renderThemeButton = (theme: Themes, { title, description }: any) => {
@@ -268,10 +321,34 @@ class GeneralSettingsView extends Component<Props, State> {
                             <Text style={AppStyles.pbold}>{Localize.t('global.theme')}</Text>
                         </View>
                     </View>
+                    <View style={styles.row}>
+                        <View style={AppStyles.flex3}>
+                            <Text numberOfLines={1} style={styles.label}>
+                                {Localize.t('settings.themeAutoSwitch')}
+                            </Text>
+                        </View>
+                        <View style={[AppStyles.rightAligned, AppStyles.flex1]}>
+                            <Switch
+                                checked={coreSettings.themeAutoSwitch}
+                                onChange={this.themeAutoSwitch}
+                            />
+                        </View>
+                    </View>
                     <View style={styles.rowNoBorder}>
                         <View style={AppStyles.flex1}>
-                            {/* @ts-ignore */}
-                            {Object.keys(themeItems).map((key: Themes) => this.renderThemeButton(key, themeItems[key]))}
+                            {
+                                Object.keys(themeItems)
+                                    // @ts-ignore
+                                    .filter((key: Themes) => {
+                                        if (coreSettings.themeAutoSwitch) {
+                                            if (key === 'light') return false;
+                                        }
+                                        
+                                        return true;
+                                    })
+                                    // @ts-ignore
+                                    .map((key: Themes) => this.renderThemeButton(key, themeItems[key]))
+                            }
                         </View>
                     </View>
 
@@ -299,6 +376,34 @@ class GeneralSettingsView extends Component<Props, State> {
                         </View>
                     </TouchableDebounce>
 
+                    <View style={styles.row}>
+                        <View style={AppStyles.flex3}>
+                            <Text numberOfLines={1} style={styles.label}>
+                                {Localize.t('settings.hideAdvisoryTransactions')}
+                            </Text>
+                        </View>
+                        <View style={[AppStyles.rightAligned, AppStyles.flex1]}>
+                            <Switch
+                                checked={coreSettings.hideAdvisoryTransactions}
+                                onChange={this.hideAdvisoryTransactionsChange}
+                            />
+                        </View>
+                    </View>
+
+                    <View style={styles.row}>
+                        <View style={AppStyles.flex3}>
+                            <Text numberOfLines={1} style={styles.label}>
+                                {Localize.t('settings.hideServiceFeeTransactions')}
+                            </Text>
+                        </View>
+                        <View style={[AppStyles.rightAligned, AppStyles.flex1]}>
+                            <Switch
+                                checked={coreSettings.hideServiceFeeTransactions}
+                                onChange={this.hideServiceFeeTransactionsChange}
+                            />
+                        </View>
+                    </View>
+
                     <View style={styles.row}>
                         <View style={AppStyles.flex3}>
                             <Text numberOfLines={1} style={styles.label}>
diff --git a/src/screens/Settings/General/styles.tsx b/src/screens/Settings/General/styles.tsx
index 9ee175f57..123fac777 100644
--- a/src/screens/Settings/General/styles.tsx
+++ b/src/screens/Settings/General/styles.tsx
@@ -22,7 +22,7 @@ const styles = StyleService.create({
         justifyContent: 'center',
         paddingHorizontal: AppSizes.paddingSml,
         paddingVertical: AppSizes.paddingSml,
-        borderBottomWidth: StyleSheet.hairlineWidth,
+        borderBottomWidth: 0,
         borderTopWidth: StyleSheet.hairlineWidth,
         borderColor: '$tint',
     },
diff --git a/src/screens/Settings/Security/ChangePasscode/ChangePasscodeView.tsx b/src/screens/Settings/Security/ChangePasscode/ChangePasscodeView.tsx
index 088e57dd5..724b190a0 100644
--- a/src/screens/Settings/Security/ChangePasscode/ChangePasscodeView.tsx
+++ b/src/screens/Settings/Security/ChangePasscode/ChangePasscodeView.tsx
@@ -8,6 +8,8 @@ import { View, Text, Alert, InteractionManager } from 'react-native';
 import { CoreRepository, AccountRepository } from '@store/repositories';
 import { EncryptionLevels } from '@store/types';
 
+import { CoreModel } from '@store/models';
+
 import Vault from '@common/libs/vault';
 import { Navigator } from '@common/helpers/navigator';
 import { Prompt } from '@common/helpers/interface';
@@ -16,7 +18,8 @@ import { AuthenticationService } from '@services';
 
 import { AppScreens } from '@common/constants';
 
-import { Header, PinInput } from '@components/General';
+import { Header, SecurePinInput } from '@components/General';
+import { isStrong } from '@components/General/PinInput/PinInput';
 
 import Localize from '@locale';
 
@@ -35,6 +38,7 @@ enum Steps {
 export interface Props {}
 
 export interface State {
+    coreSettings: CoreModel;
     newPasscode: string;
     currentStep: Steps;
     stepDescription: string;
@@ -42,7 +46,7 @@ export interface State {
 /* Component ==================================================================== */
 class ChangePasscodeView extends Component<Props, State> {
     static screenName = AppScreens.Settings.ChangePasscode;
-    private readonly pinInput: React.RefObject<PinInput>;
+    private readonly pinInput: React.RefObject<SecurePinInput>;
 
     static options() {
         return {
@@ -54,6 +58,7 @@ class ChangePasscodeView extends Component<Props, State> {
         super(props);
 
         this.state = {
+            coreSettings: CoreRepository.getSettings(),
             newPasscode: '',
             currentStep: Steps.ENTER_OLD_PASSCODE,
             stepDescription: Localize.t('settings.enterOldPasscode'),
@@ -67,19 +72,21 @@ class ChangePasscodeView extends Component<Props, State> {
     }
 
     cleanPinInput = () => {
-        setTimeout(() => {
+        requestAnimationFrame(() => {
             if (this.pinInput.current) {
-                this.pinInput.current.clean();
+                this.pinInput.current?.setState({
+                    digits: '',
+                });    
             }
-        }, 100);
+        });
     };
 
     focusPinInput = () => {
-        setTimeout(() => {
+        requestAnimationFrame(() => {
             if (this.pinInput.current) {
                 this.pinInput.current.focus();
             }
-        }, 100);
+        });
     };
 
     changeStep = (step: Steps) => {
@@ -190,8 +197,8 @@ class ChangePasscodeView extends Component<Props, State> {
             });
     };
 
-    checkNewPasscode = (newPasscode: string, isStrong: boolean) => {
-        if (isStrong) {
+    checkNewPasscode = (newPasscode: string) => {
+        if (isStrong(newPasscode)) {
             this.setState({
                 newPasscode,
             });
@@ -242,7 +249,7 @@ class ChangePasscodeView extends Component<Props, State> {
         await this.changePasscode();
     };
 
-    onPasscodeEntered = (passcode: string, isStrong?: boolean) => {
+    onPasscodeEntered = (passcode: string) => {
         const { currentStep } = this.state;
 
         switch (currentStep) {
@@ -250,7 +257,7 @@ class ChangePasscodeView extends Component<Props, State> {
                 this.checkOldPasscode(passcode);
                 break;
             case Steps.ENTER_NEW_PASSCODE:
-                this.checkNewPasscode(passcode, isStrong!);
+                this.checkNewPasscode(passcode);
                 break;
             case Steps.CONFIRM_NEW_PASSCODE:
                 this.checkConfirmPasscode(passcode);
@@ -261,7 +268,7 @@ class ChangePasscodeView extends Component<Props, State> {
     };
 
     render() {
-        const { currentStep, stepDescription } = this.state;
+        const { stepDescription, coreSettings } = this.state;
 
         return (
             <View testID="change-passcode-screen" style={styles.container}>
@@ -272,17 +279,26 @@ class ChangePasscodeView extends Component<Props, State> {
                     }}
                     centerComponent={{ text: Localize.t('settings.changePasscode') }}
                 />
-                <View style={[AppStyles.flex3, AppStyles.flexEnd]}>
-                    <Text style={[AppStyles.h5, AppStyles.textCenterAligned]}>{stepDescription}</Text>
+                
+                <View style={[AppStyles.flex1, AppStyles.flexStart, AppStyles.paddingTop]}>
+                    <Text style={[AppStyles.p, AppStyles.textCenterAligned]}>{stepDescription}</Text>
                 </View>
                 <View style={[AppStyles.flex8, AppStyles.paddingSml, AppStyles.centerAligned]}>
-                    <PinInput
+                    <SecurePinInput
+                        ref={this.pinInput}
+                        virtualKeyboard
+                        onInputFinish={this.onPasscodeEntered}
+                        supportBiometric={false}
+                        enableHapticFeedback={coreSettings.hapticFeedback}
+                        length={6}
+                    />
+                    {/* <PinInput
                         ref={this.pinInput}
                         autoFocus={false}
                         codeLength={6}
                         checkStrength={currentStep === Steps.ENTER_NEW_PASSCODE}
                         onFinish={this.onPasscodeEntered}
-                    />
+                    /> */}
                 </View>
             </View>
         );
diff --git a/src/screens/Settings/Security/SecuritySettingsView.tsx b/src/screens/Settings/Security/SecuritySettingsView.tsx
index 79636ab17..9ba83f43c 100644
--- a/src/screens/Settings/Security/SecuritySettingsView.tsx
+++ b/src/screens/Settings/Security/SecuritySettingsView.tsx
@@ -181,13 +181,13 @@ class SecuritySettingsView extends Component<Props, State> {
         Navigator.push<ChangePasscodeViewProps>(
             AppScreens.Settings.ChangePasscode,
             {},
-            {
-                animations: {
-                    push: {
-                        enabled: false,
-                    },
-                },
-            },
+            // {
+            //     animations: {
+            //         push: {
+            //             enabled: false,
+            //         },
+            //     },
+            // },
         );
     };
 
diff --git a/src/screens/Settings/SettingsView.tsx b/src/screens/Settings/SettingsView.tsx
index 4a3ac2faa..3cd2d5281 100644
--- a/src/screens/Settings/SettingsView.tsx
+++ b/src/screens/Settings/SettingsView.tsx
@@ -11,7 +11,7 @@ import { XAppOrigin } from '@common/libs/payload';
 import { AppScreenKeys, Navigator } from '@common/helpers/navigator';
 import { AppConfig, AppScreens } from '@common/constants';
 
-import { TouchableDebounce, Header, Icon, HorizontalLine } from '@components/General';
+import { TouchableDebounce, Header, Icon } from '@components/General';
 import { MonetizationElement } from '@components/Modules';
 
 import Localize from '@locale';
@@ -98,7 +98,7 @@ class SettingsView extends Component<Props, State> {
                 <View style={AppStyles.contentContainer}>
                     <ScrollView
                         style={AppStyles.flex1}
-                        contentContainerStyle={[AppStyles.paddingRight, AppStyles.paddingLeft]}
+                        contentContainerStyle={[AppStyles.paddingRightSml, AppStyles.paddingLeft]}
                     >
                         {this.renderRow(
                             'IconAccount',
@@ -106,7 +106,13 @@ class SettingsView extends Component<Props, State> {
                             AppScreens.Account.List,
                             'accounts-button',
                         )}
-                        <HorizontalLine />
+                        {this.renderRow(
+                            'IconBook',
+                            Localize.t('global.addressBook'),
+                            AppScreens.Settings.AddressBook.List,
+                            'address-book-button',
+                        )}
+                        <View style={styles.hr} />
                         {this.renderRow(
                             'IconSlider',
                             Localize.t('global.general'),
@@ -114,10 +120,10 @@ class SettingsView extends Component<Props, State> {
                             'general-button',
                         )}
                         {this.renderRow(
-                            'IconBook',
-                            Localize.t('global.addressBook'),
-                            AppScreens.Settings.AddressBook.List,
-                            'address-book-button',
+                            'IconActivity',
+                            Localize.t('global.advanced'),
+                            AppScreens.Settings.Advanced,
+                            'advanced-button',
                         )}
                         <View style={styles.hr} />
                         {this.renderRow(
@@ -132,12 +138,6 @@ class SettingsView extends Component<Props, State> {
                             AppScreens.Settings.ThirdPartyApps.List,
                             'third_party-apps-button',
                         )}
-                        {this.renderRow(
-                            'IconActivity',
-                            Localize.t('global.advanced'),
-                            AppScreens.Settings.Advanced,
-                            'advanced-button',
-                        )}
                         <View style={styles.hr} />
                         {this.renderRow(
                             'IconHelpCircle',
@@ -151,12 +151,12 @@ class SettingsView extends Component<Props, State> {
                             AppScreens.Settings.TermOfUse,
                             'tos-button',
                         )}
-                        {this.renderRow(
+                        {/* {this.renderRow(
                             'IconStar',
                             Localize.t('settings.credits'),
                             AppScreens.Settings.Credits,
                             'credits-button',
-                        )}
+                        )} */}
                     </ScrollView>
                 </View>
             </View>
diff --git a/src/screens/Settings/TermOfUse/TermOfUseView.tsx b/src/screens/Settings/TermOfUse/TermOfUseView.tsx
index 5c6ac4ca9..0427f3f5f 100644
--- a/src/screens/Settings/TermOfUse/TermOfUseView.tsx
+++ b/src/screens/Settings/TermOfUse/TermOfUseView.tsx
@@ -10,7 +10,8 @@ import { Navigator } from '@common/helpers/navigator';
 
 import { AppScreens } from '@common/constants';
 
-import { ProfileRepository, CoreRepository } from '@store/repositories';
+import { ProfileRepository } from '@store/repositories';
+// import { ProfileRepository, CoreRepository } from '@store/repositories';
 
 import { WebViewBrowser, Header, Footer, Spacer, Button } from '@components/General';
 
@@ -23,6 +24,7 @@ import styles from './styles';
 /* types ==================================================================== */
 import { Props, State } from './types';
 import { WebLinks } from '@common/constants/endpoints';
+import StyleService from '@services/StyleService';
 
 /* Component ==================================================================== */
 class TermOfUseView extends Component<Props, State> {
@@ -43,7 +45,7 @@ class TermOfUseView extends Component<Props, State> {
             TOSVersion: 0,
             isTOSLoaded: false,
             shouldShowAgreement: false,
-            coreSettings: CoreRepository.getSettings(),
+            // coreSettings: CoreRepository.getSettings(),
         };
     }
 
@@ -96,14 +98,14 @@ class TermOfUseView extends Component<Props, State> {
     };
 
     getHeaders = () => {
-        const { coreSettings } = this.state;
+        // const { coreSettings } = this.state;
 
-        if (coreSettings) {
-            return {
-                'X-Xaman-Style': coreSettings.theme,
-            };
-        }
-        return {};
+        // if (coreSettings) {
+        return {
+            'X-Xaman-Style': StyleService.getCurrentTheme(),
+        };
+        // }
+        // return {};
     };
 
     getURI = () => {
diff --git a/src/screens/Settings/TermOfUse/types.ts b/src/screens/Settings/TermOfUse/types.ts
index 73293bd2f..52ad3eb54 100644
--- a/src/screens/Settings/TermOfUse/types.ts
+++ b/src/screens/Settings/TermOfUse/types.ts
@@ -1,4 +1,4 @@
-import { CoreModel } from '@store/models';
+// import { CoreModel } from '@store/models';
 
 export interface Props {
     asModal: boolean;
@@ -8,5 +8,5 @@ export interface State {
     TOSVersion: number;
     isTOSLoaded: boolean;
     shouldShowAgreement: boolean;
-    coreSettings: CoreModel;
+    // coreSettings: CoreModel;
 }
diff --git a/src/screens/Settings/ThirdPartyApps/ThirdPartyAppsView.tsx b/src/screens/Settings/ThirdPartyApps/ThirdPartyAppsView.tsx
index 1a2718249..0acac332b 100644
--- a/src/screens/Settings/ThirdPartyApps/ThirdPartyAppsView.tsx
+++ b/src/screens/Settings/ThirdPartyApps/ThirdPartyAppsView.tsx
@@ -131,8 +131,10 @@ class ThirdPartyAppsView extends Component<Props, State> {
 
         return (
             <ImageBackground
-                source={StyleService.getImage('BackgroundShapes')}
-                imageStyle={AppStyles.BackgroundShapes}
+                resizeMode="cover"
+                source={
+                    StyleService.getImageIfLightModeIfDarkMode('BackgroundShapesLight', 'BackgroundShapes')
+                }
                 style={[AppStyles.flex1, AppStyles.centerContent]}
             >
                 <View style={[AppStyles.centerAligned, AppStyles.paddingSml]}>
@@ -164,7 +166,10 @@ class ThirdPartyAppsView extends Component<Props, State> {
                 />
                 <FlatList
                     style={[AppStyles.flex1, AppStyles.stretchSelf]}
-                    contentContainerStyle={styles.scrollContainer}
+                    contentContainerStyle={[
+                        styles.scrollContainer,
+                        !isLoading && thirdPartyApps.length > 0 && AppStyles.paddingBottom,
+                    ]}
                     data={thirdPartyApps}
                     refreshing={isLoading}
                     renderItem={this.renderItem}
diff --git a/src/screens/Settings/ThirdPartyApps/styles.tsx b/src/screens/Settings/ThirdPartyApps/styles.tsx
index ca08a1d55..a04465785 100644
--- a/src/screens/Settings/ThirdPartyApps/styles.tsx
+++ b/src/screens/Settings/ThirdPartyApps/styles.tsx
@@ -7,7 +7,6 @@ const styles = StyleService.create({
     container: { flex: 1, justifyContent: 'center', alignItems: 'center' },
     scrollContainer: {
         flexGrow: 1,
-        paddingBottom: AppSizes.padding,
     },
     rowContainer: {
         flexDirection: 'row',
diff --git a/src/screens/Settings/styles.tsx b/src/screens/Settings/styles.tsx
index 13d9f164d..96b18a328 100644
--- a/src/screens/Settings/styles.tsx
+++ b/src/screens/Settings/styles.tsx
@@ -5,8 +5,8 @@ import { AppSizes, AppFonts } from '@theme';
 /* Styles ==================================================================== */
 const styles = StyleService.create({
     rowContainer: {
-        paddingTop: AppSizes.heightPercentageToDP(2.5),
-        paddingBottom: AppSizes.heightPercentageToDP(2.5),
+        paddingTop: AppSizes.heightPercentageToDP(2),
+        paddingBottom: AppSizes.heightPercentageToDP(2),
     },
     rowLabel: {
         fontFamily: AppFonts.base.familyBold,
@@ -17,8 +17,9 @@ const styles = StyleService.create({
         tintColor: '$textPrimary',
     },
     hr: {
-        borderBottomColor: '$tint',
-        borderBottomWidth: 2,
+        borderBottomColor: '$contrast',
+        opacity: 0.15,
+        borderBottomWidth: 1,
         marginTop: 7,
         marginBottom: 7,
     },
diff --git a/src/screens/Setup/Biometry/BiometryView.tsx b/src/screens/Setup/Biometry/BiometryView.tsx
index bf38f9719..789c5e7eb 100644
--- a/src/screens/Setup/Biometry/BiometryView.tsx
+++ b/src/screens/Setup/Biometry/BiometryView.tsx
@@ -3,15 +3,15 @@
  */
 
 import React, { Component } from 'react';
-import { SafeAreaView, View, Text, Alert, Image } from 'react-native';
+import { SafeAreaView, View, Text, Alert, Image, ImageBackground } from 'react-native';
 
 import { CoreRepository } from '@store/repositories';
 import { BiometryType } from '@store/types';
 
+import { Images } from '@common/helpers/images';
 import { Biometric } from '@common/libs/biometric';
 
 import { Navigator } from '@common/helpers/navigator';
-import { Images } from '@common/helpers/images';
 import { AppScreens } from '@common/constants';
 
 import { PushNotificationsService, StyleService } from '@services';
@@ -25,6 +25,7 @@ import { PushNotificationSetupViewProps } from '@screens/Setup/PushNotification'
 
 import { AppStyles } from '@theme';
 import styles from './styles';
+import onboardingStyles from '../../Onboarding/styles';
 
 /* types ==================================================================== */
 export interface Props {}
@@ -50,11 +51,7 @@ class BiometrySetupView extends Component<Props, State> {
     }
 
     static options() {
-        return {
-            topBar: {
-                visible: false,
-            },
-        };
+        return { topBar: { visible: false } };
     }
 
     onYesPress = async () => {
@@ -126,44 +123,69 @@ class BiometrySetupView extends Component<Props, State> {
         const { isButtonsDisabled, isSkipButtonLoading, isSaveButtonLoading } = this.state;
 
         return (
-            <SafeAreaView testID="biometric-setup-view" style={[AppStyles.container]}>
-                <View style={[AppStyles.flex2, AppStyles.centerContent]}>
-                    <Image style={styles.logo} source={StyleService.getImage('XamanLogo')} />
-                </View>
-
-                <View style={[AppStyles.flex8, AppStyles.paddingSml]}>
-                    <View style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.centerContent]}>
-                        <Image style={[AppStyles.emptyIcon]} source={Images.ImageBiometric} />
+            <ImageBackground
+                testID="biometric-setup-view"
+                resizeMode="cover"
+                source={StyleService.getImageIfLightModeIfDarkMode('BackgroundPatternLight', 'BackgroundPattern')}
+                style={onboardingStyles.backgroundImageStyle}
+                imageStyle={onboardingStyles.backgroundImageStyle}
+            >
+                <SafeAreaView style={[AppStyles.flex1, AppStyles.centerAligned, AppStyles.padding]}>
+                    <Image
+                        style={onboardingStyles.logo}
+                        source={StyleService.getImageIfLightModeIfDarkMode('XamanLogo', 'XamanLogoLight')}
+                    />
+                </SafeAreaView>
+                <View style={[
+                    AppStyles.flex4,
+                ]}>
+                    <View style={[AppStyles.flex8, AppStyles.paddingSml]}>
+                        <View style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.flexEnd]}>
+                            <Text style={[AppStyles.h5, AppStyles.strong]}>
+                                {Localize.t('setupBiometry.useBiometry')}
+                            </Text>
+                            <Spacer size={10} />
+                            <Text style={[AppStyles.p, AppStyles.textCenterAligned, AppStyles.colorSilver]}>
+                                {Localize.t('setupBiometry.biometryDescription')}
+                            </Text>
+                            <View style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.centerContent]}>
+                                <Image style={[styles.icon]} source={Images.ImageBiometric} />
+                            </View>
+                        </View>
                     </View>
 
-                    <View style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.flexEnd]}>
-                        <Text style={[AppStyles.h5, AppStyles.strong]}>{Localize.t('setupBiometry.useBiometry')}</Text>
-                        <Spacer size={10} />
-                        <Text style={[AppStyles.p, AppStyles.textCenterAligned]}>
-                            {Localize.t('setupBiometry.biometryDescription')}
-                        </Text>
-                    </View>
                 </View>
-
-                <Footer style={[AppStyles.paddingBottom]}>
-                    <Button
-                        light
-                        testID="skip-button"
-                        label={Localize.t('global.maybeLater')}
-                        onPress={this.onSkipPress}
-                        isDisabled={isButtonsDisabled && !isSkipButtonLoading}
-                        isLoading={isSkipButtonLoading}
-                    />
-                    <Spacer />
-                    <Button
-                        testID="yes-button"
-                        label={Localize.t('global.yes')}
-                        onPress={this.onYesPress}
-                        isDisabled={isButtonsDisabled}
-                        isLoading={isSaveButtonLoading}
-                    />
-                </Footer>
-            </SafeAreaView>
+                <SafeAreaView style={[
+                    AppStyles.flex2,
+                    AppStyles.marginTop,
+                ]}>
+                    <SafeAreaView style={[
+                        onboardingStyles.container,
+                    ]}>
+                        <Footer style={[
+                            AppStyles.paddingBottom,
+                            AppStyles.paddingTopNone,
+                        ]}>
+                            <Button
+                                light
+                                testID="skip-button"
+                                label={Localize.t('global.maybeLater')}
+                                onPress={this.onSkipPress}
+                                isDisabled={isButtonsDisabled && !isSkipButtonLoading}
+                                isLoading={isSkipButtonLoading}
+                            />
+                            <Spacer />
+                            <Button
+                                testID="yes-button"
+                                label={Localize.t('global.yes')}
+                                onPress={this.onYesPress}
+                                isDisabled={isButtonsDisabled}
+                                isLoading={isSaveButtonLoading}
+                            />
+                        </Footer>
+                    </SafeAreaView>
+                </SafeAreaView>
+            </ImageBackground>
         );
     }
 }
diff --git a/src/screens/Setup/Biometry/styles.ts b/src/screens/Setup/Biometry/styles.ts
index d3ee3cd02..72ed1ece5 100644
--- a/src/screens/Setup/Biometry/styles.ts
+++ b/src/screens/Setup/Biometry/styles.ts
@@ -3,10 +3,10 @@ import { StyleSheet } from 'react-native';
 import { AppSizes } from '@theme';
 
 const styles = StyleSheet.create({
-    logo: {
-        width: AppSizes.screen.width * 0.4,
-        height: AppSizes.screen.height * 0.1,
-        resizeMode: 'contain',
+    icon: {
+        width: AppSizes.screen.width * 0.5,
+        height: AppSizes.screen.height * 0.25,
+        resizeMode: 'contain',    
     },
 });
 
diff --git a/src/screens/Setup/Passcode/PasscodeView.tsx b/src/screens/Setup/Passcode/PasscodeView.tsx
index 5647a17b3..aa67ec759 100644
--- a/src/screens/Setup/Passcode/PasscodeView.tsx
+++ b/src/screens/Setup/Passcode/PasscodeView.tsx
@@ -4,12 +4,14 @@
 
 import React, { Component } from 'react';
 
-import { SafeAreaView, View, Text, Image, LayoutAnimation, Alert } from 'react-native';
+import { SafeAreaView, View, Text, Image, LayoutAnimation, ImageBackground, Alert } from 'react-native';
 
 import { CoreRepository } from '@store/repositories';
+import { CoreModel } from '@store/models';
 import { BiometryType } from '@store/types';
 
 import { Biometric } from '@common/libs/biometric';
+import { Images } from '@common/helpers/images';
 
 import { AppScreens } from '@common/constants';
 import { Navigator } from '@common/helpers/navigator';
@@ -17,7 +19,8 @@ import { VibrateHapticFeedback, Toast, Prompt } from '@common/helpers/interface'
 
 import { PushNotificationsService, StyleService } from '@services';
 
-import { Button, Spacer, Footer, PinInput, InfoMessage } from '@components/General';
+import { Button, Spacer, Footer, SecurePinInput } from '@components/General';
+import { isStrong } from '@components/General/PinInput/PinInput';
 
 import Localize from '@locale';
 
@@ -27,6 +30,7 @@ import { PushNotificationSetupViewProps } from '@screens/Setup/PushNotification'
 
 import { AppStyles } from '@theme';
 import styles from './styles';
+import onboardingStyles from '../../Onboarding/styles';
 
 /* types ==================================================================== */
 enum Steps {
@@ -38,6 +42,7 @@ enum Steps {
 export interface Props {}
 
 export interface State {
+    coreSettings: CoreModel;
     passcode: string;
     passcodeConfirm: string;
     currentStep: Steps;
@@ -48,20 +53,17 @@ export interface State {
 class PasscodeSetupView extends Component<Props, State> {
     static screenName = AppScreens.Setup.Passcode;
 
-    private pinInputRef: React.RefObject<PinInput>;
+    private pinInputRef: React.RefObject<SecurePinInput>;
 
     static options() {
-        return {
-            topBar: {
-                visible: false,
-            },
-        };
+        return { topBar: { visible: false } };
     }
 
     constructor(props: Props) {
         super(props);
 
         this.state = {
+            coreSettings: CoreRepository.getSettings(),
             passcode: '',
             passcodeConfirm: '',
             currentStep: Steps.EXPLANATION,
@@ -140,8 +142,8 @@ class PasscodeSetupView extends Component<Props, State> {
                 },
                 () => {
                     if (this.pinInputRef?.current) {
-                        this.pinInputRef?.current.clean();
-                        this.pinInputRef?.current.focus();
+                        this.cleanPinInput();
+                        // this.pinInputRef?.current.focus();
                     }
                 },
             );
@@ -170,7 +172,7 @@ class PasscodeSetupView extends Component<Props, State> {
                 },
                 () => {
                     if (this.pinInputRef?.current) {
-                        this.pinInputRef?.current.clean();
+                        this.cleanPinInput();
                     }
                 },
             );
@@ -178,19 +180,33 @@ class PasscodeSetupView extends Component<Props, State> {
     };
 
     isBiometricSupported = () => {
+        // console.log('isBiometricSupported')
         return new Promise((resolve) => {
             Biometric.isSensorAvailable()
                 .then(() => {
+                    // console.log('isBiometricSupported true')
                     resolve(true);
                 })
                 .catch(() => {
+                    // console.log('isBiometricSupported false')
                     resolve(false);
                 });
         });
     };
 
-    checkPasscode = (passcode: string, isStrong: boolean) => {
-        if (isStrong) {
+    cleanPinInput = () => {
+        requestAnimationFrame(() => {
+            if (this.pinInputRef.current) {
+                this.pinInputRef.current?.setState({
+                    digits: '',
+                });    
+                this.pinInputRef.current.focus();
+            }
+        });
+    };
+
+    checkPasscode = (passcode: string) => {
+        if (isStrong(passcode)) {
             VibrateHapticFeedback('impactLight');
             this.setState({
                 passcode,
@@ -217,8 +233,8 @@ class PasscodeSetupView extends Component<Props, State> {
                         text: Localize.t('setupPasscode.changePasscode'),
                         onPress: () => {
                             if (this.pinInputRef?.current) {
-                                this.pinInputRef?.current.clean();
-                                this.pinInputRef?.current.focus();
+                                this.cleanPinInput();
+                                // this.pinInputRef?.current.focus();
                             }
                         },
                     },
@@ -238,8 +254,8 @@ class PasscodeSetupView extends Component<Props, State> {
 
             // clean pin code
             if (this.pinInputRef?.current) {
-                this.pinInputRef?.current.clean();
-                this.pinInputRef?.current.focus();
+                this.cleanPinInput();
+                // this.pinInputRef?.current.focus();
             }
 
             // go back to entry step
@@ -256,12 +272,12 @@ class PasscodeSetupView extends Component<Props, State> {
         });
     };
 
-    onPasscodeEnter = (code: string, isStrong?: boolean) => {
+    onPasscodeEnter = (code: string) => {
         const { currentStep } = this.state;
 
         switch (currentStep) {
             case Steps.ENTER_PASSCODE:
-                this.checkPasscode(code, isStrong!);
+                this.checkPasscode(code);
                 break;
             case Steps.CONFIRM_PASSCODE:
                 this.checkPasscodeConfirm(code);
@@ -271,22 +287,12 @@ class PasscodeSetupView extends Component<Props, State> {
         }
     };
 
-    renderHeader = () => {
-        return (
-            <View style={[AppStyles.flex2, AppStyles.centerContent]}>
-                <Image style={styles.logo} source={StyleService.getImage('XamanLogo')} />
-            </View>
-        );
-    };
-
     renderFooter = () => {
         const { currentStep, passcode, passcodeConfirm, isLoading } = this.state;
 
         if (currentStep === Steps.EXPLANATION) {
             return (
-                <Footer style={AppStyles.paddingBottom}>
-                    <Button testID="go-button" onPress={this.onNext} label={Localize.t('global.go')} />
-                </Footer>
+                <Button testID="go-button" onPress={this.onNext} label={Localize.t('global.okLetsGo')} />
             );
         }
 
@@ -320,58 +326,103 @@ class PasscodeSetupView extends Component<Props, State> {
     };
 
     renderContent() {
-        const { currentStep } = this.state;
+        const { currentStep, coreSettings } = this.state;
 
         if (currentStep === Steps.EXPLANATION) {
             return (
                 <View testID="pin-code-explanation-view" style={[AppStyles.flex8, AppStyles.paddingSml]}>
-                    <View style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.centerContent]}>
-                        <Image style={[AppStyles.emptyIcon]} source={StyleService.getImage('ImagePincode')} />
-                    </View>
-
-                    <View style={[AppStyles.flex2, AppStyles.centerAligned]}>
+                    <View style={[AppStyles.centerAligned]}>
                         <Text style={[AppStyles.h5, AppStyles.strong]}>
                             {Localize.t('setupPasscode.setupAPasscode')}
                         </Text>
                         <Spacer size={20} />
-                        <Text style={[AppStyles.p, AppStyles.textCenterAligned]}>
+                        <Text style={[AppStyles.p, AppStyles.textCenterAligned, AppStyles.colorSilver]}>
                             {Localize.t('setupPasscode.passCodeDescription')}
                         </Text>
                     </View>
+                    <View style={[AppStyles.centerAligned, AppStyles.centerContent]}>
+                        <Image style={[styles.instructionImage]} source={Images.Pincode} />
+                    </View>
                 </View>
             );
         }
 
         return (
-            <View testID="pin-code-entry-view" style={[AppStyles.flex8, AppStyles.paddingSml, AppStyles.stretchSelf]}>
-                <View style={[AppStyles.flex1, AppStyles.centerContent, AppStyles.centerAligned]}>
-                    <Text style={[AppStyles.h5, AppStyles.textCenterAligned, AppStyles.stretchSelf]}>
-                        {currentStep === Steps.ENTER_PASSCODE
-                            ? Localize.t('setupPasscode.setPasscode')
-                            : Localize.t('setupPasscode.repeatPasscode')}
+            <View testID="pin-code-entry-view" style={[
+                AppStyles.paddingTop,
+                AppStyles.marginTop,
+                AppStyles.paddingHorizontal,
+            ]}>
+                <Text style={[
+                    AppStyles.p,
+                    AppStyles.textCenterAligned,
+                    AppStyles.marginBottomSml,
+                ]}>
+                    {currentStep === Steps.ENTER_PASSCODE
+                        ? Localize.t('setupPasscode.setPasscode')
+                        : Localize.t('setupPasscode.repeatPasscode')}
+                </Text>
+                { currentStep === Steps.ENTER_PASSCODE &&
+                    <Text style={[
+                        AppStyles.smalltext,
+                        AppStyles.bold,
+                        AppStyles.textCenterAligned,
+                        AppStyles.marginTopNegativeSml,
+                        AppStyles.colorPrimary,
+                    ]}>
+                        {Localize.t('setupPasscode.warnNeedPasscode')}
                     </Text>
-                    <Spacer size={30} />
-                    <PinInput
-                        autoFocus
-                        ref={this.pinInputRef}
-                        checkStrength={currentStep === Steps.ENTER_PASSCODE}
-                        codeLength={6}
-                        onFinish={this.onPasscodeEnter}
-                    />
-                </View>
-
-                <InfoMessage label={Localize.t('setupPasscode.warnNeedPasscode')} type="warning" />
+                }
+                {/* <Spacer size={11} /> */}
+                <SecurePinInput
+                    // autoFocus
+                    ref={this.pinInputRef}
+                    virtualKeyboard
+                    condensed
+                    // checkStrength={currentStep === Steps.ENTER_PASSCODE}
+                    length={6}
+                    pinPadStyle={[
+                    ]}
+                    supportBiometric={false}
+                    enableHapticFeedback={coreSettings.hapticFeedback}
+                    onInputFinish={this.onPasscodeEnter}
+                />
             </View>
         );
     }
 
     render() {
         return (
-            <SafeAreaView testID="setup-passcode-screen" style={AppStyles.container}>
-                {this.renderHeader()}
+            <ImageBackground
+                testID="setup-passcode-screen"
+                resizeMode="cover"
+                source={StyleService.getImageIfLightModeIfDarkMode('BackgroundPatternLight', 'BackgroundPattern')}
+                style={onboardingStyles.backgroundImageStyle}
+                imageStyle={onboardingStyles.backgroundImageStyle}
+            >
+                <SafeAreaView style={[AppStyles.flex2, AppStyles.centerAligned, AppStyles.padding]}>
+                    <Image
+                        style={onboardingStyles.logo}
+                        source={StyleService.getImageIfLightModeIfDarkMode('XamanLogo', 'XamanLogoLight')}
+                    />
+                </SafeAreaView>
                 {this.renderContent()}
-                {this.renderFooter()}
-            </SafeAreaView>
+                <SafeAreaView style={[
+                    AppStyles.flex2,
+                    AppStyles.marginTop,
+                ]}>
+                    <SafeAreaView style={[
+                        onboardingStyles.container,
+                    ]}>
+                        <Footer style={[
+                            AppStyles.paddingBottom,
+                            AppStyles.paddingTopNone,
+                        ]}>
+                            {this.renderFooter()}
+                        </Footer>
+                    </SafeAreaView>
+                </SafeAreaView>
+            </ImageBackground>
         );
     }
 }
diff --git a/src/screens/Setup/Passcode/styles.ts b/src/screens/Setup/Passcode/styles.ts
index 39645394c..f197371c5 100644
--- a/src/screens/Setup/Passcode/styles.ts
+++ b/src/screens/Setup/Passcode/styles.ts
@@ -8,7 +8,12 @@ const styles = StyleSheet.create({
         height: AppSizes.screen.height * 0.1,
         resizeMode: 'contain',
     },
-
+    instructionImage: {
+        width: AppSizes.screen.width * 0.8,
+        height: AppSizes.screen.height * 0.3,
+        marginTop: AppSizes.screen.height * 0.08,
+        resizeMode: 'contain',
+    },
     IconChevronLeft: {
         marginLeft: 4,
         width: AppSizes.screen.width * 0.09,
diff --git a/src/screens/Setup/PushNotification/PushNotificationView.tsx b/src/screens/Setup/PushNotification/PushNotificationView.tsx
index 6b8d53659..1aa548fcc 100644
--- a/src/screens/Setup/PushNotification/PushNotificationView.tsx
+++ b/src/screens/Setup/PushNotification/PushNotificationView.tsx
@@ -4,10 +4,11 @@
 
 import React, { Component } from 'react';
 
-import { View, Text, Image, SafeAreaView, Alert } from 'react-native';
+import { View, Text, Image, SafeAreaView, Alert, ImageBackground } from 'react-native';
 
 import { Navigator } from '@common/helpers/navigator';
 import { AppScreens } from '@common/constants';
+import { Images } from '@common/helpers/images';
 
 import { PushNotificationsService, StyleService } from '@services';
 
@@ -19,6 +20,7 @@ import { FinishSetupViewProps } from '@screens/Setup/Finish';
 
 import { AppStyles } from '@theme';
 import styles from './styles';
+import onboardingStyles from '../../Onboarding/styles';
 
 /* types ==================================================================== */
 export interface Props {}
@@ -34,17 +36,11 @@ class PushNotificationSetupView extends Component<Props, State> {
     constructor(props: Props) {
         super(props);
 
-        this.state = {
-            isLoading: false,
-        };
+        this.state = { isLoading: false };
     }
 
     static options() {
-        return {
-            topBar: {
-                visible: false,
-            },
-        };
+        return { topBar: { visible: false } };
     }
 
     requestPermission = () => {
@@ -88,38 +84,64 @@ class PushNotificationSetupView extends Component<Props, State> {
         const { isLoading } = this.state;
 
         return (
-            <SafeAreaView testID="permission-setup-view" style={AppStyles.container}>
-                <View style={[AppStyles.flex2, AppStyles.centerContent]}>
-                    <Image style={styles.logo} source={StyleService.getImage('XamanLogo')} />
-                </View>
-
-                <View style={[AppStyles.flex8, AppStyles.paddingSml]}>
-                    <View style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.centerContent]}>
-                        <Image style={[AppStyles.emptyIcon]} source={StyleService.getImage('ImageNotifications')} />
-                    </View>
-
-                    <View style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.flexEnd]}>
-                        <Text style={[AppStyles.h5, AppStyles.strong, AppStyles.textCenterAligned]}>
-                            {Localize.t('setupPermissions.enableNotifications')}
-                        </Text>
-                        <Spacer size={20} />
-                        <Text style={[AppStyles.p, AppStyles.textCenterAligned]}>
-                            {Localize.t('setupPermissions.permissionDescription')}
-                        </Text>
+            <ImageBackground
+                testID="permission-setup-view"
+                resizeMode="cover"
+                source={StyleService.getImageIfLightModeIfDarkMode('BackgroundPatternLight', 'BackgroundPattern')}
+                style={onboardingStyles.backgroundImageStyle}
+                imageStyle={onboardingStyles.backgroundImageStyle}
+            >
+                <SafeAreaView style={[AppStyles.flex1, AppStyles.centerAligned, AppStyles.padding]}>
+                    <Image
+                        style={onboardingStyles.logo}
+                        source={StyleService.getImageIfLightModeIfDarkMode('XamanLogo', 'XamanLogoLight')}
+                    />
+                </SafeAreaView>
+                <View style={[
+                    AppStyles.flex4,
+                ]}>
+                    <View style={[AppStyles.flex8, AppStyles.paddingSml]}>
+                        <View style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.flexEnd]}>
+                            <Text style={[AppStyles.h5, AppStyles.strong]}>
+                                {Localize.t('setupPermissions.enableNotifications')}
+                            </Text>
+                            <Spacer size={10} />
+                            <Text style={[AppStyles.p, AppStyles.textCenterAligned, AppStyles.colorSilver]}>
+                                {Localize.t('setupPermissions.permissionDescription')}
+                            </Text>
+                            <View style={[AppStyles.flex3, AppStyles.centerAligned, AppStyles.centerContent]}>
+                                <Image style={[styles.notificationImage]} source={Images.Notification} />
+                            </View>
+                        </View>
                     </View>
                 </View>
-
-                <Footer style={AppStyles.paddingBottom}>
-                    <Button numberOfLines={1} light label={Localize.t('global.maybeLater')} onPress={this.nextStep} />
-                    <Spacer />
-                    <Button
-                        isLoading={isLoading}
-                        numberOfLines={1}
-                        label={Localize.t('global.yes')}
-                        onPress={this.requestPermission}
-                    />
-                </Footer>
-            </SafeAreaView>
+                <SafeAreaView style={[
+                    AppStyles.flex2,
+                    AppStyles.marginTop,
+                ]}>
+                    <SafeAreaView style={[
+                        onboardingStyles.container,
+                    ]}>
+                        <Footer style={[
+                            AppStyles.paddingBottom,
+                            AppStyles.paddingTopNone,
+                        ]}>
+                            <Button numberOfLines={1}
+                                light
+                                label={Localize.t('global.maybeLater')}
+                                onPress={this.nextStep}
+                            />
+                            <Spacer />
+                            <Button
+                                isLoading={isLoading}
+                                numberOfLines={1}
+                                label={Localize.t('global.yes')}
+                                onPress={this.requestPermission}
+                            />
+                        </Footer>
+                    </SafeAreaView>
+                </SafeAreaView>
+            </ImageBackground>
         );
     }
 }
diff --git a/src/screens/Setup/PushNotification/styles.ts b/src/screens/Setup/PushNotification/styles.ts
index 791372631..8701936dc 100644
--- a/src/screens/Setup/PushNotification/styles.ts
+++ b/src/screens/Setup/PushNotification/styles.ts
@@ -3,10 +3,9 @@ import { StyleSheet } from 'react-native';
 import { AppSizes } from '@theme';
 
 const styles = StyleSheet.create({
-    container: { flex: 1, justifyContent: 'center', alignItems: 'center' },
-    logo: {
-        width: AppSizes.screen.width * 0.4,
-        height: AppSizes.screen.height * 0.1,
+    notificationImage: {
+        width: AppSizes.screen.width * 0.85,
+        height: AppSizes.screen.height * 0.25,
         resizeMode: 'contain',
     },
 });
diff --git a/src/screens/xApps/XAppsView.tsx b/src/screens/xApps/XAppsView.tsx
index e4001c4e4..1ed2197de 100644
--- a/src/screens/xApps/XAppsView.tsx
+++ b/src/screens/xApps/XAppsView.tsx
@@ -38,7 +38,9 @@ export type SectionData = {
     data: XamanBackend.AppCategory[];
 };
 
-export interface Props {}
+export interface Props {
+    timestamp?: number;
+}
 
 export interface State {
     message?: MessageType;
@@ -215,7 +217,9 @@ class XAppsView extends Component<Props, State> {
             },
             () => {
                 if (!searchEnabled) {
-                    this.searchBarRef?.current?.focus();
+                    requestAnimationFrame(() => {
+                        this.searchBarRef?.current?.focus();
+                    });
                 }
             },
         );
@@ -407,6 +411,8 @@ class XAppsView extends Component<Props, State> {
     };
 
     render() {
+        const { timestamp } = this.props;
+
         return (
             <View testID="xapp-store-tab-view" style={AppStyles.tabContainer}>
                 <Header
@@ -421,7 +427,7 @@ class XAppsView extends Component<Props, State> {
                     }}
                 />
 
-                <View style={styles.contentContainer}>{this.renderContent()}</View>
+                <View key={`xappsview-${timestamp}`} style={styles.contentContainer}>{this.renderContent()}</View>
             </View>
         );
     }
diff --git a/src/services/AccountService.ts b/src/services/AccountService.ts
index e7c7be4ee..572cda1b2 100644
--- a/src/services/AccountService.ts
+++ b/src/services/AccountService.ts
@@ -9,8 +9,8 @@ import BigNumber from 'bignumber.js';
 import EventEmitter from 'events';
 import { get, keys, map } from 'lodash';
 
-import { CurrencyModel, TrustLineModel, CoreModel } from '@store/models';
-import { AccountRepository, AmmPairRepository, CoreRepository, CurrencyRepository } from '@store/repositories';
+import { CurrencyModel, TrustLineModel } from '@store/models';
+import { AccountRepository, AmmPairRepository, CurrencyRepository } from '@store/repositories';
 
 import { RewardInformation } from '@store/models/objects/accountDetails';
 
@@ -28,6 +28,7 @@ import {
     UnsubscribeRequest,
     UnsubscribeResponse,
 } from '@common/libs/ledger/types/methods';
+import { AccountTypes } from '@store/types';
 
 /* Events  ==================================================================== */
 export type AccountServiceEvent = {
@@ -43,24 +44,25 @@ declare interface AccountService {
 class AccountService extends EventEmitter {
     private transactionListener: any;
 
-    private account?: string;
+    private accounts?: string[];
     private logger: LoggerInstance;
 
     constructor() {
         super();
 
-        this.account = undefined;
+        this.accounts = undefined;
         this.logger = LoggerService.createLogger('Account');
     }
 
-    initialize = (settings: CoreModel): Promise<void> => {
+    initialize = (): Promise<void> => {
         return new Promise<void>((resolve, reject) => {
             try {
                 // set current default account
-                this.account = settings.account?.address;
+                this.loadAccounts();
 
-                // list for any default account change
-                CoreRepository.on('updateSettings', this.onSettingsUpdate);
+                // add listeners for account changes
+                AccountRepository.on('accountCreate', this.onAccountsChange);
+                AccountRepository.on('accountRemove', this.onAccountsChange);
 
                 // on network service connect
                 NetworkService.on('connect', this.onNetworkConnect);
@@ -72,29 +74,48 @@ class AccountService extends EventEmitter {
         });
     };
 
-    onSettingsUpdate = (settings: CoreModel, changes: Partial<CoreModel>) => {
-        if ('account' in changes && this.account !== settings.account.address) {
-            this.onAccountChange(settings.account.address);
+    /**
+     * Load accounts from data store
+     */
+    loadAccounts = () => {
+        // fetch accounts from store
+        const accounts = AccountRepository.getAccounts();
+
+        // no account is present in the app
+        if (accounts.length === 0) {
+            this.accounts = [];
+            return;
         }
+
+        // log the existent accounts in the session log
+        this.logger.debug(
+            `Presented accounts: ${accounts.reduce(
+                (account, item) =>
+                    `${account}\n${item.address}-${item.accessLevel} ${
+                        item.flags?.disableMasterKey ? '[MasterDisabled]' : ''
+                    } ${item.type !== AccountTypes.Regular ? `[${item.type}]` : ''}`,
+                '',
+            )}`,
+        );
+
+        this.accounts = accounts.flatMap((account) => account.address);
     };
 
     /**
-     * When default account changed
+     * Watch for any account added or removed in store
      */
-    onAccountChange = (account: string) => {
-        if (this.account) {
-            // unsubscribe from old account
-            this.unsubscribe(this.account);
-        }
+    onAccountsChange = () => {
+        // unsubscribe from old list
+        this.unsubscribe();
 
-        // set the current account
-        this.account = account;
+        // reload accounts
+        this.loadAccounts();
 
-        // subscribe again on new account
-        this.subscribe(account);
+        // subscribe again on new account list
+        this.subscribe();
 
         // update accounts info
-        this.updateAccountsDetails(account);
+        this.updateAccountsDetails();
     };
 
     /**
@@ -102,15 +123,15 @@ class AccountService extends EventEmitter {
      */
     onNetworkConnect = () => {
         // no account
-        if (!this.account) {
+        if (!this.accounts?.length) {
             return;
         }
 
         // subscribe accounts for transactions stream
-        this.subscribe(this.account);
+        this.subscribe();
 
-        // update account details
-        this.updateAccountsDetails(this.account);
+        // update all account details
+        this.updateAccountsDetails();
 
         // register on transaction event handler
         this.setTransactionListener();
@@ -141,14 +162,17 @@ class AccountService extends EventEmitter {
             const balanceChangesAccounts = keys(new Meta(meta).parseBalanceChanges());
             const ownerCountChangesAccounts = map(new Meta(meta).parseOwnerCountChanges(), 'address');
 
-            const effectedAccounts = [...new Set([...balanceChangesAccounts, ...ownerCountChangesAccounts])];
+            const effectedAccounts = [
+                ...new Set([...balanceChangesAccounts, ...ownerCountChangesAccounts, transaction.Account]),
+            ];
+            const effectedOwnAccounts = this.accounts?.filter((acc) => effectedAccounts.includes(acc));
 
-            if (this.account && effectedAccounts.includes(this.account)) {
-                // update account details
-                this.updateAccountsDetails(this.account);
+            if (effectedOwnAccounts?.length) {
+                // update account details only for own effected accounts
+                this.updateAccountsDetails(effectedOwnAccounts);
 
                 // emit onTransaction event
-                this.emit('transaction', transaction, effectedAccounts);
+                this.emit('transaction', transaction, effectedOwnAccounts);
             }
         }
     };
@@ -323,25 +347,40 @@ class AccountService extends EventEmitter {
      * Update accounts details through socket request
      * this will contain account trustLines etc ...
      */
-    updateAccountsDetails = async (account: string) => {
-        await this.updateAccountInfo(account).catch((error) => {
-            this.logger.error(`updateAccountInfo [${account}] `, error);
-        });
+    updateAccountsDetails = async (include?: string[]) => {
+        if (!this.accounts?.length) {
+            return;
+        }
 
-        await this.updateAMMPairs(account).catch((error) => {
-            this.logger.error(`updateAMMPairs [${account}] `, error);
-        });
+        for (const account of this.accounts) {
+            // check if include present
+            if (Array.isArray(include) && include.length > 0) {
+                if (!include.includes(account)) continue;
+            }
+
+            await this.updateAccountInfo(account).catch((error: Error) => {
+                this.logger.error(`Update account info [${account}] `, error);
+            });
+
+            await this.updateAMMPairs(account).catch((error: Error) => {
+                this.logger.error(`Update amm pairs [${account}] `, error);
+            });
+        }
     };
 
     /**
      * Unsubscribe for streaming
      */
-    unsubscribe(account: string) {
-        this.logger.debug(`Unsubscribe account ${account} from network`);
+    unsubscribe() {
+        if (!this.accounts?.length) {
+            return;
+        }
+
+        this.logger.debug(`Unsubscribe from ${this.accounts.length} accounts`, this.accounts);
 
         NetworkService.send<UnsubscribeRequest, UnsubscribeResponse>({
             command: 'unsubscribe',
-            accounts: [account],
+            accounts: this.accounts,
         }).catch((error) => {
             this.logger.warn('unsubscribe', error);
         });
@@ -350,12 +389,16 @@ class AccountService extends EventEmitter {
     /**
      * Subscribe for streaming
      */
-    subscribe(account: string) {
-        this.logger.debug(`Subscribed account ${account} to network`);
+    subscribe() {
+        if (!this.accounts?.length) {
+            return;
+        }
+
+        this.logger.debug(`Subscribe to ${this.accounts.length} accounts`, this.accounts);
 
         NetworkService.send<SubscribeRequest, SubscribeResponse>({
             command: 'subscribe',
-            accounts: [account],
+            accounts: this.accounts,
         }).catch((error: Error) => {
             this.logger.warn('subscribe', error);
         });
diff --git a/src/services/AppService.ts b/src/services/AppService.ts
index 8b89217b7..2abb32ab5 100644
--- a/src/services/AppService.ts
+++ b/src/services/AppService.ts
@@ -9,20 +9,25 @@ import NetInfo from '@react-native-community/netinfo';
 
 import Localize from '@locale';
 
+import { AppScreens } from '@common/constants';
 import { WebLinks } from '@common/constants/endpoints';
 
 import { InAppPurchase } from '@common/libs/iap';
 import Preferences from '@common/libs/preferences';
 
 import { GetAppVersionCode } from '@common/helpers/app';
+import { Navigator } from '@common/helpers/navigator';
 import { VersionDiff } from '@common/utils/version';
 
 import LoggerService, { LoggerInstance } from '@services/LoggerService';
 
+import { Props as ChangeLogOverlayProps } from '@screens/Overlay/ChangeLog/types';
+
 /* Constants  ==================================================================== */
 const { AppUtilsModule, AppUpdateModule } = NativeModules;
 
 const Emitter = new NativeEventEmitter(AppUtilsModule);
+
 /* Types  ==================================================================== */
 export enum NetStateStatus {
     Connected = 'Connected',
@@ -85,11 +90,18 @@ class AppService extends EventEmitter {
         const currentVersionCode = GetAppVersionCode();
         const savedVersionCode = await Preferences.get(Preferences.keys.LATEST_VERSION_CODE);
 
-        if (!savedVersionCode || VersionDiff(currentVersionCode, savedVersionCode) > 0) {
+        // just installed the app
+        if (!savedVersionCode) {
+            await Preferences.set(Preferences.keys.LATEST_VERSION_CODE, currentVersionCode);
+            return;
+        }
+
+        // we have prev saved version, let's check if we need to show the change logs overlay
+        if (VersionDiff(currentVersionCode, savedVersionCode) > 0) {
             // showChangeLogModal
-            // Navigator.showOverlay<ChangeLogOverlayProps>(AppScreens.Overlay.ChangeLog, {
-            //     version: currentVersionCode,
-            // });
+            await Navigator.showOverlay<ChangeLogOverlayProps>(AppScreens.Overlay.ChangeLog, {
+                version: currentVersionCode,
+            });
 
             // update the latest version code
             await Preferences.set(Preferences.keys.LATEST_VERSION_CODE, currentVersionCode);
diff --git a/src/services/BackendService.ts b/src/services/BackendService.ts
index 3682e9e21..316a59d0b 100644
--- a/src/services/BackendService.ts
+++ b/src/services/BackendService.ts
@@ -68,6 +68,7 @@ class BackendService {
             try {
                 // listen for ledger transaction submit
                 LedgerService.on('submitTransaction', this.onLedgerTransactionSubmit);
+                NetworkService.on('preSubmitTxEvent', this.addSignedTxBlob);
 
                 // resolve
                 resolve();
@@ -267,6 +268,7 @@ class BackendService {
                         username: user.name,
                         slug: user.slug,
                         uuid: user.uuidv4,
+                        swapNetworks: env.swapNetworks,
                         deviceUUID: device.uuidv4,
                         lastSync: new Date(),
                         hasPro,
@@ -346,6 +348,29 @@ class BackendService {
         });
     };
 
+    /**
+     * Reports a signed transaction.
+     * @param {string} hash - The hash of the transaction.
+     * @param {string} blob - The signed tx blob.
+     * @param {string} network - The network key.
+     * @returns {Promise} A promise that resolves when the transaction is reported.
+     */
+    addSignedTxBlob = (
+        txhash: string,
+        txblob: string,
+        feehash: string,
+        feeblob: string,
+        network: string,
+    ): Promise<XamanBackend.AddTransactionResponse> => {
+        return ApiService.fetch(Endpoints.AddSignedTxBlob, 'POST', null, {
+            txhash,
+            txblob,
+            feehash,
+            feeblob,
+            network,
+        });
+    };
+
     /**
      * Reports an added account for security checks.
      * @param {string} account - The account to report.
@@ -361,6 +386,34 @@ class BackendService {
         });
     };
 
+    /**
+     * Retrieve/Persist account information
+     * @param {string} account - The account to report.
+     * @param {string} name - The name of the account as present in Xaman
+     * @param {boolean} push - Enable or disable push notifications
+     * @returns {Promise} A promise that resolves when the account information persisted.
+     */
+    privateAccountInfo = (
+        account?: string,
+        name?: string,
+        push?: boolean,
+    ): Promise<XamanBackend.PrivateAccountInfoResponse> => {
+        return ApiService.fetch(Endpoints.PrivateAccountInfo, 'POST', null, {
+            account,
+            name,
+            push,
+        });
+    };
+
+    /**
+     * Get native account specific info for multiple addresses
+     * @param {string[]} address - The account address.
+     * @returns {Promise} A promise that resolves with an object with account as key, and native account information.
+     */
+    getMultiAddressNativeInfo = (addresses: string[]): Promise<XamanBackend.MultiAddressNativeInfoResponse> => {
+        return ApiService.fetch(Endpoints.MultiAccountNativeInfo, 'POST', {}, addresses);
+    };
+
     /**
      * Gets details for an account address.
      * @param {string} address - The account address.
@@ -454,6 +507,28 @@ class BackendService {
         );
     };
 
+    /**
+     * Get service fee
+     * NOTE: values are in drops
+     */
+    getServiceFee = async (
+        txJson?: any | undefined,
+        payloadUuid?: string,
+    ): Promise<{
+        availableFees: { type: string; value: string }[];
+        feeHooks: number;
+        feePercentage: number;
+        suggested: string;
+    }> => {
+        const body = {
+            txJson,
+            network: NetworkService.network?.key,
+            payload: payloadUuid,
+        };
+        const networkFees = await ApiService.fetch(Endpoints.ServiceFee, 'POST', null, body);
+        return networkFees;
+    };
+
     /**
      * Gets translation data based on a UUID.
      * @param {string} uuid - The UUID for translation data.
@@ -595,6 +670,33 @@ class BackendService {
         });
     };
 
+    /**
+     * Checks whether a specific currency issued by a given issuer is vetted.
+     *
+     * This function retrieves a list of curated IOUs associated with the issuer
+     * and determines if the specified currency is vetted based on the presence of its name
+     *
+     * @param {string} issuer - The unique identifier of the issuer.
+     * @param {string} currency - The currency to check for vetting.
+     * @returns {Promise<boolean>} A promise that resolves to a boolean indicating whether the currency is vetted.
+     */
+    isVettedCurrency = (issuer: string, currency: string): Promise<boolean> => {
+        return new Promise((resolve, reject) => {
+            this.getCuratedIOUs({
+                issuer,
+            })
+                .then(({ details }) => {
+                    const vettedCurrency =
+                        typeof details === 'object' &&
+                        Object.values(details).find((detail) => {
+                            return detail?.currencies?.[currency]?.name;
+                        });
+                    resolve(!!vettedCurrency);
+                })
+                .catch(reject);
+        });
+    };
+
     verifyPurchase = (purchases: InAppPurchaseReceipt) => {
         return ApiService.fetch(Endpoints.VerifyPurchase, 'POST', null, purchases);
     };
diff --git a/src/services/LedgerService.ts b/src/services/LedgerService.ts
index 2a8ead3bb..a1621e8ce 100644
--- a/src/services/LedgerService.ts
+++ b/src/services/LedgerService.ts
@@ -146,6 +146,7 @@ class LedgerService extends EventEmitter {
             command: 'account_objects',
             account,
             ledger_index: 'validated',
+            limit: 200,
         };
         if (typeof options === 'object') {
             Object.assign(request, options);
@@ -171,7 +172,7 @@ class LedgerService extends EventEmitter {
         const request: AccountTxRequest = {
             command: 'account_tx',
             account,
-            limit: limit || 50,
+            limit: limit || 200,
             binary: false,
         };
         if (marker) {
@@ -204,6 +205,7 @@ class LedgerService extends EventEmitter {
         const request: AccountNFTsRequest = {
             command: 'account_nfts',
             account,
+            limit: 200,
         };
         if (marker) {
             Object.assign(request, { marker });
@@ -550,7 +552,7 @@ class LedgerService extends EventEmitter {
                 fail_hard: failHard,
             });
 
-            this.logger.debug('submitTransaction', submitResponse);
+            // this.logger.debug('--- submitTransaction ---', submitResponse);
 
             // assign hash we received from submitting the transaction
             // this is necessary for verifying the transaction in case of only tx_blob is available
diff --git a/src/services/NavigationService.ts b/src/services/NavigationService.ts
index 7ae88ed68..ca85e4420 100644
--- a/src/services/NavigationService.ts
+++ b/src/services/NavigationService.ts
@@ -13,6 +13,7 @@ import analytics from '@react-native-firebase/analytics';
 import {
     Navigation,
     ComponentDidAppearEvent,
+    ComponentWillAppearEvent,
     BottomTabLongPressedEvent,
     BottomTabPressedEvent,
     ModalDismissedEvent,
@@ -78,6 +79,7 @@ class NavigationService extends EventEmitter {
                 analytics().setAnalyticsCollectionEnabled(true);
                 // navigation event listeners
                 Navigation.events().registerComponentDidAppearListener(this.componentDidAppear);
+                Navigation.events().registerComponentWillAppearListener(this.componentWillAppear);
                 Navigation.events().registerCommandListener(this.navigatorCommandListener);
                 Navigation.events().registerModalDismissedListener(this.modalDismissedListener);
                 Navigation.events().registerBottomTabLongPressedListener(this.bottomTabLongPressedListener);
@@ -220,6 +222,7 @@ class NavigationService extends EventEmitter {
                 if (get(passProps, 'componentType') === ComponentTypes.Modal) {
                     this.setCurrentModal(componentName as AppScreenKeys);
                 } else {
+                    // Also set beforehand by componentWillAppear
                     this.setCurrentScreen(componentName as AppScreenKeys);
                 }
                 break;
@@ -231,6 +234,25 @@ class NavigationService extends EventEmitter {
         }
     };
 
+    componentWillAppear = ({ componentName, passProps }: ComponentWillAppearEvent) => {
+        // Register a full page nav immediately (not Did appear, after animation slide)
+        // so the next navigation is immediately aware of the current screen for follow up navigation
+        // which prevents navigation breaking if one presses a button in the next screen faster than
+        // the animation of the screen is complete.
+        switch (this.getComponentType(componentName)) {
+            case ComponentTypes.Screen:
+                if (get(passProps, 'componentType') !== ComponentTypes.Modal) {
+                    this.setCurrentScreen(componentName as AppScreenKeys);
+                }
+                break;
+            case ComponentTypes.TabBar:
+                this.setCurrentScreen(componentName as AppScreenKeys);
+                    break;    
+            default:
+                break;
+        }
+    };
+
     navigatorCommandListener = (name: string, params: any) => {
         switch (name) {
             case 'dismissOverlay':
diff --git a/src/services/NetworkService.ts b/src/services/NetworkService.ts
index 6ba42eb98..f1169ad02 100644
--- a/src/services/NetworkService.ts
+++ b/src/services/NetworkService.ts
@@ -2,14 +2,14 @@
  * Network service
  */
 
-import { isPlainObject, isArray, isString, find } from 'lodash';
+import { find, isArray, isPlainObject, isString } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import EventEmitter from 'events';
 import Realm from 'realm';
 
 import { Platform } from 'react-native';
 
-import { XrplDefinitions, DefinitionsData, binary } from 'xrpl-accountlib';
+import { binary, DefinitionsData, XrplDefinitions } from 'xrpl-accountlib';
 
 import { XrplClient } from 'xrpl-client';
 
@@ -60,6 +60,7 @@ export type NetworkServiceEvent = {
     connect: (network: NetworkModel) => void;
     stateChange: (networkStatus: NetworkStateStatus) => void;
     networkChange: (network: NetworkModel) => void;
+    preSubmitTxEvent: (txhash: string, txblob: string, feehash: string, feeblob: string, network: string) => void;
 };
 
 declare interface NetworkService {
@@ -213,6 +214,11 @@ class NetworkService extends EventEmitter {
         }
     };
 
+    hasSwap = () => {
+        return (ProfileRepository.getProfile()?.swapNetworks.split(',') || [])
+            .indexOf(this.network?.key || '') > -1;
+    };
+
     /**
      * on AppState change
      */
@@ -273,6 +279,10 @@ class NetworkService extends EventEmitter {
         };
     };
 
+    preSubmitTx = (txhash: string, txblob: string, feehash: string, feeblob: string, network: string) => {
+        this.emit('preSubmitTxEvent', txhash, txblob, feehash, feeblob, network);
+    };
+
     /**
      * Get connected network id
      * @returns {number}
@@ -316,11 +326,11 @@ class NetworkService extends EventEmitter {
     };
 
     /**
-     * Get available fees on network base on the load
+     * Get available fees on network
      * NOTE: values are in drop
      */
     getAvailableNetworkFee = (
-        txJson: any,
+        txJson?: any | undefined,
     ): Promise<{
         availableFees: { type: string; value: string }[];
         feeHooks: number;
@@ -329,19 +339,27 @@ class NetworkService extends EventEmitter {
         // eslint-disable-next-line no-async-promise-executor
         return new Promise(async (resolve, reject) => {
             try {
-                const resp = await this.send<FeeRequest, FeeResponse>({
+                const request = {
                     command: 'fee',
-                    tx_blob: PrepareTxForHookFee(txJson, this.getNetwork().definitions, this.getNetworkId()),
-                });
+                } as FeeRequest;
+
+                if (typeof txJson === 'object') {
+                    Object.assign(request, {
+                        tx_blob: PrepareTxForHookFee(txJson, this.getNetworkDefinitions(), this.getNetworkId()),
+                    });
+                }
+                const resp = await this.send<FeeRequest, FeeResponse>(request);
 
                 if ('error' in resp) {
-                    throw new Error(`got error from network ${resp.error}`);
+                    throw new Error(
+                        `Could not reliably detect fees (${resp.error || 'unknown error type'}), message: ${resp.error_exception || 'unknown error message'}`,
+                    );
                 }
 
                 resolve(NormalizeFeeDataSet(resp));
             } catch (error) {
-                this.logger.warn('Unable to calculate available network fees:', error);
-                reject(new Error('Unable to calculate available network fees!'));
+                this.logger.error('getAvailableNetworkFee', error);
+                reject(error);
             }
         });
     };
@@ -510,13 +528,13 @@ class NetworkService extends EventEmitter {
      */
     updateNetworkDefinitions = async () => {
         try {
-            // include definitions hash if exist in the request
             const request: ServerDefinitionsRequest = {
                 command: 'server_definitions',
             };
 
             let definitionsHash = '';
 
+            // include definitions hash if exist in the request
             if (this.getNetwork().definitions) {
                 definitionsHash = this.getNetwork().definitions?.hash as string;
                 Object.assign(request, { hash: definitionsHash });
@@ -541,26 +559,30 @@ class NetworkService extends EventEmitter {
             }
 
             // validate the response
-            const respValidation = {
+            const requiredValidation = {
                 TYPES: isPlainObject,
                 TRANSACTION_RESULTS: isPlainObject,
                 TRANSACTION_TYPES: isPlainObject,
                 LEDGER_ENTRY_TYPES: isPlainObject,
-                TRANSACTION_FLAGS: isPlainObject,
-                TRANSACTION_FLAGS_INDICES: isPlainObject,
                 FIELDS: isArray,
                 hash: isString,
             } as { [key: string]: (value?: any) => boolean };
 
+            const optionalValidation = {
+                TRANSACTION_FLAGS: isPlainObject,
+                TRANSACTION_FLAGS_INDICES: isPlainObject,
+            } as { [key: string]: (value?: any) => boolean };
+
             const definitions = {};
 
-            for (const key in respValidation) {
-                if (Object.prototype.hasOwnProperty.call(respValidation, key)) {
+            for (const key in requiredValidation) {
+                if (Object.prototype.hasOwnProperty.call(requiredValidation, key)) {
                     // validate
-                    if (respValidation[key](definitionsResp[key]) === false) {
-                        this.logger.warn(
+                    if (!requiredValidation[key](definitionsResp[key])) {
+                        this.logger.error(
                             `server_definitions invalid format for key ${key}, got ${typeof definitionsResp[key]}`,
                         );
+                        // do not continue and return
                         return;
                     }
                     // set the key
@@ -568,6 +590,20 @@ class NetworkService extends EventEmitter {
                 }
             }
 
+            for (const key in optionalValidation) {
+                if (Object.prototype.hasOwnProperty.call(optionalValidation, key)) {
+                    // validate optional
+                    if (!optionalValidation[key](definitionsResp[key])) {
+                        this.logger.warn(
+                            `server_definitions invalid format for optional key ${key}, got ${typeof definitionsResp[key]}`,
+                        );
+                        continue;
+                    }
+
+                    Object.assign(definitions, { [key]: definitionsResp[key] });
+                }
+            }
+
             this.logger.debug(`Updating network [${this.getNetwork().networkId}] definitions ${definitionsResp.hash} `);
 
             NetworkRepository.update({
diff --git a/src/services/ResolverService.ts b/src/services/ResolverService.ts
index 8a6e924ac..8dc91c126 100644
--- a/src/services/ResolverService.ts
+++ b/src/services/ResolverService.ts
@@ -13,12 +13,12 @@ import ContactRepository, { ContactRepositoryEvent } from '@store/repositories/c
 import AccountRepository, { AccountRepositoryEvent } from '@store/repositories/account';
 
 import { AccountDetailsModel, AccountModel, ContactModel, CurrencyModel } from '@store/models';
+import { CurrencyRepository } from '@store/repositories';
+import { CurrencyRepositoryEvent } from '@store/repositories/currency';
 
 import Advisory from '@common/helpers/advisory';
 
 import LRUCache from '@common/utils/cache';
-import { CurrencyRepository } from '@store/repositories';
-import { CurrencyRepositoryEvent } from '@store/repositories/currency';
 import { PromiseQueue } from '@common/utils/queue';
 
 /* Types  ==================================================================== */
diff --git a/src/services/StyleService.ts b/src/services/StyleService.ts
index 3b4c32afa..b3ce40997 100644
--- a/src/services/StyleService.ts
+++ b/src/services/StyleService.ts
@@ -14,23 +14,51 @@ import { Themes } from '@store/types';
 import { ColorsGeneral, ColorsTheme } from '@theme/colors';
 
 import { ImageStyle, TextStyle, ViewStyle } from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
+
 /* Types  ==================================================================== */
 type NamedStyles<T> = { [P in keyof T]: ViewStyle | TextStyle | ImageStyle };
 export type StyleType = Record<string, any>;
+type ImageType = { uri: string };
+
+let __id = 0;
 
 /* Service  ==================================================================== */
-class StyleService {
-    private themeName: Themes;
-    private currentStyle: any;
+class StyleService {    
+    private styleDefinitions: Map<string, any> = new Map();
+    private styleReferences: Map<string, any> = new Map();
+    
+    private regularValues: Map<string, any> = new Map();
 
     public hairlineWidth = StyleSheet.hairlineWidth;
 
     constructor() {
-        this.themeName = 'light';
-        this.currentStyle = { ...ColorsTheme.light, ...ColorsGeneral };
+        this.regularValues.set('themeName', 'light');
+        this.regularValues.set('currentStyle', { ...ColorsTheme.light, ...ColorsGeneral });
+    }
+
+    // Update all living references with fresh values
+    private updateAllReferences() {
+        // console.log('Updating all style references to', this.regularValues.get('themeName'));
+        // Update style references
+        this.styleDefinitions.forEach((styleDefinition, id) => {
+            // Generate fresh styles
+            const freshStyles = this.createFr(styleDefinition);
+            const livingReference = this.styleReferences.get(id);
+            
+            if (livingReference) {
+                // Update all properties, keeping the same reference
+                Object.keys(livingReference).forEach(key => {
+                    delete livingReference[key];
+                });
+                
+                Object.keys(freshStyles).forEach(key => {
+                    livingReference[key] = freshStyles[key];
+                });
+            }
+        });
     }
 
-    initialize = (coreSettings: CoreModel) => {
+    initialize = (coreSettings: CoreModel) => {       
         return new Promise<void>((resolve, reject) => {
             try {
                 // default theme
@@ -40,6 +68,7 @@ class StyleService {
                 if (!coreSettings?.initialized) {
                     // try to get user's appearance preferences from OS
                     const colorScheme = Appearance.getColorScheme();
+                    
                     if (colorScheme) {
                         theme = colorScheme;
 
@@ -52,6 +81,18 @@ class StyleService {
                     // lowerCase the theme name is required as we stored
                     // theme name in title mode in version before v1.0.1
                     theme = (coreSettings.theme?.toLowerCase() || 'light') as Themes;
+
+                    if (coreSettings.themeAutoSwitch) {
+                        const colorScheme = Appearance.getColorScheme();
+                        if (colorScheme) {
+                            // For this session only
+                            theme = colorScheme === 'light'
+                                ? 'light'
+                                : theme === 'light' // If configured in light mode but dark requested, use default dark
+                                ? 'dark'
+                                : theme;
+                        }
+                    }
                 }
 
                 this.setTheme(theme);
@@ -64,13 +105,18 @@ class StyleService {
     };
 
     setTheme = (theme: Themes) => {
-        if (this.themeName !== theme && has(ColorsTheme, theme)) {
-            this.themeName = theme;
-            this.currentStyle = { ...ColorsTheme[theme], ...ColorsGeneral };
+        if (this.regularValues.get('themeName') !== theme && has(ColorsTheme, theme)) {
+            this.regularValues.set('themeName', theme);
+            this.regularValues.set('isDarkMode', theme !== 'light');
+            this.regularValues.set('currentStyle', { ...ColorsTheme[theme], ...ColorsGeneral });
+            
+            // Immediately update all references when theme changes
+            this.updateAllReferences();
         }
     };
 
-    create = <T extends NamedStyles<T> | NamedStyles<any>>(styles: T | NamedStyles<T>): T => {
+    // "For real" versions that compute the actual values
+    createFr = <T extends NamedStyles<T> | NamedStyles<any>>(styles: T | NamedStyles<T>): T => {
         return Object.entries(styles).reduce((themed: any, style: any) => {
             const [key, value] = style;
 
@@ -78,6 +124,71 @@ class StyleService {
         }, {});
     };
 
+    // select<T extends string | number>(spec: { light?: T; dark?: T; default?: T }): T | undefined {
+    // Wrapped, but will be parsed by the outter render
+    // @ts-ignore
+    select<T extends string | number>(spec: { light?: T; dark?: T; default?: T }): T | undefined {
+        // Wrapped, but will be parsed by the outter render
+        // @ts-ignore
+        return `$(${JSON.stringify(spec)})`;
+        // return 'light' in spec && !this.isDarkMode()
+        //     ? spec.light
+        //     : 'dark' in spec && this.isDarkMode()
+        //       ? spec.dark
+        //       : spec.default;
+    }
+
+    // Public methods that create and return living references
+    create = <T extends NamedStyles<T> | NamedStyles<any>>(styles: T | NamedStyles<T>): T => {
+        // Generate a unique ID for this style definition
+        __id++;
+        const id = String(__id);
+
+        // console.log('create', id)
+        
+        // Store the style definition
+        this.styleDefinitions.set(id, styles);
+        
+        // Create the initial styles
+        const initialStyles: { [key: string]: any } = this.createFr(styles);
+        
+        // Create a living reference object (empty object to start)
+        const livingReference: { [key: string]: any } = {};
+        
+        // Copy all properties from initial styles
+        Object.keys(initialStyles).forEach(key => {
+            livingReference[key] = initialStyles[key];
+        });
+        
+        // Store the living reference
+        this.styleReferences.set(id, livingReference);
+        
+        // Return the living reference
+        return livingReference as T;
+    };
+
+    // No living references for images - they will be calculated on each call
+    getImage = (image: Extract<keyof typeof Images, string>): ImageType => {
+        // if dark mode and there is a light mode for image return light
+        if (this.isDarkMode() && `${image}Light` in Images) {
+            return get(Images, `${image}Light`)!;
+        }
+
+        return get(Images, image);
+    };
+
+    getImageIfLightModeIfDarkMode = (
+        imageIfLightMode: Extract<keyof typeof Images, string>,
+        imageIfDarkMode: Extract<keyof typeof Images, string>,
+    ): ImageType => {
+        // if dark mode and there is a light mode for image return light
+        if (this.isDarkMode() && `${imageIfDarkMode}` in Images) {
+            return get(Images, `${imageIfDarkMode}`)!;
+        }
+
+        return get(Images, imageIfLightMode);
+    };
+
     applyTheme = (style: StyleType) => {
         if (typeof style === 'object') {
             return Object.entries(style).reduce((themed: any, item: any) => {
@@ -91,14 +202,24 @@ class StyleService {
 
     value = (value: string): string => {
         if (this.isReference(value)) {
-            const referenceKey: string = this.createKeyFromReference(value);
-            return this.findValue(referenceKey);
+            if (value.startsWith('$({')) {
+                const explodedValue = JSON.parse(value.slice(2, -1))?.[this.isDarkMode() ? 'dark' : 'light'];
+                value = explodedValue;
+            }
+
+            if (typeof value === 'string' && value.startsWith('$')) {
+                const referenceKey: string = this.createKeyFromReference(value);
+                return this.findValue(referenceKey);    
+            }
+            
+            return value;
         }
+
         return value;
     };
 
     private findValue = (name: string): any => {
-        return this.currentStyle[name];
+        return this.regularValues.get('currentStyle')[name];
     };
 
     private isReference = (value: string): boolean => {
@@ -110,28 +231,19 @@ class StyleService {
     };
 
     isDarkMode = (): boolean => {
-        return this.themeName !== 'light';
+        return this.regularValues.get('isDarkMode');
     };
 
-    select<T extends string | number>(spec: { light?: T; dark?: T; default?: T }): T | undefined {
-        return 'light' in spec && !this.isDarkMode()
-            ? spec.light
-            : 'dark' in spec && this.isDarkMode()
-              ? spec.dark
-              : spec.default;
-    }
-
-    getImage = (image: Extract<keyof typeof Images, string>): { uri: string } => {
-        // if dark mode and there is a light mode for image return light
-        if (this.isDarkMode() && `${image}Light` in Images) {
-            return get(Images, `${image}Light`)!;
+    getBackdropInterpolateColor = () => {
+        if (this.regularValues.get('themeName') === 'dark' || this.regularValues.get('themeName') === 'moonlight') {
+            return ['rgba(50,50,50,0)', 'rgba(50,50,50,0.7)'];
         }
 
-        return get(Images, image);
+        return ['rgba(0,0,0,0)', 'rgba(0,0,0,0.8)'];
     };
 
     getCurrentTheme = (): string => {
-        return this.themeName;
+        return this.regularValues.get('themeName');
     };
 }
 
diff --git a/src/services/__mocks__/LedgerService.ts b/src/services/__mocks__/LedgerService.ts
index 376b28cd0..9d005f9fe 100644
--- a/src/services/__mocks__/LedgerService.ts
+++ b/src/services/__mocks__/LedgerService.ts
@@ -4,6 +4,7 @@ class LedgerService {
     getAccountInfo = jest.fn();
     getAccountAvailableBalance = jest.fn();
     getFilteredAccountLine = jest.fn();
+    getTransactions = jest.fn();
 
     getLedgerStatus = () => {
         return {
diff --git a/src/services/__tests__/ApiService.test.ts b/src/services/__tests__/ApiService.test.ts
index d3bbe77f0..1b1de798b 100644
--- a/src/services/__tests__/ApiService.test.ts
+++ b/src/services/__tests__/ApiService.test.ts
@@ -70,9 +70,11 @@ describe('API', () => {
         });
 
         it(`call with invalid json response`, async () => {
-            await expect(ApiService.fetch(Endpoints.Ping, 'GET', { action: 'invalid_json' })).rejects.toMatchObject(
-                new ApiError('Response returned is not valid JSON Unexpected token i in JSON at position 0'),
-            );
+            const msg = 'Response returned is not valid JSON .*Unexpected token.*';
+            await expect(ApiService.fetch(Endpoints.Ping, 'GET', { action: 'invalid_json' })).rejects.toMatchObject({
+                ...new ApiError(msg),
+                originalMessage: expect.stringMatching(msg),
+            });
         });
 
         it(`call with id`, async () => {
diff --git a/src/services/__tests__/AppService.test.ts b/src/services/__tests__/AppService.test.ts
index 2106b520d..e16fc8906 100644
--- a/src/services/__tests__/AppService.test.ts
+++ b/src/services/__tests__/AppService.test.ts
@@ -1,6 +1,8 @@
 import Preferences from '@common/libs/preferences';
 import * as AppHelpers from '@common/helpers/app';
 
+import { Navigator } from '@common/helpers/navigator';
+
 import AppService, { NetStateStatus, AppStateStatus } from '../AppService';
 
 describe('AppService', () => {
@@ -55,18 +57,34 @@ describe('AppService', () => {
         spy2.mockRestore();
     });
 
-    it('should record the latest update version to the store', async () => {
+    it('should show the changelogs if latest update version ', async () => {
+        const LATEST_VERSION_CODE = '3.5.1';
+        const OLD_VERSION_CODE = '3.5.0';
+
+        const spyShowChangeLog = jest.spyOn(Navigator, 'showOverlay');
         const spyUpdateVersionCode = jest.spyOn(Preferences, 'set');
 
         // mock current app version
-        const spy1 = jest.spyOn(AppHelpers, 'GetAppVersionCode').mockImplementation(() => '0.5.1');
-        const spy2 = jest.spyOn(Preferences, 'get').mockImplementation(async () => '0.4.9');
+        const spy1 = jest.spyOn(AppHelpers, 'GetAppVersionCode').mockImplementation(() => LATEST_VERSION_CODE);
+        const spy2 = jest.spyOn(Preferences, 'get').mockImplementation(async () => null);
 
+        // let's first check for first installations
         await appService.checkVersionChange();
 
-        expect(spyUpdateVersionCode).toBeCalledWith(Preferences.keys.LATEST_VERSION_CODE, '0.5.1');
+        expect(spyShowChangeLog).toBeCalledTimes(0);
+        expect(spyUpdateVersionCode).toBeCalledWith(Preferences.keys.LATEST_VERSION_CODE, LATEST_VERSION_CODE);
 
-        spy1.mockRestore();
         spy2.mockRestore();
+
+        const spy3 = jest.spyOn(Preferences, 'get').mockImplementation(async () => OLD_VERSION_CODE);
+        // let's  check again
+        await appService.checkVersionChange();
+
+        // it should show the change logs
+        expect(spyShowChangeLog).toBeCalled();
+        expect(spyUpdateVersionCode).toBeCalledWith(Preferences.keys.LATEST_VERSION_CODE, LATEST_VERSION_CODE);
+
+        spy1.mockRestore();
+        spy3.mockRestore();
     });
 });
diff --git a/src/services/__tests__/NetworkService.test.ts b/src/services/__tests__/NetworkService.test.ts
index 70596cb55..21e6cbdb4 100644
--- a/src/services/__tests__/NetworkService.test.ts
+++ b/src/services/__tests__/NetworkService.test.ts
@@ -81,10 +81,10 @@ describe('NetworkService', () => {
                     TRANSACTION_RESULTS: returnedResponse.TRANSACTION_RESULTS,
                     TRANSACTION_TYPES: returnedResponse.TRANSACTION_TYPES,
                     LEDGER_ENTRY_TYPES: returnedResponse.LEDGER_ENTRY_TYPES,
-                    TRANSACTION_FLAGS: returnedResponse.TRANSACTION_FLAGS,
-                    TRANSACTION_FLAGS_INDICES: returnedResponse.TRANSACTION_FLAGS_INDICES,
                     FIELDS: returnedResponse.FIELDS,
                     hash: returnedResponse.hash,
+                    TRANSACTION_FLAGS: returnedResponse.TRANSACTION_FLAGS,
+                    TRANSACTION_FLAGS_INDICES: returnedResponse.TRANSACTION_FLAGS_INDICES,
                 }),
             });
 
@@ -176,7 +176,7 @@ describe('NetworkService', () => {
             const spy0 = jest.spyOn(networkService, 'send').mockImplementation(() => Promise.resolve(returnedResponse));
             const spy1 = jest.spyOn(NetworkRepository, 'update');
             // @ts-ignore
-            const spy2 = jest.spyOn(NetworkService.logger, 'warn');
+            const spy2 = jest.spyOn(NetworkService.logger, 'error');
 
             await networkService.updateNetworkDefinitions();
 
diff --git a/src/store/models/objects/core.ts b/src/store/models/objects/core.ts
index 51013c480..0a09dc30f 100644
--- a/src/store/models/objects/core.ts
+++ b/src/store/models/objects/core.ts
@@ -43,6 +43,10 @@ class Core extends Realm.Object<Core> {
     public declare account: any;
     /** Indicates whether haptic feedback is enabled. */
     public declare hapticFeedback: boolean;
+    /** Indicates whether advisoryTransasctions are to be hidden. */
+    public declare hideAdvisoryTransactions: boolean;
+    /** Indicates whether serviceFees are to be hidden. */
+    public declare hideServiceFeeTransactions: boolean;
     /** Indicates whether discreet mode is enabled. */
     public declare discreetMode: boolean;
     /** Indicates whether the reserve panel should be displayed in home screen. */
@@ -53,6 +57,8 @@ class Core extends Realm.Object<Core> {
     public declare developerMode: boolean;
     /** Selected theme for the application. */
     public declare theme: Themes;
+    /** Auto switching. */
+    public declare themeAutoSwitch: boolean;
 }
 
 export default Core;
diff --git a/src/store/models/objects/profile.ts b/src/store/models/objects/profile.ts
index c6a246c51..d1e56af10 100644
--- a/src/store/models/objects/profile.ts
+++ b/src/store/models/objects/profile.ts
@@ -28,6 +28,8 @@ class Profile extends Realm.Object<Profile> {
     /** Unique identifier representing this specific user profile. */
     public declare uuid: string;
     /** Unique identifier for the user's device. */
+    public declare swapNetworks: string;
+    /** Unique identifier for the user's device. */
     public declare deviceUUID: string;
     /** Version number of the Terms of Service the user agreed to. */
     public declare signedTOSVersion: number;
diff --git a/src/store/models/objects/trustLine.ts b/src/store/models/objects/trustLine.ts
index 96c97806a..6ff639c08 100644
--- a/src/store/models/objects/trustLine.ts
+++ b/src/store/models/objects/trustLine.ts
@@ -64,6 +64,39 @@ class TrustLine extends Realm.Object<TrustLine> {
         return this.currency.currencyCode.startsWith('03');
     }
 
+    getLpAssetPair(): string[] {
+        if (this.isLiquidityPoolToken()) {
+            const assetPair = this.linkingObjects<{ pairs: Array<string | CurrencyModel> }>('AmmPair', 'line');
+            
+            // return pairs currency code
+            if (!assetPair.isEmpty()) {
+                if (
+                    typeof assetPair?.[0]?.pairs === 'object' &&
+                    assetPair[0].pairs &&
+                    assetPair[0].pairs?.length === 2
+                ) {
+                    const img1 = typeof assetPair[0].pairs[0] === 'string'
+                        ? assetPair[0].pairs[0]
+                        : typeof assetPair[0].pairs[0] === 'object' && assetPair[0].pairs[0]
+                        ? assetPair[0].pairs[0]?.avatarUrl || assetPair[0].pairs[0]?.issuerAvatarUrl || ''
+                        : '';
+                    const img2 = typeof assetPair[0].pairs[1] === 'string'
+                        ? assetPair[0].pairs[1]
+                        : typeof assetPair[0].pairs[1] === 'object' && assetPair[0].pairs[1]
+                        ? assetPair[0].pairs[1]?.avatarUrl || assetPair[0].pairs[1]?.issuerAvatarUrl || ''
+                        : '';
+
+                    return [
+                        img1,
+                        img2,
+                    ];
+                }
+            }
+        }
+
+        return ['', ''];
+    }
+
     getFormattedCurrency(): string {
         // if there is a name for currency return the name
 
@@ -79,7 +112,7 @@ class TrustLine extends Realm.Object<TrustLine> {
             if (!assetPair.isEmpty()) {
                 return assetPair[0]?.pairs
                     .map((pair) => (typeof pair === 'string' ? pair : NormalizeCurrencyCode(pair.currencyCode)))
-                    .join('/');
+                    .join(' / ');
             }
         }
 
@@ -87,7 +120,7 @@ class TrustLine extends Realm.Object<TrustLine> {
         return NormalizeCurrencyCode(this.currency.currencyCode);
     }
 
-    getFormattedIssuer(owner?: string): string {
+    getFormattedIssuer(owner?: string, maxLength = 11): string {
         // self issued
         if (owner && this.currency.issuer === owner) {
             return Localize.t('home.selfIssued');
@@ -95,11 +128,11 @@ class TrustLine extends Realm.Object<TrustLine> {
 
         // issuer name + currency code
         if (this.currency.issuerName) {
-            return `${this.currency.issuerName} ${NormalizeCurrencyCode(this.currency.currencyCode)}`;
+            return `${Truncate(this.currency.issuerName, maxLength)} ${Truncate(NormalizeCurrencyCode(this.currency.currencyCode), 11)}`;
         }
 
         // issuer address
-        return Truncate(this.currency.issuer, 11);
+        return Truncate(this.currency.issuer, maxLength);
     }
 }
 
diff --git a/src/store/models/schemas/index.ts b/src/store/models/schemas/index.ts
index 6a758b56e..3094038dc 100644
--- a/src/store/models/schemas/index.ts
+++ b/src/store/models/schemas/index.ts
@@ -16,7 +16,11 @@ import * as v15 from './v15';
 import * as v16 from './v16';
 import * as v17 from './v17';
 import * as v18 from './v18';
+import * as v19 from './v19';
+import * as v20 from './v20';
+import * as v21 from './v21';
+import * as v22 from './v22';
 
-const schemas = [v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18];
+const schemas = [v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22];
 
 export default schemas;
diff --git a/src/store/models/schemas/latest.ts b/src/store/models/schemas/latest.ts
index e77134db1..2373d1977 100644
--- a/src/store/models/schemas/latest.ts
+++ b/src/store/models/schemas/latest.ts
@@ -1,4 +1,4 @@
-import { schemas } from './v18';
+import { schemas } from './v22';
 
 export const {
     CoreSchema,
diff --git a/src/store/models/schemas/v19/core.ts b/src/store/models/schemas/v19/core.ts
new file mode 100644
index 000000000..6f42847ae
--- /dev/null
+++ b/src/store/models/schemas/v19/core.ts
@@ -0,0 +1,50 @@
+/**
+ * App Core Schema
+ */
+import Realm from 'realm';
+
+import { AppConfig } from '@common/constants';
+import { ExtendedSchemaType } from '@store/types';
+
+/* Schema  ==================================================================== */
+const CoreSchema = {
+    schema: {
+        name: 'Core',
+        properties: {
+            initialized: { type: 'bool', default: false },
+            passcode: { type: 'string', optional: true },
+            minutesAutoLock: { type: 'int', default: 1 },
+            lastPasscodeFailedTimestamp: { type: 'int', optional: true },
+            passcodeFailedAttempts: { type: 'int', default: 0 },
+            lastUnlockedTimestamp: { type: 'int', optional: true },
+            purgeOnBruteForce: { type: 'bool', default: false },
+            biometricMethod: { type: 'string', optional: true },
+            passcodeFallback: { type: 'bool', default: false },
+            language: { type: 'string', default: AppConfig.defaultLanguage },
+            currency: { type: 'string', default: AppConfig.defaultCurrency },
+            network: { type: 'object', objectType: 'Network' },
+            account: { type: 'object', objectType: 'Account' },
+            hapticFeedback: { type: 'bool', default: true },
+            hideAdvisoryTransactions: { type: 'bool', default: true },
+            discreetMode: { type: 'bool', default: false },
+            showReservePanel: { type: 'bool', default: true },
+            useSystemSeparators: { type: 'bool', default: true },
+            developerMode: { type: 'bool', default: false },
+            theme: { type: 'string', default: AppConfig.defaultTheme },
+        },
+    },
+
+    migration: (oldRealm: Realm, newRealm: Realm) => {
+        /*  eslint-disable-next-line */
+        console.log('migrating Core schema to 19');
+
+        // update the new core settings
+        const newCoreSettings = newRealm.objects('Core') as any;
+        if (!newCoreSettings.isEmpty()) {
+            // enableAdvisoryTransactions
+            newCoreSettings[0].hideAdvisoryTransactions = true;
+        }
+    },
+};
+
+export default <ExtendedSchemaType>CoreSchema;
diff --git a/src/store/models/schemas/v19/index.ts b/src/store/models/schemas/v19/index.ts
new file mode 100644
index 000000000..c0d6955a2
--- /dev/null
+++ b/src/store/models/schemas/v19/index.ts
@@ -0,0 +1,45 @@
+import { schemas as v18Schemas } from '@store/models/schemas/v18';
+
+// ~ MODIFIED
+import CoreSchema from '@store/models/schemas/v19/core';
+
+// = NOT CHANGED
+const {
+    CurrencySchema,
+    ContactSchema,
+    ProfileSchema,
+    NodeSchema,
+    AccountSchema,
+    TrustLineSchema,
+    AccountDetailsSchema,
+    NetworkSchema,
+    AmmPairSchema,
+    UserInteractionSchema,
+} = v18Schemas;
+
+/* Exports ==================================================================== */
+export const schemaVersion = 19;
+
+export const migration = (oldRealm: Realm, newRealm: Realm) => {
+    [CoreSchema].forEach((entry) => {
+        if (typeof entry.migration !== 'function') {
+            throw new Error(`migration method is required for schema ${entry.schema.name}`);
+        }
+
+        entry.migration(oldRealm, newRealm);
+    });
+};
+
+export const schemas = {
+    ContactSchema,
+    CurrencySchema,
+    ProfileSchema,
+    NetworkSchema,
+    NodeSchema,
+    CoreSchema,
+    AccountSchema,
+    AccountDetailsSchema,
+    TrustLineSchema,
+    AmmPairSchema,
+    UserInteractionSchema,
+};
diff --git a/src/store/models/schemas/v20/core.ts b/src/store/models/schemas/v20/core.ts
new file mode 100644
index 000000000..6d54564d3
--- /dev/null
+++ b/src/store/models/schemas/v20/core.ts
@@ -0,0 +1,51 @@
+/**
+ * App Core Schema
+ */
+import Realm from 'realm';
+
+import { AppConfig } from '@common/constants';
+import { ExtendedSchemaType } from '@store/types';
+
+/* Schema  ==================================================================== */
+const CoreSchema = {
+    schema: {
+        name: 'Core',
+        properties: {
+            initialized: { type: 'bool', default: false },
+            passcode: { type: 'string', optional: true },
+            minutesAutoLock: { type: 'int', default: 1 },
+            lastPasscodeFailedTimestamp: { type: 'int', optional: true },
+            passcodeFailedAttempts: { type: 'int', default: 0 },
+            lastUnlockedTimestamp: { type: 'int', optional: true },
+            purgeOnBruteForce: { type: 'bool', default: false },
+            biometricMethod: { type: 'string', optional: true },
+            passcodeFallback: { type: 'bool', default: false },
+            language: { type: 'string', default: AppConfig.defaultLanguage },
+            currency: { type: 'string', default: AppConfig.defaultCurrency },
+            network: { type: 'object', objectType: 'Network' },
+            account: { type: 'object', objectType: 'Account' },
+            hapticFeedback: { type: 'bool', default: true },
+            hideAdvisoryTransactions: { type: 'bool', default: true },
+            hideServiceFeeTransactions: { type: 'bool', default: false },
+            discreetMode: { type: 'bool', default: false },
+            showReservePanel: { type: 'bool', default: true },
+            useSystemSeparators: { type: 'bool', default: true },
+            developerMode: { type: 'bool', default: false },
+            theme: { type: 'string', default: AppConfig.defaultTheme },
+        },
+    },
+
+    migration: (oldRealm: Realm, newRealm: Realm) => {
+        /*  eslint-disable-next-line */
+        console.log('migrating Core schema to 20');
+
+        // update the new core settings
+        const newCoreSettings = newRealm.objects('Core') as any;
+        if (!newCoreSettings.isEmpty()) {
+            // enableAdvisoryTransactions
+            newCoreSettings[0].hideServiceFeeTransactions = false;
+        }
+    },
+};
+
+export default <ExtendedSchemaType>CoreSchema;
diff --git a/src/store/models/schemas/v20/index.ts b/src/store/models/schemas/v20/index.ts
new file mode 100644
index 000000000..550d262cd
--- /dev/null
+++ b/src/store/models/schemas/v20/index.ts
@@ -0,0 +1,45 @@
+import { schemas as v19Schemas } from '@store/models/schemas/v19';
+
+// ~ MODIFIED
+import CoreSchema from '@store/models/schemas/v20/core';
+
+// = NOT CHANGED
+const {
+    CurrencySchema,
+    ContactSchema,
+    ProfileSchema,
+    NodeSchema,
+    AccountSchema,
+    TrustLineSchema,
+    AccountDetailsSchema,
+    NetworkSchema,
+    AmmPairSchema,
+    UserInteractionSchema,
+} = v19Schemas;
+
+/* Exports ==================================================================== */
+export const schemaVersion = 20;
+
+export const migration = (oldRealm: Realm, newRealm: Realm) => {
+    [CoreSchema].forEach((entry) => {
+        if (typeof entry.migration !== 'function') {
+            throw new Error(`migration method is required for schema ${entry.schema.name}`);
+        }
+
+        entry.migration(oldRealm, newRealm);
+    });
+};
+
+export const schemas = {
+    ContactSchema,
+    CurrencySchema,
+    ProfileSchema,
+    NetworkSchema,
+    NodeSchema,
+    CoreSchema,
+    AccountSchema,
+    AccountDetailsSchema,
+    TrustLineSchema,
+    AmmPairSchema,
+    UserInteractionSchema,
+};
diff --git a/src/store/models/schemas/v21/index.ts b/src/store/models/schemas/v21/index.ts
new file mode 100644
index 000000000..f658866b9
--- /dev/null
+++ b/src/store/models/schemas/v21/index.ts
@@ -0,0 +1,45 @@
+import { schemas as v20Schemas } from '@store/models/schemas/v20';
+
+// ~ MODIFIED
+import ProfileSchema from '@store/models/schemas/v21/profile';
+
+// = NOT CHANGED
+const {
+    CurrencySchema,
+    ContactSchema,
+    NodeSchema,
+    CoreSchema,
+    AccountSchema,
+    TrustLineSchema,
+    AccountDetailsSchema,
+    NetworkSchema,
+    AmmPairSchema,
+    UserInteractionSchema,
+} = v20Schemas;
+
+/* Exports ==================================================================== */
+export const schemaVersion = 21;
+
+export const migration = (oldRealm: Realm, newRealm: Realm) => {
+    [ProfileSchema].forEach((entry) => {
+        if (typeof entry.migration !== 'function') {
+            throw new Error(`migration method is required for schema ${entry.schema.name}`);
+        }
+
+        entry.migration(oldRealm, newRealm);
+    });
+};
+
+export const schemas = {
+    ContactSchema,
+    CurrencySchema,
+    ProfileSchema,
+    NetworkSchema,
+    NodeSchema,
+    CoreSchema,
+    AccountSchema,
+    AccountDetailsSchema,
+    TrustLineSchema,
+    AmmPairSchema,
+    UserInteractionSchema,
+};
diff --git a/src/store/models/schemas/v21/profile.ts b/src/store/models/schemas/v21/profile.ts
new file mode 100644
index 000000000..7ad71da7a
--- /dev/null
+++ b/src/store/models/schemas/v21/profile.ts
@@ -0,0 +1,42 @@
+/**
+ * Profile Schema v21
+ */
+
+import { ExtendedSchemaType } from '@store/types';
+
+/* Schema  ==================================================================== */
+const ProfileSchema = {
+    schema: {
+        name: 'Profile',
+        properties: {
+            username: { type: 'string', optional: true },
+            slug: { type: 'string', optional: true },
+            uuid: { type: 'string', optional: true },
+            deviceUUID: { type: 'string', optional: true },
+            swapNetworks: { type: 'string', optional: true },
+            signedTOSVersion: { type: 'int', optional: true },
+            signedTOSDate: { type: 'date', optional: true },
+            accessToken: { type: 'string', optional: true },
+            refreshToken: { type: 'string', optional: true },
+            bearerHash: { type: 'string', optional: true },
+            idempotency: { type: 'int', default: 0 },
+            hasPro: { type: 'bool', default: false },
+            monetization: { type: 'dictionary', objectType: 'string' },
+            registerAt: { type: 'date', default: new Date() },
+            lastSync: { type: 'date', default: new Date() },
+        },
+    },
+
+    migration: (oldRealm: Realm, newRealm: Realm) => {
+        /*  eslint-disable-next-line */
+        console.log('migrating Profile schema to 21');
+
+        const newObjects = newRealm.objects(ProfileSchema.schema.name) as any;
+
+        for (let i = 0; i < newObjects.length; i++) {
+            newObjects[i].swapNetworks = '';
+        }
+    },
+};
+
+export default <ExtendedSchemaType>ProfileSchema;
diff --git a/src/store/models/schemas/v22/core.ts b/src/store/models/schemas/v22/core.ts
new file mode 100644
index 000000000..0168a4f4e
--- /dev/null
+++ b/src/store/models/schemas/v22/core.ts
@@ -0,0 +1,52 @@
+/**
+ * App Core Schema
+ */
+import Realm from 'realm';
+
+import { AppConfig } from '@common/constants';
+import { ExtendedSchemaType } from '@store/types';
+
+/* Schema  ==================================================================== */
+const CoreSchema = {
+    schema: {
+        name: 'Core',
+        properties: {
+            initialized: { type: 'bool', default: false },
+            passcode: { type: 'string', optional: true },
+            minutesAutoLock: { type: 'int', default: 1 },
+            lastPasscodeFailedTimestamp: { type: 'int', optional: true },
+            passcodeFailedAttempts: { type: 'int', default: 0 },
+            lastUnlockedTimestamp: { type: 'int', optional: true },
+            purgeOnBruteForce: { type: 'bool', default: false },
+            biometricMethod: { type: 'string', optional: true },
+            passcodeFallback: { type: 'bool', default: false },
+            language: { type: 'string', default: AppConfig.defaultLanguage },
+            currency: { type: 'string', default: AppConfig.defaultCurrency },
+            network: { type: 'object', objectType: 'Network' },
+            account: { type: 'object', objectType: 'Account' },
+            hapticFeedback: { type: 'bool', default: true },
+            hideAdvisoryTransactions: { type: 'bool', default: true },
+            hideServiceFeeTransactions: { type: 'bool', default: false },
+            discreetMode: { type: 'bool', default: false },
+            showReservePanel: { type: 'bool', default: true },
+            useSystemSeparators: { type: 'bool', default: true },
+            developerMode: { type: 'bool', default: false },
+            theme: { type: 'string', default: AppConfig.defaultTheme },
+            themeAutoSwitch: { type: 'bool', default: false },
+        },
+    },
+
+    migration: (oldRealm: Realm, newRealm: Realm) => {
+        /*  eslint-disable-next-line */
+        console.log('migrating Core schema to 22');
+
+        // update the new core settings
+        const newCoreSettings = newRealm.objects('Core') as any;
+        if (!newCoreSettings.isEmpty()) {
+            // disable theme autoswitching
+            newCoreSettings[0].themeAutoSwitch = false;
+        }
+    },
+};
+
+export default <ExtendedSchemaType>CoreSchema;
diff --git a/src/store/models/schemas/v22/index.ts b/src/store/models/schemas/v22/index.ts
new file mode 100644
index 000000000..6e2e4ed71
--- /dev/null
+++ b/src/store/models/schemas/v22/index.ts
@@ -0,0 +1,45 @@
+import { schemas as v20Schemas } from '@store/models/schemas/v21';
+
+// ~ MODIFIED
+import CoreSchema from '@store/models/schemas/v22/core';
+
+// = NOT CHANGED
+const {
+    CurrencySchema,
+    ContactSchema,
+    NodeSchema,
+    ProfileSchema,
+    AccountSchema,
+    TrustLineSchema,
+    AccountDetailsSchema,
+    NetworkSchema,
+    AmmPairSchema,
+    UserInteractionSchema,
+} = v20Schemas;
+
+/* Exports ==================================================================== */
+export const schemaVersion = 22;
+
+export const migration = (oldRealm: Realm, newRealm: Realm) => {
+    [CoreSchema].forEach((entry) => {
+        if (typeof entry.migration !== 'function') {
+            throw new Error(`migration method is required for schema ${entry.schema.name}`);
+        }
+
+        entry.migration(oldRealm, newRealm);
+    });
+};
+
+export const schemas = {
+    ContactSchema,
+    CurrencySchema,
+    ProfileSchema,
+    NetworkSchema,
+    NodeSchema,
+    CoreSchema,
+    AccountSchema,
+    AccountDetailsSchema,
+    TrustLineSchema,
+    AmmPairSchema,
+    UserInteractionSchema,
+};
diff --git a/src/store/repositories/currency.ts b/src/store/repositories/currency.ts
index 0561f5ebd..c68f6228d 100644
--- a/src/store/repositories/currency.ts
+++ b/src/store/repositories/currency.ts
@@ -3,8 +3,6 @@ import Realm from 'realm';
 
 import { CurrencyModel } from '@store/models';
 
-import { IssuedCurrency } from '@common/libs/ledger/types/common';
-
 import BaseRepository from './base';
 
 /* Types  ==================================================================== */
@@ -76,14 +74,6 @@ class CurrencyRepository extends BaseRepository<CurrencyModel> {
             return updatedCurrency;
         });
     };
-
-    isVettedCurrency = (issuedCurrency: IssuedCurrency): boolean => {
-        const currency = this.findOne({ issuer: issuedCurrency.issuer, currencyCode: issuedCurrency.currency });
-        if (!currency) {
-            return false;
-        }
-        return !!currency.name;
-    };
 }
 
 export default new CurrencyRepository();
diff --git a/src/theme/colors.ts b/src/theme/colors.ts
index f34e0c2ff..efc9644e9 100644
--- a/src/theme/colors.ts
+++ b/src/theme/colors.ts
@@ -6,6 +6,7 @@ import { ColorLuminance, HexToRgbA } from '@common/utils/color';
 
 const colors = {
     blue: '#0030CF',
+    darkBlue: '#181D41',
     orange: '#F8BF4C',
     green: '#3BDC96',
     red: '#FF5B5B',
@@ -37,8 +38,8 @@ const ColorsGeneral = {
     ...colors,
     // testBlue: ColorLuminance(colors.blue, -0.5),
     // lightBlue: ColorLuminance(colors.blue, -0.5),
-    transparentBlack: HexToRgbA(colors.black, 0.7),
     transparentBlue: HexToRgbA(colors.blue, 0.7),
+    transparentBlack: HexToRgbA(colors.black, 0.7),
     transparentWhite: HexToRgbA(colors.white, 0.4),
 
     darkGrey: ColorLuminance(colors.grey, -0.75),
@@ -51,6 +52,7 @@ const ColorsTheme = {
         background: colors.white,
         tint: colors.light,
         contrast: colors.black,
+        transparentContrast: HexToRgbA(colors.black, 0.1),
         textContrast: colors.white,
         textPrimary: colors.black,
         textSecondary: colors.grey,
@@ -66,6 +68,7 @@ const ColorsTheme = {
         background: colors.black,
         tint: ColorLuminance(colors.grey, -0.75),
         contrast: colors.white,
+        transparentContrast: HexToRgbA(colors.white, 0.1),
         textContrast: colors.black,
         textPrimary: colors.white,
         textSecondary: colors.silver,
@@ -81,6 +84,7 @@ const ColorsTheme = {
         background: colors.themeMoonlight,
         tint: ColorLuminance(colors.grey, -0.65),
         contrast: colors.white,
+        transparentContrast: HexToRgbA(colors.white, 0.1),
         textContrast: colors.black,
         textPrimary: colors.white,
         textSecondary: colors.silver,
@@ -96,6 +100,7 @@ const ColorsTheme = {
         background: colors.themeRoyal,
         tint: ColorLuminance(colors.blue, -0.55),
         contrast: colors.white,
+        transparentContrast: HexToRgbA(colors.white, 0.1),
         textContrast: colors.black,
         textPrimary: colors.white,
         textSecondary: colors.silver,
diff --git a/src/theme/sizes.ts b/src/theme/sizes.ts
index fe818d01c..901d3e78c 100644
--- a/src/theme/sizes.ts
+++ b/src/theme/sizes.ts
@@ -17,6 +17,12 @@ const guidelineBaseHeight = 680;
 
 const isSmallDevice = width <= 375;
 
+const xyFactor = width / height;
+const isSquareScreen = xyFactor > 0.85; // Fixes fold devices
+const altScreenDimensionsCorrectionFactor = isSquareScreen // Fixes fold devices
+    ? 2
+    : 1;
+
 // bottomTabs height
 const tabbarHeight = Platform.select({
     ios: bottomInset + 50,
@@ -48,7 +54,10 @@ const Sizes = {
     // Screen Dimensions
     screen: {
         height,
-        width,
+        width: width / altScreenDimensionsCorrectionFactor, // Fixes fold devices
+        uncorrectedWidth: width,
+
+        screenHeight,
 
         heightHalf: height * 0.5,
         heightThird: height * 0.333,
@@ -77,18 +86,20 @@ const Sizes = {
     paddingMid: 15,
     paddingExtraSml: 10,
 
-    paddingList: 25,
+    paddingList: 20,
 
     borderRadius: 8,
 
     extraKeyBoardPadding: 20,
 
-    scale: (size: number) => (width / guidelineBaseWidth) * size,
+    scale: (size: number) => (width / guidelineBaseWidth) * size / altScreenDimensionsCorrectionFactor,
     verticalScale: (size: number) => (height / guidelineBaseHeight) * size,
     moderateScale: (size: number, factor = 0.5) => size + (Sizes.scale(size) - size) * factor,
 
-    widthPercentageToDP: (widthPercent: number) => PixelRatio.roundToNearestPixel((width * widthPercent) / 100),
-    heightPercentageToDP: (heightPercent: number) => PixelRatio.roundToNearestPixel((height * heightPercent) / 100),
+    widthPercentageToDP: (widthPercent: number) =>
+        PixelRatio.roundToNearestPixel((width * widthPercent) / 100),
+    heightPercentageToDP: (heightPercent: number) =>
+        PixelRatio.roundToNearestPixel((height * heightPercent) / 100),
 };
 
 export default Sizes;
diff --git a/src/theme/styles.ts b/src/theme/styles.ts
index 2ab3ea083..7ec43ded1 100644
--- a/src/theme/styles.ts
+++ b/src/theme/styles.ts
@@ -36,7 +36,9 @@ export default StyleService.create({
         height: Sizes.moderateScale(60),
         marginTop: 0,
         paddingTop: 0,
-        paddingHorizontal: Sizes.padding,
+        paddingHorizontal: Sizes.paddingSml,
+        // borderWidth: 3,
+        // borderColor: 'red',
     },
     headerBorder: {
         borderBottomWidth: 1,
@@ -51,7 +53,6 @@ export default StyleService.create({
         height: Sizes.screen.height,
         width: Sizes.screen.width,
     },
-
     borderGrey: {
         borderWidth: 1,
         borderColor: '$grey',
@@ -318,6 +319,9 @@ export default StyleService.create({
     paddingTop: {
         paddingTop: Sizes.padding,
     },
+    paddingTopNone: {
+        paddingTop: 0,
+    },
     paddingBottom: {
         paddingBottom: Sizes.padding,
     },
@@ -332,6 +336,12 @@ export default StyleService.create({
     paddingHorizontalSml: {
         paddingHorizontal: Sizes.paddingSml,
     },
+    paddingLeftExtraSml: {
+        paddingLeft: Sizes.paddingExtraSml,
+    },
+    paddingRightExtraSml: {
+        paddingRight: Sizes.paddingExtraSml,
+    },
     paddingHorizontalExtraSml: {
         paddingHorizontal: Sizes.paddingExtraSml,
     },
@@ -350,6 +360,9 @@ export default StyleService.create({
     paddingBottomSml: {
         paddingBottom: Sizes.paddingSml,
     },
+    paddingBottomExtraSml: {
+        paddingBottom: Sizes.paddingExtraSml,
+    },
     gap: {
         gap: Sizes.padding,
     },
@@ -380,6 +393,12 @@ export default StyleService.create({
     marginTop: {
         marginTop: Sizes.padding,
     },
+    marginTopNone: {
+        marginTop: 0,
+    },
+    marginTopNegativeSml: {
+        marginTop: -(Sizes.padding / 2),
+    },
     marginBottom: {
         marginBottom: Sizes.padding,
     },
@@ -488,8 +507,6 @@ export default StyleService.create({
         height: 80,
         marginBottom: 30,
     },
-
-    // Empty view
     emptyIcon: {
         resizeMode: 'contain',
         width: Sizes.scale(140),
@@ -498,6 +515,10 @@ export default StyleService.create({
         marginBottom: 20,
         overflow: 'visible',
     },
+    emptyIconSm: {
+        width: Sizes.scale(110),
+        height: Sizes.scale(110),
+    },
     emptyText: {
         width: '90%',
         fontSize: Fonts.base.size,
@@ -508,10 +529,6 @@ export default StyleService.create({
         alignSelf: 'center',
         color: '$textPrimary',
     },
-    BackgroundShapes: {
-        resizeMode: 'contain',
-        opacity: 0.4,
-    },
     BackgroundShapesWH: {
         width: '100%',
         height: '100%',
diff --git a/typings/xaman-backend/index.d.ts b/typings/xaman-backend/index.d.ts
index cca779e3e..32bed97f6 100644
--- a/typings/xaman-backend/index.d.ts
+++ b/typings/xaman-backend/index.d.ts
@@ -29,6 +29,15 @@ declare namespace XamanBackend {
         };
     }
 
+    interface MultiAddressNativeInfoItem {
+        hasPro: boolean;
+        hasPush: boolean;
+    }
+
+    interface MultiAddressNativeInfoResponse {
+        [key: string]: MultiAddressNativeInfoItem;
+    }
+
     interface CuratedIOUsResponse {
         version: number;
         changed: boolean;
@@ -60,9 +69,11 @@ declare namespace XamanBackend {
         pong: boolean;
         env: {
             hasPro: boolean;
+            hasKyc: boolean;
             appVersion: string;
             appLanguage: string;
             appCurrency: string;
+            swapNetworks: string;
         };
         tosAndPrivacyPolicyVersion: number;
         railsVersion: number;
@@ -119,7 +130,14 @@ declare namespace XamanBackend {
         done: boolean;
     }
     interface AddAccountResponse {
-        done: boolean;
+        account?: string;
+        added?: booleam;
+        card?: string;
+        is_card?: boolean;
+        switch_to_network?: string;
+    }
+    interface PrivateAccountInfoResponse {
+        push?: boolean;
     }
     interface AccountInfoResponse {
         account: string;
@@ -216,6 +234,7 @@ declare namespace XamanBackend {
     interface XappLunchTokenResponse {
         ott: string;
         xappTitle: string;
+        appid: string;
         allowForCurrentNetwork: boolean;
         xappSupportUrl: string;
         error: string;