diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -624,10 +624,10 @@
 
     // Register meta types used for QMetaObject::invokeMethod
     qRegisterMetaType<bool *>();
-    //   Need to pass name here as CAmount is a typedef (see
+    //   Need to pass name here as Amount is a typedef (see
     //   http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType)
     //   IMPORTANT if it is no longer a typedef use the normal variant above
-    qRegisterMetaType<CAmount>("CAmount");
+    qRegisterMetaType<Amount>("Amount");
 
     // Need to register any types Qt doesn't know about if you intend
     // to use them with the signal/slot mechanism Qt provides. Even pointers.
diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
--- a/src/qt/bitcoinamountfield.cpp
+++ b/src/qt/bitcoinamountfield.cpp
@@ -74,7 +74,7 @@
         currentUnit = unit;
 
         if (valid) {
-            setValue(val.GetSatoshis());
+            setValue(val);
         } else {
             clear();
         }
@@ -145,7 +145,7 @@
         if (valid_out) {
             *valid_out = valid;
         }
-        return valid ? val.GetSatoshis() : 0;
+        return valid ? val : Amount(0);
     }
 
 protected:
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -199,9 +199,9 @@
     bool handlePaymentRequest(const SendCoinsRecipient &recipient);
 
     /** Show incoming transaction notification for new transactions. */
-    void incomingTransaction(const QString &date, int unit,
-                             const CAmount &amount, const QString &type,
-                             const QString &address, const QString &label);
+    void incomingTransaction(const QString &date, int unit, const Amount amount,
+                             const QString &type, const QString &address,
+                             const QString &label);
 #endif // ENABLE_WALLET
 
 private Q_SLOTS:
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1025,7 +1025,7 @@
 
 #ifdef ENABLE_WALLET
 void BitcoinGUI::incomingTransaction(const QString &date, int unit,
-                                     const CAmount &amount, const QString &type,
+                                     const Amount amount, const QString &type,
                                      const QString &address,
                                      const QString &label) {
     // On new transaction, make an info balloon
diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
--- a/src/qt/coincontroldialog.h
+++ b/src/qt/coincontroldialog.h
@@ -52,7 +52,7 @@
     // static because also called from sendcoinsdialog
     static void updateLabels(WalletModel *, QDialog *);
 
-    static QList<CAmount> payAmounts;
+    static QList<Amount> payAmounts;
     static CCoinControl *coinControl;
     static bool fSubtractFeeFromAmount;
 
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -31,7 +31,7 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 
-QList<CAmount> CoinControlDialog::payAmounts;
+QList<Amount> CoinControlDialog::payAmounts;
 CCoinControl *CoinControlDialog::coinControl = new CCoinControl();
 bool CoinControlDialog::fSubtractFeeFromAmount = false;
 
@@ -450,10 +450,10 @@
     if (!model) return;
 
     // nPayAmount
-    CAmount nPayAmount = 0;
+    Amount nPayAmount = 0;
     bool fDust = false;
     CMutableTransaction txDummy;
-    for (const CAmount &amount : CoinControlDialog::payAmounts) {
+    for (const Amount amount : CoinControlDialog::payAmounts) {
         nPayAmount += amount;
 
         if (amount > 0) {
@@ -494,7 +494,7 @@
         nQuantity++;
 
         // Amount
-        nAmount += out.tx->tx->vout[out.i].nValue.GetSatoshis();
+        nAmount += out.tx->tx->vout[out.i].nValue;
 
         // Priority
         dPriorityInputs +=
@@ -536,7 +536,7 @@
         // Fee
         nPayFee = CWallet::GetMinimumFee(nBytes, nTxConfirmTarget, mempool);
         if (nPayFee > 0 && coinControl->nMinimumTotalFee > nPayFee)
-            nPayFee = coinControl->nMinimumTotalFee.GetSatoshis();
+            nPayFee = coinControl->nMinimumTotalFee;
 
         // Allow free? (require at least hard-coded threshold and default to
         // that if no estimate)
@@ -560,13 +560,12 @@
 
             // Never create dust outputs; if we would, just add the dust to the
             // fee.
-            if (nChange > 0 && nChange < MIN_CHANGE.GetSatoshis()) {
+            if (nChange > Amount(0) && nChange < MIN_CHANGE) {
                 CTxOut txout(nChange, (CScript)std::vector<uint8_t>(24, 0));
                 if (txout.IsDust(dustRelayFee)) {
                     // dust-change will be raised until no dust
                     if (CoinControlDialog::fSubtractFeeFromAmount) {
-                        nChange =
-                            txout.GetDustThreshold(dustRelayFee).GetSatoshis();
+                        nChange = txout.GetDustThreshold(dustRelayFee);
                     } else {
                         nPayFee += nChange;
                         nChange = 0;
@@ -611,21 +610,17 @@
     // Quantity
     l1->setText(QString::number(nQuantity));
     // Amount
-    l2->setText(
-        BitcoinUnits::formatWithUnit(nDisplayUnit, nAmount.GetSatoshis()));
+    l2->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAmount));
     // Fee
-    l3->setText(
-        BitcoinUnits::formatWithUnit(nDisplayUnit, nPayFee.GetSatoshis()));
+    l3->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nPayFee));
     // After Fee
-    l4->setText(
-        BitcoinUnits::formatWithUnit(nDisplayUnit, nAfterFee.GetSatoshis()));
+    l4->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAfterFee));
     // Bytes
     l5->setText(((nBytes > 0) ? ASYMP_UTF8 : "") + QString::number(nBytes));
     // Dust
     l7->setText(fDust ? tr("yes") : tr("no"));
     // Change
-    l8->setText(
-        BitcoinUnits::formatWithUnit(nDisplayUnit, nChange.GetSatoshis()));
+    l8->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nChange));
     if (nPayFee > Amount(0) && (coinControl->nMinimumTotalFee < nPayFee)) {
         l3->setText(ASYMP_UTF8 + l3->text());
         l4->setText(ASYMP_UTF8 + l4->text());
@@ -777,9 +772,8 @@
             // amount
             itemOutput->setText(
                 COLUMN_AMOUNT,
-                BitcoinUnits::format(
-                    nDisplayUnit,
-                    out.tx->tx->vout[out.i].nValue.GetSatoshis()));
+                BitcoinUnits::format(nDisplayUnit,
+                                     out.tx->tx->vout[out.i].nValue));
             // padding so that sorting works correctly
             itemOutput->setData(
                 COLUMN_AMOUNT, Qt::UserRole,
@@ -828,8 +822,7 @@
             itemWalletAddress->setText(COLUMN_CHECKBOX,
                                        "(" + QString::number(nChildren) + ")");
             itemWalletAddress->setText(
-                COLUMN_AMOUNT,
-                BitcoinUnits::format(nDisplayUnit, nSum.GetSatoshis()));
+                COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, nSum));
             itemWalletAddress->setData(COLUMN_AMOUNT, Qt::UserRole,
                                        QVariant((qlonglong)nSum.GetSatoshis()));
         }
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -215,11 +215,10 @@
             fShouldReturnFalse = false;
         } else if (i->first == "amount") {
             if (!i->second.isEmpty()) {
-                Amount amt;
-                if (!BitcoinUnits::parse(BitcoinUnits::BCH, i->second, &amt)) {
+                if (!BitcoinUnits::parse(BitcoinUnits::BCH, i->second,
+                                         &rv.amount)) {
                     return false;
                 }
-                rv.amount = amt.GetSatoshis();
             }
             fShouldReturnFalse = false;
         }
diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h
--- a/src/qt/paymentrequestplus.h
+++ b/src/qt/paymentrequestplus.h
@@ -37,7 +37,7 @@
     bool getMerchant(X509_STORE *certStore, QString &merchant) const;
 
     // Returns list of outputs, amount
-    QList<std::pair<CScript, CAmount>> getPayTo() const;
+    QList<std::pair<CScript, Amount>> getPayTo() const;
 
     const payments::PaymentDetails &getDetails() const { return details; }
 
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -219,8 +219,8 @@
     return fResult;
 }
 
-QList<std::pair<CScript, CAmount>> PaymentRequestPlus::getPayTo() const {
-    QList<std::pair<CScript, CAmount>> result;
+QList<std::pair<CScript, Amount>> PaymentRequestPlus::getPayTo() const {
+    QList<std::pair<CScript, Amount>> result;
     for (int i = 0; i < details.outputs_size(); i++) {
         const uint8_t *scriptStr =
             (const uint8_t *)details.outputs(i).script().data();
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
--- a/src/qt/paymentserver.h
+++ b/src/qt/paymentserver.h
@@ -89,7 +89,7 @@
     // Verify the payment request size is valid as per BIP70
     static bool verifySize(qint64 requestSize);
     // Verify the payment request amount is valid
-    static bool verifyAmount(const CAmount &requestAmount);
+    static bool verifyAmount(const Amount requestAmount);
 
 Q_SIGNALS:
     // Fired when a valid payment request is received
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -539,10 +539,10 @@
 
     request.getMerchant(certStore.get(), recipient.authenticatedMerchant);
 
-    QList<std::pair<CScript, CAmount>> sendingTos = request.getPayTo();
+    QList<std::pair<CScript, Amount>> sendingTos = request.getPayTo();
     QStringList addresses;
 
-    for (const std::pair<CScript, CAmount> &sendingTo : sendingTos) {
+    for (const std::pair<CScript, Amount> &sendingTo : sendingTos) {
         // Extract and check destination addresses
         CTxDestination dest;
         if (ExtractDestination(sendingTo.first, dest)) {
@@ -562,7 +562,7 @@
         }
 
         // Bitcoin amounts are stored as (optional) uint64 in the protobuf
-        // messages (see paymentrequest.proto), but CAmount is defined as
+        // messages (see paymentrequest.proto), but Amount is defined as
         // int64_t. Because of that we need to verify that amounts are in a
         // valid range and no overflow has happened.
         if (!verifyAmount(sendingTo.second)) {
@@ -802,13 +802,13 @@
     return fVerified;
 }
 
-bool PaymentServer::verifyAmount(const CAmount &requestAmount) {
+bool PaymentServer::verifyAmount(const Amount requestAmount) {
     bool fVerified = MoneyRange(Amount(requestAmount));
     if (!fVerified) {
         qWarning() << QString("PaymentServer::%1: Payment request amount out "
                               "of allowed range (%2, allowed 0 - %3).")
                           .arg(__func__)
-                          .arg(requestAmount)
+                          .arg(requestAmount.GetSatoshis())
                           .arg(MAX_MONEY.GetSatoshis());
     }
     return fVerified;
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -157,8 +157,7 @@
         address = model->getAddressTableModel()->addRow(
             AddressTableModel::Receive, label, "");
     }
-    SendCoinsRecipient info(address, label,
-                            ui->reqAmount->value().GetSatoshis(),
+    SendCoinsRecipient info(address, label, ui->reqAmount->value(),
                             ui->reqMessage->text());
     ReceiveRequestDialog *dialog = new ReceiveRequestDialog(cfg, this);
     dialog->setAttribute(Qt::WA_DeleteOnClose);
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -219,8 +219,7 @@
                 SLOT(updateGlobalFeeVariables()));
         connect(ui->checkBoxMinimumFee, SIGNAL(stateChanged(int)), this,
                 SLOT(coinControlUpdateLabels()));
-        ui->customFee->setSingleStep(
-            CWallet::GetRequiredFee(1000).GetSatoshis());
+        ui->customFee->setSingleStep(CWallet::GetRequiredFee(1000));
         updateFeeSectionControls();
         updateMinFeeLabel();
         updateSmartFeeLabel();
@@ -599,8 +598,7 @@
             msgParams.first =
                 tr("A fee higher than %1 is considered an absurdly high fee.")
                     .arg(BitcoinUnits::formatWithUnit(
-                        model->getOptionsModel()->getDisplayUnit(),
-                        maxTxFee.GetSatoshis()));
+                        model->getOptionsModel()->getDisplayUnit(), maxTxFee));
             break;
         case WalletModel::PaymentRequestExpired:
             msgParams.first = tr("Payment request expired.");
@@ -636,7 +634,7 @@
 
 void SendCoinsDialog::setMinimumFee() {
     ui->radioCustomPerKilobyte->setChecked(true);
-    ui->customFee->setValue(CWallet::GetRequiredFee(1000).GetSatoshis());
+    ui->customFee->setValue(CWallet::GetRequiredFee(1000));
 }
 
 void SendCoinsDialog::updateFeeSectionControls() {
@@ -707,7 +705,7 @@
             tr("Pay only the required fee of %1")
                 .arg(BitcoinUnits::formatWithUnit(
                          model->getOptionsModel()->getDisplayUnit(),
-                         CWallet::GetRequiredFee(1000).GetSatoshis()) +
+                         CWallet::GetRequiredFee(1000)) +
                      "/kB"));
 }
 
@@ -725,8 +723,7 @@
             BitcoinUnits::formatWithUnit(
                 model->getOptionsModel()->getDisplayUnit(),
                 std::max(CWallet::fallbackFee.GetFeePerK(),
-                         CWallet::GetRequiredFee(1000))
-                    .GetSatoshis()) +
+                         CWallet::GetRequiredFee(1000))) +
             "/kB");
         // (Smart fee not initialized yet. This usually takes a few blocks...)
         ui->labelSmartFee2->show();
@@ -735,8 +732,7 @@
         ui->labelSmartFee->setText(
             BitcoinUnits::formatWithUnit(
                 model->getOptionsModel()->getDisplayUnit(),
-                std::max(feeRate.GetFeePerK(), CWallet::GetRequiredFee(1000))
-                    .GetSatoshis()) +
+                std::max(feeRate.GetFeePerK(), CWallet::GetRequiredFee(1000))) +
             "/kB");
         ui->labelSmartFee2->hide();
         ui->labelFeeEstimation->setText(
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -161,7 +161,7 @@
     // Normal payment
     recipient.address = ui->payTo->text();
     recipient.label = ui->addAsLabel->text();
-    recipient.amount = ui->payAmount->value().GetSatoshis();
+    recipient.amount = ui->payAmount->value();
     recipient.message = ui->messageTextLabel->text();
     recipient.fSubtractFeeFromAmount =
         (ui->checkboxSubtractFeeFromAmount->checkState() == Qt::Checked);
diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp
--- a/src/qt/test/paymentservertests.cpp
+++ b/src/qt/test/paymentservertests.cpp
@@ -204,8 +204,8 @@
     // Ensure the request is initialized
     QVERIFY(r.paymentRequest.IsInitialized());
     // Extract address and amount from the request
-    QList<std::pair<CScript, CAmount>> sendingTos = r.paymentRequest.getPayTo();
-    for (const std::pair<CScript, CAmount> &sendingTo : sendingTos) {
+    QList<std::pair<CScript, Amount>> sendingTos = r.paymentRequest.getPayTo();
+    for (const std::pair<CScript, Amount> &sendingTo : sendingTos) {
         CTxDestination dest;
         if (ExtractDestination(sendingTo.first, dest))
             QCOMPARE(PaymentServer::verifyAmount(sendingTo.second), false);
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -62,7 +62,7 @@
     int64_t nTime = wtx.GetTxTime();
     Amount nCredit = wtx.GetCredit(ISMINE_ALL);
     Amount nDebit = wtx.GetDebit(ISMINE_ALL);
-    CAmount nNet = (nCredit - nDebit).GetSatoshis();
+    Amount nNet = nCredit - nDebit;
 
     strHTML += "<b>" + tr("Status") + ":</b> " + FormatTxStatus(wtx);
     int nRequests = wtx.GetRequestCount();
@@ -143,8 +143,7 @@
         }
         strHTML += "<b>" + tr("Credit") + ":</b> ";
         if (wtx.IsInMainChain())
-            strHTML += BitcoinUnits::formatHtmlWithUnit(
-                           unit, nUnmatured.GetSatoshis()) +
+            strHTML += BitcoinUnits::formatHtmlWithUnit(unit, nUnmatured) +
                        " (" + tr("matures in %n more block(s)", "",
                                  wtx.GetBlocksToMaturity()) +
                        ")";
@@ -206,15 +205,15 @@
                     }
                 }
 
-                strHTML += "<b>" + tr("Debit") + ":</b> " +
-                           BitcoinUnits::formatHtmlWithUnit(
-                               unit, -txout.nValue.GetSatoshis()) +
-                           "<br>";
+                strHTML +=
+                    "<b>" + tr("Debit") + ":</b> " +
+                    BitcoinUnits::formatHtmlWithUnit(unit, -1 * txout.nValue) +
+                    "<br>";
                 if (toSelf)
-                    strHTML += "<b>" + tr("Credit") + ":</b> " +
-                               BitcoinUnits::formatHtmlWithUnit(
-                                   unit, txout.nValue.GetSatoshis()) +
-                               "<br>";
+                    strHTML +=
+                        "<b>" + tr("Credit") + ":</b> " +
+                        BitcoinUnits::formatHtmlWithUnit(unit, txout.nValue) +
+                        "<br>";
             }
 
             if (fAllToMe) {
@@ -222,20 +221,17 @@
                 Amount nChange = wtx.GetChange();
                 Amount nValue = nCredit - nChange;
                 strHTML += "<b>" + tr("Total debit") + ":</b> " +
-                           BitcoinUnits::formatHtmlWithUnit(
-                               unit, -nValue.GetSatoshis()) +
+                           BitcoinUnits::formatHtmlWithUnit(unit, -1 * nValue) +
                            "<br>";
                 strHTML += "<b>" + tr("Total credit") + ":</b> " +
-                           BitcoinUnits::formatHtmlWithUnit(
-                               unit, nValue.GetSatoshis()) +
+                           BitcoinUnits::formatHtmlWithUnit(unit, nValue) +
                            "<br>";
             }
 
             Amount nTxFee = nDebit - wtx.tx->GetValueOut();
             if (nTxFee > Amount(0))
                 strHTML += "<b>" + tr("Transaction fee") + ":</b> " +
-                           BitcoinUnits::formatHtmlWithUnit(
-                               unit, -nTxFee.GetSatoshis()) +
+                           BitcoinUnits::formatHtmlWithUnit(unit, -1 * nTxFee) +
                            "<br>";
         } else {
             //
@@ -246,16 +242,14 @@
                     strHTML +=
                         "<b>" + tr("Debit") + ":</b> " +
                         BitcoinUnits::formatHtmlWithUnit(
-                            unit,
-                            -wallet->GetDebit(txin, ISMINE_ALL).GetSatoshis()) +
+                            unit, -1 * wallet->GetDebit(txin, ISMINE_ALL)) +
                         "<br>";
             }
             for (const CTxOut &txout : wtx.tx->vout) {
                 if (wallet->IsMine(txout))
                     strHTML += "<b>" + tr("Credit") + ":</b> " +
                                BitcoinUnits::formatHtmlWithUnit(
-                                   unit, wallet->GetCredit(txout, ISMINE_ALL)
-                                             .GetSatoshis()) +
+                                   unit, wallet->GetCredit(txout, ISMINE_ALL)) +
                                "<br>";
             }
         }
@@ -324,21 +318,17 @@
         strHTML += "<hr><br>" + tr("Debug information") + "<br><br>";
         for (const CTxIn &txin : wtx.tx->vin) {
             if (wallet->IsMine(txin))
-                strHTML +=
-                    "<b>" + tr("Debit") + ":</b> " +
-                    BitcoinUnits::formatHtmlWithUnit(
-                        unit,
-                        -wallet->GetDebit(txin, ISMINE_ALL).GetSatoshis()) +
-                    "<br>";
+                strHTML += "<b>" + tr("Debit") + ":</b> " +
+                           BitcoinUnits::formatHtmlWithUnit(
+                               unit, -1 * wallet->GetDebit(txin, ISMINE_ALL)) +
+                           "<br>";
         }
         for (const CTxOut &txout : wtx.tx->vout) {
             if (wallet->IsMine(txout))
-                strHTML +=
-                    "<b>" + tr("Credit") + ":</b> " +
-                    BitcoinUnits::formatHtmlWithUnit(
-                        unit,
-                        wallet->GetCredit(txout, ISMINE_ALL).GetSatoshis()) +
-                    "<br>";
+                strHTML += "<b>" + tr("Credit") + ":</b> " +
+                           BitcoinUnits::formatHtmlWithUnit(
+                               unit, wallet->GetCredit(txout, ISMINE_ALL)) +
+                           "<br>";
         }
 
         strHTML += "<br><b>" + tr("Transaction") + ":</b><br>";
@@ -366,8 +356,7 @@
                         QString::fromStdString(EncodeDestination(address));
                 }
                 strHTML = strHTML + " " + tr("Amount") + "=" +
-                          BitcoinUnits::formatHtmlWithUnit(
-                              unit, vout.nValue.GetSatoshis());
+                          BitcoinUnits::formatHtmlWithUnit(unit, vout.nValue);
                 strHTML =
                     strHTML + " IsMine=" +
                     (wallet->IsMine(vout) & ISMINE_SPENDABLE ? tr("true")
diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h
--- a/src/qt/transactionfilterproxy.h
+++ b/src/qt/transactionfilterproxy.h
@@ -38,7 +38,7 @@
       @note Type filter takes a bit field created with TYPE() or ALL_TYPES
      */
     void setTypeFilter(quint32 modes);
-    void setMinAmount(const CAmount &minimum);
+    void setMinAmount(const Amount minimum);
     void setWatchOnlyFilter(WatchOnlyFilter filter);
 
     /** Set maximum number of rows returned, -1 if unlimited. */
@@ -59,7 +59,7 @@
     QString addrPrefix;
     quint32 typeFilter;
     WatchOnlyFilter watchOnlyFilter;
-    CAmount minAmount;
+    Amount minAmount;
     int limitRows;
     bool showInactive;
 };
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
--- a/src/qt/transactionfilterproxy.cpp
+++ b/src/qt/transactionfilterproxy.cpp
@@ -69,7 +69,7 @@
     invalidateFilter();
 }
 
-void TransactionFilterProxy::setMinAmount(const CAmount &minimum) {
+void TransactionFilterProxy::setMinAmount(const Amount minimum) {
     this->minAmount = minimum;
     invalidateFilter();
 }
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -107,8 +107,8 @@
           credit(0), idx(0) {}
 
     TransactionRecord(uint256 _hash, qint64 _time, Type _type,
-                      const std::string &_address, const CAmount &_debit,
-                      const CAmount &_credit)
+                      const std::string &_address, const Amount _debit,
+                      const Amount _credit)
         : hash(_hash), time(_time), type(_type), address(_address),
           debit(_debit), credit(_credit), idx(0) {}
 
@@ -124,8 +124,8 @@
     qint64 time;
     Type type;
     std::string address;
-    CAmount debit;
-    CAmount credit;
+    Amount debit;
+    Amount credit;
     /**@}*/
 
     /** Subtransaction index, for sort key */
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -36,7 +36,7 @@
     int64_t nTime = wtx.GetTxTime();
     Amount nCredit = wtx.GetCredit(ISMINE_ALL);
     Amount nDebit = wtx.GetDebit(ISMINE_ALL);
-    CAmount nNet = (nCredit - nDebit).GetSatoshis();
+    Amount nNet = nCredit - nDebit;
     uint256 hash = wtx.GetId();
     std::map<std::string, std::string> mapValue = wtx.mapValue;
 
@@ -51,7 +51,7 @@
                 TransactionRecord sub(hash, nTime);
                 CTxDestination address;
                 sub.idx = i; // vout index
-                sub.credit = txout.nValue.GetSatoshis();
+                sub.credit = txout.nValue;
                 sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY;
                 if (ExtractDestination(txout.scriptPubKey, address) &&
                     IsMine(*wallet, address)) {
@@ -92,10 +92,9 @@
             // Payment to self
             Amount nChange = wtx.GetChange();
 
-            parts.append(TransactionRecord(hash, nTime,
-                                           TransactionRecord::SendToSelf, "",
-                                           -(nDebit - nChange).GetSatoshis(),
-                                           (nCredit - nChange).GetSatoshis()));
+            parts.append(TransactionRecord(
+                hash, nTime, TransactionRecord::SendToSelf, "",
+                -1 * (nDebit - nChange), (nCredit - nChange)));
             // maybe pass to TransactionRecord as constructor argument
             parts.last().involvesWatchAddress = involvesWatchAddress;
         } else if (fAllFromMe) {
@@ -133,7 +132,7 @@
                     nValue += nTxFee;
                     nTxFee = Amount(0);
                 }
-                sub.debit = -nValue.GetSatoshis();
+                sub.debit = -1 * nValue;
 
                 parts.append(sub);
             }
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -564,7 +564,7 @@
                 case ToAddress:
                     return formatTxToAddress(rec, true);
                 case Amount:
-                    return qint64(rec->credit + rec->debit);
+                    return qint64((rec->credit + rec->debit).GetSatoshis());
             }
             break;
         case Qt::ToolTipRole:
@@ -605,7 +605,7 @@
             return walletModel->getAddressTableModel()->labelForAddress(
                 QString::fromStdString(rec->address));
         case AmountRole:
-            return qint64(rec->credit + rec->debit);
+            return qint64((rec->credit + rec->debit).GetSatoshis());
         case TxIDRole:
             return rec->getTxID();
         case TxHashRole:
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -336,7 +336,7 @@
     Amount amount_parsed(0);
     if (BitcoinUnits::parse(model->getOptionsModel()->getDisplayUnit(), amount,
                             &amount_parsed)) {
-        transactionProxyModel->setMinAmount(amount_parsed.GetSatoshis());
+        transactionProxyModel->setMinAmount(amount_parsed);
     } else {
         transactionProxyModel->setMinAmount(0);
     }
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
--- a/src/qt/walletview.h
+++ b/src/qt/walletview.h
@@ -131,9 +131,9 @@
     /** HD-Enabled status of wallet changed (only possible during startup) */
     void hdEnabledStatusChanged(int hdEnabled);
     /** Notify that a new transaction appeared */
-    void incomingTransaction(const QString &date, int unit,
-                             const CAmount &amount, const QString &type,
-                             const QString &address, const QString &label);
+    void incomingTransaction(const QString &date, int unit, const Amount amount,
+                             const QString &type, const QString &address,
+                             const QString &label);
     /** Notify that the out of sync warning icon has been pressed */
     void outOfSyncWarningClicked();
 };
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -109,9 +109,9 @@
                 SLOT(setEncryptionStatus(int)));
 
         // Pass through transaction notifications
-        connect(this, SIGNAL(incomingTransaction(QString, int, CAmount, QString,
+        connect(this, SIGNAL(incomingTransaction(QString, int, Amount, QString,
                                                  QString, QString)),
-                gui, SLOT(incomingTransaction(QString, int, CAmount, QString,
+                gui, SLOT(incomingTransaction(QString, int, Amount, QString,
                                               QString, QString)));
 
         // Connect HD enabled state signal