diff --git a/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Contents.json b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Contents.json
new file mode 100644
index 00000000..d1492018
--- /dev/null
+++ b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Contents.json	
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Fee_Fee@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Fee_Fee@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Fee_Fee@2x.png b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Fee_Fee@2x.png
new file mode 100644
index 00000000..fdc26dfd
Binary files /dev/null and b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Fee_Fee@2x.png differ
diff --git a/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Fee_Fee@3x.png b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Fee_Fee@3x.png
new file mode 100644
index 00000000..ba3bd8f0
Binary files /dev/null and b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Fee_Fee@3x.png differ
diff --git a/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Contents.json b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Contents.json
new file mode 100644
index 00000000..aaec7a4d
--- /dev/null
+++ b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Contents.json	
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Fee_Gas@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Fee_Gas@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Fee_Gas@2x.png b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Fee_Gas@2x.png
new file mode 100644
index 00000000..8b6d6e8e
Binary files /dev/null and b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Fee_Gas@2x.png differ
diff --git a/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Fee_Gas@3x.png b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Fee_Gas@3x.png
new file mode 100644
index 00000000..cb79bd22
Binary files /dev/null and b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Fee_Gas@3x.png differ
diff --git a/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Contents.json b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Contents.json
new file mode 100644
index 00000000..9042950d
--- /dev/null
+++ b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Contents.json	
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Fee_Storage@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Fee_Storage@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Fee_Storage@2x.png b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Fee_Storage@2x.png
new file mode 100644
index 00000000..2b0dc379
Binary files /dev/null and b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Fee_Storage@2x.png differ
diff --git a/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Fee_Storage@3x.png b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Fee_Storage@3x.png
new file mode 100644
index 00000000..fb9059b1
Binary files /dev/null and b/Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Fee_Storage@3x.png differ
diff --git a/Kukai Mobile/Modules/Account/Account.storyboard b/Kukai Mobile/Modules/Account/Account.storyboard
index ee00f89a..2a663d7f 100644
--- a/Kukai Mobile/Modules/Account/Account.storyboard	
+++ b/Kukai Mobile/Modules/Account/Account.storyboard	
@@ -6,6 +6,7 @@
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -272,7 +273,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="&lt;balance&gt;" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sSc-km-vdB">
-                                                    <rect key="frame" x="112" y="2" width="257" height="24"/>
+                                                    <rect key="frame" x="98" y="2" width="271" height="24"/>
                                                     <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                                     <color key="textColor" name="Txt2"/>
                                                     <nil key="highlightedColor"/>
@@ -284,7 +285,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cTx-cl-SFJ" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                    <rect key="frame" x="16" y="4" width="80" height="20"/>
+                                                    <rect key="frame" x="16" y="-2" width="66" height="32"/>
                                                     <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="16"/>
                                                     <color key="tintColor" name="Txt10"/>
                                                     <inset key="imageEdgeInsets" minX="17" minY="0.0" maxX="4" maxY="0.0"/>
@@ -880,6 +881,7 @@
                         <segue destination="PJu-ck-fWS" kind="show" identifier="details" id="zcN-zW-iIF"/>
                         <segue destination="afZ-no-uZ1" kind="show" identifier="recover" id="lv2-Xs-Dwb"/>
                         <segue destination="gR5-I4-y5S" kind="show" identifier="onramp" id="cfv-eY-Nia"/>
+                        <segue destination="LdT-JN-wgl" kind="custom" identifier="total-estimated-info" customClass="BottomSheetMediumSegue" customModule="Kukai_Mobile" customModuleProvider="target" id="1e7-qw-UYx"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="SsA-5r-8s8" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -904,7 +906,7 @@
                 </viewControllerPlaceholder>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="FWf-TM-nq9" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-2592" y="-1420"/>
+            <point key="canvasLocation" x="-2592" y="-1527"/>
         </scene>
         <!--Hidden Tokens-->
         <scene sceneID="Qrr-xS-5hQ">
@@ -992,7 +994,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="insetGrouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="oRe-e5-5oV">
-                                <rect key="frame" x="0.0" y="103" width="393" height="749"/>
+                                <rect key="frame" x="0.0" y="127" width="393" height="725"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
@@ -1133,7 +1135,7 @@
                         <constraints>
                             <constraint firstItem="oRe-e5-5oV" firstAttribute="leading" secondItem="jsv-DB-BSC" secondAttribute="leading" id="2cj-6M-ymd"/>
                             <constraint firstItem="oRe-e5-5oV" firstAttribute="trailing" secondItem="jsv-DB-BSC" secondAttribute="trailing" id="KcU-sP-ubU"/>
-                            <constraint firstItem="oRe-e5-5oV" firstAttribute="top" secondItem="jsv-DB-BSC" secondAttribute="top" id="MUm-Cl-hLC"/>
+                            <constraint firstItem="oRe-e5-5oV" firstAttribute="top" secondItem="jsv-DB-BSC" secondAttribute="top" constant="24" id="MUm-Cl-hLC"/>
                             <constraint firstAttribute="bottom" secondItem="oRe-e5-5oV" secondAttribute="bottom" id="WXa-Ak-Mae"/>
                         </constraints>
                     </view>
@@ -1725,15 +1727,18 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Staking Info" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WTz-3P-7LT">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Delegate Rewards" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WTz-3P-7LT">
                                 <rect key="frame" x="16" y="83" width="361" height="24"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                 <color key="textColor" name="Txt2"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Under Construction" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OJY-ci-65Q">
-                                <rect key="frame" x="16" y="131" width="361" height="19.333333333333343"/>
-                                <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OJY-ci-65Q">
+                                <rect key="frame" x="16" y="131" width="361" height="101"/>
+                                <string key="text">Whenever you make a change to your selected baker, there is a ~20 day delay until the new baker begins to send you rewards. During that time you will continue to receive rewards from your previous baker.
+
+Rewards are typically paid out every ~3 days.</string>
+                                <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="Txt2"/>
                                 <nil key="highlightedColor"/>
                             </label>
@@ -1774,6 +1779,46 @@
             </objects>
             <point key="canvasLocation" x="-2782" y="-495"/>
         </scene>
+        <!--Fee Info View Controller-->
+        <scene sceneID="YVw-vf-N1y">
+            <objects>
+                <viewController storyboardIdentifier="create-wallet-info1" id="LdT-JN-wgl" customClass="FeeInfoViewController" customModule="Kukai_Mobile" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="9Um-gH-IIX">
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Estimated Value" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bUg-yg-MMA">
+                                <rect key="frame" x="16" y="89" width="361" height="24"/>
+                                <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
+                                <color key="textColor" name="Txt2"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DGj-qV-Va3">
+                                <rect key="frame" x="32" y="137" width="329" height="117.66666666666669"/>
+                                <string key="text">The estimated value only includes tokens you hold that have an exchange rate priced in either XTZ or your selected currency.
+
+The estimate uses exchange data that might not be up to date and does not take into account selling costs.</string>
+                                <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
+                                <color key="textColor" name="Txt6"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="6NG-9B-vES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="6NG-9B-vES" firstAttribute="trailing" secondItem="bUg-yg-MMA" secondAttribute="trailing" constant="16" id="1nb-FS-LtP"/>
+                            <constraint firstItem="DGj-qV-Va3" firstAttribute="leading" secondItem="6NG-9B-vES" secondAttribute="leading" constant="32" id="JAr-m2-1c3"/>
+                            <constraint firstItem="6NG-9B-vES" firstAttribute="trailing" secondItem="DGj-qV-Va3" secondAttribute="trailing" constant="32" id="V2n-cA-Mdp"/>
+                            <constraint firstItem="bUg-yg-MMA" firstAttribute="top" secondItem="6NG-9B-vES" secondAttribute="top" constant="30" id="bMb-ep-seH"/>
+                            <constraint firstItem="bUg-yg-MMA" firstAttribute="leading" secondItem="6NG-9B-vES" secondAttribute="leading" constant="16" id="n1f-Q9-yJC"/>
+                            <constraint firstItem="DGj-qV-Va3" firstAttribute="top" secondItem="bUg-yg-MMA" secondAttribute="bottom" constant="24" id="wZm-DN-Ho1"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="TT3-wq-V65" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-1793" y="-1420"/>
+        </scene>
     </scenes>
     <designables>
         <designable name="1Ao-zL-OIA">
@@ -1783,10 +1828,10 @@
             <size key="intrinsicContentSize" width="78" height="31"/>
         </designable>
         <designable name="405-zw-M1R">
-            <size key="intrinsicContentSize" width="26" height="26"/>
+            <size key="intrinsicContentSize" width="30" height="34"/>
         </designable>
         <designable name="5Pu-Vc-J65">
-            <size key="intrinsicContentSize" width="54" height="44"/>
+            <size key="intrinsicContentSize" width="24" height="14"/>
         </designable>
         <designable name="EKG-xY-HYO">
             <size key="intrinsicContentSize" width="73" height="34"/>
@@ -1795,10 +1840,10 @@
             <size key="intrinsicContentSize" width="117" height="34"/>
         </designable>
         <designable name="cTx-cl-SFJ">
-            <size key="intrinsicContentSize" width="80" height="20"/>
+            <size key="intrinsicContentSize" width="66" height="32"/>
         </designable>
         <designable name="dQs-Hg-Uq3">
-            <size key="intrinsicContentSize" width="56" height="46"/>
+            <size key="intrinsicContentSize" width="24" height="14"/>
         </designable>
         <designable name="mc4-MV-VSh">
             <size key="intrinsicContentSize" width="83.333333333333329" height="31"/>
@@ -1884,5 +1929,8 @@
         <namedColor name="TxtGood4">
             <color red="0.035000000149011612" green="0.68199998140335083" blue="0.29399999976158142" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/Kukai Mobile/Modules/Account/AccountViewController.swift b/Kukai Mobile/Modules/Account/AccountViewController.swift
index a77c47f1..88878806 100644
--- a/Kukai Mobile/Modules/Account/AccountViewController.swift	
+++ b/Kukai Mobile/Modules/Account/AccountViewController.swift	
@@ -126,7 +126,7 @@ class AccountViewController: UIViewController, UITableViewDelegate, EstimatedTot
 	}
 	
 	func totalEstiamtedInfoTapped() {
-		self.alert(withTitle: "Total Estimated", andMessage: "Info Text")
+		self.performSegue(withIdentifier: "total-estimated-info", sender: nil)
 	}
 }
 
diff --git a/Kukai Mobile/Modules/Account/TokenDetailsViewController.swift b/Kukai Mobile/Modules/Account/TokenDetailsViewController.swift
index acde1f7e..de5e15ba 100644
--- a/Kukai Mobile/Modules/Account/TokenDetailsViewController.swift	
+++ b/Kukai Mobile/Modules/Account/TokenDetailsViewController.swift	
@@ -149,7 +149,8 @@ class TokenDetailsViewController: UIViewController, UITableViewDelegate {
 						let address = DependencyManager.shared.selectedWalletAddress ?? ""
 						if TokenStateService.shared.removeHidden(forAddress: address, token: token) {
 							DependencyManager.shared.balanceService.updateTokenStates(forAddress: address, selectedAccount: true)
-							self?.dismiss(animated: true)
+							self?.navigationController?.popViewController(animated: true)
+							
 						} else {
 							self?.windowError(withTitle: "error".localized(), description: "error-unhide-token".localized())
 						}
@@ -166,7 +167,7 @@ class TokenDetailsViewController: UIViewController, UITableViewDelegate {
 						let address = DependencyManager.shared.selectedWalletAddress ?? ""
 						if TokenStateService.shared.addHidden(forAddress: address, token: token) {
 							DependencyManager.shared.balanceService.updateTokenStates(forAddress: address, selectedAccount: true)
-							self?.dismiss(animated: true)
+							self?.navigationController?.popViewController(animated: true)
 							
 						} else {
 							self?.windowError(withTitle: "error".localized(), description: "error-hide-token".localized())
diff --git a/Kukai Mobile/Modules/Discover/Cells/DiscoverFeaturedCell.swift b/Kukai Mobile/Modules/Discover/Cells/DiscoverFeaturedCell.swift
index 80d619fa..b8bbdb16 100644
--- a/Kukai Mobile/Modules/Discover/Cells/DiscoverFeaturedCell.swift	
+++ b/Kukai Mobile/Modules/Discover/Cells/DiscoverFeaturedCell.swift	
@@ -25,8 +25,6 @@ class DiscoverFeaturedCell: UITableViewCell {
 	private var customAspectRatioLogicHasBeenRun = false
 	private static let estimatedTextHeight: CGFloat = 40
 	private static let estimatedPageControlSize: CGFloat = 30
-	private var once = false
-	private var selectedIndex = 0
 	
 	public weak var delegate: DiscoverFeaturedCellDelegate? = nil
 	public static let customAspectRatio: CGFloat = 2.62
@@ -71,9 +69,9 @@ class DiscoverFeaturedCell: UITableViewCell {
 		self.discoverGroup = discoverGroup
 		
 		self.collectionView.reloadData()
+		self.collectionView.scrollToItem(at: IndexPath(row: 0, section: 0), at: .centeredHorizontally, animated: false)
 		self.pageControl.numberOfPages = discoverGroup.items.count
 		self.pageControl.currentPage = 0
-		self.once = false
 		
 		if discoverGroup.items.count > 1 {
 			stopTimer()
@@ -84,14 +82,13 @@ class DiscoverFeaturedCell: UITableViewCell {
 	public func setupTimer() {
 		stopTimer()
 		timer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true, block: { [weak self] timer in
-			let itemCount = self?.discoverGroup.items.count ?? 0
-			var nextRow = (self?.selectedIndex ?? 0) + 1
-			if nextRow == (itemCount * 20) {
-				nextRow = (itemCount * 10)
+			var nextRow = self?.pageControl.currentPage ?? 0
+			if nextRow == ((self?.pageControl.numberOfPages ?? 1) - 1) {
+				nextRow = -1
 			}
 			
 			self?.collectionView.isPagingEnabled = false // bug fix, some devices don't scroll horizontally if paging enabled for some reason
-			self?.collectionView.scrollToItem(at: IndexPath(row: nextRow, section: 0), at: .centeredHorizontally, animated: true)
+			self?.collectionView.scrollToItem(at: IndexPath(row: nextRow+1, section: 0), at: .centeredHorizontally, animated: true)
 			self?.collectionView.isPagingEnabled = true
 		})
 		
@@ -111,7 +108,7 @@ extension DiscoverFeaturedCell: UICollectionViewDelegate, UICollectionViewDataSo
 	}
 	
 	func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-		return discoverGroup.items.count * 10_000 // high number to give the appearence of infinite scroll
+		return discoverGroup.items.count
 	}
 	
 	func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
@@ -126,20 +123,9 @@ extension DiscoverFeaturedCell: UICollectionViewDelegate, UICollectionViewDataSo
 	}
 	
 	func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-		if !once {
-			let infiniteScrollStartIndex = 0 + (discoverGroup.items.count * 10) // give an infinite scroll-like experience by starting off many rows into the the set to allow side ways scrolling
-			
-			self.collectionView.isPagingEnabled = false // bug fix, some devices don't scroll horizontally if paging enabled for some reason
-			self.collectionView.scrollToItem(at: IndexPath(row: infiniteScrollStartIndex, section: 0), at: .centeredHorizontally, animated: false)
-			self.collectionView.isPagingEnabled = true
-			
-			self.once = true
-		}
-		
 		guard let c = cell as? DiscoverFeaturedItemCell else { return }
 		
-		selectedIndex = indexPath.row
-		let item = discoverGroup.items[indexPath.row % discoverGroup.items.count]
+		let item = discoverGroup.items[indexPath.row]
 		c.setupImage(imageURL: item.featuredItemURL)
 	}
 	
@@ -148,7 +134,7 @@ extension DiscoverFeaturedCell: UICollectionViewDelegate, UICollectionViewDataSo
 	}
 	
 	func scrollViewDidScroll(_ scrollView: UIScrollView) {
-		self.pageControl.currentPage = Int((scrollView.contentOffset.x + pageWidth / 2) / pageWidth) % discoverGroup.items.count
+		self.pageControl.currentPage = Int((scrollView.contentOffset.x + pageWidth / 2) / pageWidth)
 	}
 	
 	func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
diff --git a/Kukai Mobile/Modules/Discover/Discover.storyboard b/Kukai Mobile/Modules/Discover/Discover.storyboard
index 8220e306..8ee8b63c 100644
--- a/Kukai Mobile/Modules/Discover/Discover.storyboard	
+++ b/Kukai Mobile/Modules/Discover/Discover.storyboard	
@@ -38,13 +38,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Discover" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cwV-gP-NKx">
-                                                    <rect key="frame" x="16" y="21" width="72.333333333333329" height="21"/>
+                                                    <rect key="frame" x="16" y="18.666666666666668" width="72.333333333333329" height="21.000000000000004"/>
                                                     <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="18"/>
                                                     <color key="textColor" name="Txt2"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uLl-Eg-mC4" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                    <rect key="frame" x="335" y="8" width="38" height="47"/>
+                                                    <rect key="frame" x="335" y="8" width="38" height="42"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="38" id="Unj-Gg-ybC"/>
                                                         <constraint firstAttribute="height" constant="38" id="dhd-c9-w3Q"/>
@@ -74,7 +74,7 @@
                                                 <constraint firstItem="uLl-Eg-mC4" firstAttribute="top" secondItem="p6z-XP-GL8" secondAttribute="top" constant="8" id="GC5-Ei-QH1"/>
                                                 <constraint firstItem="cwV-gP-NKx" firstAttribute="leading" secondItem="p6z-XP-GL8" secondAttribute="leading" constant="16" id="K6f-9U-vtq"/>
                                                 <constraint firstItem="uLl-Eg-mC4" firstAttribute="centerY" secondItem="cwV-gP-NKx" secondAttribute="centerY" id="eXc-gT-A28"/>
-                                                <constraint firstAttribute="bottom" secondItem="uLl-Eg-mC4" secondAttribute="bottom" constant="3" id="pnA-1f-07B"/>
+                                                <constraint firstAttribute="bottom" secondItem="uLl-Eg-mC4" secondAttribute="bottom" constant="8" id="pnA-1f-07B"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -333,7 +333,7 @@
     </scenes>
     <designables>
         <designable name="uLl-Eg-mC4">
-            <size key="intrinsicContentSize" width="26" height="26"/>
+            <size key="intrinsicContentSize" width="30" height="34"/>
         </designable>
     </designables>
     <resources>
diff --git a/Kukai Mobile/Modules/Fees/EditFeesViewController.swift b/Kukai Mobile/Modules/Fees/EditFeesViewController.swift
index ca2f1829..775b83f7 100644
--- a/Kukai Mobile/Modules/Fees/EditFeesViewController.swift	
+++ b/Kukai Mobile/Modules/Fees/EditFeesViewController.swift	
@@ -250,17 +250,17 @@ class EditFeesViewController: UIViewController {
 	}
 	
 	@IBAction func feeInfoTapped(_ sender: Any) {
-		infoIndex = 1
+		infoIndex = 0
 		self.performSegue(withIdentifier: "feeInfo", sender: nil)
 	}
 	
 	@IBAction func gasLimitInfoTapped(_ sender: Any) {
-		infoIndex = 2
+		infoIndex = 1
 		self.performSegue(withIdentifier: "feeInfo", sender: nil)
 	}
 	
 	@IBAction func storageInfoTapped(_ sender: Any) {
-		infoIndex = 3
+		infoIndex = 2
 		self.performSegue(withIdentifier: "feeInfo", sender: nil)
 	}
 	
diff --git a/Kukai Mobile/Modules/Fees/Fees.storyboard b/Kukai Mobile/Modules/Fees/Fees.storyboard
index 4fe8e5af..0659250f 100644
--- a/Kukai Mobile/Modules/Fees/Fees.storyboard	
+++ b/Kukai Mobile/Modules/Fees/Fees.storyboard	
@@ -184,7 +184,7 @@
                                 </userDefinedRuntimeAttributes>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="trailing" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jyl-eL-Wbd" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                <rect key="frame" x="16" y="164.5" width="205" height="17"/>
+                                <rect key="frame" x="16" y="158.5" width="205" height="29"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                 <color key="tintColor" name="BG10"/>
                                 <inset key="imageEdgeInsets" minX="17" minY="0.0" maxX="4" maxY="0.0"/>
@@ -208,7 +208,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="trailing" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TlC-dR-JTf" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                <rect key="frame" x="16" y="224.5" width="205" height="17"/>
+                                <rect key="frame" x="16" y="218.5" width="205" height="29"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                 <color key="tintColor" name="BG10"/>
                                 <inset key="imageEdgeInsets" minX="17" minY="0.0" maxX="4" maxY="0.0"/>
@@ -232,7 +232,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="trailing" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RY5-dt-g9M" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                <rect key="frame" x="16" y="284.5" width="205" height="17"/>
+                                <rect key="frame" x="16" y="278.5" width="205" height="29"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                 <color key="tintColor" name="BG10"/>
                                 <inset key="imageEdgeInsets" minX="17" minY="0.0" maxX="4" maxY="0.0"/>
@@ -274,7 +274,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rnn-3H-Rsw">
-                                <rect key="frame" x="16" y="309.5" width="183" height="14.5"/>
+                                <rect key="frame" x="16" y="315.5" width="183" height="14.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Max Storage Cost" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qit-Eg-Wvz">
                                         <rect key="frame" x="0.0" y="0.0" width="96.5" height="14.5"/>
@@ -370,7 +370,7 @@
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="string" keyPath="commaSeperatedStoryboardIds" value="fee-page-1,fee-page-2,fee-page-3,fee-page-4"/>
+                        <userDefinedRuntimeAttribute type="string" keyPath="commaSeperatedStoryboardIds" value="fee-page-1,fee-page-2,fee-page-3"/>
                     </userDefinedRuntimeAttributes>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="hhz-jK-3lF" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -385,24 +385,24 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transaction Fees" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jY9-3T-Ar7">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What is Fee &amp; Storage Cost?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jY9-3T-Ar7">
                                 <rect key="frame" x="16" y="78" width="382" height="24"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                 <color key="textColor" name="Txt2"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Photos" translatesAutoresizingMaskIntoConstraints="NO" id="WeC-SM-XaC">
-                                <rect key="frame" x="127" y="118" width="160" height="110"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Fee_Fee" translatesAutoresizingMaskIntoConstraints="NO" id="WeC-SM-XaC">
+                                <rect key="frame" x="157" y="126" width="100" height="100"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="160" id="cci-S6-ufk"/>
-                                    <constraint firstAttribute="height" constant="110" id="wVc-E0-fvq"/>
+                                    <constraint firstAttribute="width" constant="100" id="cci-S6-ufk"/>
+                                    <constraint firstAttribute="height" constant="100" id="wVc-E0-fvq"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MIO-Ox-ji1">
-                                <rect key="frame" x="32" y="244" width="350" height="118"/>
-                                <string key="text">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh
+                                <rect key="frame" x="32" y="242" width="350" height="118"/>
+                                <string key="text">Kukai estimates the minimal fee necessary to process your transaction (gas fee) and also the maximum storage cost of the storage used.
 
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh</string>
+You will always pay the specified fee amount, but the storage cost will often end up lower than estimated and never higher.</string>
                                 <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="Txt6"/>
                                 <nil key="highlightedColor"/>
@@ -415,7 +415,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                             <constraint firstItem="uNv-dj-zMC" firstAttribute="trailing" secondItem="jY9-3T-Ar7" secondAttribute="trailing" constant="16" id="8lT-Ld-Dfc"/>
                             <constraint firstItem="MIO-Ox-ji1" firstAttribute="leading" secondItem="uNv-dj-zMC" secondAttribute="leading" constant="32" id="Ws1-uc-yUw"/>
                             <constraint firstItem="jY9-3T-Ar7" firstAttribute="top" secondItem="uNv-dj-zMC" secondAttribute="top" constant="30" id="beM-As-miy"/>
-                            <constraint firstItem="WeC-SM-XaC" firstAttribute="top" secondItem="jY9-3T-Ar7" secondAttribute="bottom" constant="16" id="cuv-2Q-f4O"/>
+                            <constraint firstItem="WeC-SM-XaC" firstAttribute="top" secondItem="jY9-3T-Ar7" secondAttribute="bottom" constant="24" id="cuv-2Q-f4O"/>
                             <constraint firstItem="jY9-3T-Ar7" firstAttribute="leading" secondItem="uNv-dj-zMC" secondAttribute="leading" constant="16" id="go2-OX-pZe"/>
                             <constraint firstItem="WeC-SM-XaC" firstAttribute="centerX" secondItem="uNv-dj-zMC" secondAttribute="centerX" id="hf6-cC-iVN"/>
                             <constraint firstItem="uNv-dj-zMC" firstAttribute="trailing" secondItem="MIO-Ox-ji1" secondAttribute="trailing" constant="32" id="kFj-e3-4sA"/>
@@ -434,24 +434,24 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What are Fees &amp; Max Storage?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zFP-P1-B5e">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What is Gas Fees?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zFP-P1-B5e">
                                 <rect key="frame" x="16" y="78" width="382" height="24"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                 <color key="textColor" name="Txt2"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Photos" translatesAutoresizingMaskIntoConstraints="NO" id="Sjq-bv-r7w">
-                                <rect key="frame" x="127" y="118" width="160" height="110"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Fee_Gas" translatesAutoresizingMaskIntoConstraints="NO" id="Sjq-bv-r7w">
+                                <rect key="frame" x="157" y="126" width="100" height="100"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="160" id="7Fs-3Y-suK"/>
-                                    <constraint firstAttribute="height" constant="110" id="AAf-9P-4le"/>
+                                    <constraint firstAttribute="width" constant="100" id="7Fs-3Y-suK"/>
+                                    <constraint firstAttribute="height" constant="100" id="AAf-9P-4le"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OHR-MZ-PmE">
-                                <rect key="frame" x="32" y="244" width="350" height="118"/>
-                                <string key="text">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh
+                                <rect key="frame" x="32" y="242" width="350" height="134.5"/>
+                                <string key="text">You should not need to modify the estimated gas limit. But if the transaction is failing due to gas exhausted then raising the limit will help the transaction complete.
 
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh</string>
+Increasing the fee is only helpful if the network is at full capacity. During those times the bakers will prioritize transactions that have set a higher fee.</string>
                                 <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="Txt6"/>
                                 <nil key="highlightedColor"/>
@@ -460,7 +460,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                         <viewLayoutGuide key="safeArea" id="ELi-0s-AQY"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="Sjq-bv-r7w" firstAttribute="top" secondItem="zFP-P1-B5e" secondAttribute="bottom" constant="16" id="0KJ-jC-VP5"/>
+                            <constraint firstItem="Sjq-bv-r7w" firstAttribute="top" secondItem="zFP-P1-B5e" secondAttribute="bottom" constant="24" id="0KJ-jC-VP5"/>
                             <constraint firstItem="OHR-MZ-PmE" firstAttribute="top" secondItem="Sjq-bv-r7w" secondAttribute="bottom" constant="16" id="IpJ-0h-ZSg"/>
                             <constraint firstItem="ELi-0s-AQY" firstAttribute="trailing" secondItem="OHR-MZ-PmE" secondAttribute="trailing" constant="32" id="WVa-xW-sGj"/>
                             <constraint firstAttribute="trailing" secondItem="zFP-P1-B5e" secondAttribute="trailing" constant="16" id="X5h-cW-5nB"/>
@@ -478,7 +478,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
         <!--Fee Info View Controller-->
         <scene sceneID="4Mk-ZA-ARl">
             <objects>
-                <viewController storyboardIdentifier="fee-page-4" id="vbz-jA-i0z" customClass="FeeInfoViewController" customModule="Kukai_Mobile" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="fee-page-3" id="vbz-jA-i0z" customClass="FeeInfoViewController" customModule="Kukai_Mobile" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ScO-bB-M2J">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -489,18 +489,18 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                                 <color key="textColor" name="Txt2"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Photos" translatesAutoresizingMaskIntoConstraints="NO" id="kjK-J2-LNk">
-                                <rect key="frame" x="127" y="118" width="160" height="110"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Fee_Storage" translatesAutoresizingMaskIntoConstraints="NO" id="kjK-J2-LNk">
+                                <rect key="frame" x="157" y="126" width="100" height="100"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="160" id="FNa-Wz-iAd"/>
-                                    <constraint firstAttribute="height" constant="110" id="YB5-rB-FZb"/>
+                                    <constraint firstAttribute="width" constant="100" id="FNa-Wz-iAd"/>
+                                    <constraint firstAttribute="height" constant="100" id="YB5-rB-FZb"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nhn-tm-k6x">
-                                <rect key="frame" x="32" y="244" width="350" height="118"/>
-                                <string key="text">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh
+                                <rect key="frame" x="32" y="242" width="350" height="134.5"/>
+                                <string key="text">You should not need to modify the estimated storage limit. But if the transaction is failing due to exceeding storage then raising the limit will help the transaction complete.
 
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh</string>
+Increasing the storage limit, increases the max storage cost of your transaction. But often the actual cost will be lower.</string>
                                 <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="Txt6"/>
                                 <nil key="highlightedColor"/>
@@ -513,7 +513,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                             <constraint firstItem="V6Y-3Y-7z3" firstAttribute="leading" secondItem="iHb-Ws-HBt" secondAttribute="leading" constant="16" id="AOy-Um-tL3"/>
                             <constraint firstItem="iHb-Ws-HBt" firstAttribute="trailing" secondItem="V6Y-3Y-7z3" secondAttribute="trailing" constant="16" id="Ch5-Yc-OJ5"/>
                             <constraint firstItem="kjK-J2-LNk" firstAttribute="centerX" secondItem="iHb-Ws-HBt" secondAttribute="centerX" id="PGi-Bk-nmM"/>
-                            <constraint firstItem="kjK-J2-LNk" firstAttribute="top" secondItem="V6Y-3Y-7z3" secondAttribute="bottom" constant="16" id="V8d-5K-OGs"/>
+                            <constraint firstItem="kjK-J2-LNk" firstAttribute="top" secondItem="V6Y-3Y-7z3" secondAttribute="bottom" constant="24" id="V8d-5K-OGs"/>
                             <constraint firstItem="iHb-Ws-HBt" firstAttribute="trailing" secondItem="nhn-tm-k6x" secondAttribute="trailing" constant="32" id="dAj-05-y2g"/>
                             <constraint firstItem="nhn-tm-k6x" firstAttribute="leading" secondItem="iHb-Ws-HBt" secondAttribute="leading" constant="32" id="jOm-in-ENL"/>
                             <constraint firstItem="nhn-tm-k6x" firstAttribute="top" secondItem="kjK-J2-LNk" secondAttribute="bottom" constant="16" id="w0v-59-Alv"/>
@@ -522,56 +522,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="j0R-gR-TGh" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3567" y="876"/>
-        </scene>
-        <!--Fee Info View Controller-->
-        <scene sceneID="sDY-US-zHC">
-            <objects>
-                <viewController storyboardIdentifier="fee-page-3" id="7XO-H1-NMm" customClass="FeeInfoViewController" customModule="Kukai_Mobile" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="4Fw-dx-pUr">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What are Gas Fees?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qsg-3E-Up8">
-                                <rect key="frame" x="16" y="78" width="382" height="24"/>
-                                <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
-                                <color key="textColor" name="Txt2"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Photos" translatesAutoresizingMaskIntoConstraints="NO" id="dYq-8T-5hN">
-                                <rect key="frame" x="127" y="118" width="160" height="110"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="110" id="Map-RE-pxy"/>
-                                    <constraint firstAttribute="width" constant="160" id="eaA-ha-tKq"/>
-                                </constraints>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TJQ-IW-Ixf">
-                                <rect key="frame" x="32" y="244" width="350" height="118"/>
-                                <string key="text">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh</string>
-                                <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
-                                <color key="textColor" name="Txt6"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="Dfz-As-L3n"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="qsg-3E-Up8" firstAttribute="top" secondItem="Dfz-As-L3n" secondAttribute="top" constant="30" id="3YJ-4M-otI"/>
-                            <constraint firstItem="dYq-8T-5hN" firstAttribute="centerX" secondItem="Dfz-As-L3n" secondAttribute="centerX" id="R0W-gG-PDR"/>
-                            <constraint firstItem="Dfz-As-L3n" firstAttribute="trailing" secondItem="TJQ-IW-Ixf" secondAttribute="trailing" constant="32" id="RCW-Yw-U65"/>
-                            <constraint firstItem="dYq-8T-5hN" firstAttribute="top" secondItem="qsg-3E-Up8" secondAttribute="bottom" constant="16" id="TVL-R9-CXo"/>
-                            <constraint firstItem="qsg-3E-Up8" firstAttribute="leading" secondItem="Dfz-As-L3n" secondAttribute="leading" constant="16" id="WMh-5s-Ur0"/>
-                            <constraint firstItem="TJQ-IW-Ixf" firstAttribute="leading" secondItem="Dfz-As-L3n" secondAttribute="leading" constant="32" id="rpS-ZW-893"/>
-                            <constraint firstItem="Dfz-As-L3n" firstAttribute="trailing" secondItem="qsg-3E-Up8" secondAttribute="trailing" constant="16" id="wG0-tS-Crt"/>
-                            <constraint firstItem="TJQ-IW-Ixf" firstAttribute="top" secondItem="dYq-8T-5hN" secondAttribute="bottom" constant="16" id="zjw-ya-tXw"/>
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="zKI-TU-aFa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2774" y="876"/>
+            <point key="canvasLocation" x="2813" y="876"/>
         </scene>
     </scenes>
     <designables>
@@ -579,13 +530,13 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
             <size key="intrinsicContentSize" width="39" height="18.5"/>
         </designable>
         <designable name="Jyl-eL-Wbd">
-            <size key="intrinsicContentSize" width="38" height="17"/>
+            <size key="intrinsicContentSize" width="30" height="29"/>
         </designable>
         <designable name="RY5-dt-g9M">
-            <size key="intrinsicContentSize" width="102" height="17"/>
+            <size key="intrinsicContentSize" width="88" height="29"/>
         </designable>
         <designable name="TlC-dR-JTf">
-            <size key="intrinsicContentSize" width="75" height="17"/>
+            <size key="intrinsicContentSize" width="61" height="29"/>
         </designable>
         <designable name="pfX-zJ-QUN">
             <size key="intrinsicContentSize" width="74" height="18.5"/>
@@ -595,7 +546,9 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
         </designable>
     </designables>
     <resources>
-        <image name="Photos" width="24" height="24"/>
+        <image name="Fee_Fee" width="100" height="100"/>
+        <image name="Fee_Gas" width="100" height="100"/>
+        <image name="Fee_Storage" width="100" height="100"/>
         <image name="btnInfoKnockout" width="36" height="36"/>
         <namedColor name="BG10">
             <color red="0.52499997615814209" green="0.53299999237060547" blue="0.61599999666213989" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard b/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard
index eafdb4e7..b89b24e7 100644
--- a/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard	
+++ b/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard	
@@ -216,13 +216,13 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&lt;heading&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fxm-nU-LyP">
-                                                    <rect key="frame" x="40.000000000000007" y="12.666666666666664" width="76.666666666666686" height="30"/>
+                                                    <rect key="frame" x="39.999999999999993" y="12.666666666666664" width="79.333333333333314" height="30"/>
                                                     <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
                                                     <color key="textColor" name="Txt10"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XEg-Fn-9q8" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                    <rect key="frame" x="116.66666666666669" y="12.666666666666664" width="50" height="30"/>
+                                                    <rect key="frame" x="119.33333333333331" y="12.666666666666664" width="50" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="50" id="NPg-Hh-oA7"/>
                                                     </constraints>
@@ -286,23 +286,23 @@
                                                     <rect key="frame" x="16" y="2" width="358" height="61"/>
                                                     <subviews>
                                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Ye-Sl-4hC">
-                                                            <rect key="frame" x="12" y="11" width="22" height="22"/>
+                                                            <rect key="frame" x="12" y="10.333333333333336" width="22" height="22"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="22" id="JsF-FC-M3v"/>
                                                                 <constraint firstAttribute="width" constant="22" id="Qfh-ad-6A0"/>
                                                             </constraints>
                                                         </imageView>
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="bCf-Ky-9Ha">
-                                                            <rect key="frame" x="44" y="11" width="246" height="39"/>
+                                                            <rect key="frame" x="44" y="10.333333333333332" width="246" height="40.333333333333343"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&lt;title&gt;" textAlignment="natural" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eXR-AY-uAm">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="246" height="18.666666666666668"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="246" height="19.333333333333332"/>
                                                                     <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
                                                                     <color key="textColor" name="Txt2"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="&lt;subtitle&gt;" textAlignment="natural" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dqA-p2-tZv">
-                                                                    <rect key="frame" x="0.0" y="22.666666666666664" width="246" height="16.333333333333336"/>
+                                                                    <rect key="frame" x="0.0" y="23.333333333333329" width="246" height="17"/>
                                                                     <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="14"/>
                                                                     <color key="textColor" name="Txt10"/>
                                                                     <nil key="highlightedColor"/>
@@ -325,10 +325,10 @@
                                                             </constraints>
                                                         </imageView>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TQu-WQ-O8r">
-                                                            <rect key="frame" x="268.66666666666669" y="22.666666666666668" width="29.333333333333314" height="15.666666666666668"/>
+                                                            <rect key="frame" x="267.33333333333331" y="22.666666666666668" width="30.666666666666686" height="16.000000000000004"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NEW!" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xVA-bH-wuC">
-                                                                    <rect key="frame" x="2" y="2" width="25.333333333333332" height="11.666666666666666"/>
+                                                                    <rect key="frame" x="2" y="2" width="26.666666666666668" height="12"/>
                                                                     <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="10"/>
                                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -400,7 +400,7 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="More (1)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d1O-lW-vwG">
-                                                    <rect key="frame" x="36" y="11.333333333333334" width="317" height="16.333333333333329"/>
+                                                    <rect key="frame" x="36" y="11" width="317" height="17"/>
                                                     <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="14"/>
                                                     <color key="textColor" name="TxtB6"/>
                                                     <nil key="highlightedColor"/>
@@ -685,13 +685,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Account" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OYl-Ut-AGZ">
-                                <rect key="frame" x="16" y="77" width="358" height="23.333333333333329"/>
+                                <rect key="frame" x="16" y="77" width="358" height="24"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                 <color key="textColor" name="Txt2"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="Hym-l7-6bO">
-                                <rect key="frame" x="16" y="126.33333333333331" width="358" height="434.99999999999994"/>
+                                <rect key="frame" x="16" y="127" width="358" height="455"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="kci-rX-izT">
                                         <rect key="frame" x="0.0" y="0.0" width="358" height="54"/>
@@ -707,7 +707,7 @@
                                                 <rect key="frame" x="122.33333333333334" y="0.0" width="101.66666666666666" height="54"/>
                                                 <subviews>
                                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Social_TZ_Ovalcolor" translatesAutoresizingMaskIntoConstraints="NO" id="nKI-mD-x5o">
-                                                        <rect key="frame" x="0.0" y="3.6666666666666714" width="20" height="20"/>
+                                                        <rect key="frame" x="0.0" y="3.6666666666666572" width="20" height="20"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="20" id="1rk-RH-H5t"/>
                                                             <constraint firstAttribute="height" constant="20" id="ZJO-TX-sJM"/>
@@ -720,7 +720,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="&lt;address&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ISA-WZ-lai">
-                                                        <rect key="frame" x="24" y="27.000000000000014" width="77.666666666666671" height="27"/>
+                                                        <rect key="frame" x="24" y="27" width="77.666666666666671" height="27"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
                                                         <color key="textColor" name="Txt10"/>
                                                         <nil key="highlightedColor"/>
@@ -750,10 +750,10 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="dIF-1f-QDL">
-                                        <rect key="frame" x="0.0" y="70.000000000000028" width="358" height="92.333333333333343"/>
+                                        <rect key="frame" x="0.0" y="70" width="358" height="110.66666666666669"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TZZ-Gt-iwb" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="102" height="31"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="105" height="32"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
                                                 <color key="tintColor" name="Txt10"/>
                                                 <inset key="imageEdgeInsets" minX="17" minY="0.0" maxX="4" maxY="0.0"/>
@@ -761,14 +761,14 @@
                                                     <color key="titleColor" name="Txt10"/>
                                                 </state>
                                             </button>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="info here about getting a domain name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i0u-Jf-cpf">
-                                                <rect key="frame" x="0.0" y="39" width="242" height="16.333333333333329"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You can purchase a friendly public name for your account by visiting https://tezos.domains" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i0u-Jf-cpf">
+                                                <rect key="frame" x="0.0" y="40" width="310.66666666666669" height="33.666666666666657"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="Txt6"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XV7-87-nVU" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="63.333333333333343" width="72" height="29"/>
+                                                <rect key="frame" x="0.0" y="81.666666666666686" width="73" height="29"/>
                                                 <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="14"/>
                                                 <color key="tintColor" name="Txt10"/>
                                                 <inset key="imageEdgeInsets" minX="17" minY="0.0" maxX="4" maxY="0.0"/>
@@ -794,34 +794,19 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Nxk-cJ-RaT">
-                                        <rect key="frame" x="0.0" y="178.33333333333337" width="358" height="60"/>
+                                        <rect key="frame" x="0.0" y="196.66666666666669" width="358" height="61"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="abB-kP-P9Y" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="102" height="31"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="105" height="32"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
                                                 <color key="tintColor" name="Txt10"/>
                                                 <inset key="imageEdgeInsets" minX="17" minY="0.0" maxX="4" maxY="0.0"/>
                                                 <state key="normal" title="Domain Name">
                                                     <color key="titleColor" name="Txt10"/>
                                                 </state>
-                                                <userDefinedRuntimeAttributes>
-                                                    <userDefinedRuntimeAttribute type="image" keyPath="customImage" value="btnInfoKnockout"/>
-                                                    <userDefinedRuntimeAttribute type="number" keyPath="imageWidth">
-                                                        <real key="value" value="14"/>
-                                                    </userDefinedRuntimeAttribute>
-                                                    <userDefinedRuntimeAttribute type="number" keyPath="imageHeight">
-                                                        <real key="value" value="14"/>
-                                                    </userDefinedRuntimeAttribute>
-                                                    <userDefinedRuntimeAttribute type="color" keyPath="customImageTint">
-                                                        <color key="value" name="Txt10"/>
-                                                    </userDefinedRuntimeAttribute>
-                                                </userDefinedRuntimeAttributes>
-                                                <connections>
-                                                    <action selector="domainInfoButtonTapped:" destination="dXg-LT-sIm" eventType="touchUpInside" id="hbn-SU-9j9"/>
-                                                </connections>
                                             </button>
                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="KQS-cU-QUJ">
-                                                <rect key="frame" x="0.0" y="39" width="146" height="21"/>
+                                                <rect key="frame" x="0.0" y="40" width="150.66666666666666" height="21"/>
                                                 <subviews>
                                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Social_TZDomain_Color" translatesAutoresizingMaskIntoConstraints="NO" id="HSD-Sk-bYw">
                                                         <rect key="frame" x="0.0" y="0.0" width="21" height="21"/>
@@ -831,7 +816,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&lt;domainName&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MJR-ic-bOZ">
-                                                        <rect key="frame" x="31" y="0.0" width="115" height="21"/>
+                                                        <rect key="frame" x="31.000000000000007" y="0.0" width="119.66666666666669" height="21"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
                                                         <color key="textColor" name="Txt2"/>
                                                         <nil key="highlightedColor"/>
@@ -841,7 +826,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="dfs-AO-LMR">
-                                        <rect key="frame" x="0.0" y="254.33333333333337" width="358" height="180.66666666666663"/>
+                                        <rect key="frame" x="0.0" y="273.66666666666669" width="358" height="181.33333333333331"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lJP-hM-7yn">
                                                 <rect key="frame" x="0.0" y="0.0" width="358" height="24"/>
@@ -851,13 +836,13 @@
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U4O-0L-4v9">
-                                                <rect key="frame" x="0.0" y="30" width="358" height="18.666666666666671"/>
+                                                <rect key="frame" x="0.0" y="30" width="358" height="19.333333333333329"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
                                                 <color key="textColor" name="Txt10"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="No Custom Name" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="TQh-in-HjU" customClass="ValidatorTextField" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="54.666666666666629" width="358" height="34"/>
+                                                <rect key="frame" x="0.0" y="55.333333333333314" width="358" height="34"/>
                                                 <color key="backgroundColor" name="BG4"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" returnKeyType="done"/>
@@ -875,14 +860,14 @@
                                                 </userDefinedRuntimeAttributes>
                                             </textField>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zRj-EP-r5n">
-                                                <rect key="frame" x="0.0" y="94.666666666666629" width="358" height="24"/>
+                                                <rect key="frame" x="0.0" y="95.333333333333314" width="358" height="24"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="24" id="82G-yD-hyv"/>
                                                 </constraints>
                                             </view>
                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="hqI-4r-t2O">
-                                                <rect key="frame" x="0.0" y="124.66666666666663" width="358" height="56"/>
+                                                <rect key="frame" x="0.0" y="125.33333333333331" width="358" height="56"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VPE-bC-rGj" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="171" height="56"/>
@@ -930,7 +915,7 @@
                                 </subviews>
                             </stackView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3wJ-fs-S4I">
-                                <rect key="frame" x="326" y="68.666666666666671" width="40" height="40"/>
+                                <rect key="frame" x="326" y="69" width="40" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="E7v-2r-lkx"/>
                                     <constraint firstAttribute="width" constant="40" id="pyP-z2-Ibu"/>
@@ -985,13 +970,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom Name Wallet" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5b4-Az-ZZf">
-                                <rect key="frame" x="16" y="77" width="358" height="23.333333333333329"/>
+                                <rect key="frame" x="16" y="77" width="358" height="24"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                 <color key="textColor" name="Txt2"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Bch-4C-wGL">
-                                <rect key="frame" x="16" y="126.33333333333331" width="358" height="126"/>
+                                <rect key="frame" x="16" y="127" width="358" height="126"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="HQx-bY-sC9">
                                         <rect key="frame" x="0.0" y="0.0" width="358" height="126"/>
@@ -1015,14 +1000,14 @@
                                                 </userDefinedRuntimeAttributes>
                                             </textField>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="s5O-aS-Yd2">
-                                                <rect key="frame" x="0.0" y="40.000000000000014" width="358" height="24"/>
+                                                <rect key="frame" x="0.0" y="40" width="358" height="24"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="24" id="Cy9-E4-VAm"/>
                                                 </constraints>
                                             </view>
                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="yNu-ym-jvZ">
-                                                <rect key="frame" x="0.0" y="70.000000000000014" width="358" height="56"/>
+                                                <rect key="frame" x="0.0" y="70" width="358" height="56"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5wT-IG-lLN" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="171" height="56"/>
@@ -1100,7 +1085,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4bK-1b-rfc">
-                                <rect key="frame" x="16" y="78" width="358" height="688.33333333333337"/>
+                                <rect key="frame" x="16" y="77" width="358" height="690.33333333333337"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Alert" translatesAutoresizingMaskIntoConstraints="NO" id="NU3-fB-cJx">
                                         <rect key="frame" x="140" y="50" width="78" height="78"/>
@@ -1111,13 +1096,13 @@
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Remove Wallet?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y2v-fe-LwF">
-                                        <rect key="frame" x="16" y="144" width="326" height="25.666666666666657"/>
+                                        <rect key="frame" x="16" y="144" width="326" height="26.666666666666657"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="22"/>
                                         <color key="textColor" name="Txt2"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="CX8-pJ-Ude">
-                                        <rect key="frame" x="16" y="193.66666666666666" width="326" height="470.66666666666674"/>
+                                        <rect key="frame" x="16" y="194.66666666666666" width="326" height="471.66666666666674"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="w5y-lD-Fo2">
                                                 <rect key="frame" x="0.0" y="0.0" width="326" height="334"/>
@@ -1230,13 +1215,13 @@
                                                 </constraints>
                                             </stackView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message that if you remove this wallet the accounts contained and all content will be removed" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rwk-gp-69K">
-                                                <rect key="frame" x="0.0" y="357.99999999999994" width="326" height="32.666666666666686"/>
+                                                <rect key="frame" x="0.0" y="357.99999999999994" width="326" height="33.666666666666686"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="Txt6"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="LR0-GJ-gJA">
-                                                <rect key="frame" x="0.0" y="414.66666666666669" width="326" height="56"/>
+                                                <rect key="frame" x="0.0" y="415.66666666666669" width="326" height="56"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1un-2s-Olb" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="155" height="56"/>
@@ -1374,10 +1359,10 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R4G-Xl-bPf">
-                                <rect key="frame" x="16" y="217.33333333333334" width="358" height="409.33333333333326"/>
+                                <rect key="frame" x="16" y="216.99999999999997" width="358" height="410.33333333333326"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Downloads" translatesAutoresizingMaskIntoConstraints="NO" id="9lH-yf-zcz">
-                                        <rect key="frame" x="140" y="49.999999999999972" width="78" height="78"/>
+                                        <rect key="frame" x="140" y="50" width="78" height="78"/>
                                         <color key="tintColor" name="BGAlert4"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="78" id="vsg-sh-nn6"/>
@@ -1385,25 +1370,25 @@
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Update Available!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vkp-B1-RW0">
-                                        <rect key="frame" x="16" y="143.99999999999997" width="326" height="26.666666666666657"/>
+                                        <rect key="frame" x="16" y="144" width="326" height="26.666666666666657"/>
                                         <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" text="REQUIRED:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dhs-IZ-wtB">
-                                        <rect key="frame" x="16" y="194.66666666666666" width="326" height="17"/>
+                                        <rect key="frame" x="16" y="194.66666666666669" width="326" height="17"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                         <color key="textColor" name="TxtAlert2"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This is a new update available for Kukai. You MUST update your app to continue using your wallets." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NGh-WG-OQM">
-                                        <rect key="frame" x="16" y="221.66666666666666" width="326" height="32.666666666666657"/>
+                                        <rect key="frame" x="16" y="221.66666666666669" width="326" height="33.666666666666657"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                         <color key="textColor" name="Txt6"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f4H-Qi-waO" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                        <rect key="frame" x="60" y="314.33333333333326" width="238" height="56"/>
+                                        <rect key="frame" x="60" y="315.33333333333337" width="238" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="nhO-hU-2GE"/>
                                         </constraints>
@@ -1482,46 +1467,46 @@
             <size key="intrinsicContentSize" width="24" height="14"/>
         </designable>
         <designable name="1un-2s-Olb">
-            <size key="intrinsicContentSize" width="74" height="36"/>
+            <size key="intrinsicContentSize" width="76" height="36"/>
         </designable>
         <designable name="5wT-IG-lLN">
-            <size key="intrinsicContentSize" width="63" height="36"/>
+            <size key="intrinsicContentSize" width="64" height="36"/>
         </designable>
         <designable name="9Bj-V9-TG1">
-            <size key="intrinsicContentSize" width="155.33333333333334" height="34"/>
+            <size key="intrinsicContentSize" width="159" height="34"/>
         </designable>
         <designable name="BXZ-at-zJb">
             <size key="intrinsicContentSize" width="24" height="14"/>
         </designable>
         <designable name="F7s-Ip-5Ee">
-            <size key="intrinsicContentSize" width="173" height="36"/>
+            <size key="intrinsicContentSize" width="180" height="36"/>
         </designable>
         <designable name="TPw-8i-3vV">
-            <size key="intrinsicContentSize" width="136" height="36"/>
+            <size key="intrinsicContentSize" width="142" height="36"/>
         </designable>
         <designable name="TQh-in-HjU">
-            <size key="intrinsicContentSize" width="140.33333333333334" height="34"/>
+            <size key="intrinsicContentSize" width="143.33333333333334" height="34"/>
         </designable>
         <designable name="TZZ-Gt-iwb">
-            <size key="intrinsicContentSize" width="102" height="31"/>
+            <size key="intrinsicContentSize" width="105" height="32"/>
         </designable>
         <designable name="VPE-bC-rGj">
-            <size key="intrinsicContentSize" width="63" height="36"/>
+            <size key="intrinsicContentSize" width="64" height="36"/>
         </designable>
         <designable name="XEg-Fn-9q8">
             <size key="intrinsicContentSize" width="30" height="30"/>
         </designable>
         <designable name="XV7-87-nVU">
-            <size key="intrinsicContentSize" width="72" height="29"/>
+            <size key="intrinsicContentSize" width="73" height="29"/>
         </designable>
         <designable name="abB-kP-P9Y">
-            <size key="intrinsicContentSize" width="102" height="31"/>
+            <size key="intrinsicContentSize" width="105" height="32"/>
         </designable>
         <designable name="f4H-Qi-waO">
-            <size key="intrinsicContentSize" width="136.66666666666666" height="37.333333333333336"/>
+            <size key="intrinsicContentSize" width="140" height="38"/>
         </designable>
         <designable name="j1h-E1-Rkf">
-            <size key="intrinsicContentSize" width="63" height="36"/>
+            <size key="intrinsicContentSize" width="64" height="36"/>
         </designable>
         <designable name="jXG-tZ-HG4">
             <size key="intrinsicContentSize" width="45" height="36"/>
@@ -1546,7 +1531,6 @@
         <image name="Social_TZ_Ovalcolor" width="30" height="30"/>
         <image name="Wallet" width="24" height="24"/>
         <image name="btnAddKnockout" width="36" height="36"/>
-        <image name="btnInfoKnockout" width="36" height="36"/>
         <image name="btnUnchecked" width="36" height="36"/>
         <namedColor name="BG12">
             <color red="0.41200000047683716" green="0.41600000858306885" blue="0.50199997425079346" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/Kukai Mobile/Modules/Home/EditWalletViewController.swift b/Kukai Mobile/Modules/Home/EditWalletViewController.swift
index 09940601..7327af8d 100644
--- a/Kukai Mobile/Modules/Home/EditWalletViewController.swift	
+++ b/Kukai Mobile/Modules/Home/EditWalletViewController.swift	
@@ -94,12 +94,9 @@ class EditWalletViewController: UIViewController, BottomSheetCustomFixedProtocol
 		}
 	}
 	
-	@IBAction func domainInfoButtonTapped(_ sender: Any) {
-		self.alert(withTitle: "Domain Info", andMessage: "info text")
-	}
-	
 	@IBAction func domainNameLearnMoreTapped(_ sender: Any) {
-		self.alert(withTitle: "Learn more", andMessage: "info text")
+		guard let url = URL(string: "https://tezos.domains/") else { return }
+		UIApplication.shared.open(url)
 	}
 	
 	@IBAction func cancelTapped(_ sender: Any) {
diff --git a/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard b/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard
index ac52aa55..ebd3907f 100644
--- a/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard	
+++ b/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard	
@@ -326,7 +326,7 @@ for your Digital Assets</string>
                                                     </userDefinedRuntimeAttribute>
                                                 </userDefinedRuntimeAttributes>
                                                 <connections>
-                                                    <action selector="learnMoreTapped:" destination="3EC-3V-hGn" eventType="touchUpInside" id="xXE-cx-E98"/>
+                                                    <segue destination="lTh-XN-LfV" kind="custom" customClass="BottomSheetMediumSegue" customModule="Kukai_Mobile" customModuleProvider="target" id="jwT-jy-rkF"/>
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5t4-7b-ZSi" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
@@ -1462,31 +1462,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                             <constraint firstItem="E7i-BW-W2F" firstAttribute="top" secondItem="Cik-1x-02T" secondAttribute="top" id="Uav-V3-dhC"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" title="Import Wallet" id="103-Gk-UFC">
-                        <barButtonItem key="rightBarButtonItem" id="Jdc-Mw-eyH">
-                            <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="trailing" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" id="ljI-gW-RKX" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                <rect key="frame" x="276" y="5.5" width="83" height="33"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain"/>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="image" keyPath="customImage" value="btnInfo_Outline_Dark"/>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="imageWidth">
-                                        <real key="value" value="22"/>
-                                    </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="color" keyPath="customImageTint">
-                                        <color key="value" name="BGB4"/>
-                                    </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="imageHeight">
-                                        <real key="value" value="22"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                                <connections>
-                                    <segue destination="JB4-HE-1ks" kind="custom" customClass="BottomSheetMediumSegue" customModule="Kukai_Mobile" customModuleProvider="target" id="Hvb-6L-9To"/>
-                                </connections>
-                            </button>
-                        </barButtonItem>
-                    </navigationItem>
+                    <navigationItem key="navigationItem" title="Import Wallet" id="103-Gk-UFC"/>
                     <connections>
                         <outlet property="advancedButton" destination="mM7-0X-VxZ" id="3w3-Xu-6b2"/>
                         <outlet property="advancedStackView" destination="hmv-tG-gdu" id="jmx-ed-i7j"/>
@@ -1509,57 +1485,6 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
             </objects>
             <point key="canvasLocation" x="-9532" y="2317"/>
         </scene>
-        <!--Fee Info View Controller-->
-        <scene sceneID="pQv-Bt-qPM">
-            <objects>
-                <viewController id="JB4-HE-1ks" customClass="FeeInfoViewController" customModule="Kukai_Mobile" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="3hV-AI-t0J">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Import wallet" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ehl-fS-tyP">
-                                <rect key="frame" x="16" y="52" width="343" height="24"/>
-                                <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
-                                <color key="textColor" name="Txt2"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Photos" translatesAutoresizingMaskIntoConstraints="NO" id="kS6-RM-WYe">
-                                <rect key="frame" x="105.5" y="84" width="164" height="113"/>
-                                <color key="tintColor" name="BG4"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="164" id="3bv-wJ-1Jl"/>
-                                    <constraint firstAttribute="height" constant="113" id="icf-xM-5d5"/>
-                                </constraints>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qeg-LG-WoB">
-                                <rect key="frame" x="16" y="221" width="343" height="118"/>
-                                <string key="text">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh</string>
-                                <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
-                                <color key="textColor" name="Txt6"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="7Iu-IA-3GU"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="7Iu-IA-3GU" firstAttribute="trailing" secondItem="ehl-fS-tyP" secondAttribute="trailing" constant="16" id="0Z4-Zi-ABm"/>
-                            <constraint firstItem="qeg-LG-WoB" firstAttribute="leading" secondItem="7Iu-IA-3GU" secondAttribute="leading" constant="16" id="4T0-Xy-PNa"/>
-                            <constraint firstItem="qeg-LG-WoB" firstAttribute="top" secondItem="kS6-RM-WYe" secondAttribute="bottom" constant="24" id="LDy-BT-szn"/>
-                            <constraint firstItem="7Iu-IA-3GU" firstAttribute="trailing" secondItem="qeg-LG-WoB" secondAttribute="trailing" constant="16" id="Uzm-cd-Sjm"/>
-                            <constraint firstItem="kS6-RM-WYe" firstAttribute="top" secondItem="ehl-fS-tyP" secondAttribute="bottom" constant="8" id="Y7Z-WI-4af"/>
-                            <constraint firstItem="7Iu-IA-3GU" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="qeg-LG-WoB" secondAttribute="bottom" constant="24" id="fZJ-qk-xTS"/>
-                            <constraint firstItem="ehl-fS-tyP" firstAttribute="top" secondItem="7Iu-IA-3GU" secondAttribute="top" constant="32" id="fxr-qe-NjQ"/>
-                            <constraint firstItem="ehl-fS-tyP" firstAttribute="leading" secondItem="7Iu-IA-3GU" secondAttribute="leading" constant="16" id="hPz-0Y-6IR"/>
-                            <constraint firstItem="kS6-RM-WYe" firstAttribute="centerX" secondItem="7Iu-IA-3GU" secondAttribute="centerX" id="n7q-Q7-51Z"/>
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="BxD-YY-8u3" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-10116" y="3323"/>
-        </scene>
         <!--Connect Ledger-->
         <scene sceneID="kVg-jt-iew">
             <objects>
@@ -2128,7 +2053,7 @@ You will not be able to transact in this wallet.</string>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Tj9-rq-529" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-8329" y="-752"/>
+            <point key="canvasLocation" x="-8271" y="-1449"/>
         </scene>
         <!--Fee Info View Controller-->
         <scene sceneID="6vH-Fr-E0g">
@@ -2153,9 +2078,9 @@ You will not be able to transact in this wallet.</string>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dHV-WD-wSg">
                                 <rect key="frame" x="32" y="250" width="311" height="151.5"/>
-                                <string key="text">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh
+                                <string key="text">Social wallets are best for easy onboarding and lower value use. Your account address will be publicly known, for privacy it is better to choose an HD Wallet.
 
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh</string>
+Social wallets are secured by your chosen social provider credentials. If you lose access to your social provider you will lose access to the social wallet.</string>
                                 <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="Txt6"/>
                                 <nil key="highlightedColor"/>
@@ -2177,7 +2102,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="gXx-Vh-Cdb" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-8330" y="-1472"/>
+            <point key="canvasLocation" x="-7231" y="-1449"/>
         </scene>
         <!--Fee Info View Controller-->
         <scene sceneID="WuM-8P-DJa">
@@ -2187,7 +2112,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Use Other Wallet" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hhX-XD-bm8">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Choose HD Wallet" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hhX-XD-bm8">
                                 <rect key="frame" x="16" y="50" width="343" height="24"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                 <color key="textColor" name="Txt2"/>
@@ -2201,10 +2126,10 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eLh-rm-mWx">
-                                <rect key="frame" x="32" y="250" width="311" height="151.5"/>
-                                <string key="text">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh
+                                <rect key="frame" x="32" y="250" width="311" height="118"/>
+                                <string key="text">An HD Wallet uses a Recovery Phrase to backup your wallet. You will be asked to write down your phrase, and store it in a secure offline location.
 
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhet, consectetuer adipiscing elit, sed diam nonummy nibh</string>
+HD Wallets allow you to create many accounts within the same wallet, all of them accessible by the same Recovery Phrase.</string>
                                 <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="Txt6"/>
                                 <nil key="highlightedColor"/>
@@ -2226,7 +2151,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="M02-p0-TUQ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-7586" y="-1472"/>
+            <point key="canvasLocation" x="-6487" y="-1449"/>
         </scene>
     </scenes>
     <designables>
@@ -2275,9 +2200,6 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
         <designable name="fpw-5A-t7A">
             <size key="intrinsicContentSize" width="165.5" height="38"/>
         </designable>
-        <designable name="ljI-gW-RKX">
-            <size key="intrinsicContentSize" width="24" height="14"/>
-        </designable>
         <designable name="mM7-0X-VxZ">
             <size key="intrinsicContentSize" width="106" height="36"/>
         </designable>
@@ -2319,7 +2241,6 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
         <image name="ChevronDown" width="18" height="10"/>
         <image name="ChevronRight" width="10" height="18"/>
         <image name="KukaiWheel" width="24" height="24"/>
-        <image name="Photos" width="24" height="24"/>
         <image name="ProtectWallet" width="150" height="150"/>
         <image name="Social_Apple" width="30" height="30"/>
         <image name="Social_Facebook_kockout" width="30" height="30"/>
@@ -2330,7 +2251,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibhe
         <image name="branding_image" width="201" height="195"/>
         <image name="btnInfo_Outline_Dark" width="36" height="36"/>
         <image name="btnUnchecked" width="36" height="36"/>
-        <image name="faceid" catalog="system" width="128" height="115"/>
+        <image name="faceid" catalog="system" width="32" height="32"/>
         <image name="logo_kukai" width="293" height="80"/>
         <image name="use_key_wallet" width="126" height="97.5"/>
         <image name="use_social_wallet" width="126" height="97.5"/>
diff --git a/Kukai Mobile/Modules/Onboarding/CreateWithSocialViewController.swift b/Kukai Mobile/Modules/Onboarding/CreateWithSocialViewController.swift
index cbef5051..1b076783 100644
--- a/Kukai Mobile/Modules/Onboarding/CreateWithSocialViewController.swift	
+++ b/Kukai Mobile/Modules/Onboarding/CreateWithSocialViewController.swift	
@@ -90,11 +90,6 @@ class CreateWithSocialViewController: UIViewController {
 		self.torusObserver = nil
 	}
 	
-	
-	@IBAction func learnMoreTapped(_ sender: Any) {
-		self.alert(withTitle: "Learn More", andMessage: "Info Text")
-	}
-	
 	@IBAction func appleTapped(_ sender: Any) {
 		guard DependencyManager.shared.torusVerifiers[.apple] != nil else {
 			self.windowError(withTitle: "error".localized(), description: "error-missing-verifier".localized())
diff --git a/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhrase.storyboard b/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhrase.storyboard
index 5f3266f2..cb27459b 100644
--- a/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhrase.storyboard	
+++ b/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhrase.storyboard	
@@ -967,7 +967,7 @@ Please store it carefully!</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Pcb-Lc-EOE">
-                                <rect key="frame" x="16" y="261.66666666666663" width="361" height="328.66666666666663"/>
+                                <rect key="frame" x="16" y="258.66666666666669" width="361" height="335.00000000000006"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Safety Alert" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FGT-Zj-Cxh">
                                         <rect key="frame" x="16" y="26" width="329" height="24"/>
@@ -976,7 +976,7 @@ Please store it carefully!</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AlertCautionColored" translatesAutoresizingMaskIntoConstraints="NO" id="BNU-Yo-cwD">
-                                        <rect key="frame" x="154" y="84" width="53" height="48"/>
+                                        <rect key="frame" x="154" y="74" width="53" height="48"/>
                                         <color key="tintColor" name="BGB-alt4"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="53" id="Bua-U0-Gqe"/>
@@ -984,43 +984,21 @@ Please store it carefully!</string>
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ozw-LX-CJN">
-                                        <rect key="frame" x="16" y="166" width="329" height="50.666666666666657"/>
-                                        <string key="text">Screenshots aren’t a safe way to keep track of your Recovery Phrase.  Store it somewhere that isn’t backed up online to keep your account safe.</string>
-                                        <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
+                                        <rect key="frame" x="16" y="146" width="329" height="77"/>
+                                        <string key="text">Screenshots aren't a safe way to store your Recovery Phrase. If you want to protect this wallet you should start over and not take a screenshot.</string>
+                                        <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="16"/>
                                         <color key="textColor" name="Txt6"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wIg-3U-TK6" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                        <rect key="frame" x="191" y="240.66666666666663" width="152" height="56"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="56" id="UfV-JS-tvH"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
-                                        <color key="tintColor" name="TxtBtnPrim1"/>
-                                        <inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                        <state key="normal" title="Send" image="ArrowUp-right"/>
-                                        <buttonConfiguration key="configuration" style="plain" title="Learn More">
-                                            <fontDescription key="titleFontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
-                                        </buttonConfiguration>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="customCornerRadius">
-                                                <real key="value" value="12"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="boolean" keyPath="maskToBounds" value="YES"/>
-                                        </userDefinedRuntimeAttributes>
-                                        <connections>
-                                            <action selector="learnMoreTapped:" destination="sO4-Is-Oyd" eventType="touchUpInside" id="Ynr-fU-rQy"/>
-                                        </connections>
-                                    </button>
                                     <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hbe-iD-iGO" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                        <rect key="frame" x="18" y="240.66666666666663" width="152" height="56"/>
+                                        <rect key="frame" x="36" y="247" width="289" height="56"/>
                                         <color key="backgroundColor" name="BtnSec1"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="zkU-jK-Kul"/>
                                         </constraints>
                                         <color key="tintColor" name="TxtBtnSec1"/>
                                         <state key="normal" title="Button"/>
-                                        <buttonConfiguration key="configuration" style="plain" title="Got it">
+                                        <buttonConfiguration key="configuration" style="plain" title="Continue">
                                             <fontDescription key="titleFontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                         </buttonConfiguration>
                                         <userDefinedRuntimeAttributes>
@@ -1042,21 +1020,18 @@ Please store it carefully!</string>
                                 </subviews>
                                 <color key="backgroundColor" name="BG2"/>
                                 <constraints>
-                                    <constraint firstItem="hbe-iD-iGO" firstAttribute="width" secondItem="wIg-3U-TK6" secondAttribute="width" id="0Rc-V7-GPR"/>
                                     <constraint firstItem="FGT-Zj-Cxh" firstAttribute="top" secondItem="Pcb-Lc-EOE" secondAttribute="top" constant="26" id="7RA-7v-MGE"/>
-                                    <constraint firstItem="ozw-LX-CJN" firstAttribute="top" secondItem="BNU-Yo-cwD" secondAttribute="bottom" constant="34" id="9Wy-x1-GXx"/>
+                                    <constraint firstItem="ozw-LX-CJN" firstAttribute="top" secondItem="BNU-Yo-cwD" secondAttribute="bottom" constant="24" id="9Wy-x1-GXx"/>
+                                    <constraint firstAttribute="trailing" secondItem="hbe-iD-iGO" secondAttribute="trailing" constant="36" id="EJr-B3-Ik0"/>
                                     <constraint firstAttribute="trailing" secondItem="ozw-LX-CJN" secondAttribute="trailing" constant="16" id="JUk-wu-Upx"/>
                                     <constraint firstItem="BNU-Yo-cwD" firstAttribute="centerX" secondItem="Pcb-Lc-EOE" secondAttribute="centerX" id="LyH-V3-ebg"/>
                                     <constraint firstAttribute="bottom" secondItem="hbe-iD-iGO" secondAttribute="bottom" constant="32" id="VEi-z9-B9h"/>
-                                    <constraint firstItem="wIg-3U-TK6" firstAttribute="top" secondItem="ozw-LX-CJN" secondAttribute="bottom" constant="24" id="VaY-3t-aS2"/>
                                     <constraint firstAttribute="trailing" secondItem="FGT-Zj-Cxh" secondAttribute="trailing" constant="16" id="bX3-Vw-9JA"/>
-                                    <constraint firstAttribute="bottom" secondItem="wIg-3U-TK6" secondAttribute="bottom" constant="32" id="cQJ-pz-8bG"/>
                                     <constraint firstItem="FGT-Zj-Cxh" firstAttribute="leading" secondItem="Pcb-Lc-EOE" secondAttribute="leading" constant="16" id="fjH-JI-0lE"/>
-                                    <constraint firstItem="BNU-Yo-cwD" firstAttribute="top" secondItem="FGT-Zj-Cxh" secondAttribute="bottom" constant="34" id="ibW-Ke-Lxv"/>
-                                    <constraint firstItem="wIg-3U-TK6" firstAttribute="leading" secondItem="hbe-iD-iGO" secondAttribute="trailing" constant="21" id="meu-xz-x0z"/>
+                                    <constraint firstItem="BNU-Yo-cwD" firstAttribute="top" secondItem="FGT-Zj-Cxh" secondAttribute="bottom" constant="24" id="ibW-Ke-Lxv"/>
                                     <constraint firstItem="ozw-LX-CJN" firstAttribute="leading" secondItem="Pcb-Lc-EOE" secondAttribute="leading" constant="16" id="moq-46-U0W"/>
-                                    <constraint firstAttribute="trailing" secondItem="wIg-3U-TK6" secondAttribute="trailing" constant="18" id="qp0-qZ-HgA"/>
-                                    <constraint firstItem="hbe-iD-iGO" firstAttribute="leading" secondItem="Pcb-Lc-EOE" secondAttribute="leading" constant="18" id="y1U-Rr-wfK"/>
+                                    <constraint firstItem="hbe-iD-iGO" firstAttribute="leading" secondItem="Pcb-Lc-EOE" secondAttribute="leading" constant="36" id="y1U-Rr-wfK"/>
+                                    <constraint firstItem="hbe-iD-iGO" firstAttribute="top" secondItem="ozw-LX-CJN" secondAttribute="bottom" constant="24" id="yVd-tv-95Y"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="boolean" keyPath="maskToBounds" value="YES"/>
@@ -1077,7 +1052,6 @@ Please store it carefully!</string>
                     <connections>
                         <outlet property="contentView" destination="Pcb-Lc-EOE" id="zx0-tJ-A2A"/>
                         <outlet property="gotItButton" destination="hbe-iD-iGO" id="SuT-2L-GcC"/>
-                        <outlet property="learnMoreButton" destination="wIg-3U-TK6" id="R6V-Pi-Cck"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ruc-Pz-Roq" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -1635,7 +1609,7 @@ Please store it carefully!</string>
             <size key="intrinsicContentSize" width="53.333333333333336" height="38"/>
         </designable>
         <designable name="hbe-iD-iGO">
-            <size key="intrinsicContentSize" width="76.666666666666671" height="38"/>
+            <size key="intrinsicContentSize" width="108.66666666666667" height="38"/>
         </designable>
         <designable name="nxu-NE-n0L">
             <size key="intrinsicContentSize" width="142.66666666666666" height="38"/>
@@ -1643,9 +1617,6 @@ Please store it carefully!</string>
         <designable name="uch-qJ-gRT">
             <size key="intrinsicContentSize" width="71.333333333333329" height="38"/>
         </designable>
-        <designable name="wIg-3U-TK6">
-            <size key="intrinsicContentSize" width="127.66666666666667" height="38"/>
-        </designable>
     </designables>
     <resources>
         <image name="AlertCautionColored" width="20" height="18"/>
diff --git a/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhraseScreenshotWarningViewController.swift b/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhraseScreenshotWarningViewController.swift
index 36dcf0e2..c43cd0d8 100644
--- a/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhraseScreenshotWarningViewController.swift	
+++ b/Kukai Mobile/Modules/RecoveryPhrase/RecoveryPhraseScreenshotWarningViewController.swift	
@@ -11,15 +11,13 @@ class RecoveryPhraseScreenshotWarningViewController: UIViewController {
 	
 	@IBOutlet var contentView: UIView!
 	@IBOutlet var gotItButton: CustomisableButton!
-	@IBOutlet var learnMoreButton: CustomisableButton!
 	
 	private var gradient = CAGradientLayer()
 	
     override func viewDidLoad() {
         super.viewDidLoad()
 		
-		gotItButton.customButtonType = .secondary
-		learnMoreButton.customButtonType = .primary
+		gotItButton.customButtonType = .primary
     }
 	
 	override func viewDidLayoutSubviews() {
@@ -32,8 +30,4 @@ class RecoveryPhraseScreenshotWarningViewController: UIViewController {
 	@IBAction func gotItTapped(_ sender: Any) {
 		self.dismiss(animated: true)
 	}
-	
-	@IBAction func learnMoreTapped(_ sender: Any) {
-		self.alert(withTitle: "Learn More", andMessage: "Info text")
-	}
 }
diff --git a/Kukai Mobile/Modules/Send/Base.lproj/Send.storyboard b/Kukai Mobile/Modules/Send/Base.lproj/Send.storyboard
index 9ad57399..957afbcc 100644
--- a/Kukai Mobile/Modules/Send/Base.lproj/Send.storyboard	
+++ b/Kukai Mobile/Modules/Send/Base.lproj/Send.storyboard	
@@ -2715,10 +2715,10 @@
             </objects>
             <point key="canvasLocation" x="2947" y="-110"/>
         </scene>
-        <!--info-->
+        <!--fee-page-1-->
         <scene sceneID="Rnb-Lu-Onc">
             <objects>
-                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="info" id="5iJ-b7-xV4" sceneMemberID="viewController"/>
+                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="fee-page-1" id="5iJ-b7-xV4" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Vf1-HH-M16" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="2434" y="-110"/>
@@ -2731,10 +2731,10 @@
             </objects>
             <point key="canvasLocation" x="2947" y="964"/>
         </scene>
-        <!--info-->
+        <!--fee-page-1-->
         <scene sceneID="H51-Bq-baj">
             <objects>
-                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="info" id="axm-qz-pV5" sceneMemberID="viewController"/>
+                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="fee-page-1" id="axm-qz-pV5" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Nfc-AR-x1s" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="2434" y="964"/>
@@ -3731,10 +3731,10 @@
             </objects>
             <point key="canvasLocation" x="2946" y="1997"/>
         </scene>
-        <!--info-->
+        <!--fee-page-1-->
         <scene sceneID="vhm-7A-8oa">
             <objects>
-                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="info" id="eo6-K3-SYV" sceneMemberID="viewController"/>
+                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="fee-page-1" id="eo6-K3-SYV" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="9qA-Wz-fBq" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="2434" y="1997"/>
@@ -4314,10 +4314,10 @@
             </objects>
             <point key="canvasLocation" x="2690.8396946564885" y="2603.5211267605637"/>
         </scene>
-        <!--info-->
+        <!--fee-page-1-->
         <scene sceneID="7Xe-fy-H63">
             <objects>
-                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="info" id="Jq3-ex-B2o" sceneMemberID="viewController"/>
+                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="fee-page-1" id="Jq3-ex-B2o" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ZGU-xP-dg4" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="2434" y="3064"/>
diff --git a/Kukai Mobile/Modules/Side Menu/CurrencyViewModel.swift b/Kukai Mobile/Modules/Side Menu/CurrencyViewModel.swift
index a7601f4d..c01cfc0c 100644
--- a/Kukai Mobile/Modules/Side Menu/CurrencyViewModel.swift	
+++ b/Kukai Mobile/Modules/Side Menu/CurrencyViewModel.swift	
@@ -25,7 +25,7 @@ class CurrencyViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 	public var selectedIndex: IndexPath = IndexPath(row: -1, section: 0)
 	
 	private let coinGeckoService = DependencyManager.shared.coinGeckoService
-	private let popularKeys = ["usd", "eur", "gbp", "jpy", "rub", "inr", "btc", "eth"]
+	private let popularKeys = ["usd", "eur", "gbp", "jpy", "rub", "inr"]
 	private var popularCells: [CurrencyObj] = []
 	private var otherCells: [CurrencyObj] = []
 	private var cancellable: AnyCancellable? = nil
@@ -61,14 +61,18 @@ class CurrencyViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 			return
 		}
 		
+		let fiatOnly = rates.filter { (key: String, value: CoinGeckoExchangeRate) in
+			return value.type == "fiat"
+		}
+		
 		for key in popularKeys {
-			if let obj = rates[key] {
+			if let obj = fiatOnly[key] {
 				popularCells.append(CurrencyObj(code: key.uppercased(), name: obj.name))
 			}
 		}
 		
-		for key in rates.keys.sorted(by: <) where !popularKeys.contains(key) {
-			otherCells.append(CurrencyObj(code: key.uppercased(), name: rates[key]?.name ?? ""))
+		for key in fiatOnly.keys.sorted(by: <) where !popularKeys.contains(key) {
+			otherCells.append(CurrencyObj(code: key.uppercased(), name: fiatOnly[key]?.name ?? ""))
 		}
 		
 		
diff --git a/Kukai Mobile/Modules/Side Menu/OnrampViewController.swift b/Kukai Mobile/Modules/Side Menu/OnrampViewController.swift
index 3f8ccb75..e1cd70dd 100644
--- a/Kukai Mobile/Modules/Side Menu/OnrampViewController.swift	
+++ b/Kukai Mobile/Modules/Side Menu/OnrampViewController.swift	
@@ -49,10 +49,6 @@ class OnrampViewController: UIViewController, UITableViewDelegate {
 		viewModel.refresh(animate: true)
 	}
 	
-	@IBAction func infoButtonTapped(_ sender: Any) {
-		self.alert(errorWithMessage: "Under Construction")
-	}
-	
 	func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
 		cell.layoutIfNeeded()
 		
diff --git a/Kukai Mobile/Modules/Side Menu/ShowQRViewController.swift b/Kukai Mobile/Modules/Side Menu/ShowQRViewController.swift
index 22504baf..3891d95a 100644
--- a/Kukai Mobile/Modules/Side Menu/ShowQRViewController.swift	
+++ b/Kukai Mobile/Modules/Side Menu/ShowQRViewController.swift	
@@ -60,8 +60,4 @@ class ShowQRViewController: UIViewController {
 		// present the view controller
 		self.present(activityViewController, animated: true, completion: nil)
 	}
-	
-	@IBAction func infoButtonTapped(_ sender: Any) {
-		self.alert(errorWithMessage: "Under Construction")
-	}
 }
diff --git a/Kukai Mobile/Modules/Side Menu/SideMenu.storyboard b/Kukai Mobile/Modules/Side Menu/SideMenu.storyboard
index 0ba0bc6e..d2c3bc1c 100644
--- a/Kukai Mobile/Modules/Side Menu/SideMenu.storyboard	
+++ b/Kukai Mobile/Modules/Side Menu/SideMenu.storyboard	
@@ -558,7 +558,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="insetGrouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="S0B-cf-p5c">
-                                <rect key="frame" x="0.0" y="103" width="393" height="749"/>
+                                <rect key="frame" x="0.0" y="127" width="393" height="725"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SideMenuOptionCell" rowHeight="52" id="mol-vp-Z86" customClass="SideMenuOptionCell" customModule="Kukai_Mobile" customModuleProvider="target">
@@ -626,7 +626,7 @@
                         <constraints>
                             <constraint firstItem="S0B-cf-p5c" firstAttribute="trailing" secondItem="DBo-DQ-1Eo" secondAttribute="trailing" id="ATx-rc-yOg"/>
                             <constraint firstAttribute="bottom" secondItem="S0B-cf-p5c" secondAttribute="bottom" id="dKk-dB-pZL"/>
-                            <constraint firstItem="S0B-cf-p5c" firstAttribute="top" secondItem="DBo-DQ-1Eo" secondAttribute="top" id="eFv-mH-9Zs"/>
+                            <constraint firstItem="S0B-cf-p5c" firstAttribute="top" secondItem="DBo-DQ-1Eo" secondAttribute="top" constant="24" id="eFv-mH-9Zs"/>
                             <constraint firstItem="S0B-cf-p5c" firstAttribute="leading" secondItem="DBo-DQ-1Eo" secondAttribute="leading" id="sJb-wM-qgB"/>
                         </constraints>
                     </view>
@@ -861,30 +861,6 @@
                                 <color key="textColor" name="Txt8"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="trailing" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VdS-Ic-j1F" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                <rect key="frame" x="337" y="83" width="40" height="40"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="pmQ-bg-5nz"/>
-                                    <constraint firstAttribute="width" constant="40" id="vlG-qi-86z"/>
-                                </constraints>
-                                <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain"/>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="image" keyPath="customImage" value="btnInfo_Outline_Dark"/>
-                                    <userDefinedRuntimeAttribute type="color" keyPath="customImageTint">
-                                        <color key="value" name="BGB4"/>
-                                    </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="imageWidth">
-                                        <real key="value" value="20"/>
-                                    </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="imageHeight">
-                                        <real key="value" value="20"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                                <connections>
-                                    <action selector="infoButtonTapped:" destination="3dX-B7-5wO" eventType="touchUpInside" id="Yps-jW-Bn7"/>
-                                </connections>
-                            </button>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="uAj-Kq-HRO"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -892,13 +868,11 @@
                             <constraint firstItem="JOj-kz-zuN" firstAttribute="top" secondItem="B7w-2U-Q4Z" secondAttribute="bottom" constant="16" id="0LN-TT-NCP"/>
                             <constraint firstItem="g8u-6O-KBs" firstAttribute="centerX" secondItem="uAj-Kq-HRO" secondAttribute="centerX" id="28v-KF-K21"/>
                             <constraint firstItem="uAj-Kq-HRO" firstAttribute="trailing" secondItem="B7w-2U-Q4Z" secondAttribute="trailing" constant="32" id="5d2-gE-zl4"/>
-                            <constraint firstItem="uAj-Kq-HRO" firstAttribute="trailing" secondItem="VdS-Ic-j1F" secondAttribute="trailing" constant="16" id="60T-o4-8Fn"/>
                             <constraint firstItem="uAj-Kq-HRO" firstAttribute="trailing" secondItem="GKP-JB-95F" secondAttribute="trailing" constant="16" id="91J-NW-0h4"/>
                             <constraint firstItem="g8u-6O-KBs" firstAttribute="top" secondItem="GKP-JB-95F" secondAttribute="bottom" constant="24" id="A6A-ty-Ko1"/>
                             <constraint firstItem="Afd-eu-CxP" firstAttribute="top" secondItem="B7w-2U-Q4Z" secondAttribute="bottom" constant="16" id="CEp-lL-ffP"/>
                             <constraint firstItem="9Tu-Wp-MBG" firstAttribute="leading" secondItem="B7w-2U-Q4Z" secondAttribute="leading" id="RI5-3m-nOF"/>
                             <constraint firstItem="Afd-eu-CxP" firstAttribute="leading" secondItem="JOj-kz-zuN" secondAttribute="trailing" constant="16" id="Rmx-yt-JJz"/>
-                            <constraint firstItem="VdS-Ic-j1F" firstAttribute="centerY" secondItem="GKP-JB-95F" secondAttribute="centerY" id="ZRq-az-ax2"/>
                             <constraint firstItem="9Tu-Wp-MBG" firstAttribute="top" secondItem="JOj-kz-zuN" secondAttribute="bottom" constant="32" id="bjK-B5-GQS"/>
                             <constraint firstItem="JOj-kz-zuN" firstAttribute="width" secondItem="Afd-eu-CxP" secondAttribute="width" id="iHH-3Q-uUt"/>
                             <constraint firstItem="JOj-kz-zuN" firstAttribute="leading" secondItem="B7w-2U-Q4Z" secondAttribute="leading" id="oaI-No-eEV"/>
@@ -1022,7 +996,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="THb-l2-U1S">
-                                <rect key="frame" x="0.0" y="103" width="393" height="715"/>
+                                <rect key="frame" x="0.0" y="127" width="393" height="691"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="CurrencyChoiceCell" rowHeight="71" id="RqK-9j-b9Q" customClass="CurrencyChoiceCell" customModule="Kukai_Mobile" customModuleProvider="target">
@@ -1093,7 +1067,7 @@
                         <constraints>
                             <constraint firstItem="6dS-y4-XJF" firstAttribute="trailing" secondItem="THb-l2-U1S" secondAttribute="trailing" id="4ja-cm-MpL"/>
                             <constraint firstItem="THb-l2-U1S" firstAttribute="leading" secondItem="6dS-y4-XJF" secondAttribute="leading" id="NZk-Ap-XRA"/>
-                            <constraint firstItem="THb-l2-U1S" firstAttribute="top" secondItem="6dS-y4-XJF" secondAttribute="top" id="pSl-mo-EhY"/>
+                            <constraint firstItem="THb-l2-U1S" firstAttribute="top" secondItem="6dS-y4-XJF" secondAttribute="top" constant="24" id="pSl-mo-EhY"/>
                             <constraint firstItem="6dS-y4-XJF" firstAttribute="bottom" secondItem="THb-l2-U1S" secondAttribute="bottom" id="vWU-Er-Tx8"/>
                         </constraints>
                     </view>
@@ -1349,31 +1323,7 @@
                             <constraint firstItem="AQE-V0-0pn" firstAttribute="top" secondItem="xs7-2c-i9N" secondAttribute="top" constant="16" id="tn7-SG-cf8"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" title="Get Tez (XTZ)" id="7hD-kP-1fg">
-                        <barButtonItem key="rightBarButtonItem" id="VbL-Fo-XOh">
-                            <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="trailing" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" id="n7h-lU-KVu" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                <rect key="frame" x="290" y="5.6666666666666679" width="87" height="33"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain"/>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="image" keyPath="customImage" value="btnInfo_Outline_Dark"/>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="imageWidth">
-                                        <real key="value" value="20"/>
-                                    </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="imageHeight">
-                                        <real key="value" value="20"/>
-                                    </userDefinedRuntimeAttribute>
-                                    <userDefinedRuntimeAttribute type="color" keyPath="customImageTint">
-                                        <color key="value" name="BGB4"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                            </button>
-                            <connections>
-                                <action selector="infoButtonTapped:" destination="daz-8U-xgY" id="wU6-9B-qUY"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
+                    <navigationItem key="navigationItem" title="Get Tez (XTZ)" id="7hD-kP-1fg"/>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <connections>
                         <outlet property="tableView" destination="vCq-eJ-jnD" id="K1N-BO-t8z"/>
@@ -1982,9 +1932,6 @@ Sometimes it can be necessary to clear this list manually in order to remove sta
         <designable name="Uoh-oV-NMX">
             <size key="intrinsicContentSize" width="113" height="36"/>
         </designable>
-        <designable name="VdS-Ic-j1F">
-            <size key="intrinsicContentSize" width="24" height="14"/>
-        </designable>
         <designable name="W4f-J6-VHc">
             <size key="intrinsicContentSize" width="30" height="34"/>
         </designable>
@@ -1994,9 +1941,6 @@ Sometimes it can be necessary to clear this list manually in order to remove sta
         <designable name="j6C-A9-dec">
             <size key="intrinsicContentSize" width="30" height="34"/>
         </designable>
-        <designable name="n7h-lU-KVu">
-            <size key="intrinsicContentSize" width="24" height="14"/>
-        </designable>
         <designable name="vT4-cL-ycF">
             <size key="intrinsicContentSize" width="32" height="36"/>
         </designable>
@@ -2014,7 +1958,6 @@ Sometimes it can be necessary to clear this list manually in order to remove sta
         <image name="Social_Twitter_1color" width="30" height="30"/>
         <image name="btnAddKnockout" width="36" height="36"/>
         <image name="btnCopyKnockout" width="36" height="36"/>
-        <image name="btnInfo_Outline_Dark" width="36" height="36"/>
         <image name="btnQRKnockout" width="36" height="36"/>
         <image name="btnUnchecked" width="36" height="36"/>
         <namedColor name="BG2">
diff --git a/Kukai Mobile/Modules/Stake/Stake.storyboard b/Kukai Mobile/Modules/Stake/Stake.storyboard
index 0e8b6ff2..61c3e3bb 100644
--- a/Kukai Mobile/Modules/Stake/Stake.storyboard	
+++ b/Kukai Mobile/Modules/Stake/Stake.storyboard	
@@ -261,15 +261,18 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Info" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bUC-oz-6FD">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Delegating" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bUC-oz-6FD">
                                 <rect key="frame" x="20" y="72" width="374" height="24"/>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                 <color key="textColor" name="Txt2"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Under Construction" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dNU-Q8-GZN">
-                                <rect key="frame" x="20" y="120" width="374" height="19.5"/>
-                                <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dNU-Q8-GZN">
+                                <rect key="frame" x="20" y="120" width="374" height="151.5"/>
+                                <string key="text">There is no risk to your balance when you delegate in Tezos. Your balance is not frozen, you can freely transfer your tokens at at time.
+
+Bakers validate and participate in Tezos governance. By delegating to a Baker, you are actively helping the Tezos network be more decentralized and secure. The Baker you select will share the specified split % of their rewards with you. </string>
+                                <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="Txt2"/>
                                 <nil key="highlightedColor"/>
                             </label>
@@ -1095,10 +1098,10 @@
             </objects>
             <point key="canvasLocation" x="1817" y="1242"/>
         </scene>
-        <!--info-->
+        <!--fee-page-1-->
         <scene sceneID="hEf-ir-t9p">
             <objects>
-                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="info" id="Jcn-pG-BcY" sceneMemberID="viewController"/>
+                <viewControllerPlaceholder storyboardName="Fees" referencedIdentifier="fee-page-1" id="Jcn-pG-BcY" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="37I-1i-uKo" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="1301" y="1242"/>
diff --git a/Kukai Mobile/Services/DiscoverService.swift b/Kukai Mobile/Services/DiscoverService.swift
index 58949a79..4252a243 100644
--- a/Kukai Mobile/Services/DiscoverService.swift	
+++ b/Kukai Mobile/Services/DiscoverService.swift	
@@ -33,10 +33,10 @@ public struct DiscoverItem: Codable, Hashable, Identifiable {
 		guard let stringURL = mobileBannerUri else { return nil }
 		
 		let scale = UIScreen.main.scale
-		if scale == 2 {
-			return URL(string: "\(stringURL)300")
-		} else {
+		if scale == 3 {
 			return URL(string: "\(stringURL)450")
+		} else {
+			return URL(string: "\(stringURL)300")
 		}
 	}
 }