diff --git a/src/common/styles/_cards.scss b/src/common/styles/_cards.scss
index 0627c834..26a07caf 100644
--- a/src/common/styles/_cards.scss
+++ b/src/common/styles/_cards.scss
@@ -10,3 +10,15 @@
     border-color: rgba(var(--v-border-color), 1);
   }
 }
+
+.not-available {
+  position: relative;
+  .not-available-text {
+  position: absolute;
+  inset: 0;
+  background-color: rgba(var(--v-theme-background), 0.5);
+  backdrop-filter: blur(4px);
+  opacity: 1;
+  z-index: 1;
+  }
+}
\ No newline at end of file
diff --git a/src/common/styles/_inputs.scss b/src/common/styles/_inputs.scss
index 6e364039..acfcda14 100644
--- a/src/common/styles/_inputs.scss
+++ b/src/common/styles/_inputs.scss
@@ -26,6 +26,7 @@ input[type=number].v-field__input, .v-select__selection, .amount-input input[typ
   font-size: 1.5rem;
   font-weight: 700;
   line-height: 1;
+  padding-block: 0;
 }
 
 .v-field--focused {
diff --git a/src/common/styles/main.scss b/src/common/styles/main.scss
index 61b53c08..d4133b4f 100644
--- a/src/common/styles/main.scss
+++ b/src/common/styles/main.scss
@@ -26,3 +26,8 @@ a:hover {
     --v-avatar-height: 16px;
   }
 }
+
+.v-tooltip > .v-overlay__content {
+  background-color: rgb(var(--v-theme-bw-700));
+  color: white;
+}
diff --git a/src/pegin/components/create/BtcFeeSelect.vue b/src/pegin/components/create/BtcFeeSelect.vue
index 4d96065e..338ff4b4 100644
--- a/src/pegin/components/create/BtcFeeSelect.vue
+++ b/src/pegin/components/create/BtcFeeSelect.vue
@@ -1,6 +1,6 @@
 <template>
-  <v-row class="align-start mx-0">
-    <v-col class="px-0 py-6">
+  <v-row no-gutters>
+    <v-col class="pa-0">
       <span class="d-inline-block font-weight-bold">
         Select transaction fee
       </span>
diff --git a/src/pegin/components/create/BtcInput.vue b/src/pegin/components/create/BtcInput.vue
new file mode 100644
index 00000000..1c803688
--- /dev/null
+++ b/src/pegin/components/create/BtcInput.vue
@@ -0,0 +1,169 @@
+<template>
+  <v-col class="d-flex flex-column ga-2">
+    <span class="font-weight-bold">
+      Amount to send
+    </span>
+    <v-text-field
+      hide-details
+      hide-spin-buttons
+      flat
+      variant="solo"
+      density="comfortable"
+      rounded="lg"
+      :class="(!isValidAmount && isInputFilled) && 'input-error'"
+      class="text-h4 flex-grow-0 amount-input"
+      v-model="bitcoinAmountModel"
+      type="text"
+      :readonly="isComposing"
+      @compositionstart="isComposing = true"
+      @keydown="blockLetterKeyDown"
+      @wheel.prevent
+      @focus="focus = true"
+      @blur="focus = false"
+      >
+        <template #prepend-inner>
+          <v-chip density="comfortable" :prepend-icon="mdiBitcoin" class="btc-icon">
+            {{ environmentContext.getBtcTicker() }}
+          </v-chip>
+        </template>
+        <template #append-inner>
+          <div class="d-flex px-2 ga-1">
+            <v-chip variant="outlined" density="compact" @click="setMin">
+              {{ boundaries.minValue.toBTCString().slice(0,5) }} MIN
+            </v-chip>
+          </div>
+        </template>
+    </v-text-field>
+    <div>
+      <v-alert v-if="!isValidAmount && isInputFilled" :text="amountErrorMessage"
+        density="compact" type="warning" color="orange"/>
+    </div>
+  </v-col>
+</template>
+
+<script lang="ts">
+import EnvironmentContextProviderService from '@/common/providers/EnvironmentContextProvider';
+import {
+  computed, defineComponent, ref, watch,
+} from 'vue';
+import SatoshiBig from '@/common/types/SatoshiBig';
+import {
+  PeginConfiguration,
+} from '@/common/types/pegInTx';
+import { useAction, useGetter, useStateAttribute } from '@/common/store/helper';
+import { mdiBitcoin } from '@mdi/js';
+import * as constants from '@/common/store/constants';
+import { isBTCAmountValidRegex } from '@/common/utils';
+
+export default defineComponent({
+  name: 'BtcInput',
+  setup(props, context) {
+    const environmentContext = EnvironmentContextProviderService.getEnvironmentContext();
+    const peginConfiguration = useStateAttribute<PeginConfiguration>('pegInTx', 'peginConfiguration');
+    const boundaries = computed(() => {
+      const minValue: SatoshiBig = new SatoshiBig(peginConfiguration.value.minValue, 'btc');
+      return {
+        minValue,
+      };
+    });
+    const isComposing = ref(false);
+    watch(isComposing, () => {
+      const timeout = setTimeout(() => { isComposing.value = false; }, 200);
+      return () => clearTimeout(timeout);
+    });
+
+    const bitcoinAmount = ref('');
+    function blockLetterKeyDown(e: KeyboardEvent) {
+      const allowedKeys = ['Backspace', 'Delete', 'Home', 'End', 'ArrowRight', 'ArrowLeft'];
+      if (allowedKeys.includes(e.key)) return;
+      if (e.key === '.' && (bitcoinAmount.value && !bitcoinAmount.value.includes('.'))) return;
+      const decimals = bitcoinAmount.value.split('.').pop() ?? '';
+      if (decimals.length >= 8 || Number.isNaN(Number(e.key)) || e.key === ' ') {
+        e.preventDefault();
+      }
+    }
+
+    const setBtcAmountPeginTx = useAction('pegInTx', constants.PEGIN_TX_ADD_AMOUNT_TO_TRANSFER);
+    const setBtcAmountFlyover = useAction('flyoverPegin', constants.FLYOVER_PEGIN_ADD_AMOUNT);
+
+    function setBtcAmount(amount: SatoshiBig) {
+      setBtcAmountPeginTx(amount);
+      setBtcAmountFlyover(amount);
+    }
+
+    const safeTxFee = useGetter<SatoshiBig>('pegInTx', constants.PEGIN_TX_GET_SAFE_TX_FEE);
+    const safeAmount = useStateAttribute<SatoshiBig>('pegInTx', 'amountToTransfer');
+    const selectedAccountBalance = useGetter<SatoshiBig>('pegInTx', constants.PEGIN_TX_GET_SELECTED_BALANCE);
+
+    const insufficientAmount = computed(() => {
+      const feePlusAmount: SatoshiBig = safeAmount.value.plus(safeTxFee.value);
+      const { minValue } = boundaries.value;
+      if (safeAmount.value.lte('0')
+        || feePlusAmount.gt(selectedAccountBalance.value)
+        || safeAmount.value.lt(minValue)) {
+        return true;
+      }
+      if (safeAmount.value.gt('0') && feePlusAmount.lte(selectedAccountBalance.value)) {
+        return false;
+      }
+      return false;
+    });
+
+    const amountErrorMessage = computed(() => {
+      const { minValue } = boundaries.value;
+      if (safeAmount.value.lt(minValue)) {
+        return `The minimum accepted value is ${minValue.toBTCTrimmedString()} ${environmentContext.getBtcTicker()}`;
+      }
+      const feePlusAmount: SatoshiBig = safeAmount.value.plus(safeTxFee.value);
+      if (feePlusAmount.gte(selectedAccountBalance.value)) {
+        return 'You don\'t have the balance for this amount';
+      }
+      if (isBTCAmountValidRegex(bitcoinAmount.value)) {
+        return 'The amount must be a valid Bitcoin value';
+      }
+      return '';
+    });
+
+    const isInputFilled = computed(() => bitcoinAmount.value !== '');
+    const isValidAmount = computed(() => !insufficientAmount.value
+      && isBTCAmountValidRegex(bitcoinAmount.value));
+
+    function emitIsValidAmount() {
+      const amount = new SatoshiBig(Number(bitcoinAmount.value), 'btc');
+      setBtcAmount(amount);
+      context.emit('validAmount', isValidAmount.value, bitcoinAmount.value);
+    }
+
+    const timeOutId = ref(0);
+    const bitcoinAmountModel = computed({
+      get() {
+        return bitcoinAmount.value;
+      },
+      set(amount: string) {
+        window.clearTimeout(timeOutId.value);
+        bitcoinAmount.value = amount;
+        timeOutId.value = window.setTimeout(emitIsValidAmount, 300);
+      },
+    });
+
+    function setMin() {
+      const { minValue } = boundaries.value;
+      bitcoinAmountModel.value = minValue.toBTCTrimmedString();
+    }
+
+    return {
+      environmentContext,
+      boundaries,
+      mdiBitcoin,
+      isComposing,
+      blockLetterKeyDown,
+      bitcoinAmountModel,
+      isValidAmount,
+      isInputFilled,
+      amountErrorMessage,
+      setMin,
+    };
+  },
+});
+
+</script>
diff --git a/src/pegin/components/create/PegInForm.vue b/src/pegin/components/create/PegInForm.vue
index b5969295..af84f881 100644
--- a/src/pegin/components/create/PegInForm.vue
+++ b/src/pegin/components/create/PegInForm.vue
@@ -1,33 +1,47 @@
 <template>
-  <v-container fluid class="pa-0">
-    <v-row>
+  <v-container fluid class="pa-0 d-flex flex-column ga-6">
+    <v-row no-gutters>
       <v-btn variant="text"
+        class="px-0"
         :prepend-icon="mdiArrowLeft"
         @click="back"
         :disabled="pegInFormState.matches(['loading', 'goingHome'])">
         Go Back
       </v-btn>
     </v-row>
-    <btc-input-amount @getPeginQuotes="getQuotes" @peginError="handleError"/>
-    <btc-fee-select/>
-    <v-row v-if="showOptions && !loadingQuotes">
-      <v-col cols="6" class="mr-3">
-        <pegin-option-card
-          :option-type="peginType.POWPEG"
-          @selected-option="changeSelectedOption"
-          :selected="selected === peginType.POWPEG"
-        />
-      </v-col>
-      <v-col v-for="(quote, index) in peginQuotes" :key="index">
-        <pegin-option-card
-          :option-type="peginType.FLYOVER"
-          @selected-option="changeSelectedOption"
-          :selected="selected === peginType.FLYOVER"
-          :quote="quote"
-        />
-      </v-col>
+    <v-row no-gutters class="ga-4 ga-lg-8">
+      <btc-input @valid-amount="checkValidAmount" />
+      <rsk-destination-address @valid-address="checkValidAddress"/>
     </v-row>
-    <v-row v-else-if="loadingQuotes" class="py-8 justify-center">
+    <btc-fee-select/>
+    <div v-if="showOptions" class="d-flex flex-column ga-2">
+      <span class="font-weight-bold">Select mode</span>
+      <v-row no-gutters class="ga-4 ga-lg-8">
+        <v-col v-if="peginQuotes.length === 0">
+          <pegin-option-card :option-type="peginType.FLYOVER" flyover-not-available>
+            <template v-slot>
+              <h4><span class="text-orange">Fast Mode</span> is unavailable at this time.</h4>
+            </template>
+          </pegin-option-card>
+        </v-col>
+        <v-col v-for="(quote, index) in peginQuotes" :key="index">
+          <pegin-option-card
+            :option-type="peginType.FLYOVER"
+            @selected-option="changeSelectedOption"
+            :selected="selected === peginType.FLYOVER"
+            :quote="quote"
+          />
+        </v-col>
+        <v-col>
+          <pegin-option-card
+            :option-type="peginType.POWPEG"
+            @selected-option="changeSelectedOption"
+            :selected="selected === peginType.POWPEG"
+          />
+        </v-col>
+      </v-row>
+    </div>
+    <v-row no-gutters v-else-if="loadingQuotes" class="justify-center">
       <v-progress-circular
         :size="250"
         :width="18"
@@ -36,40 +50,30 @@
         Searching Options...
       </v-progress-circular>
     </v-row>
-      <v-row justify="end">
-        <v-col cols="auto">
-            <v-btn-rsk v-if="!pegInFormState.matches(['loading'])"
-            @click="callRecaptcha"
-            :disabled="!isReadyToCreate || pegInFormState.matches(['goingHome'])"
-            >
-            <template #append>
-              <v-icon :icon="mdiArrowRight" />
-            </template>
-            Continue to Summary
-          </v-btn-rsk>
-          <v-progress-circular v-else indeterminate />
-        </v-col>
-      </v-row>
-      <v-row>
-        <address-warning-dialog :address="pegInTxState.rskAddressSelected"
-                                :show-dialog="showWarningMessage"
-                                @continue="createTx"
-                                @cancel="showWarningMessage = false"
-        />
-      </v-row>
-      <div id="recaptcha" class="g-recaptcha"
-          :data-sitekey="flyoverService.siteKey"
-          data-callback="onRecaptchaSuccess"
-          data-action="submit"
-          data-size="invisible"></div>
+    <v-btn-rsk v-if="!pegInFormState.matches(['loading'])"
+      @click="callRecaptcha"
+      :disabled="!isReadyToCreate || pegInFormState.matches(['goingHome'])"
+      class="align-self-end text-body-1"
+      >
+      <template #append>
+        <v-icon :icon="mdiArrowRight" />
+      </template>
+        Send
+    </v-btn-rsk>
+    <v-progress-circular class="align-self-end" v-else indeterminate />
   </v-container>
+  <div id="recaptcha" class="g-recaptcha"
+      :data-sitekey="flyoverService.siteKey"
+      data-callback="onRecaptchaSuccess"
+      data-action="submit"
+      data-size="invisible"></div>
   <template v-if="showErrorDialog">
-      <full-tx-error-dialog
-      :showTxErrorDialog="showErrorDialog"
-      :error="txError"
-      @closeErrorDialog="showErrorDialog = false"
-      />
-    </template>
+    <full-tx-error-dialog
+    :showTxErrorDialog="showErrorDialog"
+    :error="txError"
+    @closeErrorDialog="showErrorDialog = false"
+    />
+  </template>
 </template>
 
 <script lang="ts">
@@ -77,56 +81,52 @@ import {
   computed, ref, defineComponent, onBeforeMount, watch, onMounted,
 } from 'vue';
 import { mdiArrowLeft, mdiArrowRight, mdiSendOutline } from '@mdi/js';
-import BtcInputAmount from '@/pegin/components/create/BtcInputAmount.vue';
+import BtcInput from '@/pegin/components/create/BtcInput.vue';
 import PeginOptionCard from '@/pegin/components/create/PeginOptionCard.vue';
 import { PegInTxState } from '@/common/types/pegInTx';
 import * as constants from '@/common/store/constants';
-import { appendRecaptcha, Machine, ServiceError } from '@/common/utils';
+import {
+  appendRecaptcha, Machine, ServiceError,
+} from '@/common/utils';
 import EnvironmentContextProviderService from '@/common/providers/EnvironmentContextProvider';
-import { TxStatusType } from '@/common/types/store';
-import { TxSummaryOrientation } from '@/common/types/Status';
 import {
   Feature, FeatureNames, FlyoverPeginState, PeginQuote, QuotePegIn2WP, SatoshiBig,
 } from '@/common/types';
 import {
   useAction, useGetter, useState, useStateAttribute,
 } from '@/common/store/helper';
-import AddressWarningDialog from '@/common/components/exchange/AddressWarningDialog.vue';
 import BtcFeeSelect from '@/pegin/components/create/BtcFeeSelect.vue';
 import { BridgeService } from '@/common/services/BridgeService';
 import { FlyoverService } from '@/common/services';
 import FullTxErrorDialog from '@/common/components/exchange/FullTxErrorDialog.vue';
+import RskDestinationAddress from '@/pegin/components/create/RskDestinationAddress.vue';
 
 export default defineComponent({
   name: 'PegInForm',
   components: {
-    BtcInputAmount,
+    BtcInput,
+    RskDestinationAddress,
     PeginOptionCard,
-    AddressWarningDialog,
     BtcFeeSelect,
     FullTxErrorDialog,
   },
   emits: ['back', 'createTx'],
   setup(_, context) {
     const pegInFormState = ref<Machine<'loading' | 'goingHome' | 'fill'>>(new Machine('fill'));
-    const showWarningMessage = ref(false);
     const environmentContext = EnvironmentContextProviderService.getEnvironmentContext();
-    const typeSummary = TxStatusType.PEGIN;
-    const orientationSummary = TxSummaryOrientation.VERTICAL;
     const flyoverEnabled = ref(true);
-    const showOptions = ref(false);
     const loadingQuotes = ref(false);
     const selected = ref<constants.peginType>();
     const selectedQuote = ref<PeginQuote>();
     const showErrorDialog = ref(false);
     const txError = ref<ServiceError>(new ServiceError('', '', '', ''));
-
     const account = useStateAttribute<string>('web3Session', 'account');
     const flyoverFeature = useGetter<(name: FeatureNames) => Feature>('web3Session', constants.SESSION_GET_FEATURE);
     const pegInTxState = useState<PegInTxState>('pegInTx');
     const flyoverPeginState = useState<FlyoverPeginState>('flyoverPegin');
     const refundAddress = useGetter<string>('pegInTx', constants.PEGIN_TX_GET_REFUND_ADDRESS);
     const enoughBalanceSelectedFee = useGetter<boolean>('pegInTx', constants.PEGIN_TX_GET_ENOUGH_FEE_VALUE);
+    const isEnoughBalance = useGetter<boolean>('pegInTx', constants.PEGIN_TX_IS_ENOUGH_BALANCE);
     const getPeginQuotes = useAction('flyoverPegin', constants.FLYOVER_PEGIN_GET_QUOTES);
     const setSelectedQuote = useAction('flyoverPegin', constants.FLYOVER_PEGIN_ADD_SELECTED_QUOTE);
     const clearQuotes = useAction('flyoverPegin', constants.FLYOVER_PEGIN_CLEAR_QUOTES);
@@ -136,6 +136,7 @@ export default defineComponent({
     const flyoverService = useStateAttribute<FlyoverService>('flyoverPegin', 'flyoverService');
     const selectedFee = useGetter<SatoshiBig>('pegInTx', constants.PEGIN_TX_GET_SAFE_TX_FEE);
     const selectedAccountBalance = useGetter<SatoshiBig>('pegInTx', constants.PEGIN_TX_GET_SELECTED_BALANCE);
+    const loadingFee = useStateAttribute<boolean>('pegInTx', 'loadingFee');
 
     const enoughAmountFlyover = computed(() => {
       if (!selectedQuote.value) {
@@ -145,25 +146,6 @@ export default defineComponent({
       return selectedAccountBalance.value?.gte(fullAmount);
     });
 
-    const isReadyToCreate = computed((): boolean => {
-      if (selected.value === constants.peginType.POWPEG) {
-        return pegInTxState.value.isValidAmountToTransfer
-        && !pegInTxState.value.loadingFee
-        && !!pegInTxState.value.rskAddressSelected
-        && pegInTxState.value.rskAddressSelected !== '0x'
-        && enoughBalanceSelectedFee.value;
-      }
-
-      if (selected.value === constants.peginType.FLYOVER) {
-        return enoughAmountFlyover.value
-          && !!flyoverPeginState.value.selectedQuoteHash
-          && !!flyoverPeginState.value.rootstockRecipientAddress
-          && flyoverPeginState.value.rootstockRecipientAddress !== '0x';
-      }
-
-      return false;
-    });
-
     const peginQuotes = computed(() => {
       if (!flyoverEnabled.value) {
         return [];
@@ -191,7 +173,6 @@ export default defineComponent({
     }
 
     async function createTx() {
-      showWarningMessage.value = false;
       pegInFormState.value.send('loading');
       const bridgeService = new BridgeService();
       if (selected.value === constants.peginType.POWPEG) {
@@ -234,12 +215,63 @@ export default defineComponent({
         rootstockRecipientAddress: account.value,
         bitcoinRefundAddress: refundAddress.value,
       })
-        .then(() => {
+        .finally(() => {
           loadingQuotes.value = false;
-          showOptions.value = true;
         });
     }
 
+    const validAmount = ref(false);
+    const amount = ref();
+    const validAddress = ref(Boolean(account.value));
+    const address = ref();
+
+    const showOptions = computed(() => !loadingQuotes.value
+    && !loadingFee.value && validAddress.value && validAmount.value);
+
+    function checkValidAddress(isValid: boolean, amountInformed: string) {
+      validAddress.value = isValid;
+      if (isValid && amountInformed !== amount.value) {
+        amount.value = amountInformed;
+      }
+    }
+
+    function checkValidAmount(isValid: boolean, addressInformed: string) {
+      validAmount.value = isValid;
+      if (isValid && addressInformed !== address.value) {
+        address.value = addressInformed;
+      }
+    }
+
+    watch([amount, validAmount, address, validAddress], async () => {
+      if (!validAmount.value || !validAddress.value) {
+        return;
+      }
+      await getQuotes();
+    });
+
+    const isReadyToCreate = computed((): boolean => {
+      if (!showOptions.value) {
+        return false;
+      }
+
+      if (selected.value === constants.peginType.POWPEG) {
+        return isEnoughBalance.value
+        && !pegInTxState.value.loadingFee
+        && !!pegInTxState.value.rskAddressSelected
+        && pegInTxState.value.rskAddressSelected !== '0x'
+        && enoughBalanceSelectedFee.value;
+      }
+
+      if (selected.value === constants.peginType.FLYOVER) {
+        return enoughAmountFlyover.value
+          && !!flyoverPeginState.value.selectedQuoteHash
+          && !!flyoverPeginState.value.rootstockRecipientAddress
+          && flyoverPeginState.value.rootstockRecipientAddress !== '0x';
+      }
+
+      return false;
+    });
+
     function callRecaptcha() {
       window.grecaptcha.execute();
     }
@@ -254,18 +286,9 @@ export default defineComponent({
       appendRecaptcha(flyoverService.value.siteKey);
     });
 
-    watch(account, getQuotes);
-
-    if (flyoverEnabled.value && peginQuotes.value.length > 0) {
-      showOptions.value = true;
-    }
-
     return {
       pegInFormState,
-      showWarningMessage,
       environmentContext,
-      typeSummary,
-      orientationSummary,
       back,
       isReadyToCreate,
       pegInTxState,
@@ -286,6 +309,10 @@ export default defineComponent({
       handleError,
       flyoverService,
       callRecaptcha,
+      checkValidAmount,
+      checkValidAddress,
+      validAmount,
+      validAddress,
     };
   },
 });
diff --git a/src/pegin/components/create/PeginOptionCard.vue b/src/pegin/components/create/PeginOptionCard.vue
index ea5580a1..a1326371 100644
--- a/src/pegin/components/create/PeginOptionCard.vue
+++ b/src/pegin/components/create/PeginOptionCard.vue
@@ -1,7 +1,15 @@
 <template>
-  <v-card :ripple="false" @click="selectOption" rounded="lg" flat variant="outlined"
-    :class="selected && 'selected'"
+  <v-card :ripple="false" :disabled="flyoverNotAvailable"
+    @click="selectOption" rounded="lg" flat variant="outlined"
+    :class="{
+      'selected': selected,
+      'not-available': flyoverNotAvailable,
+    }"
     class="d-flex flex-column ga-4 pa-8 fill-height">
+    <div v-if="flyoverNotAvailable"
+      class="not-available-text d-flex align-center justify-center pa-8 text-center">
+      <slot />
+    </div>
     <v-row no-gutters class="my-2">
       <div class='text-h3'>
         <span :class='`pa-1 bg-${option.subtitleColor}`'>
@@ -9,53 +17,44 @@
         </span>
       </div>
     </v-row>
-    <v-row no-gutters>
-      <v-col cols="auto">
-        <span class="text-right"> {{ option.label }}</span>
-      </v-col>
-      <v-col cols="auto" class="pl-2">
-        <v-btn @click="openLink(option.link)" icon density="compact" size="small" variant="plain">
+    <v-row no-gutters justify="space-between">
+        <div class="d-flex align-center ga-1">
+          <span class="text-balance">{{ option.label }}</span>
+          <v-btn @click="openLink(option.link)" icon density="compact" size="small" variant="plain">
             <v-icon :icon="mdiOpenInNew"></v-icon>
-        </v-btn>
-      </v-col>
+          </v-btn>
+        </div>
+      <v-tooltip :text="tooltipText" location="top" max-width="200">
+        <template v-slot:activator="{ props }">
+            <div v-bind="props" class="d-flex align-center ga-1">
+              <v-icon :icon="mdiClockOutline" :color="option.subtitleColor" size="20" />
+              <span :class='`text-${option.subtitleColor}`'>{{ option.estimatedTime() }}</span>
+            </div>
+        </template>
+      </v-tooltip>
     </v-row>
-    <div class="d-flex flex-column ga-2 py-4">
-      <rsk-address-input :option-type="optionType"/>
-    </div>
-    <span class="text-h4">Features</span>
-    <div class="d-flex flex-column">
-      <span>Estimated Time</span>
-      <span class="text-bw-400">{{ option.estimatedTime() }}</span>
-    </div>
-    <div class="d-flex flex-column">
-      <span>{{ environmentContext.getBtcTicker() }} fee</span>
-      <span class="text-bw-400">
-        {{ selectedFee.toBTCTrimmedString() }} {{ environmentContext.getBtcTicker() }}
-      </span>
-      <span class="text-bw-400">USD {{ toUSD(selectedFee) }}</span>
-    </div>
-    <div class="d-flex flex-column">
-      <span>Provider fee</span>
-      <span class="text-bw-400">
-        {{ option.providerFee().toBTCTrimmedString() }} {{ environmentContext.getBtcTicker() }}
-      </span>
-      <span class="text-bw-400">USD {{ toUSD(option.providerFee()) }}</span>
-    </div>
+    <v-divider :color="option.subtitleColor" class="border-opacity-100" ></v-divider>
+    <v-row>
+      <v-col>
     <div class="d-flex flex-column">
-      <span>Amount to send</span>
+      <span :class='`text-${option.subtitleColor}`'>Value to receive</span>
       <span class="text-bw-400">
-        {{ option.amountToTransfer().toBTCTrimmedString() }} {{ environmentContext.getBtcTicker() }}
+        {{ option.valueToReceive()?.toBTCTrimmedString() }} {{ environmentContext.getRbtcTicker() }}
       </span>
-      <span class="text-bw-400">USD {{ toUSD(option.amountToTransfer()) }}</span>
+      <span class="text-bw-400">USD {{ toUSD(option.valueToReceive()) }}</span>
     </div>
+      </v-col>
+      <v-col>
     <div class="d-flex flex-column">
-      <span>Value to receive</span>
+      <span>Total Fee {{ optionType === 'POWPEG' ? '(Network)' : '(Network & Provider)' }}</span>
       <span class="text-bw-400">
-        {{ option.valueToReceive().toBTCTrimmedString() }} {{ environmentContext.getRbtcTicker() }}
+        {{ option.totalFee()?.toBTCTrimmedString() }} {{ environmentContext.getBtcTicker() }}
       </span>
-      <span class="text-bw-400">USD {{ toUSD(option.valueToReceive()) }}</span>
+      <span class="text-bw-400">USD {{ toUSD(option.totalFee()) }}</span>
     </div>
-    <v-spacer class="fill-height" />
+      </v-col>
+    </v-row>
+    <v-spacer></v-spacer>
   </v-card>
 </template>
 
@@ -65,18 +64,14 @@ import {
   computed, defineComponent,
 } from 'vue';
 import * as constants from '@/common/store/constants';
-import { mdiInformationOutline, mdiOpenInNew } from '@mdi/js';
+import { mdiInformationOutline, mdiOpenInNew, mdiClockOutline } from '@mdi/js';
 import { useGetter, useState, useStateAttribute } from '@/common/store/helper';
 import { blockConfirmationsToTimeString, truncateString } from '@/common/utils';
-import RskAddressInput from '@/pegin/components/create/RskAddressInput.vue';
 import EnvironmentContextProviderService from '@/common/providers/EnvironmentContextProvider';
 import { PeginQuote, PegInTxState, SatoshiBig } from '@/common/types';
 
 export default defineComponent({
   name: 'PeginOptionCard',
-  components: {
-    RskAddressInput,
-  },
   props: {
     optionType: {
       type: String,
@@ -89,6 +84,10 @@ export default defineComponent({
     quote: {
       type: Object as PropType<PeginQuote>,
     },
+    flyoverNotAvailable: {
+      type: Boolean,
+      default: false,
+    },
   },
   setup(props, context) {
     const account = useStateAttribute<string>('web3Session', 'account');
@@ -113,9 +112,9 @@ export default defineComponent({
         subtitleColor: 'purple',
         link: 'https://dev.rootstock.io/rsk/architecture/powpeg/',
         estimatedTime: () => '17 hours',
+        totalFee: () => selectedFee.value,
         amountToTransfer: () => pegInTxState.value.amountToTransfer
           .plus(selectedFee.value),
-        providerFee: () => new SatoshiBig('0', 'btc'),
         valueToReceive: () => pegInTxState.value.amountToTransfer,
       },
       FLYOVER: {
@@ -126,6 +125,7 @@ export default defineComponent({
         estimatedTime: () => blockConfirmationsToTimeString(computedQuote.value?.quote.confirmations ?? 0, 'btc'),
         amountToTransfer: () => computedQuote.value?.getTotalTxAmount(selectedFee.value)
           ?? new SatoshiBig('0', 'btc'),
+        totalFee: () => computedQuote.value?.getTotalQuoteFee(selectedFee.value),
         providerFee: () => quoteFee.value,
         valueToReceive: () => computedQuote.value?.quote.value ?? new SatoshiBig('0', 'btc'),
       },
@@ -137,6 +137,7 @@ export default defineComponent({
     }
 
     function toUSD(value: SatoshiBig) {
+      if (!value) return '';
       return value.toUSDFromBTCString(bitcoinPrice.value, fixedUSDDecimals);
     }
 
@@ -144,6 +145,8 @@ export default defineComponent({
       window.open(link, '_blank');
     }
 
+    const tooltipText = 'Time is approximate and may vary due to block confirmation times and network congestion.';
+
     return {
       constants,
       mdiInformationOutline,
@@ -155,6 +158,8 @@ export default defineComponent({
       toUSD,
       mdiOpenInNew,
       openLink,
+      mdiClockOutline,
+      tooltipText,
     };
   },
 });
diff --git a/src/pegin/components/create/RskDestinationAddress.vue b/src/pegin/components/create/RskDestinationAddress.vue
new file mode 100644
index 00000000..313912a4
--- /dev/null
+++ b/src/pegin/components/create/RskDestinationAddress.vue
@@ -0,0 +1,97 @@
+<template>
+  <v-col class="d-flex flex-column ga-2">
+    <span class="font-weight-bold">
+      Destination Rootstock Address
+    </span>
+    <v-text-field
+        class="flex-grow-0"
+        density="comfortable"
+        :class="(!isValidInputAddress && isInputFilled) && 'input-error'"
+        v-model="address"
+        :readonly="Boolean(connectedAccount)"
+        flat
+        hide-details
+        rounded="lg"
+        variant="solo"
+        placeholder="Paste your RBTC Address">
+      <template #append-inner>
+        <v-btn size="small" class="text-button" @click="connectOrDisconnect">
+          {{ connectedAccount ? 'Disconnect' : 'Connect Wallet' }}
+        </v-btn>
+      </template>
+    </v-text-field>
+    <v-alert v-show="!isValidInputAddress && isInputFilled" type="error"
+      color="orange" density="compact">
+      Not an address
+    </v-alert>
+    <v-alert v-show="notChecksummedAddressWarning" type="warning"
+      color="orange" density="compact" variant="outline">
+      Not a checksummed address
+    </v-alert>
+  </v-col>
+</template>
+
+<script lang="ts">
+import {
+  computed, defineComponent, ref, watch,
+} from 'vue';
+import { useAction, useGetter } from '@/common/store/helper';
+import * as rskUtils from '@rsksmart/rsk-utils';
+import * as constants from '@/common/store/constants';
+import { EnvironmentAccessorService } from '@/common/services/enviroment-accessor.service';
+
+export default defineComponent({
+  name: 'RskDestinationAddress',
+  setup(props, context) {
+    const connectedAccount = useGetter<string>('web3Session', constants.SESSION_GET_CHECKSUMMED_ACCOUNT);
+    const address = ref(connectedAccount.value);
+    const { isAddress, isValidAddress } = rskUtils;
+
+    const CHAIN_ID = EnvironmentAccessorService.getEnvironmentVariables()
+      .vueAppCoin === constants.BTC_NETWORK_MAINNET ? 30 : 31;
+
+    const notChecksummedAddressWarning = computed(() => {
+      if (isAddress(address.value)) {
+        return !isValidAddress(address.value, CHAIN_ID);
+      }
+      return false;
+    });
+
+    const isInputFilled = computed(() => address.value !== '');
+    const isValidInputAddress = computed(() => isInputFilled.value && isAddress(address.value));
+    const setRskAddress = useAction('pegInTx', constants.PEGIN_TX_ADD_RSK_ADDRESS);
+    const setRskAddressForFlyover = useAction('flyoverPegin', constants.FLYOVER_PEGIN_ADD_ROOTSTOCK_ADDRESS);
+
+    watch(address, async () => {
+      if (isValidInputAddress.value) {
+        await setRskAddress(address.value);
+        await setRskAddressForFlyover(address.value);
+      }
+      context.emit('validAddress', isValidInputAddress.value, address.value);
+    });
+
+    const clearSession = useAction('web3Session', constants.WEB3_SESSION_CLEAR_ACCOUNT);
+    const connectWeb3 = useAction('web3Session', constants.SESSION_CONNECT_WEB3);
+    function connectOrDisconnect() {
+      if (connectedAccount.value) {
+        clearSession().then(() => { address.value = ''; });
+      } else {
+        connectWeb3().then(() => { address.value = connectedAccount.value; });
+      }
+    }
+
+    if (connectedAccount.value) {
+      setRskAddress(address.value);
+    }
+
+    return {
+      address,
+      connectedAccount,
+      connectOrDisconnect,
+      isValidInputAddress,
+      notChecksummedAddressWarning,
+      isInputFilled,
+    };
+  },
+});
+</script>
diff --git a/src/pegin/components/create/SendBitcoin.vue b/src/pegin/components/create/SendBitcoin.vue
index b1fc6e07..14f948f4 100644
--- a/src/pegin/components/create/SendBitcoin.vue
+++ b/src/pegin/components/create/SendBitcoin.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container>
+  <v-container class="pt-0">
     <template v-if="!walletDataReady">
       <connect-device @continueToForm="startAskingForBalance"
                       :sendBitcoinState="sendBitcoinState"
@@ -92,7 +92,6 @@ export default defineComponent({
     const startAskingForBalanceStore = useAction('pegInTx', constants.PEGIN_TX_START_ASKING_FOR_BALANCE);
     const stopAskingForBalance = useAction('pegInTx', constants.PEGIN_TX_STOP_ASKING_FOR_BALANCE);
     const addNormalizedTx = useAction('pegInTx', constants.PEGIN_TX_ADD_NORMALIZED_TX);
-    const clearAccount = useAction('web3Session', constants.WEB3_SESSION_CLEAR_ACCOUNT);
     const clearStore = useAction('pegInTx', constants.PEGIN_TX_CLEAR_STATE);
     const init = useAction('pegInTx', constants.PEGIN_TX_INIT);
     const setBtcWallet = useAction('pegInTx', constants.PEGIN_TX_ADD_BITCOIN_WALLET);
@@ -219,7 +218,6 @@ export default defineComponent({
       txId.value = '';
       txError.value = '';
       setTxBuilder();
-      await clearAccount();
       await stopAskingForBalance();
     }
 
diff --git a/src/pegin/store/PeginTx/actions.ts b/src/pegin/store/PeginTx/actions.ts
index 2a22dd51..5e1e96c6 100644
--- a/src/pegin/store/PeginTx/actions.ts
+++ b/src/pegin/store/PeginTx/actions.ts
@@ -14,7 +14,9 @@ import {
   PeginConfiguration, PegInTxState, WalletAddress,
   BtcAccount, BtcWallet, MiningSpeedFee, UtxoListPerAccount, Utxo,
 } from '@/common/types';
-import { getCookie, setCookie } from '@/common/utils';
+import {
+  getClearPeginTxState, getCookie, isBTCAmountValidRegex, setCookie,
+} from '@/common/utils';
 import PeginConfigurationService from '@/pegin/services/peginConfigurationService';
 import TxFeeService from '../../services/TxFeeService';
 
@@ -93,9 +95,18 @@ export const actions: ActionTree<PegInTxState, RootState> = {
   [constants.PEGIN_TX_SELECT_ACCOUNT_TYPE]: ({ commit }, accountType: BtcAccount): void => {
     commit(constants.PEGIN_TX_SET_ACCOUNT_TYPE, accountType);
   },
-  [constants.PEGIN_TX_ADD_AMOUNT_TO_TRANSFER]: ({ commit }, amount: SatoshiBig): void => {
-    commit(constants.PEGIN_TX_SET_AMOUNT_TO_TRANSFER, amount);
-  },
+  [constants.PEGIN_TX_ADD_AMOUNT_TO_TRANSFER]:
+    ({ commit, dispatch, state }, amount: SatoshiBig): void => {
+      commit(constants.PEGIN_TX_SET_AMOUNT_TO_TRANSFER, amount);
+      const minValue = new SatoshiBig(state.peginConfiguration.minValue, 'btc');
+      const isValidAmount = isBTCAmountValidRegex(amount.toBTCString()) && amount.gte(minValue);
+      if (isValidAmount) {
+        dispatch(constants.PEGIN_TX_CALCULATE_TX_FEE);
+      }
+      if (amount.eq(0)) {
+        commit(constants.PEGIN_TX_SET_CALCULATED_TX_FEE, getClearPeginTxState().calculatedFees);
+      }
+    },
   [constants.PEGIN_TX_CALCULATE_TX_FEE]: ({ commit, state, getters }):
     Promise<void> => new Promise<void>((resolve, reject) => {
       if (!state.selectedAccount) {
diff --git a/src/scss/settings.scss b/src/scss/settings.scss
index fac981f5..601eca61 100644
--- a/src/scss/settings.scss
+++ b/src/scss/settings.scss
@@ -41,6 +41,9 @@
       'size': 0.75rem,
     ),
     "button": (
+      "size": 0.875rem,
+      "line-height": 1,
+      "letter-spacing": normal,
       "text-transform": none,
     )
   ),