diff --git a/package.json b/package.json
index aea27450..82362494 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@cosmjs/cosmwasm-stargate": "^0.31.1",
-    "@delphi-labs/shuttle-react": "^3.8.0",
+    "@delphi-labs/shuttle-react": "^3.9.0",
     "@keplr-wallet/cosmos": "^0.12.20",
     "@sentry/nextjs": "^7.64.0",
     "@splinetool/react-spline": "^2.2.1",
@@ -72,4 +72,4 @@
     "tailwindcss": "^3.3.3",
     "typescript": "5.2.2"
   }
-}
\ No newline at end of file
+}
diff --git a/public/images/wallets/cosmostation-wc.png b/public/images/wallets/cosmostation-wc.png
new file mode 100644
index 00000000..68599ee8
Binary files /dev/null and b/public/images/wallets/cosmostation-wc.png differ
diff --git a/public/images/wallets/cosmostation.png b/public/images/wallets/cosmostation.png
new file mode 100644
index 00000000..68ba11be
Binary files /dev/null and b/public/images/wallets/cosmostation.png differ
diff --git a/public/images/wallets/keplr-wc.png b/public/images/wallets/keplr-wc.png
new file mode 100644
index 00000000..cb64b3d5
Binary files /dev/null and b/public/images/wallets/keplr-wc.png differ
diff --git a/public/images/wallets/keplr.png b/public/images/wallets/keplr.png
index 0db08c87..7c7dcf70 100644
Binary files a/public/images/wallets/keplr.png and b/public/images/wallets/keplr.png differ
diff --git a/public/images/wallets/leap-snap.png b/public/images/wallets/leap-snap.png
new file mode 100644
index 00000000..3b4f6faa
Binary files /dev/null and b/public/images/wallets/leap-snap.png differ
diff --git a/public/images/wallets/leap-wc.png b/public/images/wallets/leap-wc.png
new file mode 100644
index 00000000..f1db809c
Binary files /dev/null and b/public/images/wallets/leap-wc.png differ
diff --git a/public/images/wallets/leap.png b/public/images/wallets/leap.png
new file mode 100644
index 00000000..5cdf0a63
Binary files /dev/null and b/public/images/wallets/leap.png differ
diff --git a/public/images/wallets/station.png b/public/images/wallets/station.png
index 41c27bd2..3bcf6441 100644
Binary files a/public/images/wallets/station.png and b/public/images/wallets/station.png differ
diff --git a/public/images/wallets/xdefi.png b/public/images/wallets/xdefi.png
new file mode 100644
index 00000000..5342a2cc
Binary files /dev/null and b/public/images/wallets/xdefi.png differ
diff --git a/public/images/wallets/xdelfi.png b/public/images/wallets/xdelfi.png
deleted file mode 100644
index 2de78526..00000000
Binary files a/public/images/wallets/xdelfi.png and /dev/null differ
diff --git a/src/components/Wallet/WalletConnectProvider.tsx b/src/components/Wallet/WalletConnectProvider.tsx
index d926e648..7b2a1c7f 100644
--- a/src/components/Wallet/WalletConnectProvider.tsx
+++ b/src/components/Wallet/WalletConnectProvider.tsx
@@ -4,6 +4,8 @@ import {
   KeplrExtensionProvider,
   KeplrMobileProvider,
   LeapCosmosExtensionProvider,
+  LeapCosmosMobileProvider,
+  LeapMetamaskCosmosSnapExtensionProvider,
   ShuttleProvider,
   StationExtensionProvider,
   WalletExtensionProvider,
@@ -37,6 +39,9 @@ const mobileProviders: WalletMobileProvider[] = [
   new KeplrMobileProvider({
     networks: getSupportedChainsInfos(WalletID.KeplrMobile),
   }),
+  new LeapCosmosMobileProvider({
+    networks: getSupportedChainsInfos(WalletID.LeapMobile),
+  }),
   new CosmostationMobileProvider({
     networks: getSupportedChainsInfos(WalletID.CosmostationMobile),
   }),
@@ -44,10 +49,13 @@ const mobileProviders: WalletMobileProvider[] = [
 
 const extensionProviders: WalletExtensionProvider[] = [
   new KeplrExtensionProvider({ networks: getSupportedChainsInfos(WalletID.Keplr) }),
-  new StationExtensionProvider({ networks: getSupportedChainsInfos(WalletID.Station) }),
   new LeapCosmosExtensionProvider({ networks: getSupportedChainsInfos(WalletID.Leap) }),
+  new LeapMetamaskCosmosSnapExtensionProvider({
+    networks: getSupportedChainsInfos(WalletID.LeapSnap),
+  }),
   new CosmostationExtensionProvider({ networks: getSupportedChainsInfos(WalletID.Cosmostation) }),
   new XDEFICosmosExtensionProvider({ networks: getSupportedChainsInfos(WalletID.Xdefi) }),
+  new StationExtensionProvider({ networks: getSupportedChainsInfos(WalletID.Station) }),
 ]
 
 export const WalletConnectProvider: FC<Props> = ({ children }) => {
diff --git a/src/components/Wallet/WalletConnectedButton.tsx b/src/components/Wallet/WalletConnectedButton.tsx
index 6d1b7fae..446663ea 100644
--- a/src/components/Wallet/WalletConnectedButton.tsx
+++ b/src/components/Wallet/WalletConnectedButton.tsx
@@ -23,6 +23,7 @@ import { ChainInfoID } from 'types/enums/wallet'
 import { getBaseAsset, getEnabledMarketAssets } from 'utils/assets'
 import { truncate } from 'utils/formatters'
 import { getPage, getRoute } from 'utils/route'
+import WalletSelect from './WalletSelect'
 
 export default function WalletConnectedButton() {
   // ---------------
@@ -62,6 +63,15 @@ export default function WalletConnectedButton() {
     if (!currentWallet) return
     disconnectWallet(currentWallet)
     useStore.setState({ client: undefined, address: undefined, accounts: null, balances: [] })
+    if (focusComponent)
+      useStore.setState({
+        focusComponent: {
+          component: <WalletSelect />,
+          onClose: () => {
+            useStore.setState({ focusComponent: null })
+          },
+        },
+      })
     navigate(getRoute(getPage(pathname)))
   }
 
diff --git a/src/components/Wallet/WalletConnecting.tsx b/src/components/Wallet/WalletConnecting.tsx
index 21df9be6..42c4947e 100644
--- a/src/components/Wallet/WalletConnecting.tsx
+++ b/src/components/Wallet/WalletConnecting.tsx
@@ -55,7 +55,12 @@ export default function WalletConnecting(props: Props) {
           useStore.setState({
             client: walletClient,
             address: response.account.address,
-            focusComponent: { component: <WalletFetchBalancesAndAccounts /> },
+            focusComponent: {
+              component: <WalletFetchBalancesAndAccounts />,
+              onClose: () => {
+                useStore.setState({ focusComponent: null })
+              },
+            },
           })
         } catch (error) {
           setIsConnecting(false)
diff --git a/src/components/Wallet/WalletSelect.tsx b/src/components/Wallet/WalletSelect.tsx
index a037c9c5..4d78bfa0 100644
--- a/src/components/Wallet/WalletSelect.tsx
+++ b/src/components/Wallet/WalletSelect.tsx
@@ -28,6 +28,7 @@ interface WalletOptionProps {
   name: string
   imageSrc: string
   handleClick: () => void
+  showLoader?: boolean
 }
 
 const currentChainId = ENV.CHAIN_ID
@@ -37,8 +38,9 @@ function WalletOption(props: WalletOptionProps) {
   return (
     <Button
       color='tertiary'
-      className='flex w-full !justify-start px-4 py-3'
+      className='flex w-full !justify-start px-4 py-3 h-11'
       onClick={props.handleClick}
+      showProgressIndicator={props.showLoader}
     >
       <Image
         className='rounded-full'
@@ -57,15 +59,22 @@ export default function WalletSelect(props: Props) {
   const { extensionProviders, mobileProviders, mobileConnect } = useShuttle()
   const [qrCodeUrl, setQRCodeUrl] = useState('')
   const [error, setError] = useState(props.error)
+  const [isLoading, setIsLoading] = useState<string | boolean>(false)
   const sortedExtensionProviders = extensionProviders.sort((a, b) => +b - +a)
 
   const handleConnectClick = (extensionProviderId: string) => {
     useStore.setState({
-      focusComponent: { component: <WalletConnecting providerId={extensionProviderId} /> },
+      focusComponent: {
+        component: <WalletConnecting providerId={extensionProviderId} />,
+        onClose: () => {
+          useStore.setState({ focusComponent: null })
+        },
+      },
     })
   }
 
   const handleMobileConnectClick = async (mobileProviderId: string, chainId: string) => {
+    setIsLoading(mobileProviderId)
     try {
       const urls = await mobileConnect({
         mobileProviderId,
@@ -88,6 +97,7 @@ export default function WalletSelect(props: Props) {
         setError({ title: 'Failed to connect to wallet', message: error.message })
       }
     }
+    setIsLoading(false)
   }
 
   useEffect(() => {
@@ -179,6 +189,7 @@ export default function WalletSelect(props: Props) {
                       name={WALLETS[walletId].walletConnect ?? 'WalletConnect'}
                       imageSrc={WALLETS[walletId].mobileImageURL ?? '/'}
                       handleClick={() => handleMobileConnectClick(walletId, network.chainId)}
+                      showLoader={isLoading === walletId}
                     />
                   )
                 })}
diff --git a/src/constants/wallets.ts b/src/constants/wallets.ts
index d8a5bdb6..ea0cbe51 100644
--- a/src/constants/wallets.ts
+++ b/src/constants/wallets.ts
@@ -6,18 +6,15 @@ export const WALLETS: WalletInfos = {
     install: 'Install Cosmostation Wallet',
     installURL:
       'https://chrome.google.com/webstore/detail/cosmostation-wallet/fpkhgmpbidmiogeglndfbkegfdlnajnf',
-    imageURL:
-      'https://raw.githubusercontent.com/mars-protocol/wallet-connector/main/src/components/ui/images/cosmostation-wallet-extension.png',
+    imageURL: '/images/wallets/cosmostation.png',
 
     supportedChains: [ChainInfoID.Osmosis1, ChainInfoID.OsmosisDevnet, ChainInfoID.OsmosisTestnet],
   },
   [WalletID.CosmostationMobile]: {
     name: 'Cosmostation Wallet',
     walletConnect: 'Cosmostation WalletConnect',
-    imageURL:
-      'https://raw.githubusercontent.com/mars-protocol/wallet-connector/main/src/components/ui/images/cosmostation-wallet-extension.png',
-    mobileImageURL:
-      'https://raw.githubusercontent.com/mars-protocol/wallet-connector/main/src/components/ui/images/cosmostation-wallet-connect.png',
+    imageURL: '/images/wallets/cosmostation.png',
+    mobileImageURL: '/images/wallets/cosmostation-wc.png',
     supportedChains: [ChainInfoID.Osmosis1, ChainInfoID.OsmosisDevnet, ChainInfoID.OsmosisTestnet],
   },
   [WalletID.Keplr]: {
@@ -31,8 +28,7 @@ export const WALLETS: WalletInfos = {
     name: 'Keplr Wallet',
     walletConnect: 'Keplr WalletConnect',
     imageURL: '/images/wallets/keplr.png',
-    mobileImageURL:
-      'https://raw.githubusercontent.com/mars-protocol/wallet-connector/main/src/components/ui/images/keplr-wallet-connect.png',
+    mobileImageURL: '/images/wallets/keplr-wc.png',
     supportedChains: [ChainInfoID.Osmosis1],
   },
   [WalletID.Leap]: {
@@ -40,9 +36,23 @@ export const WALLETS: WalletInfos = {
     install: 'Install Leap Wallet',
     installURL:
       'https://chrome.google.com/webstore/detail/leap-cosmos-wallet/fcfcfllfndlomdhbehjjcoimbgofdncg',
-    imageURL: 'https://assets.leapwallet.io/logos/leap-cosmos-logo.png',
+    imageURL: '/images/wallets/leap.png',
     supportedChains: [ChainInfoID.Osmosis1, ChainInfoID.OsmosisDevnet, ChainInfoID.OsmosisTestnet],
   },
+  [WalletID.LeapMobile]: {
+    name: 'Leap Wallet',
+    walletConnect: 'Leap WalletConnect',
+    imageURL: '/images/wallets/leap.png',
+    mobileImageURL: '/images/wallets/leap-wc.png',
+    supportedChains: [ChainInfoID.Osmosis1, ChainInfoID.OsmosisDevnet, ChainInfoID.OsmosisTestnet],
+  },
+  [WalletID.LeapSnap]: {
+    name: 'MetaMask (via Leap Snap)',
+    install: 'Install MetaMask',
+    installURL: 'https://metamask.io/download/',
+    imageURL: '/images/wallets/leap-snap.png',
+    supportedChains: [ChainInfoID.Osmosis1],
+  },
   [WalletID.Station]: {
     name: 'Station Wallet',
     install: 'Install Station Wallet',
@@ -55,7 +65,7 @@ export const WALLETS: WalletInfos = {
     name: 'XDEFI Wallet',
     install: 'Install XDEFI Wallet',
     installURL: 'https://go.xdefi.io/mars',
-    imageURL: 'https://xdefi-static.s3.eu-west-1.amazonaws.com/xdefi.png',
+    imageURL: '/images/wallets/xdefi.png',
     supportedChains: [ChainInfoID.Osmosis1],
   },
 }
diff --git a/src/types/enums/wallet.ts b/src/types/enums/wallet.ts
index 8ef15005..c639c231 100644
--- a/src/types/enums/wallet.ts
+++ b/src/types/enums/wallet.ts
@@ -4,6 +4,8 @@ export enum WalletID {
   Keplr = 'keplr',
   KeplrMobile = 'mobile-keplr',
   Leap = 'leap-cosmos',
+  LeapMobile = 'mobile-leap-cosmos',
+  LeapSnap = 'leap-metamask-cosmos-snap',
   Station = 'station',
   Xdefi = 'xfi-cosmos',
 }
diff --git a/yarn.lock b/yarn.lock
index b42be969..bbe62a8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1461,21 +1461,21 @@
   resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.31.1.tgz#e6055cd7d722fa72df9cbd0d39cd1f7a9ac80483"
   integrity sha512-n4Se1wu4GnKwztQHNFfJvUeWcpvx3o8cWhSbNs9JQShEuB3nv3R5lqFBtDCgHZF/emFQAP+ZjF8bTfCs9UBGhA==
 
-"@delphi-labs/shuttle-react@^3.8.0":
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/@delphi-labs/shuttle-react/-/shuttle-react-3.8.0.tgz#8919cf101e19849dd5fe94652ed62661d14c01e7"
-  integrity sha512-dYv7HWRFkGfJXiAG9JjvtPZ3LKeeSykS2yZ+WXZJQnCjRKXaRLVdZNVuclKchiSbfrVssymN9aplmFycEAK4Qg==
+"@delphi-labs/shuttle-react@^3.9.0":
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/@delphi-labs/shuttle-react/-/shuttle-react-3.9.0.tgz#fac4a8c8358ba3f52dddc27bb75e086793f7c06a"
+  integrity sha512-L6A2WfBV/qHvsKwF0cDC7NbZ0BNDvOUGdJSuXKEqhjmp92aSTcpfktCj5UIHLDhK64Q9ovaxR0WUosetiFrgUA==
   dependencies:
-    "@delphi-labs/shuttle" "3.8.0"
+    "@delphi-labs/shuttle" "3.9.0"
     tslib "^2.6.0"
     tsup "^7.1.0"
     use-local-storage-state "^18.3.3"
     zustand "^4.3.8"
 
-"@delphi-labs/shuttle@3.8.0":
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/@delphi-labs/shuttle/-/shuttle-3.8.0.tgz#5c7ee1a02affea667aaa7302afb84986c23cfc66"
-  integrity sha512-eEgk2zYQkv55SV+UNtVhPDl5Oe3AUST0bYlU7v/g/YlLoSLjxOuAbJrBtS+j7SsVAlmEi+2MD5R10bJ0w8GYLw==
+"@delphi-labs/shuttle@3.9.0":
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/@delphi-labs/shuttle/-/shuttle-3.9.0.tgz#7a39adeeb55d44cb19c3b395c570827b6d052d30"
+  integrity sha512-cO55tSE9ejM0y+txhYIZfkIzOQdpbkid/ZMhhbA/+OEjnefUAVX4o1El2uH0bRIYElJwWum5mqyjxtIRceZEHQ==
   dependencies:
     "@cosmjs/amino" "^0.31.0"
     "@cosmjs/cosmwasm-stargate" "^0.31.0"