diff --git a/package.json b/package.json
index 4438274c3..fbc8deac8 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,9 @@
   },
   "main": "src/main.ts",
   "dependencies": {
+    "@formatjs/intl-displaynames": "^3.3.4",
     "@linusborg/vue-simple-portal": "^0.1.4",
-    "@nimiq/hub-api": "^1.2.0",
+    "@nimiq/hub-api": "^1.2.5",
     "@nimiq/iqons": "^1.5.2",
     "@nimiq/network-client": "^0.5.0",
     "@nimiq/style": "^0.8.2",
diff --git a/src/App.vue b/src/App.vue
index 40464a387..55da52fcb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -106,7 +106,7 @@ export default defineComponent({
     overflow: hidden; // To prevent horizontal scrollbars during panel sliding
 
     /* Default: >= 1500px */
-    --sidebar-width: 23rem;
+    --sidebar-width: 24rem;
     --account-column-width: 70rem;
     --address-column-width: 150rem;
 
diff --git a/src/components/AccountMenu.vue b/src/components/AccountMenu.vue
index c80f96cb4..019164a58 100644
--- a/src/components/AccountMenu.vue
+++ b/src/components/AccountMenu.vue
@@ -324,10 +324,9 @@ export default defineComponent({
 
 .menu .item {
     align-items: center;
-    line-height: 3.75rem;
+    line-height: 1.2;
     width: 100%;
-    padding: 0.625rem 1.25rem;
-    white-space: nowrap;
+    padding: 1.125rem 1.25rem;
     border-radius: 0.5rem;
     color: var(--text-70);
 
@@ -354,6 +353,7 @@ export default defineComponent({
 
 .menu .item .alert {
     margin-left: auto;
+    flex-shrink: 0;
     font-size: 2.5rem;
     color: var(--nimiq-orange);
 }
@@ -362,6 +362,7 @@ export default defineComponent({
     width: 2.75rem;
     height: 3rem;
     margin: -0.125rem 1rem -0.125rem 0;
+    flex-shrink: 0;
     opacity: 0.6;
 }
 
diff --git a/src/components/MobileActionBar.vue b/src/components/MobileActionBar.vue
index a3057b5a6..4bf2a714f 100644
--- a/src/components/MobileActionBar.vue
+++ b/src/components/MobileActionBar.vue
@@ -1,13 +1,13 @@
 <template>
     <div class="mobile-action-bar flex-row">
         <button class="receive nq-button-s flex-row" @click="$router.push('/receive')" @mousedown.prevent>
-            <ArrowRightSmallIcon />Receive
+            <ArrowRightSmallIcon />{{ $t('Receive') }}
         </button>
         <button class="send nq-button-pill light-blue flex-row"
             @click="$router.push('/send')" @mousedown.prevent
             :disabled="!activeAddressInfo || !activeAddressInfo.balance"
         >
-            <ArrowRightSmallIcon />Send
+            <ArrowRightSmallIcon />{{ $t('Send') }}
         </button>
         <button class="reset scan-qr" @click="$router.push('/scan')">
             <ScanQrCodeIcon/>
diff --git a/src/components/NetworkMap.vue b/src/components/NetworkMap.vue
index e1eee24f6..ed46ed5c1 100644
--- a/src/components/NetworkMap.vue
+++ b/src/components/NetworkMap.vue
@@ -30,8 +30,8 @@
                         </h3>
                         <p v-if="peer.locationData.country"
                            :class="{'self': peer.type === 0 /* SELF */, 'connected': peer.connected}">
-                            {{ peer.locationData.city ? `${peer.locationData.city},` : '' }}
-                            {{ peer.locationData.countryFull }}
+                            {{ getPeerCity(peer) ? `${getPeerCity(peer)},` : '' }}
+                            {{ getPeerCountry(peer) }}
                         </p>
                     </div>
                 </template>
@@ -41,11 +41,31 @@
 </template>
 
 <script lang="ts">
+import { shouldPolyfill as shouldPolyFillIntlDisplayNames } from '@formatjs/intl-displaynames/should-polyfill';
 import { defineComponent, onMounted, onUnmounted, ref, computed, watch } from '@vue/composition-api';
 import { Tooltip, HexagonIcon } from '@nimiq/vue-components';
 import { NetworkClient } from '@nimiq/network-client';
 import { getNetworkClient } from '../network';
-import NetworkMap, { NodeHexagon, WIDTH, HEIGHT, SCALING_FACTOR, NodeType } from '../lib/NetworkMap';
+import NetworkMap, { NodeHexagon, WIDTH, HEIGHT, SCALING_FACTOR, Node, NodeType } from '../lib/NetworkMap';
+import { useSettingsStore } from '../stores/Settings';
+
+type IntlDisplayNames = import('@formatjs/intl-displaynames').DisplayNames;
+type IntlDisplayNamesOptions = import('@formatjs/intl-displaynames').DisplayNamesOptions;
+// eslint-disable-next-line @typescript-eslint/no-namespace
+declare namespace Intl {
+    let DisplayNames: undefined | {
+        new (
+            locales?: string | string[],
+            options?: IntlDisplayNamesOptions,
+        ): IntlDisplayNames,
+
+        readonly polyfilled?: true,
+    };
+}
+
+const intlDisplayNamesReadyPromise = !Intl.DisplayNames?.polyfilled && shouldPolyFillIntlDisplayNames()
+    ? import('@formatjs/intl-displaynames/polyfill')
+    : Promise.resolve();
 
 export default defineComponent({
     setup(props, context) {
@@ -115,6 +135,40 @@ export default defineComponent({
         const ownXCoordinate = computed(() => ownNode.value ? ownNode.value.x : null);
         watch(ownXCoordinate, (x) => x !== null && context.emit('own-x-coordinate', (x / 2) * SCALING_FACTOR));
 
+        const { language } = useSettingsStore();
+        let i18nCountryName: IntlDisplayNames | null = null;
+
+        watch(language, async () => {
+            i18nCountryName = null;
+            // TODO polyfill can be removed in the future and i18nCountryName then changed to a non-async computed prop
+            await intlDisplayNamesReadyPromise;
+            if (Intl.DisplayNames!.polyfilled) {
+                // has to be imported after the polyfill is ready
+                await import(
+                    /* webpackChunkName: "country-names-[request]" */
+                    /* webpackInclude: /\/\w{2}\.js$/ */
+                    `@formatjs/intl-displaynames/locale-data/${language.value}`);
+            }
+            i18nCountryName = new Intl.DisplayNames!(language.value, { type: 'region' });
+        });
+
+        function getPeerCity(peer: Node) {
+            const fallbackCityName = peer.locationData.city;
+            const { i18nCityNames } = peer.locationData;
+            if (!i18nCityNames) return fallbackCityName;
+            // Try to find a translation for current language
+            const availableLanguage = i18nCityNames[language.value]
+                ? language.value
+                : Object.keys(i18nCityNames).find((locale) => locale.startsWith(language.value)); // accept zh-CH for zh
+            return availableLanguage ? i18nCityNames[availableLanguage] : fallbackCityName;
+        }
+
+        function getPeerCountry(peer: Node) {
+            return i18nCountryName && peer.locationData.country
+                ? i18nCountryName.of(peer.locationData.country)
+                : peer.locationData.country;
+        }
+
         return {
             $container,
             $network,
@@ -123,6 +177,8 @@ export default defineComponent({
             scale,
             width,
             height,
+            getPeerCity,
+            getPeerCountry,
         };
     },
     components: {
diff --git a/src/components/TestnetFaucet.vue b/src/components/TestnetFaucet.vue
index feae62248..c2bf1e8a2 100644
--- a/src/components/TestnetFaucet.vue
+++ b/src/components/TestnetFaucet.vue
@@ -34,13 +34,17 @@ type FaucetInfoResponse = {
 type FaucetTapResponse = {
     success: false,
     msg: string,
-    error: 'VAPTCHA_UNAVAILABLE'
+    error?: 'VAPTCHA_UNAVAILABLE'
         | 'INVALID_CAPTCHA'
         | 'INVALID_ADDRESS'
-        | 'RATE_LIMIT'
         | 'GEOBLOCKED'
         | 'OUT_OF_FUNDS'
         | 'TRANSACTION_FAILED',
+} | {
+    success: false,
+    msg: string,
+    error: 'RATE_LIMIT',
+    wait: number,
 } | {
     success: true,
     msg: string,
@@ -110,12 +114,32 @@ export default defineComponent({
                 }
 
                 loading.value = false;
-
-                if (result.error === 'TRANSACTION_FAILED') {
-                    // Reset button for user to try again
-                    unavailableMsg.value = context.root.$t('Faucet error - please try again');
-                } else {
-                    errorMsg.value = result.msg; // Disables button and shows the error message.
+                errorMsg.value = '';
+                unavailableMsg.value = '';
+
+                switch (result.error) {
+                    case 'RATE_LIMIT':
+                        errorMsg.value = context.root.$t(
+                            'You can receive more free NIM in {waitTime} hours.',
+                            { waitTime: Math.ceil(result.wait / 3600) },
+                        );
+                        break;
+                    case 'GEOBLOCKED':
+                        errorMsg.value = context.root.$t(
+                            'This service is currently not available in your region.',
+                        );
+                        break;
+                    case 'OUT_OF_FUNDS':
+                        errorMsg.value = context.root.$t('There are currently no free NIM available.');
+                        break;
+                    case 'TRANSACTION_FAILED':
+                        // Set unavailableMsg instead of errorMsg to keep button active for user to try again
+                        unavailableMsg.value = context.root.$t('Faucet error - please try again.');
+                        break;
+                    default:
+                        // 'INVALID_CAPTCHA', 'VAPTCHA_UNAVAILABLE', 'INVALID_ADDRESS' or unspecified errors should
+                        // not occur via this frontend, therefore no need to translate them.
+                        errorMsg.value = `${context.root.$t('Request failed')}: ${result.msg}`;
                 }
 
                 return false;
@@ -154,9 +178,12 @@ button {
 
 .unavailable,
 .error {
+    padding: 0 5rem;
     font-weight: 600;
+    text-align: center;
 
     svg {
+        display: inline-block;
         width: 2.5rem;
         height: 2.5rem;
         margin-right: 1rem;
diff --git a/src/components/TransactionList.vue b/src/components/TransactionList.vue
index 44a68be07..bd8a527e4 100644
--- a/src/components/TransactionList.vue
+++ b/src/components/TransactionList.vue
@@ -603,6 +603,7 @@ export default defineComponent({
     .nq-h1 {
         margin-top: 0;
         margin-bottom: 1.5rem;
+        text-align: center;
     }
 
     span {
diff --git a/src/components/TransactionListItem.vue b/src/components/TransactionListItem.vue
index 925c668cb..a98bea74b 100644
--- a/src/components/TransactionListItem.vue
+++ b/src/components/TransactionListItem.vue
@@ -73,6 +73,7 @@ import {
 import { AddressBook } from '@nimiq/utils';
 import { useAddressStore } from '../stores/Address';
 import { useFiatStore } from '../stores/Fiat';
+import { useSettingsStore } from '../stores/Settings';
 import { Transaction, TransactionState, useTransactionsStore } from '../stores/Transactions';
 import { twoDigit } from '../lib/NumberFormatting';
 import { parseData } from '../lib/DataFormatting';
@@ -154,10 +155,12 @@ export default defineComponent({
         });
 
         // Date
+        const { language } = useSettingsStore();
         const date = computed(() => props.transaction.timestamp && new Date(props.transaction.timestamp * 1000));
         const dateDay = computed(() => date.value && twoDigit(date.value.getDate()));
-        const MONTHS = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC'];
-        const dateMonth = computed(() => date.value && MONTHS[date.value.getMonth()]);
+        const monthFormatter = computed(() => new Intl.DateTimeFormat(language.value, { month: 'short' }));
+        const dateMonth = computed(() => date.value && monthFormatter.value
+            && monthFormatter.value.format(date.value as Date));
         const dateTime = computed(() => date.value
             && `${twoDigit(date.value.getHours())}:${twoDigit(date.value.getMinutes())}`);
 
@@ -238,6 +241,7 @@ svg {
         > .month {
             font-size: var(--small-label-size);
             letter-spacing: 0.0667em;
+            text-transform: uppercase;
         }
     }
 
diff --git a/src/components/layouts/AddressOverview.vue b/src/components/layouts/AddressOverview.vue
index 6da839c90..a81d13fff 100644
--- a/src/components/layouts/AddressOverview.vue
+++ b/src/components/layouts/AddressOverview.vue
@@ -416,6 +416,7 @@ export default defineComponent({
         font-size: var(--body-size);
         padding: 0.5rem;
         font-weight: 600;
+        word-break: keep-all;
         border-radius: 0.5rem;
         z-index: 1;
         pointer-events: none;
diff --git a/src/components/layouts/Settings.vue b/src/components/layouts/Settings.vue
index 59f19c859..07fa9bc97 100644
--- a/src/components/layouts/Settings.vue
+++ b/src/components/layouts/Settings.vue
@@ -19,7 +19,7 @@
                             {{ $t('Change your language setting.') }}
                         </p>
                     </div>
-                    <select id="language" name="language" @input="setLanguage($event.target.value)" disabled>
+                    <select id="language" name="language" @input="setLanguage($event.target.value)">
                         <option
                             v-for="lang in Languages" :key="lang.code"
                             :value="lang.code" :selected="language === lang.code"
diff --git a/src/components/layouts/Sidebar.vue b/src/components/layouts/Sidebar.vue
index 35dc3e1d8..02da77e07 100644
--- a/src/components/layouts/Sidebar.vue
+++ b/src/components/layouts/Sidebar.vue
@@ -242,7 +242,7 @@ export default defineComponent({
 }
 
 .trade-actions .nq-button-s {
-    margin: 0.5rem 1rem 1rem;
+    margin: 0.5rem .625rem 1rem;
     background: rgba(255, 255, 255, .1);
 
     &:active,
@@ -252,6 +252,10 @@ export default defineComponent({
     }
 }
 
+button > :first-child {
+    flex-shrink: 0;
+}
+
 .account-menu,
 .settings,
 .network {
diff --git a/src/components/modals/DisclaimerModal.vue b/src/components/modals/DisclaimerModal.vue
index a25a5986d..9d2a52f66 100644
--- a/src/components/modals/DisclaimerModal.vue
+++ b/src/components/modals/DisclaimerModal.vue
@@ -16,6 +16,10 @@
                 <!-- eslint-disable-next-line max-len -->
                 {{ $t('Nimiq is not responsible for any loss. Nimiq, wallet.nimiq.com, hub.nimiq.com & keyguard.nimiq.com, and some of the underlying libraries are under active development.') }}
             </p>
+            <p class="nq-text">
+                <!-- eslint-disable-next-line max-len -->
+                {{ $t('All translations are for information purposes only. The English text is the controlling version.') }}
+            </p>
         </PageBody>
     </Modal>
 </template>
diff --git a/src/components/modals/MigrationWelcomeModal.vue b/src/components/modals/MigrationWelcomeModal.vue
index 3491f0365..7b876385c 100644
--- a/src/components/modals/MigrationWelcomeModal.vue
+++ b/src/components/modals/MigrationWelcomeModal.vue
@@ -29,12 +29,16 @@
                     {{ $t('Handling multiple addresses is now convenient and easy – with one password and shared login'
                     + ' information.') }}
                 </p>
-                <p class="nq-text">
-                    <strong>{{ $t('Accounts') }}</strong> {{ $t('hold, manage and aggregate addresses.') }}
-                </p>
-                <p class="nq-text">
-                    <strong>{{ $t('Addresses') }}</strong> {{ $t('send and receive transactions.') }}
-                </p>
+                <i18n tag="p" path="{accounts} hold, manage and aggregate addresses." class="nq-text">
+                    <template #accounts>
+                        <strong>{{ $t('Accounts') }}</strong>
+                    </template>
+                </i18n>
+                <i18n tag="p" path="{addresses} send and receive transactions." class="nq-text">
+                    <template #addresses>
+                        <strong>{{ $t('Addresses') }}</strong>
+                    </template>
+                </i18n>
             </div>
             <div class="visual address-ring">
                 <img src="../../assets/slides/account-ring-half.svg" key="account-ring">
@@ -137,6 +141,7 @@ export default defineComponent({
         display: flex;
         flex-direction: row;
         justify-content: space-between;
+        align-items: center;
         overflow: hidden;
     }
 
@@ -168,11 +173,11 @@ export default defineComponent({
     .visual img {
         width: 100%;
         height: 100%;
-        margin-top: -1rem;
     }
 
     .visual.address-ring {
         width: 18rem;
+        height: 100%;
     }
 
     .visual.login-file {
@@ -185,6 +190,7 @@ export default defineComponent({
     .visual.account-menu {
         width: 18rem;
         height: 48rem;
+        align-self: flex-start;
     }
 
     .nq-button {
diff --git a/src/components/modals/ReceiveModal.vue b/src/components/modals/ReceiveModal.vue
index f0e9c6e85..befd6c62f 100644
--- a/src/components/modals/ReceiveModal.vue
+++ b/src/components/modals/ReceiveModal.vue
@@ -47,6 +47,7 @@
                 </div>
             </PageHeader>
             <PageBody class="flex-column link-overlay">
+                <div class="dynamic-spacer"></div>
                 <div class="inputs">
                     <div class="separator"></div>
                     <AmountInput v-model="amount" :maxFontSize="5"/>
@@ -54,6 +55,7 @@
                 </div>
                 <!-- <AmountInput v-model="amount" />
                 <labelInput v-model="message" placeholder="add a message" /> -->
+                <div class="dynamic-spacer"></div>
                 <QrCode
                     :data="requestLink"
                     :size="400"
@@ -226,68 +228,80 @@ export default defineComponent({
     }
 }
 
-.page-body.link-overlay {
-    justify-content: space-between;
-    align-items: center;
-    overflow: visible;
-
-    .inputs {
-        width: calc(100% + 4rem);
-        margin: -1rem -2rem 2rem;
-        position: relative;
+.link-overlay {
+    &.page-header {
+        padding: 4rem 3rem 2rem;
+    }
 
-        .separator:first-child {
-            height: 2px;
-            margin-bottom: 1.5rem;
-            box-shadow: inset 0 1.5px 0 var(--text-10);
-        }
+    &.page-body {
+        padding: 1rem 3rem 3rem;
+        justify-content: space-between;
+        align-items: center;
+        overflow: visible;
 
-        .separator:last-child {
-            height: 2px;
-            margin-top: 1.5rem;
-            box-shadow: inset 0 -1.5px 0 var(--text-10);
+        .dynamic-spacer {
+            flex-grow: 1;
+            max-height: 1rem;
         }
 
-        .amount-input {
-            font-size: 5rem;
+        .inputs {
+            width: calc(100% + 4rem);
+            margin: -1rem -2rem 4rem;
+            position: relative;
 
-            /deep/ .nim {
-                font-size: 0.5em;
-                margin-left: 0.5rem;
-                margin-right: calc(-1.9em - 0.5rem);
+            .separator:first-child {
+                height: 2px;
+                margin-bottom: 1.5rem;
+                box-shadow: inset 0 1.5px 0 var(--text-10);
             }
 
-            /deep/ .nq-input {
-                padding: 0;
+            .separator:last-child {
+                height: 2px;
+                margin-top: 1.5rem;
+                box-shadow: inset 0 -1.5px 0 var(--text-10);
             }
 
-            /deep/ .width-finder {
-                padding: 0 1rem;
+            .amount-input {
+                font-size: 5rem;
+
+                /deep/ .nim {
+                    font-size: 0.5em;
+                    margin-left: 0.5rem;
+                    margin-right: calc(-1.9em - 0.5rem);
+                }
+
+                /deep/ .nq-input {
+                    padding: 0;
+                }
+
+                /deep/ .width-finder {
+                    padding: 0 1rem;
+                }
             }
         }
-    }
-
-    .qr-code {
-        flex-shrink: 1;
-        // min-height: 0;
 
-        // The QrCode is rendered at 2x size and then scaled to half its size,
-        // to be sharp on retina displays:
-        // 2 x 200px = 400px
-        // But now we need to make it behave as half its size as well, that's
-        // why we use negative margins on all sides (100px = 200px / 2).
-        transform: scale(0.5);
-        margin: -100px;
-    }
+        .qr-code {
+            flex-shrink: 1;
+            // min-height: 0;
+
+            // The QrCode is rendered at 2x size and then scaled to half its size,
+            // to be sharp on retina displays:
+            // 2 x 200px = 400px
+            // But now we need to make it behave as half its size as well, that's
+            // why we use negative margins on all sides (100px = 200px / 2).
+            transform: scale(0.5);
+            margin: -100px;
+        }
 
-    .copyable {
-        flex-shrink: 0;
-        max-width: 100%;
-        word-wrap: break-word;
-        color: rgba(31, 35, 72, 0.5);
-        text-align: center;
-        font-size: var(--h2-size);
-        margin-top: 2rem;
+        .copyable {
+            flex-shrink: 0;
+            max-width: 100%;
+            word-wrap: break-word;
+            color: rgba(31, 35, 72, 0.5);
+            text-align: center;
+            font-size: var(--h2-size);
+            margin-top: 2rem;
+        }
     }
 }
 </style>
diff --git a/src/components/modals/SendModal.vue b/src/components/modals/SendModal.vue
index 166005e98..b8da3dcaf 100644
--- a/src/components/modals/SendModal.vue
+++ b/src/components/modals/SendModal.vue
@@ -223,6 +223,7 @@ import { useSettingsStore } from '../../stores/Settings';
 import { FiatCurrency, FIAT_CURRENCY_DENYLIST } from '../../lib/Constants';
 import { createCashlink, sendTransaction } from '../../hub';
 import { useWindowSize } from '../../composables/useWindowSize';
+import { i18n } from '../../i18n/i18n-setup';
 
 export enum RecipientType {
     CONTACT,
@@ -342,11 +343,22 @@ export default defineComponent({
         const amountMenuOpened = ref(false);
         const feeSelectionOpened = ref(false);
 
-        const feeOptions: SelectBar.SelectBarOption[] = [
-            { color: 'nq-light-blue-bg', text: 'free', value: 0, index: 0 },
-            { color: 'nq-green-bg', text: 'standard', value: 1, index: 1 },
-            { color: 'nq-gold-bg', text: 'express', value: 2, index: 2 },
-        ];
+        const feeOptions: SelectBar.SelectBarOption[] = [{
+            color: 'nq-light-blue-bg',
+            get text() { return i18n.t('free') as string; },
+            value: 0,
+            index: 0,
+        }, {
+            color: 'nq-green-bg',
+            get text() { return i18n.t('standard') as string; },
+            value: 1,
+            index: 1,
+        }, {
+            color: 'nq-gold-bg',
+            get text() { return i18n.t('express') as string; },
+            value: 2,
+            index: 2,
+        }];
 
         const activeCurrency = ref('nim');
         const fiatAmount = ref(0);
diff --git a/src/components/modals/TradeModal.vue b/src/components/modals/TradeModal.vue
index a3de76441..45f32493a 100644
--- a/src/components/modals/TradeModal.vue
+++ b/src/components/modals/TradeModal.vue
@@ -5,7 +5,7 @@
                 <header>
                     <h1 class="nq-h1">{{ $t('Get NIM and BTC') }}</h1>
                     <!-- eslint-disable-next-line max-len -->
-                    <i18n path="There are many options, use a credit card or trade crypto. You can find more exchanges on {link}"
+                    <i18n :path="'There are many options, use a credit card or trade\u00a0crypto. You can find more exchanges on {link}'"
                         tag="p" class="nq-text intro"
                     >
                         <template v-slot:link>
@@ -162,7 +162,7 @@ export default defineComponent({
 
     .intro {
         color: inherit;
-        max-width: 42.5rem;
+        max-width: 50rem;
         line-height: 1.4;
         margin-top: 1rem;
 
diff --git a/src/components/modals/TransactionModal.vue b/src/components/modals/TransactionModal.vue
index 41deefc0a..4a5597827 100644
--- a/src/components/modals/TransactionModal.vue
+++ b/src/components/modals/TransactionModal.vue
@@ -130,7 +130,7 @@
                         v-else-if="hubCashlink && hubCashlink.value"
                         class="nq-button-s manage-cashlink"
                         @click="manageCashlink(hubCashlink.address)"
-                        @mousedown.prevent>Show Link</button>
+                        @mousedown.prevent>{{ $t('Show Link') }}</button>
                 </div>
             </div>
 
@@ -148,7 +148,7 @@
                         value-mask/>
                     <div v-else-if="fiatValue === undefined" class="fiat-amount">&nbsp;</div>
                     <div v-else-if="fiatValue === constants.FIAT_PRICE_UNAVAILABLE" class="fiat-amount">
-                        Fiat value unavailable
+                        {{ $t('Fiat value unavailable') }}
                     </div>
                     <div v-else class="fiat-amount flex-row">
                         <Tooltip>
@@ -183,7 +183,11 @@
                 <span class="confirmations">
                     {{ $tc('{count} Confirmation | {count} Confirmations', confirmations) }}
                 </span>
-                <span v-if="transaction.fee" class="fee"><Amount :amount="transaction.fee"/> fee</span>
+                <i18n v-if="transaction.fee" class="fee" tag="span" path="{fee} fee">
+                    <template #fee>
+                        <Amount :amount="transaction.fee"/>
+                    </template>
+                </i18n>
 
                 <BlueLink
                     :href="`https://${env === ENV_MAIN ? '' : 'test.'}nimiq.watch/#${transaction.transactionHash}`"
diff --git a/src/components/modals/WelcomeModal.vue b/src/components/modals/WelcomeModal.vue
index 895afd56c..b037f1dc9 100644
--- a/src/components/modals/WelcomeModal.vue
+++ b/src/components/modals/WelcomeModal.vue
@@ -104,7 +104,7 @@
                 {{ $t('Skip for now') }}
                 <CaretRightSmallIcon/>
             </a>
-            <!-- <div v-if="page === 1" class="flex-row flags">
+            <div v-if="page === 1" class="flex-row flags">
                 <Tooltip v-for="lang in Languages" :key="lang.code"
                     preferredPosition="bottom"
                     :styles="{'white-space': 'nowrap', 'padding': '0.75rem 1.25rem'}"
@@ -114,7 +114,7 @@
                         class="flag" :class="{'active': settings$.language === lang.code}">
                     {{ lang.name }}
                 </Tooltip>
-            </div> -->
+            </div>
         </PageFooter>
     </Modal>
 </template>
@@ -200,6 +200,7 @@ export default defineComponent({
         display: flex;
         flex-direction: row;
         justify-content: space-between;
+        align-items: center;
         overflow: hidden;
     }
 
@@ -226,17 +227,16 @@ export default defineComponent({
 
     .visual img {
         width: 100%;
-        margin-top: -1rem;
     }
 
     .visual.nim-and-btc {
         width: 11.75rem;
+        height: 28rem;
         position: relative
     }
 
     .visual.browser-network {
         width: 13.75rem;
-        margin-top: -6rem;
     }
 
     .visual.login-file {
diff --git a/src/composables/useGeoIp.ts b/src/composables/useGeoIp.ts
index ea4fa3c16..007020e89 100644
--- a/src/composables/useGeoIp.ts
+++ b/src/composables/useGeoIp.ts
@@ -5,6 +5,7 @@ export type GeoIpResponse = {
     },
     country?: string,
     city?: string,
+    city_names?: { [language: string]: string },
 }
 
 const CACHE_MAX_SIZE = 1000;
diff --git a/src/i18n/de.po b/src/i18n/de.po
index fb13010e2..ea889c138 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -13,7 +13,15 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/components/modals/TransactionModal.vue:185
+#: src/components/modals/MigrationWelcomeModal.vue:32
+msgid "{accounts} hold, manage and aggregate addresses."
+msgstr "{accounts} halten und fassen Adressen zusammen."
+
+#: src/components/modals/MigrationWelcomeModal.vue:37
+msgid "{addresses} send and receive transactions."
+msgstr "{addresses} senden und empfangen Transaktionen."
+
+#: src/components/modals/TransactionModal.vue:184
 msgid "{count} Confirmation | {count} Confirmations"
 msgstr "{count} Bestätigung | {count} Bestätigungen"
 
@@ -26,11 +34,15 @@ msgstr "{count} Teilnehmer | {count} Teilnehmer"
 msgid "{count} pending Cashlink | {count} pending Cashlinks"
 msgstr "{count} offener Cashlink | {count} offene Cashlinks"
 
+#: src/components/modals/TransactionModal.vue:186
+msgid "{fee} fee"
+msgstr "{fee} Gebühr"
+
 #: src/components/modals/TradeModal.vue:29
 msgid "24/7 Chat & Phone Support"
 msgstr "24/7 Chat- & Telefonservice"
 
-#: src/components/layouts/Settings.vue:213
+#: src/components/layouts/Settings.vue:197
 msgid ""
 "A contact with the address \"{address}\", but a different name already exists.\n"
 "                            Do you want to replace it?"
@@ -38,7 +50,7 @@ msgstr ""
 "Ein Kontakt mit der Adresse \"{adress}\", aber ein anderer Name exisiert bereits.\n"
 "Willst du ihn überschreiben?"
 
-#: src/components/modals/MigrationWelcomeModal.vue:72
+#: src/components/modals/MigrationWelcomeModal.vue:76
 msgid ""
 "Account creation was massively improved. Give\n"
 "it a try and experience all new Nimiq features."
@@ -46,7 +58,7 @@ msgstr ""
 "Die Kontoerstellung wurde massiv verbessert. \n"
 "Probiere es direkt aus und erlebe was Nimiq alles neues kann."
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
+#: src/components/modals/MigrationWelcomeModal.vue:34
 msgid "Accounts"
 msgstr "Konten"
 
@@ -71,7 +83,7 @@ msgstr "Kontakt hinzufügen"
 msgid "Address unavailable?"
 msgstr "Adresse nicht bekannt?"
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
+#: src/components/modals/MigrationWelcomeModal.vue:39
 msgid "Addresses"
 msgstr "Adressen"
 
@@ -92,6 +104,14 @@ msgstr ""
 "Jetzt aktualisieren um alle neuen Funktionen nutzen zu können. Es dauert "
 "auch wirklich nur ein paar Sekunden!"
 
+#: src/components/modals/DisclaimerModal.vue:21
+msgid ""
+"All translations are for information purposes only. The English text is the "
+"controlling version."
+msgstr ""
+"Alle Übersetzungen dienen ausschließlich zu Informationszwecken. Die "
+"englische Originalversion ist rechtlich bindend."
+
 #: src/components/modals/DisclaimerModal.vue:7
 msgid "Always backup your Recovery Words, Password and Login Files."
 msgstr ""
@@ -100,17 +120,12 @@ msgstr ""
 
 #: src/components/modals/WelcomeModal.vue:41
 msgid "And {BTC}, the gold standard of crypto and a sound store of value."
-msgstr ""
-"Und {BTC}, der defacto Crypto-Goldstandard sowie eine solide Wertanlage."
+msgstr "Und {BTC}, den Crypto-Goldstandard."
 
 #: src/components/modals/TradeModal.vue:30
 msgid "Android and iOS App"
 msgstr "Android und iOS App"
 
-#: src/components/layouts/Settings.vue:130
-msgid "Automatic"
-msgstr ""
-
 #: src/components/layouts/Network.vue:14
 msgid "Back to addresses"
 msgstr "Zurück zu Adressen"
@@ -123,11 +138,11 @@ msgstr "Backup"
 msgid "Bitcoin"
 msgstr "Bitcoin"
 
-#: src/components/modals/TransactionModal.vue:182
+#: src/components/modals/TransactionModal.vue:181
 msgid "Block #{height}"
 msgstr "Block #{height}"
 
-#: src/components/modals/TransactionModal.vue:192
+#: src/components/modals/TransactionModal.vue:195
 msgid "Block explorer"
 msgstr "Block Explorer"
 
@@ -159,13 +174,13 @@ msgstr ""
 "Indem du eine Transaktionsgebühr hinzufügst, kannst du beeinflussen, wie "
 "schnell deine Transaktion verarbeitet wird."
 
-#: src/components/layouts/Settings.vue:193
+#: src/components/layouts/Settings.vue:177
 msgid "Cannot import contacts, wrong file format."
 msgstr "Kontakte können nicht importiert werden, falsches Datei-Format"
 
-#: src/components/modals/TransactionModal.vue:324
+#: src/components/modals/TransactionModal.vue:327
 #: src/components/TransactionList.vue:61
-#: src/components/TransactionListItem.vue:139
+#: src/components/TransactionListItem.vue:138
 msgid "Cashlink"
 msgstr "Cashlink"
 
@@ -206,7 +221,7 @@ msgstr "Zwischenspeicher löschen"
 #: src/components/LegacyAccountNotice.vue:28
 #: src/components/modals/WelcomeModal.vue:40
 msgid "Coming soon"
-msgstr "Bald verfügbar"
+msgstr "Bald"
 
 #: src/components/modals/TradeModal.vue:97
 msgid "Coming soon"
@@ -221,12 +236,12 @@ msgid ""
 "Connect directly to the Nimiq blockchain.\n"
 "Be independent from any middleman."
 msgstr ""
-"Verbinde dich direkt mit der Blockchain, komplett unabhängig von "
-"irgendwelchen Mittelsmännern."
+"Verbinde dich direkt mit der Blockchain,\n"
+"komplett unabhängig von Mittelsmännern."
 
 #: src/components/NetworkStats.vue:8
 msgid "Connected to"
-msgstr "Verbunden mit"
+msgstr "Verbunden"
 
 #: src/components/NetworkStats.vue:46
 msgid "connecting"
@@ -240,7 +255,7 @@ msgstr "Konsensus"
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/components/modals/MigrationWelcomeModal.vue:83
+#: src/components/modals/MigrationWelcomeModal.vue:87
 #: src/components/modals/WelcomeModal.vue:94
 msgid "Continue"
 msgstr "Weiter"
@@ -277,11 +292,7 @@ msgstr "Zahlungslink erstellen"
 msgid "Credit Card accepted"
 msgstr "Kreditkartenzahlung möglich"
 
-#: src/components/layouts/Settings.vue:121
-msgid "Currency Format"
-msgstr ""
-
-#: src/components/modals/TransactionModal.vue:168
+#: src/components/modals/TransactionModal.vue:167
 msgid "Current value"
 msgstr "Aktueller Wert"
 
@@ -289,7 +300,7 @@ msgstr "Aktueller Wert"
 msgid "Developer"
 msgstr "Entwickler"
 
-#: src/components/layouts/Settings.vue:140
+#: src/components/layouts/Settings.vue:124
 #: src/components/modals/DisclaimerModal.vue:5
 msgid "Disclaimer"
 msgstr "Haftungsausschluss"
@@ -300,13 +311,11 @@ msgstr "Fertig"
 
 #: src/components/modals/WelcomeModal.vue:81
 msgid "Download it and store it safely. Don’t share it – don’t lose it."
-msgstr ""
-"Lade sie herunter und bewahre sie sicher auf. Teile sie nicht mit anderen..."
-" und verliere sie nicht."
+msgstr "Lade sie runter und verwahre sie gut. "
 
 #: src/components/modals/WelcomeModal.vue:26
 msgid "Download your Login File"
-msgstr "Login-Datei herunterladen"
+msgstr "Login-Datei speichern"
 
 #: src/components/ContactBook.vue:43
 msgid "Edit contacts"
@@ -316,7 +325,7 @@ msgstr "Kontakte bearbeiten"
 msgid "Edit the amount of decimals visible for NIM values."
 msgstr "Wieviele Nachkommenstellen möchtest du für NIM sehen?"
 
-#: src/components/modals/SendModal.vue:482
+#: src/components/modals/SendModal.vue:494
 msgid "Edit transaction"
 msgstr "Transaktion bearbeiten"
 
@@ -336,27 +345,31 @@ msgstr "abgelaufen"
 msgid "Expired"
 msgstr "Abgelaufen"
 
+#: src/components/modals/SendModal.vue:358
+msgid "express"
+msgstr "express"
+
 #: src/components/modals/TransactionModal.vue:58
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: src/components/TestnetFaucet.vue:116
-msgid "Faucet error - please try again"
+#: src/components/TestnetFaucet.vue:137
+msgid "Faucet error - please try again."
 msgstr "Problem mit der Faucet, probiere es noch einmal."
 
-#: src/components/TestnetFaucet.vue:76
+#: src/components/TestnetFaucet.vue:80
 msgid "Faucet is empty"
 msgstr "Faucet ist leer"
 
-#: src/components/TestnetFaucet.vue:80
+#: src/components/TestnetFaucet.vue:84
 msgid "Faucet is not available from your location"
 msgstr "Die Faucet ist in deiner Region leider nicht verfügbar."
 
-#: src/components/TestnetFaucet.vue:87
+#: src/components/TestnetFaucet.vue:91
 msgid "Faucet unavailable"
 msgstr "Faucet nicht verfügbar"
 
-#: src/components/TestnetFaucet.vue:72
+#: src/components/TestnetFaucet.vue:76
 msgid "Faucet unavailable (wrong network)"
 msgstr "Faucet nicht verfügbar (falsches Netzwerk)"
 
@@ -368,11 +381,12 @@ msgstr "Gebühr"
 msgid "Fetching"
 msgstr "Lade"
 
+#: src/components/modals/TransactionModal.vue:151
 #: src/components/TransactionListItem.vue:52
 msgid "Fiat value unavailable"
 msgstr "Fiatwert nicht verfügbar"
 
-#: src/components/layouts/Settings.vue:199
+#: src/components/layouts/Settings.vue:183
 msgid "File contains no contacts."
 msgstr "Datei enthält keine Kontakte."
 
@@ -384,6 +398,10 @@ msgstr "Für Anfänger"
 msgid "forum thread"
 msgstr "Forumsbeitrag"
 
+#: src/components/modals/SendModal.vue:348
+msgid "free"
+msgstr "gratis"
+
 #: src/components/NetworkMap.vue:29
 msgid "Full Node"
 msgstr "Full Node"
@@ -415,7 +433,7 @@ msgstr "Feedback? Bugs?"
 msgid "Got it"
 msgstr "Alles klar"
 
-#: src/components/modals/MigrationWelcomeModal.vue:85
+#: src/components/modals/MigrationWelcomeModal.vue:89
 msgid "Got it!"
 msgstr "Alles klar!"
 
@@ -431,14 +449,10 @@ msgstr ""
 "Mit nur einem Passwort und einem Login ist es ist jetzt ganz einfach und "
 "bequem mehrere Addressen zu haben."
 
-#: src/components/modals/TransactionModal.vue:163
+#: src/components/modals/TransactionModal.vue:162
 msgid "Historic value"
 msgstr "Historischer Wert"
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
-msgid "hold, manage and aggregate addresses."
-msgstr "halten und fassen Adressen zusammen."
-
 #: src/components/modals/BetaNoticeModal.vue:18
 msgid ""
 "If you find a bug or have feedback, please share it in this {forum-thread}."
@@ -454,7 +468,7 @@ msgstr "Kontakte importieren"
 msgid "Import contacts that you exported from the Safe."
 msgstr "Importiere Kontakte, die du aus dem Safe exportiert hast."
 
-#: src/components/modals/MigrationWelcomeModal.vue:51
+#: src/components/modals/MigrationWelcomeModal.vue:55
 msgid ""
 "Import it to any browser and enter your password to use the same addresses."
 msgstr ""
@@ -463,7 +477,7 @@ msgstr ""
 
 #: src/components/modals/MigrationWelcomeModal.vue:12
 msgid "Improved Accessibility"
-msgstr "Verbesserte Barrierefreiheit"
+msgstr "Vereinfachter Login"
 
 #: src/components/modals/TradeModal.vue:110
 msgid "In cooperation with"
@@ -483,7 +497,7 @@ msgstr "Lade Freunde mit einem "
 
 #: src/components/modals/WelcomeModal.vue:67
 msgid "It is fast, safe and makes you truly independent."
-msgstr "Es ist schnell, sicher und macht dich wirklich unabhängig."
+msgstr "Sie ist schnell, sicher und macht dich unabhängig."
 
 #: src/components/layouts/Settings.vue:17
 msgid "Language"
@@ -494,7 +508,7 @@ msgstr "Sprache"
 msgid "Learn more"
 msgstr "Mehr erfahren"
 
-#: src/components/modals/MigrationWelcomeModal.vue:57
+#: src/components/modals/MigrationWelcomeModal.vue:61
 msgid "Learn more here"
 msgstr "Hier erfährst du mehr"
 
@@ -510,16 +524,13 @@ msgstr "Light Node"
 msgid "Load file"
 msgstr "Datei laden"
 
-#: src/components/layouts/Settings.vue:131
-msgid "Localized"
-msgstr ""
-
 #: src/components/modals/MigrationWelcomeModal.vue:14
 msgid ""
 "Log in on your devices with the new\n"
 "Nimiq Login Files."
 msgstr ""
-"Mit deiner Login-Datei kannst du dich auf all deinen Geräten anmelden."
+"Mit den neuen Nimiq Login-Dateien kannst du dich auf all deinen Geräten "
+"anmelden."
 
 #: src/components/AccountMenu.vue:53
 msgid "Logout"
@@ -591,7 +602,7 @@ msgstr "Keine"
 msgid "not sent"
 msgstr "nicht gesendet"
 
-#: src/components/layouts/Settings.vue:222
+#: src/components/layouts/Settings.vue:206
 msgid "OK! Contacts imported successfully."
 msgstr "OK! Deine Kontakte wurden erfolgreich importiert."
 
@@ -649,6 +660,7 @@ msgstr ""
 "Blockchain zu interagieren."
 
 #: src/components/layouts/AddressOverview.vue:89
+#: src/components/MobileActionBar.vue:4
 msgid "Receive"
 msgstr "Empfangen"
 
@@ -678,7 +690,7 @@ msgstr "Referenzwährung"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/components/TestnetFaucet.vue:124
+#: src/components/TestnetFaucet.vue:142 src/components/TestnetFaucet.vue:148
 msgid "Request failed"
 msgstr "Anfrage fehlgeschlagen"
 
@@ -687,7 +699,7 @@ msgid "Reset your wallet settings and reload data from the blockchain."
 msgstr ""
 "Setze deine Wallet-Einstellungen zurück und lade die Blockchain-Daten neu."
 
-#: src/components/modals/SendModal.vue:481
+#: src/components/modals/SendModal.vue:493
 msgid "Retry"
 msgstr "Erneut versuchen"
 
@@ -720,6 +732,7 @@ msgid "Search transactions by contact, address, etc."
 msgstr "Suche Transaktionen mittels Kontakt, Adresse, usw."
 
 #: src/components/layouts/AddressOverview.vue:86
+#: src/components/MobileActionBar.vue:10
 msgid "Send"
 msgstr "Senden"
 
@@ -738,10 +751,6 @@ msgstr ""
 "NIM ohne Mittelsmann versenden und empfangen, das ist wahre "
 "Dezentralisierung!"
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
-msgid "send and receive transactions."
-msgstr "Transaktionen versenden und empfangen."
-
 #: src/components/modals/SendModal.vue:11
 #: src/components/modals/SendModal.vue:151
 msgid "Send Transaction"
@@ -751,15 +760,15 @@ msgstr "Transaktion senden"
 msgid "Send, receive and hold BTC in your wallet."
 msgstr "Sende, empfange und verwahre BTC in deiner Wallet."
 
-#: src/components/modals/SendModal.vue:478
+#: src/components/modals/SendModal.vue:490
 msgid "Sending Transaction"
 msgstr "Transaktion wird versendet"
 
-#: src/components/modals/SendModal.vue:513
+#: src/components/modals/SendModal.vue:525
 msgid "Sent {nim} NIM"
 msgstr "{nim} NIM versendet"
 
-#: src/components/modals/SendModal.vue:509
+#: src/components/modals/SendModal.vue:521
 msgid "Sent {nim} NIM to {name}"
 msgstr "{nim} NIM an {name} versendet"
 
@@ -804,6 +813,10 @@ msgstr "Alle meine Adressen anzeigen"
 msgid "Show Decimals"
 msgstr "Nachkommastellen"
 
+#: src/components/modals/TransactionModal.vue:133
+msgid "Show Link"
+msgstr "Link anzeigen"
+
 #: src/components/layouts/AddressOverview.vue:104
 msgid "Signup"
 msgstr "Anmelden"
@@ -812,7 +825,7 @@ msgstr "Anmelden"
 msgid "Skip for now"
 msgstr "Erstmal überspringen"
 
-#: src/components/modals/SendModal.vue:524
+#: src/components/modals/SendModal.vue:536
 msgid "Something went wrong"
 msgstr "Etwas ging schief"
 
@@ -828,6 +841,10 @@ msgstr "Stake deine NIM für Zinsen und um das Netzwerk zu sichern."
 msgid "Staking"
 msgstr "Staking"
 
+#: src/components/modals/SendModal.vue:353
+msgid "standard"
+msgstr "Standard"
+
 #: src/components/modals/TradeModal.vue:104
 msgid "Starting with EU bank accounts in Q3 2020."
 msgstr "Los geht's in Q3 2020 mit SEPA Instant Konten."
@@ -836,10 +853,6 @@ msgstr "Los geht's in Q3 2020 mit SEPA Instant Konten."
 msgid "Store, send and receive NIM."
 msgstr "Verwahre, sende und empfange NIM."
 
-#: src/components/layouts/Settings.vue:123
-msgid "Switch between automatic and localized currency formatting."
-msgstr ""
-
 #: src/components/NetworkStats.vue:45
 msgid "syncing"
 msgstr "abgleichen"
@@ -860,7 +873,7 @@ msgstr ""
 "Die neuen und verbesserten Konten \n"
 "können mehrere Adressen haben."
 
-#: src/components/modals/MigrationWelcomeModal.vue:47
+#: src/components/modals/MigrationWelcomeModal.vue:51
 msgid ""
 "The new Login Files are an easy and convenient way to gain access to your "
 "account and its addresses."
@@ -871,8 +884,8 @@ msgstr ""
 #: src/components/modals/WelcomeModal.vue:61
 msgid "The Nimiq wallet is more than a web-wallet, it is a network node."
 msgstr ""
-"Die Nimiq Wallet ist mehr als nur eine Web-Wallet, sie ist direkt Teil des "
-"Nimiq-Netzwerkes mit einer eingebauten Light-Node."
+"Die Nimiq Wallet ist mehr als nur eine Web-Wallet: Sie ist als Light-Node "
+"direkter Teil des Nimiq-Netzwerks."
 
 #: src/components/modals/BetaNoticeModal.vue:16
 msgid ""
@@ -882,9 +895,13 @@ msgstr ""
 "Die Wallet ist noch Beta. Deine Guthaben sind sicher, aber es könnten noch "
 "kleine, optische Fehler auftreten."
 
+#: src/components/TestnetFaucet.vue:133
+msgid "There are currently no free NIM available."
+msgstr "Aktuell sind keine kostenlosen NIM mehr verfügbar."
+
 #: src/components/modals/TradeModal.vue:8
 msgid ""
-"There are many options, use a credit card or trade crypto. You can find more"
+"There are many options, use a credit card or trade crypto. You can find more"
 " exchanges on {link}"
 msgstr ""
 "Es gibt viele Möglichkeiten, benutze deine Kreditkarte oder tausche mit "
@@ -903,6 +920,10 @@ msgstr "Dies ist ein Legacy-Konto"
 msgid "This month"
 msgstr "Diesen Monat"
 
+#: src/components/TestnetFaucet.vue:128
+msgid "This service is currently not available in your region."
+msgstr "Dieser Service ist aktuell in deiner Region nicht verfügbar."
+
 #: src/components/AccountBalance.vue:4
 msgid "Total Balance"
 msgstr "Gesamtguthaben"
@@ -923,20 +944,18 @@ msgstr "Guthaben überweisen"
 msgid "Tweet your map!"
 msgstr "Teile deine Karte auf Twitter!"
 
-#: src/components/modals/TransactionModal.vue:325
-#: src/components/TransactionListItem.vue:140
+#: src/components/modals/TransactionModal.vue:328
+#: src/components/TransactionListItem.vue:139
 msgid "Unclaimed Cashlink"
 msgstr "Ungenutzter Cashlink"
 
 #: src/components/modals/WelcomeModal.vue:35
 msgid "Use {NIM}, the super performant and browser- based payment coin."
-msgstr ""
-"Verwende {NIM}, die super schnelle Bezahlwährung die direkt im Browser "
-"funktioniert."
+msgstr "Nutze {NIM}, die super schnelle Browser-Währung."
 
 #: src/components/modals/WelcomeModal.vue:84
 msgid "Use it to access your account from any device."
-msgstr "Benutze sie um dein Konto von anderen Geräten zu benutzen."
+msgstr "Nutze sie, um dich auf weiteren Geräten einzuloggen."
 
 #: src/components/modals/BetaNoticeModal.vue:13
 msgid ""
@@ -946,7 +965,7 @@ msgstr ""
 "Willkommen in der\n"
 "neuen Nimiq Wallet!"
 
-#: src/components/modals/MigrationWelcomeModal.vue:84
+#: src/components/modals/MigrationWelcomeModal.vue:88
 msgid "What else?"
 msgstr "Sonst noch was?"
 
@@ -962,6 +981,10 @@ msgstr "Du verbindest dich mit dem Nimiq Testnet."
 msgid "You are using a Legacy Account "
 msgstr "Du nutzt ein Legacy-Konto"
 
+#: src/components/TestnetFaucet.vue:122
+msgid "You can receive more free NIM in {waitTime} hours."
+msgstr "In {waitTime} Stunden kannst du erneut kostenlose NIM erhalten."
+
 #: src/components/TransactionList.vue:58
 msgid "You now own crypto!"
 msgstr "Du besitzt jetzt Krypto!"
@@ -974,7 +997,7 @@ msgstr "Du sendest {amount} NIM"
 msgid "Your account is not safe yet!"
 msgstr "Dein Konto ist noch nicht sicher!"
 
-#: src/components/modals/MigrationWelcomeModal.vue:68
+#: src/components/modals/MigrationWelcomeModal.vue:72
 msgid ""
 "Your accounts are now legacy accounts. Easily switch, edit and create "
 "accounts with the new account picker."
diff --git a/src/i18n/en.po b/src/i18n/en.po
index 5a2f67205..e5756749f 100644
--- a/src/i18n/en.po
+++ b/src/i18n/en.po
@@ -2,6 +2,14 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 
+#: src/components/modals/MigrationWelcomeModal.vue:32
+msgid "{accounts} hold, manage and aggregate addresses."
+msgstr ""
+
+#: src/components/modals/MigrationWelcomeModal.vue:37
+msgid "{addresses} send and receive transactions."
+msgstr ""
+
 #: src/components/modals/TransactionModal.vue:184
 msgid "{count} Confirmation | {count} Confirmations"
 msgstr ""
@@ -15,6 +23,10 @@ msgstr ""
 msgid "{count} pending Cashlink | {count} pending Cashlinks"
 msgstr ""
 
+#: src/components/modals/TransactionModal.vue:186
+msgid "{fee} fee"
+msgstr ""
+
 #: src/components/modals/TradeModal.vue:29
 msgid "24/7 Chat & Phone Support"
 msgstr ""
@@ -25,13 +37,13 @@ msgid ""
 "                            Do you want to replace it?"
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:72
+#: src/components/modals/MigrationWelcomeModal.vue:76
 msgid ""
 "Account creation was massively improved. Give\n"
 "it a try and experience all new Nimiq features."
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
+#: src/components/modals/MigrationWelcomeModal.vue:34
 msgid "Accounts"
 msgstr ""
 
@@ -56,7 +68,7 @@ msgstr ""
 msgid "Address unavailable?"
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
+#: src/components/modals/MigrationWelcomeModal.vue:39
 msgid "Addresses"
 msgstr ""
 
@@ -73,6 +85,10 @@ msgstr ""
 msgid "All new features are exclusive to new accounts. Upgrade now, it only takes seconds."
 msgstr ""
 
+#: src/components/modals/DisclaimerModal.vue:21
+msgid "All translations are for information purposes only. The English text is the controlling version."
+msgstr ""
+
 #: src/components/modals/DisclaimerModal.vue:7
 msgid "Always backup your Recovery Words, Password and Login Files."
 msgstr ""
@@ -101,7 +117,7 @@ msgstr ""
 msgid "Block #{height}"
 msgstr ""
 
-#: src/components/modals/TransactionModal.vue:191
+#: src/components/modals/TransactionModal.vue:195
 msgid "Block explorer"
 msgstr ""
 
@@ -133,7 +149,7 @@ msgstr ""
 msgid "Cannot import contacts, wrong file format."
 msgstr ""
 
-#: src/components/modals/TransactionModal.vue:323
+#: src/components/modals/TransactionModal.vue:327
 #: src/components/TransactionList.vue:61
 #: src/components/TransactionListItem.vue:138
 msgid "Cashlink"
@@ -208,7 +224,7 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:83
+#: src/components/modals/MigrationWelcomeModal.vue:87
 #: src/components/modals/WelcomeModal.vue:94
 msgid "Continue"
 msgstr ""
@@ -274,7 +290,7 @@ msgstr ""
 msgid "Edit the amount of decimals visible for NIM values."
 msgstr ""
 
-#: src/components/modals/SendModal.vue:482
+#: src/components/modals/SendModal.vue:494
 msgid "Edit transaction"
 msgstr ""
 
@@ -294,27 +310,31 @@ msgstr ""
 msgid "Expired"
 msgstr ""
 
+#: src/components/modals/SendModal.vue:358
+msgid "express"
+msgstr ""
+
 #: src/components/modals/TransactionModal.vue:58
 msgid "Failed"
 msgstr ""
 
-#: src/components/TestnetFaucet.vue:116
-msgid "Faucet error - please try again"
+#: src/components/TestnetFaucet.vue:137
+msgid "Faucet error - please try again."
 msgstr ""
 
-#: src/components/TestnetFaucet.vue:76
+#: src/components/TestnetFaucet.vue:80
 msgid "Faucet is empty"
 msgstr ""
 
-#: src/components/TestnetFaucet.vue:80
+#: src/components/TestnetFaucet.vue:84
 msgid "Faucet is not available from your location"
 msgstr ""
 
-#: src/components/TestnetFaucet.vue:87
+#: src/components/TestnetFaucet.vue:91
 msgid "Faucet unavailable"
 msgstr ""
 
-#: src/components/TestnetFaucet.vue:72
+#: src/components/TestnetFaucet.vue:76
 msgid "Faucet unavailable (wrong network)"
 msgstr ""
 
@@ -326,6 +346,7 @@ msgstr ""
 msgid "Fetching"
 msgstr ""
 
+#: src/components/modals/TransactionModal.vue:151
 #: src/components/TransactionListItem.vue:52
 msgid "Fiat value unavailable"
 msgstr ""
@@ -342,6 +363,10 @@ msgstr ""
 msgid "forum thread"
 msgstr ""
 
+#: src/components/modals/SendModal.vue:348
+msgid "free"
+msgstr ""
+
 #: src/components/NetworkMap.vue:29
 msgid "Full Node"
 msgstr ""
@@ -373,7 +398,7 @@ msgstr ""
 msgid "Got it"
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:85
+#: src/components/modals/MigrationWelcomeModal.vue:89
 msgid "Got it!"
 msgstr ""
 
@@ -389,10 +414,6 @@ msgstr ""
 msgid "Historic value"
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
-msgid "hold, manage and aggregate addresses."
-msgstr ""
-
 #: src/components/modals/BetaNoticeModal.vue:18
 msgid "If you find a bug or have feedback, please share it in this {forum-thread}."
 msgstr ""
@@ -405,7 +426,7 @@ msgstr ""
 msgid "Import contacts that you exported from the Safe."
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:51
+#: src/components/modals/MigrationWelcomeModal.vue:55
 msgid "Import it to any browser and enter your password to use the same addresses."
 msgstr ""
 
@@ -442,7 +463,7 @@ msgstr ""
 msgid "Learn more"
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:57
+#: src/components/modals/MigrationWelcomeModal.vue:61
 msgid "Learn more here"
 msgstr ""
 
@@ -565,6 +586,7 @@ msgid "Please note that wallet.nimiq.com, hub.nimiq.com & keyguard.nimiq.com are
 msgstr ""
 
 #: src/components/layouts/AddressOverview.vue:89
+#: src/components/MobileActionBar.vue:4
 msgid "Receive"
 msgstr ""
 
@@ -595,7 +617,8 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: src/components/TestnetFaucet.vue:124
+#: src/components/TestnetFaucet.vue:142
+#: src/components/TestnetFaucet.vue:148
 msgid "Request failed"
 msgstr ""
 
@@ -603,7 +626,7 @@ msgstr ""
 msgid "Reset your wallet settings and reload data from the blockchain."
 msgstr ""
 
-#: src/components/modals/SendModal.vue:481
+#: src/components/modals/SendModal.vue:493
 msgid "Retry"
 msgstr ""
 
@@ -634,6 +657,7 @@ msgid "Search transactions by contact, address, etc."
 msgstr ""
 
 #: src/components/layouts/AddressOverview.vue:86
+#: src/components/MobileActionBar.vue:10
 msgid "Send"
 msgstr ""
 
@@ -650,10 +674,6 @@ msgstr ""
 msgid "Send and receive NIM without a middleman and enjoy true decentralization."
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
-msgid "send and receive transactions."
-msgstr ""
-
 #: src/components/modals/SendModal.vue:11
 #: src/components/modals/SendModal.vue:151
 msgid "Send Transaction"
@@ -663,15 +683,15 @@ msgstr ""
 msgid "Send, receive and hold BTC in your wallet."
 msgstr ""
 
-#: src/components/modals/SendModal.vue:478
+#: src/components/modals/SendModal.vue:490
 msgid "Sending Transaction"
 msgstr ""
 
-#: src/components/modals/SendModal.vue:513
+#: src/components/modals/SendModal.vue:525
 msgid "Sent {nim} NIM"
 msgstr ""
 
-#: src/components/modals/SendModal.vue:509
+#: src/components/modals/SendModal.vue:521
 msgid "Sent {nim} NIM to {name}"
 msgstr ""
 
@@ -714,6 +734,10 @@ msgstr ""
 msgid "Show Decimals"
 msgstr ""
 
+#: src/components/modals/TransactionModal.vue:133
+msgid "Show Link"
+msgstr ""
+
 #: src/components/layouts/AddressOverview.vue:104
 msgid "Signup"
 msgstr ""
@@ -722,7 +746,7 @@ msgstr ""
 msgid "Skip for now"
 msgstr ""
 
-#: src/components/modals/SendModal.vue:524
+#: src/components/modals/SendModal.vue:536
 msgid "Something went wrong"
 msgstr ""
 
@@ -738,6 +762,10 @@ msgstr ""
 msgid "Staking"
 msgstr ""
 
+#: src/components/modals/SendModal.vue:353
+msgid "standard"
+msgstr ""
+
 #: src/components/modals/TradeModal.vue:104
 msgid "Starting with EU bank accounts in Q3 2020."
 msgstr ""
@@ -764,7 +792,7 @@ msgid ""
 "can have multiple addresses."
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:47
+#: src/components/modals/MigrationWelcomeModal.vue:51
 msgid "The new Login Files are an easy and convenient way to gain access to your account and its addresses."
 msgstr ""
 
@@ -776,8 +804,12 @@ msgstr ""
 msgid "The Wallet is still in Beta. Your funds are safe, there just might be some visual issues."
 msgstr ""
 
+#: src/components/TestnetFaucet.vue:133
+msgid "There are currently no free NIM available."
+msgstr ""
+
 #: src/components/modals/TradeModal.vue:8
-msgid "There are many options, use a credit card or trade crypto. You can find more exchanges on {link}"
+msgid "There are many options, use a credit card or trade crypto. You can find more exchanges on {link}"
 msgstr ""
 
 #: src/components/layouts/AccountOverview.vue:19
@@ -793,6 +825,10 @@ msgstr ""
 msgid "This month"
 msgstr ""
 
+#: src/components/TestnetFaucet.vue:128
+msgid "This service is currently not available in your region."
+msgstr ""
+
 #: src/components/AccountBalance.vue:4
 msgid "Total Balance"
 msgstr ""
@@ -813,7 +849,7 @@ msgstr ""
 msgid "Tweet your map!"
 msgstr ""
 
-#: src/components/modals/TransactionModal.vue:324
+#: src/components/modals/TransactionModal.vue:328
 #: src/components/TransactionListItem.vue:139
 msgid "Unclaimed Cashlink"
 msgstr ""
@@ -832,7 +868,7 @@ msgid ""
 "new Nimiq Wallet"
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:84
+#: src/components/modals/MigrationWelcomeModal.vue:88
 msgid "What else?"
 msgstr ""
 
@@ -848,6 +884,10 @@ msgstr ""
 msgid "You are using a Legacy Account "
 msgstr ""
 
+#: src/components/TestnetFaucet.vue:122
+msgid "You can receive more free NIM in {waitTime} hours."
+msgstr ""
+
 #: src/components/TransactionList.vue:58
 msgid "You now own crypto!"
 msgstr ""
@@ -860,7 +900,7 @@ msgstr ""
 msgid "Your account is not safe yet!"
 msgstr ""
 
-#: src/components/modals/MigrationWelcomeModal.vue:68
+#: src/components/modals/MigrationWelcomeModal.vue:72
 msgid "Your accounts are now legacy accounts. Easily switch, edit and create accounts with the new account picker."
 msgstr ""
 
diff --git a/src/i18n/es.po b/src/i18n/es.po
index 2cfb0d89a..4fffd3973 100644
--- a/src/i18n/es.po
+++ b/src/i18n/es.po
@@ -2,18 +2,26 @@
 # Translators:
 # Sören Schwert <hello@soerenschwert.de>, 2020
 # Matheo <matheo@nimiq.com>, 2020
-# Daniel, 2020
 # Ricardo Barquero Carranza <richy@nimiq.com>, 2020
+# Daniel, 2020
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Ricardo Barquero Carranza <richy@nimiq.com>, 2020\n"
+"Last-Translator: Daniel, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/nimiq-foundation/teams/107022/es/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/components/modals/TransactionModal.vue:185
+#: src/components/modals/MigrationWelcomeModal.vue:32
+msgid "{accounts} hold, manage and aggregate addresses."
+msgstr ""
+
+#: src/components/modals/MigrationWelcomeModal.vue:37
+msgid "{addresses} send and receive transactions."
+msgstr ""
+
+#: src/components/modals/TransactionModal.vue:184
 msgid "{count} Confirmation | {count} Confirmations"
 msgstr "{count} Confirmaciones | {count} Confirmaciones"
 
@@ -26,11 +34,15 @@ msgstr "{count} Pares | {count} Pares"
 msgid "{count} pending Cashlink | {count} pending Cashlinks"
 msgstr "{count} Cashlink en trámite | {count} Cashlinks en trámite"
 
+#: src/components/modals/TransactionModal.vue:186
+msgid "{fee} fee"
+msgstr ""
+
 #: src/components/modals/TradeModal.vue:29
 msgid "24/7 Chat & Phone Support"
 msgstr "24/7 Soporte Chat & Teléfono"
 
-#: src/components/layouts/Settings.vue:213
+#: src/components/layouts/Settings.vue:197
 msgid ""
 "A contact with the address \"{address}\", but a different name already exists.\n"
 "                            Do you want to replace it?"
@@ -38,7 +50,7 @@ msgstr ""
 "Ya existe un contacto con la dirección \"{address}\", pero con nombre distinto.\n"
 "                            Do you want to replace it?"
 
-#: src/components/modals/MigrationWelcomeModal.vue:72
+#: src/components/modals/MigrationWelcomeModal.vue:76
 msgid ""
 "Account creation was massively improved. Give\n"
 "it a try and experience all new Nimiq features."
@@ -46,7 +58,7 @@ msgstr ""
 "La creación de cuentas ha sido mejorada en sobremanera.\n"
 "Pruébala ahora y experimenta las nuevas características de Nimiq."
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
+#: src/components/modals/MigrationWelcomeModal.vue:34
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -71,7 +83,7 @@ msgstr "Agregar Contacto"
 msgid "Address unavailable?"
 msgstr "Dirección no disponible?"
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
+#: src/components/modals/MigrationWelcomeModal.vue:39
 msgid "Addresses"
 msgstr "Direcciones"
 
@@ -92,6 +104,12 @@ msgstr ""
 "Todas las nuevas características son exclusivas para nuevas cuentas. Mejora "
 "a la nueva versión ahora, solo toma unos segundos."
 
+#: src/components/modals/DisclaimerModal.vue:21
+msgid ""
+"All translations are for information purposes only. The English text is the "
+"controlling version."
+msgstr ""
+
 #: src/components/modals/DisclaimerModal.vue:7
 msgid "Always backup your Recovery Words, Password and Login Files."
 msgstr ""
@@ -107,10 +125,6 @@ msgstr ""
 msgid "Android and iOS App"
 msgstr "App de Android y iOS."
 
-#: src/components/layouts/Settings.vue:130
-msgid "Automatic"
-msgstr ""
-
 #: src/components/layouts/Network.vue:14
 msgid "Back to addresses"
 msgstr "Volver a las direcciones"
@@ -123,11 +137,11 @@ msgstr "Respaldar"
 msgid "Bitcoin"
 msgstr "Bitcoin"
 
-#: src/components/modals/TransactionModal.vue:182
+#: src/components/modals/TransactionModal.vue:181
 msgid "Block #{height}"
 msgstr "Bloque #{height}"
 
-#: src/components/modals/TransactionModal.vue:192
+#: src/components/modals/TransactionModal.vue:195
 msgid "Block explorer"
 msgstr "Explorador de Bloques"
 
@@ -159,13 +173,13 @@ msgstr ""
 "Al agregar una cuota a la transacción, puede influenciar que tan rápidamente"
 " será procesada."
 
-#: src/components/layouts/Settings.vue:193
+#: src/components/layouts/Settings.vue:177
 msgid "Cannot import contacts, wrong file format."
 msgstr "No se pueden importar los contactos, formato de archivos incorrecto."
 
-#: src/components/modals/TransactionModal.vue:324
+#: src/components/modals/TransactionModal.vue:327
 #: src/components/TransactionList.vue:61
-#: src/components/TransactionListItem.vue:139
+#: src/components/TransactionListItem.vue:138
 msgid "Cashlink"
 msgstr "Cashlink"
 
@@ -240,7 +254,7 @@ msgstr "Consenso"
 msgid "Contacts"
 msgstr "Contactos"
 
-#: src/components/modals/MigrationWelcomeModal.vue:83
+#: src/components/modals/MigrationWelcomeModal.vue:87
 #: src/components/modals/WelcomeModal.vue:94
 msgid "Continue"
 msgstr "Continuar"
@@ -277,11 +291,7 @@ msgstr "Crear un link de pago"
 msgid "Credit Card accepted"
 msgstr "Tarjeta de Crédito aceptada"
 
-#: src/components/layouts/Settings.vue:121
-msgid "Currency Format"
-msgstr ""
-
-#: src/components/modals/TransactionModal.vue:168
+#: src/components/modals/TransactionModal.vue:167
 msgid "Current value"
 msgstr "Valor actual"
 
@@ -289,7 +299,7 @@ msgstr "Valor actual"
 msgid "Developer"
 msgstr "Programador"
 
-#: src/components/layouts/Settings.vue:140
+#: src/components/layouts/Settings.vue:124
 #: src/components/modals/DisclaimerModal.vue:5
 msgid "Disclaimer"
 msgstr "Aviso legal"
@@ -314,7 +324,7 @@ msgstr "Editar contactos"
 msgid "Edit the amount of decimals visible for NIM values."
 msgstr "Editar la cantidad de decimales visibles para valores en NIM"
 
-#: src/components/modals/SendModal.vue:482
+#: src/components/modals/SendModal.vue:494
 msgid "Edit transaction"
 msgstr "Editar transacción"
 
@@ -334,27 +344,31 @@ msgstr "expirado"
 msgid "Expired"
 msgstr "Expirado"
 
+#: src/components/modals/SendModal.vue:358
+msgid "express"
+msgstr ""
+
 #: src/components/modals/TransactionModal.vue:58
 msgid "Failed"
 msgstr "Fallido"
 
-#: src/components/TestnetFaucet.vue:116
-msgid "Faucet error - please try again"
-msgstr "Error en aplicación grifo - por favor intente de nuevo"
+#: src/components/TestnetFaucet.vue:137
+msgid "Faucet error - please try again."
+msgstr ""
 
-#: src/components/TestnetFaucet.vue:76
+#: src/components/TestnetFaucet.vue:80
 msgid "Faucet is empty"
 msgstr "Aplicación grifo esta vacia"
 
-#: src/components/TestnetFaucet.vue:80
+#: src/components/TestnetFaucet.vue:84
 msgid "Faucet is not available from your location"
 msgstr "La aplicación grifo no esta disponible desde su ubicación"
 
-#: src/components/TestnetFaucet.vue:87
+#: src/components/TestnetFaucet.vue:91
 msgid "Faucet unavailable"
 msgstr "Aplicación grifo no disponible"
 
-#: src/components/TestnetFaucet.vue:72
+#: src/components/TestnetFaucet.vue:76
 msgid "Faucet unavailable (wrong network)"
 msgstr "Aplicación grifo no disponible (red errónea)"
 
@@ -366,11 +380,12 @@ msgstr "cuota"
 msgid "Fetching"
 msgstr "Recolectando"
 
+#: src/components/modals/TransactionModal.vue:151
 #: src/components/TransactionListItem.vue:52
 msgid "Fiat value unavailable"
 msgstr "Valor en moneda fiduciaria no disponible"
 
-#: src/components/layouts/Settings.vue:199
+#: src/components/layouts/Settings.vue:183
 msgid "File contains no contacts."
 msgstr "El archivo no contiene contactos."
 
@@ -382,6 +397,10 @@ msgstr "Para novatos"
 msgid "forum thread"
 msgstr "tema en el foro"
 
+#: src/components/modals/SendModal.vue:348
+msgid "free"
+msgstr ""
+
 #: src/components/NetworkMap.vue:29
 msgid "Full Node"
 msgstr "Nodo Completo"
@@ -413,7 +432,7 @@ msgstr "¿Quieres decirnos algo? ¿Encontraste un error?"
 msgid "Got it"
 msgstr "Lo tengo"
 
-#: src/components/modals/MigrationWelcomeModal.vue:85
+#: src/components/modals/MigrationWelcomeModal.vue:89
 msgid "Got it!"
 msgstr "¡Lo tengo!"
 
@@ -429,14 +448,10 @@ msgstr ""
 "Manejar múltiples direcciones es ahora fácil y conveniente – con una sola "
 "contraseña y información de sesión compartida."
 
-#: src/components/modals/TransactionModal.vue:163
+#: src/components/modals/TransactionModal.vue:162
 msgid "Historic value"
 msgstr "Valor histórico"
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
-msgid "hold, manage and aggregate addresses."
-msgstr "conservan, manejan y agreguan direcciones."
-
 #: src/components/modals/BetaNoticeModal.vue:18
 msgid ""
 "If you find a bug or have feedback, please share it in this {forum-thread}."
@@ -452,7 +467,7 @@ msgstr "Importar Contactos"
 msgid "Import contacts that you exported from the Safe."
 msgstr "Importe contactos que exporto de la Nimiq Safe"
 
-#: src/components/modals/MigrationWelcomeModal.vue:51
+#: src/components/modals/MigrationWelcomeModal.vue:55
 msgid ""
 "Import it to any browser and enter your password to use the same addresses."
 msgstr ""
@@ -492,7 +507,7 @@ msgstr "Idioma"
 msgid "Learn more"
 msgstr "Aprenda más"
 
-#: src/components/modals/MigrationWelcomeModal.vue:57
+#: src/components/modals/MigrationWelcomeModal.vue:61
 msgid "Learn more here"
 msgstr "Aprenda más aquí"
 
@@ -508,10 +523,6 @@ msgstr "Nodo Ligero"
 msgid "Load file"
 msgstr "Cargar archivo"
 
-#: src/components/layouts/Settings.vue:131
-msgid "Localized"
-msgstr ""
-
 #: src/components/modals/MigrationWelcomeModal.vue:14
 msgid ""
 "Log in on your devices with the new\n"
@@ -590,7 +601,7 @@ msgstr "Ninguna"
 msgid "not sent"
 msgstr "no enviado"
 
-#: src/components/layouts/Settings.vue:222
+#: src/components/layouts/Settings.vue:206
 msgid "OK! Contacts imported successfully."
 msgstr "¡OK! Los Contactos fueron importados exitosamente."
 
@@ -647,6 +658,7 @@ msgstr ""
 "almacenar y acceder a su información e interactuar con la cadena de bloques."
 
 #: src/components/layouts/AddressOverview.vue:89
+#: src/components/MobileActionBar.vue:4
 msgid "Receive"
 msgstr "Recibir"
 
@@ -676,7 +688,7 @@ msgstr "Moneda de referencia"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/components/TestnetFaucet.vue:124
+#: src/components/TestnetFaucet.vue:142 src/components/TestnetFaucet.vue:148
 msgid "Request failed"
 msgstr "Petición fallida"
 
@@ -686,7 +698,7 @@ msgstr ""
 "Reinicialice los ajustes de su billetera y recargue los datos de la cadena "
 "de bloques."
 
-#: src/components/modals/SendModal.vue:481
+#: src/components/modals/SendModal.vue:493
 msgid "Retry"
 msgstr "Intente de nuevo"
 
@@ -719,6 +731,7 @@ msgid "Search transactions by contact, address, etc."
 msgstr "Buscar transacciones por contacto, dirección, etc."
 
 #: src/components/layouts/AddressOverview.vue:86
+#: src/components/MobileActionBar.vue:10
 msgid "Send"
 msgstr "Enviar"
 
@@ -737,10 +750,6 @@ msgstr ""
 "Envíe y reciba NIM sin ningún intermediario y disfrute de verdadera "
 "descentralización."
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
-msgid "send and receive transactions."
-msgstr "envíe y reciba transacciones"
-
 #: src/components/modals/SendModal.vue:11
 #: src/components/modals/SendModal.vue:151
 msgid "Send Transaction"
@@ -750,15 +759,15 @@ msgstr "Enviar Transacción"
 msgid "Send, receive and hold BTC in your wallet."
 msgstr "Envíe, reciba y almacene BTC en su billetera."
 
-#: src/components/modals/SendModal.vue:478
+#: src/components/modals/SendModal.vue:490
 msgid "Sending Transaction"
 msgstr "Enviando Transacción"
 
-#: src/components/modals/SendModal.vue:513
+#: src/components/modals/SendModal.vue:525
 msgid "Sent {nim} NIM"
 msgstr "Se enviaron {nim} NIM"
 
-#: src/components/modals/SendModal.vue:509
+#: src/components/modals/SendModal.vue:521
 msgid "Sent {nim} NIM to {name}"
 msgstr "Se enviaron {nim} NIM a {name}"
 
@@ -803,6 +812,10 @@ msgstr "Mostrar todas mis cuentas"
 msgid "Show Decimals"
 msgstr "Mostrar Decimales"
 
+#: src/components/modals/TransactionModal.vue:133
+msgid "Show Link"
+msgstr "Mostrar Enlace"
+
 #: src/components/layouts/AddressOverview.vue:104
 msgid "Signup"
 msgstr "Regístrate"
@@ -811,7 +824,7 @@ msgstr "Regístrate"
 msgid "Skip for now"
 msgstr "Saltar por ahora"
 
-#: src/components/modals/SendModal.vue:524
+#: src/components/modals/SendModal.vue:536
 msgid "Something went wrong"
 msgstr "Algo ha salido mal"
 
@@ -829,6 +842,10 @@ msgstr ""
 msgid "Staking"
 msgstr "Participación"
 
+#: src/components/modals/SendModal.vue:353
+msgid "standard"
+msgstr ""
+
 #: src/components/modals/TradeModal.vue:104
 msgid "Starting with EU bank accounts in Q3 2020."
 msgstr "Comenzando con cuentas bancarias Europeas en Q3 2020."
@@ -837,10 +854,6 @@ msgstr "Comenzando con cuentas bancarias Europeas en Q3 2020."
 msgid "Store, send and receive NIM."
 msgstr "Almacene, envíe y reciba NIM."
 
-#: src/components/layouts/Settings.vue:123
-msgid "Switch between automatic and localized currency formatting."
-msgstr ""
-
 #: src/components/NetworkStats.vue:45
 msgid "syncing"
 msgstr "sincronizando"
@@ -861,7 +874,7 @@ msgstr ""
 "Las nuevas y mejoradas cuentas\n"
 "pueden tener múltiples direcciones."
 
-#: src/components/modals/MigrationWelcomeModal.vue:47
+#: src/components/modals/MigrationWelcomeModal.vue:51
 msgid ""
 "The new Login Files are an easy and convenient way to gain access to your "
 "account and its addresses."
@@ -882,9 +895,13 @@ msgstr ""
 "La billetera esta en Beta. Su fondos esta a salvo, debe tratarse solamente "
 "de algunos problemas visuales."
 
+#: src/components/TestnetFaucet.vue:133
+msgid "There are currently no free NIM available."
+msgstr ""
+
 #: src/components/modals/TradeModal.vue:8
 msgid ""
-"There are many options, use a credit card or trade crypto. You can find more"
+"There are many options, use a credit card or trade crypto. You can find more"
 " exchanges on {link}"
 msgstr ""
 "Existen muchas opciones, use una tarjeta de credito o intercambie sus "
@@ -903,6 +920,10 @@ msgstr "Esta es una Cuenta Versión Antigua"
 msgid "This month"
 msgstr "Este mes"
 
+#: src/components/TestnetFaucet.vue:128
+msgid "This service is currently not available in your region."
+msgstr ""
+
 #: src/components/AccountBalance.vue:4
 msgid "Total Balance"
 msgstr "Balance Total"
@@ -923,8 +944,8 @@ msgstr "Transferir fondos"
 msgid "Tweet your map!"
 msgstr "¡Twitea tu mapa!"
 
-#: src/components/modals/TransactionModal.vue:325
-#: src/components/TransactionListItem.vue:140
+#: src/components/modals/TransactionModal.vue:328
+#: src/components/TransactionListItem.vue:139
 msgid "Unclaimed Cashlink"
 msgstr "Cashlink no canjeado"
 
@@ -944,7 +965,7 @@ msgstr ""
 "¡Bienvenido a la\n"
 "nueva Billetera Nimiq!"
 
-#: src/components/modals/MigrationWelcomeModal.vue:84
+#: src/components/modals/MigrationWelcomeModal.vue:88
 msgid "What else?"
 msgstr "¿Qué más?"
 
@@ -960,6 +981,10 @@ msgstr "Te estas conectando a la Testnet Nimiq."
 msgid "You are using a Legacy Account "
 msgstr "Esta usando una Cuenta versión antigua "
 
+#: src/components/TestnetFaucet.vue:122
+msgid "You can receive more free NIM in {waitTime} hours."
+msgstr ""
+
 #: src/components/TransactionList.vue:58
 msgid "You now own crypto!"
 msgstr "¡Ahora posee criptomonedas!"
@@ -972,7 +997,7 @@ msgstr "Va a enviar {amount} NIM"
 msgid "Your account is not safe yet!"
 msgstr "¡Su cuenta no esta segura aún!"
 
-#: src/components/modals/MigrationWelcomeModal.vue:68
+#: src/components/modals/MigrationWelcomeModal.vue:72
 msgid ""
 "Your accounts are now legacy accounts. Easily switch, edit and create "
 "accounts with the new account picker."
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index 9e4fc2cdb..30fdea0fc 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -1,18 +1,26 @@
 # 
 # Translators:
 # Talleyrand <baptistekugener@wanadoo.fr>, 2020
-# Daniel, 2020
 # Matheo <matheo@nimiq.com>, 2020
+# Daniel, 2020
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Matheo <matheo@nimiq.com>, 2020\n"
+"Last-Translator: Daniel, 2020\n"
 "Language-Team: French (https://www.transifex.com/nimiq-foundation/teams/107022/fr/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/components/modals/TransactionModal.vue:185
+#: src/components/modals/MigrationWelcomeModal.vue:32
+msgid "{accounts} hold, manage and aggregate addresses."
+msgstr ""
+
+#: src/components/modals/MigrationWelcomeModal.vue:37
+msgid "{addresses} send and receive transactions."
+msgstr ""
+
+#: src/components/modals/TransactionModal.vue:184
 msgid "{count} Confirmation | {count} Confirmations"
 msgstr "{count} Confirmation | {count} Confirmations"
 
@@ -25,11 +33,15 @@ msgstr "{count} Pair | {count} Pairs"
 msgid "{count} pending Cashlink | {count} pending Cashlinks"
 msgstr "{count} Cashlink | {count} Cashlinks"
 
+#: src/components/modals/TransactionModal.vue:186
+msgid "{fee} fee"
+msgstr "{fee} frais"
+
 #: src/components/modals/TradeModal.vue:29
 msgid "24/7 Chat & Phone Support"
 msgstr "Support 24/7 par Chat & Téléphone"
 
-#: src/components/layouts/Settings.vue:213
+#: src/components/layouts/Settings.vue:197
 msgid ""
 "A contact with the address \"{address}\", but a different name already exists.\n"
 "                            Do you want to replace it?"
@@ -37,7 +49,7 @@ msgstr ""
 "Un contact avec l'adresse \"{address}\", mais un nom différent existe déjà.\n"
 "                            Voulez-vous le remplacer ?"
 
-#: src/components/modals/MigrationWelcomeModal.vue:72
+#: src/components/modals/MigrationWelcomeModal.vue:76
 msgid ""
 "Account creation was massively improved. Give\n"
 "it a try and experience all new Nimiq features."
@@ -45,7 +57,7 @@ msgstr ""
 "La création de compte a été fortement améliorée. \n"
 "Essayez-la et tester les nouvelles fonctionnalités Nimiq."
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
+#: src/components/modals/MigrationWelcomeModal.vue:34
 msgid "Accounts"
 msgstr "Comptes"
 
@@ -70,7 +82,7 @@ msgstr "Ajouter un contact"
 msgid "Address unavailable?"
 msgstr "Adresse indisponible ?"
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
+#: src/components/modals/MigrationWelcomeModal.vue:39
 msgid "Addresses"
 msgstr "Adresses"
 
@@ -91,6 +103,14 @@ msgstr ""
 "Les nouvelles fonctionnalités sont exclusives aux comptes multi-adresses. "
 "Essayez-les, cela ne prend que quelques secondes."
 
+#: src/components/modals/DisclaimerModal.vue:21
+msgid ""
+"All translations are for information purposes only. The English text is the "
+"controlling version."
+msgstr ""
+"Toutes les traductions sont à titre informatif uniquement. Le texte anglais "
+"est la version de contrôle."
+
 #: src/components/modals/DisclaimerModal.vue:7
 msgid "Always backup your Recovery Words, Password and Login Files."
 msgstr ""
@@ -105,10 +125,6 @@ msgstr "Et {BTC}, l'étalon-or de la crypto et une bonne réserve de valeur."
 msgid "Android and iOS App"
 msgstr "Application Android et IOS"
 
-#: src/components/layouts/Settings.vue:130
-msgid "Automatic"
-msgstr ""
-
 #: src/components/layouts/Network.vue:14
 msgid "Back to addresses"
 msgstr "Retour aux adresses"
@@ -121,11 +137,11 @@ msgstr "Sauvegarder"
 msgid "Bitcoin"
 msgstr "Bitcoin"
 
-#: src/components/modals/TransactionModal.vue:182
+#: src/components/modals/TransactionModal.vue:181
 msgid "Block #{height}"
 msgstr "Bloc #{height}"
 
-#: src/components/modals/TransactionModal.vue:192
+#: src/components/modals/TransactionModal.vue:195
 msgid "Block explorer"
 msgstr "Explorateur de blocs"
 
@@ -157,13 +173,13 @@ msgstr ""
 "Ajouter des frais peut augmenter la rapidité de traitement de votre "
 "transaction."
 
-#: src/components/layouts/Settings.vue:193
+#: src/components/layouts/Settings.vue:177
 msgid "Cannot import contacts, wrong file format."
 msgstr "Impossible d'importer des contacts, format de fichier incorrect."
 
-#: src/components/modals/TransactionModal.vue:324
+#: src/components/modals/TransactionModal.vue:327
 #: src/components/TransactionList.vue:61
-#: src/components/TransactionListItem.vue:139
+#: src/components/TransactionListItem.vue:138
 msgid "Cashlink"
 msgstr "Cashlink"
 
@@ -238,7 +254,7 @@ msgstr "Consensus"
 msgid "Contacts"
 msgstr "Contacts"
 
-#: src/components/modals/MigrationWelcomeModal.vue:83
+#: src/components/modals/MigrationWelcomeModal.vue:87
 #: src/components/modals/WelcomeModal.vue:94
 msgid "Continue"
 msgstr "Continue"
@@ -275,11 +291,7 @@ msgstr "Créer lien de paiement"
 msgid "Credit Card accepted"
 msgstr "Carte de crédit acceptée"
 
-#: src/components/layouts/Settings.vue:121
-msgid "Currency Format"
-msgstr ""
-
-#: src/components/modals/TransactionModal.vue:168
+#: src/components/modals/TransactionModal.vue:167
 msgid "Current value"
 msgstr "Valeur actuelle"
 
@@ -287,7 +299,7 @@ msgstr "Valeur actuelle"
 msgid "Developer"
 msgstr "Développeur"
 
-#: src/components/layouts/Settings.vue:140
+#: src/components/layouts/Settings.vue:124
 #: src/components/modals/DisclaimerModal.vue:5
 msgid "Disclaimer"
 msgstr "Avertissement"
@@ -314,7 +326,7 @@ msgstr "Éditer les contacts"
 msgid "Edit the amount of decimals visible for NIM values."
 msgstr "Modifier le nombre de décimales visibles pour les valeurs NIM."
 
-#: src/components/modals/SendModal.vue:482
+#: src/components/modals/SendModal.vue:494
 msgid "Edit transaction"
 msgstr "Éditer la transaction"
 
@@ -334,27 +346,31 @@ msgstr "expiré"
 msgid "Expired"
 msgstr "Expiré"
 
+#: src/components/modals/SendModal.vue:358
+msgid "express"
+msgstr "express"
+
 #: src/components/modals/TransactionModal.vue:58
 msgid "Failed"
 msgstr "Échoué"
 
-#: src/components/TestnetFaucet.vue:116
-msgid "Faucet error - please try again"
-msgstr "Erreur du Faucet - veuillez réessayer"
+#: src/components/TestnetFaucet.vue:137
+msgid "Faucet error - please try again."
+msgstr "Erreur du Faucet - veuillez réessayer."
 
-#: src/components/TestnetFaucet.vue:76
+#: src/components/TestnetFaucet.vue:80
 msgid "Faucet is empty"
 msgstr "Le Faucet est vide"
 
-#: src/components/TestnetFaucet.vue:80
+#: src/components/TestnetFaucet.vue:84
 msgid "Faucet is not available from your location"
 msgstr "Faucet non disponible depuis votre localisation"
 
-#: src/components/TestnetFaucet.vue:87
+#: src/components/TestnetFaucet.vue:91
 msgid "Faucet unavailable"
 msgstr "Faucet indisponible"
 
-#: src/components/TestnetFaucet.vue:72
+#: src/components/TestnetFaucet.vue:76
 msgid "Faucet unavailable (wrong network)"
 msgstr "Faucet indisponible (mauvais réseau)"
 
@@ -366,11 +382,12 @@ msgstr "frais"
 msgid "Fetching"
 msgstr "Récupération"
 
+#: src/components/modals/TransactionModal.vue:151
 #: src/components/TransactionListItem.vue:52
 msgid "Fiat value unavailable"
 msgstr "Fiat value unavailable"
 
-#: src/components/layouts/Settings.vue:199
+#: src/components/layouts/Settings.vue:183
 msgid "File contains no contacts."
 msgstr "Le fichier ne contient aucun contact."
 
@@ -382,6 +399,10 @@ msgstr "Pour les débutants"
 msgid "forum thread"
 msgstr "fil de discussion du forum"
 
+#: src/components/modals/SendModal.vue:348
+msgid "free"
+msgstr "gratuit"
+
 #: src/components/NetworkMap.vue:29
 msgid "Full Node"
 msgstr "Noeud Complet"
@@ -413,7 +434,7 @@ msgstr "Vous avez des commentaires ? Ou trouvé un bug ?"
 msgid "Got it"
 msgstr "Compris"
 
-#: src/components/modals/MigrationWelcomeModal.vue:85
+#: src/components/modals/MigrationWelcomeModal.vue:89
 msgid "Got it!"
 msgstr "Compris !"
 
@@ -429,14 +450,10 @@ msgstr ""
 "Gérer plusieurs adresses est maintenant pratique et facile - avec un mot de "
 "passe et les informations de connexion partagées."
 
-#: src/components/modals/TransactionModal.vue:163
+#: src/components/modals/TransactionModal.vue:162
 msgid "Historic value"
 msgstr "Valeur historique"
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
-msgid "hold, manage and aggregate addresses."
-msgstr "conserver, gérer et regrouper les adresses."
-
 #: src/components/modals/BetaNoticeModal.vue:18
 msgid ""
 "If you find a bug or have feedback, please share it in this {forum-thread}."
@@ -452,7 +469,7 @@ msgstr "Importer des contacts"
 msgid "Import contacts that you exported from the Safe."
 msgstr "Importer des contacts que vous avez exporté depuis le Safe."
 
-#: src/components/modals/MigrationWelcomeModal.vue:51
+#: src/components/modals/MigrationWelcomeModal.vue:55
 msgid ""
 "Import it to any browser and enter your password to use the same addresses."
 msgstr ""
@@ -492,7 +509,7 @@ msgstr "Langage"
 msgid "Learn more"
 msgstr "En apprendre plus"
 
-#: src/components/modals/MigrationWelcomeModal.vue:57
+#: src/components/modals/MigrationWelcomeModal.vue:61
 msgid "Learn more here"
 msgstr "En apprendre plus"
 
@@ -508,10 +525,6 @@ msgstr "Light Node"
 msgid "Load file"
 msgstr "Charger le fichier"
 
-#: src/components/layouts/Settings.vue:131
-msgid "Localized"
-msgstr ""
-
 #: src/components/modals/MigrationWelcomeModal.vue:14
 msgid ""
 "Log in on your devices with the new\n"
@@ -590,7 +603,7 @@ msgstr "Aucun"
 msgid "not sent"
 msgstr "non envoyée"
 
-#: src/components/layouts/Settings.vue:222
+#: src/components/layouts/Settings.vue:206
 msgid "OK! Contacts imported successfully."
 msgstr "OK ! Les contacts ont été importés avec succès."
 
@@ -647,6 +660,7 @@ msgstr ""
 "enregistrer et accéder à vos informations et d'interagir avec la blockchain."
 
 #: src/components/layouts/AddressOverview.vue:89
+#: src/components/MobileActionBar.vue:4
 msgid "Receive"
 msgstr "Recevoir"
 
@@ -676,7 +690,7 @@ msgstr "Devise de référence"
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/components/TestnetFaucet.vue:124
+#: src/components/TestnetFaucet.vue:142 src/components/TestnetFaucet.vue:148
 msgid "Request failed"
 msgstr "Requête échouée"
 
@@ -686,7 +700,7 @@ msgstr ""
 "Réinitialisez les paramètres de votre wallet et rechargez les données depuis"
 " la blockchain."
 
-#: src/components/modals/SendModal.vue:481
+#: src/components/modals/SendModal.vue:493
 msgid "Retry"
 msgstr "Réessayer"
 
@@ -719,6 +733,7 @@ msgid "Search transactions by contact, address, etc."
 msgstr "Rechercher des transactions via contacts, adresses, etc..."
 
 #: src/components/layouts/AddressOverview.vue:86
+#: src/components/MobileActionBar.vue:10
 msgid "Send"
 msgstr "Envoyer"
 
@@ -737,10 +752,6 @@ msgstr ""
 "Envoyez et recevez des NIM sans intermédiaire et profitez d'une véritable "
 "décentralisation."
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
-msgid "send and receive transactions."
-msgstr "envoyer et recevoir des transactions"
-
 #: src/components/modals/SendModal.vue:11
 #: src/components/modals/SendModal.vue:151
 msgid "Send Transaction"
@@ -750,15 +761,15 @@ msgstr "Envoyer la Transaction"
 msgid "Send, receive and hold BTC in your wallet."
 msgstr "Envoyez, recevez et stockez du BTC sur votre wallet."
 
-#: src/components/modals/SendModal.vue:478
+#: src/components/modals/SendModal.vue:490
 msgid "Sending Transaction"
 msgstr "Transaction en cours."
 
-#: src/components/modals/SendModal.vue:513
+#: src/components/modals/SendModal.vue:525
 msgid "Sent {nim} NIM"
 msgstr "{nim} NIM envoyés"
 
-#: src/components/modals/SendModal.vue:509
+#: src/components/modals/SendModal.vue:521
 msgid "Sent {nim} NIM to {name}"
 msgstr "{nim} NIM envoyés à {name}"
 
@@ -803,6 +814,10 @@ msgstr "Afficher toutes mes adresses"
 msgid "Show Decimals"
 msgstr "Afficher les décimales"
 
+#: src/components/modals/TransactionModal.vue:133
+msgid "Show Link"
+msgstr "Afficher le lien"
+
 #: src/components/layouts/AddressOverview.vue:104
 msgid "Signup"
 msgstr "S'inscrire"
@@ -811,7 +826,7 @@ msgstr "S'inscrire"
 msgid "Skip for now"
 msgstr "Ignorer pour l'instant"
 
-#: src/components/modals/SendModal.vue:524
+#: src/components/modals/SendModal.vue:536
 msgid "Something went wrong"
 msgstr "Quelque chose s'est mal passé"
 
@@ -827,6 +842,10 @@ msgstr "Utilisez vos fonds pour sécurisez le réseau et gagner du NIM."
 msgid "Staking"
 msgstr "Staking"
 
+#: src/components/modals/SendModal.vue:353
+msgid "standard"
+msgstr "standard"
+
 #: src/components/modals/TradeModal.vue:104
 msgid "Starting with EU bank accounts in Q3 2020."
 msgstr "En commençant avec les comptes bancaires EU dans le Q3 2020."
@@ -835,10 +854,6 @@ msgstr "En commençant avec les comptes bancaires EU dans le Q3 2020."
 msgid "Store, send and receive NIM."
 msgstr "Stockez, envoyez et recevez des NIM."
 
-#: src/components/layouts/Settings.vue:123
-msgid "Switch between automatic and localized currency formatting."
-msgstr ""
-
 #: src/components/NetworkStats.vue:45
 msgid "syncing"
 msgstr "synchronisation"
@@ -859,7 +874,7 @@ msgstr ""
 "Le nouveau type de compte\n"
 "peut posséder plusieurs adresses à la fois."
 
-#: src/components/modals/MigrationWelcomeModal.vue:47
+#: src/components/modals/MigrationWelcomeModal.vue:51
 msgid ""
 "The new Login Files are an easy and convenient way to gain access to your "
 "account and its addresses."
@@ -879,9 +894,13 @@ msgstr ""
 "Le wallet est encore en Beta. Vos fonds sont en sécurité, mais il se peut "
 "qu'il y ait des problèmes visuels."
 
+#: src/components/TestnetFaucet.vue:133
+msgid "There are currently no free NIM available."
+msgstr "Il n'y a actuellement aucun NIM gratuit disponible."
+
 #: src/components/modals/TradeModal.vue:8
 msgid ""
-"There are many options, use a credit card or trade crypto. You can find more"
+"There are many options, use a credit card or trade crypto. You can find more"
 " exchanges on {link}"
 msgstr ""
 "Il existe de nombreuses options, utilisez une carte de crédit ou échangez "
@@ -900,6 +919,10 @@ msgstr "Ceci est un ancien type de compte."
 msgid "This month"
 msgstr "Ce mois-ci"
 
+#: src/components/TestnetFaucet.vue:128
+msgid "This service is currently not available in your region."
+msgstr "Ce service n'est actuellement pas disponible dans votre région."
+
 #: src/components/AccountBalance.vue:4
 msgid "Total Balance"
 msgstr "Solde total"
@@ -920,8 +943,8 @@ msgstr "Transférer des fonds"
 msgid "Tweet your map!"
 msgstr "Tweetez votre carte !"
 
-#: src/components/modals/TransactionModal.vue:325
-#: src/components/TransactionListItem.vue:140
+#: src/components/modals/TransactionModal.vue:328
+#: src/components/TransactionListItem.vue:139
 msgid "Unclaimed Cashlink"
 msgstr "Cashlink non réclamé"
 
@@ -944,7 +967,7 @@ msgstr ""
 "Bienvenue dans le\n"
 "nouveau Wallet Nimiq"
 
-#: src/components/modals/MigrationWelcomeModal.vue:84
+#: src/components/modals/MigrationWelcomeModal.vue:88
 msgid "What else?"
 msgstr "Quoi d'autre ?"
 
@@ -960,6 +983,10 @@ msgstr "Vous êtes en train de vous connecter au Testnet Nimiq."
 msgid "You are using a Legacy Account "
 msgstr "Vous utilisez un ancien type de compte."
 
+#: src/components/TestnetFaucet.vue:122
+msgid "You can receive more free NIM in {waitTime} hours."
+msgstr "Vous pourrez recevoir plus de NIM gratuit dans {waitTime} heures."
+
 #: src/components/TransactionList.vue:58
 msgid "You now own crypto!"
 msgstr "Vous possédez maintenant de la crypto !"
@@ -972,7 +999,7 @@ msgstr "Vous enverrez {amount} NIM"
 msgid "Your account is not safe yet!"
 msgstr "Votre compte n'est pas encore sûr !"
 
-#: src/components/modals/MigrationWelcomeModal.vue:68
+#: src/components/modals/MigrationWelcomeModal.vue:72
 msgid ""
 "Your accounts are now legacy accounts. Easily switch, edit and create "
 "accounts with the new account picker."
diff --git a/src/i18n/i18n-setup.ts b/src/i18n/i18n-setup.ts
index 99bd1ccce..f2c4f2066 100644
--- a/src/i18n/i18n-setup.ts
+++ b/src/i18n/i18n-setup.ts
@@ -8,17 +8,17 @@ export const Languages = [{
     code: 'en',
     name: 'English',
 }, {
-    code: 'de',
-    name: 'Deutsch',
-}, {
-    code: 'fr',
-    name: 'Français',
-}, {
+//     code: 'de',
+//     name: 'Deutsch',
+// }, {
+//     code: 'fr',
+//     name: 'Français',
+// }, {
     code: 'zh',
     name: '简体中文',
-}, {
-    code: 'es',
-    name: 'Español',
+// }, {
+//     code: 'es',
+//     name: 'Español',
 // }, {
 //     code: 'ru',
 //     name: 'Русский',
@@ -70,11 +70,15 @@ export async function loadLanguage(lang: string): Promise<string> {
 }
 
 export function detectLanguage(): string {
-    return i18n.locale || DEFAULT_LANGUAGE; // FIXME: Remove when enabling i18n
     const langCookie = Cookie.getCookie('lang');
-    const langRaw = window.navigator.language;
-    const langParts = langRaw.split('-');
-    return langCookie || langParts[0];
+    const fallbackLang = window.navigator.language.split('-')[0];
+
+    let lang = langCookie || fallbackLang;
+    // If the language is not supported set it to the default one
+    if (!SUPPORTED_LANGUAGES.includes(lang)) {
+        lang = DEFAULT_LANGUAGE;
+    }
+    return lang;
 }
 
 // If the user changed the language in another window/tab then load and enable new language
diff --git a/src/i18n/ko.po b/src/i18n/ko.po
index 85659cb5d..efa820269 100644
--- a/src/i18n/ko.po
+++ b/src/i18n/ko.po
@@ -1,11 +1,11 @@
 # 
 # Translators:
-# Daniel, 2020
 # Kyungil Choi <hanpama@gmail.com>, 2020
+# Daniel, 2020
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Kyungil Choi <hanpama@gmail.com>, 2020\n"
+"Last-Translator: Daniel, 2020\n"
 "Language-Team: Korean (https://www.transifex.com/nimiq-foundation/teams/107022/ko/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language: ko\n"
@@ -24,6 +24,10 @@ msgstr "{count}개의 피어 | {count}개의 피어"
 msgid "{count} pending Cashlink | {count} pending Cashlinks"
 msgstr "{count}개의 처리 중인 캐시링크 | {count}개의 처리 중인 캐시링크"
 
+#: src/components/modals/TransactionModal.vue:187
+msgid "{fee} fee"
+msgstr ""
+
 #: src/components/modals/TradeModal.vue:29
 msgid "24/7 Chat & Phone Support"
 msgstr "24/7 채팅 & 전화 지원"
@@ -88,6 +92,12 @@ msgid ""
 "seconds."
 msgstr "모든 새 기능은 새로운 계정에만 제공됩니다. 지금 업그레이드 하세요. 몇 초면 됩니다."
 
+#: src/components/modals/DisclaimerModal.vue:21
+msgid ""
+"All translations are for information purposes only. The English text is the "
+"controlling version."
+msgstr ""
+
 #: src/components/modals/DisclaimerModal.vue:7
 msgid "Always backup your Recovery Words, Password and Login Files."
 msgstr "복구 단어, 비밀번호와 로그인 파일은 항상 백업하세요."
@@ -100,10 +110,6 @@ msgstr "그리고 {BTC}, 암호화폐의 금본위이자 가치의 견고한 저
 msgid "Android and iOS App"
 msgstr "안드로이드와 iOS 앱"
 
-#: src/components/layouts/Settings.vue:130
-msgid "Automatic"
-msgstr ""
-
 #: src/components/layouts/Network.vue:14
 msgid "Back to addresses"
 msgstr "주소로 돌아가기"
@@ -120,7 +126,7 @@ msgstr "비트코인"
 msgid "Block #{height}"
 msgstr "블록 #{height}"
 
-#: src/components/modals/TransactionModal.vue:192
+#: src/components/modals/TransactionModal.vue:196
 msgid "Block explorer"
 msgstr "블록 탐색기"
 
@@ -154,7 +160,7 @@ msgstr "거래 수수료를 추가하여, 거래가 처리되는 속도에 영
 msgid "Cannot import contacts, wrong file format."
 msgstr "파일 형식이 잘못되어 연락처를 불러올 수 없습니다."
 
-#: src/components/modals/TransactionModal.vue:324
+#: src/components/modals/TransactionModal.vue:328
 #: src/components/TransactionList.vue:61
 #: src/components/TransactionListItem.vue:139
 msgid "Cashlink"
@@ -270,6 +276,10 @@ msgstr "신용 카드 허용"
 msgid "Currency Format"
 msgstr ""
 
+#: src/components/layouts/Settings.vue:130
+msgid "Currency specific"
+msgstr ""
+
 #: src/components/modals/TransactionModal.vue:168
 msgid "Current value"
 msgstr "현재 가치"
@@ -303,7 +313,7 @@ msgstr "연락처 수정"
 msgid "Edit the amount of decimals visible for NIM values."
 msgstr "NIM 잔고에 표시할 소수점의 개수를 바꾸세요."
 
-#: src/components/modals/SendModal.vue:482
+#: src/components/modals/SendModal.vue:494
 msgid "Edit transaction"
 msgstr "거래 수정"
 
@@ -323,27 +333,31 @@ msgstr "만료"
 msgid "Expired"
 msgstr "만료"
 
+#: src/components/modals/SendModal.vue:358
+msgid "express"
+msgstr ""
+
 #: src/components/modals/TransactionModal.vue:58
 msgid "Failed"
 msgstr "실패"
 
-#: src/components/TestnetFaucet.vue:116
-msgid "Faucet error - please try again"
-msgstr "수도꼭지 오류 - 다시 시도해 주세요"
+#: src/components/TestnetFaucet.vue:137
+msgid "Faucet error - please try again."
+msgstr ""
 
-#: src/components/TestnetFaucet.vue:76
+#: src/components/TestnetFaucet.vue:80
 msgid "Faucet is empty"
 msgstr "수도꼭지가 비었습니다"
 
-#: src/components/TestnetFaucet.vue:80
+#: src/components/TestnetFaucet.vue:84
 msgid "Faucet is not available from your location"
 msgstr "현재 위치에서는 수도꼭지를 사용할 수 없습니다"
 
-#: src/components/TestnetFaucet.vue:87
+#: src/components/TestnetFaucet.vue:91
 msgid "Faucet unavailable"
 msgstr "수도꼭지 사용 불가"
 
-#: src/components/TestnetFaucet.vue:72
+#: src/components/TestnetFaucet.vue:76
 msgid "Faucet unavailable (wrong network)"
 msgstr "수도꼭지 사용 불가(잘못된 네트워크)"
 
@@ -355,6 +369,7 @@ msgstr "수수료"
 msgid "Fetching"
 msgstr "불러 오는 중"
 
+#: src/components/modals/TransactionModal.vue:151
 #: src/components/TransactionListItem.vue:52
 msgid "Fiat value unavailable"
 msgstr "명목화폐 값 사용 불가"
@@ -371,6 +386,10 @@ msgstr "초심자용"
 msgid "forum thread"
 msgstr "포럼 스레드"
 
+#: src/components/modals/SendModal.vue:348
+msgid "free"
+msgstr ""
+
 #: src/components/NetworkMap.vue:29
 msgid "Full Node"
 msgstr "완전 노드"
@@ -470,6 +489,10 @@ msgstr "빠르고 안전하며 진정한 독립성을 제공합니다."
 msgid "Language"
 msgstr "언어"
 
+#: src/components/layouts/Settings.vue:131
+msgid "Language specific"
+msgstr ""
+
 #: src/components/modals/NetworkInfoModal.vue:19
 #: src/components/modals/TradeModal.vue:107
 msgid "Learn more"
@@ -491,10 +514,6 @@ msgstr "경량 노드"
 msgid "Load file"
 msgstr "파일 불러오기"
 
-#: src/components/layouts/Settings.vue:131
-msgid "Localized"
-msgstr ""
-
 #: src/components/modals/MigrationWelcomeModal.vue:14
 msgid ""
 "Log in on your devices with the new\n"
@@ -625,6 +644,7 @@ msgstr ""
 "상호작용할 수 있도록만 합니다."
 
 #: src/components/layouts/AddressOverview.vue:89
+#: src/components/MobileActionBar.vue:4
 msgid "Receive"
 msgstr "받기"
 
@@ -654,7 +674,7 @@ msgstr "참조 통화"
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: src/components/TestnetFaucet.vue:124
+#: src/components/TestnetFaucet.vue:142 src/components/TestnetFaucet.vue:148
 msgid "Request failed"
 msgstr "요청 실패"
 
@@ -662,7 +682,7 @@ msgstr "요청 실패"
 msgid "Reset your wallet settings and reload data from the blockchain."
 msgstr "지갑 설정을 초기화하고 블록체인에서 데이터를 다시 가져옵니다."
 
-#: src/components/modals/SendModal.vue:481
+#: src/components/modals/SendModal.vue:493
 msgid "Retry"
 msgstr "재시도"
 
@@ -695,6 +715,7 @@ msgid "Search transactions by contact, address, etc."
 msgstr "연락처, 주소 등으로 검색"
 
 #: src/components/layouts/AddressOverview.vue:86
+#: src/components/MobileActionBar.vue:10
 msgid "Send"
 msgstr "보내기"
 
@@ -724,15 +745,15 @@ msgstr "거래 전송"
 msgid "Send, receive and hold BTC in your wallet."
 msgstr "당신의 지갑에서 BTC를 주고 받고 보관하세요."
 
-#: src/components/modals/SendModal.vue:478
+#: src/components/modals/SendModal.vue:490
 msgid "Sending Transaction"
 msgstr "거래 전송 중"
 
-#: src/components/modals/SendModal.vue:513
+#: src/components/modals/SendModal.vue:525
 msgid "Sent {nim} NIM"
 msgstr "{nim} NIM을 보냄"
 
-#: src/components/modals/SendModal.vue:509
+#: src/components/modals/SendModal.vue:521
 msgid "Sent {nim} NIM to {name}"
 msgstr "{nim}NIM을 {name}에게 보냄"
 
@@ -777,6 +798,10 @@ msgstr "내 주소 모두 표시"
 msgid "Show Decimals"
 msgstr "소수점 표시"
 
+#: src/components/modals/TransactionModal.vue:133
+msgid "Show Link"
+msgstr ""
+
 #: src/components/layouts/AddressOverview.vue:104
 msgid "Signup"
 msgstr "가입"
@@ -785,7 +810,7 @@ msgstr "가입"
 msgid "Skip for now"
 msgstr "지금은 넘어가기"
 
-#: src/components/modals/SendModal.vue:524
+#: src/components/modals/SendModal.vue:536
 msgid "Something went wrong"
 msgstr "문제가 발생했습니다"
 
@@ -801,6 +826,10 @@ msgstr "NIM 지분을 걸어 보상을 받고 네트워크를 지키세요."
 msgid "Staking"
 msgstr "지분 걸기"
 
+#: src/components/modals/SendModal.vue:353
+msgid "standard"
+msgstr ""
+
 #: src/components/modals/TradeModal.vue:104
 msgid "Starting with EU bank accounts in Q3 2020."
 msgstr "2020년 3분기에 유럽 은행 계좌와 시작합니다"
@@ -810,7 +839,7 @@ msgid "Store, send and receive NIM."
 msgstr "NIM을 보관하고 주고 받으세요."
 
 #: src/components/layouts/Settings.vue:123
-msgid "Switch between automatic and localized currency formatting."
+msgid "Switch between currency specific and language specific formatting."
 msgstr ""
 
 #: src/components/NetworkStats.vue:45
@@ -849,9 +878,13 @@ msgid ""
 "visual issues."
 msgstr "지갑은 아직 베타 단계입니다. 당신의 자산은 안전하지만 화면 상의 문제가 조금 있을 수도 있습니다."
 
+#: src/components/TestnetFaucet.vue:133
+msgid "There are currently no free NIM available."
+msgstr ""
+
 #: src/components/modals/TradeModal.vue:8
 msgid ""
-"There are many options, use a credit card or trade crypto. You can find more"
+"There are many options, use a credit card or trade crypto. You can find more"
 " exchanges on {link}"
 msgstr "여러 선택지가 있습니다. 신용 카드를 활용하거나 암호화폐를 거래하세요. {link}에서 거래소를 더 찾아볼 수 있습니다."
 
@@ -868,6 +901,10 @@ msgstr "본 계정은 구 계정입니다"
 msgid "This month"
 msgstr "이달"
 
+#: src/components/TestnetFaucet.vue:128
+msgid "This service is currently not available in your region."
+msgstr ""
+
 #: src/components/AccountBalance.vue:4
 msgid "Total Balance"
 msgstr "전체 잔고"
@@ -888,7 +925,7 @@ msgstr "자금 이체하기"
 msgid "Tweet your map!"
 msgstr "지도를 트윗하세요!"
 
-#: src/components/modals/TransactionModal.vue:325
+#: src/components/modals/TransactionModal.vue:329
 #: src/components/TransactionListItem.vue:140
 msgid "Unclaimed Cashlink"
 msgstr "미인수 캐시링크"
@@ -925,6 +962,10 @@ msgstr "당신은 Nimiq 테스트넷에 접속중입니다."
 msgid "You are using a Legacy Account "
 msgstr "구 계정을 사용중입니다"
 
+#: src/components/TestnetFaucet.vue:122
+msgid "You can receive more free NIM in {waitTime} hours."
+msgstr ""
+
 #: src/components/TransactionList.vue:58
 msgid "You now own crypto!"
 msgstr "당신은 이제 암호화폐를 가지고 있습니다!"
diff --git a/src/i18n/zh.po b/src/i18n/zh.po
index 4395cf8ea..f0a4f81dd 100644
--- a/src/i18n/zh.po
+++ b/src/i18n/zh.po
@@ -12,7 +12,15 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/components/modals/TransactionModal.vue:185
+#: src/components/modals/MigrationWelcomeModal.vue:32
+msgid "{accounts} hold, manage and aggregate addresses."
+msgstr "{accounts} 保存，管理和汇总地址。"
+
+#: src/components/modals/MigrationWelcomeModal.vue:37
+msgid "{addresses} send and receive transactions."
+msgstr "{addresss} 发送和接收交易。"
+
+#: src/components/modals/TransactionModal.vue:184
 msgid "{count} Confirmation | {count} Confirmations"
 msgstr "{count}个确认 | {count}个确认"
 
@@ -25,11 +33,15 @@ msgstr "{count}个端点 | {count}个端点"
 msgid "{count} pending Cashlink | {count} pending Cashlinks"
 msgstr "{count}个待处理现金链接 | {count}个待处理的现金链接"
 
+#: src/components/modals/TransactionModal.vue:186
+msgid "{fee} fee"
+msgstr "{fee} 费用"
+
 #: src/components/modals/TradeModal.vue:29
 msgid "24/7 Chat & Phone Support"
 msgstr "24/7文字和电话 支持"
 
-#: src/components/layouts/Settings.vue:213
+#: src/components/layouts/Settings.vue:197
 msgid ""
 "A contact with the address \"{address}\", but a different name already exists.\n"
 "                            Do you want to replace it?"
@@ -37,7 +49,7 @@ msgstr ""
 "此地址“ {address}”的联系人已经使用了其他名称。\n"
 "                            您要更换吗？"
 
-#: src/components/modals/MigrationWelcomeModal.vue:72
+#: src/components/modals/MigrationWelcomeModal.vue:76
 msgid ""
 "Account creation was massively improved. Give\n"
 "it a try and experience all new Nimiq features."
@@ -45,7 +57,7 @@ msgstr ""
 "帐户创建得到了极大的改善，\n"
 "尝试看看并体验Nimiq的所有新功能。"
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
+#: src/components/modals/MigrationWelcomeModal.vue:34
 msgid "Accounts"
 msgstr "账户"
 
@@ -70,7 +82,7 @@ msgstr "添加联络人"
 msgid "Address unavailable?"
 msgstr "地址无法使用？"
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
+#: src/components/modals/MigrationWelcomeModal.vue:39
 msgid "Addresses"
 msgstr "地址"
 
@@ -89,6 +101,12 @@ msgid ""
 "seconds."
 msgstr "所有新功能均为新帐户独有。立即升级，仅需几秒钟。"
 
+#: src/components/modals/DisclaimerModal.vue:21
+msgid ""
+"All translations are for information purposes only. The English text is the "
+"controlling version."
+msgstr "所有翻译仅供参考，以英文版本为主。"
+
 #: src/components/modals/DisclaimerModal.vue:7
 msgid "Always backup your Recovery Words, Password and Login Files."
 msgstr "请随时备份您的恢复字，密码和登录文件。"
@@ -101,10 +119,6 @@ msgstr "而{BTC}，则是加密技术的黄金标准和健全的价值存储。"
 msgid "Android and iOS App"
 msgstr "Android和iOS应用"
 
-#: src/components/layouts/Settings.vue:130
-msgid "Automatic"
-msgstr ""
-
 #: src/components/layouts/Network.vue:14
 msgid "Back to addresses"
 msgstr "返回地址"
@@ -117,11 +131,11 @@ msgstr "备份"
 msgid "Bitcoin"
 msgstr "比特币"
 
-#: src/components/modals/TransactionModal.vue:182
+#: src/components/modals/TransactionModal.vue:181
 msgid "Block #{height}"
 msgstr "区块＃{height}"
 
-#: src/components/modals/TransactionModal.vue:192
+#: src/components/modals/TransactionModal.vue:195
 msgid "Block explorer"
 msgstr "区块链链浏览器"
 
@@ -135,7 +149,7 @@ msgstr "浏览器"
 
 #: src/components/layouts/Sidebar.vue:31
 msgid "Buy & Sell"
-msgstr "买 & 卖"
+msgstr "买&卖"
 
 #: src/components/modals/TradeModal.vue:98
 msgid "Buy and sell with your wallet."
@@ -151,13 +165,13 @@ msgid ""
 "will be processed."
 msgstr "通过增加交易费用，您可以影响交易的处理速度"
 
-#: src/components/layouts/Settings.vue:193
+#: src/components/layouts/Settings.vue:177
 msgid "Cannot import contacts, wrong file format."
 msgstr "文件格式错误，无法导入联系人。"
 
-#: src/components/modals/TransactionModal.vue:324
+#: src/components/modals/TransactionModal.vue:327
 #: src/components/TransactionList.vue:61
-#: src/components/TransactionListItem.vue:139
+#: src/components/TransactionListItem.vue:138
 msgid "Cashlink"
 msgstr "现金链接"
 
@@ -232,7 +246,7 @@ msgstr "共识"
 msgid "Contacts"
 msgstr "联系信息"
 
-#: src/components/modals/MigrationWelcomeModal.vue:83
+#: src/components/modals/MigrationWelcomeModal.vue:87
 #: src/components/modals/WelcomeModal.vue:94
 msgid "Continue"
 msgstr "继续"
@@ -267,11 +281,7 @@ msgstr "创建付款链接"
 msgid "Credit Card accepted"
 msgstr "接受信用卡"
 
-#: src/components/layouts/Settings.vue:121
-msgid "Currency Format"
-msgstr ""
-
-#: src/components/modals/TransactionModal.vue:168
+#: src/components/modals/TransactionModal.vue:167
 msgid "Current value"
 msgstr "当前价值"
 
@@ -279,7 +289,7 @@ msgstr "当前价值"
 msgid "Developer"
 msgstr "开发者"
 
-#: src/components/layouts/Settings.vue:140
+#: src/components/layouts/Settings.vue:124
 #: src/components/modals/DisclaimerModal.vue:5
 msgid "Disclaimer"
 msgstr "免责声明"
@@ -304,7 +314,7 @@ msgstr "编辑联络人"
 msgid "Edit the amount of decimals visible for NIM values."
 msgstr "编辑NIM值可见的小数数量。"
 
-#: src/components/modals/SendModal.vue:482
+#: src/components/modals/SendModal.vue:494
 msgid "Edit transaction"
 msgstr "修改交易"
 
@@ -324,27 +334,31 @@ msgstr "已过期"
 msgid "Expired"
 msgstr "已过期"
 
+#: src/components/modals/SendModal.vue:358
+msgid "express"
+msgstr "快速"
+
 #: src/components/modals/TransactionModal.vue:58
 msgid "Failed"
 msgstr "失败"
 
-#: src/components/TestnetFaucet.vue:116
-msgid "Faucet error - please try again"
-msgstr "水龙头错误－请重试"
+#: src/components/TestnetFaucet.vue:137
+msgid "Faucet error - please try again."
+msgstr "水龙头错误——请再试一次。"
 
-#: src/components/TestnetFaucet.vue:76
+#: src/components/TestnetFaucet.vue:80
 msgid "Faucet is empty"
 msgstr "水龙头是空的"
 
-#: src/components/TestnetFaucet.vue:80
+#: src/components/TestnetFaucet.vue:84
 msgid "Faucet is not available from your location"
 msgstr "您所在的位置无法使用水龙头"
 
-#: src/components/TestnetFaucet.vue:87
+#: src/components/TestnetFaucet.vue:91
 msgid "Faucet unavailable"
 msgstr "水龙头无法使用"
 
-#: src/components/TestnetFaucet.vue:72
+#: src/components/TestnetFaucet.vue:76
 msgid "Faucet unavailable (wrong network)"
 msgstr "水龙头无法使用（网络错误）"
 
@@ -356,11 +370,12 @@ msgstr "费用"
 msgid "Fetching"
 msgstr "正在取得"
 
+#: src/components/modals/TransactionModal.vue:151
 #: src/components/TransactionListItem.vue:52
 msgid "Fiat value unavailable"
 msgstr "法币无法使用"
 
-#: src/components/layouts/Settings.vue:199
+#: src/components/layouts/Settings.vue:183
 msgid "File contains no contacts."
 msgstr "文件不包含任何联系人。"
 
@@ -372,6 +387,10 @@ msgstr "给初学者"
 msgid "forum thread"
 msgstr "论坛帖子"
 
+#: src/components/modals/SendModal.vue:348
+msgid "free"
+msgstr "免费"
+
 #: src/components/NetworkMap.vue:29
 msgid "Full Node"
 msgstr "完整节点"
@@ -403,13 +422,13 @@ msgstr "得到反馈了吗？发现错误了？"
 msgid "Got it"
 msgstr "已取得"
 
-#: src/components/modals/MigrationWelcomeModal.vue:85
+#: src/components/modals/MigrationWelcomeModal.vue:89
 msgid "Got it!"
 msgstr "已取得！"
 
 #: src/components/modals/WelcomeModal.vue:11
 msgid "Great, you’re here!"
-msgstr "太好了，您来了！"
+msgstr "很高兴在这里看到您！"
 
 #: src/components/modals/MigrationWelcomeModal.vue:29
 msgid ""
@@ -417,14 +436,10 @@ msgid ""
 "and shared login information."
 msgstr "现在使用一个密码和共享的登录信息，即可轻松便捷地处理多个地址。"
 
-#: src/components/modals/TransactionModal.vue:163
+#: src/components/modals/TransactionModal.vue:162
 msgid "Historic value"
 msgstr "历史价值"
 
-#: src/components/modals/MigrationWelcomeModal.vue:33
-msgid "hold, manage and aggregate addresses."
-msgstr "保存，管理和汇总地址。"
-
 #: src/components/modals/BetaNoticeModal.vue:18
 msgid ""
 "If you find a bug or have feedback, please share it in this {forum-thread}."
@@ -438,7 +453,7 @@ msgstr "导入联系人"
 msgid "Import contacts that you exported from the Safe."
 msgstr "导入从保险柜 (Safe) 中导出的联系人。"
 
-#: src/components/modals/MigrationWelcomeModal.vue:51
+#: src/components/modals/MigrationWelcomeModal.vue:55
 msgid ""
 "Import it to any browser and enter your password to use the same addresses."
 msgstr "导入到任意浏览器中，输入密码即可使用相同的地址。"
@@ -476,7 +491,7 @@ msgstr "语言"
 msgid "Learn more"
 msgstr "了解更多"
 
-#: src/components/modals/MigrationWelcomeModal.vue:57
+#: src/components/modals/MigrationWelcomeModal.vue:61
 msgid "Learn more here"
 msgstr "在这里了解更多"
 
@@ -492,10 +507,6 @@ msgstr "轻节点"
 msgid "Load file"
 msgstr "加载文件"
 
-#: src/components/layouts/Settings.vue:131
-msgid "Localized"
-msgstr ""
-
 #: src/components/modals/MigrationWelcomeModal.vue:14
 msgid ""
 "Log in on your devices with the new\n"
@@ -571,7 +582,7 @@ msgstr "无"
 msgid "not sent"
 msgstr "未发送"
 
-#: src/components/layouts/Settings.vue:222
+#: src/components/layouts/Settings.vue:206
 msgid "OK! Contacts imported successfully."
 msgstr "OK！ 联系人已成功导入。"
 
@@ -625,6 +636,7 @@ msgstr ""
 "Nimiq仅是让您通过浏览器，轻松地创建、保存和访问您的信息，并与区块链互动的桥梁。"
 
 #: src/components/layouts/AddressOverview.vue:89
+#: src/components/MobileActionBar.vue:4
 msgid "Receive"
 msgstr "接收"
 
@@ -654,7 +666,7 @@ msgstr "参考货币"
 msgid "Rename"
 msgstr "重新命名"
 
-#: src/components/TestnetFaucet.vue:124
+#: src/components/TestnetFaucet.vue:142 src/components/TestnetFaucet.vue:148
 msgid "Request failed"
 msgstr "请求失败"
 
@@ -662,7 +674,7 @@ msgstr "请求失败"
 msgid "Reset your wallet settings and reload data from the blockchain."
 msgstr "重置您的钱包设置并从区块链重新加载数据。"
 
-#: src/components/modals/SendModal.vue:481
+#: src/components/modals/SendModal.vue:493
 msgid "Retry"
 msgstr "重试"
 
@@ -695,6 +707,7 @@ msgid "Search transactions by contact, address, etc."
 msgstr "通过联系人，地址等搜索交易"
 
 #: src/components/layouts/AddressOverview.vue:86
+#: src/components/MobileActionBar.vue:10
 msgid "Send"
 msgstr "发送"
 
@@ -711,10 +724,6 @@ msgid ""
 "Send and receive NIM without a middleman and enjoy true decentralization."
 msgstr "在没有中间人的情况下发送和接收NIM，享受真正的去中心。"
 
-#: src/components/modals/MigrationWelcomeModal.vue:36
-msgid "send and receive transactions."
-msgstr "发送和接收交易"
-
 #: src/components/modals/SendModal.vue:11
 #: src/components/modals/SendModal.vue:151
 msgid "Send Transaction"
@@ -724,15 +733,15 @@ msgstr "发送交易"
 msgid "Send, receive and hold BTC in your wallet."
 msgstr "从您的钱包中发送、接收和持有BTC。"
 
-#: src/components/modals/SendModal.vue:478
+#: src/components/modals/SendModal.vue:490
 msgid "Sending Transaction"
 msgstr "正在发送交易"
 
-#: src/components/modals/SendModal.vue:513
+#: src/components/modals/SendModal.vue:525
 msgid "Sent {nim} NIM"
 msgstr "发送 {nim} NIM"
 
-#: src/components/modals/SendModal.vue:509
+#: src/components/modals/SendModal.vue:521
 msgid "Sent {nim} NIM to {name}"
 msgstr "发送 {nim} NIM 至 {name}"
 
@@ -777,6 +786,10 @@ msgstr "显示我所有的地址"
 msgid "Show Decimals"
 msgstr "显示小数"
 
+#: src/components/modals/TransactionModal.vue:133
+msgid "Show Link"
+msgstr "显示链接"
+
 #: src/components/layouts/AddressOverview.vue:104
 msgid "Signup"
 msgstr "注册"
@@ -785,7 +798,7 @@ msgstr "注册"
 msgid "Skip for now"
 msgstr "暂时跳过"
 
-#: src/components/modals/SendModal.vue:524
+#: src/components/modals/SendModal.vue:536
 msgid "Something went wrong"
 msgstr "出了些问题"
 
@@ -801,6 +814,10 @@ msgstr "质押NIM取得奖励，并确保网络安全。"
 msgid "Staking"
 msgstr "质押"
 
+#: src/components/modals/SendModal.vue:353
+msgid "standard"
+msgstr "标准"
+
 #: src/components/modals/TradeModal.vue:104
 msgid "Starting with EU bank accounts in Q3 2020."
 msgstr "将从2020年 第三季度 欧盟 银行 帐户开始"
@@ -809,10 +826,6 @@ msgstr "将从2020年 第三季度 欧盟 银行 帐户开始"
 msgid "Store, send and receive NIM."
 msgstr "存储、发送和接收NIM。"
 
-#: src/components/layouts/Settings.vue:123
-msgid "Switch between automatic and localized currency formatting."
-msgstr ""
-
 #: src/components/NetworkStats.vue:45
 msgid "syncing"
 msgstr "正在同步"
@@ -833,7 +846,7 @@ msgstr ""
 "新的和改进的账户\n"
 "可以持有多个地址"
 
-#: src/components/modals/MigrationWelcomeModal.vue:47
+#: src/components/modals/MigrationWelcomeModal.vue:51
 msgid ""
 "The new Login Files are an easy and convenient way to gain access to your "
 "account and its addresses."
@@ -849,9 +862,13 @@ msgid ""
 "visual issues."
 msgstr "钱包仍处于测试阶段。您的资金是安全的，只是视觉上可能有一些的问题。"
 
+#: src/components/TestnetFaucet.vue:133
+msgid "There are currently no free NIM available."
+msgstr "目前没有免费的NIM"
+
 #: src/components/modals/TradeModal.vue:8
 msgid ""
-"There are many options, use a credit card or trade crypto. You can find more"
+"There are many options, use a credit card or trade crypto. You can find more"
 " exchanges on {link}"
 msgstr "我们有多种选择，您可以使用信用卡或交易加密货币，也可以在 {link} 上找到更多的交易所。"
 
@@ -868,6 +885,10 @@ msgstr "这是一个传统账户（ Legacy Account）"
 msgid "This month"
 msgstr "本月份"
 
+#: src/components/TestnetFaucet.vue:128
+msgid "This service is currently not available in your region."
+msgstr "您所在的地区目前还没有提供这项服务"
+
 #: src/components/AccountBalance.vue:4
 msgid "Total Balance"
 msgstr "总余额"
@@ -888,8 +909,8 @@ msgstr "转移资金"
 msgid "Tweet your map!"
 msgstr "推特您的地图！"
 
-#: src/components/modals/TransactionModal.vue:325
-#: src/components/TransactionListItem.vue:140
+#: src/components/modals/TransactionModal.vue:328
+#: src/components/TransactionListItem.vue:139
 msgid "Unclaimed Cashlink"
 msgstr "未认领的现金链接"
 
@@ -909,7 +930,7 @@ msgstr ""
 "欢迎来到\n"
 "新的Nimiq钱包"
 
-#: src/components/modals/MigrationWelcomeModal.vue:84
+#: src/components/modals/MigrationWelcomeModal.vue:88
 msgid "What else?"
 msgstr "还有什么？"
 
@@ -925,6 +946,10 @@ msgstr "您正在连接到Nimiq测试网。"
 msgid "You are using a Legacy Account "
 msgstr "您正在使用传统账户"
 
+#: src/components/TestnetFaucet.vue:122
+msgid "You can receive more free NIM in {waitTime} hours."
+msgstr "您可以在{waitTime}小时内收到更多的免费NIM"
+
 #: src/components/TransactionList.vue:58
 msgid "You now own crypto!"
 msgstr "您现在拥有加密货币了！"
@@ -937,7 +962,7 @@ msgstr "您将发送 {amount} NIM"
 msgid "Your account is not safe yet!"
 msgstr "您的帐户还不安全！"
 
-#: src/components/modals/MigrationWelcomeModal.vue:68
+#: src/components/modals/MigrationWelcomeModal.vue:72
 msgid ""
 "Your accounts are now legacy accounts. Easily switch, edit and create "
 "accounts with the new account picker."
diff --git a/src/lib/CountryIsoNames.ts b/src/lib/CountryIsoNames.ts
deleted file mode 100644
index 6de507416..000000000
--- a/src/lib/CountryIsoNames.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-// TODO: Internationalization of country names?
-const COUNTRY_ISO_NAME: {[iso: string]: string} = {
-    AF: 'Afghanistan',
-    AX: 'Aland Islands',
-    AL: 'Albania',
-    DZ: 'Algeria',
-    AS: 'American Samoa',
-    AD: 'Andorra',
-    AO: 'Angola',
-    AI: 'Anguilla',
-    AQ: 'Antarctica',
-    AG: 'Antigua And Barbuda',
-    AR: 'Argentina',
-    AM: 'Armenia',
-    AW: 'Aruba',
-    AU: 'Australia',
-    AT: 'Austria',
-    AZ: 'Azerbaijan',
-    BS: 'Bahamas',
-    BH: 'Bahrain',
-    BD: 'Bangladesh',
-    BB: 'Barbados',
-    BY: 'Belarus',
-    BE: 'Belgium',
-    BZ: 'Belize',
-    BJ: 'Benin',
-    BM: 'Bermuda',
-    BT: 'Bhutan',
-    BO: 'Bolivia',
-    BA: 'Bosnia And Herzegovina',
-    BW: 'Botswana',
-    BV: 'Bouvet Island',
-    BR: 'Brazil',
-    IO: 'British Indian Ocean Territory',
-    BN: 'Brunei Darussalam',
-    BG: 'Bulgaria',
-    BF: 'Burkina Faso',
-    BI: 'Burundi',
-    KH: 'Cambodia',
-    CM: 'Cameroon',
-    CA: 'Canada',
-    CV: 'Cape Verde',
-    KY: 'Cayman Islands',
-    CF: 'Central African Republic',
-    TD: 'Chad',
-    CL: 'Chile',
-    CN: 'China',
-    CX: 'Christmas Island',
-    CC: 'Cocos (Keeling) Islands',
-    CO: 'Colombia',
-    KM: 'Comoros',
-    CG: 'Congo',
-    CD: 'Congo, Democratic Republic',
-    CK: 'Cook Islands',
-    CR: 'Costa Rica',
-    CI: 'Cote D\'Ivoire',
-    HR: 'Croatia',
-    CU: 'Cuba',
-    CY: 'Cyprus',
-    CZ: 'Czech Republic',
-    DK: 'Denmark',
-    DJ: 'Djibouti',
-    DM: 'Dominica',
-    DO: 'Dominican Republic',
-    EC: 'Ecuador',
-    EG: 'Egypt',
-    SV: 'El Salvador',
-    GQ: 'Equatorial Guinea',
-    ER: 'Eritrea',
-    EE: 'Estonia',
-    ET: 'Ethiopia',
-    FK: 'Falkland Islands (Malvinas)',
-    FO: 'Faroe Islands',
-    FJ: 'Fiji',
-    FI: 'Finland',
-    FR: 'France',
-    GF: 'French Guiana',
-    PF: 'French Polynesia',
-    TF: 'French Southern Territories',
-    GA: 'Gabon',
-    GM: 'Gambia',
-    GE: 'Georgia',
-    DE: 'Germany',
-    GH: 'Ghana',
-    GI: 'Gibraltar',
-    GR: 'Greece',
-    GL: 'Greenland',
-    GD: 'Grenada',
-    GP: 'Guadeloupe',
-    GU: 'Guam',
-    GT: 'Guatemala',
-    GG: 'Guernsey',
-    GN: 'Guinea',
-    GW: 'Guinea-Bissau',
-    GY: 'Guyana',
-    HT: 'Haiti',
-    HM: 'Heard Island & Mcdonald Islands',
-    VA: 'Holy See (Vatican City State)',
-    HN: 'Honduras',
-    HK: 'Hong Kong',
-    HU: 'Hungary',
-    IS: 'Iceland',
-    IN: 'India',
-    ID: 'Indonesia',
-    IR: 'Iran, Islamic Republic Of',
-    IQ: 'Iraq',
-    IE: 'Ireland',
-    IM: 'Isle Of Man',
-    IL: 'Israel',
-    IT: 'Italy',
-    JM: 'Jamaica',
-    JP: 'Japan',
-    JE: 'Jersey',
-    JO: 'Jordan',
-    KZ: 'Kazakhstan',
-    KE: 'Kenya',
-    KI: 'Kiribati',
-    KR: 'Korea',
-    KW: 'Kuwait',
-    KG: 'Kyrgyzstan',
-    LA: 'Lao People\'s Democratic Republic',
-    LV: 'Latvia',
-    LB: 'Lebanon',
-    LS: 'Lesotho',
-    LR: 'Liberia',
-    LY: 'Libyan Arab Jamahiriya',
-    LI: 'Liechtenstein',
-    LT: 'Lithuania',
-    LU: 'Luxembourg',
-    MO: 'Macao',
-    MK: 'Macedonia',
-    MG: 'Madagascar',
-    MW: 'Malawi',
-    MY: 'Malaysia',
-    MV: 'Maldives',
-    ML: 'Mali',
-    MT: 'Malta',
-    MH: 'Marshall Islands',
-    MQ: 'Martinique',
-    MR: 'Mauritania',
-    MU: 'Mauritius',
-    YT: 'Mayotte',
-    MX: 'Mexico',
-    FM: 'Micronesia, Federated States Of',
-    MD: 'Moldova',
-    MC: 'Monaco',
-    MN: 'Mongolia',
-    ME: 'Montenegro',
-    MS: 'Montserrat',
-    MA: 'Morocco',
-    MZ: 'Mozambique',
-    MM: 'Myanmar',
-    NA: 'Namibia',
-    NR: 'Nauru',
-    NP: 'Nepal',
-    NL: 'Netherlands',
-    AN: 'Netherlands Antilles',
-    NC: 'New Caledonia',
-    NZ: 'New Zealand',
-    NI: 'Nicaragua',
-    NE: 'Niger',
-    NG: 'Nigeria',
-    NU: 'Niue',
-    NF: 'Norfolk Island',
-    MP: 'Northern Mariana Islands',
-    NO: 'Norway',
-    OM: 'Oman',
-    PK: 'Pakistan',
-    PW: 'Palau',
-    PS: 'Palestinian Territory, Occupied',
-    PA: 'Panama',
-    PG: 'Papua New Guinea',
-    PY: 'Paraguay',
-    PE: 'Peru',
-    PH: 'Philippines',
-    PN: 'Pitcairn',
-    PL: 'Poland',
-    PT: 'Portugal',
-    PR: 'Puerto Rico',
-    QA: 'Qatar',
-    RE: 'Reunion',
-    RO: 'Romania',
-    RU: 'Russian Federation',
-    RW: 'Rwanda',
-    BL: 'Saint Barthelemy',
-    SH: 'Saint Helena',
-    KN: 'Saint Kitts And Nevis',
-    LC: 'Saint Lucia',
-    MF: 'Saint Martin',
-    PM: 'Saint Pierre And Miquelon',
-    VC: 'Saint Vincent And Grenadines',
-    WS: 'Samoa',
-    SM: 'San Marino',
-    ST: 'Sao Tome And Principe',
-    SA: 'Saudi Arabia',
-    SN: 'Senegal',
-    RS: 'Serbia',
-    SC: 'Seychelles',
-    SL: 'Sierra Leone',
-    SG: 'Singapore',
-    SK: 'Slovakia',
-    SI: 'Slovenia',
-    SB: 'Solomon Islands',
-    SO: 'Somalia',
-    ZA: 'South Africa',
-    GS: 'South Georgia And Sandwich Isl.',
-    ES: 'Spain',
-    LK: 'Sri Lanka',
-    SD: 'Sudan',
-    SR: 'Suriname',
-    SJ: 'Svalbard And Jan Mayen',
-    SZ: 'Swaziland',
-    SE: 'Sweden',
-    CH: 'Switzerland',
-    SY: 'Syrian Arab Republic',
-    TW: 'Taiwan',
-    TJ: 'Tajikistan',
-    TZ: 'Tanzania',
-    TH: 'Thailand',
-    TL: 'Timor-Leste',
-    TG: 'Togo',
-    TK: 'Tokelau',
-    TO: 'Tonga',
-    TT: 'Trinidad And Tobago',
-    TN: 'Tunisia',
-    TR: 'Turkey',
-    TM: 'Turkmenistan',
-    TC: 'Turks And Caicos Islands',
-    TV: 'Tuvalu',
-    UG: 'Uganda',
-    UA: 'Ukraine',
-    AE: 'United Arab Emirates',
-    GB: 'United Kingdom',
-    US: 'United States',
-    UM: 'United States Outlying Islands',
-    UY: 'Uruguay',
-    UZ: 'Uzbekistan',
-    VU: 'Vanuatu',
-    VE: 'Venezuela',
-    VN: 'Viet Nam',
-    VG: 'Virgin Islands, British',
-    VI: 'Virgin Islands, U.S.',
-    WF: 'Wallis And Futuna',
-    EH: 'Western Sahara',
-    YE: 'Yemen',
-    ZM: 'Zambia',
-    ZW: 'Zimbabwe',
-};
-
-export function countryIso2Name(iso?: string) {
-    if (!iso) return undefined;
-    return COUNTRY_ISO_NAME[iso];
-}
diff --git a/src/lib/NetworkMap.ts b/src/lib/NetworkMap.ts
index 59286d33e..004ac1071 100644
--- a/src/lib/NetworkMap.ts
+++ b/src/lib/NetworkMap.ts
@@ -2,7 +2,6 @@ import { PlainAddressInfo } from '@nimiq/network-client';
 import bitmap from '../data/NetworkBitMap';
 import { useGeoIp, GeoIpResponse } from '../composables/useGeoIp';
 import RobinsonProjection from './RobinsonProjection';
-import { countryIso2Name } from './CountryIsoNames';
 
 /** how long the tangent to the control point is in relation to the distance between the two points */
 const CURVINESS_FACTOR = .2;
@@ -64,13 +63,13 @@ export { NodeType };
 /**
  * the PlainAddressInfo returned from the network, augmented with its asociated hexagon
  */
-type Node = PlainAddressInfo & {
+export type Node = PlainAddressInfo & {
     hexagon: NodeHexagon,
     type: NodeType,
     locationData: {
         country?: string,
-        countryFull?: string,
         city?: string,
+        i18nCityNames?: { [language: string]: string },
     },
     host?: string,
 }
@@ -462,8 +461,8 @@ export default class NetworkMap {
                     hexagon: selfHexagon,
                     locationData: {
                         country: response.country,
-                        countryFull: countryIso2Name(response.country),
                         city: response.city,
+                        i18nCityNames: response.city_names,
                     },
                     type: NodeType.SELF,
                 });
@@ -533,11 +532,13 @@ export default class NetworkMap {
 
                         if (response.country) {
                             node.locationData.country = response.country;
-                            node.locationData.countryFull = countryIso2Name(response.country);
                         }
                         if (response.city) {
                             node.locationData.city = response.city;
                         }
+                        if (response.city_names) {
+                            node.locationData.i18nCityNames = response.city_names;
+                        }
 
                         hexagon.addNode(node);
                         this._nodes.set(nodeAddressInfo.peerId, node);
diff --git a/vue.config.js b/vue.config.js
index 16022581d..cca4c5ff3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -60,6 +60,24 @@ module.exports = {
                 },
             ]]);
 
+        config
+            .plugin('prefetch')
+            .tap(options => {
+                // Ignore rarely used files.
+                // Note that for production build, also the hash in the filename needs to be matched by the regexes.
+                const blacklist = options[0].fileBlacklist || [];
+                options[0].fileBlacklist = [
+                    ...blacklist,
+                    /\.map$/,
+                    /settings.*?\.(js|css)$/,
+                    /(migration-)?welcome-modal.*?\.(js|css)$/,
+                    /disclaimer-modal.*?\.(js|css)$/,
+                    /country-names-.+?\.js$/, // only needed for Intl.DisplayNames polyfill and only one of them needed
+                    /lang-[^-]+-po.*?\.js$/, // only one of them needed
+                ];
+                return options
+            });
+
         config.module
             .rule('eslint')
             .use('eslint-loader')
diff --git a/yarn.lock b/yarn.lock
index ee77a8eed..5a55e66f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -819,6 +819,23 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@formatjs/ecma402-abstract@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.0.3.tgz#26c77b2c33512f4c59dd03bbd1e10f5d400e0042"
+  integrity sha512-ZT5ZwqT9o+5pqDSI840s+CaAmUcyfA8KjbPrxUD2maCh99K5Iwu0L8tGmF20aZ6NAd8mBasrB999bV12kasQJA==
+  dependencies:
+    "@types/es-abstract" "^1.17.1"
+    es-abstract "^1.17.6"
+
+"@formatjs/intl-displaynames@^3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-3.3.4.tgz#d2ade514255536af793a896d06fb0b8a4f736514"
+  integrity sha512-Rxu7v78f+OYEB+cgLZb8JrfkQJpF8uQtEYmj1fuSBDMTkjqTEjLSZ1fMwuOws+HYVqKNkAf3+WYgP7BQ6fr6+g==
+  dependencies:
+    "@formatjs/ecma402-abstract" "^1.0.3"
+    "@types/es-abstract" "^1.17.1"
+    es-abstract "^1.17.6"
+
 "@fullhuman/postcss-purgecss@^1.3.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-1.3.0.tgz#d632900d818f4fcf4678e7326923fb838c3e03a7"
@@ -893,10 +910,10 @@
   resolved "https://registry.yarnpkg.com/@nimiq/core-web/-/core-web-1.5.4.tgz#647e3f018b5a3245f1feb028ca77155a89528cb4"
   integrity sha512-g08sY0afLC6u1zfWsS+vhNm90XpPU4bWI9k9qAiqicxXtF0sM+f7CyfXuUXRjeK6cEqeK3GLesygT4BM5kOhTQ==
 
-"@nimiq/hub-api@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@nimiq/hub-api/-/hub-api-1.2.0.tgz#ac505f7765fc6f374ebded7a0bfe0ab8f64f9530"
-  integrity sha512-G7XSjxV0SH4naJjGWWpQKTbjuuncu0mSYtwk33EGVDroWc0PhtxDOtoxi4DdA3jL9mrxuknRLOAGpsLIf7Y0iw==
+"@nimiq/hub-api@^1.2.5":
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@nimiq/hub-api/-/hub-api-1.2.5.tgz#b593a36f62d27b8a2ba607107b52f248a6ecab57"
+  integrity sha512-g3kWcpy6gPY6elrir+4ZW6N2bjC4OUwOUhJnIJ0HHJqxl0EVSdTb6Qj7lCRX9H4uyyjsNwB0ec0FUIH9k03bYQ==
   dependencies:
     "@nimiq/core-web" "^1.5.3"
     "@nimiq/rpc" "^0.4.0"
@@ -1038,6 +1055,18 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
+"@types/es-abstract@^1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@types/es-abstract/-/es-abstract-1.17.1.tgz#0bdb5585287f0736d58f910f193f24bdb7bec0de"
+  integrity sha512-EDbuWgrS1wq0y2qhw8Bll2F5d6iN1e3ULzfz6Tctu9Np135zdWOzb7NUuB5DzQoNLtCYw51Cp9pnRoqdn0dNXw==
+  dependencies:
+    "@types/es-to-primitive" "*"
+
+"@types/es-to-primitive@*":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/es-to-primitive/-/es-to-primitive-1.2.2.tgz#d669d2ed1c67414cfbd75c45925d78ce9e1da013"
+  integrity sha512-PVQF+wlxOaVKZ/XZfS55gfvkFQzRQYqwAkmf9fLNC4ww0VxY+/FUXFCNAkqY1QH7uAppNePWzWkmCryKBhXdHw==
+
 "@types/eslint-visitor-keys@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
@@ -3668,6 +3697,23 @@ es-abstract@^1.17.0-next.1:
     string.prototype.trimleft "^2.1.1"
     string.prototype.trimright "^2.1.1"
 
+es-abstract@^1.17.5, es-abstract@^1.17.6:
+  version "1.17.6"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
+  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.0"
+    is-regex "^1.1.0"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -5183,6 +5229,11 @@ is-callable@^1.1.4, is-callable@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
+is-callable@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
+  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
@@ -5359,6 +5410,13 @@ is-regex@^1.0.4, is-regex@^1.0.5:
   dependencies:
     has "^1.0.3"
 
+is-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+  dependencies:
+    has-symbols "^1.0.1"
+
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -8654,6 +8712,14 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string.prototype.trimend@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
 string.prototype.trimleft@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
@@ -8670,6 +8736,14 @@ string.prototype.trimright@^2.1.1:
     define-properties "^1.1.3"
     function-bind "^1.1.1"
 
+string.prototype.trimstart@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"