diff --git a/src/front/shared/helpers/paddingForSwapList.ts b/src/front/shared/helpers/paddingForSwapList.ts
deleted file mode 100644
index 22b0aee47e..0000000000
--- a/src/front/shared/helpers/paddingForSwapList.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-const getPaddingValue = ({ step }) => {
-  if (step <= 2) {
-    const getPaddingValue = 120
-    return getPaddingValue
-  }
-  if (step > 2 && step <= 5) {
-    const getPaddingValue = 120
-    return getPaddingValue
-  }
-  if (step >= 6 && step < 7) {
-    const getPaddingValue = 120
-    return getPaddingValue
-  }
-  if (step >= 7) {
-    const getPaddingValue = 120
-    return getPaddingValue
-  }
-}
-export default getPaddingValue
\ No newline at end of file
diff --git a/src/front/shared/pages/Swap/UTXOSwap/EthToUTXO.tsx b/src/front/shared/pages/Swap/UTXOSwap/EthToUTXO.tsx
index e69155eb19..c7d971e8c7 100644
--- a/src/front/shared/pages/Swap/UTXOSwap/EthToUTXO.tsx
+++ b/src/front/shared/pages/Swap/UTXOSwap/EthToUTXO.tsx
@@ -12,7 +12,7 @@ import FeeControler from '../FeeControler/FeeControler'
 import SwapProgress from './SwapProgress/SwapProgress'
 import SwapList from './SwapList/SwapList'
 import DepositWindow from './DepositWindow/DepositWindow'
-import paddingForSwapList from 'shared/helpers/paddingForSwapList'
+
 
 @CSSModules(styles)
 export default class EthToUTXO extends Component<any, any> {
@@ -42,7 +42,6 @@ export default class EthToUTXO extends Component<any, any> {
       enoughBalance,
       signed: false,
       depositWindow,
-      paddingContainerValue: 0,
       enabledButton: false,
       isAddressCopied: false,
       flow: this.swap.flow.state,
@@ -58,7 +57,6 @@ export default class EthToUTXO extends Component<any, any> {
 
   componentDidMount() {
     const { swap, flow: { isSignFetching, isMeSigned, step } } = this.state
-    this.changePaddingValue()
     window.addEventListener('resize', this.updateWindowDimensions)
     this.updateWindowDimensions()
     this.signTimer = setInterval(() => {
@@ -83,23 +81,10 @@ export default class EthToUTXO extends Component<any, any> {
     window.removeEventListener('resize', this.updateWindowDimensions)
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if (prevState.flow !== this.state.flow) {
-      this.changePaddingValue()
-    }
-  }
-
   updateWindowDimensions = () => {
     this.setState({ windowWidth: window.innerWidth })
   }
 
-  changePaddingValue = () => {
-    const { flow: { step } } = this.state
-    this.setState(() => ({
-      paddingContainerValue: paddingForSwapList({ step }),
-    }))
-  }
-
   confirmScriptChecked = () => {
     const {
       verifyScriptFunc,
@@ -134,8 +119,6 @@ export default class EthToUTXO extends Component<any, any> {
       flow: values,
     })
 
-    this.changePaddingValue()
-
   }
 
   signSwap = () => {
@@ -165,12 +148,12 @@ export default class EthToUTXO extends Component<any, any> {
       wallets,
     } = this.props
 
-    const { currencyAddress, flow, isShowingScript, swap, currencyData, signed, paddingContainerValue, buyCurrency, sellCurrency, windowWidth } = this.state
+    const { currencyAddress, flow, isShowingScript, swap, currencyData, signed, buyCurrency, sellCurrency, windowWidth } = this.state
     const stepse = flow.step
 
     return (
       <div>
-        <div styleName="swapContainer" style={(isMobile && (windowWidth < 569)) ? { paddingTop: paddingContainerValue } : { paddingTop: 0 }}>
+        <div styleName="swapContainer" style={(isMobile && (windowWidth < 569)) ? { paddingTop: 120 } : { paddingTop: 0 }}>
           <div>
             <div styleName="swapInfo">
               {this.swap.id &&
diff --git a/src/front/shared/pages/Swap/UTXOSwap/EthTokenToUTXO.tsx b/src/front/shared/pages/Swap/UTXOSwap/EthTokenToUTXO.tsx
index e75ce4002b..677814c101 100644
--- a/src/front/shared/pages/Swap/UTXOSwap/EthTokenToUTXO.tsx
+++ b/src/front/shared/pages/Swap/UTXOSwap/EthTokenToUTXO.tsx
@@ -11,7 +11,6 @@ import SwapList from './SwapList/SwapList'
 import FeeControler from '../FeeControler/FeeControler'
 import FailControler from '../FailControler/FailControler'
 import DepositWindow from './DepositWindow/DepositWindow'
-import paddingForSwapList from 'shared/helpers/paddingForSwapList'
 
 
 @CSSModules(styles)
@@ -39,7 +38,6 @@ export default class EthTokenToUTXO extends Component<any, any> {
       currencyData,
       tokenItems,
       signed: false,
-      paddingContainerValue: 0,
       enabledButton: false,
       isAddressCopied: false,
       flow: this.swap.flow.state,
@@ -66,8 +64,6 @@ export default class EthTokenToUTXO extends Component<any, any> {
       },
     } = this.state
 
-    this.changePaddingValue()
-
     this.signTimer = setInterval(() => {
       if (!this.state.flow.isMeSigned) {
         this.signSwap()
@@ -87,23 +83,10 @@ export default class EthTokenToUTXO extends Component<any, any> {
     this.requestMaxAllowance()
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if (prevState.flow !== this.state.flow) {
-      this.changePaddingValue()
-    }
-  }
-
   confirmScriptChecked = () => {
     this.swap.flow[this._fields.verifyScriptFunc]()
   }
 
-  changePaddingValue = () => {
-    const { flow: { step } } = this.state
-    this.setState(() => ({
-      paddingContainerValue: paddingForSwapList({ step }),
-    }))
-  }
-
   handleFlowStateUpdate = (values) => {
 
     const stepNumbers = {
@@ -168,7 +151,6 @@ export default class EthTokenToUTXO extends Component<any, any> {
       currencyData,
       tokenItems,
       signed,
-      paddingContainerValue,
       swap,
     } = this.state
 
diff --git a/src/front/shared/pages/Swap/UTXOSwap/UTXOToEth.tsx b/src/front/shared/pages/Swap/UTXOSwap/UTXOToEth.tsx
index 102d0577a7..8796312b3a 100644
--- a/src/front/shared/pages/Swap/UTXOSwap/UTXOToEth.tsx
+++ b/src/front/shared/pages/Swap/UTXOSwap/UTXOToEth.tsx
@@ -14,7 +14,6 @@ import SwapProgress from './SwapProgress/SwapProgress'
 import DepositWindow from './DepositWindow/DepositWindow'
 import FeeControler from '../FeeControler/FeeControler'
 import SwapList from './SwapList/SwapList'
-import paddingForSwapList from 'shared/helpers/paddingForSwapList'
 
 
 @CSSModules(styles)
@@ -34,7 +33,6 @@ export default class UTXOToEth extends Component<any, any> {
       currencyData,
       enabledButton: false,
       flow: this.swap.flow.state,
-      paddingContainerValue: 60,
       currencyAddress: currencyData.address,
       secret: crypto.randomBytes(32).toString('hex'),
     }
@@ -48,7 +46,6 @@ export default class UTXOToEth extends Component<any, any> {
     const { flow: { isSignFetching, isMeSigned, step, isParticipantSigned } } = this.state
     window.addEventListener('resize', this.updateWindowDimensions)
     this.updateWindowDimensions()
-    this.changePaddingValue()
     this.ParticipantTimer = setInterval(() => {
       if (this.state.flow.isParticipantSigned && this.state.destinationBuyAddress) {
         this.submitSecret()
@@ -75,19 +72,6 @@ export default class UTXOToEth extends Component<any, any> {
     this.swap.flow.submitSecret(secret)
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if (prevState.flow !== this.state.flow) {
-      this.changePaddingValue()
-    }
-  }
-
-  changePaddingValue = () => {
-    const { flow: { step } } = this.state
-    this.setState(() => ({
-      paddingContainerValue: paddingForSwapList({ step }),
-    }))
-  }
-
   handleFlowStateUpdate = (values) => {
     /** todo - not used - remove **/
     const stepNumbers = {
@@ -106,8 +90,6 @@ export default class UTXOToEth extends Component<any, any> {
     this.setState({
       flow: values,
     })
-
-    this.changePaddingValue()
   }
 
   updateBalance = () => {
@@ -147,14 +129,14 @@ export default class UTXOToEth extends Component<any, any> {
       wallets,
     }  = this.props
 
-    const { flow, isShowingGhostScript, currencyData, paddingContainerValue, windowWidth } = this.state
+    const { flow, isShowingGhostScript, currencyData, windowWidth } = this.state
 
     return (
       <div>
         <div
           styleName="swapContainer"
           style={(isMobile && (windowWidth < 569))
-            ? { paddingTop: paddingContainerValue }
+            ? { paddingTop: 120 }
             : { paddingTop: 0 }
           }>
           <div>
diff --git a/src/front/shared/pages/Swap/UTXOSwap/UTXOToEthToken.tsx b/src/front/shared/pages/Swap/UTXOSwap/UTXOToEthToken.tsx
index e7f0a39c7a..9f1b489b4d 100644
--- a/src/front/shared/pages/Swap/UTXOSwap/UTXOToEthToken.tsx
+++ b/src/front/shared/pages/Swap/UTXOSwap/UTXOToEthToken.tsx
@@ -12,7 +12,6 @@ import DepositWindow from './DepositWindow/DepositWindow'
 import SwapProgress from './SwapProgress/SwapProgress'
 import SwapList from './SwapList/SwapList'
 import FeeControler from '../FeeControler/FeeControler'
-import paddingForSwapList from 'shared/helpers/paddingForSwapList'
 
 
 @CSSModules(styles)
@@ -37,7 +36,6 @@ export default class UTXOToEthToken extends Component<any, any> {
       enabledButton: false,
       isAddressCopied: false,
       flow: this.swap.flow.state,
-      paddingContainerValue: 0,
       destinationAddressTimer: true,
       isShowingScript: false,
       currencyAddress: currencyData.address,
@@ -59,7 +57,6 @@ export default class UTXOToEthToken extends Component<any, any> {
 
   componentDidMount() {
     const { swap, flow: { step, isParticipantSigned } } = this.state
-    this.changePaddingValue()
 
     this.ParticipantTimer = setInterval(() => {
       if (this.state.flow.isParticipantSigned && this.state.destinationBuyAddress) {
@@ -71,23 +68,11 @@ export default class UTXOToEthToken extends Component<any, any> {
     }, 3000)
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if (prevState.flow !== this.state.flow) {
-      this.changePaddingValue()
-    }
-  }
-
   submitSecret = () => {
     const { secret } = this.state
     this.swap.flow.submitSecret(secret)
   }
 
-  changePaddingValue = () => {
-    const { flow: { step } } = this.state
-    this.setState(() => ({
-      paddingContainerValue: paddingForSwapList({ step }),
-    }))
-  }
 
   handleFlowStateUpdate = (values) => {
 
@@ -166,7 +151,6 @@ export default class UTXOToEthToken extends Component<any, any> {
       flow,
       secret,
       ethAddress,
-      paddingContainerValue,
       isShowingScript,
     } = this.state
 
diff --git a/src/front/shared/pages/Swap/_BtcToGhost.tsx_ b/src/front/shared/pages/Swap/_BtcToGhost.tsx_
index a2c50db40f..608e6d52a5 100644
--- a/src/front/shared/pages/Swap/_BtcToGhost.tsx_
+++ b/src/front/shared/pages/Swap/_BtcToGhost.tsx_
@@ -16,7 +16,7 @@ import FeeControler from './FeeControler/FeeControler'
 import SwapProgress from './SwapProgress/SwapProgress'
 import SwapList from './SwapList/SwapList'
 import DepositWindow from './DepositWindow/DepositWindow'
-import paddingForSwapList from 'shared/helpers/paddingForSwapList'
+
 
 @CSSModules(styles)
 export default class BtcToGhost extends Component<any, any> {
@@ -37,7 +37,6 @@ export default class BtcToGhost extends Component<any, any> {
       enoughBalance,
       signed: false,
       depositWindow,
-      paddingContainerValue: 0,
       enabledButton: false,
       isAddressCopied: false,
       flow: this.swap.flow.state,
@@ -57,7 +56,6 @@ export default class BtcToGhost extends Component<any, any> {
 
   componentDidMount() {
     const { swap, flow: { isSignFetching, isMeSigned, step } } = this.state
-    this.changePaddingValue()
     window.addEventListener('resize', this.updateWindowDimensions)
     this.updateWindowDimensions()
     this.signTimer = setInterval(() => {
@@ -82,23 +80,10 @@ export default class BtcToGhost extends Component<any, any> {
     window.removeEventListener('resize', this.updateWindowDimensions)
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if (prevState.flow !== this.state.flow) {
-      this.changePaddingValue()
-    }
-  }
-
   updateWindowDimensions = () => {
     this.setState({ windowWidth: window.innerWidth })
   }
 
-  changePaddingValue = () => {
-    const { flow: { step } } = this.state
-    this.setState(() => ({
-      paddingContainerValue: paddingForSwapList({ step }),
-    }))
-  }
-
   confirmGhostScriptChecked = () => {
     this.swap.flow.verifyGhostScript()
   }
@@ -123,8 +108,6 @@ export default class BtcToGhost extends Component<any, any> {
       flow: values,
     })
 
-    this.changePaddingValue()
-
   }
 
   signSwap = () => {
@@ -154,12 +137,12 @@ export default class BtcToGhost extends Component<any, any> {
       wallets,
     } = this.props
 
-    const { currencyAddress, flow, isShowingBitcoinScript, swap, currencyData, signed, paddingContainerValue, buyCurrency, sellCurrency, windowWidth } = this.state
+    const { currencyAddress, flow, isShowingBitcoinScript, swap, currencyData, signed, buyCurrency, sellCurrency, windowWidth } = this.state
     const stepse = flow.step
 
     return (
       <div>
-        <div styleName="swapContainer" style={(isMobile && (windowWidth < 569)) ? { paddingTop: paddingContainerValue } : { paddingTop: 0 }}>
+        <div styleName="swapContainer" style={(isMobile && (windowWidth < 569)) ? { paddingTop: 120 } : { paddingTop: 0 }}>
           <div>
             <div styleName="swapInfo">
               {this.swap.id &&
diff --git a/src/front/shared/pages/Swap/_GhostToBtc.tsx_ b/src/front/shared/pages/Swap/_GhostToBtc.tsx_
index 99238eb9ef..061cb1cf6b 100644
--- a/src/front/shared/pages/Swap/_GhostToBtc.tsx_
+++ b/src/front/shared/pages/Swap/_GhostToBtc.tsx_
@@ -16,7 +16,7 @@ import FeeControler from './FeeControler/FeeControler'
 import SwapProgress from './SwapProgress/SwapProgress'
 import SwapList from './SwapList/SwapList'
 import DepositWindow from './DepositWindow/DepositWindow'
-import paddingForSwapList from 'shared/helpers/paddingForSwapList'
+
 
 @CSSModules(styles)
 export default class GhostToBtc extends Component<any, any> {
@@ -37,7 +37,6 @@ export default class GhostToBtc extends Component<any, any> {
       enoughBalance,
       signed: false,
       depositWindow,
-      paddingContainerValue: 0,
       enabledButton: false,
       isAddressCopied: false,
       flow: this.swap.flow.state,
@@ -57,7 +56,6 @@ export default class GhostToBtc extends Component<any, any> {
 
   componentDidMount() {
     const { swap, flow: { isSignFetching, isMeSigned, step } } = this.state
-    this.changePaddingValue()
     window.addEventListener('resize', this.updateWindowDimensions)
     this.updateWindowDimensions()
     this.signTimer = setInterval(() => {
@@ -82,23 +80,10 @@ export default class GhostToBtc extends Component<any, any> {
     window.removeEventListener('resize', this.updateWindowDimensions)
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if (prevState.flow !== this.state.flow) {
-      this.changePaddingValue()
-    }
-  }
-
   updateWindowDimensions = () => {
     this.setState({ windowWidth: window.innerWidth })
   }
 
-  changePaddingValue = () => {
-    const { flow: { step } } = this.state
-    this.setState(() => ({
-      paddingContainerValue: paddingForSwapList({ step }),
-    }))
-  }
-
   confirmBTCScriptChecked = () => {
     this.swap.flow.verifyBtcScript()
   }
@@ -123,8 +108,6 @@ export default class GhostToBtc extends Component<any, any> {
       flow: values,
     })
 
-    this.changePaddingValue()
-
   }
 
   signSwap = () => {
@@ -154,12 +137,12 @@ export default class GhostToBtc extends Component<any, any> {
       wallets,
     } = this.props
 
-    const { currencyAddress, flow, isShowingBitcoinScript, swap, currencyData, signed, paddingContainerValue, buyCurrency, sellCurrency, windowWidth } = this.state
+    const { currencyAddress, flow, isShowingBitcoinScript, swap, currencyData, signed, buyCurrency, sellCurrency, windowWidth } = this.state
     const stepse = flow.step
 
     return (
       <div>
-        <div styleName="swapContainer" style={(isMobile && (windowWidth < 569)) ? { paddingTop: paddingContainerValue } : { paddingTop: 0 }}>
+        <div styleName="swapContainer" style={(isMobile && (windowWidth < 569)) ? { paddingTop: 120 } : { paddingTop: 0 }}>
           <div>
             <div styleName="swapInfo">
               {this.swap.id &&