diff --git a/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 3f27efcd..dfff2845 100644
--- a/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved	
+++ b/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved	
@@ -69,7 +69,7 @@
       "location" : "https://github.com/kukai-wallet/kukai-core-swift",
       "state" : {
         "branch" : "develop",
-        "revision" : "757ccb82347d0ef5e42c36f6709ba731ca875f61"
+        "revision" : "08e2baf10ea197af930dc7a430da3745efef7e11"
       }
     },
     {
@@ -77,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/kukai-wallet/kukai-crypto-swift",
       "state" : {
-        "revision" : "9c077851c8eca37bba69fe95f97db4b051879c53",
-        "version" : "1.0.21"
+        "revision" : "8afd803c7fa1fe6716b47f66f77b4fa9ceb94aea",
+        "version" : "1.0.20"
       }
     },
     {
diff --git a/Kukai Mobile/Modules/Account/Account.storyboard b/Kukai Mobile/Modules/Account/Account.storyboard
index d0a1f9b3..039aca63 100644
--- a/Kukai Mobile/Modules/Account/Account.storyboard	
+++ b/Kukai Mobile/Modules/Account/Account.storyboard	
@@ -694,23 +694,23 @@
                                             <rect key="frame" x="0.0" y="0.0" width="393" height="91"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dIV-vR-veM">
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dIV-vR-veM">
                                                     <rect key="frame" x="16" y="16" width="361" height="59"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Getting Started" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OaX-dE-p7M">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Getting Started" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OaX-dE-p7M">
                                                             <rect key="frame" x="16" y="20.333333333333336" width="159" height="26.666666666666664"/>
                                                             <accessibility key="accessibilityConfiguration" identifier="account-getting-started-header"/>
                                                             <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="22"/>
                                                             <color key="textColor" name="Txt2"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Copy here about needing some XTZ to get started etc and how to get XTZ." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WUd-ec-WyL">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copy here about needing some XTZ to get started etc and how to get XTZ." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WUd-ec-WyL">
                                                             <rect key="frame" x="16" y="59" width="329" height="0.0"/>
                                                             <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                                             <color key="textColor" name="Txt6"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="Social_TZ_Ovalcolor" translatesAutoresizingMaskIntoConstraints="NO" id="0XZ-Q7-XG3">
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Social_TZ_Ovalcolor" translatesAutoresizingMaskIntoConstraints="NO" id="0XZ-Q7-XG3">
                                                             <rect key="frame" x="307" y="16" width="38" height="35"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="38" id="VwN-8M-Lxz"/>
@@ -747,7 +747,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="393" height="63"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1Ao-zL-OIA" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1Ao-zL-OIA" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
                                                     <rect key="frame" x="32" y="8" width="329" height="47"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="48" id="NL4-wV-VUW"/>
@@ -779,22 +779,22 @@
                                             <rect key="frame" x="0.0" y="0.0" width="393" height="212"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="p5E-1m-530">
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="p5E-1m-530">
                                                     <rect key="frame" x="16" y="16" width="361" height="180"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Receive Assets" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2ij-BE-VqB">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Receive Assets" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2ij-BE-VqB">
                                                             <rect key="frame" x="16" y="21.666666666666664" width="153.33333333333334" height="26.666666666666664"/>
                                                             <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="22"/>
                                                             <color key="textColor" name="Txt2"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="You can also copy your address by tapping the top left button and choose copy in the side menu" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Juv-Ge-4u3">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You can also copy your address by tapping the top left button and choose copy in the side menu" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Juv-Ge-4u3">
                                                             <rect key="frame" x="16" y="62" width="329" height="38"/>
                                                             <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                                             <color key="textColor" name="Txt6"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="btnQR_Outline_Dark" translatesAutoresizingMaskIntoConstraints="NO" id="BGW-ha-UIr">
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="btnQR_Outline_Dark" translatesAutoresizingMaskIntoConstraints="NO" id="BGW-ha-UIr">
                                                             <rect key="frame" x="307" y="16" width="38" height="38"/>
                                                             <color key="tintColor" name="BGB4"/>
                                                             <constraints>
@@ -802,7 +802,7 @@
                                                                 <constraint firstAttribute="width" constant="38" id="NlK-3x-MQg"/>
                                                             </constraints>
                                                         </imageView>
-                                                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EKG-xY-HYO" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EKG-xY-HYO" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
                                                             <rect key="frame" x="16" y="116" width="156.66666666666666" height="48"/>
                                                             <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="18"/>
                                                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -811,7 +811,7 @@
                                                                 <action selector="qrButtonTapped:" destination="I2q-rN-gX7" eventType="touchUpInside" id="plX-QU-ZkK"/>
                                                             </connections>
                                                         </button>
-                                                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rdt-d8-lSF" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rdt-d8-lSF" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
                                                             <rect key="frame" x="188.66666666666663" y="116" width="156.33333333333337" height="48"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="48" id="7e9-HA-La6"/>
diff --git a/Kukai Mobile/Modules/Side Menu/WalletConnectViewController.swift b/Kukai Mobile/Modules/Side Menu/WalletConnectViewController.swift
index e2925047..ff5c82f6 100644
--- a/Kukai Mobile/Modules/Side Menu/WalletConnectViewController.swift	
+++ b/Kukai Mobile/Modules/Side Menu/WalletConnectViewController.swift	
@@ -7,7 +7,6 @@
 
 import UIKit
 import KukaiCoreSwift
-import KukaiCryptoSwift
 import WalletConnectSign
 import Combine
 
@@ -67,9 +66,8 @@ class WalletConnectViewController: UIViewController, BottomSheetContainerDelegat
 		if let pairing = self.pairingToChangeAccount {
 			
 			let newAddress = DependencyManager.shared.temporarySelectedWalletAddress ?? DependencyManager.shared.selectedWalletAddress ?? ""
-			guard let metadata = DependencyManager.shared.walletList.metadata(forAddress: newAddress),
-				  let existingSession = Sign.instance.getSessions().first(where: { $0.pairingTopic == pairing.topic }),
-				  let newNamespaces = WalletConnectService.updateNamespaces(forPairing: pairing, toMetadata: metadata) else {
+			guard let existingSession = Sign.instance.getSessions().first(where: { $0.pairingTopic == pairing.topic }),
+				  let newNamespaces = WalletConnectService.updateNamespaces(forPairing: pairing, toAddress: newAddress) else {
 				return
 			}
 			
@@ -172,7 +170,7 @@ extension WalletConnectViewController: UITableViewDelegate {
 			}
 			
 			self?.pairingToChangeAccount = pairing
-			self?.performSegue(withIdentifier: "accounts", sender: PublicKey.publicKeyHash(fromBase58EncodedKey: firstAccount.address))
+			self?.performSegue(withIdentifier: "accounts", sender: firstAccount.address)
 		}
 		
 		/*
diff --git a/Kukai Mobile/Modules/Side Menu/WalletConnectViewModel.swift b/Kukai Mobile/Modules/Side Menu/WalletConnectViewModel.swift
index 71b4e6a4..a28b6a0c 100644
--- a/Kukai Mobile/Modules/Side Menu/WalletConnectViewModel.swift	
+++ b/Kukai Mobile/Modules/Side Menu/WalletConnectViewModel.swift	
@@ -7,7 +7,6 @@
 
 import UIKit
 import KukaiCoreSwift
-import KukaiCryptoSwift
 import WalletConnectSign
 
 struct PairObj: Hashable {
@@ -83,7 +82,7 @@ class WalletConnectViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 			} else {
 				let firstSession = sessions.first
 				let firstAccount = firstSession?.accounts.first
-				let address = PublicKey.publicKeyHash(fromBase58EncodedKey: firstAccount?.address ?? "")
+				let address = firstAccount?.address
 				let network = firstAccount?.blockchain.reference == "ghostnet" ? "Ghostnet" : "Mainnet"
 				let iconURL = URL(string: pair.peer?.icons.first ?? "")
 				
diff --git a/Kukai Mobile/Services/WalletConnectService.swift b/Kukai Mobile/Services/WalletConnectService.swift
index 98086e7d..665004e0 100644
--- a/Kukai Mobile/Services/WalletConnectService.swift	
+++ b/Kukai Mobile/Services/WalletConnectService.swift	
@@ -508,7 +508,7 @@ public class WalletConnectService {
 	
 	// MARK: - Namespaces
 	
-	public static func createNamespace(forProposal proposal: Session.Proposal, metadata: WalletMetadata, currentNetworkType: TezosNodeClientConfig.NetworkType) -> [String: SessionNamespace]? {
+	public static func createNamespace(forProposal proposal: Session.Proposal, address: String, currentNetworkType: TezosNodeClientConfig.NetworkType) -> [String: SessionNamespace]? {
 		var sessionNamespaces = [String: SessionNamespace]()
 		
 		let supportedMethods = ["tezos_send", "tezos_sign", "tezos_getAccounts"]
@@ -524,7 +524,7 @@ public class WalletConnectService {
 		
 		
 		let network = currentNetworkType == .mainnet ? "mainnet" : "ghostnet"
-		if let wcAccount = Account("tezos:\(network):\(metadata.bas58EncodedPublicKey)") {
+		if let wcAccount = Account("tezos:\(network):\(address)") {
 			let accounts: Set<WalletConnectSign.Account> = Set([wcAccount])
 			//let accounts = [wcAccount]
 			let sessionNamespace = SessionNamespace(accounts: accounts, methods: approvedMethods ?? [], events: approvedEvents ?? [])
@@ -537,12 +537,12 @@ public class WalletConnectService {
 		}
 	}
 	
-	public static func updateNamespaces(forPairing pairing: Pairing, toMetadata: WalletMetadata/*, andNetwork newNetwork: TezosNodeClientConfig.NetworkType*/) -> [String: SessionNamespace]? {
+	public static func updateNamespaces(forPairing pairing: Pairing, toAddress: String/*, andNetwork newNetwork: TezosNodeClientConfig.NetworkType*/) -> [String: SessionNamespace]? {
 		let session = Sign.instance.getSessions().first(where: { $0.pairingTopic == pairing.topic })
 		var tezosNamespace = session?.namespaces["tezos"]
 		
 		let previousNetwork = tezosNamespace?.accounts.first?.blockchain.reference ?? (DependencyManager.shared.currentNetworkType == .mainnet ? "mainnet" : "ghostnet")
-		if let newAccount = Account("tezos:\(previousNetwork):\(toMetadata.bas58EncodedPublicKey)") {
+		if let newAccount = Account("tezos:\(previousNetwork):\(toAddress)") {
 			tezosNamespace?.accounts = Set([newAccount])
 			//tezosNamespace?.accounts = [newAccount]
 		}
@@ -668,7 +668,7 @@ public class WalletConnectService {
 		
 		guard let proposal = TransactionService.shared.walletConnectOperationData.proposal,
 			  let currentAccount = selectedAccountMeta,
-			  let namespaces = WalletConnectService.createNamespace(forProposal: proposal, metadata: currentAccount, currentNetworkType: DependencyManager.shared.currentNetworkType) else {
+			  let namespaces = WalletConnectService.createNamespace(forProposal: proposal, address: currentAccount.address, currentNetworkType: DependencyManager.shared.currentNetworkType) else {
 			Logger.app.error("WC approveCurrentProposal can't find current prposal or current state")
 			WalletConnectService.completeRequest()
 			completion?(false, nil)