diff --git a/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 9a0f5567..48c8b884 100644
--- a/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved	
+++ b/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved	
@@ -70,7 +70,7 @@
       "location" : "https://github.com/kukai-wallet/kukai-core-swift",
       "state" : {
         "branch" : "develop",
-        "revision" : "2935cd7930f1ca7a32bdacbfb26ef832d56d1f91"
+        "revision" : "ce9be84d54254ac954b36b4258481d83af0de496"
       }
     },
     {
diff --git a/Kukai Mobile/Modules/Account/AccountViewController.swift b/Kukai Mobile/Modules/Account/AccountViewController.swift
index 087e9cbc..c14d9cb8 100644
--- a/Kukai Mobile/Modules/Account/AccountViewController.swift	
+++ b/Kukai Mobile/Modules/Account/AccountViewController.swift	
@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import KukaiCoreSwift
 import Combine
 
 class AccountViewController: UIViewController, UITableViewDelegate, EstimatedTotalCellDelegate {
@@ -85,6 +86,21 @@ class AccountViewController: UIViewController, UITableViewDelegate, EstimatedTot
 		}
 	}
 	
+	func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
+		guard let token = viewModel.token(atIndexPath: indexPath), let c = cell as? TokenBalanceCell else {
+			return
+		}
+		
+		if token.isXTZ() {
+			c.iconView.image = UIImage.tezosToken().resizedImage(size: CGSize(width: 50, height: 50))
+		} else {
+			c.iconView.backgroundColor = .colorNamed("BG4")
+			MediaProxyService.load(url: token.thumbnailURL, to: c.iconView, withCacheType: .permanent, fallback: UIImage.unknownToken()) { res in
+				c.iconView.backgroundColor = .white
+			}
+		}
+	}
+	
 	func tableView(_ tableView: UITableView, didEndDisplaying cell: UITableViewCell, forRowAt indexPath: IndexPath) {
 		guard let cell = cell as? UITableViewCellImageDownloading else {
 			return
diff --git a/Kukai Mobile/Modules/Account/AccountViewModel.swift b/Kukai Mobile/Modules/Account/AccountViewModel.swift
index 664138ad..d28090b7 100644
--- a/Kukai Mobile/Modules/Account/AccountViewModel.swift	
+++ b/Kukai Mobile/Modules/Account/AccountViewModel.swift	
@@ -118,7 +118,6 @@ class AccountViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 				return cell
 				
 			} else if let amount = item as? XTZAmount, let cell = tableView.dequeueReusableCell(withIdentifier: "TokenBalanceCell", for: indexPath) as? TokenBalanceCell {
-				cell.iconView.image = UIImage.tezosToken().resizedImage(size: CGSize(width: 50, height: 50))
 				cell.symbolLabel.text = "XTZ"
 				cell.balanceLabel.text = DependencyManager.shared.coinGeckoService.formatLargeTokenDisplay(amount.toNormalisedDecimal() ?? 0, decimalPlaces: amount.decimalPlaces)
 				cell.favCorner.isHidden = false
@@ -136,12 +135,6 @@ class AccountViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 				}
 				
 				cell.favCorner.isHidden = !token.isFavourite
-				
-				cell.iconView.backgroundColor = .colorNamed("BG4")
-				MediaProxyService.load(url: token.thumbnailURL, to: cell.iconView, withCacheType: .permanent, fallback: UIImage.unknownToken()) { res in
-					cell.iconView.backgroundColor = .white
-				}
-				
 				cell.symbolLabel.text = symbol
 				cell.balanceLabel.text = DependencyManager.shared.coinGeckoService.formatLargeTokenDisplay(token.balance.toNormalisedDecimal() ?? 0, decimalPlaces: token.decimalPlaces)
 				// cell.setPriceChange(value: Decimal(Int.random(in: -100..<100))) // Will be re-added when we have the actual values
@@ -364,7 +357,7 @@ class AccountViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 		let obj = dataSource?.itemIdentifier(for: atIndexPath)
 		
 		if obj is XTZAmount {
-			let account =  DependencyManager.shared.balanceService.account
+			let account = DependencyManager.shared.balanceService.account
 			return Token.xtz(withAmount: account.xtzBalance, stakedAmount: account.xtzStakedBalance, unstakedAmount: account.xtzUnstakedBalance)
 			
 		} else if obj is Token {
diff --git a/Kukai Mobile/Modules/Account/Cells/TokenDetailsBalanceAndBakerCell_baker.xib b/Kukai Mobile/Modules/Account/Cells/TokenDetailsBalanceAndBakerCell_baker.xib
index ed16dca0..7d7b351d 100644
--- a/Kukai Mobile/Modules/Account/Cells/TokenDetailsBalanceAndBakerCell_baker.xib	
+++ b/Kukai Mobile/Modules/Account/Cells/TokenDetailsBalanceAndBakerCell_baker.xib	
@@ -26,33 +26,34 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Balance" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n3k-p2-Iuk">
-                        <rect key="frame" x="16" y="24" width="288" height="14"/>
+                        <rect key="frame" x="16" y="24" width="283" height="14"/>
                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="12"/>
                         <color key="textColor" name="Txt10"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Delegated" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P0a-eF-wJZ">
-                        <rect key="frame" x="320" y="24" width="57" height="14"/>
+                        <rect key="frame" x="315" y="24" width="62" height="14"/>
                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="12"/>
                         <color key="textColor" name="Txt10"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" verticalCompressionResistancePriority="752" text="&lt;balance&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mYK-bA-h7Q">
-                        <rect key="frame" x="48" y="42" width="256" height="21"/>
+                        <rect key="frame" x="48" y="42" width="251" height="21"/>
                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="18"/>
                         <color key="textColor" name="Txt2"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="&lt;value&gt;" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M0S-MN-rKw">
-                        <rect key="frame" x="48" y="63" width="256" height="19"/>
+                        <rect key="frame" x="48" y="63" width="251" height="19"/>
                         <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="12"/>
                         <color key="textColor" name="Txt10"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="trailing" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SJw-6f-S0R" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                        <rect key="frame" x="320" y="42" width="57" height="29"/>
+                        <rect key="frame" x="313" y="42" width="62" height="17"/>
                         <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="14"/>
                         <color key="tintColor" name="BGB4"/>
+                        <inset key="contentEdgeInsets" minX="2" minY="0.0" maxX="0.0" maxY="0.0"/>
                         <state key="normal" title="&lt;baker&gt;">
                             <color key="titleColor" name="Txt6"/>
                         </state>
@@ -86,7 +87,7 @@
                     <constraint firstItem="BWT-yR-fDJ" firstAttribute="top" secondItem="n3k-p2-Iuk" secondAttribute="bottom" constant="4" id="8Ei-01-OYa"/>
                     <constraint firstItem="mYK-bA-h7Q" firstAttribute="trailing" secondItem="n3k-p2-Iuk" secondAttribute="trailing" id="Cfk-pe-7cE"/>
                     <constraint firstItem="SJw-6f-S0R" firstAttribute="top" secondItem="mYK-bA-h7Q" secondAttribute="top" id="DZd-Rd-rlg"/>
-                    <constraint firstItem="SJw-6f-S0R" firstAttribute="leading" secondItem="P0a-eF-wJZ" secondAttribute="leading" id="ERl-QW-XLT"/>
+                    <constraint firstItem="SJw-6f-S0R" firstAttribute="leading" secondItem="P0a-eF-wJZ" secondAttribute="leading" constant="-2" id="ERl-QW-XLT"/>
                     <constraint firstItem="M0S-MN-rKw" firstAttribute="leading" secondItem="mYK-bA-h7Q" secondAttribute="leading" id="Efg-GQ-v16"/>
                     <constraint firstItem="n3k-p2-Iuk" firstAttribute="top" secondItem="6Vq-rB-jAg" secondAttribute="top" constant="24" id="FZT-N3-iyM"/>
                     <constraint firstItem="P0a-eF-wJZ" firstAttribute="top" secondItem="n3k-p2-Iuk" secondAttribute="top" id="GsX-lA-U8D"/>
@@ -114,7 +115,7 @@
     </objects>
     <designables>
         <designable name="SJw-6f-S0R">
-            <size key="intrinsicContentSize" width="53" height="29"/>
+            <size key="intrinsicContentSize" width="62" height="17"/>
         </designable>
     </designables>
     <resources>
diff --git a/Kukai Mobile/Modules/Account/Cells/TokenDetailsStakingRewardsCell.xib b/Kukai Mobile/Modules/Account/Cells/TokenDetailsStakingRewardsCell.xib
index 877660b1..3599d315 100644
--- a/Kukai Mobile/Modules/Account/Cells/TokenDetailsStakingRewardsCell.xib	
+++ b/Kukai Mobile/Modules/Account/Cells/TokenDetailsStakingRewardsCell.xib	
@@ -60,13 +60,13 @@
                                 <rect key="frame" x="16" y="46.666666666666671" width="142.66666666666666" height="167.33333333333331"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Pbp-74-fBM">
-                                        <rect key="frame" x="0.0" y="0.0" width="142.66666666666666" height="26"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="142.66666666666666" height="28"/>
                                         <subviews>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="EoA-2N-bkY">
-                                                <rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="28" height="28"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="26" id="2kZ-7N-5Ny"/>
-                                                    <constraint firstAttribute="width" constant="26" id="wvV-aD-uGE"/>
+                                                    <constraint firstAttribute="height" constant="28" id="2kZ-7N-5Ny"/>
+                                                    <constraint firstAttribute="width" constant="28" id="wvV-aD-uGE"/>
                                                 </constraints>
                                                 <userDefinedRuntimeAttributes>
                                                     <userDefinedRuntimeAttribute type="number" keyPath="customCornerRadius">
@@ -75,17 +75,17 @@
                                                     <userDefinedRuntimeAttribute type="boolean" keyPath="maskToBounds" value="YES"/>
                                                 </userDefinedRuntimeAttributes>
                                             </imageView>
-                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="2bG-Cp-6Oy">
-                                                <rect key="frame" x="34.000000000000007" y="0.0" width="108.66666666666669" height="26"/>
+                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="2bG-Cp-6Oy">
+                                                <rect key="frame" x="36.000000000000007" y="0.0" width="106.66666666666669" height="28"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="LAST" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zFp-1U-ILM">
-                                                        <rect key="frame" x="0.0" y="0.0" width="108.66666666666667" height="12"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="106.66666666666667" height="12"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="10"/>
                                                         <color key="textColor" name="Txt8"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="&lt;lastBaker&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ubc-vp-oLJ">
-                                                        <rect key="frame" x="0.0" y="16" width="108.66666666666667" height="10"/>
+                                                        <rect key="frame" x="0.0" y="14" width="106.66666666666667" height="14"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="12"/>
                                                         <color key="textColor" name="Txt10"/>
                                                         <nil key="highlightedColor"/>
@@ -95,7 +95,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="VUH-x6-dEt">
-                                        <rect key="frame" x="0.0" y="35.000000000000014" width="142.66666666666666" height="35.666666666666671"/>
+                                        <rect key="frame" x="0.0" y="37.000000000000014" width="142.66666666666666" height="35.666666666666671"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amount (fee)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zX5-8G-bza">
                                                 <rect key="frame" x="0.0" y="0.0" width="142.66666666666666" height="14.666666666666666"/>
@@ -112,7 +112,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="lNg-0O-cYK">
-                                        <rect key="frame" x="0.0" y="79.666666666666657" width="142.66666666666666" height="35.666666666666657"/>
+                                        <rect key="frame" x="0.0" y="81.666666666666686" width="142.66666666666666" height="35.666666666666657"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uiC-Cl-xdT">
                                                 <rect key="frame" x="0.0" y="0.0" width="142.66666666666666" height="14.666666666666666"/>
@@ -121,7 +121,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="&lt;time&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nL5-3k-JIz">
-                                                <rect key="frame" x="0.0" y="18.666666666666671" width="142.66666666666666" height="17"/>
+                                                <rect key="frame" x="0.0" y="18.666666666666657" width="142.66666666666666" height="17"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="Txt2"/>
                                                 <nil key="highlightedColor"/>
@@ -129,7 +129,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="JPj-Oh-Rv0">
-                                        <rect key="frame" x="0.0" y="124.33333333333334" width="142.66666666666666" height="43"/>
+                                        <rect key="frame" x="0.0" y="126.33333333333334" width="142.66666666666666" height="41"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cycle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="01i-7m-Nej">
                                                 <rect key="frame" x="0.0" y="0.0" width="142.66666666666666" height="14.666666666666666"/>
@@ -138,7 +138,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="249" text="&lt;cycle&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PR8-Ox-teK">
-                                                <rect key="frame" x="0.0" y="18.666666666666657" width="142.66666666666666" height="24.333333333333329"/>
+                                                <rect key="frame" x="0.0" y="18.666666666666657" width="142.66666666666666" height="22.333333333333329"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="Txt2"/>
                                                 <nil key="highlightedColor"/>
@@ -151,13 +151,13 @@
                                 <rect key="frame" x="202.66666666666663" y="46.666666666666671" width="142.33333333333337" height="167.33333333333331"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="ckm-yk-7sr">
-                                        <rect key="frame" x="0.0" y="0.0" width="142.33333333333334" height="26"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="142.33333333333334" height="28"/>
                                         <subviews>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="okW-3M-ofV">
-                                                <rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="28" height="28"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="26" id="3Px-25-Q4G"/>
-                                                    <constraint firstAttribute="width" constant="26" id="VS2-e1-sFW"/>
+                                                    <constraint firstAttribute="height" constant="28" id="3Px-25-Q4G"/>
+                                                    <constraint firstAttribute="width" constant="28" id="VS2-e1-sFW"/>
                                                 </constraints>
                                                 <userDefinedRuntimeAttributes>
                                                     <userDefinedRuntimeAttribute type="boolean" keyPath="maskToBounds" value="YES"/>
@@ -166,17 +166,17 @@
                                                     </userDefinedRuntimeAttribute>
                                                 </userDefinedRuntimeAttributes>
                                             </imageView>
-                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="dQF-RZ-NZR">
-                                                <rect key="frame" x="33.999999999999993" y="0.0" width="108.33333333333331" height="26"/>
+                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="dQF-RZ-NZR">
+                                                <rect key="frame" x="35.999999999999993" y="0.0" width="106.33333333333331" height="28"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="NEXT" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JOm-t7-cQp">
-                                                        <rect key="frame" x="0.0" y="0.0" width="108.33333333333333" height="12"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="106.33333333333333" height="12"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="10"/>
                                                         <color key="textColor" name="Txt8"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="&lt;nextBaker&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MlS-Vu-VoM">
-                                                        <rect key="frame" x="0.0" y="16" width="108.33333333333333" height="10"/>
+                                                        <rect key="frame" x="0.0" y="14" width="106.33333333333333" height="14"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="12"/>
                                                         <color key="textColor" name="Txt10"/>
                                                         <nil key="highlightedColor"/>
@@ -186,7 +186,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="PWX-vl-OXp">
-                                        <rect key="frame" x="0.0" y="35.000000000000014" width="142.33333333333334" height="35.666666666666671"/>
+                                        <rect key="frame" x="0.0" y="37.000000000000014" width="142.33333333333334" height="35.666666666666671"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Est Amount (fee)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Km-tS-Jbz">
                                                 <rect key="frame" x="0.0" y="0.0" width="142.33333333333334" height="14.666666666666666"/>
@@ -203,7 +203,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="UAA-IS-zg7">
-                                        <rect key="frame" x="0.0" y="79.666666666666657" width="142.33333333333334" height="35.666666666666657"/>
+                                        <rect key="frame" x="0.0" y="81.666666666666686" width="142.33333333333334" height="35.666666666666657"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Est Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oMQ-5B-30K">
                                                 <rect key="frame" x="0.0" y="0.0" width="142.33333333333334" height="14.666666666666666"/>
@@ -212,7 +212,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="&lt;estTime&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wok-60-ixL">
-                                                <rect key="frame" x="0.0" y="18.666666666666671" width="142.33333333333334" height="17"/>
+                                                <rect key="frame" x="0.0" y="18.666666666666657" width="142.33333333333334" height="17"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="Txt2"/>
                                                 <nil key="highlightedColor"/>
@@ -220,7 +220,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="52N-jT-dji">
-                                        <rect key="frame" x="0.0" y="124.33333333333334" width="142.33333333333334" height="43"/>
+                                        <rect key="frame" x="0.0" y="126.33333333333334" width="142.33333333333334" height="41"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cycle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GsJ-Cw-Ieh">
                                                 <rect key="frame" x="0.0" y="0.0" width="142.33333333333334" height="14.666666666666666"/>
@@ -229,7 +229,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" text="&lt;estCycle&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sTd-t7-2nl">
-                                                <rect key="frame" x="0.0" y="18.666666666666657" width="142.33333333333334" height="24.333333333333329"/>
+                                                <rect key="frame" x="0.0" y="18.666666666666657" width="142.33333333333334" height="22.333333333333329"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="Txt2"/>
                                                 <nil key="highlightedColor"/>
diff --git a/Kukai Mobile/Services/BalanceService.swift b/Kukai Mobile/Services/BalanceService.swift
index 7edf52ba..ef72df00 100644
--- a/Kukai Mobile/Services/BalanceService.swift	
+++ b/Kukai Mobile/Services/BalanceService.swift	
@@ -527,6 +527,13 @@ public class BalanceService {
 			lhs.sortIndex < rhs.sortIndex
 		}
 		
+		// Then need to sort the items inside the modifiedArray based on lastLevel, so newest items show up first
+		for tokenWrapper in modifiedArray {
+			tokenWrapper.token.nfts = tokenWrapper.token.nfts?.sorted(by: { lhs, rhs in
+				lhs.lastLevel > rhs.lastLevel
+			})
+		}
+		
 		
 		// Ultimately we need data from OBJKT.com for the `unmodifiedNFTs`. Make a list of which ever ones don't exist, and bulk fetch them
 		let addresses = self.currentlyRefreshingAccount.nfts.compactMap({ $0.tokenContractAddress })