diff --git a/.gitignore b/.gitignore
index 61497b82..f48b5eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ yarn.lock
 # Derived js files
 qortal-ui-plugins/plugins/core/**/*.js
 !*.src.js
+qortal-ui-core/src/redux/app/version.js
 
 # Node modules
 node_modules/
diff --git a/qortal-ui-core/src/components/app-view.js b/qortal-ui-core/src/components/app-view.js
index 81cd764a..a481d5f3 100644
--- a/qortal-ui-core/src/components/app-view.js
+++ b/qortal-ui-core/src/components/app-view.js
@@ -13,9 +13,6 @@ import './show-plugin.js'
 import './qort-theme-toggle.js'
 import './language-selector.js'
 
-import '@material/mwc-drawer'
-import '@material/mwc-icon'
-
 import '@polymer/app-layout/app-layout.js'
 import '@polymer/paper-ripple'
 
diff --git a/qortal-ui-core/src/components/sidenav-menu.js b/qortal-ui-core/src/components/sidenav-menu.js
index c730c05d..20c5f31b 100644
--- a/qortal-ui-core/src/components/sidenav-menu.js
+++ b/qortal-ui-core/src/components/sidenav-menu.js
@@ -3,7 +3,6 @@ import { connect } from 'pwa-helpers'
 import { store } from '../store.js'
 import { translate, translateUnsafeHTML } from 'lit-translate'
 
-import '@material/mwc-icon'
 import '@polymer/paper-ripple'
 import '@vaadin/icon'
 import '@vaadin/icons'
diff --git a/qortal-ui-core/src/redux/app/version.js b/qortal-ui-core/src/redux/app/version.js
deleted file mode 100644
index dbe4ce76..00000000
--- a/qortal-ui-core/src/redux/app/version.js
+++ /dev/null
@@ -1 +0,0 @@
-export const UI_VERSION = "1.8.2";
diff --git a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
index 6dfe2ea1..63aa7fc9 100644
--- a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
+++ b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
@@ -239,7 +239,7 @@ class TradePortal extends LitElement {
 			overflow: hidden;
 		}
 
-		.you-have {
+		.amt-text {
 			color: var(--tradehave);
 			font-size: 15px;
 			text-align: right;
@@ -411,7 +411,8 @@ class TradePortal extends LitElement {
             name: "QORTAL",
             balance: "0",
             coinCode: "QORT",
-            coinAmount: this.amountString
+            coinAmount: this.amountString,
+            tradeFee: "0.002"
         }
 
         let litecoin = {
@@ -426,7 +427,8 @@ class TradePortal extends LitElement {
             myOfferingOrders: [],
             openTradeOrders: null,
             tradeOffersSocketCounter: 1,
-            coinAmount: this.amountString
+            coinAmount: this.amountString,
+            tradeFee: "~0.00005"
         }
 
         let dogecoin = {
@@ -441,7 +443,8 @@ class TradePortal extends LitElement {
             myOfferingOrders: [],
             openTradeOrders: null,
             tradeOffersSocketCounter: 1,
-            coinAmount: this.amountString
+            coinAmount: this.amountString,
+            tradeFee: "~0.005"
         }
 
         this.listedCoins = new Map()
@@ -637,7 +640,8 @@ class TradePortal extends LitElement {
 								>
 								</mwc-textfield>
 							</p>
-							<span class="you-have">${translate("tradepage.tchange16")}: ${this.listedCoins.get(this.selectedCoin).balance} ${this.listedCoins.get(this.selectedCoin).coinCode}</span>
+							<span class="amt-text">${translate("tradepage.tchange16")}: ${this.listedCoins.get(this.selectedCoin).balance} ${this.listedCoins.get(this.selectedCoin).coinCode}</span>
+							<span class="amt-text">${translate("walletpage.wchange12")}: ${this.listedCoins.get(this.selectedCoin).tradeFee} ${this.listedCoins.get(this.selectedCoin).coinCode}</span>
 							<div class="buttons">
 								<div>
 									<mwc-button class="buy-button" ?disabled="${this.buyBtnDisable}" style="width:100%;" raised @click="${(e) => this.buyAction(e)}">
@@ -696,7 +700,8 @@ class TradePortal extends LitElement {
 								>
 								</mwc-textfield>
 							</p>
-							<span class="you-have">${translate("tradepage.tchange16")}: ${this.listedCoins.get("QORTAL").balance} QORT</span>
+							<span class="amt-text">${translate("tradepage.tchange16")}: ${this.listedCoins.get("QORTAL").balance} QORT</span>
+							<span class="amt-text">${translate("walletpage.wchange12")}: ${this.listedCoins.get("QORTAL").tradeFee} QORT</span>
 							<div class="buttons">
 								<div>
 									<mwc-button class="sell-button" ?disabled="${this.sellBtnDisable}" style="width:100%;" raised @click="${(e) => this.sellAction()}">
diff --git a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js
index b547c6c8..7203e51a 100644
--- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js
+++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js
@@ -1145,7 +1145,7 @@ class MultiWallet extends LitElement {
                         </p>
                         <div style="margin-bottom: 0;">
                             <p style="margin-bottom: 0;">
-                                ${translate("walletpage.wchange24")}: <span style="font-weight: bold;">${(this.dogeFeePerByte / 1e8).toFixed(8)} DOGE</span><br>L${translate("walletpage.wchange25")}
+                                ${translate("walletpage.wchange24")}: <span style="font-weight: bold;">${(this.dogeFeePerByte / 1e8).toFixed(8)} DOGE</span><br>${translate("walletpage.wchange25")}
                             </p>
                             <paper-slider
                                 class="blue"