diff --git a/packages/bridge/src/components/TokenSelectModal/index.tsx b/packages/bridge/src/components/TokenSelectModal/index.tsx
index cc8d1ee..a232dbd 100644
--- a/packages/bridge/src/components/TokenSelectModal/index.tsx
+++ b/packages/bridge/src/components/TokenSelectModal/index.tsx
@@ -145,7 +145,6 @@ export const TokenSelectModal = (props: {
             )}
           </AutoSizer>
         </div>
-        {/*<div className={'assets-scroll'}>{[...renderTokensChain]}</div>*/}
       </Modal>
     </>
   );
diff --git a/packages/bridge/src/components/Transfer/index.tsx b/packages/bridge/src/components/Transfer/index.tsx
index 25743e7..74ba2a0 100644
--- a/packages/bridge/src/components/Transfer/index.tsx
+++ b/packages/bridge/src/components/Transfer/index.tsx
@@ -161,7 +161,7 @@ export const Transfer = () => {
         <Button
           type="primary"
           className="swap-button"
-          style={{ paddingLeft: '11px' }}
+          style={{ padding: 0 }}
           disabled={false}
           onClick={() => {
             const from = A.chain;
diff --git a/packages/bridge/src/contexts/chainPair.tsx b/packages/bridge/src/contexts/chainPair.tsx
index a3f2d11..992052d 100644
--- a/packages/bridge/src/contexts/chainPair.tsx
+++ b/packages/bridge/src/contexts/chainPair.tsx
@@ -50,7 +50,7 @@ export const toChainSymbol = (chain: number | null) => {
 
 function getDefaultTokens(tokens: TokenInfo[], search: string) {
   let defaultChain = 'ETH';
-  let defaultToken = 'SRM';
+  let defaultToken = tokens[0].symbol;
 
   const nameToToken = tokens.reduce((map, item) => {
     map.set(item.symbol, item);
@@ -61,7 +61,7 @@ function getDefaultTokens(tokens: TokenInfo[], search: string) {
     const urlParams = new URLSearchParams(search);
     const from = urlParams.get('from');
     defaultChain = from === 'SOL' ? from : 'ETH';
-    const token = urlParams.get('token') || 'SRM';
+    const token = urlParams.get('token') || defaultToken;
     if (nameToToken.has(token) || isValidAddress(token)) {
       defaultToken = token;
     }
@@ -137,6 +137,7 @@ export function TokenChainPairProvider({ children = null as any }) {
   // Updates tokens on location change
   useEffect(() => {
     if (
+      !tokens.length ||
       (!location.search && mintAddress) ||
       location.pathname.indexOf('move') < 0
     ) {