diff --git a/package-lock.json b/package-lock.json
index 4a5959cf..2ccc931a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@invariant-labs/a0-sdk": "^0.2.11",
+        "@invariant-labs/a0-sdk": "^0.2.15",
         "@mui/icons-material": "^5.15.15",
         "@mui/material": "^5.15.15",
         "@nightlylabs/wallet-selector-polkadot": "^0.2.5",
@@ -2566,11 +2566,11 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@invariant-labs/a0-sdk": {
-      "version": "0.2.11",
-      "resolved": "https://registry.npmjs.org/@invariant-labs/a0-sdk/-/a0-sdk-0.2.11.tgz",
-      "integrity": "sha512-u01pVliIQjm5W37al9pfaqWe/7tvvPOUdzXwopFk2M8xDxICqFyUXb0gk0MrdO//xHPdmk5SEXagS9zOO2zcMg==",
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/@invariant-labs/a0-sdk/-/a0-sdk-0.2.15.tgz",
+      "integrity": "sha512-x+awjvwfWtjy/T571ZZCX2vEoB8R3Q2125IvDtVMlB9ljHUP5EWpXi++1UTvK6at5OYsf3hNmrO88r7R6CnNsQ==",
       "dependencies": {
-        "@invariant-labs/a0-sdk-wasm": "^0.1.21",
+        "@invariant-labs/a0-sdk-wasm": "^0.1.22",
         "@polkadot/api": "^10.12.4",
         "@polkadot/api-contract": "^10.12.4",
         "@scio-labs/use-inkathon": "^0.6.3",
@@ -2579,9 +2579,9 @@
       }
     },
     "node_modules/@invariant-labs/a0-sdk-wasm": {
-      "version": "0.1.21",
-      "resolved": "https://registry.npmjs.org/@invariant-labs/a0-sdk-wasm/-/a0-sdk-wasm-0.1.21.tgz",
-      "integrity": "sha512-I+Y4byfEPzm8kihZp7Yoft1gLrn0zOXWrhmvdMJ0/6Kz5uwP7QyRkPPIdfAla/sVLGERwkg9gsalfN5Uv2gx9A=="
+      "version": "0.1.22",
+      "resolved": "https://registry.npmjs.org/@invariant-labs/a0-sdk-wasm/-/a0-sdk-wasm-0.1.22.tgz",
+      "integrity": "sha512-e172o+Q5+aThR5nr4Fy1ddlpoF4EHCqWzuv9qK9KVP+UZMirHawTAi6OOtPMPsIIY6Ms8t5FSDeIy07mrFeY5g=="
     },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
@@ -12494,9 +12494,9 @@
       "license": "MIT"
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.0.tgz",
-      "integrity": "sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
+      "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index c69deb19..d1981083 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@invariant-labs/a0-sdk": "^0.2.11",
+    "@invariant-labs/a0-sdk": "^0.2.15",
     "@mui/icons-material": "^5.15.15",
     "@mui/material": "^5.15.15",
     "@nightlylabs/wallet-selector-polkadot": "^0.2.5",
diff --git a/src/components/Modals/Slippage/Slippage.tsx b/src/components/Modals/Slippage/Slippage.tsx
index e187bdd7..d8bfa3c3 100644
--- a/src/components/Modals/Slippage/Slippage.tsx
+++ b/src/components/Modals/Slippage/Slippage.tsx
@@ -118,7 +118,7 @@ const Slippage: React.FC<Props> = ({
         <Grid container className={classes.detailsWrapper}>
           <Grid container justifyContent='space-between' style={{ marginBottom: 6 }}>
             <Typography component='h2'>{headerText ?? 'Exchange Settings'}</Typography>
-            <Button className={classes.selectTokenClose} onClick={handleClose} />
+            <Button className={classes.selectTokenClose} onClick={handleClose} aria-label='Close' />
           </Grid>
           <Typography className={classes.label}>Slippage tolerance</Typography>
           <Grid container gap='9px'>
diff --git a/src/components/NewPosition/NewPosition.tsx b/src/components/NewPosition/NewPosition.tsx
index 27ac520c..f204382b 100644
--- a/src/components/NewPosition/NewPosition.tsx
+++ b/src/components/NewPosition/NewPosition.tsx
@@ -513,7 +513,7 @@ export const NewPosition: React.FC<INewPosition> = ({
           ) : null}
           <Grid className={classes.optionsWrapper}>
             <Hidden mdDown>
-              {poolKey !== '' && (
+              {tokenAIndex !== null && tokenBIndex !== null && (
                 <ConcentrationTypeSwitch
                   onSwitch={val => {
                     if (val) {
diff --git a/src/components/NewPosition/RangeSelector/RangeSelector.tsx b/src/components/NewPosition/RangeSelector/RangeSelector.tsx
index a95cf9f6..f0720814 100644
--- a/src/components/NewPosition/RangeSelector/RangeSelector.tsx
+++ b/src/components/NewPosition/RangeSelector/RangeSelector.tsx
@@ -377,7 +377,7 @@ export const RangeSelector: React.FC<IRangeSelector> = ({
           ? cachedConcentrationArray.length - 1
           : concentrationIndex
       setConcentrationIndex(index)
-      console.log('test')
+
       const { leftRange, rightRange } = calculateConcentrationRange(
         tickSpacing,
         cachedConcentrationArray[index],
diff --git a/src/components/NewPosition/style.ts b/src/components/NewPosition/style.ts
index 6b3abfad..a6210708 100644
--- a/src/components/NewPosition/style.ts
+++ b/src/components/NewPosition/style.ts
@@ -106,7 +106,9 @@ const useStyles = makeStyles()(theme => {
       }
     },
     switch: {
-      transition: 'opacity 500ms'
+      transition: 'opacity 500ms',
+      display: 'flex',
+      justifyContent: 'flex-end'
     },
     titleContainer: {
       maxWidth: 464,
@@ -122,7 +124,9 @@ const useStyles = makeStyles()(theme => {
     },
     optionsWrapper: {
       display: 'flex',
-      alignItems: 'center'
+      alignItems: 'center',
+      flex: 1,
+      justifyContent: 'flex-end'
     }
   }
 })
diff --git a/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx b/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
index 016485d8..83f03336 100644
--- a/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
+++ b/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
@@ -75,8 +75,8 @@ const SinglePositionInfo: React.FC<IProp> = ({
           />
           <img
             className={classes.arrowIcon}
-            src={icons.ArrowIcon}
-            alt={'Arrow'}
+            src={icons.swapListIcon}
+            alt='Reverse tokens'
             onClick={swapHandler}
           />
           <img
diff --git a/src/components/PositionDetails/SinglePositionInfo/style.ts b/src/components/PositionDetails/SinglePositionInfo/style.ts
index b8415dbe..02d0fe38 100644
--- a/src/components/PositionDetails/SinglePositionInfo/style.ts
+++ b/src/components/PositionDetails/SinglePositionInfo/style.ts
@@ -22,10 +22,10 @@ export const useStyles = makeStyles()((theme: Theme) => ({
     }
   },
   arrowIcon: {
-    width: 22,
+    width: 32,
     marginRight: 8,
     marginLeft: 8,
-    height: 22,
+    height: 32,
     borderRadius: '100%',
     padding: 4,
 
@@ -36,8 +36,7 @@ export const useStyles = makeStyles()((theme: Theme) => ({
     },
     '&:hover': {
       cursor: 'pointer',
-      background: 'rgba(255, 255, 255, 0.15)',
-      filter: 'brightness(1.2)',
+      filter: 'brightness(2)',
       '@media (hover: none)': {
         filter: 'none'
       }
diff --git a/src/components/Swap/Swap.tsx b/src/components/Swap/Swap.tsx
index 9fcdad33..87bfac9c 100644
--- a/src/components/Swap/Swap.tsx
+++ b/src/components/Swap/Swap.tsx
@@ -245,10 +245,6 @@ export const Swap: React.FC<ISwap> = ({
     return () => clearTimeout(timeout)
   }, [refresherTime, tokenFromIndex, tokenToIndex])
 
-  useEffect(() => {
-    updateEstimatedAmount()
-  }, [tokenToIndex, tokenFromIndex, pools.length])
-
   useEffect(() => {
     if (inputRef !== inputTarget.DEFAULT) {
       const temp: string = amountFrom
@@ -302,13 +298,6 @@ export const Swap: React.FC<ISwap> = ({
     return !!swapPool
   }
 
-  const updateEstimatedAmount = () => {
-    if (tokenFromIndex !== null && tokenToIndex !== null) {
-      const amount = getAmountOut(tokens[tokenToIndex])
-      setAmountTo(+amount === 0 ? '' : trimLeadingZeros(amount))
-    }
-  }
-
   const isError = (error: SwapError): boolean => {
     if (simulateResult.errors) {
       return simulateResult.errors.some(err => err === error)
@@ -440,6 +429,11 @@ export const Swap: React.FC<ISwap> = ({
 
   useEffect(() => {
     setRefresherTime(REFRESHER_INTERVAL)
+
+    if (tokenFromIndex === tokenToIndex) {
+      setAmountFrom('')
+      setAmountTo('')
+    }
   }, [tokenFromIndex, tokenToIndex])
 
   return (
@@ -517,9 +511,7 @@ export const Swap: React.FC<ISwap> = ({
             tokens={tokens}
             current={tokenFromIndex !== null ? tokens[tokenFromIndex] : null}
             onSelect={setTokenFromIndex}
-            disabled={
-              tokenFromIndex === null || tokenToIndex === null || tokenFromIndex === tokenToIndex
-            }
+            disabled={tokenFromIndex === tokenToIndex || tokenFromIndex === null}
             hideBalances={walletStatus !== Status.Initialized}
             handleAddToken={handleAddToken}
             commonTokens={commonTokens}
@@ -603,9 +595,7 @@ export const Swap: React.FC<ISwap> = ({
             tokens={tokens}
             current={tokenToIndex !== null ? tokens[tokenToIndex] : null}
             onSelect={setTokenToIndex}
-            disabled={
-              tokenFromIndex === null || tokenToIndex === null || tokenFromIndex === tokenToIndex
-            }
+            disabled={tokenFromIndex === tokenToIndex || tokenToIndex === null}
             hideBalances={walletStatus !== Status.Initialized}
             handleAddToken={handleAddToken}
             commonTokens={commonTokens}
diff --git a/src/static/icons.ts b/src/static/icons.ts
index f671d68f..56f9c690 100644
--- a/src/static/icons.ts
+++ b/src/static/icons.ts
@@ -28,6 +28,7 @@ import copyAddress from './svg/copy-address.svg'
 import emptyIcon from './svg/empty.svg'
 import plusIcon from './svg/plus.svg'
 import horizontalSwapIcon from './svg/horizontalSwapArrows.svg'
+import swapListIcon from './svg/swap-list.svg'
 
 const icons: { [key: string]: string } = {
   clear: clearIcon,
@@ -59,7 +60,8 @@ const icons: { [key: string]: string } = {
   copyAddress: copyAddress,
   empty: emptyIcon,
   plusIcon: plusIcon,
-  horizontalSwapIcon: horizontalSwapIcon
+  horizontalSwapIcon: horizontalSwapIcon,
+  swapListIcon: swapListIcon
 }
 
 export default icons
diff --git a/src/store/consts/static.ts b/src/store/consts/static.ts
index 190c318a..db99968e 100644
--- a/src/store/consts/static.ts
+++ b/src/store/consts/static.ts
@@ -278,7 +278,8 @@ export const EMPTY_POSITION: Position = {
   feeGrowthInsideY: 0n,
   lastBlockNumber: 0n,
   tokensOwedX: 0n,
-  tokensOwedY: 0n
+  tokensOwedY: 0n,
+  createdAt: 0n
 }
 
 export const POSITIONS_PER_QUERY =
diff --git a/src/store/sagas/pools.ts b/src/store/sagas/pools.ts
index 9f65c524..f7bd4192 100644
--- a/src/store/sagas/pools.ts
+++ b/src/store/sagas/pools.ts
@@ -49,8 +49,6 @@ export function* fetchPoolsDataForList(action: PayloadAction<ListPoolsRequest>)
   yield* put(actions.addTokens(unknownTokensData))
   yield* put(actions.updateTokenBalances(knownTokenBalances))
 
-  console.log(yield* select(tokens))
-
   yield* put(actions.addPoolsForList({ data: pools, listType: action.payload.listType }))
 }
 
diff --git a/src/store/sagas/positions.ts b/src/store/sagas/positions.ts
index 2628179a..4d676469 100644
--- a/src/store/sagas/positions.ts
+++ b/src/store/sagas/positions.ts
@@ -652,7 +652,6 @@ export function* handleGetPositionsListPage(
   }
 
   if (!length || refresh) {
-    console.log('call', index)
     const result = yield* call(
       [invariant, invariant.getPositions],
       walletAddress,
@@ -681,7 +680,6 @@ export function* handleGetPositionsListPage(
 
   if (!isPageLoaded || refresh) {
     if (length && !refresh) {
-      console.log('call', index)
       const result = yield* call(
         [invariant, invariant.getPositions],
         walletAddress,
diff --git a/src/store/selectors/positions.ts b/src/store/selectors/positions.ts
index 0e392a06..0c85a07a 100644
--- a/src/store/selectors/positions.ts
+++ b/src/store/selectors/positions.ts
@@ -61,10 +61,8 @@ export const positionsWithPoolsData = createSelector(
       const tokenY = tokens.find(token => token.assetAddress === position.poolKey.tokenY)
 
       if (!tokenX) {
-        console.log(`Token ${position.poolKey.tokenX} not found for position`)
         continue
       } else if (!tokenY) {
-        console.log(`Token ${position.poolKey.tokenY} not found for position`)
         continue
       }