diff --git a/src/components/swaptab/index.js b/src/components/swaptab/index.js
index 42b5576..4bb6a1a 100644
--- a/src/components/swaptab/index.js
+++ b/src/components/swaptab/index.js
@@ -108,6 +108,7 @@ class SwapTab extends React.Component {
       maxAmount: 0,
       baseAmount: 0.001,
       quoteAmount: 0,
+      feeAmount: 0,
       errorMessage: '',
     };
   }
@@ -222,6 +223,13 @@ class SwapTab extends React.Component {
     localStorage.setItem('baseAmount', baseAmount);
   };
 
+  calculateFee = (baseAmount, isReverse) => {
+    const percentage = baseAmount * 0.01;
+    const fee = isReverse ? 0.00001 + percentage : 0.0000001 + percentage;
+
+    return Number(fee.toFixed(8));
+  };
+
   checkBaseAmount = baseAmount => {
     const { minAmount, maxAmount } = this.state;
 
@@ -234,24 +242,36 @@ class SwapTab extends React.Component {
 
   updateBaseAmount = quoteAmount => {
     const rate = new BigNumber(this.state.rate.rate);
-    const newBaseAmount = new BigNumber(quoteAmount).dividedBy(rate).toFixed(8);
-    const inputError = !this.checkBaseAmount(newBaseAmount);
+
+    const newBase = new BigNumber(quoteAmount).dividedBy(rate).toFixed(8);
+    const fee = this.calculateFee(newBase, this.baseAsset.isLightning);
+    const newBaseWithFee = Number((newBase + fee).toFixed(8));
+
+    const inputError = !this.checkBaseAmount(newBaseWithFee);
 
     this.setState({
       quoteAmount: Number(quoteAmount),
-      baseAmount: Number(newBaseAmount),
+      baseAmount: newBaseWithFee,
+      feeAmount: fee,
       inputError,
     });
   };
 
   updateQuoteAmount = baseAmount => {
     const rate = new BigNumber(this.state.rate.rate);
-    const newQuoteAmount = new BigNumber(baseAmount).times(rate).toFixed(8);
+    const fee = this.calculateFee(baseAmount, this.baseAsset.isLightning);
+
+    const newQuote = new BigNumber(baseAmount)
+      .times(rate)
+      .minus(fee * rate)
+      .toFixed(8);
+
     const inputError = !this.checkBaseAmount(baseAmount);
 
     this.setState({
-      quoteAmount: Number(newQuoteAmount),
+      quoteAmount: Math.max(Number(newQuote), 0),
       baseAmount: Number(baseAmount),
+      feeAmount: fee,
       inputError,
     });
   };
@@ -285,24 +305,25 @@ class SwapTab extends React.Component {
   render() {
     const { classes, rates, currencies } = this.props;
     const {
-      error,
       base,
       quote,
+      error,
       minAmount,
       maxAmount,
+      feeAmount,
       baseAmount,
+      inputError,
       quoteAmount,
       errorMessage,
-      inputError,
     } = this.state;
 
     return (
       <View className={classes.wrapper}>
         <View className={classes.stats}>
-          <InfoText title="Min amount:" text={`${minAmount}`} />
-          <InfoText title="Max amount:" text={`${maxAmount}`} />
-          <InfoText title="Fee:" text={'0'} />
-          <InfoText title="Rate:" text={`${this.parseRate(rates)}`} />
+          <InfoText title="Min amount" text={`${minAmount}`} />
+          <InfoText title="Max amount" text={`${maxAmount}`} />
+          <InfoText title="Fee" text={`${feeAmount}`} />
+          <InfoText title="Rate" text={`${this.parseRate(rates)}`} />
         </View>
         <View className={classes.options}>
           <View className={classes.select}>
diff --git a/src/components/text/index.js b/src/components/text/index.js
index 4a8133e..f0d1821 100644
--- a/src/components/text/index.js
+++ b/src/components/text/index.js
@@ -38,7 +38,7 @@ const infoTextStyles = () => ({
 
 const StyledInfoText = ({ title, text, classes }) => (
   <View className={classes.wrapper}>
-    <Text text={title} className={classes.title} />
+    <Text text={`${title}:`} className={classes.title} />
     <Text text={text} className={classes.text} />
   </View>
 );
diff --git a/src/views/swap/swap.js b/src/views/swap/swap.js
index 107c5a1..5a0702e 100644
--- a/src/views/swap/swap.js
+++ b/src/views/swap/swap.js
@@ -84,7 +84,7 @@ const Swap = ({
               render={props => (
                 <Controls
                   loading={swapStatus.error}
-                  text={`Fee: 0 ${swapInfo.base}`}
+                  text={`Next`}
                   loadingText={'Invalid invoice'}
                   onPress={() => {
                     startSwap(swapInfo, props.nextStage);