diff --git a/package-lock.json b/package-lock.json
index c8673039d..0fbd59ae0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5332,6 +5332,60 @@
         "node": ">=10"
       }
     },
+    "node_modules/@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
+    },
+    "node_modules/@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "node_modules/@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "node_modules/@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
+    },
+    "node_modules/@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "node_modules/@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
+    },
+    "node_modules/@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
+    },
+    "node_modules/@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
+    },
+    "node_modules/@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
+    },
+    "node_modules/@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
+    },
     "node_modules/@samverschueren/stream-to-observable": {
       "version": "0.3.1",
       "dev": true,
@@ -45610,6 +45664,60 @@
       "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz",
       "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ=="
     },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
+    },
     "@samverschueren/stream-to-observable": {
       "version": "0.3.1",
       "dev": true,
diff --git a/src/composables/accounts.ts b/src/composables/accounts.ts
index a5ed38dbb..7cc422b30 100644
--- a/src/composables/accounts.ts
+++ b/src/composables/accounts.ts
@@ -44,7 +44,7 @@ export function useAccounts({ store }: IDefaultComposableOptions) {
 
   function setActiveAccountByIdx(idx: number = 0) {
     // TODO replace with updating local state after removing the Vuex
-    store.commit('accounts/setActiveIdx', +(accounts.value[idx].idx || 0));
+    store.commit('accounts/setActiveIdx', idx);
   }
 
   function setActiveAccountByAddress(address?: string) {
diff --git a/src/composables/airGap.ts b/src/composables/airGap.ts
index 1ae316440..cab3b0c6c 100644
--- a/src/composables/airGap.ts
+++ b/src/composables/airGap.ts
@@ -11,7 +11,7 @@ import type {
 import { AeternityAddress } from '@airgap/aeternity';
 import { MainProtocolSymbols } from '@airgap/coinlib-core';
 import type { IAccount } from '../types';
-import { ACCOUNT_AIR_GAP_WALLET, handleUnknownError } from '../popup/utils';
+import { ACCOUNT_AIR_GAP_WALLET, MOBILE_SCHEMA, handleUnknownError } from '../popup/utils';
 
 export function useAirGap() {
   /**
@@ -45,8 +45,11 @@ export function useAirGap() {
         );
         const fragments = [];
 
-        // eslint-disable-next-line no-restricted-syntax, guard-for-in, no-unused-vars
-        for (const _index in [...Array(multiEncoder.fragmentsLength)]) {
+        // eslint-disable-next-line no-restricted-syntax, guard-for-in
+        for (
+          // eslint-disable-next-line  @typescript-eslint/no-unused-vars
+          const _index in [...Array(multiEncoder.fragmentsLength)]
+        ) {
           // eslint-disable-next-line no-await-in-loop
           fragments.push(await multiEncoder.nextPart());
         }
@@ -110,7 +113,7 @@ export function useAirGap() {
     networkId: string,
   ): Promise<string[]> {
     const id = Math.floor(Math.random() * 90000000 + 10000000);
-    const callbackURL = 'superhero://?d=';
+    const callbackURL = `${MOBILE_SCHEMA}?d=`;
     const payload: TransactionSignRequest = {
       callbackURL,
       publicKey,
diff --git a/src/lib/accounts/superhero.ts b/src/lib/accounts/superhero.ts
index 544f95add..93f923532 100644
--- a/src/lib/accounts/superhero.ts
+++ b/src/lib/accounts/superhero.ts
@@ -58,7 +58,7 @@ export class AccountSuperhero extends AccountBase {
   sign(data: string | Uint8Array, opt: any): Promise<Uint8Array> {
     const { activeAccount } = useAccounts({ store: this.store });
     return IS_EXTENSION_BACKGROUND
-      ? sign(data, activeAccount.value.secretKey) as any
+      ? sign(data, activeAccount.value.secretKey as any) as any
       : this.store.dispatch('accounts/sign', data, opt);
   }
 
diff --git a/src/popup/components/AccountImportRow.vue b/src/popup/components/AccountImportRow.vue
index 907dedcf0..e84feff5f 100644
--- a/src/popup/components/AccountImportRow.vue
+++ b/src/popup/components/AccountImportRow.vue
@@ -10,6 +10,7 @@
     <TokenAmount
       :amount="+numericBalance"
       fiat-below
+      fiat-right
     />
   </div>
 </template>
@@ -48,7 +49,7 @@ export default defineComponent({
     const isAirGapAccount = computed((): boolean => props.account.type === ACCOUNT_AIR_GAP_WALLET);
     onMounted(async () => {
       const sdk = await getSdk();
-      const fetchedBalance = await (sdk as any).balance(props.account.address);
+      const fetchedBalance = await sdk.balance(props.account.address);
       balance.value = new BigNumber(aettosToAe(fetchedBalance));
     });
 
diff --git a/src/popup/components/Modals/AccountCreate.vue b/src/popup/components/Modals/AccountCreate.vue
index 15731466a..d662b718a 100644
--- a/src/popup/components/Modals/AccountCreate.vue
+++ b/src/popup/components/Modals/AccountCreate.vue
@@ -96,8 +96,7 @@ export default defineComponent({
     }
 
     async function connectHardwareWallet() {
-      const scanResult = await root.$store.dispatch('modals/open', {
-        name: MODAL_READ_QR_CODE,
+      const scanResult = await openModal(MODAL_READ_QR_CODE, {
         heading: root.$t('modals.importAirGapAccount.scanTitle'),
         title: root.$t('modals.importAirGapAccount.scanDescription'),
         icon: 'critical',
@@ -109,8 +108,7 @@ export default defineComponent({
 
       // Show Account import.
       try {
-        const selectedAccounts = await root.$store.dispatch('modals/open', {
-          name: MODAL_AIR_GAP_CONFIRM_IMPORT,
+        const selectedAccounts = await openModal(MODAL_AIR_GAP_CONFIRM_IMPORT, {
           accounts,
         });
         selectedAccounts.forEach((account: IAccount) => {
diff --git a/src/popup/components/Modals/AirGapConfirmImport.vue b/src/popup/components/Modals/AirGapConfirmImport.vue
index 71f8e96d9..cc93e355a 100644
--- a/src/popup/components/Modals/AirGapConfirmImport.vue
+++ b/src/popup/components/Modals/AirGapConfirmImport.vue
@@ -6,18 +6,15 @@
     class="air-gap-confirm-import"
     @close="cancel()"
   >
-    <template #header>
+    <div>
       <div class="title">
         {{ $t('modals.importAirGapAccount.importConfirmDialog.title') }}
       </div>
-    </template>
-    <div>
       <div
-        v-if="filteredAccounts.length"
-        class="select-all"
+        v-if="accounts.length"
+        class="description"
       >
-        <CheckBox v-model="selectAll" />
-        {{ $t('modals.importAirGapAccount.importConfirmDialog.selectAll') }}
+        {{ $t('modals.importAirGapAccount.importConfirmDialog.description') }}
       </div>
       <div
         v-else
@@ -26,28 +23,24 @@
         {{ $t('modals.importAirGapAccount.importConfirmDialog.noAccountsFound') }}
       </div>
       <div
-        v-for="account in filteredAccounts"
+        v-for="account in accounts"
         :key="account.address"
         class="account-row"
         :class="{disabled: isAccountAlreadyImported(account)}"
       >
-        <CheckBox
-          v-model="selectedAccounts[account.address]"
-          :disabled="isAccountAlreadyImported(account)"
-        />
         <AccountImportRow :account="account" />
       </div>
     </div>
     <template #footer>
       <BtnMain
         variant="muted"
-        :text="$t('modals.cancel')"
+        :text="$t('common.cancel')"
         @click="cancel()"
       />
       <BtnMain
         extra-padded
-        :text="$t('modals.importAirGapAccount.importConfirmDialog.importAccounts')"
-        :disabled="!hasSelectedAccounts"
+        :text="$t('modals.importAirGapAccount.importConfirmDialog.importAccount')"
+        :disabled="!canImportAccounts"
         @click="confirm()"
       />
     </template>
@@ -55,18 +48,11 @@
 </template>
 
 <script lang="ts">
-import {
-  defineComponent,
-  ref,
-  watch,
-  computed,
-  PropType,
-} from '@vue/composition-api';
+import { computed, defineComponent, PropType } from '@vue/composition-api';
 import type { IAccount } from '../../../types';
 import { useState } from '../../../composables/vuex';
 
 import Modal from '../Modal.vue';
-import CheckBox from '../CheckBox.vue';
 import BtnMain from '../buttons/BtnMain.vue';
 import AccountImportRow from '../AccountImportRow.vue';
 
@@ -75,7 +61,6 @@ export default defineComponent({
     Modal,
     BtnMain,
     AccountImportRow,
-    CheckBox,
   },
   props: {
     resolve: {
@@ -88,52 +73,25 @@ export default defineComponent({
   },
   setup(props) {
     const importedAccounts = useState<IAccount[]>('accounts', 'list');
-    const searchPhrase = ref<string>('');
-    const selectAll = ref<boolean>(false);
-    const selectedAccounts = ref<Record<string, boolean>>({});
-    const hasSelectedAccounts = computed((): boolean => props.accounts.some(
-      (account) => selectedAccounts.value[account.address],
-    ));
-    const filteredAccounts = computed((): IAccount[] => (
-      props.accounts.filter((account) => account.address.includes(searchPhrase.value))
-    ));
+    const canImportAccounts = computed(() => props.accounts.length > 0);
 
     function isAccountAlreadyImported(account: IAccount) {
       return importedAccounts.value.some((acc) => acc.address === account.address);
     }
 
     function confirm() {
-      props.resolve(props.accounts.filter(
-        (account) => selectedAccounts.value[account.address],
-      ));
+      props.resolve(props.accounts.filter((account) => !isAccountAlreadyImported(account)));
     }
 
     function cancel() {
       props.reject();
     }
 
-    watch(
-      selectAll,
-      (_selectAll) => {
-        const _selectedAccounts: Record<string, boolean> = {
-          ...selectedAccounts.value,
-        };
-        props.accounts.forEach((account: IAccount) => {
-          _selectedAccounts[account.address] = _selectAll;
-        });
-        selectedAccounts.value = _selectedAccounts;
-      },
-    );
-
     return {
       confirm,
       cancel,
-      searchPhrase,
-      selectAll,
-      selectedAccounts,
-      filteredAccounts,
-      hasSelectedAccounts,
       isAccountAlreadyImported,
+      canImportAccounts,
     };
   },
 });
@@ -146,14 +104,23 @@ export default defineComponent({
 
 .air-gap-confirm-import {
   .title {
-    @extend %face-sans-15-medium;
+    @extend %face-sans-18-bold;
 
-    color: rgba(variables.$color-white, 0.75);
-    text-align: left;
+    color: variables.$color-white;
+    text-align: center;
+    padding: 12px;
+  }
+
+  .description {
+    @extend %face-sans-16-regular;
+
+    color: variables.$color-white;
+    line-height: 24px;
+    text-align: center;
     padding: 12px;
+    margin-bottom: 20px;
   }
 
-  .select-all,
   .account-row {
     @include mixins.flex(flex-start, center, row);
 
diff --git a/src/popup/components/Modals/AirGapSignTransaction.vue b/src/popup/components/Modals/AirGapSignTransaction.vue
index 9949c697d..bfbf9039f 100644
--- a/src/popup/components/Modals/AirGapSignTransaction.vue
+++ b/src/popup/components/Modals/AirGapSignTransaction.vue
@@ -23,13 +23,13 @@
     <template #footer>
       <BtnMain
         variant="muted"
-        :text="$t('modals.cancel')"
+        :text="$t('common.cancel')"
         @click="reject()"
       />
       <BtnMain
         extra-padded
         :icon="QrScanIcon"
-        :text="$t('modals.scan')"
+        :text="$t('common.scan')"
         @click="scanSignedTransaction()"
       />
     </template>
@@ -49,7 +49,7 @@ import type {
   TransactionSignResponse,
 } from '@airgap/serializer';
 import { useGetter } from '../../../composables/vuex';
-import { useAccounts, useAirGap } from '../../../composables';
+import { useAccounts, useModals, useAirGap } from '../../../composables';
 import type { INetwork } from '../../../types';
 import { MODAL_READ_QR_CODE } from '../../utils';
 
@@ -73,21 +73,21 @@ export default defineComponent({
   },
   setup(props, { root }) {
     const fragments = ref();
-    const { account } = useAccounts({ store: root.$store });
+    const { openModal } = useModals();
+    const { activeAccount } = useAccounts({ store: root.$store });
     const activeNetwork = useGetter<INetwork>('activeNetwork');
     const { generateTransactionURDataFragments } = useAirGap();
 
     onMounted(async () => {
       fragments.value = await generateTransactionURDataFragments(
-        account.value.airGapPublicKey as string,
+        activeAccount.value.airGapPublicKey as string,
         props.txRaw,
         activeNetwork.value.networkId,
       );
     });
 
     async function scanSignedTransaction() {
-      const scanResult: IACMessageDefinitionObjectV3[] = await root.$store.dispatch('modals/open', {
-        name: MODAL_READ_QR_CODE,
+      const scanResult: IACMessageDefinitionObjectV3[] = await openModal(MODAL_READ_QR_CODE, {
         heading: root.$t('modals.importAirGapAccount.scanTitle'),
         title: root.$t('modals.importAirGapAccount.scanDescription'),
         icon: 'critical',
diff --git a/src/popup/components/Modals/QrCodeReader.vue b/src/popup/components/Modals/QrCodeReader.vue
index 0bbb37de5..62f55e175 100644
--- a/src/popup/components/Modals/QrCodeReader.vue
+++ b/src/popup/components/Modals/QrCodeReader.vue
@@ -131,6 +131,8 @@ export default {
     },
   },
   async mounted() {
+    this.decoder = new URDecoder();
+
     if (this.mobile) {
       try {
         await new Promise((resolve, reject) => window.QRScanner.prepare((error, status) => (
@@ -169,7 +171,6 @@ export default {
       const { BrowserQRCodeReader } = await import('@zxing/library');
 
       this.browserReader = new BrowserQRCodeReader();
-      this.decoder = new URDecoder();
     },
     async scan() {
       return this.mobile
diff --git a/src/popup/components/Modals/TransferSend.vue b/src/popup/components/Modals/TransferSend.vue
index 45150a15e..2d746357c 100644
--- a/src/popup/components/Modals/TransferSend.vue
+++ b/src/popup/components/Modals/TransferSend.vue
@@ -147,7 +147,7 @@ export default defineComponent({
       }
 
       if (props.isAirGap && showScanButton.value) {
-        return root.$t('modals.scan');
+        return root.$t('common.scan');
       }
 
       return root.$t('common.send');
diff --git a/src/popup/components/TokenAmount.vue b/src/popup/components/TokenAmount.vue
index 6e741a69a..aad9769c7 100644
--- a/src/popup/components/TokenAmount.vue
+++ b/src/popup/components/TokenAmount.vue
@@ -29,7 +29,7 @@
     <span
       v-if="amountFiat"
       class="fiat"
-      :class="{ 'fiat-below': fiatBelow }"
+      :class="{ 'fiat-below': fiatBelow, 'fiat-right': fiatRight }"
     >
       {{ amountFiat }}
     </span>
@@ -51,6 +51,7 @@ export default defineComponent({
     symbol: { type: String, default: AETERNITY_SYMBOL },
     aex9: { type: Boolean, default: false },
     fiatBelow: { type: Boolean, default: false },
+    fiatRight: Boolean,
     hideFiat: Boolean,
     large: Boolean,
     row: Boolean,
@@ -119,6 +120,9 @@ export default defineComponent({
       margin-left: 0;
       padding-top: 4px;
       white-space: nowrap;
+    }
+
+    &.fiat-right {
       text-align: right;
     }
   }
diff --git a/src/popup/components/TransferQRCodeGenerator.vue b/src/popup/components/TransferQRCodeGenerator.vue
index 2bfb03dce..6b44c3254 100644
--- a/src/popup/components/TransferQRCodeGenerator.vue
+++ b/src/popup/components/TransferQRCodeGenerator.vue
@@ -36,7 +36,7 @@ export default defineComponent({
   setup(props, { root }) {
     const activeNetwork = useGetter<INetwork>('activeNetwork');
     const { getSdk } = useSdk({ store: root.$store });
-    const { account } = useAccounts({ store: root.$store });
+    const { activeAccount } = useAccounts({ store: root.$store });
     const { generateTransactionURDataFragments } = useAirGap();
     const fragments = ref();
 
@@ -48,7 +48,7 @@ export default defineComponent({
         selectedAsset,
       } = props.transferData;
 
-      if (!amountRaw || !recipient || !selectedAsset || !account.value.airGapPublicKey) {
+      if (!amountRaw || !recipient || !selectedAsset || !activeAccount.value.airGapPublicKey) {
         return null;
       }
 
@@ -57,13 +57,13 @@ export default defineComponent({
         : convertToken(amountRaw, selectedAsset.decimals);
 
       const txRaw = await sdk.spendTx({
-        senderId: account.value.address,
+        senderId: activeAccount.value.address,
         recipientId: recipient,
         amount,
         payload: props.transferData.payload,
       });
       fragments.value = await generateTransactionURDataFragments(
-        account.value.airGapPublicKey,
+        activeAccount.value.airGapPublicKey,
         txRaw,
         activeNetwork.value.networkId,
       );
diff --git a/src/popup/components/TransferRawTxReview.vue b/src/popup/components/TransferRawTxReview.vue
index 25dbd90cc..7443c2751 100644
--- a/src/popup/components/TransferRawTxReview.vue
+++ b/src/popup/components/TransferRawTxReview.vue
@@ -84,6 +84,7 @@ import {
 import { TxBuilder } from '@aeternity/aepp-sdk';
 import BigNumber from 'bignumber.js';
 import { useGetter } from '../../composables/vuex';
+import { useModals } from '../../composables';
 import {
   AETERNITY_CONTRACT_ID,
   AETERNITY_SYMBOL,
@@ -110,6 +111,8 @@ export default defineComponent({
     txRaw: { type: String, required: true },
   },
   setup(props, { root, emit }) {
+    const { openModal } = useModals();
+
     const transferData = ref<TransferFormModel>();
     const loading = ref<boolean>(true);
     const sdk = useGetter<ISdk>('sdkPlugin/sdk');
@@ -122,13 +125,11 @@ export default defineComponent({
         const transaction = await sdk.value.sendTransaction(props.txRaw, {
           waitMined: true,
         });
-        root.$store.dispatch('modals/open', {
-          name: MODAL_SPEND_SUCCESS,
+        openModal(MODAL_SPEND_SUCCESS, {
           transaction,
         });
       } catch (error) {
-        root.$store.dispatch('modals/open', {
-          name: MODAL_DEFAULT,
+        openModal(MODAL_DEFAULT, {
           title: root.$t('modals.transaction-failed.msg'),
           icon: 'critical',
         });
diff --git a/src/popup/components/TransferReview.vue b/src/popup/components/TransferReview.vue
index 105dc02c7..ac7bf86b9 100644
--- a/src/popup/components/TransferReview.vue
+++ b/src/popup/components/TransferReview.vue
@@ -202,7 +202,7 @@ export default defineComponent({
     amount: { type: Number, default: null },
   },
   setup(props, { root, emit }) {
-    const { openDefaultModal } = useModals();
+    const { openDefaultModal, openModal } = useModals();
     const { openCallbackOrGoHome } = useDeepLinkApi({ router: root.$router });
     const { activeAccount } = useAccounts({ store: root.$store });
     const { extractSignedTransactionResponseData } = useAirGap();
@@ -417,8 +417,7 @@ export default defineComponent({
     }
 
     async function scanSignedTransaction() {
-      const scanResult = await root.$store.dispatch('modals/open', {
-        name: MODAL_READ_QR_CODE,
+      const scanResult = await openModal(MODAL_READ_QR_CODE, {
         heading: root.$t('modals.scanAirGapTx.heading'),
         title: root.$t('modals.scanAirGapTx.title'),
         icon: 'critical',
diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json
index 1a9ecea8b..95f66961d 100644
--- a/src/popup/locales/en.json
+++ b/src/popup/locales/en.json
@@ -206,10 +206,9 @@
       "scanTitle": "Scan QR code",
       "scanDescription": "Scan QR code from your AirGap vault in order to pair wallets and import accounts.",
       "importConfirmDialog": {
-        "title": "Select accounts to import from AirGap",
-        "selectAll": "Select all",
-        "search": "Search for account",
-        "importAccounts": "Import Accounts",
+        "title": "Import account from AirGap",
+        "description": "Import æternity account from AirGap into your Superhero wallet in order to manage cryptocurrency funds signing transactions through QR-codes.",
+        "importAccount": "Import Account",
         "noAccountsFound": "There are no accounts found."
       }
     },
diff --git a/src/popup/pages/FungibleTokens/TokenContainer.vue b/src/popup/pages/FungibleTokens/TokenContainer.vue
index 0f5b7399f..130dee074 100644
--- a/src/popup/pages/FungibleTokens/TokenContainer.vue
+++ b/src/popup/pages/FungibleTokens/TokenContainer.vue
@@ -149,7 +149,7 @@ export default defineComponent({
       store: root.$store,
       isMultisig: isMultisig.value,
     });
-    const { account, isAirGap } = useAccounts({ store: root.$store });
+    const { isAirGap } = useAccounts({ store: root.$store });
 
     const isCoin: boolean = !!root.$route.matched.find(
       ({ name }) => name && [ROUTE_COIN, ROUTE_COIN_DETAILS].includes(name),
diff --git a/src/popup/utils/constants.ts b/src/popup/utils/constants.ts
index 287b2b363..72832f21b 100644
--- a/src/popup/utils/constants.ts
+++ b/src/popup/utils/constants.ts
@@ -14,6 +14,7 @@ import { i18n } from '../../store/plugins/languages';
 
 export const EXTENSION_HEIGHT = 600;
 export const MOBILE_WIDTH = 480;
+export const MOBILE_SCHEMA = 'superhero://';
 
 export const LOCAL_STORAGE_PREFIX = 'sh-wallet';
 
diff --git a/src/store/modules/accounts/airgap.js b/src/store/modules/accounts/airgap.js
index 6be6b9dc9..32bc42412 100644
--- a/src/store/modules/accounts/airgap.js
+++ b/src/store/modules/accounts/airgap.js
@@ -1,4 +1,5 @@
 import { MODAL_DEFAULT, ACCOUNT_AIR_GAP_WALLET, MODAL_AIR_GAP_SIGN_TRANSACTION } from '../../../popup/utils';
+import { useModals } from '../../../composables';
 
 export default {
   namespaced: true,
@@ -25,20 +26,21 @@ export default {
     },
 
     async ensureCurrentAccountAvailable({ rootGetters: { account }, dispatch }) {
+      const { openModal } = useModals();
       const address = await dispatch('request', { name: 'getAddress', args: [account.idx] });
       if (account.address !== address) {
         if (!process.env.IS_EXTENSION) {
-          dispatch('modals/open', { name: MODAL_DEFAULT, icon: 'alert', title: 'account not found' }, { root: true });
+          openModal(MODAL_DEFAULT, { icon: 'alert', title: 'account not found' });
         }
         throw new Error('Account not found');
       }
     },
 
     sign: () => Promise.reject(new Error('AirGap Sign Not implemented yet')),
-    signTransaction: async ({ dispatch }, { txBase64 }) => dispatch('modals/open', {
-      name: MODAL_AIR_GAP_SIGN_TRANSACTION,
-      txRaw: txBase64,
-    }, { root: true }),
+    signTransaction: async (_, { txBase64 }) => {
+      const { openModal } = useModals();
+      openModal(MODAL_AIR_GAP_SIGN_TRANSACTION, { txRaw: txBase64 });
+    },
 
     async signTransactionFromAccount({ dispatch }, { txBase64 }) {
       return dispatch('signTransaction', { txBase64 });