diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png b/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png
index 53d3fcb75..2f0996acb 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-animation.png b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-animation.png
index def9666e8..4e267e78a 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-animation.png and b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-results-animation.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png
index 8ec725ee1..6fa29648d 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png
index e1c67756d..3b36a0a86 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png
index ba6ffdd2d..e83f73c35 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png
index 3ca441d01..96966af10 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png
index 37f7557e5..71253b06f 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png
index f24dc62fe..5c5088093 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png
index 8b4038cdd..a82096efc 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png
index 845e614ed..c681a82e2 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png
index 67d63a7d2..d8d030add 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png
index 5b9988887..3ad9c07bc 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png differ
diff --git a/src/libs/tokens/tokenHelperFn.ts b/src/libs/tokens/tokenHelperFn.ts
index 4d3e3fae1..40f8362b6 100644
--- a/src/libs/tokens/tokenHelperFn.ts
+++ b/src/libs/tokens/tokenHelperFn.ts
@@ -67,8 +67,8 @@ export const buildTokenList = (tokenList: TokenList[]): Token[] => {
 
   const lsImportedTokens = lsService.getItem('importedTokens') ?? [];
   const result = new Map<string, Token>();
-  for (const token of tokens) result.set(token.address, token);
   for (const token of lsImportedTokens) result.set(token.address, token);
+  for (const token of tokens) result.set(token.address, token);
   return Array.from(result.values());
 };
 
diff --git a/src/store/useTokensStore.ts b/src/store/useTokensStore.ts
index e0d15b31b..d7afc30e0 100644
--- a/src/store/useTokensStore.ts
+++ b/src/store/useTokensStore.ts
@@ -22,8 +22,8 @@ export const useTokensStore = (): TokensStore => {
   const tokens = useMemo(() => {
     if (!tokensQuery.data?.length) return [];
     const result = new Map<string, Token>();
-    for (const token of tokensQuery.data) result.set(token.address, token);
     for (const token of importedTokens) result.set(token.address, token);
+    for (const token of tokensQuery.data) result.set(token.address, token);
     return Array.from(result.values());
   }, [tokensQuery.data, importedTokens]);