diff --git a/package.json b/package.json
index 071ee4262..affe77595 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^1.2.0",
-    "@soramitsu/soraneo-wallet-web": "1.6.37",
+    "@soramitsu/soraneo-wallet-web": "1.6.41",
     "@walletconnect/web3-provider": "^1.6.6",
     "core-js": "^3.6.4",
     "ethers": "^5.3.1",
diff --git a/src/components/App/Header/AppHeader.vue b/src/components/App/Header/AppHeader.vue
index eca63c8fc..a3c70cd2f 100644
--- a/src/components/App/Header/AppHeader.vue
+++ b/src/components/App/Header/AppHeader.vue
@@ -16,8 +16,8 @@
     </div>
     <div class="app-controls s-flex">
       <market-maker-countdown />
-      <s-button type="action" class="theme-control s-pressed" :tooltip="hideBalancesTooltip" @click="toggleHideBalance">
-        <s-icon :name="hideBalancesIcon" :size="iconSize" />
+      <s-button type="action" class="node-control s-pressed" :tooltip="nodeTooltip" @click="openNodeSelectionDialog">
+        <token-logo class="node-control__logo" v-bind="nodeLogo" />
       </s-button>
       <account-button :disabled="loading" @click="goTo(PageNames.Wallet)" />
       <s-button
@@ -36,8 +36,8 @@
           @select="handleSelectHeaderMenu"
         >
           <template #menu>
-            <s-dropdown-item class="header-menu__item" icon="symbols-24" :value="HeaderMenuType.Node">
-              {{ t('headerMenu.selectNode') }}
+            <s-dropdown-item class="header-menu__item" :icon="hideBalancesIcon" :value="HeaderMenuType.HideBalances">
+              {{ hideBalancesText }}
             </s-dropdown-item>
             <s-dropdown-item class="header-menu__item" :icon="themeIcon" :value="HeaderMenuType.Theme">
               {{ t('headerMenu.switchTheme', { theme: t(themeTitle) }) }}
@@ -64,6 +64,7 @@
 <script lang="ts">
 import { Component, Mixins, Prop } from 'vue-property-decorator';
 import { Getter, Action } from 'vuex-class';
+import { KnownSymbols } from '@sora-substrate/util';
 import { components, WALLET_TYPES } from '@soramitsu/soraneo-wallet-web';
 import { switchTheme } from '@soramitsu/soramitsu-js-ui/lib/utils';
 import Theme from '@soramitsu/soramitsu-js-ui/lib/types/Theme';
@@ -73,10 +74,10 @@ import NodeErrorMixin from '@/components/mixins/NodeErrorMixin';
 import PolkaswapLogo from '@/components/logo/Polkaswap.vue';
 
 import { lazyComponent, goTo } from '@/router';
-import { PageNames, Components } from '@/consts';
+import { PageNames, Components, LogoSize } from '@/consts';
 
 enum HeaderMenuType {
-  Node = 'node',
+  HideBalances = 'hide-balances',
   Theme = 'theme',
   Language = 'language',
 }
@@ -94,6 +95,7 @@ enum HeaderMenuType {
     MoonpayNotification: lazyComponent(Components.MoonpayNotification),
     MoonpayHistoryButton: lazyComponent(Components.MoonpayHistoryButton),
     MoonpayConfirmation: lazyComponent(Components.MoonpayConfirmation),
+    TokenLogo: lazyComponent(Components.TokenLogo),
   },
 })
 export default class AppHeader extends Mixins(WalletConnectMixin, NodeErrorMixin) {
@@ -122,6 +124,13 @@ export default class AppHeader extends Mixins(WalletConnectMixin, NodeErrorMixin
     return this.t('selectNodeText');
   }
 
+  get nodeLogo() {
+    return {
+      size: LogoSize.MEDIUM,
+      tokenSymbol: KnownSymbols.XOR,
+    };
+  }
+
   get themeIcon(): string {
     return this.libraryTheme === Theme.LIGHT ? 'various-moon-24' : 'various-brightness-low-24';
   }
@@ -131,13 +140,17 @@ export default class AppHeader extends Mixins(WalletConnectMixin, NodeErrorMixin
   }
 
   get hideBalancesIcon(): string {
-    return this.shouldBalanceBeHidden ? 'basic-filterlist-24' : 'basic-eye-no-24';
+    return this.shouldBalanceBeHidden ? 'basic-eye-no-24' : 'basic-filterlist-24';
   }
 
-  get hideBalancesTooltip(): string {
+  get hideBalancesText(): string {
     return this.t(`headerMenu.${this.shouldBalanceBeHidden ? 'showBalances' : 'hideBalances'}`);
   }
 
+  openNodeSelectionDialog(): void {
+    this.setSelectNodeDialogVisibility(true);
+  }
+
   async openMoonpayDialog(): Promise<void> {
     if (!this.isSoraAccountConnected) {
       return this.connectInternalWallet();
@@ -158,8 +171,8 @@ export default class AppHeader extends Mixins(WalletConnectMixin, NodeErrorMixin
 
   handleSelectHeaderMenu(value: HeaderMenuType): void {
     switch (value) {
-      case HeaderMenuType.Node:
-        this.setSelectNodeDialogVisibility(true);
+      case HeaderMenuType.HideBalances:
+        this.toggleHideBalance();
         break;
       case HeaderMenuType.Theme:
         switchTheme();
@@ -266,14 +279,6 @@ $icon-size: 28px;
   padding: $inner-spacing-mini;
   min-height: $header-height;
   position: relative;
-  @include tablet {
-    padding: $inner-spacing-mini $inner-spacing-medium;
-
-    &:after {
-      left: $inner-spacing-medium;
-      right: $inner-spacing-medium;
-    }
-  }
   &:after {
     content: '';
     position: absolute;
@@ -283,6 +288,14 @@ $icon-size: 28px;
     right: $inner-spacing-mini;
     background-color: var(--s-color-base-border-secondary);
   }
+  @include tablet {
+    padding: $inner-spacing-mini $inner-spacing-medium;
+
+    &:after {
+      left: $inner-spacing-medium;
+      right: $inner-spacing-medium;
+    }
+  }
 }
 
 .app-controls {
@@ -294,6 +307,14 @@ $icon-size: 28px;
     margin-right: $inner-spacing-mini;
   }
 
+  .node-control {
+    @include element-size('token-logo', 28px);
+    &__logo {
+      display: block;
+      margin: auto;
+    }
+  }
+
   .el-button {
     + .el-button {
       margin-left: 0;
diff --git a/src/components/NetworkFeeWarningDialog.vue b/src/components/NetworkFeeWarningDialog.vue
index 1c2cc9c88..534dc2dcf 100644
--- a/src/components/NetworkFeeWarningDialog.vue
+++ b/src/components/NetworkFeeWarningDialog.vue
@@ -22,6 +22,7 @@ export default class NetworkFeeWarningDialog extends Mixins(DialogMixin, Transla
 
   handleConfirm(): void {
     this.closeDialog();
+    this.$emit('confirm');
   }
 }
 </script>
diff --git a/src/components/Rewards/AmountTable.vue b/src/components/Rewards/AmountTable.vue
index f6f3cfffd..903b43759 100644
--- a/src/components/Rewards/AmountTable.vue
+++ b/src/components/Rewards/AmountTable.vue
@@ -26,13 +26,13 @@
                   "
                   :fiat-font-size-rate="FontSizeRate.MEDIUM"
                 >
-                  <s-tooltip
+                  <el-popover
                     v-if="formatted.total && index === 0"
                     popper-class="amount-table-tooltip"
                     placement="right"
-                    border-radius="mini"
+                    trigger="hover"
                   >
-                    <div slot="content" class="amount-table-tooltip-content">
+                    <div class="amount-table-tooltip-content">
                       <div>{{ t('rewards.totalVested') }}:</div>
                       <formatted-amount
                         class="amount-table-value"
@@ -43,8 +43,8 @@
                         :asset-symbol="formatted.total.asset.symbol"
                       />
                     </div>
-                    <s-icon name="info-16" size="14px" class="amount-table-value-icon" />
-                  </s-tooltip>
+                    <s-icon slot="reference" name="info-16" size="14px" class="amount-table-value-icon" />
+                  </el-popover>
                 </formatted-amount-with-fiat-value>
               </div>
             </div>
@@ -167,8 +167,22 @@ export default class AmountTable extends Mixins(mixins.FormattedAmountMixin, Tra
     &__input {
       & .el-checkbox__inner {
         border-radius: 6px !important;
+
         &:after {
-          left: 4px;
+          content: '\ea1c';
+          color: white;
+          font-family: 'soramitsu-icons';
+          border: none;
+          transform: rotate(0) scaleY(0);
+          left: 2px;
+          top: 2px;
+        }
+      }
+      &.is-checked {
+        & .el-checkbox__inner {
+          &:after {
+            transform: rotate(0) scaleY(1);
+          }
         }
       }
       &:not(.is-checked) {
@@ -208,11 +222,18 @@ export default class AmountTable extends Mixins(mixins.FormattedAmountMixin, Tra
     }
   }
 
-  &-tooltip.el-tooltip__popper.neumorphic {
+  &-tooltip.el-popover.el-popper {
+    border-color: var(--s-color-base-border-secondary);
+    border-radius: var(--s-border-radius-mini);
+    box-shadow: var(--s-shadow-dialog);
     background-color: var(--s-color-status-success);
+    padding: $inner-spacing-mini $inner-spacing-small;
 
     &[x-placement^='right'] .popper__arrow {
-      border-right-color: var(--s-color-status-success);
+      border-right-color: var(--s-color-base-border-secondary);
+      &:after {
+        border-right-color: var(--s-color-status-success);
+      }
     }
   }
 
diff --git a/src/components/mixins/NetworkFeeDialogMixin.ts b/src/components/mixins/NetworkFeeDialogMixin.ts
index 63a65a309..8af7aaea4 100644
--- a/src/components/mixins/NetworkFeeDialogMixin.ts
+++ b/src/components/mixins/NetworkFeeDialogMixin.ts
@@ -4,6 +4,11 @@ import { delay } from '@/utils';
 @Component
 export default class NetworkFeeDialogMixin extends Vue {
   showWarningFeeDialog = false;
+  isWarningFeeDialogConfirmed = false;
+
+  confirmNetworkFeeWariningDialog(): void {
+    this.isWarningFeeDialogConfirmed = true;
+  }
 
   openWarningFeeDialog(): void {
     this.showWarningFeeDialog = true;
diff --git a/src/components/mixins/TokenPairMixin.ts b/src/components/mixins/TokenPairMixin.ts
index df13e93f6..9c273bbb8 100644
--- a/src/components/mixins/TokenPairMixin.ts
+++ b/src/components/mixins/TokenPairMixin.ts
@@ -13,6 +13,7 @@ import {
   isXorAccountAsset,
   hasInsufficientBalance,
   formatAssetBalance,
+  getAssetBalance,
 } from '@/utils';
 
 const CreateTokenPairMixin = (namespace: string) => {
@@ -168,7 +169,11 @@ const CreateTokenPairMixin = (namespace: string) => {
       });
     }
 
-    getTokenBalance(token: any): string {
+    getTokenBalance(token: any): CodecString {
+      return getAssetBalance(token);
+    }
+
+    getFormattedTokenBalance(token: any): string {
       return formatAssetBalance(token);
     }
 
diff --git a/src/lang/cs.json b/src/lang/cs.json
index c54202d82..793c53faa 100644
--- a/src/lang/cs.json
+++ b/src/lang/cs.json
@@ -127,7 +127,8 @@
             "reserved": " - Rezervováno",
             "total": "Celkem"
         },
-        "totalAssetsValue": "Celková hodnota vašich aktiv:"
+        "totalAssetsValue": "Celková hodnota vašich aktiv:",
+        "details": "Podrobnosti"
     },
     "asset": {
         "remove": "Odebrat aktivum"
diff --git a/src/lang/de.json b/src/lang/de.json
index e2f0e571d..3e09c0dd5 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -127,7 +127,8 @@
             "reserved": " Reserviert",
             "total": "Gesamt"
         },
-        "totalAssetsValue": "Gesamtwert deiner Assets:"
+        "totalAssetsValue": "Gesamtwert deiner Assets:",
+        "details": "Einzelheiten"
     },
     "asset": {
         "remove": "Asset entfernen"
diff --git a/src/lang/en.json b/src/lang/en.json
index 7a85f08ca..40cd0fd0f 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -127,7 +127,8 @@
             "reserved": " - Reserved",
             "total": "Total"
         },
-        "totalAssetsValue": "Your total assets value:"
+        "totalAssetsValue": "Your total assets value:",
+        "details": "Details"
     },
     "asset": {
         "remove": "Remove asset"
diff --git a/src/lang/es.json b/src/lang/es.json
index 440784b12..7cc317782 100644
--- a/src/lang/es.json
+++ b/src/lang/es.json
@@ -127,7 +127,8 @@
             "reserved": "- Reservado",
             "total": "Total"
         },
-        "totalAssetsValue": "El valor total de sus activos:"
+        "totalAssetsValue": "El valor total de sus activos:",
+        "details": "Detalles"
     },
     "asset": {
         "remove": "Eliminar el Activo"
diff --git a/src/lang/fr.json b/src/lang/fr.json
index 7edd855db..23ff6bfe0 100644
--- a/src/lang/fr.json
+++ b/src/lang/fr.json
@@ -127,7 +127,8 @@
             "reserved": "- Réservé",
             "total": "Total"
         },
-        "totalAssetsValue": "Valeur total de vos actifs:"
+        "totalAssetsValue": "Valeur total de vos actifs:",
+        "details": "Détails"
     },
     "asset": {
         "remove": "Retirer l'actif"
diff --git a/src/lang/hy.json b/src/lang/hy.json
index f4263729d..a72cc9da1 100644
--- a/src/lang/hy.json
+++ b/src/lang/hy.json
@@ -127,7 +127,8 @@
             "reserved": "- վերապահված է",
             "total": "Ընդհանուր"
         },
-        "totalAssetsValue": "Ձեր ակտիվների ընդհանուր արժեքը."
+        "totalAssetsValue": "Ձեր ակտիվների ընդհանուր արժեքը.",
+        "details": "Մանրամասներ"
     },
     "asset": {
         "remove": "Հեռացնել ակտիվը"
diff --git a/src/lang/id.json b/src/lang/id.json
index 2dcff7876..08f3bb5af 100644
--- a/src/lang/id.json
+++ b/src/lang/id.json
@@ -127,7 +127,8 @@
             "reserved": "- Dicadangkan",
             "total": "Total"
         },
-        "totalAssetsValue": "Nilai total aset Anda:"
+        "totalAssetsValue": "Nilai total aset Anda:",
+        "details": "Rincian"
     },
     "asset": {
         "remove": "Hapus aset"
diff --git a/src/lang/it.json b/src/lang/it.json
index 5e310fec7..b193bada9 100644
--- a/src/lang/it.json
+++ b/src/lang/it.json
@@ -127,7 +127,8 @@
             "reserved": "- Riservato",
             "total": "Totale"
         },
-        "totalAssetsValue": "Il valore totale del tuo patrimonio:"
+        "totalAssetsValue": "Il valore totale del tuo patrimonio:",
+        "details": "Dettagli"
     },
     "asset": {
         "remove": "Rimuovi l'asset"
diff --git a/src/lang/nl.json b/src/lang/nl.json
index c0784ae74..d2422e7c5 100644
--- a/src/lang/nl.json
+++ b/src/lang/nl.json
@@ -127,7 +127,8 @@
             "reserved": " - Gereserveerd",
             "total": "Totaal"
         },
-        "totalAssetsValue": "Totale waarde van bezittingen:"
+        "totalAssetsValue": "Totale waarde van bezittingen:",
+        "details": "Details"
     },
     "asset": {
         "remove": "Asset verwijderen"
diff --git a/src/lang/no.json b/src/lang/no.json
index 6e227e958..48b45da73 100644
--- a/src/lang/no.json
+++ b/src/lang/no.json
@@ -127,7 +127,8 @@
             "reserved": "- Reservert",
             "total": "Totalt"
         },
-        "totalAssetsValue": "Totalverdi aktiva:"
+        "totalAssetsValue": "Totalverdi aktiva:",
+        "details": "Detaljer"
     },
     "asset": {
         "remove": "Fjern aktiva"
diff --git a/src/lang/pl.json b/src/lang/pl.json
index 87514e8b2..27ba5a53c 100644
--- a/src/lang/pl.json
+++ b/src/lang/pl.json
@@ -127,7 +127,8 @@
             "reserved": " – Zarezerwowano",
             "total": "Łącznie"
         },
-        "totalAssetsValue": "Twoja łączna wartość walut:"
+        "totalAssetsValue": "Twoja łączna wartość walut:",
+        "details": "Szczegóły"
     },
     "asset": {
         "remove": "Usuń walutę"
diff --git a/src/lang/ru.json b/src/lang/ru.json
index 917d214ec..3a7541324 100644
--- a/src/lang/ru.json
+++ b/src/lang/ru.json
@@ -127,7 +127,8 @@
             "reserved": " - Зарезервировано",
             "total": "Всего"
         },
-        "totalAssetsValue": "Общая стоимость ваших активов:"
+        "totalAssetsValue": "Общая стоимость ваших активов:",
+        "details": "Детали"
     },
     "asset": {
         "remove": "Удалить актив"
diff --git a/src/lang/yo.json b/src/lang/yo.json
index 825178bd6..8f766a4d6 100644
--- a/src/lang/yo.json
+++ b/src/lang/yo.json
@@ -127,7 +127,8 @@
             "reserved": "- Ni ipamọ",
             "total": "Lapapọ"
         },
-        "totalAssetsValue": "Iye awọn ohun -ini rẹ lapapọ:"
+        "totalAssetsValue": "Iye awọn ohun -ini rẹ lapapọ:",
+        "details": "Awọn alaye"
     },
     "asset": {
         "remove": "Yọ dukia kuro"
diff --git a/src/views/AddLiquidity.vue b/src/views/AddLiquidity.vue
index d87a9de4d..5f9215ad6 100644
--- a/src/views/AddLiquidity.vue
+++ b/src/views/AddLiquidity.vue
@@ -29,7 +29,7 @@
               value-can-be-hidden
               with-left-shift
               value-class="input-value--primary"
-              :value="getTokenBalance(firstToken)"
+              :value="getFormattedTokenBalance(firstToken)"
               :fiat-value="getFiatBalance(firstToken)"
             />
           </div>
@@ -82,7 +82,7 @@
               value-can-be-hidden
               with-left-shift
               value-class="input-value--primary"
-              :value="getTokenBalance(secondToken)"
+              :value="getFormattedTokenBalance(secondToken)"
               :fiat-value="getFiatBalance(secondToken)"
             />
           </div>
@@ -219,7 +219,11 @@
       @confirm="handleConfirmAddLiquidity"
     />
 
-    <network-fee-warning-dialog :visible.sync="showWarningFeeDialog" :fee="formattedFee" />
+    <network-fee-warning-dialog
+      :visible.sync="showWarningFeeDialog"
+      :fee="removeLiquidityFormattedFee"
+      @confirm="confirmNetworkFeeWariningDialog"
+    />
   </div>
 </template>
 
@@ -351,12 +355,15 @@ export default class AddLiquidity extends Mixins(mixins.NetworkFeeWarningMixin,
     return `${this.getFPNumberFromCodec(strategicBonusApy).mul(this.Hundred).toLocaleString()}%`;
   }
 
+  get removeLiquidityFormattedFee(): string {
+    return this.formatCodecNumber(this.networkFees.RemoveLiquidity);
+  }
+
   get isXorSufficientForNextOperation(): boolean {
     return this.isXorSufficientForNextTx({
       type: Operation.AddLiquidity,
-      amount: this.getFPNumber(this.firstTokenValue).toCodecString(),
-      xorBalance: this.getFPNumber(this.getTokenBalance(this.firstToken)).toCodecString(),
-      fee: this.networkFee,
+      amount: this.getFPNumber(this.firstTokenValue),
+      xorBalance: this.getFPNumberFromCodec(this.getTokenBalance(this.firstToken)),
     });
   }
 
@@ -373,8 +380,11 @@ export default class AddLiquidity extends Mixins(mixins.NetworkFeeWarningMixin,
     if (!this.isXorSufficientForNextOperation) {
       this.openWarningFeeDialog();
       await this.waitOnNextTxFailureConfirmation();
+      if (!this.isWarningFeeDialogConfirmed) {
+        return;
+      }
+      this.isWarningFeeDialogConfirmed = false;
     }
-
     this.openConfirmDialog();
   }
 
diff --git a/src/views/Bridge.vue b/src/views/Bridge.vue
index 8aef45811..24746109a 100644
--- a/src/views/Bridge.vue
+++ b/src/views/Bridge.vue
@@ -233,7 +233,11 @@
         :sora-network-fee="soraNetworkFee"
         @confirm="confirmTransaction"
       />
-      <network-fee-warning-dialog :visible.sync="showWarningFeeDialog" :fee="formattedSoraNetworkFee" />
+      <network-fee-warning-dialog
+        :visible.sync="showWarningFeeDialog"
+        :fee="formattedSoraNetworkFee"
+        @confirm="confirmNetworkFeeWariningDialog"
+      />
     </s-form>
     <div v-if="!areNetworksConnected" class="bridge-footer">{{ t('bridge.connectWallets') }}</div>
   </div>
@@ -450,9 +454,8 @@ export default class Bridge extends Mixins(
     return this.isXorSufficientForNextTx({
       type: this.isSoraToEvm ? Operation.EthBridgeOutgoing : Operation.EthBridgeIncoming,
       isXorAccountAsset: isXorAccountAsset(this.asset),
-      amount: this.getFPNumber(this.amount).toCodecString(),
-      xorBalance: getAssetBalance(this.tokenXOR),
-      fee: this.soraNetworkFee,
+      amount: this.getFPNumber(this.amount),
+      xorBalance: this.getFPNumberFromCodec(getAssetBalance(this.tokenXOR)),
     });
   }
 
@@ -520,6 +523,10 @@ export default class Bridge extends Mixins(
     if (!this.isXorSufficientForNextOperation) {
       this.openWarningFeeDialog();
       await this.waitOnNextTxFailureConfirmation();
+      if (!this.isWarningFeeDialogConfirmed) {
+        return;
+      }
+      this.isWarningFeeDialogConfirmed = false;
     }
 
     await this.checkConnectionToExternalAccount(() => {
diff --git a/src/views/CreatePair.vue b/src/views/CreatePair.vue
index cb8d351b4..09ed5330f 100644
--- a/src/views/CreatePair.vue
+++ b/src/views/CreatePair.vue
@@ -28,7 +28,7 @@
               value-can-be-hidden
               with-left-shift
               value-class="input-value--primary"
-              :value="getTokenBalance(firstToken)"
+              :value="getFormattedTokenBalance(firstToken)"
               :fiat-value="getFiatBalance(firstToken)"
             />
           </div>
@@ -80,7 +80,7 @@
               value-can-be-hidden
               with-left-shift
               value-class="input-value--primary"
-              :value="getTokenBalance(secondToken)"
+              :value="getFormattedTokenBalance(secondToken)"
               :fiat-value="getFiatBalance(secondToken)"
             />
           </div>
@@ -212,7 +212,11 @@
       @confirm="confirmCreatePair"
     />
 
-    <network-fee-warning-dialog :visible.sync="showWarningFeeDialog" :fee="formattedFee" />
+    <network-fee-warning-dialog
+      :visible.sync="showWarningFeeDialog"
+      :fee="formattedFee"
+      @confirm="confirmNetworkFeeWariningDialog"
+    />
   </div>
 </template>
 
@@ -261,9 +265,8 @@ export default class CreatePair extends Mixins(mixins.NetworkFeeWarningMixin, To
   get isXorSufficientForNextOperation(): boolean {
     return this.isXorSufficientForNextTx({
       type: Operation.CreatePair,
-      amount: this.getFPNumber(this.firstTokenValue).toCodecString(),
-      xorBalance: this.getFPNumber(this.getTokenBalance(this.firstToken)).toCodecString(),
-      fee: this.getFPNumber(this.formattedFee).toCodecString(),
+      amount: this.getFPNumber(this.firstTokenValue),
+      xorBalance: this.getFPNumberFromCodec(this.getTokenBalance(this.firstToken)),
     });
   }
 
@@ -277,8 +280,11 @@ export default class CreatePair extends Mixins(mixins.NetworkFeeWarningMixin, To
     if (!this.isXorSufficientForNextOperation) {
       this.openWarningFeeDialog();
       await this.waitOnNextTxFailureConfirmation();
+      if (!this.isWarningFeeDialogConfirmed) {
+        return;
+      }
+      this.isWarningFeeDialogConfirmed = false;
     }
-
     this.openConfirmDialog();
   }
 
diff --git a/src/views/RemoveLiquidity.vue b/src/views/RemoveLiquidity.vue
index e3cbc053b..dcff567b2 100644
--- a/src/views/RemoveLiquidity.vue
+++ b/src/views/RemoveLiquidity.vue
@@ -155,7 +155,11 @@
       @confirm="handleConfirmRemoveLiquidity"
     />
 
-    <network-fee-warning-dialog :visible.sync="showWarningFeeDialog" :fee="formattedFee" />
+    <network-fee-warning-dialog
+      :visible.sync="showWarningFeeDialog"
+      :fee="formattedFee"
+      @confirm="confirmNetworkFeeWariningDialog"
+    />
   </div>
 </template>
 
@@ -205,8 +209,6 @@ export default class RemoveLiquidity extends Mixins(
   readonly KnownSymbols = KnownSymbols;
   readonly delimiters = FPNumber.DELIMITERS_CONFIG;
 
-  @Getter networkFees!: NetworkFeesObject;
-
   @State((state) => state[namespace].liquidityAmount) liquidityAmount!: string;
   @State((state) => state[namespace].firstTokenAmount) firstTokenAmount!: string;
   @State((state) => state[namespace].secondTokenAmount) secondTokenAmount!: string;
@@ -345,10 +347,10 @@ export default class RemoveLiquidity extends Mixins(
   }
 
   get isXorSufficientForNextOperation(): boolean {
+    const firstTokenAmount = this.getFPNumber(this.firstTokenAmount);
     return this.isXorSufficientForNextTx({
       type: Operation.RemoveLiquidity,
-      xorBalance: getAssetBalance(this.tokenXOR),
-      fee: this.networkFee,
+      xorBalance: this.getFPNumberFromCodec(getAssetBalance(this.tokenXOR)).add(firstTokenAmount),
     });
   }
 
@@ -404,8 +406,11 @@ export default class RemoveLiquidity extends Mixins(
     if (!this.isXorSufficientForNextOperation) {
       this.openWarningFeeDialog();
       await this.waitOnNextTxFailureConfirmation();
+      if (!this.isWarningFeeDialogConfirmed) {
+        return;
+      }
+      this.isWarningFeeDialogConfirmed = false;
     }
-
     this.openConfirmDialog();
   }
 
diff --git a/yarn.lock b/yarn.lock
index 8304d5b6e..2504167a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2181,10 +2181,10 @@
     vuex "^3.1.3"
     vuex-class "^0.3.2"
 
-"@soramitsu/soraneo-wallet-web@1.6.37":
-  version "1.6.37"
-  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.6.37.tgz#43f6dce946fdecff523985ee8af16add8fe0c4b5"
-  integrity sha512-nX75AAx4CuL+84RB0ytVmBNczekiAZNusbQjfhKGfK9/huobVVtm5QR115KVPwuG4v0JqBZb1k/+jFzh/RAhJA==
+"@soramitsu/soraneo-wallet-web@1.6.41":
+  version "1.6.41"
+  resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.6.41.tgz#91a0548c629d637fd72d2b6539d50394138e04d1"
+  integrity sha512-1XGuKGGJkZg2DbjTdKttLHuTQgLMcVvGzIYXMAaVZQSGArmfIE9nsUrqjO9lbgSR7uFneQzwZa5kmAJqvYmXaA==
   dependencies:
     "@polkadot/extension-dapp" "^0.35.0-beta.35"
     "@polkadot/vue-identicon" "^0.72.1"