diff --git a/apps/main/src/components/AssetSelect/AssetSelect.tsx b/apps/main/src/components/AssetSelect/AssetSelect.tsx
index ba8cab4138..d193782736 100644
--- a/apps/main/src/components/AssetSelect/AssetSelect.tsx
+++ b/apps/main/src/components/AssetSelect/AssetSelect.tsx
@@ -48,6 +48,7 @@ export const AssetSelect = ({
   const displayValueLoading = props.displayValueLoading ?? displayValueLoading_
 
   const { getTransferableBalance } = useAccountBalances()
+
   const maxBalance = ((): string | undefined => {
     if (providedMaxBalance) {
       return providedMaxBalance
diff --git a/apps/main/src/components/AssetSelectModal/AssetSelectModal.utils.ts b/apps/main/src/components/AssetSelectModal/AssetSelectModal.utils.ts
index fd4a5d4d7f..336d086648 100644
--- a/apps/main/src/components/AssetSelectModal/AssetSelectModal.utils.ts
+++ b/apps/main/src/components/AssetSelectModal/AssetSelectModal.utils.ts
@@ -19,7 +19,9 @@ export const useAssetSelectModalAssets = ({
   search,
   selectedAssetId,
   ignoreAssetIds,
-  ...sortOptions
+  tickerOrder,
+  lowPriorityAssetIds,
+  highPriorityAssetIds,
 }: {
   assets: TAssetData[]
   ignoreAssetIds?: string[]
@@ -45,33 +47,54 @@ export const useAssetSelectModalAssets = ({
   const { getAssetPrice, isLoading: isPriceLoading } =
     useAssetsPrice(assetsBalanceIds)
 
-  if (!account || !assets.length) {
-    return {
-      sortedAssets: filteredAssets,
-      isLoading: false,
-    }
-  }
-
-  const assetsWithBalances = filteredAssets.map((asset) => {
-    const balance = scaleHuman(getTransferableBalance(asset.id), asset.decimals)
+  const invalidState = !account || !assets.length
 
-    const { price, isValid } = getAssetPrice(asset.id)
-    const balanceDisplay = isValid ? Big(price).times(balance).toString() : "0"
+  const isLoading = isPriceLoading || isBalanceLoading
 
-    return {
-      ...asset,
-      balance,
-      balanceDisplay,
+  const sortedAssets = useMemo(() => {
+    if (invalidState || isLoading) {
+      return filteredAssets
     }
-  })
 
-  const sortedAssets = sortAssets(assetsWithBalances, "balanceDisplay", {
-    firstAssetId: selectedAssetId,
+    const assetsWithBalances = filteredAssets.map((asset) => {
+      const balance = scaleHuman(
+        getTransferableBalance(asset.id),
+        asset.decimals,
+      )
+
+      const { price, isValid } = getAssetPrice(asset.id)
+      const balanceDisplay = isValid
+        ? Big(price).times(balance).toString()
+        : "0"
+
+      return {
+        ...asset,
+        balance,
+        balanceDisplay,
+      }
+    })
+
+    return sortAssets(assetsWithBalances, "balanceDisplay", {
+      firstAssetId: selectedAssetId,
+      search,
+      tickerOrder,
+      lowPriorityAssetIds,
+      highPriorityAssetIds,
+    })
+  }, [
+    invalidState,
+    filteredAssets,
+    getAssetPrice,
+    getTransferableBalance,
+    highPriorityAssetIds,
+    isLoading,
+    lowPriorityAssetIds,
+    selectedAssetId,
     search,
-    ...sortOptions,
-  })
+    tickerOrder,
+  ])
 
-  return { sortedAssets, isLoading: isPriceLoading || isBalanceLoading }
+  return { sortedAssets, isLoading: invalidState ? false : isLoading }
 }
 
 export const useFilteredSearchAssets = <T extends TAssetData>(
@@ -85,6 +108,7 @@ export const useFilteredSearchAssets = <T extends TAssetData>(
     }
 
     const ignoredAssetIdSet = new Set(ignoreAssetIds ?? [])
+    const searchLower = search.length ? search.toLowerCase() : ""
 
     return assets.filter((asset) => {
       if (ignoredAssetIdSet.has(asset.id)) {
@@ -93,8 +117,8 @@ export const useFilteredSearchAssets = <T extends TAssetData>(
 
       if (search.length) {
         return (
-          asset.name.toLowerCase().includes(search.toLowerCase()) ||
-          asset.symbol.toLowerCase().includes(search.toLowerCase())
+          asset.name.toLowerCase().includes(searchLower) ||
+          asset.symbol.toLowerCase().includes(searchLower)
         )
       }
 
diff --git a/apps/main/src/modules/layout/components/LayoutSkeleton/AppSkeleton.tsx b/apps/main/src/modules/layout/components/LayoutSkeleton/AppSkeleton.tsx
index 0b50380507..e160b1f041 100644
--- a/apps/main/src/modules/layout/components/LayoutSkeleton/AppSkeleton.tsx
+++ b/apps/main/src/modules/layout/components/LayoutSkeleton/AppSkeleton.tsx
@@ -1,4 +1,5 @@
 import {
+  AssetButton,
   Box,
   Flex,
   LoadingButton,
@@ -8,10 +9,11 @@ import {
   Stack,
   Text,
 } from "@galacticcouncil/ui/components"
+import { pxToRem } from "@galacticcouncil/ui/utils"
 
 const AssetSectionSkeleton = () => {
   return (
-    <Stack gap="s" py="m" px="l">
+    <Stack gap="m" py="l" px="xl">
       <Flex justify="space-between">
         <Text fs="p6">
           <Skeleton width={100} />
@@ -21,13 +23,14 @@ const AssetSectionSkeleton = () => {
         </Text>
       </Flex>
       <Flex justify="space-between" align="center">
-        <Flex gap="m" align="center">
-          <Skeleton width={42} height={42} circle />
-          <Skeleton width={70} height={30} />
-        </Flex>
-        <Flex gap="base" direction="column" align="end">
-          <Skeleton width={40} height={30} />
-          <Skeleton width={50} height={14} />
+        <AssetButton loading error={false} />
+        <Flex gap="s" direction="column" align="end">
+          <div sx={{ height: pxToRem(26), lineHeight: 1 }}>
+            <Skeleton width={pxToRem(40)} height={pxToRem(26)} />
+          </div>
+          <div sx={{ height: pxToRem(12), lineHeight: 1 }}>
+            <Skeleton width={pxToRem(50)} height={pxToRem(12)} />
+          </div>
         </Flex>
       </Flex>
     </Stack>
@@ -36,11 +39,11 @@ const AssetSectionSkeleton = () => {
 
 const SwitcherSkeleton = () => {
   return (
-    <Flex align="center" justify="space-between" gap="s">
-      <Separator sx={{ flexShrink: 0, width: "m" }} />
+    <Flex align="center" justify="space-between">
+      <Separator sx={{ flexShrink: 0, width: 32 }} />
       <Skeleton
-        width={30}
-        height={30}
+        width={34}
+        height={34}
         circle
         sx={{ display: "inline-flex", flexShrink: 0 }}
       />
diff --git a/apps/main/src/modules/trade/orders/DcaOrderDetailsModal.tsx b/apps/main/src/modules/trade/orders/DcaOrderDetailsModal.tsx
index 30f35fcc37..c81049488d 100644
--- a/apps/main/src/modules/trade/orders/DcaOrderDetailsModal.tsx
+++ b/apps/main/src/modules/trade/orders/DcaOrderDetailsModal.tsx
@@ -66,9 +66,9 @@ export const DcaOrderDetailsModal = ({ details, onTerminate }: Props) => {
               {t("number", {
                 value: details.isOpenBudget
                   ? details.fromAmountExecuted
-                  : details.status === DcaScheduleStatus.Created
-                    ? details.fromAmountRemaining
-                    : "0",
+                  : details.status === DcaScheduleStatus.Completed
+                    ? "0"
+                    : (details.fromAmountRemaining ?? details.fromAmountBudget),
               })}
               {!details.isOpenBudget && (
                 <>
diff --git a/apps/main/src/modules/trade/orders/columns/SwapPrice.tsx b/apps/main/src/modules/trade/orders/columns/SwapPrice.tsx
index 54f134959c..a35c162964 100644
--- a/apps/main/src/modules/trade/orders/columns/SwapPrice.tsx
+++ b/apps/main/src/modules/trade/orders/columns/SwapPrice.tsx
@@ -13,7 +13,14 @@ type Props = {
 }
 
 export const SwapPrice: FC<Props> = ({ from, to, price }) => {
-  const { t } = useTranslation()
+  const { t } = useTranslation("common")
+
+  if (!price)
+    return (
+      <Text fw={500} fs="p6" lh="s" color={getToken("text.high")}>
+        -
+      </Text>
+    )
 
   return (
     <Flex align="center" gap="s" justify="center">
diff --git a/apps/main/src/modules/trade/otc/place-order/PlaceOrderModalContent.tsx b/apps/main/src/modules/trade/otc/place-order/PlaceOrderModalContent.tsx
index aa756f45bf..d52601c1f4 100644
--- a/apps/main/src/modules/trade/otc/place-order/PlaceOrderModalContent.tsx
+++ b/apps/main/src/modules/trade/otc/place-order/PlaceOrderModalContent.tsx
@@ -449,7 +449,6 @@ export const PlaceOrderModalContent: FC<Props> = ({ onClose }) => {
                 )}
               </>
             )}
-            <Separator />
           </ModalBody>
           <ModalFooter>
             <Button
diff --git a/apps/main/src/modules/trade/otc/place-order/PlaceOrderPrice.tsx b/apps/main/src/modules/trade/otc/place-order/PlaceOrderPrice.tsx
index 1a386172ad..35565c809d 100644
--- a/apps/main/src/modules/trade/otc/place-order/PlaceOrderPrice.tsx
+++ b/apps/main/src/modules/trade/otc/place-order/PlaceOrderPrice.tsx
@@ -1,7 +1,8 @@
-import { AssetIcon } from "@galacticcouncil/ui/assets/icons"
+import { ArrowLeftRight } from "@galacticcouncil/ui/assets/icons"
 import {
   ButtonIcon,
   Flex,
+  Icon,
   NumberInput,
   Text,
 } from "@galacticcouncil/ui/components"
@@ -79,6 +80,11 @@ export const PlaceOrderPrice: FC<Props> = ({
       <Flex justify="space-between" align="center">
         <Flex py="s" pl="s" gap="s" align="center">
           <ButtonIcon
+            sx={{
+              border: "1px solid",
+              borderColor: getToken("buttons.secondary.low.borderRest"),
+            }}
+            size="small"
             onClick={() =>
               viewField.onChange(
                 (isOfferView
@@ -87,7 +93,11 @@ export const PlaceOrderPrice: FC<Props> = ({
               )
             }
           >
-            <AssetIcon />
+            <Icon
+              component={ArrowLeftRight}
+              size="s"
+              color={getToken("icons.onContainer")}
+            />
           </ButtonIcon>
           <Text fw={600} fs="p3" lh="s" color={getToken("text.high")}>
             {isOfferView ? buyAsset.symbol : offerAsset.symbol}
diff --git a/apps/main/src/states/account.ts b/apps/main/src/states/account.ts
index dfdee96c21..b18207bda6 100644
--- a/apps/main/src/states/account.ts
+++ b/apps/main/src/states/account.ts
@@ -1,5 +1,6 @@
 import { Balance as SdkBalance } from "@galacticcouncil/sdk-next"
 import { useStableArray } from "@galacticcouncil/utils"
+import { useAccount } from "@galacticcouncil/web3-connect"
 import { produce } from "immer"
 import { useCallback, useMemo } from "react"
 import { pick } from "remeda"
@@ -138,6 +139,7 @@ export const useAccountData = create<
 }))
 
 export const useAccountBalances = () => {
+  const { account } = useAccount()
   const { balances, isBalanceLoading } = useAccountData(
     useShallow(pick(["balances", "isBalanceLoading"])),
   )
@@ -159,7 +161,7 @@ export const useAccountBalances = () => {
 
   return {
     balances,
-    isBalanceLoading,
+    isBalanceLoading: account ? isBalanceLoading : false,
     getBalance,
     getTransferableBalance,
     isBalanceLoaded,
diff --git a/package.json b/package.json
index b7deeb3d96..e57f939123 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "@galacticcouncil/common": "^0.6.0",
     "@galacticcouncil/descriptors": "^1.15.0",
-    "@galacticcouncil/sdk-next": "^0.38.0",
+    "@galacticcouncil/sdk-next": "^0.39.0",
     "@galacticcouncil/xc": "^0.5.0",
     "@galacticcouncil/xc-cfg": "^0.18.1",
     "@galacticcouncil/xc-core": "^0.13.0",
diff --git a/packages/ui/src/assets/icons/AssetIcon.svg b/packages/ui/src/assets/icons/AssetIcon.svg
deleted file mode 100644
index c843040f2c..0000000000
--- a/packages/ui/src/assets/icons/AssetIcon.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<svg width="27" height="26" viewBox="0 0 27 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 12.9708C1 6.09097 6.57719 0.513794 13.457 0.513794H13.7419C20.6217 0.513794 26.1989 6.09097 26.1989 12.9708C26.1989 19.8506 20.6217 25.4278 13.7419 25.4278H13.457C6.57719 25.4278 1 19.8506 1 12.9708Z" stroke="#373C4B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.69139 9.92917L10.4156 8.20493C10.6705 7.95008 11.0888 7.95008 11.3442 8.20493C11.5991 8.45977 11.5991 8.87813 11.3442 9.13352L10.7416 9.73618H16.0424C16.4033 9.73618 16.6997 10.0326 16.6997 10.3935C16.6997 10.7545 16.4033 11.0509 16.0424 11.0509L10.7427 11.0503L11.3453 11.653C11.6002 11.9078 11.6002 12.3262 11.3453 12.5816C11.0905 12.8364 10.6721 12.8364 10.4168 12.5816L8.69251 10.8573C8.43603 10.6025 8.436 10.184 8.69139 9.92917ZM18.5073 15.0831L16.7831 13.3589C16.5282 13.1041 16.1099 13.1041 15.8534 13.3589C15.5985 13.6137 15.5985 14.0321 15.8534 14.2875L16.456 14.8902H11.1568C10.7958 14.8902 10.4994 15.1866 10.4994 15.5475C10.4994 15.9084 10.7958 16.2048 11.1568 16.2048L16.456 16.2043L15.8534 16.807C15.5985 17.0618 15.5985 17.4802 15.8534 17.7366C16.1082 17.9915 16.5266 17.9915 16.7831 17.7366L18.5073 16.0124C18.7627 15.7565 18.7627 15.338 18.5073 15.0831Z" fill="white"/>
-</svg>
diff --git a/packages/ui/src/assets/icons/index.ts b/packages/ui/src/assets/icons/index.ts
index 757631cb5a..e02a530c94 100644
--- a/packages/ui/src/assets/icons/index.ts
+++ b/packages/ui/src/assets/icons/index.ts
@@ -1,5 +1,4 @@
 export { default as ArrowRightLong } from "./ArrowRightLong.svg?react"
-export { default as AssetIcon } from "./AssetIcon.svg?react"
 export { default as CaretDown } from "./CaretDown.svg?react"
 export { default as CircleAlert } from "./CircleAlert.svg?react"
 export { default as CircleCheck } from "./CircleCheck.svg?react"
diff --git a/packages/ui/src/components/AssetInput/AssetInput.tsx b/packages/ui/src/components/AssetInput/AssetInput.tsx
index e023167ae6..b0926190d2 100644
--- a/packages/ui/src/components/AssetInput/AssetInput.tsx
+++ b/packages/ui/src/components/AssetInput/AssetInput.tsx
@@ -5,7 +5,7 @@ import { ReactNode } from "react"
 
 import { Flex, Icon, MicroButton, Skeleton, Text } from "@/components"
 import { FormError } from "@/components/FormError"
-import { getToken } from "@/utils"
+import { getToken, pxToRem } from "@/utils"
 
 import {
   SAssetButton,
@@ -75,7 +75,8 @@ export const AssetInput = ({
     <Flex
       direction="column"
       gap="m"
-      sx={{ position: "relative", py: 20, overflow: "hidden" }}
+      py="l"
+      sx={{ position: "relative", overflow: "hidden" }}
       className={className}
     >
       <Flex align="center" gap="s" justify="space-between">
@@ -222,20 +223,9 @@ export const AssetButton = ({
 }) => {
   if (loading)
     return (
-      <Flex
-        direction="column"
-        height="2.375rem"
-        gap="xs"
-        justify="center"
-        className={className}
-      >
-        <div sx={{ height: "xs", lineHeight: 1 }}>
-          <Skeleton sx={{ width: "m", height: "xs" }} />
-        </div>
-        <div sx={{ height: "xs", lineHeight: 1 }}>
-          <Skeleton sx={{ width: "100%", minWidth: "xl", height: "xs" }} />
-        </div>
-      </Flex>
+      <div sx={{ height: pxToRem(34), lineHeight: 1 }}>
+        <Skeleton sx={{ width: pxToRem(80), height: pxToRem(34) }} />
+      </div>
     )
 
   if (symbol && icon)
diff --git a/yarn.lock b/yarn.lock
index 783f429bee..8d5f4844be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2072,10 +2072,10 @@
   resolved "https://registry.yarnpkg.com/@galacticcouncil/math-xyk/-/math-xyk-1.3.0.tgz#96d3b3e63a93544c7e60d3fa9e1be9a576a20efe"
   integrity sha512-ZYVSyI5W2pQKCqpkaRM7t1AJqtPyxQ0P04T2+KpBEEABMRjSpQz2x44s1tk6r3DdFR8dICeZJEh5BI7eQYlT6w==
 
-"@galacticcouncil/sdk-next@^0.38.0":
-  version "0.38.0"
-  resolved "https://registry.yarnpkg.com/@galacticcouncil/sdk-next/-/sdk-next-0.38.0.tgz#5faedd2319c027b342b2fe4f4ed008e28602216b"
-  integrity sha512-XDRLA/dSOLwV8eAFCks0urpXgmNPrUASGFBeWge/IchinT4idfVzrnmvQFEpL9IcCejqg026Qp5h232mX67tBw==
+"@galacticcouncil/sdk-next@^0.39.0":
+  version "0.39.0"
+  resolved "https://registry.yarnpkg.com/@galacticcouncil/sdk-next/-/sdk-next-0.39.0.tgz#b4187c793a77124df7929a6511577f976bd32147"
+  integrity sha512-eGrMzhG9MYXr3LQyLLfDj3q8lV0EtSMuCewd+Wia8cqpBwPvL8d2U5UE2zlgkYlXHA4x1qayH2qRpWe4gRyIIQ==
   dependencies:
     "@galacticcouncil/math-hsm" "^1.2.0"
     "@galacticcouncil/math-lbp" "^1.3.0"