diff --git a/src/app/wallet/views/token_list.nim b/src/app/wallet/views/token_list.nim
index 530d9fb5b9..f625633bc0 100644
--- a/src/app/wallet/views/token_list.nim
+++ b/src/app/wallet/views/token_list.nim
@@ -5,8 +5,7 @@ import # vendor libs
   NimQml
 
 import # status-desktop libs
-  ../../../status/[utils],
-  ../../../status/libstatus/[tokens, settings, eth/contracts],
+  ../../../status/[utils, tokens, settings],
   ../../../status/tasks/[qt, task_runner_impl], ../../../status/status
 from web3/conversions import `$`
 
@@ -72,7 +71,7 @@ QtObject:
 
   proc loadCustomTokens*(self: TokenList) =
     self.beginResetModel()
-    self.tokens = getCustomTokens()
+    self.tokens = self.status.tokens.getCustomTokens()
     self.tokensLoaded(self.tokens.len)
     self.isCustom = true
     self.endResetModel()
diff --git a/src/status/settings.nim b/src/status/settings.nim
index 371c93c668..08e808b324 100644
--- a/src/status/settings.nim
+++ b/src/status/settings.nim
@@ -45,5 +45,8 @@ proc saveMailserver*(self: SettingsModel, name, enode: string) =
 proc getFleet*(self: SettingsModel): Fleet =
     result = status_settings.getFleet()
 
-proc getCurrentNetwork*(self: SettingsModel): Network =
+proc getCurrentNetwork*(): Network =
     result = status_settings.getCurrentNetwork()
+
+proc getCurrentNetwork*(self: SettingsModel): Network =
+    result = getCurrentNetwork()
diff --git a/src/status/tokens.nim b/src/status/tokens.nim
index 0bc6605dbb..cdd881a0a3 100644
--- a/src/status/tokens.nim
+++ b/src/status/tokens.nim
@@ -4,6 +4,7 @@ import
   sugar, sequtils, strutils, atomics
 
 import libstatus/tokens as status_tokens
+import libstatus/eth/contracts
 import ../eventemitter
 import signals/types
 
@@ -21,6 +22,21 @@ proc newTokensModel*(events: EventEmitter): TokensModel =
 proc getSNTAddress*(): string =
   result = status_tokens.getSNTAddress()
 
+proc getCustomTokens*(self: TokensModel, useCached: bool = true): seq[Erc20Contract] =
+  result = status_tokens.getCustomTokens(useCached)
+
 proc getSNTBalance*(account: string): string =
   result = status_tokens.getSNTBalance(account)
 
+proc tokenDecimals*(contract: Contract): int =
+  result = status_tokens.tokenDecimals(contract)
+
+proc tokenName*(contract: Contract): string =
+  result = status_tokens.tokenName(contract)
+
+proc tokensymbol*(contract: Contract): string =
+  result = status_tokens.tokensymbol(contract)
+
+export newErc20Contract
+export getErc20Contracts
+export Erc20Contract