diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
--- a/src/qt/bitcoinamountfield.cpp
+++ b/src/qt/bitcoinamountfield.cpp
@@ -62,20 +62,20 @@
 
     void stepBy(int steps) {
         bool valid = false;
-        CAmount val = value(&valid);
+        Amount val(value(&valid));
         val = val + steps * singleStep;
-        val = qMin(qMax(val, CAmount(0)), BitcoinUnits::maxMoney());
-        setValue(val);
+        val = qMin(qMax(val, Amount(0)), BitcoinUnits::maxMoney());
+        setValue(val.GetSatoshis());
     }
 
     void setDisplayUnit(int unit) {
         bool valid = false;
-        CAmount val = value(&valid);
+        Amount val(value(&valid));
 
         currentUnit = unit;
 
         if (valid)
-            setValue(val);
+            setValue(val.GetSatoshis());
         else
             clear();
     }
@@ -135,17 +135,17 @@
      * @note Must return 0 if !valid.
      */
     CAmount parse(const QString &text, bool *valid_out = 0) const {
-        CAmount val = 0;
+        Amount val = 0;
         bool valid = BitcoinUnits::parse(currentUnit, text, &val);
         if (valid) {
-            if (val < 0 || val > BitcoinUnits::maxMoney()) {
+            if (val < Amount(0) || val > BitcoinUnits::maxMoney()) {
                 valid = false;
             }
         }
         if (valid_out) {
             *valid_out = valid;
         }
-        return valid ? val : 0;
+        return valid ? val.GetSatoshis() : 0;
     }
 
 protected:
diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h
--- a/src/qt/bitcoinunits.h
+++ b/src/qt/bitcoinunits.h
@@ -77,19 +77,18 @@
     //! Number of decimals left
     static int decimals(int unit);
     //! Format as string
-    static QString format(int unit, const CAmount &amount,
-                          bool plussign = false,
+    static QString format(int unit, const Amount amount, bool plussign = false,
                           SeparatorStyle separators = separatorStandard);
     //! Format as string (with unit)
     static QString
-    formatWithUnit(int unit, const CAmount &amount, bool plussign = false,
+    formatWithUnit(int unit, const Amount amount, bool plussign = false,
                    SeparatorStyle separators = separatorStandard);
     //! Format as HTML string (with unit)
     static QString
-    formatHtmlWithUnit(int unit, const CAmount &amount, bool plussign = false,
+    formatHtmlWithUnit(int unit, const Amount amount, bool plussign = false,
                        SeparatorStyle separators = separatorStandard);
     //! Parse string to coin amount
-    static bool parse(int unit, const QString &value, CAmount *val_out);
+    static bool parse(int unit, const QString &value, Amount *val_out);
     //! Gets title for amount column including current display unit if
     //! optionsModel reference available */
     static QString getAmountColumnTitle(int unit);
@@ -116,7 +115,7 @@
     }
 
     //! Return maximum number of base units (Satoshis)
-    static CAmount maxMoney();
+    static Amount maxMoney();
 
 private:
     QList<BitcoinUnits::Unit> unitlist;
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -83,7 +83,7 @@
     }
 }
 
-QString BitcoinUnits::format(int unit, const CAmount &nIn, bool fPlus,
+QString BitcoinUnits::format(int unit, const Amount nIn, bool fPlus,
                              SeparatorStyle separators) {
     // Note: not using straight sprintf here because we do NOT want
     // localized number formatting.
@@ -91,7 +91,7 @@
         // Refuse to format invalid unit
         return QString();
     }
-    qint64 n = (qint64)nIn;
+    qint64 n = (qint64)nIn.GetSatoshis();
     qint64 coin = factor(unit);
     int num_decimals = decimals(unit);
     qint64 n_abs = (n > 0 ? n : -n);
@@ -129,13 +129,13 @@
 // Please take care to use formatHtmlWithUnit instead, when
 // appropriate.
 
-QString BitcoinUnits::formatWithUnit(int unit, const CAmount &amount,
+QString BitcoinUnits::formatWithUnit(int unit, const Amount amount,
                                      bool plussign, SeparatorStyle separators) {
     return format(unit, amount, plussign, separators) + QString(" ") +
            name(unit);
 }
 
-QString BitcoinUnits::formatHtmlWithUnit(int unit, const CAmount &amount,
+QString BitcoinUnits::formatHtmlWithUnit(int unit, const Amount amount,
                                          bool plussign,
                                          SeparatorStyle separators) {
     QString str(formatWithUnit(unit, amount, plussign, separators));
@@ -143,7 +143,7 @@
     return QString("<span style='white-space: nowrap;'>%1</span>").arg(str);
 }
 
-bool BitcoinUnits::parse(int unit, const QString &value, CAmount *val_out) {
+bool BitcoinUnits::parse(int unit, const QString &value, Amount *val_out) {
     if (!valid(unit) || value.isEmpty()) {
         // Refuse to parse invalid unit or empty string
         return false;
@@ -174,7 +174,7 @@
         // Longer numbers will exceed 63 bits
         return false;
     }
-    CAmount retvalue(str.toLongLong(&ok));
+    Amount retvalue(str.toLongLong(&ok));
     if (val_out) {
         *val_out = retvalue;
     }
@@ -211,6 +211,6 @@
     return QVariant();
 }
 
-CAmount BitcoinUnits::maxMoney() {
-    return MAX_MONEY.GetSatoshis();
+Amount BitcoinUnits::maxMoney() {
+    return MAX_MONEY;
 }
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -58,7 +58,7 @@
 QString formatBitcoinURI(const SendCoinsRecipient &info);
 
 // Returns true if given address+amount meets "dust" definition
-bool isDust(const QString &address, const CAmount &amount);
+bool isDust(const QString &address, const Amount amount);
 
 // HTML escaping for rich text controls
 QString HtmlEscape(const QString &str, bool fMultiLine = false);
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -200,10 +200,11 @@
             fShouldReturnFalse = false;
         } else if (i->first == "amount") {
             if (!i->second.isEmpty()) {
-                if (!BitcoinUnits::parse(BitcoinUnits::BCH, i->second,
-                                         &rv.amount)) {
+                Amount amt;
+                if (!BitcoinUnits::parse(BitcoinUnits::BCH, i->second, &amt)) {
                     return false;
                 }
+                rv.amount = amt.GetSatoshis();
             }
             fShouldReturnFalse = false;
         }
@@ -259,10 +260,10 @@
     return ret;
 }
 
-bool isDust(const QString &address, const CAmount &amount) {
+bool isDust(const QString &address, const Amount amount) {
     CTxDestination dest = DecodeDestination(address.toStdString());
     CScript script = GetScriptForDestination(dest);
-    CTxOut txOut(Amount(amount), script);
+    CTxOut txOut(amount, script);
     return txOut.IsDust(dustRelayFee);
 }
 
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -333,10 +333,10 @@
 
 void TransactionView::changedAmount(const QString &amount) {
     if (!transactionProxyModel) return;
-    CAmount amount_parsed(0);
+    Amount amount_parsed(0);
     if (BitcoinUnits::parse(model->getOptionsModel()->getDisplayUnit(), amount,
                             &amount_parsed)) {
-        transactionProxyModel->setMinAmount(amount_parsed);
+        transactionProxyModel->setMinAmount(amount_parsed.GetSatoshis());
     } else {
         transactionProxyModel->setMinAmount(0);
     }