diff --git a/src/components/AnimatedButton/style.ts b/src/components/AnimatedButton/style.ts
index a6a7825..4f5b45e 100644
--- a/src/components/AnimatedButton/style.ts
+++ b/src/components/AnimatedButton/style.ts
@@ -46,6 +46,7 @@ const useStyles = makeStyles()(() => {
       position: 'relative',
       overflow: 'hidden',
       zIndex: 4,
+
       '&:disabled': {
         background: colors.invariant.light,
         color: colors.invariant.componentBcg,
@@ -63,9 +64,9 @@ const useStyles = makeStyles()(() => {
     },
 
     buttonRelease: {
-      background: `${colors.invariant.component} !important`,
+      background: `${colors.invariant.componentBcg} !important`,
       '&:hover': {
-        background: `${colors.invariant.component} !important`
+        background: `${colors.invariant.componentBcg} !important`
       }
     },
     background: {
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index d67d539..cc71f0f 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -191,13 +191,6 @@ export const Header: React.FC<IHeader> = ({
                 rpcStatus={rpcStatus}
               />
             </Box>
-            <Box sx={{ display: { xs: 'none', md: 'block' } }}>
-              <SelectChainButton
-                activeChain={activeChain}
-                chains={CHAINS}
-                onSelect={onChainSelect}
-              />
-            </Box>
             <SelectNetworkButton
               name={typeOfNetwork}
               networks={[
@@ -216,6 +209,13 @@ export const Header: React.FC<IHeader> = ({
               ]}
               onSelect={onNetworkSelect}
             />
+            <Box sx={{ display: { xs: 'none', md: 'block' } }}>
+              <SelectChainButton
+                activeChain={activeChain}
+                chains={CHAINS}
+                onSelect={onChainSelect}
+              />
+            </Box>
           </Grid>
           <ChangeWalletButton
             name={
diff --git a/src/components/Inputs/DepositAmountInput/DepositAmountInput.stories.tsx b/src/components/Inputs/DepositAmountInput/DepositAmountInput.stories.tsx
index 5a78d7b..1922b77 100644
--- a/src/components/Inputs/DepositAmountInput/DepositAmountInput.stories.tsx
+++ b/src/components/Inputs/DepositAmountInput/DepositAmountInput.stories.tsx
@@ -29,7 +29,8 @@ export const Null: Story = {
     style: {},
     disabled: false,
     isBalanceLoading: false,
-    walletUninitialized: true
+    walletUninitialized: true,
+    currencyIsUnknown: true
   }
 }
 
@@ -51,6 +52,7 @@ export const BTC: Story = {
     style: {},
     disabled: false,
     isBalanceLoading: false,
-    walletUninitialized: false
+    walletUninitialized: false,
+    currencyIsUnknown: true
   }
 }
diff --git a/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx b/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx
index 55fafcd..f3f1fee 100644
--- a/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx
+++ b/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx
@@ -1,13 +1,15 @@
-import { Button, Grid, Input, Tooltip, Typography } from '@mui/material'
+import { Box, Button, Grid, Input, Tooltip, Typography } from '@mui/material'
 import loadingAnimation from '@static/gif/loading.gif'
 import { formatNumber, getScaleFromString } from '@utils/utils'
 import React, { CSSProperties, useRef } from 'react'
 import useStyles from './style'
+import icons from '@static/icons'
 
 interface IProps {
   setValue: (value: string) => void
   currency: string | null
   currencyIconSrc?: string
+  currencyIsUnknown: boolean
   value?: string
   placeholder?: string
   onMaxClick: () => void
@@ -28,6 +30,7 @@ interface IProps {
 export const DepositAmountInput: React.FC<IProps> = ({
   currency,
   currencyIconSrc,
+  currencyIsUnknown,
   value,
   setValue,
   placeholder,
@@ -44,9 +47,7 @@ export const DepositAmountInput: React.FC<IProps> = ({
   isBalanceLoading,
   walletUninitialized
 }) => {
-  const { classes } = useStyles({
-    isSelected: !!currency && !walletUninitialized
-  })
+  const { classes } = useStyles({ isSelected: !!currency && !walletUninitialized })
 
   const inputRef = useRef<HTMLInputElement>(null)
 
@@ -109,7 +110,12 @@ export const DepositAmountInput: React.FC<IProps> = ({
             wrap='nowrap'>
             {currency !== null ? (
               <>
-                <img alt='currency icon' src={currencyIconSrc} className={classes.currencyIcon} />
+                <Box className={classes.imageContainer}>
+                  <img alt='currency icon' src={currencyIconSrc} className={classes.currencyIcon} />
+                  {currencyIsUnknown && (
+                    <img className={classes.warningIcon} src={icons.warningIcon} />
+                  )}
+                </Box>
                 <Typography className={classes.currencySymbol}>{currency}</Typography>
               </>
             ) : (
diff --git a/src/components/Inputs/DepositAmountInput/style.ts b/src/components/Inputs/DepositAmountInput/style.ts
index 8378e98..6b4615a 100644
--- a/src/components/Inputs/DepositAmountInput/style.ts
+++ b/src/components/Inputs/DepositAmountInput/style.ts
@@ -95,12 +95,26 @@ export const useStyles = makeStyles<{ isSelected: boolean }>()((theme: Theme, {
     color: colors.invariant.Error,
     backgroundColor: `${colors.invariant.Error}40`
   },
-  currencyIcon: {
+  imageContainer: {
     width: 20,
     height: 20,
     marginRight: 8,
-    borderRadius: '100%',
-    background: colors.white.main
+    position: 'relative',
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  currencyIcon: {
+    width: 20,
+    height: 20,
+    borderRadius: '100%'
+  },
+  warningIcon: {
+    position: 'absolute',
+    width: 12,
+    height: 12,
+    bottom: -6,
+    right: -6
   },
   currencySymbol: {
     ...typography.body3,
diff --git a/src/components/Inputs/ExchangeAmountInput/ExchangeAmountInput.tsx b/src/components/Inputs/ExchangeAmountInput/ExchangeAmountInput.tsx
index 2352ab4..647d214 100644
--- a/src/components/Inputs/ExchangeAmountInput/ExchangeAmountInput.tsx
+++ b/src/components/Inputs/ExchangeAmountInput/ExchangeAmountInput.tsx
@@ -2,7 +2,7 @@ import Select from '@components/Inputs/Select/Select'
 import { OutlinedButton } from '@components/OutlinedButton/OutlinedButton'
 import { Grid, Input, Tooltip, Typography } from '@mui/material'
 import loadingAnimation from '@static/gif/loading.gif'
-import { formatNumber } from '@utils/utils'
+import { formatNumber, trimDecimalZeros } from '@utils/utils'
 import { SwapToken } from '@store/selectors/wallet'
 import classNames from 'classnames'
 import React, { CSSProperties, useRef } from 'react'
@@ -141,6 +141,11 @@ export const AmountInput: React.FC<IProps> = ({
             inputProps={{
               inputMode: 'decimal'
             }}
+            onBlur={() => {
+              if (value) {
+                setValue(trimDecimalZeros(value))
+              }
+            }}
           />
         )}
       </Grid>
diff --git a/src/components/Inputs/Select/Select.tsx b/src/components/Inputs/Select/Select.tsx
index 123933c..5a017bb 100644
--- a/src/components/Inputs/Select/Select.tsx
+++ b/src/components/Inputs/Select/Select.tsx
@@ -3,7 +3,7 @@ import icons from '@static/icons'
 import classNames from 'classnames'
 import useStyles from './style'
 import { blurContent, unblurContent } from '@utils/uiUtils'
-import { Button } from '@mui/material'
+import { Box, Button } from '@mui/material'
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
 import SelectTokenModal from '@components/Modals/SelectModals/SelectTokenModal/SelectTokenModal'
 import { SwapToken } from '@store/selectors/wallet'
@@ -71,13 +71,16 @@ export const Select: React.FC<ISelectModal> = ({
         onClick={handleClick}
         startIcon={
           !current ? null : (
-            <img
-              className={classes.icon}
-              src={current.logoURI ?? icons.SNY}
-              alt={current.name + 'logo'}
-              width='20'
-              height='20'
-            />
+            <Box className={classes.imageContainer}>
+              <img
+                className={classes.icon}
+                src={current.logoURI ?? icons.SNY}
+                alt={current.name + 'logo'}
+                width='20'
+                height='20'
+              />
+              {current.isUnknown && <img className={classes.warningIcon} src={icons.warningIcon} />}
+            </Box>
           )
         }
         endIcon={<ExpandMoreIcon />}
diff --git a/src/components/Inputs/Select/style.ts b/src/components/Inputs/Select/style.ts
index cccf025..ccf7c9e 100644
--- a/src/components/Inputs/Select/style.ts
+++ b/src/components/Inputs/Select/style.ts
@@ -36,12 +36,25 @@ export const useStyles = makeStyles()((theme: Theme) => {
       top: 1,
       color: colors.white.main
     },
+    imageContainer: {
+      minWidth: 20,
+      maxWidth: 20,
+      height: 20,
+      marginRight: 5,
+      position: 'relative'
+    },
     icon: {
       marginRight: 5,
       minWidth: 20,
       height: 20,
-      borderRadius: '100%',
-      background: colors.white.main
+      borderRadius: '100%'
+    },
+    warningIcon: {
+      position: 'absolute',
+      width: 12,
+      height: 12,
+      bottom: -6,
+      right: -6
     }
   }
 })
diff --git a/src/components/Modals/SelectChain/SelectChain.tsx b/src/components/Modals/SelectChain/SelectChain.tsx
index ef68453..1bb87a7 100644
--- a/src/components/Modals/SelectChain/SelectChain.tsx
+++ b/src/components/Modals/SelectChain/SelectChain.tsx
@@ -47,7 +47,7 @@ export const SelectChain: React.FC<ISelectChainModal> = ({
                 chain.name === activeChain.name ? classes.active : null
               )}
               item
-              key={`chain-${chain.name}`}
+              key={`chain-${activeChain}`}
               onClick={() => {
                 onSelect(chain)
               }}>
diff --git a/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.tsx b/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.tsx
index 7d6901d..ed490d7 100644
--- a/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.tsx
+++ b/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.tsx
@@ -46,13 +46,8 @@ export const SelectMainnetRPC: React.FC<ISelectMainnetRPC> = ({
   useEffect(() => {
     if (!open && !customApplied) {
       setAddress('')
-    } else {
-      setCustomApplied(false)
-      setButtonApplied(false)
-      setActiveCustom(false)
-      setAddress('')
     }
-  }, [activeRPC])
+  }, [open])
 
   useEffect(() => {
     if (!networks.some(net => net.rpc === activeRPC)) {
@@ -60,8 +55,13 @@ export const SelectMainnetRPC: React.FC<ISelectMainnetRPC> = ({
       setButtonApplied(true)
       setActiveCustom(true)
       setAddress(activeRPC)
+    } else {
+      setCustomApplied(false)
+      setButtonApplied(false)
+      setActiveCustom(false)
+      setAddress('')
     }
-  }, [])
+  }, [activeRPC])
 
   return (
     <Popover
diff --git a/src/components/Modals/SelectModals/SelectTokenModal/SelectTokenModal.tsx b/src/components/Modals/SelectModals/SelectTokenModal/SelectTokenModal.tsx
index b42d036..c74e99e 100644
--- a/src/components/Modals/SelectModals/SelectTokenModal/SelectTokenModal.tsx
+++ b/src/components/Modals/SelectModals/SelectTokenModal/SelectTokenModal.tsx
@@ -23,7 +23,6 @@ import { SwapToken } from '@store/selectors/wallet'
 import Scrollbars from 'rc-scrollbars'
 import icons from '@static/icons'
 import { TooltipHover } from '@components/TooltipHover/TooltipHover'
-import { addressFromTokenId } from '@alephium/web3'
 
 export interface ISelectTokenModal {
   tokens: Record<string, SwapToken>
@@ -291,12 +290,17 @@ export const SelectTokenModal: React.FC<ISelectTokenModal> = ({
                       setValue('')
                       handleClose()
                     }}>
-                    <img
-                      className={classes.tokenIcon}
-                      src={token.logoURI}
-                      loading='lazy'
-                      alt={token.name + 'logo'}
-                    />
+                    <Box className={classes.imageContainer}>
+                      <img
+                        className={classes.tokenIcon}
+                        src={token.logoURI}
+                        loading='lazy'
+                        alt={token.name + 'logo'}
+                      />
+                      {token.isUnknown && (
+                        <img className={classes.warningIcon} src={icons.warningIcon} />
+                      )}
+                    </Box>
                     <Grid container className={classes.tokenContainer}>
                       <Grid
                         container
@@ -309,9 +313,7 @@ export const SelectTokenModal: React.FC<ISelectTokenModal> = ({
                         </Typography>
                         <Grid className={classes.tokenAddress} container direction='column'>
                           <a
-                            href={`https://testnet.alephium.org/addresses/${addressFromTokenId(
-                              token.assetAddress
-                            )}`}
+                            href={`https://ascan.alephzero.org/testnet/account/${token.assetAddress}`}
                             target='_blank'
                             rel='noopener noreferrer'
                             onClick={event => {
diff --git a/src/components/Modals/SelectModals/style.ts b/src/components/Modals/SelectModals/style.ts
index a7a8b76..3b234bd 100644
--- a/src/components/Modals/SelectModals/style.ts
+++ b/src/components/Modals/SelectModals/style.ts
@@ -130,8 +130,7 @@ const useStyles = makeStyles()((theme: Theme) => {
       width: 24,
       height: 24,
       borderRadius: '50%',
-      marginRight: 8,
-      background: colors.white.main
+      marginRight: 8
     },
     tokenList: {
       background: colors.invariant.component,
@@ -215,15 +214,27 @@ const useStyles = makeStyles()((theme: Theme) => {
         color: colors.invariant.text
       }
     },
-
+    imageContainer: {
+      minWidth: 30,
+      maxWidth: 30,
+      height: 30,
+      marginRight: 16,
+      position: 'relative'
+    },
     tokenIcon: {
       minWidth: 30,
       maxWidth: 30,
       height: 30,
       marginRight: 16,
       borderRadius: '50%',
-      boxShadow: '0px 0px 10px rgba(216, 255, 181, 0.5)',
-      background: colors.white.main
+      boxShadow: '0px 0px 10px rgba(216, 255, 181, 0.5)'
+    },
+    warningIcon: {
+      position: 'absolute',
+      width: 12,
+      height: 12,
+      bottom: -6,
+      right: -6
     },
     tokenBalance: {
       ...typography.body2,
diff --git a/src/components/NewPosition/DepositSelector/DepositSelector.tsx b/src/components/NewPosition/DepositSelector/DepositSelector.tsx
index ba05034..07023a8 100644
--- a/src/components/NewPosition/DepositSelector/DepositSelector.tsx
+++ b/src/components/NewPosition/DepositSelector/DepositSelector.tsx
@@ -9,7 +9,8 @@ import {
   getScaleFromString,
   parsePathFeeToFeeString,
   printBigint,
-  tickerToAddress
+  tickerToAddress,
+  trimDecimalZeros
 } from '@utils/utils'
 import classNames from 'classnames'
 import React, { useCallback, useEffect, useState } from 'react'
@@ -125,8 +126,6 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
     }
   }, [priceALoading, priceBLoading, priceA, priceB])
 
-  useEffect(() => {}, [priceA, priceB])
-
   const [hideUnknownTokens, setHideUnknownTokens] = useState<boolean>(initialHideUnknownTokensValue)
 
   const [isLoaded, setIsLoaded] = useState<boolean>(false)
@@ -348,13 +347,16 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
           tokenPrice={priceA}
           currency={tokenA !== null ? tokens[tokenA].symbol : null}
           currencyIconSrc={tokenA !== null ? tokens[tokenA].logoURI : undefined}
+          currencyIsUnknown={tokenA !== null ? tokens[tokenA].isUnknown ?? false : false}
           placeholder='0.0'
           onMaxClick={() => {
             if (tokenA === null) {
               return
             }
 
-            tokenAInputState.setValue(printBigint(tokens[tokenA].balance, tokens[tokenA].decimals))
+            tokenAInputState.setValue(
+              trimDecimalZeros(printBigint(tokens[tokenA].balance, tokens[tokenA].decimals))
+            )
           }}
           balanceValue={
             tokenA !== null ? printBigint(tokens[tokenA].balance, tokens[tokenA].decimals) : ''
@@ -366,6 +368,7 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
             if (tokenA !== null && tokenB !== null && tokenAInputState.value.length === 0) {
               tokenAInputState.setValue('0.0')
             }
+            tokenAInputState.setValue(trimDecimalZeros(tokenAInputState.value))
           }}
           {...tokenAInputState}
           priceLoading={priceALoading}
@@ -377,13 +380,16 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
           tokenPrice={priceB}
           currency={tokenB !== null ? tokens[tokenB].symbol : null}
           currencyIconSrc={tokenB !== null ? tokens[tokenB].logoURI : undefined}
+          currencyIsUnknown={tokenB !== null ? tokens[tokenB].isUnknown ?? false : false}
           placeholder='0.0'
           onMaxClick={() => {
             if (tokenB === null) {
               return
             }
 
-            tokenBInputState.setValue(printBigint(tokens[tokenB].balance, tokens[tokenB].decimals))
+            tokenBInputState.setValue(
+              trimDecimalZeros(printBigint(tokens[tokenB].balance, tokens[tokenB].decimals))
+            )
           }}
           balanceValue={
             tokenB !== null ? printBigint(tokens[tokenB].balance, tokens[tokenB].decimals) : ''
@@ -392,6 +398,7 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
             if (tokenA !== null && tokenB !== null && tokenBInputState.value.length === 0) {
               tokenBInputState.setValue('0.0')
             }
+            tokenBInputState.setValue(trimDecimalZeros(tokenBInputState.value))
           }}
           {...tokenBInputState}
           priceLoading={priceBLoading}
diff --git a/src/components/NoConnected/NoConnected.stories.tsx b/src/components/NoConnected/NoConnected.stories.tsx
index 968aba1..afd138d 100644
--- a/src/components/NoConnected/NoConnected.stories.tsx
+++ b/src/components/NoConnected/NoConnected.stories.tsx
@@ -13,7 +13,6 @@ type Story = StoryObj<typeof meta>
 export const Primary: Story = {
   args: {
     onConnect: () => {},
-    descCustomText: 'You have no positions.',
-    onExplorePools: () => {}
+    descCustomText: 'You have no positions.'
   }
 }
diff --git a/src/components/NoConnected/NoConnected.tsx b/src/components/NoConnected/NoConnected.tsx
index 82d2b7a..72c3554 100644
--- a/src/components/NoConnected/NoConnected.tsx
+++ b/src/components/NoConnected/NoConnected.tsx
@@ -2,22 +2,19 @@ import { Button, Grid, Typography } from '@mui/material'
 import icons from '@static/icons'
 import classNames from 'classnames'
 import { useStyles } from './style'
+import { useNavigate } from 'react-router-dom'
 
 export interface INoConnected {
   onConnect: () => void
   title?: string
   descCustomText?: string
-  onExplorePools: () => void
 }
 
-export const NoConnected: React.FC<INoConnected> = ({
-  onConnect,
-  title,
-  descCustomText,
-  onExplorePools
-}) => {
+export const NoConnected: React.FC<INoConnected> = ({ onConnect, title, descCustomText }) => {
   const { classes } = useStyles()
 
+  const navigate = useNavigate()
+
   return (
     <>
       <Grid className={classNames(classes.blur, 'blurLayer')} />
@@ -29,7 +26,12 @@ export const NoConnected: React.FC<INoConnected> = ({
           {descCustomText?.length && (
             <Typography className={classes.desc}>{descCustomText}</Typography>
           )}
-          <Button className={classes.buttonPrimary} onClick={onExplorePools} variant='contained'>
+          <Button
+            className={classes.buttonPrimary}
+            onClick={() => {
+              navigate('/newPosition/0_01')
+            }}
+            variant='contained'>
             Explore pools
           </Button>
 
diff --git a/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx b/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
index 0ff6921..ab78215 100644
--- a/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
+++ b/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
@@ -205,29 +205,13 @@ const SinglePositionInfo: React.FC<IProp> = ({
           title={'Liquidity'}
           tokenA={
             xToY
-              ? {
-                  ...tokenX,
-                  value: tokenX.liqValue,
-                  price: tokenXPriceData?.price
-                }
-              : {
-                  ...tokenY,
-                  value: tokenY.liqValue,
-                  price: tokenYPriceData?.price
-                }
+              ? { ...tokenX, value: tokenX.liqValue, price: tokenXPriceData?.price }
+              : { ...tokenY, value: tokenY.liqValue, price: tokenYPriceData?.price }
           }
           tokenB={
             xToY
-              ? {
-                  ...tokenY,
-                  value: tokenY.liqValue,
-                  price: tokenYPriceData?.price
-                }
-              : {
-                  ...tokenX,
-                  value: tokenX.liqValue,
-                  price: tokenXPriceData?.price
-                }
+              ? { ...tokenY, value: tokenY.liqValue, price: tokenYPriceData?.price }
+              : { ...tokenX, value: tokenX.liqValue, price: tokenXPriceData?.price }
           }
           showBalance
           swapHandler={swapHandler}
diff --git a/src/components/PositionDetails/SinglePositionInfo/style.ts b/src/components/PositionDetails/SinglePositionInfo/style.ts
index da8b344..32c4040 100644
--- a/src/components/PositionDetails/SinglePositionInfo/style.ts
+++ b/src/components/PositionDetails/SinglePositionInfo/style.ts
@@ -17,7 +17,11 @@ export const useStyles = makeStyles()((theme: Theme) => ({
     width: 35,
     height: 35,
     borderRadius: '100%',
-    background: colors.white.main
+    background: colors.white.main,
+
+    [theme.breakpoints.down('sm')]: {
+      width: 22
+    }
   },
   arrowIcon: {
     width: 32,
diff --git a/src/components/PositionsList/PositionItem/style.tsx b/src/components/PositionsList/PositionItem/style.tsx
index 356977d..67a7b4f 100644
--- a/src/components/PositionsList/PositionItem/style.tsx
+++ b/src/components/PositionsList/PositionItem/style.tsx
@@ -35,13 +35,10 @@ export const useStyles = makeStyles()((theme: Theme) => ({
   },
   tokenIcon: {
     width: 40,
-    height: 40,
     borderRadius: '100%',
-    background: colors.white.main,
 
     [theme.breakpoints.down('sm')]: {
-      width: 28,
-      height: 28
+      width: 28
     }
   },
   arrows: {
diff --git a/src/components/PositionsList/PositionsList.stories.tsx b/src/components/PositionsList/PositionsList.stories.tsx
index 4f47834..720483f 100644
--- a/src/components/PositionsList/PositionsList.stories.tsx
+++ b/src/components/PositionsList/PositionsList.stories.tsx
@@ -103,8 +103,7 @@ export const Primary: Story = {
     onAddPositionClick: handleClick,
     itemsPerPage: 5,
     noConnectedBlockerProps: {
-      onConnect: () => {},
-      onExplorePools: () => {}
+      onConnect: () => {}
     },
     searchValue: '',
     searchSetValue: () => {},
diff --git a/src/components/Stats/PoolList/PoolList.tsx b/src/components/Stats/PoolList/PoolList.tsx
index 9642b0e..64e5702 100644
--- a/src/components/Stats/PoolList/PoolList.tsx
+++ b/src/components/Stats/PoolList/PoolList.tsx
@@ -23,7 +23,9 @@ interface PoolListInterface {
     //   fees: number
     //   accumulatedFarmsAvg: number
     //   accumulatedFarmsSingleTick: number
-    // }
+    // },
+    isUnknownFrom: boolean
+    isUnknownTo: boolean
   }>
   network: Network
 }
@@ -99,6 +101,8 @@ const PoolList: React.FC<PoolListInterface> = ({ data, network }) => {
           addressFrom={element.addressFrom}
           addressTo={element.addressTo}
           network={network}
+          isUnknownFrom={element.isUnknownFrom}
+          isUnknownTo={element.isUnknownTo}
         />
       ))}
       {pages > 1 ? (
diff --git a/src/components/Stats/PoolList/Stats.PoolList.stories.tsx b/src/components/Stats/PoolList/Stats.PoolList.stories.tsx
index 6487ca8..0122134 100644
--- a/src/components/Stats/PoolList/Stats.PoolList.stories.tsx
+++ b/src/components/Stats/PoolList/Stats.PoolList.stories.tsx
@@ -78,7 +78,9 @@ const poolsList = Array(40)
       volume24: randomVolume24,
       tvl: randomTvl24,
       addressFrom: '5Dvb5E8zKU4E9c7YxfNL5VC8YQj4VAFUTCGYY9ayFLnnY3UA',
-      addressTo: '5Dvb5E8zKU4E9c7YxfNL5VC8YQj4VAFUTCGYY9ayFLnnY3UA'
+      addressTo: '5Dvb5E8zKU4E9c7YxfNL5VC8YQj4VAFUTCGYY9ayFLnnY3UA',
+      isUnknownFrom: true,
+      isUnknownTo: true
     }
   })
 
diff --git a/src/components/Stats/PoolListItem/PoolListItem.tsx b/src/components/Stats/PoolListItem/PoolListItem.tsx
index 898653b..bf0b756 100644
--- a/src/components/Stats/PoolListItem/PoolListItem.tsx
+++ b/src/components/Stats/PoolListItem/PoolListItem.tsx
@@ -32,7 +32,9 @@ interface IProps {
   //   fees: number
   //   accumulatedFarmsAvg: number
   //   accumulatedFarmsSingleTick: number
-  // }
+  // },
+  isUnknownFrom?: boolean
+  isUnknownTo?: boolean
 }
 
 const PoolListItem: React.FC<IProps> = ({
@@ -50,13 +52,15 @@ const PoolListItem: React.FC<IProps> = ({
   hideBottomLine = false,
   addressFrom,
   addressTo,
-  network
+  network,
   // apy = 0,
   // apyData = {
   //   fees: 0,
   //   accumulatedFarmsAvg: 0,
   //   accumulatedFarmsSingleTick: 0
   // }
+  isUnknownFrom,
+  isUnknownTo
 }) => {
   const { classes } = useStyles()
 
@@ -82,6 +86,7 @@ const PoolListItem: React.FC<IProps> = ({
       )}/${addressToTicker(network ?? Network.Testnet, addressTo ?? '')}`
     )
   }
+
   return (
     <Grid maxWidth='100%'>
       {displayType === 'token' ? (
@@ -93,8 +98,14 @@ const PoolListItem: React.FC<IProps> = ({
           <Grid className={classes.imageContainer}>
             {!isSm && (
               <Box className={classes.iconsWrapper}>
-                <img className={classes.tokenIcon} src={iconFrom} alt='Token from' />
-                <img className={classes.tokenIcon} src={iconTo} alt='Token to' />
+                <Box className={classes.iconContainer}>
+                  <img className={classes.tokenIcon} src={iconFrom} alt='Token from' />
+                  {isUnknownFrom && <img className={classes.warningIcon} src={icons.warningIcon} />}
+                </Box>
+                <Box className={classes.iconContainer}>
+                  <img className={classes.tokenIcon} src={iconTo} alt='Token to' />
+                  {isUnknownTo && <img className={classes.warningIcon} src={icons.warningIcon} />}
+                </Box>
               </Box>
             )}
             <Grid className={classes.symbolsContainer}>
diff --git a/src/components/Stats/PoolListItem/style.ts b/src/components/Stats/PoolListItem/style.ts
index 0ee5241..e8063d0 100644
--- a/src/components/Stats/PoolListItem/style.ts
+++ b/src/components/Stats/PoolListItem/style.ts
@@ -34,17 +34,11 @@ export const useStyles = makeStyles()(() => ({
 
   imageContainer: {
     display: 'flex',
-    alignItems: 'center',
-    '& img': {
-      minWidth: 28,
-      maxWidth: 28,
-      height: 28,
-      marginRight: 3,
-      borderRadius: '50%'
-    }
+    alignItems: 'center'
   },
 
   iconsWrapper: {
+    display: 'flex',
     height: 28
   },
 
@@ -140,8 +134,25 @@ export const useStyles = makeStyles()(() => ({
       }
     }
   },
-
+  iconContainer: {
+    minWidth: 28,
+    maxWidth: 28,
+    height: 28,
+    marginRight: 3,
+    position: 'relative'
+  },
   tokenIcon: {
-    background: colors.white.main
+    minWidth: 28,
+    maxWidth: 28,
+    height: 28,
+    marginRight: 3,
+    borderRadius: '50%'
+  },
+  warningIcon: {
+    position: 'absolute',
+    width: 12,
+    height: 12,
+    bottom: -6,
+    right: -6
   }
 }))
diff --git a/src/components/Stats/TokenListItem/TokenListItem.tsx b/src/components/Stats/TokenListItem/TokenListItem.tsx
index a620a62..0b634b3 100644
--- a/src/components/Stats/TokenListItem/TokenListItem.tsx
+++ b/src/components/Stats/TokenListItem/TokenListItem.tsx
@@ -3,9 +3,10 @@ import { colors, theme } from '@static/theme'
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown'
 import ArrowDropUpIcon from '@mui/icons-material/ArrowDropUp'
 import { useStyles } from './style'
-import { Grid, Typography, useMediaQuery } from '@mui/material'
+import { Box, Grid, Typography, useMediaQuery } from '@mui/material'
 import { formatNumber } from '@utils/utils'
 import { SortTypeTokenList } from '@store/consts/static'
+import icons from '@static/icons'
 
 interface IProps {
   displayType: string
@@ -20,6 +21,7 @@ interface IProps {
   sortType?: SortTypeTokenList
   onSort?: (type: SortTypeTokenList) => void
   hideBottomLine?: boolean
+  isUnknown?: boolean
 }
 
 const TokenListItem: React.FC<IProps> = ({
@@ -34,7 +36,8 @@ const TokenListItem: React.FC<IProps> = ({
   TVL = 0,
   sortType,
   onSort,
-  hideBottomLine = false
+  hideBottomLine = false,
+  isUnknown
 }) => {
   const { classes } = useStyles()
   // const isNegative = priceChange < 0
@@ -51,7 +54,12 @@ const TokenListItem: React.FC<IProps> = ({
           style={hideBottomLine ? { border: 'none' } : undefined}>
           {!hideName && !isSm && <Typography component='p'>{itemNumber}</Typography>}
           <Grid className={classes.tokenName}>
-            {!isSm && <img className={classes.tokenIcon} src={icon} alt='Token icon'></img>}
+            {!isSm && (
+              <Box className={classes.imageContainer}>
+                <img className={classes.tokenIcon} src={icon} alt='Token icon'></img>
+                {isUnknown && <img className={classes.warningIcon} src={icons.warningIcon} />}
+              </Box>
+            )}
             <Typography>
               {hideName ? symbol : name}
               {!hideName && <span className={classes.tokenSymbol}>{` (${symbol})`}</span>}
diff --git a/src/components/Stats/TokenListItem/style.ts b/src/components/Stats/TokenListItem/style.ts
index 00a76b1..e1ebbab 100644
--- a/src/components/Stats/TokenListItem/style.ts
+++ b/src/components/Stats/TokenListItem/style.ts
@@ -56,14 +56,6 @@ export const useStyles = makeStyles()((theme: Theme) => ({
       overflow: 'hidden',
       whiteSpace: 'nowrap',
       textOverflow: 'ellipsis'
-    },
-
-    '& img': {
-      minWidth: 28,
-      maxWidth: 28,
-      height: 28,
-      marginRight: 8,
-      borderRadius: '50%'
     }
   },
 
@@ -76,8 +68,27 @@ export const useStyles = makeStyles()((theme: Theme) => ({
       marginLeft: -4
     }
   },
-
+  imageContainer: {
+    minWidth: 28,
+    maxWidth: 28,
+    height: 28,
+    marginRight: 8,
+    position: 'relative',
+    display: 'flex',
+    alignItems: 'center'
+  },
   tokenIcon: {
-    background: colors.white.main
+    minWidth: 28,
+    maxWidth: 28,
+    height: 28,
+    marginRight: 8,
+    borderRadius: '50%'
+  },
+  warningIcon: {
+    position: 'absolute',
+    width: 12,
+    height: 12,
+    bottom: -6,
+    right: -6
   }
 }))
diff --git a/src/components/Stats/TokensList/Stats.TokenList.stories.tsx b/src/components/Stats/TokensList/Stats.TokenList.stories.tsx
index 419ad26..11e08ad 100644
--- a/src/components/Stats/TokensList/Stats.TokenList.stories.tsx
+++ b/src/components/Stats/TokensList/Stats.TokenList.stories.tsx
@@ -101,7 +101,8 @@ export const Primary: Story = {
       price: tokenData.price,
       priceChange: tokenData.priceChange,
       volume: tokenData.volume24,
-      TVL: tokenData.tvl
+      TVL: tokenData.tvl,
+      isUnknown: true
     }))
   }
 }
diff --git a/src/components/Stats/TokensList/TokensList.tsx b/src/components/Stats/TokensList/TokensList.tsx
index 0d1112c..590c9d4 100644
--- a/src/components/Stats/TokensList/TokensList.tsx
+++ b/src/components/Stats/TokensList/TokensList.tsx
@@ -13,6 +13,7 @@ export interface ITokensListData {
   price: number
   volume: number
   TVL: number
+  isUnknown: boolean
 }
 
 export interface ITokensList {
@@ -99,6 +100,7 @@ const TokensList: React.FC<ITokensList> = ({ data }) => {
             volume={token.volume}
             TVL={token.TVL}
             hideBottomLine={pages === 1 && index + 1 === data.length}
+            isUnknown={token.isUnknown}
           />
         )
       })}
diff --git a/src/components/Swap/Swap.tsx b/src/components/Swap/Swap.tsx
index a6489f1..30227b2 100644
--- a/src/components/Swap/Swap.tsx
+++ b/src/components/Swap/Swap.tsx
@@ -19,6 +19,7 @@ import {
   convertBalanceToBigint,
   printBigint,
   stringToFixed,
+  trimDecimalZeros,
   trimLeadingZeros
 } from '@utils/utils'
 import { PoolWithPoolKey } from '@store/reducers/pools'
@@ -528,7 +529,11 @@ export const Swap: React.FC<ISwap> = ({
             onMaxClick={() => {
               if (tokenFrom !== null) {
                 setInputRef(inputTarget.FROM)
-                setAmountFrom(printBigint(tokens[tokenFrom].balance, tokens[tokenFrom].decimals))
+                setAmountFrom(
+                  trimDecimalZeros(
+                    printBigint(tokens[tokenFrom].balance, tokens[tokenFrom].decimals)
+                  )
+                )
               }
             }}
             tokens={tokens}
@@ -617,7 +622,11 @@ export const Swap: React.FC<ISwap> = ({
             onMaxClick={() => {
               if (tokenFrom !== null) {
                 setInputRef(inputTarget.FROM)
-                setAmountFrom(printBigint(tokens[tokenFrom].balance, tokens[tokenFrom].decimals))
+                setAmountFrom(
+                  trimDecimalZeros(
+                    printBigint(tokens[tokenFrom].balance, tokens[tokenFrom].decimals)
+                  )
+                )
               }
             }}
             tokens={tokens}
@@ -645,6 +654,28 @@ export const Swap: React.FC<ISwap> = ({
             hiddenUnknownTokens={hideUnknownTokens}
           />
         </Box>
+        <Box className={classes.unknownWarningContainer}>
+          {tokens[tokenFrom ?? '']?.isUnknown && (
+            <TooltipHover
+              text={`${
+                tokens[tokenFrom ?? ''].symbol
+              } is unknown, make sure address is correct before trading`}>
+              <Box className={classes.unknownWarning}>
+                {tokens[tokenFrom ?? ''].symbol} is not verified
+              </Box>
+            </TooltipHover>
+          )}
+          {tokens[tokenTo ?? '']?.isUnknown && (
+            <TooltipHover
+              text={`${
+                tokens[tokenTo ?? ''].symbol
+              } is unknown, make sure address is correct before trading`}>
+              <Box className={classes.unknownWarning}>
+                {tokens[tokenTo ?? ''].symbol} is not verified
+              </Box>
+            </TooltipHover>
+          )}
+        </Box>
         <Box className={classes.transactionDetails}>
           <Box className={classes.transactionDetailsInner}>
             <button
diff --git a/src/components/Swap/TokensInfo/SingleToken/SingleToken.tsx b/src/components/Swap/TokensInfo/SingleToken/SingleToken.tsx
index 49ed941..f534ba0 100644
--- a/src/components/Swap/TokensInfo/SingleToken/SingleToken.tsx
+++ b/src/components/Swap/TokensInfo/SingleToken/SingleToken.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Grid, Typography } from '@mui/material'
+import { Box, Grid, Typography } from '@mui/material'
 import { useStyles } from './../styles'
 import { SwapToken } from '@store/selectors/wallet'
 import icons from '@static/icons'
@@ -32,12 +32,15 @@ const SingleToken: React.FC<IProps> = ({ token, tokenPrice, copyTokenAddressHand
     <Grid className={classes.token}>
       <Grid container direction='row' justifyContent='flex-start' alignItems='center' wrap='nowrap'>
         {token?.logoURI ? (
-          <img
-            className={classes.tokenIcon}
-            src={token.logoURI}
-            loading='lazy'
-            alt={token.name + 'logo'}
-          />
+          <Box className={classes.imageContainer}>
+            <img
+              className={classes.tokenIcon}
+              src={token.logoURI}
+              loading='lazy'
+              alt={token.name + 'logo'}
+            />
+            {token.isUnknown && <img className={classes.warningIcon} src={icons.warningIcon} />}
+          </Box>
         ) : (
           <img className={classes.tokenIcon} src={icons.selectToken} alt={'Select token'} />
         )}
diff --git a/src/components/Swap/TokensInfo/styles.ts b/src/components/Swap/TokensInfo/styles.ts
index 826a399..3c6ec65 100644
--- a/src/components/Swap/TokensInfo/styles.ts
+++ b/src/components/Swap/TokensInfo/styles.ts
@@ -32,14 +32,26 @@ export const useStyles = makeStyles<{ isToken: boolean }>()((_theme, { isToken }
     flex: 1,
     width: '100%'
   },
-
+  imageContainer: {
+    minWidth: 30,
+    maxWidth: 30,
+    height: 30,
+    marginRight: 8,
+    position: 'relative'
+  },
   tokenIcon: {
     minWidth: 30,
     maxWidth: 30,
     height: 30,
     marginRight: 8,
-    borderRadius: '50%',
-    background: colors.white.main
+    borderRadius: '50%'
+  },
+  warningIcon: {
+    position: 'absolute',
+    width: 12,
+    height: 12,
+    bottom: -6,
+    right: -6
   },
   tokenName: {
     color: colors.white.main,
diff --git a/src/components/Swap/TransactionDetailsBox/TransactionDetailsBox.tsx b/src/components/Swap/TransactionDetailsBox/TransactionDetailsBox.tsx
index 09c42b5..2c79039 100644
--- a/src/components/Swap/TransactionDetailsBox/TransactionDetailsBox.tsx
+++ b/src/components/Swap/TransactionDetailsBox/TransactionDetailsBox.tsx
@@ -1,5 +1,4 @@
 import React from 'react'
-
 import { PERCENTAGE_SCALE } from '@invariant-labs/alph-sdk'
 import { Grid, Typography } from '@mui/material'
 import loadingAnimation from '@static/gif/loading.gif'
diff --git a/src/components/Swap/style.ts b/src/components/Swap/style.ts
index e00c8f7..44519a2 100644
--- a/src/components/Swap/style.ts
+++ b/src/components/Swap/style.ts
@@ -197,7 +197,7 @@ export const useStyles = makeStyles()((theme: Theme) => ({
     justifyContent: 'space-between',
     flexFlow: 'row',
     flexWrap: 'wrap',
-    marginTop: 24,
+    marginTop: 12,
     marginBottom: 12,
     cursor: 'default',
     filter: 'brightness(0.9)',
@@ -333,6 +333,20 @@ export const useStyles = makeStyles()((theme: Theme) => ({
     ...typography.caption1,
     color: colors.invariant.lightGrey,
     marginBottom: 8
+  },
+  unknownWarningContainer: {
+    marginTop: 12,
+    display: 'flex',
+    gap: 12
+  },
+  unknownWarning: {
+    width: 'fit-content',
+    background: colors.invariant.yellow,
+    color: colors.invariant.black,
+    padding: 4,
+    paddingInline: 8,
+    borderRadius: 8,
+    fontSize: 12
   }
 }))
 
diff --git a/src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx b/src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx
index 6384a9d..168587c 100644
--- a/src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx
+++ b/src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx
@@ -434,7 +434,6 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
           }}
           title='Connect a wallet to view your position,'
           descCustomText='or start exploring liquidity pools now!'
-          onExplorePools={() => navigate('/newPosition/0_01')}
         />
       </Grid>
     )
diff --git a/src/containers/WrappedPositionsList/WrappedPositionsList.tsx b/src/containers/WrappedPositionsList/WrappedPositionsList.tsx
index c288152..6a600c3 100644
--- a/src/containers/WrappedPositionsList/WrappedPositionsList.tsx
+++ b/src/containers/WrappedPositionsList/WrappedPositionsList.tsx
@@ -14,6 +14,7 @@ import {
   printBigint
 } from '@utils/utils'
 import { actions } from '@store/reducers/positions'
+import { actions as walletActions } from '@store/reducers/wallet'
 import { Status } from '@store/reducers/wallet'
 import {
   isLoadingPositionsList,
@@ -26,7 +27,6 @@ import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { useNavigate } from 'react-router-dom'
 import { IPositionItem } from '@components/PositionsList/PositionItem/PositionItem'
-import { actions as walletActions } from '@store/reducers/wallet'
 
 export const WrappedPositionsList: React.FC = () => {
   const walletAddress = useSelector(address)
@@ -173,8 +173,7 @@ export const WrappedPositionsList: React.FC = () => {
           dispatch(walletActions.setShowConnectModal(true))
         },
         title: 'Start exploring liquidity pools right now!',
-        descCustomText: 'Or, connect your wallet to see existing positions, and create a new one!',
-        onExplorePools: () => navigate('/newPosition/0_01')
+        descCustomText: 'Or, connect your wallet to see existing positions, and create a new one!'
       }}
       pageChanged={page => {
         const index = positionListPageToQueryPage(page)
diff --git a/src/containers/WrappedStats/WrappedStats.tsx b/src/containers/WrappedStats/WrappedStats.tsx
index 829b0e3..d2a23c2 100644
--- a/src/containers/WrappedStats/WrappedStats.tsx
+++ b/src/containers/WrappedStats/WrappedStats.tsx
@@ -92,7 +92,8 @@ export const WrappedStats: React.FC = () => {
                 price: tokenData.price,
                 // priceChange: tokenData.priceChange,
                 volume: tokenData.volume24,
-                TVL: tokenData.tvl
+                TVL: tokenData.tvl,
+                isUnknown: tokenData.tokenDetails?.isUnknown ?? false
               }))}
             />
           </Grid>
@@ -107,7 +108,7 @@ export const WrappedStats: React.FC = () => {
               TVL: poolData.tvl,
               fee: poolData.fee,
               addressFrom: poolData.tokenX,
-              addressTo: poolData.tokenY
+              addressTo: poolData.tokenY,
               // apy: poolData.apy,
               // apyData: {
               //   fees: poolData.apy,
@@ -121,7 +122,9 @@ export const WrappedStats: React.FC = () => {
               //   accumulatedFarmsSingleTick:
               //     accumulatedSingleTickAPY?.[poolData.poolAddress.toString()] ?? 0,
               //   accumulatedFarmsAvg: accumulatedAverageAPY?.[poolData.poolAddress.toString()] ?? 0
-              // }
+              // },
+              isUnknownFrom: poolData.tokenXDetails?.isUnknown ?? false,
+              isUnknownTo: poolData.tokenYDetails?.isUnknown ?? false
             }))}
             network={currentNetwork}
           />
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 20b526a..fec31f6 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -111,6 +111,23 @@ export const trimZeros = (numStr: string): string => {
     .replace(/\.$/, '')
 }
 
+export const trimDecimalZeros = (numStr: string): string => {
+  if (/^[0.]+$/.test(numStr)) {
+    return '0'
+  }
+
+  const withoutTrailingDot = numStr.replace(/\.$/, '')
+
+  if (!withoutTrailingDot.includes('.')) {
+    return withoutTrailingDot
+  }
+
+  const [integerPart, decimalPart] = withoutTrailingDot.split('.')
+
+  const trimmedDecimal = decimalPart.replace(/0+$/, '')
+  return trimmedDecimal ? `${integerPart}.${trimmedDecimal}` : integerPart
+}
+
 export const calcYPerXPriceByTickIndex = (
   tickIndex: bigint,
   xDecimal: bigint,