diff --git a/src/components/security/mnemonic-input.stories.tsx b/src/components/security/mnemonic-input.stories.tsx
index 35fe4924b..6016f7c45 100644
--- a/src/components/security/mnemonic-input.stories.tsx
+++ b/src/components/security/mnemonic-input.stories.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import type { Meta, StoryObj } from '@storybook/react';
 import { MnemonicInput } from './mnemonic-input';
-import { GradientButton } from '../common/gradient-button';
+import { GradientButton } from '@biochain/key-ui';
 
 const meta: Meta<typeof MnemonicInput> = {
   title: 'Security/MnemonicInput',
diff --git a/src/components/token/token-list.stories.tsx b/src/components/token/token-list.stories.tsx
index 81f826226..72e066cba 100644
--- a/src/components/token/token-list.stories.tsx
+++ b/src/components/token/token-list.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TokenList } from './token-list'
 import type { TokenInfo } from './token-item'
-import { GradientButton } from '../common/gradient-button'
+import { GradientButton } from '@biochain/key-ui'
 
 const meta: Meta<typeof TokenList> = {
   title: 'Token/TokenList',
diff --git a/src/components/token/token-list.tsx b/src/components/token/token-list.tsx
index 67399f285..aa2d58b75 100644
--- a/src/components/token/token-list.tsx
+++ b/src/components/token/token-list.tsx
@@ -1,7 +1,6 @@
 import { cn } from '@/lib/utils'
 import { TokenItem, type TokenInfo, type TokenItemContext, type TokenMenuItem } from './token-item'
-import { EmptyState } from '../common/empty-state'
-import { SkeletonList } from '../common/skeleton'
+import { EmptyState, SkeletonList } from '@biochain/key-ui'
 
 interface TokenListProps {
   tokens: TokenInfo[]
diff --git a/src/components/transaction/transaction-list.stories.tsx b/src/components/transaction/transaction-list.stories.tsx
index f3d0fa7b7..6ab3ea695 100644
--- a/src/components/transaction/transaction-list.stories.tsx
+++ b/src/components/transaction/transaction-list.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'
 import { Amount } from '@/types/amount'
 import { TransactionList } from './transaction-list'
 import type { TransactionInfo } from './transaction-item'
-import { GradientButton } from '../common/gradient-button'
+import { GradientButton } from '@biochain/key-ui'
 
 const meta: Meta<typeof TransactionList> = {
   title: 'Transaction/TransactionList',
diff --git a/src/components/transaction/transaction-list.tsx b/src/components/transaction/transaction-list.tsx
index aef3851fe..5e152caa4 100644
--- a/src/components/transaction/transaction-list.tsx
+++ b/src/components/transaction/transaction-list.tsx
@@ -1,7 +1,6 @@
 import { cn } from '@/lib/utils';
 import { TransactionItem, type TransactionInfo } from './transaction-item';
-import { EmptyState } from '../common/empty-state';
-import { SkeletonList } from '../common/skeleton';
+import { EmptyState, SkeletonList } from '@biochain/key-ui';
 
 interface TransactionListProps {
   transactions: TransactionInfo[];
diff --git a/src/stackflow/activities/tabs/WalletTab.tsx b/src/stackflow/activities/tabs/WalletTab.tsx
index fae2858ee..4727a2270 100644
--- a/src/stackflow/activities/tabs/WalletTab.tsx
+++ b/src/stackflow/activities/tabs/WalletTab.tsx
@@ -3,9 +3,8 @@ import { useTranslation } from "react-i18next";
 import { useFlow } from "../../stackflow";
 import { WalletCardCarousel } from "@/components/wallet/wallet-card-carousel";
 import { WalletAddressPortfolioView } from "@/components/wallet/wallet-address-portfolio-view";
-import { LoadingSpinner } from "@/components/common/loading-spinner";
+import { LoadingSpinner, GradientButton } from "@biochain/key-ui";
 import { MigrationRequiredView } from "@/components/common/migration-required-view";
-import { GradientButton } from "@/components/common/gradient-button";
 import { Button } from "@/components/ui/button";
 import { useWalletTheme } from "@/hooks/useWalletTheme";
 import { useClipboard, useToast, useHaptics } from "@/services";