From 9dc8a7bc6e5269660b00ed574c331ed0937ca9a2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 29 Aug 2025 20:27:09 +0000
Subject: [PATCH 01/31] refactor: move Dash-specific font management to
 `qt/guiutil_font.{cpp,h}`

Review with `git log -p -n1 --color-moved=dimmed_zebra`.
---
 src/Makefile.qt.include            |   2 +
 src/qt/addressbookpage.cpp         |   1 +
 src/qt/addresstablemodel.cpp       |   1 +
 src/qt/appearancewidget.h          |   1 +
 src/qt/askpassphrasedialog.cpp     |   1 +
 src/qt/bitcoin.cpp                 |   1 +
 src/qt/bitcoingui.cpp              |   1 +
 src/qt/coincontroldialog.cpp       |   1 +
 src/qt/governancelist.cpp          |   1 +
 src/qt/guiutil.cpp                 | 592 ---------------------------
 src/qt/guiutil.h                   |  84 ----
 src/qt/guiutil_font.cpp            | 616 +++++++++++++++++++++++++++++
 src/qt/guiutil_font.h              | 101 +++++
 src/qt/masternodelist.cpp          |   1 +
 src/qt/modaloverlay.cpp            |   1 +
 src/qt/openuridialog.cpp           |   1 +
 src/qt/optionsmodel.cpp            |   1 +
 src/qt/overviewpage.cpp            |   1 +
 src/qt/proposalwizard.cpp          |   1 +
 src/qt/qrdialog.cpp                |   1 +
 src/qt/qrimagewidget.cpp           |   1 +
 src/qt/receivecoinsdialog.cpp      |   1 +
 src/qt/receiverequestdialog.cpp    |   1 +
 src/qt/rpcconsole.cpp              |   1 +
 src/qt/sendcoinsdialog.cpp         |   1 +
 src/qt/sendcoinsentry.cpp          |   1 +
 src/qt/signverifymessagedialog.cpp |   1 +
 src/qt/splashscreen.cpp            |   1 +
 src/qt/test/apptests.cpp           |   1 +
 src/qt/trafficgraphwidget.cpp      |   1 +
 src/qt/transactiondescdialog.cpp   |   1 +
 src/qt/utilitydialog.cpp           |   1 +
 src/qt/walletview.cpp              |   1 +
 33 files changed, 747 insertions(+), 676 deletions(-)
 create mode 100644 src/qt/guiutil_font.cpp
 create mode 100644 src/qt/guiutil_font.h

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index f50ac4602bfb4..4372effd3e853 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -137,6 +137,7 @@ BITCOIN_QT_H = \
   qt/proposalwizard.h \
   qt/guiconstants.h \
   qt/guiutil.h \
+  qt/guiutil_font.h \
   qt/initexecutor.h \
   qt/intro.h \
   qt/macdockiconhandler.h \
@@ -227,6 +228,7 @@ BITCOIN_QT_BASE_CPP = \
   qt/clientmodel.cpp \
   qt/csvmodelwriter.cpp \
   qt/guiutil.cpp \
+  qt/guiutil_font.cpp \
   qt/initexecutor.cpp \
   qt/intro.cpp \
   qt/modaloverlay.cpp \
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index 441531bb9207a..3b1f1df4ee763 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -14,6 +14,7 @@
 #include <qt/csvmodelwriter.h>
 #include <qt/editaddressdialog.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/qrdialog.h>
 
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index d40a3deef6ebc..e1cc9e6a01559 100644
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -6,6 +6,7 @@
 #include <qt/addresstablemodel.h>
 
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/walletmodel.h>
 
 #include <key_io.h>
diff --git a/src/qt/appearancewidget.h b/src/qt/appearancewidget.h
index a1cd06e49b6b6..c3e62605d085e 100644
--- a/src/qt/appearancewidget.h
+++ b/src/qt/appearancewidget.h
@@ -8,6 +8,7 @@
 #include <QWidget>
 
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 
 namespace Ui {
 class AppearanceWidget;
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
index 3b9fd117ffe61..3e7fd9087d247 100644
--- a/src/qt/askpassphrasedialog.cpp
+++ b/src/qt/askpassphrasedialog.cpp
@@ -12,6 +12,7 @@
 
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/walletmodel.h>
 
 #include <support/allocators/secure.h>
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index e78adbb798843..fb265d84ad54d 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -23,6 +23,7 @@
 #include <qt/clientmodel.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/initexecutor.h>
 #include <qt/intro.h>
 #include <qt/networkstyle.h>
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 08d0c6a16ca5c..f68abf1fcb1e4 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -10,6 +10,7 @@
 #include <qt/createwalletdialog.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/modaloverlay.h>
 #include <qt/networkstyle.h>
 #include <qt/notificator.h>
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 593caf5ba252b..570ca199387d3 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -13,6 +13,7 @@
 #include <qt/addresstablemodel.h>
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/walletmodel.h>
 
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index c68f6a7076d93..6bb9e7d72b215 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -17,6 +17,7 @@
 #include <key_io.h>
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/walletmodel.h>
 #include <script/standard.h>
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 1fcc3ca040d07..621a313a39509 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -112,35 +112,6 @@ static const std::map<QString, QString> mapThemeToStyle{
     {"Traditional", "traditional.css"},
 };
 
-/** loadFonts stores the SystemDefault font in osDefaultFont to be able to reference it later again */
-static std::unique_ptr<QFont> osDefaultFont;
-/** Font related default values. */
-static const FontFamily defaultFontFamily = FontFamily::SystemDefault;
-static const int defaultFontSize = 12;
-static const double fontScaleSteps = 0.01;
-#ifdef Q_OS_MAC
-static const QFont::Weight defaultFontWeightNormal = QFont::ExtraLight;
-static const QFont::Weight defaultFontWeightBold = QFont::Medium;
-static const int defaultFontScale = 0;
-#else
-static const QFont::Weight defaultFontWeightNormal = QFont::Light;
-static const QFont::Weight defaultFontWeightBold = QFont::Medium;
-static const int defaultFontScale = 0;
-#endif
-
-/** Font related variables. */
-// Application font family. May be overwritten by -font-family.
-static FontFamily fontFamily = defaultFontFamily;
-// Application font scale value. May be overwritten by -font-scale.
-static int fontScale = defaultFontScale;
-// Contains the weight settings separated for all available fonts
-static std::map<FontFamily, std::pair<QFont::Weight, QFont::Weight>> mapDefaultWeights;
-static std::map<FontFamily, std::pair<QFont::Weight, QFont::Weight>> mapWeights;
-// Contains all widgets and its font attributes (weight, italic, size) with font changes due to GUIUtil::setFont
-static std::map<QPointer<QWidget>, std::tuple<FontWeight, bool, int>> mapFontUpdates;
-// Contains a list of supported font weights for all members of GUIUtil::FontFamily
-static std::map<FontFamily, std::vector<QFont::Weight>> mapSupportedWeights;
-
 #ifdef Q_OS_MAC
 // Contains all widgets where the macOS focus rect has been disabled.
 static std::set<QWidget*> setRectsDisabled;
@@ -1013,569 +984,6 @@ void loadStyleSheet(bool fForceUpdate)
     }
 }
 
-FontFamily fontFamilyFromString(const QString& strFamily)
-{
-    if (strFamily == "SystemDefault") {
-        return FontFamily::SystemDefault;
-    }
-    if (strFamily == "Montserrat") {
-        return FontFamily::Montserrat;
-    }
-    throw std::invalid_argument(strprintf("Invalid font-family: %s", strFamily.toStdString()));
-}
-
-QString fontFamilyToString(FontFamily family)
-{
-    switch (family) {
-    case FontFamily::SystemDefault:
-        return "SystemDefault";
-    case FontFamily::Montserrat:
-        return "Montserrat";
-    default:
-        assert(false);
-    }
-}
-
-void setFontFamily(FontFamily family)
-{
-    fontFamily = family;
-    setApplicationFont();
-    updateFonts();
-}
-
-FontFamily getFontFamilyDefault()
-{
-    return defaultFontFamily;
-}
-
-FontFamily getFontFamily()
-{
-    return fontFamily;
-}
-
-bool weightFromArg(int nArg, QFont::Weight& weight)
-{
-    const std::map<int, QFont::Weight> mapWeight{
-        {0, QFont::Thin},
-        {1, QFont::ExtraLight},
-        {2, QFont::Light},
-        {3, QFont::Normal},
-        {4, QFont::Medium},
-        {5, QFont::DemiBold},
-        {6, QFont::Bold},
-        {7, QFont::ExtraBold},
-        {8, QFont::Black}
-    };
-    auto it = mapWeight.find(nArg);
-    if (it == mapWeight.end()) {
-        return false;
-    }
-    weight = it->second;
-    return true;
-}
-
-int weightToArg(const QFont::Weight weight)
-{
-    const std::map<QFont::Weight, int> mapWeight{
-        {QFont::Thin, 0},
-        {QFont::ExtraLight, 1},
-        {QFont::Light, 2},
-        {QFont::Normal, 3},
-        {QFont::Medium, 4},
-        {QFont::DemiBold, 5},
-        {QFont::Bold, 6},
-        {QFont::ExtraBold, 7},
-        {QFont::Black, 8}
-    };
-    assert(mapWeight.count(weight));
-    return mapWeight.find(weight)->second;
-}
-
-QFont::Weight getFontWeightNormalDefault()
-{
-    return defaultFontWeightNormal;
-}
-
-QFont::Weight toQFontWeight(FontWeight weight)
-{
-    return weight == FontWeight::Bold ? getFontWeightBold() : getFontWeightNormal();
-}
-
-QFont::Weight getFontWeightNormal()
-{
-    if (!mapWeights.count(fontFamily)) {
-        return defaultFontWeightNormal;
-    }
-    return mapWeights[fontFamily].first;
-}
-
-void setFontWeightNormal(QFont::Weight weight)
-{
-    if (!mapWeights.count(fontFamily)) {
-        throw std::runtime_error(strprintf("%s: Font family not loaded: %s", __func__, fontFamilyToString(fontFamily).toStdString()));
-    }
-    mapWeights[fontFamily].first = weight;
-    updateFonts();
-}
-
-QFont::Weight getFontWeightBoldDefault()
-{
-    return defaultFontWeightBold;
-}
-
-QFont::Weight getFontWeightBold()
-{
-    if (!mapWeights.count(fontFamily)) {
-        return defaultFontWeightBold;
-    }
-    return mapWeights[fontFamily].second;
-}
-
-void setFontWeightBold(QFont::Weight weight)
-{
-    if (!mapWeights.count(fontFamily)) {
-        throw std::runtime_error(strprintf("%s: Font family not loaded: %s", __func__, fontFamilyToString(fontFamily).toStdString()));
-    }
-    mapWeights[fontFamily].second = weight;
-    updateFonts();
-}
-
-int getFontScaleDefault()
-{
-    return defaultFontScale;
-}
-
-int getFontScale()
-{
-    return fontScale;
-}
-
-void setFontScale(int nScale)
-{
-    fontScale = nScale;
-    updateFonts();
-}
-
-double getScaledFontSize(int nSize)
-{
-    return std::round(nSize * (1 + (fontScale * fontScaleSteps)) * 4) / 4.0;
-}
-
-bool loadFonts()
-{
-    // Before any font changes store the applications default font to use it as SystemDefault.
-    osDefaultFont = std::make_unique<QFont>(QApplication::font());
-
-    QString family = fontFamilyToString(FontFamily::Montserrat);
-    QString italic = "Italic";
-
-    std::map<QString, bool> mapStyles{
-        {"Thin", true},
-        {"ExtraLight", true},
-        {"Light", true},
-        {"Italic", false},
-        {"Regular", false},
-        {"Medium", true},
-        {"SemiBold", true},
-        {"Bold", true},
-        {"ExtraBold", true},
-        {"Black", true},
-    };
-
-    QFontDatabase database;
-    std::vector<int> vecFontIds;
-
-    for (const auto& it : mapStyles) {
-        QString font = ":fonts/" + family + "-" + it.first;
-        vecFontIds.push_back(QFontDatabase::addApplicationFont(font));
-        qDebug() << __func__ << ": " << font << " loaded with id " << vecFontIds.back();
-        if (it.second) {
-            vecFontIds.push_back(QFontDatabase::addApplicationFont(font + italic));
-            qDebug() << __func__ << ": " << font + italic << " loaded with id " << vecFontIds.back();
-        }
-    }
-
-    // Fail if an added id is -1 which means QFontDatabase::addApplicationFont failed.
-    if (std::find(vecFontIds.begin(), vecFontIds.end(), -1) != vecFontIds.end()) {
-        osDefaultFont = nullptr;
-        return false;
-    }
-
-    // Print debug logs for added fonts fetched by the added ids
-    for (const auto& i : vecFontIds) {
-        auto families = QFontDatabase::applicationFontFamilies(i);
-        for (const QString& f : families) {
-            qDebug() << __func__ << ": - Font id " << i << " is family: " << f;
-            const QStringList fontStyles = database.styles(f);
-            for (const QString& style : fontStyles) {
-                qDebug() << __func__ << ": Style for family " << f << " with id: " << i << ": " << style;
-            }
-        }
-    }
-    // Print debug logs for added fonts fetched by the family name
-    const QStringList fontFamilies = database.families();
-    for (const QString& f : fontFamilies) {
-        if (f.contains(family)) {
-            const QStringList fontStyles = database.styles(f);
-            for (const QString& style : fontStyles) {
-                qDebug() << __func__ << ": Family: " << f << ", Style: " << style;
-            }
-        }
-    }
-
-    setApplicationFont();
-
-    // Initialize supported font weights for all available fonts
-    // Generate a vector with supported font weights by comparing the width of a certain test text for all font weights
-    auto supportedWeights = [](FontFamily family) -> std::vector<QFont::Weight> {
-        auto getTestWidth = [&](QFont::Weight weight) -> int {
-            QFont font = getFont(family, weight, false, defaultFontSize);
-            return TextWidth(QFontMetrics(font), ("Check the width of this text to see if the weight change has an impact!"));
-        };
-        std::vector<QFont::Weight> vecWeights{QFont::Thin, QFont::ExtraLight, QFont::Light,
-                                              QFont::Normal, QFont::Medium, QFont::DemiBold,
-                                              QFont::Bold, QFont::ExtraBold, QFont::Black};
-        std::vector<QFont::Weight> vecSupported;
-        QFont::Weight prevWeight = vecWeights.front();
-        for (auto weight = vecWeights.begin() + 1; weight != vecWeights.end(); ++weight) {
-            if (getTestWidth(prevWeight) != getTestWidth(*weight)) {
-                if (vecSupported.empty()) {
-                    vecSupported.push_back(prevWeight);
-                }
-                vecSupported.push_back(*weight);
-            }
-            prevWeight = *weight;
-        }
-        if (vecSupported.empty()) {
-            vecSupported.push_back(QFont::Normal);
-        }
-        return vecSupported;
-    };
-
-    mapSupportedWeights.insert(std::make_pair(FontFamily::SystemDefault, supportedWeights(FontFamily::SystemDefault)));
-    mapSupportedWeights.insert(std::make_pair(FontFamily::Montserrat, supportedWeights(FontFamily::Montserrat)));
-
-    auto getBestMatch = [&](FontFamily fontFamily, QFont::Weight targetWeight) {
-        auto& vecSupported = mapSupportedWeights[fontFamily];
-        auto it = vecSupported.begin();
-        QFont::Weight bestWeight = *it;
-        int nBestDiff = abs(*it - targetWeight);
-        while (++it != vecSupported.end()) {
-            int nDiff = abs(*it - targetWeight);
-            if (nDiff < nBestDiff) {
-                bestWeight = *it;
-                nBestDiff = nDiff;
-            }
-        }
-        return bestWeight;
-    };
-
-    auto addBestDefaults = [&](FontFamily family) -> auto {
-        QFont::Weight normalWeight = getBestMatch(family, defaultFontWeightNormal);
-        QFont::Weight boldWeight = getBestMatch(family, defaultFontWeightBold);
-        if (normalWeight == boldWeight) {
-            // If the results are the same use the next possible weight for bold font
-            auto& vecSupported = mapSupportedWeights[fontFamily];
-            auto it = std::find(vecSupported.begin(), vecSupported.end(),normalWeight);
-            if (++it != vecSupported.end()) {
-                boldWeight = *it;
-            }
-        }
-        mapDefaultWeights.emplace(family, std::make_pair(normalWeight, boldWeight));
-    };
-
-    addBestDefaults(FontFamily::SystemDefault);
-    addBestDefaults(FontFamily::Montserrat);
-
-    // Load supported defaults. May become overwritten later.
-    mapWeights = mapDefaultWeights;
-
-    return true;
-}
-
-bool fontsLoaded()
-{
-    return osDefaultFont != nullptr;
-}
-
-void setApplicationFont()
-{
-    if (!fontsLoaded()) {
-        return;
-    }
-
-    std::unique_ptr<QFont> font;
-
-    if (fontFamily == FontFamily::Montserrat) {
-        QString family = fontFamilyToString(FontFamily::Montserrat);
-#ifdef Q_OS_MAC
-        if (getFontWeightNormal() != getFontWeightNormalDefault()) {
-            font = std::make_unique<QFont>(getFontNormal());
-        } else {
-            font = std::make_unique<QFont>(family);
-            font->setWeight(getFontWeightNormalDefault());
-        }
-#else
-        font = std::make_unique<QFont>(family);
-        font->setWeight(getFontWeightNormal());
-#endif
-    } else {
-        font = std::make_unique<QFont>(*osDefaultFont);
-    }
-
-    font->setPointSizeF(defaultFontSize);
-    qApp->setFont(*font);
-
-    qDebug() << __func__ << ": " << qApp->font().toString() <<
-                " family: " << qApp->font().family() <<
-                ", style: " << qApp->font().styleName() <<
-                " match: " << qApp->font().exactMatch();
-}
-
-void setFont(const std::vector<QWidget*>& vecWidgets, FontWeight weight, int nPointSize, bool fItalic)
-{
-    for (auto it : vecWidgets) {
-        auto fontAttributes = std::make_tuple(weight, fItalic, nPointSize);
-        auto itFontUpdate = mapFontUpdates.emplace(std::make_pair(it, fontAttributes));
-        if (!itFontUpdate.second) {
-            itFontUpdate.first->second = fontAttributes;
-        }
-    }
-}
-
-void updateFonts()
-{
-    // Fonts need to be loaded by GUIIUtil::loadFonts(), if not just return.
-    if (!osDefaultFont) {
-        return;
-    }
-
-    static std::map<QPointer<QWidget>, int> mapWidgetDefaultFontSizes;
-
-    // QPointer becomes nullptr for objects that were deleted.
-    // Remove them from mapDefaultFontSize and mapFontUpdates
-    // before proceeding any further.
-    size_t nRemovedDefaultFonts{0};
-    auto itd = mapWidgetDefaultFontSizes.begin();
-    while (itd != mapWidgetDefaultFontSizes.end()) {
-        if (itd->first.isNull()) {
-            itd = mapWidgetDefaultFontSizes.erase(itd);
-            ++nRemovedDefaultFonts;
-        } else {
-            ++itd;
-        }
-    }
-
-    size_t nRemovedFontUpdates{0};
-    auto itn = mapFontUpdates.begin();
-    while (itn != mapFontUpdates.end()) {
-        if (itn->first.isNull()) {
-            itn = mapFontUpdates.erase(itn);
-            ++nRemovedFontUpdates;
-        } else {
-            ++itn;
-        }
-    }
-
-    size_t nUpdatable{0}, nUpdated{0};
-    std::map<QWidget*, QFont> mapWidgetFonts;
-    // Loop through all widgets
-    for (QWidget* w : qApp->allWidgets()) {
-        std::vector<QString> vecIgnoreClasses{
-            "QWidget", "QDialog", "QFrame", "QStackedWidget", "QDesktopWidget", "QDesktopScreenWidget",
-            "QTipLabel", "QMessageBox", "QMenu", "QComboBoxPrivateScroller", "QComboBoxPrivateContainer",
-            "QScrollBar", "QListView", "BitcoinGUI", "WalletView", "WalletFrame", "QVBoxLayout", "QGroupBox"
-        };
-        std::vector<QString> vecIgnoreObjects{
-            "messagesWidget"
-        };
-        if (std::find(vecIgnoreClasses.begin(), vecIgnoreClasses.end(), w->metaObject()->className()) != vecIgnoreClasses.end() ||
-            std::find(vecIgnoreObjects.begin(), vecIgnoreObjects.end(), w->objectName()) != vecIgnoreObjects.end()) {
-            continue;
-        }
-        ++nUpdatable;
-
-        QFont font = w->font();
-        assert(font.pointSize() > 0);
-        font.setFamily(qApp->font().family());
-        font.setWeight(getFontWeightNormal());
-        font.setStyleName(qApp->font().styleName());
-        font.setStyle(qApp->font().style());
-
-        // Insert/Get the default font size of the widget
-        auto itDefault = mapWidgetDefaultFontSizes.emplace(w, font.pointSize());
-
-        auto it = mapFontUpdates.find(w);
-        if (it != mapFontUpdates.end()) {
-            int nSize = std::get<2>(it->second);
-            if (nSize == -1) {
-                nSize = itDefault.first->second;
-            }
-            font = getFont(std::get<0>(it->second), std::get<1>(it->second), nSize);
-        } else {
-            font.setPointSizeF(getScaledFontSize(itDefault.first->second));
-        }
-
-        if (w->font() != font) {
-            auto itWidgetFont = mapWidgetFonts.emplace(w, font);
-            assert(itWidgetFont.second);
-            ++nUpdated;
-        }
-    }
-    qDebug().nospace() << __func__ << " - widget counts: updated/updatable/total(" << nUpdated << "/" << nUpdatable << "/" << qApp->allWidgets().size() << ")"
-             << ", removed items: mapWidgetDefaultFontSizes/mapFontUpdates(" << nRemovedDefaultFonts << "/" << nRemovedFontUpdates << ")";
-
-    // Perform the required font updates
-    // NOTE: This is done as separate step to avoid scaling issues due to font inheritance
-    //       hence all fonts are calculated and stored in mapWidgetFonts above.
-    for (auto it : mapWidgetFonts) {
-        it.first->setFont(it.second);
-    }
-
-    // Scale the global font size for the classes in the map below
-    static std::map<std::string, int> mapClassFontUpdates{
-        {"QTipLabel", -1}, {"QMenu", -1}, {"QMessageBox", -1}
-    };
-    for (auto& it : mapClassFontUpdates) {
-        QFont fontClass = qApp->font(it.first.c_str());
-        if (it.second == -1) {
-            it.second = fontClass.pointSize();
-        }
-        double dSize = getScaledFontSize(it.second);
-        if (fontClass.pointSizeF() != dSize) {
-            fontClass.setPointSizeF(dSize);
-            qApp->setFont(fontClass, it.first.c_str());
-        }
-    }
-}
-
-QFont getFont(FontFamily family, QFont::Weight qWeight, bool fItalic, int nPointSize)
-{
-    QFont font;
-    if (!fontsLoaded()) {
-        return font;
-    }
-
-    if (family == FontFamily::Montserrat) {
-        static std::map<QFont::Weight, QString> mapMontserratMapping{
-            {QFont::Thin, "Thin"},
-            {QFont::ExtraLight, "ExtraLight"},
-            {QFont::Light, "Light"},
-            {QFont::Medium, "Medium"},
-            {QFont::DemiBold, "SemiBold"},
-            {QFont::ExtraBold, "ExtraBold"},
-            {QFont::Black, "Black"},
-#ifdef Q_OS_MAC
-            {QFont::Normal, "Regular"},
-            {QFont::Bold, "Bold"},
-#else
-            {QFont::Normal, ""},
-            {QFont::Bold, ""},
-#endif
-        };
-
-        assert(mapMontserratMapping.count(qWeight));
-
-#ifdef Q_OS_MAC
-
-        QString styleName = mapMontserratMapping[qWeight];
-
-        if (fItalic) {
-            if (styleName == "Regular") {
-                styleName = "Italic";
-            } else {
-                styleName += " Italic";
-            }
-        }
-
-        font.setFamily(fontFamilyToString(FontFamily::Montserrat));
-        font.setStyleName(styleName);
-#else
-        font.setFamily(fontFamilyToString(FontFamily::Montserrat) + " " + mapMontserratMapping[qWeight]);
-        font.setWeight(qWeight);
-        font.setStyle(fItalic ? QFont::StyleItalic : QFont::StyleNormal);
-#endif
-    } else {
-        font.setFamily(osDefaultFont->family());
-        font.setWeight(qWeight);
-        font.setStyle(fItalic ? QFont::StyleItalic : QFont::StyleNormal);
-    }
-
-    if (nPointSize != -1) {
-        font.setPointSizeF(getScaledFontSize(nPointSize));
-    }
-
-    if (gArgs.GetBoolArg("-debug-ui", false)) {
-        qDebug() << __func__ << ": font size: " << font.pointSizeF() << " family: " << font.family() << ", style: " << font.styleName() << ", weight:" << font.weight() << " match: " << font.exactMatch();
-    }
-
-    return font;
-}
-
-QFont getFont(QFont::Weight qWeight, bool fItalic, int nPointSize)
-{
-    return getFont(fontFamily, qWeight, fItalic, nPointSize);
-}
-QFont getFont(FontWeight weight, bool fItalic, int nPointSize)
-{
-    return getFont(toQFontWeight(weight), fItalic, nPointSize);
-}
-
-QFont getFontNormal()
-{
-    return getFont(FontWeight::Normal);
-}
-
-QFont getFontBold()
-{
-    return getFont(FontWeight::Bold);
-}
-
-QFont::Weight getSupportedFontWeightNormalDefault()
-{
-    if (!mapDefaultWeights.count(fontFamily)) {
-        throw std::runtime_error(strprintf("%s: Font family not loaded: %s", __func__, fontFamilyToString(fontFamily).toStdString()));
-    }
-    return mapDefaultWeights[fontFamily].first;
-}
-
-QFont::Weight getSupportedFontWeightBoldDefault()
-{
-    if (!mapDefaultWeights.count(fontFamily)) {
-        throw std::runtime_error(strprintf("%s: Font family not loaded: %s", __func__, fontFamilyToString(fontFamily).toStdString()));
-    }
-    return mapDefaultWeights[fontFamily].second;
-}
-
-std::vector<QFont::Weight> getSupportedWeights()
-{
-    assert(mapSupportedWeights.count(fontFamily));
-    return mapSupportedWeights[fontFamily];
-}
-
-QFont::Weight supportedWeightFromIndex(int nIndex)
-{
-    auto vecWeights = getSupportedWeights();
-    assert(vecWeights.size() > uint64_t(nIndex));
-    return vecWeights[nIndex];
-}
-
-int supportedWeightToIndex(QFont::Weight weight)
-{
-    auto vecWeights = getSupportedWeights();
-    for (uint64_t index = 0; index < vecWeights.size(); ++index) {
-        if (weight == vecWeights[index]) {
-            return index;
-        }
-    }
-    return -1;
-}
-
-bool isSupportedWeight(const QFont::Weight weight)
-{
-    return supportedWeightToIndex(weight) != -1;
-}
-
 QString getActiveTheme()
 {
     QSettings settings;
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 999f51721b921..ae61a63a20ed9 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -311,90 +311,6 @@ namespace GUIUtil
     related css files has been changed and -debug-ui mode is active. */
     void loadStyleSheet(bool fForceUpdate = false);
 
-    enum class FontFamily {
-        SystemDefault,
-        Montserrat,
-    };
-
-    FontFamily fontFamilyFromString(const QString& strFamily);
-    QString fontFamilyToString(FontFamily family);
-
-    /** set/get font family: GUIUtil::fontFamily */
-    FontFamily getFontFamilyDefault();
-    FontFamily getFontFamily();
-    void setFontFamily(FontFamily family);
-
-    enum class FontWeight {
-        Normal, // Font weight for normal text
-        Bold,   // Font weight for bold text
-    };
-
-    /** Convert weight value from args (0-8) to QFont::Weight */
-    bool weightFromArg(int nArg, QFont::Weight& weight);
-    /** Convert QFont::Weight to an arg value (0-8) */
-    int weightToArg(const QFont::Weight weight);
-    /** Convert GUIUtil::FontWeight to QFont::Weight */
-    QFont::Weight toQFontWeight(FontWeight weight);
-
-    /** set/get normal font weight: GUIUtil::fontWeightNormal */
-    QFont::Weight getFontWeightNormalDefault();
-    QFont::Weight getFontWeightNormal();
-    void setFontWeightNormal(QFont::Weight weight);
-
-    /** set/get bold font weight: GUIUtil::fontWeightBold */
-    QFont::Weight getFontWeightBoldDefault();
-    QFont::Weight getFontWeightBold();
-    void setFontWeightBold(QFont::Weight weight);
-
-    /** set/get font scale: GUIUtil::fontScale */
-    int getFontScaleDefault();
-    int getFontScale();
-    void setFontScale(int nScale);
-
-    /** get font size with GUIUtil::fontScale applied */
-    double getScaledFontSize(int nSize);
-
-    /** Load dash specific appliciation fonts */
-    bool loadFonts();
-    /** Check if the fonts have been loaded successfully */
-    bool fontsLoaded();
-
-    /** Set an application wide default font, depends on the selected theme */
-    void setApplicationFont();
-
-    /** Workaround to set correct font styles in all themes since there is a bug in macOS which leads to
-        issues loading variations of montserrat in css it also keeps track of the set fonts to update on
-        theme changes. */
-    void setFont(const std::vector<QWidget*>& vecWidgets, FontWeight weight, int nPointSize = -1, bool fItalic = false);
-
-    /** Update the font of all widgets where a custom font has been set with
-        GUIUtil::setFont */
-    void updateFonts();
-
-    /** Get a properly weighted QFont object with the selected font. */
-    QFont getFont(FontFamily family, QFont::Weight qWeight, bool fItalic = false, int nPointSize = -1);
-    QFont getFont(QFont::Weight qWeight, bool fItalic = false, int nPointSize = -1);
-    QFont getFont(FontWeight weight, bool fItalic = false, int nPointSize = -1);
-
-    /** Get the default normal QFont */
-    QFont getFontNormal();
-
-    /** Get the default bold QFont */
-    QFont getFontBold();
-
-    /** Return supported normal default for the current font family */
-    QFont::Weight getSupportedFontWeightNormalDefault();
-    /** Return supported bold default for the current font family */
-    QFont::Weight getSupportedFontWeightBoldDefault();
-    /** Return supported weights for the current font family */
-    std::vector<QFont::Weight> getSupportedWeights();
-    /** Convert an index to a weight in the supported weights vector */
-    QFont::Weight supportedWeightFromIndex(int nIndex);
-    /** Convert a weight to an index in the supported weights vector */
-    int supportedWeightToIndex(QFont::Weight weight);
-    /** Check if a weight is supported by the current font family */
-    bool isSupportedWeight(QFont::Weight weight);
-
     /** Return the name of the currently active theme.*/
     QString getActiveTheme();
 
diff --git a/src/qt/guiutil_font.cpp b/src/qt/guiutil_font.cpp
new file mode 100644
index 0000000000000..9185759a0c6b3
--- /dev/null
+++ b/src/qt/guiutil_font.cpp
@@ -0,0 +1,616 @@
+// Copyright (c) 2014-2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <qt/guiutil_font.h>
+
+#include <tinyformat.h>
+#include <util/system.h>
+
+#include <qt/guiutil.h>
+
+#include <QApplication>
+#include <QDebug>
+#include <QFontDatabase>
+#include <QFontMetrics>
+#include <QPointer>
+#include <QWidget>
+
+#include <cmath>
+#include <map>
+#include <memory>
+#include <utility>
+
+namespace GUIUtil {
+/** loadFonts stores the SystemDefault font in osDefaultFont to be able to reference it later again */
+static std::unique_ptr<QFont> osDefaultFont;
+/** Font related default values. */
+static const FontFamily defaultFontFamily = FontFamily::SystemDefault;
+static const int defaultFontSize = 12;
+static const double fontScaleSteps = 0.01;
+#ifdef Q_OS_MAC
+static const QFont::Weight defaultFontWeightNormal = QFont::ExtraLight;
+static const QFont::Weight defaultFontWeightBold = QFont::Medium;
+static const int defaultFontScale = 0;
+#else
+static const QFont::Weight defaultFontWeightNormal = QFont::Light;
+static const QFont::Weight defaultFontWeightBold = QFont::Medium;
+static const int defaultFontScale = 0;
+#endif
+
+/** Font related variables. */
+// Application font family. May be overwritten by -font-family.
+static FontFamily fontFamily = defaultFontFamily;
+// Application font scale value. May be overwritten by -font-scale.
+static int fontScale = defaultFontScale;
+// Contains the weight settings separated for all available fonts
+static std::map<FontFamily, std::pair<QFont::Weight, QFont::Weight>> mapDefaultWeights;
+static std::map<FontFamily, std::pair<QFont::Weight, QFont::Weight>> mapWeights;
+// Contains all widgets and its font attributes (weight, italic, size) with font changes due to GUIUtil::setFont
+static std::map<QPointer<QWidget>, std::tuple<FontWeight, bool, int>> mapFontUpdates;
+// Contains a list of supported font weights for all members of GUIUtil::FontFamily
+static std::map<FontFamily, std::vector<QFont::Weight>> mapSupportedWeights;
+
+FontFamily fontFamilyFromString(const QString& strFamily)
+{
+    if (strFamily == "SystemDefault") {
+        return FontFamily::SystemDefault;
+    }
+    if (strFamily == "Montserrat") {
+        return FontFamily::Montserrat;
+    }
+    throw std::invalid_argument(strprintf("Invalid font-family: %s", strFamily.toStdString()));
+}
+
+QString fontFamilyToString(FontFamily family)
+{
+    switch (family) {
+    case FontFamily::SystemDefault:
+        return "SystemDefault";
+    case FontFamily::Montserrat:
+        return "Montserrat";
+    default:
+        assert(false);
+    }
+}
+
+FontFamily getFontFamilyDefault()
+{
+    return defaultFontFamily;
+}
+
+FontFamily getFontFamily()
+{
+    return fontFamily;
+}
+
+void setFontFamily(FontFamily family)
+{
+    fontFamily = family;
+    setApplicationFont();
+    updateFonts();
+}
+
+bool weightFromArg(int nArg, QFont::Weight& weight)
+{
+    const std::map<int, QFont::Weight> mapWeight{
+        {0, QFont::Thin},
+        {1, QFont::ExtraLight},
+        {2, QFont::Light},
+        {3, QFont::Normal},
+        {4, QFont::Medium},
+        {5, QFont::DemiBold},
+        {6, QFont::Bold},
+        {7, QFont::ExtraBold},
+        {8, QFont::Black}
+    };
+    auto it = mapWeight.find(nArg);
+    if (it == mapWeight.end()) {
+        return false;
+    }
+    weight = it->second;
+    return true;
+}
+
+int weightToArg(const QFont::Weight weight)
+{
+    const std::map<QFont::Weight, int> mapWeight{
+        {QFont::Thin, 0},
+        {QFont::ExtraLight, 1},
+        {QFont::Light, 2},
+        {QFont::Normal, 3},
+        {QFont::Medium, 4},
+        {QFont::DemiBold, 5},
+        {QFont::Bold, 6},
+        {QFont::ExtraBold, 7},
+        {QFont::Black, 8}
+    };
+    assert(mapWeight.count(weight));
+    return mapWeight.find(weight)->second;
+}
+
+QFont::Weight toQFontWeight(FontWeight weight)
+{
+    return weight == FontWeight::Bold ? getFontWeightBold() : getFontWeightNormal();
+}
+
+QFont::Weight getFontWeightNormalDefault()
+{
+    return defaultFontWeightNormal;
+}
+
+QFont::Weight getFontWeightNormal()
+{
+    if (!mapWeights.count(fontFamily)) {
+        return defaultFontWeightNormal;
+    }
+    return mapWeights[fontFamily].first;
+}
+
+void setFontWeightNormal(QFont::Weight weight)
+{
+    if (!mapWeights.count(fontFamily)) {
+        throw std::runtime_error(strprintf("%s: Font family not loaded: %s", __func__, fontFamilyToString(fontFamily).toStdString()));
+    }
+    mapWeights[fontFamily].first = weight;
+    updateFonts();
+}
+
+QFont::Weight getFontWeightBoldDefault()
+{
+    return defaultFontWeightBold;
+}
+
+QFont::Weight getFontWeightBold()
+{
+    if (!mapWeights.count(fontFamily)) {
+        return defaultFontWeightBold;
+    }
+    return mapWeights[fontFamily].second;
+}
+
+void setFontWeightBold(QFont::Weight weight)
+{
+    if (!mapWeights.count(fontFamily)) {
+        throw std::runtime_error(strprintf("%s: Font family not loaded: %s", __func__, fontFamilyToString(fontFamily).toStdString()));
+    }
+    mapWeights[fontFamily].second = weight;
+    updateFonts();
+}
+
+int getFontScaleDefault()
+{
+    return defaultFontScale;
+}
+
+int getFontScale()
+{
+    return fontScale;
+}
+
+void setFontScale(int nScale)
+{
+    fontScale = nScale;
+    updateFonts();
+}
+
+double getScaledFontSize(int nSize)
+{
+    return std::round(nSize * (1 + (fontScale * fontScaleSteps)) * 4) / 4.0;
+}
+
+bool loadFonts()
+{
+    // Before any font changes store the applications default font to use it as SystemDefault.
+    osDefaultFont = std::make_unique<QFont>(QApplication::font());
+
+    QString family = fontFamilyToString(FontFamily::Montserrat);
+    QString italic = "Italic";
+
+    std::map<QString, bool> mapStyles{
+        {"Thin", true},
+        {"ExtraLight", true},
+        {"Light", true},
+        {"Italic", false},
+        {"Regular", false},
+        {"Medium", true},
+        {"SemiBold", true},
+        {"Bold", true},
+        {"ExtraBold", true},
+        {"Black", true},
+    };
+
+    QFontDatabase database;
+    std::vector<int> vecFontIds;
+
+    for (const auto& it : mapStyles) {
+        QString font = ":fonts/" + family + "-" + it.first;
+        vecFontIds.push_back(QFontDatabase::addApplicationFont(font));
+        qDebug() << __func__ << ": " << font << " loaded with id " << vecFontIds.back();
+        if (it.second) {
+            vecFontIds.push_back(QFontDatabase::addApplicationFont(font + italic));
+            qDebug() << __func__ << ": " << font + italic << " loaded with id " << vecFontIds.back();
+        }
+    }
+
+    // Fail if an added id is -1 which means QFontDatabase::addApplicationFont failed.
+    if (std::find(vecFontIds.begin(), vecFontIds.end(), -1) != vecFontIds.end()) {
+        osDefaultFont = nullptr;
+        return false;
+    }
+
+    // Print debug logs for added fonts fetched by the added ids
+    for (const auto& i : vecFontIds) {
+        auto families = QFontDatabase::applicationFontFamilies(i);
+        for (const QString& f : families) {
+            qDebug() << __func__ << ": - Font id " << i << " is family: " << f;
+            const QStringList fontStyles = database.styles(f);
+            for (const QString& style : fontStyles) {
+                qDebug() << __func__ << ": Style for family " << f << " with id: " << i << ": " << style;
+            }
+        }
+    }
+    // Print debug logs for added fonts fetched by the family name
+    const QStringList fontFamilies = database.families();
+    for (const QString& f : fontFamilies) {
+        if (f.contains(family)) {
+            const QStringList fontStyles = database.styles(f);
+            for (const QString& style : fontStyles) {
+                qDebug() << __func__ << ": Family: " << f << ", Style: " << style;
+            }
+        }
+    }
+
+    setApplicationFont();
+
+    // Initialize supported font weights for all available fonts
+    // Generate a vector with supported font weights by comparing the width of a certain test text for all font weights
+    auto supportedWeights = [](FontFamily family) -> std::vector<QFont::Weight> {
+        auto getTestWidth = [&](QFont::Weight weight) -> int {
+            QFont font = getFont(family, weight, false, defaultFontSize);
+            return TextWidth(QFontMetrics(font), ("Check the width of this text to see if the weight change has an impact!"));
+        };
+        std::vector<QFont::Weight> vecWeights{QFont::Thin, QFont::ExtraLight, QFont::Light,
+                                              QFont::Normal, QFont::Medium, QFont::DemiBold,
+                                              QFont::Bold, QFont::ExtraBold, QFont::Black};
+        std::vector<QFont::Weight> vecSupported;
+        QFont::Weight prevWeight = vecWeights.front();
+        for (auto weight = vecWeights.begin() + 1; weight != vecWeights.end(); ++weight) {
+            if (getTestWidth(prevWeight) != getTestWidth(*weight)) {
+                if (vecSupported.empty()) {
+                    vecSupported.push_back(prevWeight);
+                }
+                vecSupported.push_back(*weight);
+            }
+            prevWeight = *weight;
+        }
+        if (vecSupported.empty()) {
+            vecSupported.push_back(QFont::Normal);
+        }
+        return vecSupported;
+    };
+
+    mapSupportedWeights.insert(std::make_pair(FontFamily::SystemDefault, supportedWeights(FontFamily::SystemDefault)));
+    mapSupportedWeights.insert(std::make_pair(FontFamily::Montserrat, supportedWeights(FontFamily::Montserrat)));
+
+    auto getBestMatch = [&](FontFamily fontFamily, QFont::Weight targetWeight) {
+        auto& vecSupported = mapSupportedWeights[fontFamily];
+        auto it = vecSupported.begin();
+        QFont::Weight bestWeight = *it;
+        int nBestDiff = abs(*it - targetWeight);
+        while (++it != vecSupported.end()) {
+            int nDiff = abs(*it - targetWeight);
+            if (nDiff < nBestDiff) {
+                bestWeight = *it;
+                nBestDiff = nDiff;
+            }
+        }
+        return bestWeight;
+    };
+
+    auto addBestDefaults = [&](FontFamily family) -> auto {
+        QFont::Weight normalWeight = getBestMatch(family, defaultFontWeightNormal);
+        QFont::Weight boldWeight = getBestMatch(family, defaultFontWeightBold);
+        if (normalWeight == boldWeight) {
+            // If the results are the same use the next possible weight for bold font
+            auto& vecSupported = mapSupportedWeights[fontFamily];
+            auto it = std::find(vecSupported.begin(), vecSupported.end(),normalWeight);
+            if (++it != vecSupported.end()) {
+                boldWeight = *it;
+            }
+        }
+        mapDefaultWeights.emplace(family, std::make_pair(normalWeight, boldWeight));
+    };
+
+    addBestDefaults(FontFamily::SystemDefault);
+    addBestDefaults(FontFamily::Montserrat);
+
+    // Load supported defaults. May become overwritten later.
+    mapWeights = mapDefaultWeights;
+
+    return true;
+}
+
+bool fontsLoaded()
+{
+    return osDefaultFont != nullptr;
+}
+
+void setApplicationFont()
+{
+    if (!fontsLoaded()) {
+        return;
+    }
+
+    std::unique_ptr<QFont> font;
+
+    if (fontFamily == FontFamily::Montserrat) {
+        QString family = fontFamilyToString(FontFamily::Montserrat);
+#ifdef Q_OS_MAC
+        if (getFontWeightNormal() != getFontWeightNormalDefault()) {
+            font = std::make_unique<QFont>(getFontNormal());
+        } else {
+            font = std::make_unique<QFont>(family);
+            font->setWeight(getFontWeightNormalDefault());
+        }
+#else
+        font = std::make_unique<QFont>(family);
+        font->setWeight(getFontWeightNormal());
+#endif
+    } else {
+        font = std::make_unique<QFont>(*osDefaultFont);
+    }
+
+    font->setPointSizeF(defaultFontSize);
+    qApp->setFont(*font);
+
+    qDebug() << __func__ << ": " << qApp->font().toString() <<
+                " family: " << qApp->font().family() <<
+                ", style: " << qApp->font().styleName() <<
+                " match: " << qApp->font().exactMatch();
+}
+
+void setFont(const std::vector<QWidget*>& vecWidgets, FontWeight weight, int nPointSize, bool fItalic)
+{
+    for (auto it : vecWidgets) {
+        auto fontAttributes = std::make_tuple(weight, fItalic, nPointSize);
+        auto itFontUpdate = mapFontUpdates.emplace(std::make_pair(it, fontAttributes));
+        if (!itFontUpdate.second) {
+            itFontUpdate.first->second = fontAttributes;
+        }
+    }
+}
+
+void updateFonts()
+{
+    // Fonts need to be loaded by GUIIUtil::loadFonts(), if not just return.
+    if (!osDefaultFont) {
+        return;
+    }
+
+    static std::map<QPointer<QWidget>, int> mapWidgetDefaultFontSizes;
+
+    // QPointer becomes nullptr for objects that were deleted.
+    // Remove them from mapDefaultFontSize and mapFontUpdates
+    // before proceeding any further.
+    size_t nRemovedDefaultFonts{0};
+    auto itd = mapWidgetDefaultFontSizes.begin();
+    while (itd != mapWidgetDefaultFontSizes.end()) {
+        if (itd->first.isNull()) {
+            itd = mapWidgetDefaultFontSizes.erase(itd);
+            ++nRemovedDefaultFonts;
+        } else {
+            ++itd;
+        }
+    }
+
+    size_t nRemovedFontUpdates{0};
+    auto itn = mapFontUpdates.begin();
+    while (itn != mapFontUpdates.end()) {
+        if (itn->first.isNull()) {
+            itn = mapFontUpdates.erase(itn);
+            ++nRemovedFontUpdates;
+        } else {
+            ++itn;
+        }
+    }
+
+    size_t nUpdatable{0}, nUpdated{0};
+    std::map<QWidget*, QFont> mapWidgetFonts;
+    // Loop through all widgets
+    for (QWidget* w : qApp->allWidgets()) {
+        std::vector<QString> vecIgnoreClasses{
+            "QWidget", "QDialog", "QFrame", "QStackedWidget", "QDesktopWidget", "QDesktopScreenWidget",
+            "QTipLabel", "QMessageBox", "QMenu", "QComboBoxPrivateScroller", "QComboBoxPrivateContainer",
+            "QScrollBar", "QListView", "BitcoinGUI", "WalletView", "WalletFrame", "QVBoxLayout", "QGroupBox"
+        };
+        std::vector<QString> vecIgnoreObjects{
+            "messagesWidget"
+        };
+        if (std::find(vecIgnoreClasses.begin(), vecIgnoreClasses.end(), w->metaObject()->className()) != vecIgnoreClasses.end() ||
+            std::find(vecIgnoreObjects.begin(), vecIgnoreObjects.end(), w->objectName()) != vecIgnoreObjects.end()) {
+            continue;
+        }
+        ++nUpdatable;
+
+        QFont font = w->font();
+        assert(font.pointSize() > 0);
+        font.setFamily(qApp->font().family());
+        font.setWeight(getFontWeightNormal());
+        font.setStyleName(qApp->font().styleName());
+        font.setStyle(qApp->font().style());
+
+        // Insert/Get the default font size of the widget
+        auto itDefault = mapWidgetDefaultFontSizes.emplace(w, font.pointSize());
+
+        auto it = mapFontUpdates.find(w);
+        if (it != mapFontUpdates.end()) {
+            int nSize = std::get<2>(it->second);
+            if (nSize == -1) {
+                nSize = itDefault.first->second;
+            }
+            font = getFont(std::get<0>(it->second), std::get<1>(it->second), nSize);
+        } else {
+            font.setPointSizeF(getScaledFontSize(itDefault.first->second));
+        }
+
+        if (w->font() != font) {
+            auto itWidgetFont = mapWidgetFonts.emplace(w, font);
+            assert(itWidgetFont.second);
+            ++nUpdated;
+        }
+    }
+    qDebug().nospace() << __func__ << " - widget counts: updated/updatable/total(" << nUpdated << "/" << nUpdatable << "/" << qApp->allWidgets().size() << ")"
+             << ", removed items: mapWidgetDefaultFontSizes/mapFontUpdates(" << nRemovedDefaultFonts << "/" << nRemovedFontUpdates << ")";
+
+    // Perform the required font updates
+    // NOTE: This is done as separate step to avoid scaling issues due to font inheritance
+    //       hence all fonts are calculated and stored in mapWidgetFonts above.
+    for (auto it : mapWidgetFonts) {
+        it.first->setFont(it.second);
+    }
+
+    // Scale the global font size for the classes in the map below
+    static std::map<std::string, int> mapClassFontUpdates{
+        {"QTipLabel", -1}, {"QMenu", -1}, {"QMessageBox", -1}
+    };
+    for (auto& it : mapClassFontUpdates) {
+        QFont fontClass = qApp->font(it.first.c_str());
+        if (it.second == -1) {
+            it.second = fontClass.pointSize();
+        }
+        double dSize = getScaledFontSize(it.second);
+        if (fontClass.pointSizeF() != dSize) {
+            fontClass.setPointSizeF(dSize);
+            qApp->setFont(fontClass, it.first.c_str());
+        }
+    }
+}
+
+QFont getFont(FontFamily family, QFont::Weight qWeight, bool fItalic, int nPointSize)
+{
+    QFont font;
+    if (!fontsLoaded()) {
+        return font;
+    }
+
+    if (family == FontFamily::Montserrat) {
+        static std::map<QFont::Weight, QString> mapMontserratMapping{
+            {QFont::Thin, "Thin"},
+            {QFont::ExtraLight, "ExtraLight"},
+            {QFont::Light, "Light"},
+            {QFont::Medium, "Medium"},
+            {QFont::DemiBold, "SemiBold"},
+            {QFont::ExtraBold, "ExtraBold"},
+            {QFont::Black, "Black"},
+#ifdef Q_OS_MAC
+            {QFont::Normal, "Regular"},
+            {QFont::Bold, "Bold"},
+#else
+            {QFont::Normal, ""},
+            {QFont::Bold, ""},
+#endif
+        };
+
+        assert(mapMontserratMapping.count(qWeight));
+
+#ifdef Q_OS_MAC
+
+        QString styleName = mapMontserratMapping[qWeight];
+
+        if (fItalic) {
+            if (styleName == "Regular") {
+                styleName = "Italic";
+            } else {
+                styleName += " Italic";
+            }
+        }
+
+        font.setFamily(fontFamilyToString(FontFamily::Montserrat));
+        font.setStyleName(styleName);
+#else
+        font.setFamily(fontFamilyToString(FontFamily::Montserrat) + " " + mapMontserratMapping[qWeight]);
+        font.setWeight(qWeight);
+        font.setStyle(fItalic ? QFont::StyleItalic : QFont::StyleNormal);
+#endif
+    } else {
+        font.setFamily(osDefaultFont->family());
+        font.setWeight(qWeight);
+        font.setStyle(fItalic ? QFont::StyleItalic : QFont::StyleNormal);
+    }
+
+    if (nPointSize != -1) {
+        font.setPointSizeF(getScaledFontSize(nPointSize));
+    }
+
+    if (gArgs.GetBoolArg("-debug-ui", false)) {
+        qDebug() << __func__ << ": font size: " << font.pointSizeF() << " family: " << font.family() << ", style: " << font.styleName() << ", weight:" << font.weight() << " match: " << font.exactMatch();
+    }
+
+    return font;
+}
+
+QFont getFont(QFont::Weight qWeight, bool fItalic, int nPointSize)
+{
+    return getFont(fontFamily, qWeight, fItalic, nPointSize);
+}
+QFont getFont(FontWeight weight, bool fItalic, int nPointSize)
+{
+    return getFont(toQFontWeight(weight), fItalic, nPointSize);
+}
+
+QFont getFontNormal()
+{
+    return getFont(FontWeight::Normal);
+}
+
+QFont getFontBold()
+{
+    return getFont(FontWeight::Bold);
+}
+
+QFont::Weight getSupportedFontWeightNormalDefault()
+{
+    if (!mapDefaultWeights.count(fontFamily)) {
+        throw std::runtime_error(strprintf("%s: Font family not loaded: %s", __func__, fontFamilyToString(fontFamily).toStdString()));
+    }
+    return mapDefaultWeights[fontFamily].first;
+}
+
+QFont::Weight getSupportedFontWeightBoldDefault()
+{
+    if (!mapDefaultWeights.count(fontFamily)) {
+        throw std::runtime_error(strprintf("%s: Font family not loaded: %s", __func__, fontFamilyToString(fontFamily).toStdString()));
+    }
+    return mapDefaultWeights[fontFamily].second;
+}
+
+std::vector<QFont::Weight> getSupportedWeights()
+{
+    assert(mapSupportedWeights.count(fontFamily));
+    return mapSupportedWeights[fontFamily];
+}
+
+QFont::Weight supportedWeightFromIndex(int nIndex)
+{
+    auto vecWeights = getSupportedWeights();
+    assert(vecWeights.size() > uint64_t(nIndex));
+    return vecWeights[nIndex];
+}
+
+int supportedWeightToIndex(QFont::Weight weight)
+{
+    auto vecWeights = getSupportedWeights();
+    for (uint64_t index = 0; index < vecWeights.size(); ++index) {
+        if (weight == vecWeights[index]) {
+            return index;
+        }
+    }
+    return -1;
+}
+
+bool isSupportedWeight(const QFont::Weight weight)
+{
+    return supportedWeightToIndex(weight) != -1;
+}
+} // namespace GUIUtil
diff --git a/src/qt/guiutil_font.h b/src/qt/guiutil_font.h
new file mode 100644
index 0000000000000..8b8dc4aba4b38
--- /dev/null
+++ b/src/qt/guiutil_font.h
@@ -0,0 +1,101 @@
+// Copyright (c) 2014-2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_QT_GUIUTIL_FONT_H
+#define BITCOIN_QT_GUIUTIL_FONT_H
+
+#include <QFont>
+#include <QString>
+#include <QWidget>
+
+#include <cstdint>
+#include <vector>
+
+namespace GUIUtil {
+enum class FontFamily {
+    SystemDefault,
+    Montserrat,
+};
+
+FontFamily fontFamilyFromString(const QString& strFamily);
+QString fontFamilyToString(FontFamily family);
+
+/** set/get font family: GUIUtil::fontFamily */
+FontFamily getFontFamilyDefault();
+FontFamily getFontFamily();
+void setFontFamily(FontFamily family);
+
+enum class FontWeight {
+    Normal, // Font weight for normal text
+    Bold,   // Font weight for bold text
+};
+
+/** Convert weight value from args (0-8) to QFont::Weight */
+bool weightFromArg(int nArg, QFont::Weight& weight);
+/** Convert QFont::Weight to an arg value (0-8) */
+int weightToArg(const QFont::Weight weight);
+/** Convert GUIUtil::FontWeight to QFont::Weight */
+QFont::Weight toQFontWeight(FontWeight weight);
+
+/** set/get normal font weight: GUIUtil::fontWeightNormal */
+QFont::Weight getFontWeightNormalDefault();
+QFont::Weight getFontWeightNormal();
+void setFontWeightNormal(QFont::Weight weight);
+
+/** set/get bold font weight: GUIUtil::fontWeightBold */
+QFont::Weight getFontWeightBoldDefault();
+QFont::Weight getFontWeightBold();
+void setFontWeightBold(QFont::Weight weight);
+
+/** set/get font scale: GUIUtil::fontScale */
+int getFontScaleDefault();
+int getFontScale();
+void setFontScale(int nScale);
+
+/** get font size with GUIUtil::fontScale applied */
+double getScaledFontSize(int nSize);
+
+/** Load dash specific appliciation fonts */
+bool loadFonts();
+/** Check if the fonts have been loaded successfully */
+bool fontsLoaded();
+
+/** Set an application wide default font, depends on the selected theme */
+void setApplicationFont();
+
+/** Workaround to set correct font styles in all themes since there is a bug in macOS which leads to
+    issues loading variations of montserrat in css it also keeps track of the set fonts to update on
+    theme changes. */
+void setFont(const std::vector<QWidget*>& vecWidgets, FontWeight weight, int nPointSize = -1, bool fItalic = false);
+
+/** Update the font of all widgets where a custom font has been set with
+    GUIUtil::setFont */
+void updateFonts();
+
+/** Get a properly weighted QFont object with the selected font. */
+QFont getFont(FontFamily family, QFont::Weight qWeight, bool fItalic = false, int nPointSize = -1);
+QFont getFont(QFont::Weight qWeight, bool fItalic = false, int nPointSize = -1);
+QFont getFont(FontWeight weight, bool fItalic = false, int nPointSize = -1);
+
+/** Get the default normal QFont */
+QFont getFontNormal();
+
+/** Get the default bold QFont */
+QFont getFontBold();
+
+/** Return supported normal default for the current font family */
+QFont::Weight getSupportedFontWeightNormalDefault();
+/** Return supported bold default for the current font family */
+QFont::Weight getSupportedFontWeightBoldDefault();
+/** Return supported weights for the current font family */
+std::vector<QFont::Weight> getSupportedWeights();
+/** Convert an index to a weight in the supported weights vector */
+QFont::Weight supportedWeightFromIndex(int nIndex);
+/** Convert a weight to an index in the supported weights vector */
+int supportedWeightToIndex(QFont::Weight weight);
+/** Check if a weight is supported by the current font family */
+bool isSupportedWeight(QFont::Weight weight);
+} // namespace GUIUtil
+
+#endif // BITCOIN_QT_GUIUTIL_FONT_H
diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index e34b9ac7eba79..2010a2270a1c3 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -9,6 +9,7 @@
 #include <qt/clientmodel.h>
 #include <coins.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/walletmodel.h>
 
 #include <univalue.h>
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
index b5dabb2a6f5c5..9943750e8daf6 100644
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -7,6 +7,7 @@
 
 #include <chainparams.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 
 #include <QEasingCurve>
 #include <QPropertyAnimation>
diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp
index 95d2891f31a21..739cc6a07a929 100644
--- a/src/qt/openuridialog.cpp
+++ b/src/qt/openuridialog.cpp
@@ -7,6 +7,7 @@
 #include <qt/forms/ui_openuridialog.h>
 
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/sendcoinsrecipient.h>
 
 #include <QAbstractButton>
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 0ed490752d403..f64797d4de678 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -12,6 +12,7 @@
 #include <qt/bitcoinunits.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 
 #include <interfaces/node.h>
 #include <mapport.h>
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index dc08a67c3e2ec..7ae5f4e5cf92f 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -9,6 +9,7 @@
 #include <qt/bitcoinunits.h>
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/transactionfilterproxy.h>
 #include <qt/transactionoverviewwidget.h>
diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index 0da56394a4ff9..8e8836c76f642 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -13,6 +13,7 @@
 #include <qt/bitcoinamountfield.h>
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/qvalidatedlineedit.h>
 #include <qt/rpcconsole.h>
diff --git a/src/qt/qrdialog.cpp b/src/qt/qrdialog.cpp
index 3f5dfdb65a23d..7b65e144aeca2 100644
--- a/src/qt/qrdialog.cpp
+++ b/src/qt/qrdialog.cpp
@@ -8,6 +8,7 @@
 #include <qt/bitcoinunits.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/qrimagewidget.h>
 
 #include <QPainter>
diff --git a/src/qt/qrimagewidget.cpp b/src/qt/qrimagewidget.cpp
index ba2006e4b95a5..f2f31db7c5003 100644
--- a/src/qt/qrimagewidget.cpp
+++ b/src/qt/qrimagewidget.cpp
@@ -5,6 +5,7 @@
 #include <qt/qrimagewidget.h>
 
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 
 #include <QApplication>
 #include <QClipboard>
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index c542260ff9aa3..f00e04e066f86 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -7,6 +7,7 @@
 
 #include <qt/addresstablemodel.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/receiverequestdialog.h>
 #include <qt/recentrequeststablemodel.h>
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index 2961084f37143..6f8021d6d3d4e 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -7,6 +7,7 @@
 
 #include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/qrimagewidget.h>
 #include <qt/walletmodel.h>
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 55b3fb301e744..77f428f277aca 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -18,6 +18,7 @@
 #include <qt/bantablemodel.h>
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/peertablesortproxy.h>
 #include <qt/walletmodel.h>
 #include <rpc/client.h>
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 26088439f1e91..7e4d6e681ffbe 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -15,6 +15,7 @@
 #include <qt/clientmodel.h>
 #include <qt/coincontroldialog.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/sendcoinsentry.h>
 
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index 748de45ae70a4..5fc43acf57c08 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -13,6 +13,7 @@
 #include <qt/addressbookpage.h>
 #include <qt/addresstablemodel.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/walletmodel.h>
 
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index c0f0367cb8523..a0a764135b53b 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -8,6 +8,7 @@
 
 #include <qt/addressbookpage.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/walletmodel.h>
 
 #include <key_io.h>
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index f4519d84e4b27..621899a251c50 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -16,6 +16,7 @@
 #include <interfaces/node.h>
 #include <interfaces/wallet.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/networkstyle.h>
 #include <qt/walletmodel.h>
 #include <util/system.h>
diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp
index 01f43caa7e9e8..6e0a498d00484 100644
--- a/src/qt/test/apptests.cpp
+++ b/src/qt/test/apptests.cpp
@@ -8,6 +8,7 @@
 #include <key.h>
 #include <qt/bitcoin.h>
 #include <qt/bitcoingui.h>
+#include <qt/guiutil_font.h>
 #include <qt/networkstyle.h>
 #include <qt/rpcconsole.h>
 #include <shutdown.h>
diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp
index b49473f002285..2900d45233631 100644
--- a/src/qt/trafficgraphwidget.cpp
+++ b/src/qt/trafficgraphwidget.cpp
@@ -6,6 +6,7 @@
 #include <qt/trafficgraphwidget.h>
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 
 #include <QPainter>
 #include <QPainterPath>
diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp
index 95e82d931eca4..e5865fa31aab2 100644
--- a/src/qt/transactiondescdialog.cpp
+++ b/src/qt/transactiondescdialog.cpp
@@ -6,6 +6,7 @@
 #include <qt/forms/ui_transactiondescdialog.h>
 
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/transactiontablemodel.h>
 
 #include <QModelIndex>
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index a57217e09e708..9132e7f757237 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -12,6 +12,7 @@
 #include <qt/forms/ui_helpmessagedialog.h>
 
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 
 #include <clientversion.h>
 #include <init.h>
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 7c7626d9d97fc..d2d2f578fa1bd 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -11,6 +11,7 @@
 #include <qt/askpassphrasedialog.h>
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 #include <qt/overviewpage.h>
 #include <qt/receivecoinsdialog.h>

From 306e703eeb3b8d9d4567d1fee5885eaaa78af236 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 29 Aug 2025 20:23:18 +0000
Subject: [PATCH 02/31] refactor: consolidate font settings to struct
 `FontSettings`

Currently they're a bunch of loose variables with dedicated getter
functions, we can cut down on it a fair bit.
---
 src/qt/bitcoin.cpp      | 10 ++++----
 src/qt/guiutil_font.cpp | 55 +++++++++--------------------------------
 src/qt/guiutil_font.h   | 22 ++++++++++++++---
 src/qt/optionsmodel.cpp |  8 +++---
 4 files changed, 39 insertions(+), 56 deletions(-)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index fb265d84ad54d..b811800709bd2 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -489,10 +489,10 @@ static void SetupUIArgs(ArgsManager& argsman)
 {
     argsman.AddArg("-choosedatadir", strprintf(QObject::tr("Choose data directory on startup (default: %u)").toStdString(), DEFAULT_CHOOSE_DATADIR), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
     argsman.AddArg("-custom-css-dir", "Set a directory which contains custom css files. Those will be used as stylesheets for the UI.", ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
-    argsman.AddArg("-font-family", QObject::tr("Set the font family. Possible values: %1. (default: %2)").arg("SystemDefault, Montserrat").arg(GUIUtil::fontFamilyToString(GUIUtil::getFontFamilyDefault())).toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
-    argsman.AddArg("-font-scale", QObject::tr("Set a scale factor which gets applied to the base font size. Possible range %1 (smallest fonts) to %2 (largest fonts). (default: %3)").arg(-100).arg(100).arg(GUIUtil::getFontScaleDefault()).toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
-    argsman.AddArg("-font-weight-bold", QObject::tr("Set the font weight for bold texts. Possible range %1 to %2 (default: %3)").arg(0).arg(8).arg(GUIUtil::weightToArg(GUIUtil::getFontWeightBoldDefault())).toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
-    argsman.AddArg("-font-weight-normal", QObject::tr("Set the font weight for normal texts. Possible range %1 to %2 (default: %3)").arg(0).arg(8).arg(GUIUtil::weightToArg(GUIUtil::getFontWeightNormalDefault())).toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
+    argsman.AddArg("-font-family", QObject::tr("Set the font family. Possible values: %1. (default: %2)").arg("SystemDefault, Montserrat").arg(GUIUtil::fontFamilyToString(GUIUtil::g_font_defaults.family)).toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
+    argsman.AddArg("-font-scale", QObject::tr("Set a scale factor which gets applied to the base font size. Possible range %1 (smallest fonts) to %2 (largest fonts). (default: %3)").arg(-100).arg(100).arg(GUIUtil::g_font_defaults.scale).toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
+    argsman.AddArg("-font-weight-bold", QObject::tr("Set the font weight for bold texts. Possible range %1 to %2 (default: %3)").arg(0).arg(8).arg(GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_bold)).toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
+    argsman.AddArg("-font-weight-normal", QObject::tr("Set the font weight for normal texts. Possible range %1 to %2 (default: %3)").arg(0).arg(8).arg(GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_normal)).toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
     argsman.AddArg("-lang=<lang>", QObject::tr("Set language, for example \"de_DE\" (default: system locale)").toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
     argsman.AddArg("-min", QObject::tr("Start minimized").toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
     argsman.AddArg("-resetguisettings", QObject::tr("Reset all settings changed in the GUI").toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
@@ -676,7 +676,7 @@ int GuiMain(int argc, char* argv[])
     // Validate/set font family
     if (gArgs.IsArgSet("-font-family")) {
         GUIUtil::FontFamily family;
-        QString strFamily = gArgs.GetArg("-font-family", GUIUtil::fontFamilyToString(GUIUtil::getFontFamilyDefault()).toStdString()).c_str();
+        QString strFamily = gArgs.GetArg("-font-family", GUIUtil::fontFamilyToString(GUIUtil::g_font_defaults.family).toStdString()).c_str();
         try {
             family = GUIUtil::fontFamilyFromString(strFamily);
         } catch (const std::exception& e) {
diff --git a/src/qt/guiutil_font.cpp b/src/qt/guiutil_font.cpp
index 9185759a0c6b3..4fd11b97885cd 100644
--- a/src/qt/guiutil_font.cpp
+++ b/src/qt/guiutil_font.cpp
@@ -25,24 +25,13 @@ namespace GUIUtil {
 /** loadFonts stores the SystemDefault font in osDefaultFont to be able to reference it later again */
 static std::unique_ptr<QFont> osDefaultFont;
 /** Font related default values. */
-static const FontFamily defaultFontFamily = FontFamily::SystemDefault;
-static const int defaultFontSize = 12;
-static const double fontScaleSteps = 0.01;
-#ifdef Q_OS_MAC
-static const QFont::Weight defaultFontWeightNormal = QFont::ExtraLight;
-static const QFont::Weight defaultFontWeightBold = QFont::Medium;
-static const int defaultFontScale = 0;
-#else
-static const QFont::Weight defaultFontWeightNormal = QFont::Light;
-static const QFont::Weight defaultFontWeightBold = QFont::Medium;
-static const int defaultFontScale = 0;
-#endif
+const FontSettings g_font_defaults{};
 
 /** Font related variables. */
 // Application font family. May be overwritten by -font-family.
-static FontFamily fontFamily = defaultFontFamily;
+static FontFamily fontFamily = g_font_defaults.family;
 // Application font scale value. May be overwritten by -font-scale.
-static int fontScale = defaultFontScale;
+static int fontScale = g_font_defaults.scale;
 // Contains the weight settings separated for all available fonts
 static std::map<FontFamily, std::pair<QFont::Weight, QFont::Weight>> mapDefaultWeights;
 static std::map<FontFamily, std::pair<QFont::Weight, QFont::Weight>> mapWeights;
@@ -74,11 +63,6 @@ QString fontFamilyToString(FontFamily family)
     }
 }
 
-FontFamily getFontFamilyDefault()
-{
-    return defaultFontFamily;
-}
-
 FontFamily getFontFamily()
 {
     return fontFamily;
@@ -134,15 +118,10 @@ QFont::Weight toQFontWeight(FontWeight weight)
     return weight == FontWeight::Bold ? getFontWeightBold() : getFontWeightNormal();
 }
 
-QFont::Weight getFontWeightNormalDefault()
-{
-    return defaultFontWeightNormal;
-}
-
 QFont::Weight getFontWeightNormal()
 {
     if (!mapWeights.count(fontFamily)) {
-        return defaultFontWeightNormal;
+        return g_font_defaults.weight_normal;
     }
     return mapWeights[fontFamily].first;
 }
@@ -156,15 +135,10 @@ void setFontWeightNormal(QFont::Weight weight)
     updateFonts();
 }
 
-QFont::Weight getFontWeightBoldDefault()
-{
-    return defaultFontWeightBold;
-}
-
 QFont::Weight getFontWeightBold()
 {
     if (!mapWeights.count(fontFamily)) {
-        return defaultFontWeightBold;
+        return g_font_defaults.weight_bold;
     }
     return mapWeights[fontFamily].second;
 }
@@ -178,11 +152,6 @@ void setFontWeightBold(QFont::Weight weight)
     updateFonts();
 }
 
-int getFontScaleDefault()
-{
-    return defaultFontScale;
-}
-
 int getFontScale()
 {
     return fontScale;
@@ -196,7 +165,7 @@ void setFontScale(int nScale)
 
 double getScaledFontSize(int nSize)
 {
-    return std::round(nSize * (1 + (fontScale * fontScaleSteps)) * 4) / 4.0;
+    return std::round(nSize * (1 + (fontScale * g_font_defaults.scale_steps)) * 4) / 4.0;
 }
 
 bool loadFonts()
@@ -267,7 +236,7 @@ bool loadFonts()
     // Generate a vector with supported font weights by comparing the width of a certain test text for all font weights
     auto supportedWeights = [](FontFamily family) -> std::vector<QFont::Weight> {
         auto getTestWidth = [&](QFont::Weight weight) -> int {
-            QFont font = getFont(family, weight, false, defaultFontSize);
+            QFont font = getFont(family, weight, false, g_font_defaults.size);
             return TextWidth(QFontMetrics(font), ("Check the width of this text to see if the weight change has an impact!"));
         };
         std::vector<QFont::Weight> vecWeights{QFont::Thin, QFont::ExtraLight, QFont::Light,
@@ -309,8 +278,8 @@ bool loadFonts()
     };
 
     auto addBestDefaults = [&](FontFamily family) -> auto {
-        QFont::Weight normalWeight = getBestMatch(family, defaultFontWeightNormal);
-        QFont::Weight boldWeight = getBestMatch(family, defaultFontWeightBold);
+        QFont::Weight normalWeight = getBestMatch(family, g_font_defaults.weight_normal);
+        QFont::Weight boldWeight = getBestMatch(family, g_font_defaults.weight_bold);
         if (normalWeight == boldWeight) {
             // If the results are the same use the next possible weight for bold font
             auto& vecSupported = mapSupportedWeights[fontFamily];
@@ -347,11 +316,11 @@ void setApplicationFont()
     if (fontFamily == FontFamily::Montserrat) {
         QString family = fontFamilyToString(FontFamily::Montserrat);
 #ifdef Q_OS_MAC
-        if (getFontWeightNormal() != getFontWeightNormalDefault()) {
+        if (getFontWeightNormal() != g_font_defaults.weight_normal) {
             font = std::make_unique<QFont>(getFontNormal());
         } else {
             font = std::make_unique<QFont>(family);
-            font->setWeight(getFontWeightNormalDefault());
+            font->setWeight(g_font_defaults.weight_normal);
         }
 #else
         font = std::make_unique<QFont>(family);
@@ -361,7 +330,7 @@ void setApplicationFont()
         font = std::make_unique<QFont>(*osDefaultFont);
     }
 
-    font->setPointSizeF(defaultFontSize);
+    font->setPointSizeF(g_font_defaults.size);
     qApp->setFont(*font);
 
     qDebug() << __func__ << ": " << qApp->font().toString() <<
diff --git a/src/qt/guiutil_font.h b/src/qt/guiutil_font.h
index 8b8dc4aba4b38..170e793897dbf 100644
--- a/src/qt/guiutil_font.h
+++ b/src/qt/guiutil_font.h
@@ -21,8 +21,25 @@ enum class FontFamily {
 FontFamily fontFamilyFromString(const QString& strFamily);
 QString fontFamilyToString(FontFamily family);
 
+struct FontSettings {
+    FontFamily family{FontFamily::SystemDefault};
+    int size{12};
+    int scale{0};
+    double scale_steps{0.01};
+    QFont::Weight weight_bold{QFont::Medium};
+    QFont::Weight weight_normal{
+#ifdef Q_OS_MACOS
+    QFont::ExtraLight
+#else
+    QFont::Light
+#endif // Q_OS_MAC
+    };
+};
+
+/** Font related default values. */
+extern const FontSettings g_font_defaults;
+
 /** set/get font family: GUIUtil::fontFamily */
-FontFamily getFontFamilyDefault();
 FontFamily getFontFamily();
 void setFontFamily(FontFamily family);
 
@@ -39,17 +56,14 @@ int weightToArg(const QFont::Weight weight);
 QFont::Weight toQFontWeight(FontWeight weight);
 
 /** set/get normal font weight: GUIUtil::fontWeightNormal */
-QFont::Weight getFontWeightNormalDefault();
 QFont::Weight getFontWeightNormal();
 void setFontWeightNormal(QFont::Weight weight);
 
 /** set/get bold font weight: GUIUtil::fontWeightBold */
-QFont::Weight getFontWeightBoldDefault();
 QFont::Weight getFontWeightBold();
 void setFontWeightBold(QFont::Weight weight);
 
 /** set/get font scale: GUIUtil::fontScale */
-int getFontScaleDefault();
 int getFontScale();
 void setFontScale(int nScale);
 
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index f64797d4de678..095cc338e795f 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -98,7 +98,7 @@ void OptionsModel::Init(bool resetSettings)
         settings.setValue("theme", GUIUtil::getDefaultTheme());
 
     if (!settings.contains("fontFamily"))
-        settings.setValue("fontFamily", GUIUtil::fontFamilyToString(GUIUtil::getFontFamilyDefault()));
+        settings.setValue("fontFamily", GUIUtil::fontFamilyToString(GUIUtil::g_font_defaults.family));
     if (gArgs.SoftSetArg("-font-family", settings.value("fontFamily").toString().toStdString())) {
         if (GUIUtil::fontsLoaded()) {
             GUIUtil::setFontFamily(GUIUtil::fontFamilyFromString(settings.value("fontFamily").toString()));
@@ -108,7 +108,7 @@ void OptionsModel::Init(bool resetSettings)
     }
 
     if (!settings.contains("fontScale"))
-        settings.setValue("fontScale", GUIUtil::getFontScaleDefault());
+        settings.setValue("fontScale", GUIUtil::g_font_defaults.scale);
     if (gArgs.SoftSetArg("-font-scale", settings.value("fontScale").toString().toStdString())) {
         if (GUIUtil::fontsLoaded()) {
             GUIUtil::setFontScale(settings.value("fontScale").toInt());
@@ -118,7 +118,7 @@ void OptionsModel::Init(bool resetSettings)
     }
 
     if (!settings.contains("fontWeightNormal"))
-        settings.setValue("fontWeightNormal", GUIUtil::weightToArg(GUIUtil::getFontWeightNormalDefault()));
+        settings.setValue("fontWeightNormal", GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_normal));
     if (gArgs.SoftSetArg("-font-weight-normal", settings.value("fontWeightNormal").toString().toStdString())) {
         if (GUIUtil::fontsLoaded()) {
             QFont::Weight weight;
@@ -135,7 +135,7 @@ void OptionsModel::Init(bool resetSettings)
     }
 
     if (!settings.contains("fontWeightBold"))
-        settings.setValue("fontWeightBold", GUIUtil::weightToArg(GUIUtil::getFontWeightBoldDefault()));
+        settings.setValue("fontWeightBold", GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_bold));
     if (gArgs.SoftSetArg("-font-weight-bold", settings.value("fontWeightBold").toString().toStdString())) {
         if (GUIUtil::fontsLoaded()) {
             QFont::Weight weight;

From f194b8f4e1d18359acbeda2ad20dca51bd8ee77f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 29 Aug 2025 20:26:42 +0000
Subject: [PATCH 03/31] refactor: consolidate available fonts with
 `AVAILABLE_FONTS`

---
 src/qt/appearancewidget.cpp |  8 +++-----
 src/qt/guiutil_font.cpp     | 29 ++++++++++++-----------------
 src/qt/guiutil_font.h       | 10 +++++++++-
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/qt/appearancewidget.cpp b/src/qt/appearancewidget.cpp
index 2a26902d017aa..82aafa0572e0b 100644
--- a/src/qt/appearancewidget.cpp
+++ b/src/qt/appearancewidget.cpp
@@ -28,11 +28,9 @@ AppearanceWidget::AppearanceWidget(QWidget* parent) :
         ui->theme->addItem(entry, QVariant(entry));
     }
 
-    GUIUtil::FontFamily fontSystem = GUIUtil::FontFamily::SystemDefault;
-    GUIUtil::FontFamily fontMontserrat = GUIUtil::FontFamily::Montserrat;
-
-    ui->fontFamily->addItem(GUIUtil::fontFamilyToString(fontSystem), QVariant(static_cast<int>(fontSystem)));
-    ui->fontFamily->addItem(GUIUtil::fontFamilyToString(fontMontserrat), QVariant(static_cast<int>(fontMontserrat)));
+    for (const auto& [family, family_str] : GUIUtil::AVAILABLE_FONTS) {
+        ui->fontFamily->addItem(family_str, QVariant(static_cast<int>(family)));
+    }
 
     updateWeightSlider();
 
diff --git a/src/qt/guiutil_font.cpp b/src/qt/guiutil_font.cpp
index 4fd11b97885cd..f63dee393dd87 100644
--- a/src/qt/guiutil_font.cpp
+++ b/src/qt/guiutil_font.cpp
@@ -42,25 +42,18 @@ static std::map<FontFamily, std::vector<QFont::Weight>> mapSupportedWeights;
 
 FontFamily fontFamilyFromString(const QString& strFamily)
 {
-    if (strFamily == "SystemDefault") {
-        return FontFamily::SystemDefault;
-    }
-    if (strFamily == "Montserrat") {
-        return FontFamily::Montserrat;
+    for (const auto& [family, family_str] : AVAILABLE_FONTS) {
+        if (strFamily == family_str) {
+            return family;
+        }
     }
     throw std::invalid_argument(strprintf("Invalid font-family: %s", strFamily.toStdString()));
 }
 
 QString fontFamilyToString(FontFamily family)
 {
-    switch (family) {
-    case FontFamily::SystemDefault:
-        return "SystemDefault";
-    case FontFamily::Montserrat:
-        return "Montserrat";
-    default:
-        assert(false);
-    }
+    assert(family <= FontFamily::MaxVal);
+    return AVAILABLE_FONTS[static_cast<size_t>(family)].second;
 }
 
 FontFamily getFontFamily()
@@ -259,8 +252,9 @@ bool loadFonts()
         return vecSupported;
     };
 
-    mapSupportedWeights.insert(std::make_pair(FontFamily::SystemDefault, supportedWeights(FontFamily::SystemDefault)));
-    mapSupportedWeights.insert(std::make_pair(FontFamily::Montserrat, supportedWeights(FontFamily::Montserrat)));
+    for (const auto& [family, _] : AVAILABLE_FONTS) {
+        mapSupportedWeights.insert(std::make_pair(family, supportedWeights(family)));
+    }
 
     auto getBestMatch = [&](FontFamily fontFamily, QFont::Weight targetWeight) {
         auto& vecSupported = mapSupportedWeights[fontFamily];
@@ -291,8 +285,9 @@ bool loadFonts()
         mapDefaultWeights.emplace(family, std::make_pair(normalWeight, boldWeight));
     };
 
-    addBestDefaults(FontFamily::SystemDefault);
-    addBestDefaults(FontFamily::Montserrat);
+    for (const auto& [family, _] : AVAILABLE_FONTS) {
+        addBestDefaults(family);
+    }
 
     // Load supported defaults. May become overwritten later.
     mapWeights = mapDefaultWeights;
diff --git a/src/qt/guiutil_font.h b/src/qt/guiutil_font.h
index 170e793897dbf..ad06320dfb9a2 100644
--- a/src/qt/guiutil_font.h
+++ b/src/qt/guiutil_font.h
@@ -9,15 +9,23 @@
 #include <QString>
 #include <QWidget>
 
+#include <array>
 #include <cstdint>
+#include <tuple>
 #include <vector>
 
 namespace GUIUtil {
-enum class FontFamily {
+enum class FontFamily : int {
     SystemDefault,
     Montserrat,
+    MaxVal = Montserrat
 };
 
+static const std::array<std::pair<FontFamily, QString>, 2> AVAILABLE_FONTS{{
+    {FontFamily::SystemDefault, QString{"SystemDefault"}},
+    {FontFamily::Montserrat, QString{"Montserrat"}},
+}};
+
 FontFamily fontFamilyFromString(const QString& strFamily);
 QString fontFamilyToString(FontFamily family);
 

From 5940f9f59598197f6e8db04f22b38b2c047fe1bd Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 28 Aug 2025 20:02:20 +0000
Subject: [PATCH 04/31] refactor: consolidate Montserrat weight and name maps

---
 src/qt/guiutil_font.cpp | 134 +++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 69 deletions(-)

diff --git a/src/qt/guiutil_font.cpp b/src/qt/guiutil_font.cpp
index f63dee393dd87..bf3954733f17a 100644
--- a/src/qt/guiutil_font.cpp
+++ b/src/qt/guiutil_font.cpp
@@ -40,6 +40,19 @@ static std::map<QPointer<QWidget>, std::tuple<FontWeight, bool, int>> mapFontUpd
 // Contains a list of supported font weights for all members of GUIUtil::FontFamily
 static std::map<FontFamily, std::vector<QFont::Weight>> mapSupportedWeights;
 
+//! Map between font weights, Montserrat's convention and italic availability
+static const std::map<QFont::Weight, std::tuple<QString, /*can_italic=*/bool>> mapMontserrat{{
+    {QFont::Black, {"Black", true}},
+    {QFont::Bold, {"Bold", true}},
+    {QFont::DemiBold, {"SemiBold", true}},
+    {QFont::ExtraBold, {"ExtraBold", true}},
+    {QFont::ExtraLight, {"ExtraLight", true}},
+    {QFont::Light, {"Light", true}},
+    {QFont::Medium, {"Medium", true}},
+    {QFont::Normal, {"Regular", false}},
+    {QFont::Thin, {"Thin", true}},
+}};
+
 FontFamily fontFamilyFromString(const QString& strFamily)
 {
     for (const auto& [family, family_str] : AVAILABLE_FONTS) {
@@ -166,32 +179,25 @@ bool loadFonts()
     // Before any font changes store the applications default font to use it as SystemDefault.
     osDefaultFont = std::make_unique<QFont>(QApplication::font());
 
-    QString family = fontFamilyToString(FontFamily::Montserrat);
-    QString italic = "Italic";
-
-    std::map<QString, bool> mapStyles{
-        {"Thin", true},
-        {"ExtraLight", true},
-        {"Light", true},
-        {"Italic", false},
-        {"Regular", false},
-        {"Medium", true},
-        {"SemiBold", true},
-        {"Bold", true},
-        {"ExtraBold", true},
-        {"Black", true},
-    };
+    // Load Montserrat
+    const QString montserrat_str{fontFamilyToString(FontFamily::Montserrat)};
+    const QString italic_str{"Italic"};
 
-    QFontDatabase database;
     std::vector<int> vecFontIds;
-
-    for (const auto& it : mapStyles) {
-        QString font = ":fonts/" + family + "-" + it.first;
-        vecFontIds.push_back(QFontDatabase::addApplicationFont(font));
-        qDebug() << __func__ << ": " << font << " loaded with id " << vecFontIds.back();
-        if (it.second) {
-            vecFontIds.push_back(QFontDatabase::addApplicationFont(font + italic));
-            qDebug() << __func__ << ": " << font + italic << " loaded with id " << vecFontIds.back();
+    QString font_str;
+    // Import the italic Montserrat variant as it doesn't map to a weight
+    font_str = ":fonts/" + montserrat_str + "-" + italic_str;
+    vecFontIds.push_back(QFontDatabase::addApplicationFont(font_str));
+    qDebug() << __func__ << ": " << font_str << " loaded with id " << vecFontIds.back();
+    // Import the rest of Montserrat variants
+    for (const auto& [_, val] : mapMontserrat) {
+        const auto& [variant, can_italic] = val;
+        font_str = ":fonts/" + montserrat_str + "-" + variant;
+        vecFontIds.push_back(QFontDatabase::addApplicationFont(font_str));
+        qDebug() << __func__ << ": " << font_str << " loaded with id " << vecFontIds.back();
+        if (can_italic) {
+            vecFontIds.push_back(QFontDatabase::addApplicationFont(font_str + italic_str));
+            qDebug() << __func__ << ": " << font_str + italic_str << " loaded with id " << vecFontIds.back();
         }
     }
 
@@ -201,27 +207,28 @@ bool loadFonts()
         return false;
     }
 
+#ifndef QT_NO_DEBUG
+    QFontDatabase database;
+
     // Print debug logs for added fonts fetched by the added ids
     for (const auto& i : vecFontIds) {
-        auto families = QFontDatabase::applicationFontFamilies(i);
-        for (const QString& f : families) {
+        for (const QString& f : QFontDatabase::applicationFontFamilies(i)) {
             qDebug() << __func__ << ": - Font id " << i << " is family: " << f;
-            const QStringList fontStyles = database.styles(f);
-            for (const QString& style : fontStyles) {
+            for (const QString& style : database.styles(f)) {
                 qDebug() << __func__ << ": Style for family " << f << " with id: " << i << ": " << style;
             }
         }
     }
+
     // Print debug logs for added fonts fetched by the family name
-    const QStringList fontFamilies = database.families();
-    for (const QString& f : fontFamilies) {
-        if (f.contains(family)) {
-            const QStringList fontStyles = database.styles(f);
-            for (const QString& style : fontStyles) {
+    for (const QString& f : database.families()) {
+        if (f.contains(montserrat_str)) {
+            for (const QString& style : database.styles(f)) {
                 qDebug() << __func__ << ": Family: " << f << ", Style: " << style;
             }
         }
     }
+#endif // QT_NO_DEBUG
 
     setApplicationFont();
 
@@ -347,7 +354,7 @@ void setFont(const std::vector<QWidget*>& vecWidgets, FontWeight weight, int nPo
 
 void updateFonts()
 {
-    // Fonts need to be loaded by GUIIUtil::loadFonts(), if not just return.
+    // Fonts need to be loaded by GUIUtil::loadFonts(), if not just return.
     if (!osDefaultFont) {
         return;
     }
@@ -459,46 +466,35 @@ QFont getFont(FontFamily family, QFont::Weight qWeight, bool fItalic, int nPoint
     }
 
     if (family == FontFamily::Montserrat) {
-        static std::map<QFont::Weight, QString> mapMontserratMapping{
-            {QFont::Thin, "Thin"},
-            {QFont::ExtraLight, "ExtraLight"},
-            {QFont::Light, "Light"},
-            {QFont::Medium, "Medium"},
-            {QFont::DemiBold, "SemiBold"},
-            {QFont::ExtraBold, "ExtraBold"},
-            {QFont::Black, "Black"},
+        assert(mapMontserrat.count(qWeight));
 #ifdef Q_OS_MAC
-            {QFont::Normal, "Regular"},
-            {QFont::Bold, "Bold"},
-#else
-            {QFont::Normal, ""},
-            {QFont::Bold, ""},
-#endif
-        };
-
-        assert(mapMontserratMapping.count(qWeight));
-
-#ifdef Q_OS_MAC
-
-        QString styleName = mapMontserratMapping[qWeight];
-
-        if (fItalic) {
-            if (styleName == "Regular") {
-                styleName = "Italic";
-            } else {
-                styleName += " Italic";
-            }
-        }
-
         font.setFamily(fontFamilyToString(FontFamily::Montserrat));
-        font.setStyleName(styleName);
+        font.setStyleName([&](){
+            QString ret{std::get<0>(mapMontserrat.at(qWeight))};
+            if (fItalic) {
+                if (ret == "Regular") {
+                    ret = "Italic";
+                } else {
+                    ret += " Italic";
+                }
+            }
+            return ret;
+        }());
 #else
-        font.setFamily(fontFamilyToString(FontFamily::Montserrat) + " " + mapMontserratMapping[qWeight]);
-        font.setWeight(qWeight);
-        font.setStyle(fItalic ? QFont::StyleItalic : QFont::StyleNormal);
-#endif
+        if (qWeight == QFont::Normal || qWeight == QFont::Bold) {
+            font.setFamily(fontFamilyToString(FontFamily::Montserrat));
+        } else {
+            font.setFamily(fontFamilyToString(FontFamily::Montserrat) + " " + std::get<0>(mapMontserrat.at(qWeight)));
+        }
+#endif // Q_OS_MAC
     } else {
         font.setFamily(osDefaultFont->family());
+    }
+
+#ifdef Q_OS_MAC
+    if (family != FontFamily::Montserrat)
+#endif // Q_OS_MAC
+    {
         font.setWeight(qWeight);
         font.setStyle(fItalic ? QFont::StyleItalic : QFont::StyleNormal);
     }

From 2ea87ccca8ce65f9fca44c8178c86368048f145e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 28 Aug 2025 17:43:13 +0000
Subject: [PATCH 05/31] qt: recognize "Roboto Mono" as non-selectable font

---
 src/qt/appearancewidget.cpp |  4 ++--
 src/qt/guiutil_font.cpp     | 11 +++++++----
 src/qt/guiutil_font.h       | 10 ++++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/qt/appearancewidget.cpp b/src/qt/appearancewidget.cpp
index 82aafa0572e0b..e5b5954a7f4c1 100644
--- a/src/qt/appearancewidget.cpp
+++ b/src/qt/appearancewidget.cpp
@@ -28,8 +28,8 @@ AppearanceWidget::AppearanceWidget(QWidget* parent) :
         ui->theme->addItem(entry, QVariant(entry));
     }
 
-    for (const auto& [family, family_str] : GUIUtil::AVAILABLE_FONTS) {
-        ui->fontFamily->addItem(family_str, QVariant(static_cast<int>(family)));
+    for (const auto& [family, family_str, selectable] : GUIUtil::AVAILABLE_FONTS) {
+        if (selectable) ui->fontFamily->addItem(family_str, QVariant(static_cast<int>(family)));
     }
 
     updateWeightSlider();
diff --git a/src/qt/guiutil_font.cpp b/src/qt/guiutil_font.cpp
index bf3954733f17a..2ab06d494316d 100644
--- a/src/qt/guiutil_font.cpp
+++ b/src/qt/guiutil_font.cpp
@@ -55,7 +55,7 @@ static const std::map<QFont::Weight, std::tuple<QString, /*can_italic=*/bool>> m
 
 FontFamily fontFamilyFromString(const QString& strFamily)
 {
-    for (const auto& [family, family_str] : AVAILABLE_FONTS) {
+    for (const auto& [family, family_str, _] : AVAILABLE_FONTS) {
         if (strFamily == family_str) {
             return family;
         }
@@ -66,7 +66,7 @@ FontFamily fontFamilyFromString(const QString& strFamily)
 QString fontFamilyToString(FontFamily family)
 {
     assert(family <= FontFamily::MaxVal);
-    return AVAILABLE_FONTS[static_cast<size_t>(family)].second;
+    return std::get<1>(AVAILABLE_FONTS[static_cast<size_t>(family)]);
 }
 
 FontFamily getFontFamily()
@@ -259,7 +259,7 @@ bool loadFonts()
         return vecSupported;
     };
 
-    for (const auto& [family, _] : AVAILABLE_FONTS) {
+    for (const auto& [family, _, __] : AVAILABLE_FONTS) {
         mapSupportedWeights.insert(std::make_pair(family, supportedWeights(family)));
     }
 
@@ -292,7 +292,7 @@ bool loadFonts()
         mapDefaultWeights.emplace(family, std::make_pair(normalWeight, boldWeight));
     };
 
-    for (const auto& [family, _] : AVAILABLE_FONTS) {
+    for (const auto& [family, _, __] : AVAILABLE_FONTS) {
         addBestDefaults(family);
     }
 
@@ -487,6 +487,9 @@ QFont getFont(FontFamily family, QFont::Weight qWeight, bool fItalic, int nPoint
             font.setFamily(fontFamilyToString(FontFamily::Montserrat) + " " + std::get<0>(mapMontserrat.at(qWeight)));
         }
 #endif // Q_OS_MAC
+    } else if (family == FontFamily::RobotoMono) {
+        font.setFamily(fontFamilyToString(FontFamily::RobotoMono));
+        font.setStyleHint(QFont::Monospace);
     } else {
         font.setFamily(osDefaultFont->family());
     }
diff --git a/src/qt/guiutil_font.h b/src/qt/guiutil_font.h
index ad06320dfb9a2..6ee4b60fc7929 100644
--- a/src/qt/guiutil_font.h
+++ b/src/qt/guiutil_font.h
@@ -18,12 +18,14 @@ namespace GUIUtil {
 enum class FontFamily : int {
     SystemDefault,
     Montserrat,
-    MaxVal = Montserrat
+    RobotoMono,
+    MaxVal = RobotoMono
 };
 
-static const std::array<std::pair<FontFamily, QString>, 2> AVAILABLE_FONTS{{
-    {FontFamily::SystemDefault, QString{"SystemDefault"}},
-    {FontFamily::Montserrat, QString{"Montserrat"}},
+static const std::array<std::tuple<FontFamily, QString, /*selectable=*/bool>, 3> AVAILABLE_FONTS{{
+    {FontFamily::SystemDefault, QString{"SystemDefault"}, true},
+    {FontFamily::Montserrat, QString{"Montserrat"}, true},
+    {FontFamily::RobotoMono, QString{"Roboto Mono"}, false},
 }};
 
 FontFamily fontFamilyFromString(const QString& strFamily);

From daae3c18887e719af07a65ae0ec0fa4fe1f7caca Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 28 Aug 2025 17:48:27 +0000
Subject: [PATCH 06/31] qt: recognize system monospace font as non-selectable
 font

---
 src/qt/guiutil_font.cpp | 2 ++
 src/qt/guiutil_font.h   | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/qt/guiutil_font.cpp b/src/qt/guiutil_font.cpp
index 2ab06d494316d..6a3cee5ff6995 100644
--- a/src/qt/guiutil_font.cpp
+++ b/src/qt/guiutil_font.cpp
@@ -490,6 +490,8 @@ QFont getFont(FontFamily family, QFont::Weight qWeight, bool fItalic, int nPoint
     } else if (family == FontFamily::RobotoMono) {
         font.setFamily(fontFamilyToString(FontFamily::RobotoMono));
         font.setStyleHint(QFont::Monospace);
+    } else if (family == FontFamily::DefaultMonospace) {
+        font.setFamily(fixedPitchFont(/*use_embedded_font*/false).family());
     } else {
         font.setFamily(osDefaultFont->family());
     }
diff --git a/src/qt/guiutil_font.h b/src/qt/guiutil_font.h
index 6ee4b60fc7929..0dd04d1fb83c5 100644
--- a/src/qt/guiutil_font.h
+++ b/src/qt/guiutil_font.h
@@ -19,13 +19,15 @@ enum class FontFamily : int {
     SystemDefault,
     Montserrat,
     RobotoMono,
-    MaxVal = RobotoMono
+    DefaultMonospace,
+    MaxVal = DefaultMonospace
 };
 
-static const std::array<std::tuple<FontFamily, QString, /*selectable=*/bool>, 3> AVAILABLE_FONTS{{
+static const std::array<std::tuple<FontFamily, QString, /*selectable=*/bool>, 4> AVAILABLE_FONTS{{
     {FontFamily::SystemDefault, QString{"SystemDefault"}, true},
     {FontFamily::Montserrat, QString{"Montserrat"}, true},
     {FontFamily::RobotoMono, QString{"Roboto Mono"}, false},
+    {FontFamily::DefaultMonospace, QString{"DefaultMonospace"}, false},
 }};
 
 FontFamily fontFamilyFromString(const QString& strFamily);

From dcf919e093ba716675c3343ad194a7ef135aa4d2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 28 Aug 2025 19:33:20 +0000
Subject: [PATCH 07/31] qt: apply monospace font to overview page balances

---
 src/qt/guiutil_font.cpp | 21 +++++++++++----------
 src/qt/guiutil_font.h   |  2 +-
 src/qt/overviewpage.cpp | 18 ++++++++++++++++++
 src/qt/overviewpage.h   |  1 +
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/qt/guiutil_font.cpp b/src/qt/guiutil_font.cpp
index 6a3cee5ff6995..99d866bd25cc5 100644
--- a/src/qt/guiutil_font.cpp
+++ b/src/qt/guiutil_font.cpp
@@ -35,8 +35,8 @@ static int fontScale = g_font_defaults.scale;
 // Contains the weight settings separated for all available fonts
 static std::map<FontFamily, std::pair<QFont::Weight, QFont::Weight>> mapDefaultWeights;
 static std::map<FontFamily, std::pair<QFont::Weight, QFont::Weight>> mapWeights;
-// Contains all widgets and its font attributes (weight, italic, size) with font changes due to GUIUtil::setFont
-static std::map<QPointer<QWidget>, std::tuple<FontWeight, bool, int>> mapFontUpdates;
+// Contains all widgets and its font attributes (family, weight, italic, size) with font changes due to GUIUtil::setFont
+static std::map<QPointer<QWidget>, std::tuple<FontFamily, FontWeight, bool, int>> mapFontUpdates;
 // Contains a list of supported font weights for all members of GUIUtil::FontFamily
 static std::map<FontFamily, std::vector<QFont::Weight>> mapSupportedWeights;
 
@@ -342,9 +342,14 @@ void setApplicationFont()
 }
 
 void setFont(const std::vector<QWidget*>& vecWidgets, FontWeight weight, int nPointSize, bool fItalic)
+{
+    setFont(vecWidgets, fontFamily, weight, nPointSize, fItalic);
+}
+
+void setFont(const std::vector<QWidget*>& vecWidgets, FontFamily family, FontWeight weight, int nPointSize, bool fItalic)
 {
     for (auto it : vecWidgets) {
-        auto fontAttributes = std::make_tuple(weight, fItalic, nPointSize);
+        auto fontAttributes = std::make_tuple(family, weight, fItalic, nPointSize);
         auto itFontUpdate = mapFontUpdates.emplace(std::make_pair(it, fontAttributes));
         if (!itFontUpdate.second) {
             itFontUpdate.first->second = fontAttributes;
@@ -416,11 +421,11 @@ void updateFonts()
 
         auto it = mapFontUpdates.find(w);
         if (it != mapFontUpdates.end()) {
-            int nSize = std::get<2>(it->second);
+            int nSize = std::get<3>(it->second);
             if (nSize == -1) {
                 nSize = itDefault.first->second;
             }
-            font = getFont(std::get<0>(it->second), std::get<1>(it->second), nSize);
+            font = getFont(std::get<0>(it->second), toQFontWeight(std::get<1>(it->second)), std::get<2>(it->second), nSize);
         } else {
             font.setPointSizeF(getScaledFontSize(itDefault.first->second));
         }
@@ -515,13 +520,9 @@ QFont getFont(FontFamily family, QFont::Weight qWeight, bool fItalic, int nPoint
     return font;
 }
 
-QFont getFont(QFont::Weight qWeight, bool fItalic, int nPointSize)
-{
-    return getFont(fontFamily, qWeight, fItalic, nPointSize);
-}
 QFont getFont(FontWeight weight, bool fItalic, int nPointSize)
 {
-    return getFont(toQFontWeight(weight), fItalic, nPointSize);
+    return getFont(fontFamily, toQFontWeight(weight), fItalic, nPointSize);
 }
 
 QFont getFontNormal()
diff --git a/src/qt/guiutil_font.h b/src/qt/guiutil_font.h
index 0dd04d1fb83c5..f6c488711d38e 100644
--- a/src/qt/guiutil_font.h
+++ b/src/qt/guiutil_font.h
@@ -94,6 +94,7 @@ void setApplicationFont();
     issues loading variations of montserrat in css it also keeps track of the set fonts to update on
     theme changes. */
 void setFont(const std::vector<QWidget*>& vecWidgets, FontWeight weight, int nPointSize = -1, bool fItalic = false);
+void setFont(const std::vector<QWidget*>& vecWidgets, FontFamily family, FontWeight weight, int nPointSize = -1, bool fItalic = false);
 
 /** Update the font of all widgets where a custom font has been set with
     GUIUtil::setFont */
@@ -101,7 +102,6 @@ void updateFonts();
 
 /** Get a properly weighted QFont object with the selected font. */
 QFont getFont(FontFamily family, QFont::Weight qWeight, bool fItalic = false, int nPointSize = -1);
-QFont getFont(QFont::Weight qWeight, bool fItalic = false, int nPointSize = -1);
 QFont getFont(FontWeight weight, bool fItalic = false, int nPointSize = -1);
 
 /** Get the default normal QFont */
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 7ae5f4e5cf92f..d7d2be0088057 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -301,6 +301,7 @@ void OverviewPage::setClientModel(ClientModel *model)
         // Show warning, for example if this is a prerelease version
         connect(model, &ClientModel::alertsChanged, this, &OverviewPage::updateAlerts);
         updateAlerts(model->getStatusBarWarnings());
+        setMonospacedFont(false);
         // explicitly update CoinJoin frame and transaction list to reflect actual settings
         updateAdvancedCJUI(model->getOptionsModel()->getShowAdvancedCJUI());
     }
@@ -373,6 +374,23 @@ void OverviewPage::showOutOfSyncWarning(bool fShow)
     ui->labelTransactionsStatus->setVisible(fShow);
 }
 
+void OverviewPage::setMonospacedFont(bool use_embedded_font)
+{
+    GUIUtil::setFont({
+        ui->labelBalance,
+        ui->labelUnconfirmed,
+        ui->labelImmature,
+        ui->labelAnonymized,
+        ui->labelTotal,
+        ui->labelWatchAvailable,
+        ui->labelWatchPending,
+        ui->labelWatchImmature,
+        ui->labelWatchTotal
+    }, use_embedded_font ? GUIUtil::FontFamily::RobotoMono : GUIUtil::FontFamily::DefaultMonospace, GUIUtil::FontWeight::Bold);
+
+    GUIUtil::updateFonts();
+}
+
 void OverviewPage::updateCoinJoinProgress()
 {
     if (!walletModel || !clientModel || clientModel->node().shutdownRequested() || !clientModel->masternodeSync().isBlockchainSynced()) return;
diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h
index 5f1789f27d7a9..62d9a0dbc5d56 100644
--- a/src/qt/overviewpage.h
+++ b/src/qt/overviewpage.h
@@ -71,6 +71,7 @@ private Q_SLOTS:
     void handleTransactionClicked(const QModelIndex &index);
     void updateAlerts(const QString &warnings);
     void updateWatchOnlyLabels(bool showWatchOnly);
+    void setMonospacedFont(bool use_embedded_font);
 };
 
 #endif // BITCOIN_QT_OVERVIEWPAGE_H

From a1c5b68f26a380a82a5e61e86bd0e0b1a21886a6 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 29 Aug 2025 20:25:46 +0000
Subject: [PATCH 08/31] qt: add monospaced font settings

---
 src/qt/forms/optionsdialog.ui | 100 ++++++++++++++++++++++++++++++++++
 src/qt/guiutil_font.cpp       |   2 +-
 src/qt/optionsdialog.cpp      |  14 +++++
 src/qt/optionsmodel.cpp       |  13 +++++
 src/qt/optionsmodel.h         |   4 ++
 src/qt/overviewpage.cpp       |   3 +-
 6 files changed, 134 insertions(+), 2 deletions(-)

diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index d8f462c6e4b0c..cf630c8bd70dd 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -1055,6 +1055,106 @@ https://explore.transifex.com/dash/dash/</string>
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="QGroupBox" name="font_groupBox">
+         <property name="title">
+          <string>Monospaced font in the Overview tab:</string>
+         </property>
+         <layout class="QVBoxLayout" name="font_verticalLayout">
+          <item>
+           <layout class="QHBoxLayout" name="embeddedFont_horizontalLayout">
+            <item>
+             <widget class="QRadioButton" name="embeddedFont_radioButton">
+              <property name="text">
+               <string>embedded &quot;%1&quot;</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="embeddedFont_horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="embeddedFont_verticalLayout">
+              <item>
+               <widget class="QLabel" name="embeddedFont_label_1">
+                <property name="text">
+                 <string>111.11111111 DASH</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="embeddedFont_label_9">
+                <property name="text">
+                 <string>909.09090909 DASH</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="Line" name="font_line">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="systemFont_horizontalLayout">
+            <item>
+             <widget class="QRadioButton" name="systemFont_radioButton">
+              <property name="text">
+               <string>closest matching &quot;%1&quot;</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="systemFont_horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="systemFont_verticalLayout">
+              <item>
+               <widget class="QLabel" name="systemFont_label_1">
+                <property name="text">
+                 <string>111.11111111 DASH</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="systemFont_label_9">
+                <property name="text">
+                 <string>909.09090909 DASH</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
diff --git a/src/qt/guiutil_font.cpp b/src/qt/guiutil_font.cpp
index 99d866bd25cc5..4c918c895a41e 100644
--- a/src/qt/guiutil_font.cpp
+++ b/src/qt/guiutil_font.cpp
@@ -401,7 +401,7 @@ void updateFonts()
             "QScrollBar", "QListView", "BitcoinGUI", "WalletView", "WalletFrame", "QVBoxLayout", "QGroupBox"
         };
         std::vector<QString> vecIgnoreObjects{
-            "messagesWidget"
+            "embeddedFont_label_1", "embeddedFont_label_9", "messagesWidget", "systemFont_label_1", "systemFont_label_9"
         };
         if (std::find(vecIgnoreClasses.begin(), vecIgnoreClasses.end(), w->metaObject()->className()) != vecIgnoreClasses.end() ||
             std::find(vecIgnoreObjects.begin(), vecIgnoreObjects.end(), w->objectName()) != vecIgnoreObjects.end()) {
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 8cbd3bb9a07e4..d663a136b6787 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -13,6 +13,7 @@
 #include <qt/bitcoinunits.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
+#include <qt/guiutil_font.h>
 #include <qt/optionsmodel.h>
 
 #include <interfaces/coinjoin.h>
@@ -206,6 +207,18 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
         ui->minimizeToTray->setEnabled(false);
     }
 
+    QFont embedded_font{GUIUtil::getFont(GUIUtil::FontFamily::RobotoMono, toQFontWeight(GUIUtil::FontWeight::Bold))};
+    ui->embeddedFont_radioButton->setText(ui->embeddedFont_radioButton->text().arg(QFontInfo(embedded_font).family()));
+    ui->embeddedFont_label_1->setFont(embedded_font);
+    ui->embeddedFont_label_9->setFont(embedded_font);
+
+    QFont system_font{GUIUtil::getFont(GUIUtil::FontFamily::DefaultMonospace, toQFontWeight(GUIUtil::FontWeight::Bold))};
+    ui->systemFont_radioButton->setText(ui->systemFont_radioButton->text().arg(QFontInfo(system_font).family()));
+    ui->systemFont_label_1->setFont(system_font);
+    ui->systemFont_label_9->setFont(system_font);
+    // Checking the embeddedFont_radioButton automatically unchecks the systemFont_radioButton.
+    ui->systemFont_radioButton->setChecked(true);
+
     GUIUtil::handleCloseWindowShortcut(this);
 }
 
@@ -362,6 +375,7 @@ void OptionsDialog::setMapper()
     mapper->addMapping(ui->lang, OptionsModel::Language);
     mapper->addMapping(ui->unit, OptionsModel::DisplayUnit);
     mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls);
+    mapper->addMapping(ui->embeddedFont_radioButton, OptionsModel::UseEmbeddedMonospacedFont);
 
     /* Appearance
        See AppearanceWidget::setModel
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 095cc338e795f..bfb2b0e57813a 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -328,6 +328,12 @@ void OptionsModel::Init(bool resetSettings)
         addOverriddenOption("-lang");
 
     language = settings.value("language").toString();
+
+    if (!settings.contains("UseEmbeddedMonospacedFont")) {
+        settings.setValue("UseEmbeddedMonospacedFont", "true");
+    }
+    m_use_embedded_monospaced_font = settings.value("UseEmbeddedMonospacedFont").toBool();
+    Q_EMIT useEmbeddedMonospacedFontChanged(m_use_embedded_monospaced_font);
 }
 
 /** Helper function to copy contents from one QSettings to another.
@@ -549,6 +555,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
         }
         case Language:
             return settings.value("language");
+        case UseEmbeddedMonospacedFont:
+            return m_use_embedded_monospaced_font;
 #ifdef ENABLE_WALLET
         case CoinControlFeatures:
             return fCoinControlFeatures;
@@ -795,6 +803,11 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
                 setRestartRequired(true);
             }
             break;
+        case UseEmbeddedMonospacedFont:
+            m_use_embedded_monospaced_font = value.toBool();
+            settings.setValue("UseEmbeddedMonospacedFont", m_use_embedded_monospaced_font);
+            Q_EMIT useEmbeddedMonospacedFontChanged(m_use_embedded_monospaced_font);
+            break;
 #ifdef ENABLE_WALLET
         case CoinControlFeatures:
             fCoinControlFeatures = value.toBool();
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 95f6bc987023c..ac42a8beb687d 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -66,6 +66,7 @@ class OptionsModel : public QAbstractListModel
         FontWeightNormal,     // int
         FontWeightBold,       // int
         Language,             // QString
+        UseEmbeddedMonospacedFont, // bool
         CoinControlFeatures,  // bool
         SubFeeFromAmount,     // bool
         KeepChangeAddress,    // bool
@@ -106,6 +107,7 @@ class OptionsModel : public QAbstractListModel
     bool getMinimizeOnClose() const { return fMinimizeOnClose; }
     BitcoinUnit getDisplayUnit() const { return m_display_bitcoin_unit; }
     QString getThirdPartyTxUrls() const { return strThirdPartyTxUrls; }
+    bool getUseEmbeddedMonospacedFont() const { return m_use_embedded_monospaced_font; }
     bool getCoinControlFeatures() const { return fCoinControlFeatures; }
     bool getSubFeeFromAmount() const { return m_sub_fee_from_amount; }
     bool getKeepChangeAddress() const { return fKeepChangeAddress; }
@@ -134,6 +136,7 @@ class OptionsModel : public QAbstractListModel
     QString language;
     BitcoinUnit m_display_bitcoin_unit;
     QString strThirdPartyTxUrls;
+    bool m_use_embedded_monospaced_font;
     bool fCoinControlFeatures;
     bool m_sub_fee_from_amount;
     bool fKeepChangeAddress;
@@ -155,6 +158,7 @@ class OptionsModel : public QAbstractListModel
     void coinControlFeaturesChanged(bool);
     void keepChangeAddressChanged(bool);
     void showTrayIconChanged(bool);
+    void useEmbeddedMonospacedFontChanged(bool);
 };
 
 #endif // BITCOIN_QT_OPTIONSMODEL_H
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index d7d2be0088057..9783f80e91961 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -301,7 +301,8 @@ void OverviewPage::setClientModel(ClientModel *model)
         // Show warning, for example if this is a prerelease version
         connect(model, &ClientModel::alertsChanged, this, &OverviewPage::updateAlerts);
         updateAlerts(model->getStatusBarWarnings());
-        setMonospacedFont(false);
+        connect(model->getOptionsModel(), &OptionsModel::useEmbeddedMonospacedFontChanged, this, &OverviewPage::setMonospacedFont);
+        setMonospacedFont(model->getOptionsModel()->getUseEmbeddedMonospacedFont());
         // explicitly update CoinJoin frame and transaction list to reflect actual settings
         updateAdvancedCJUI(model->getOptionsModel()->getShowAdvancedCJUI());
     }

From 467e57c6734c94736b99871956f57883c17a0b63 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 28 Aug 2025 19:51:57 +0000
Subject: [PATCH 09/31] qt: adjust padding and font size of monospace font
 selector

---
 src/qt/forms/optionsdialog.ui | 12 ++++++++++++
 src/qt/optionsdialog.cpp      |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index cf630c8bd70dd..2039a7682e1e2 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -1061,6 +1061,18 @@ https://explore.transifex.com/dash/dash/</string>
           <string>Monospaced font in the Overview tab:</string>
          </property>
          <layout class="QVBoxLayout" name="font_verticalLayout">
+          <property name="leftMargin">
+           <number>18</number>
+          </property>
+          <property name="topMargin">
+           <number>18</number>
+          </property>
+          <property name="rightMargin">
+           <number>18</number>
+          </property>
+          <property name="bottomMargin">
+           <number>18</number>
+          </property>
           <item>
            <layout class="QHBoxLayout" name="embeddedFont_horizontalLayout">
             <item>
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index d663a136b6787..0be146e7d4ff8 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -207,12 +207,14 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
         ui->minimizeToTray->setEnabled(false);
     }
 
-    QFont embedded_font{GUIUtil::getFont(GUIUtil::FontFamily::RobotoMono, toQFontWeight(GUIUtil::FontWeight::Bold))};
+    QFont embedded_font{GUIUtil::getFont(GUIUtil::FontFamily::RobotoMono, toQFontWeight(GUIUtil::FontWeight::Bold),
+                                         /*fItalic=*/false, /*nPointSize=*/10)};
     ui->embeddedFont_radioButton->setText(ui->embeddedFont_radioButton->text().arg(QFontInfo(embedded_font).family()));
     ui->embeddedFont_label_1->setFont(embedded_font);
     ui->embeddedFont_label_9->setFont(embedded_font);
 
-    QFont system_font{GUIUtil::getFont(GUIUtil::FontFamily::DefaultMonospace, toQFontWeight(GUIUtil::FontWeight::Bold))};
+    QFont system_font{GUIUtil::getFont(GUIUtil::FontFamily::DefaultMonospace, toQFontWeight(GUIUtil::FontWeight::Bold),
+                                       /*fItalic=*/false, /*nPointSize=*/10)};
     ui->systemFont_radioButton->setText(ui->systemFont_radioButton->text().arg(QFontInfo(system_font).family()));
     ui->systemFont_label_1->setFont(system_font);
     ui->systemFont_label_9->setFont(system_font);

From 3abaeeee91e3ab0cf072c08455aa21aa8f027523 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 28 Aug 2025 19:53:37 +0000
Subject: [PATCH 10/31] merge bitcoin-core/gui#79: Embed monospaced font

includes:
- 22e0114d055b0ac6cdc47af2968b5dc742ba055a
- 67f26319a0ca7e34e3db17d9330133622a40de09

continuation of 7774bdb423 from dash#6049

From fd6ec64808ec26d6ec5e1fd6737a15b92d90e3ab Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 18 Aug 2025 16:19:36 +0000
Subject: [PATCH 11/31] merge bitcoin-core/gui#600: Add OptionsModel
 getOption/setOption methods

---
 src/qt/optionsmodel.cpp | 754 ++++++++++++++++++++--------------------
 src/qt/optionsmodel.h   |   2 +
 2 files changed, 385 insertions(+), 371 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index bfb2b0e57813a..1a9cbeb45826f 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -455,414 +455,426 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
 {
     if(role == Qt::EditRole)
     {
-        QSettings settings;
-        switch(index.row())
-        {
-        case StartAtStartup:
-            return GUIUtil::GetStartOnSystemStartup();
-        case ShowTrayIcon:
-            return m_show_tray_icon;
-        case MinimizeToTray:
-            return fMinimizeToTray;
-        case MapPortUPnP:
+        return getOption(OptionID(index.row()));
+    }
+    return QVariant();
+}
+
+// write QSettings values
+bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, int role)
+{
+    bool successful = true; /* set to false on parse error */
+    if(role == Qt::EditRole)
+    {
+        successful = setOption(OptionID(index.row()), value);
+    }
+
+    Q_EMIT dataChanged(index, index);
+
+    return successful;
+}
+
+QVariant OptionsModel::getOption(OptionID option) const
+{
+    QSettings settings;
+    switch (option) {
+    case StartAtStartup:
+        return GUIUtil::GetStartOnSystemStartup();
+    case ShowTrayIcon:
+        return m_show_tray_icon;
+    case MinimizeToTray:
+        return fMinimizeToTray;
+    case MapPortUPnP:
 #ifdef USE_UPNP
-            return settings.value("fUseUPnP");
+        return settings.value("fUseUPnP");
 #else
-            return false;
+        return false;
 #endif // USE_UPNP
-        case MapPortNatpmp:
+    case MapPortNatpmp:
 #ifdef USE_NATPMP
-            return settings.value("fUseNatpmp");
+        return settings.value("fUseNatpmp");
 #else
-            return false;
+        return false;
 #endif // USE_NATPMP
-        case MinimizeOnClose:
-            return fMinimizeOnClose;
-
-        // default proxy
-        case ProxyUse:
-            return settings.value("fUseProxy", false);
-        case ProxyIP:
-            return GetProxySetting(settings, "addrProxy").ip;
-        case ProxyPort:
-            return GetProxySetting(settings, "addrProxy").port;
-
-        // separate Tor proxy
-        case ProxyUseTor:
-            return settings.value("fUseSeparateProxyTor", false);
-        case ProxyIPTor:
-            return GetProxySetting(settings, "addrSeparateProxyTor").ip;
-        case ProxyPortTor:
-            return GetProxySetting(settings, "addrSeparateProxyTor").port;
+    case MinimizeOnClose:
+        return fMinimizeOnClose;
+
+    // default proxy
+    case ProxyUse:
+        return settings.value("fUseProxy", false);
+    case ProxyIP:
+        return GetProxySetting(settings, "addrProxy").ip;
+    case ProxyPort:
+        return GetProxySetting(settings, "addrProxy").port;
+
+    // separate Tor proxy
+    case ProxyUseTor:
+        return settings.value("fUseSeparateProxyTor", false);
+    case ProxyIPTor:
+        return GetProxySetting(settings, "addrSeparateProxyTor").ip;
+    case ProxyPortTor:
+        return GetProxySetting(settings, "addrSeparateProxyTor").port;
 
 #ifdef ENABLE_WALLET
-        case SpendZeroConfChange:
-            return settings.value("bSpendZeroConfChange");
-        case SubFeeFromAmount:
-            return m_sub_fee_from_amount;
-        case ShowMasternodesTab:
-            return settings.value("fShowMasternodesTab");
-        case ShowGovernanceTab:
-            return settings.value("fShowGovernanceTab");
-        case CoinJoinEnabled:
-            return settings.value("fCoinJoinEnabled");
-        case ShowAdvancedCJUI:
-            return fShowAdvancedCJUI;
-        case ShowCoinJoinPopups:
-            return settings.value("fShowCoinJoinPopups");
-        case LowKeysWarning:
-            return settings.value("fLowKeysWarning");
-        case CoinJoinSessions:
-            return settings.value("nCoinJoinSessions");
-        case CoinJoinRounds:
-            return settings.value("nCoinJoinRounds");
-        case CoinJoinAmount:
-            return settings.value("nCoinJoinAmount");
-        case CoinJoinDenomsGoal:
-            return settings.value("nCoinJoinDenomsGoal");
-        case CoinJoinDenomsHardCap:
-            return settings.value("nCoinJoinDenomsHardCap");
-        case CoinJoinMultiSession:
-            return settings.value("fCoinJoinMultiSession");
+    case SpendZeroConfChange:
+        return settings.value("bSpendZeroConfChange");
+    case SubFeeFromAmount:
+        return m_sub_fee_from_amount;
+    case ShowMasternodesTab:
+        return settings.value("fShowMasternodesTab");
+    case ShowGovernanceTab:
+        return settings.value("fShowGovernanceTab");
+    case CoinJoinEnabled:
+        return settings.value("fCoinJoinEnabled");
+    case ShowAdvancedCJUI:
+        return fShowAdvancedCJUI;
+    case ShowCoinJoinPopups:
+        return settings.value("fShowCoinJoinPopups");
+    case LowKeysWarning:
+        return settings.value("fLowKeysWarning");
+    case CoinJoinSessions:
+        return settings.value("nCoinJoinSessions");
+    case CoinJoinRounds:
+        return settings.value("nCoinJoinRounds");
+    case CoinJoinAmount:
+        return settings.value("nCoinJoinAmount");
+    case CoinJoinDenomsGoal:
+        return settings.value("nCoinJoinDenomsGoal");
+    case CoinJoinDenomsHardCap:
+        return settings.value("nCoinJoinDenomsHardCap");
+    case CoinJoinMultiSession:
+        return settings.value("fCoinJoinMultiSession");
 #endif
-        case DisplayUnit:
-            return QVariant::fromValue(m_display_bitcoin_unit);
-        case ThirdPartyTxUrls:
-            return strThirdPartyTxUrls;
+    case DisplayUnit:
+        return QVariant::fromValue(m_display_bitcoin_unit);
+    case ThirdPartyTxUrls:
+        return strThirdPartyTxUrls;
 #ifdef ENABLE_WALLET
-        case Digits:
-            return settings.value("digits");
+    case Digits:
+        return settings.value("digits");
 #endif // ENABLE_WALLET
-        case Theme:
-            return settings.value("theme");
-        case FontFamily:
-            return settings.value("fontFamily");
-        case FontScale:
-            return settings.value("fontScale");
-        case FontWeightNormal: {
-            QFont::Weight weight;
-            GUIUtil::weightFromArg(settings.value("fontWeightNormal").toInt(), weight);
-            int nIndex = GUIUtil::supportedWeightToIndex(weight);
-            assert(nIndex != -1);
-            return nIndex;
-        }
-        case FontWeightBold: {
-            QFont::Weight weight;
-            GUIUtil::weightFromArg(settings.value("fontWeightBold").toInt(), weight);
-            int nIndex = GUIUtil::supportedWeightToIndex(weight);
-            assert(nIndex != -1);
-            return nIndex;
-        }
-        case Language:
-            return settings.value("language");
-        case UseEmbeddedMonospacedFont:
-            return m_use_embedded_monospaced_font;
+    case Theme:
+        return settings.value("theme");
+    case FontFamily:
+        return settings.value("fontFamily");
+    case FontScale:
+        return settings.value("fontScale");
+    case FontWeightNormal: {
+        QFont::Weight weight;
+        GUIUtil::weightFromArg(settings.value("fontWeightNormal").toInt(), weight);
+        int nIndex = GUIUtil::supportedWeightToIndex(weight);
+        assert(nIndex != -1);
+        return nIndex;
+    }
+    case FontWeightBold: {
+        QFont::Weight weight;
+        GUIUtil::weightFromArg(settings.value("fontWeightBold").toInt(), weight);
+        int nIndex = GUIUtil::supportedWeightToIndex(weight);
+        assert(nIndex != -1);
+        return nIndex;
+    }
+    case Language:
+        return settings.value("language");
+    case UseEmbeddedMonospacedFont:
+        return m_use_embedded_monospaced_font;
 #ifdef ENABLE_WALLET
-        case CoinControlFeatures:
-            return fCoinControlFeatures;
-        case KeepChangeAddress:
-            return fKeepChangeAddress;
+    case CoinControlFeatures:
+        return fCoinControlFeatures;
+    case KeepChangeAddress:
+        return fKeepChangeAddress;
 #endif // ENABLE_WALLET
-        case Prune:
-            return settings.value("bPrune");
-        case PruneSize:
-            return settings.value("nPruneSize");
-        case DatabaseCache:
-            return settings.value("nDatabaseCache");
-        case ThreadsScriptVerif:
-            return settings.value("nThreadsScriptVerif");
-        case Listen:
-            return settings.value("fListen");
-        case Server:
-            return settings.value("server");
-        default:
-            return QVariant();
-        }
+    case Prune:
+        return settings.value("bPrune");
+    case PruneSize:
+        return settings.value("nPruneSize");
+    case DatabaseCache:
+        return settings.value("nDatabaseCache");
+    case ThreadsScriptVerif:
+        return settings.value("nThreadsScriptVerif");
+    case Listen:
+        return settings.value("fListen");
+    case Server:
+        return settings.value("server");
+    default:
+        return QVariant();
     }
-    return QVariant();
 }
 
-// write QSettings values
-bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, int role)
+bool OptionsModel::setOption(OptionID option, const QVariant& value)
 {
     bool successful = true; /* set to false on parse error */
-    if(role == Qt::EditRole)
-    {
-        QSettings settings;
-        switch(index.row())
-        {
-        case StartAtStartup:
-            successful = GUIUtil::SetStartOnSystemStartup(value.toBool());
-            break;
-        case ShowTrayIcon:
-            m_show_tray_icon = value.toBool();
-            settings.setValue("fHideTrayIcon", !m_show_tray_icon);
-            Q_EMIT showTrayIconChanged(m_show_tray_icon);
-            break;
-        case MinimizeToTray:
-            fMinimizeToTray = value.toBool();
-            settings.setValue("fMinimizeToTray", fMinimizeToTray);
-            break;
-        case MapPortUPnP: // core option - can be changed on-the-fly
-            settings.setValue("fUseUPnP", value.toBool());
-            break;
-        case MapPortNatpmp: // core option - can be changed on-the-fly
-            settings.setValue("fUseNatpmp", value.toBool());
-            break;
-        case MinimizeOnClose:
-            fMinimizeOnClose = value.toBool();
-            settings.setValue("fMinimizeOnClose", fMinimizeOnClose);
-            break;
-
-        // default proxy
-        case ProxyUse:
-            if (settings.value("fUseProxy") != value) {
-                settings.setValue("fUseProxy", value.toBool());
-                setRestartRequired(true);
-            }
-            break;
-        case ProxyIP: {
-            auto ip_port = GetProxySetting(settings, "addrProxy");
-            if (!ip_port.is_set || ip_port.ip != value.toString()) {
-                ip_port.ip = value.toString();
-                SetProxySetting(settings, "addrProxy", ip_port);
-                setRestartRequired(true);
-            }
-        }
+    QSettings settings;
+
+    switch (option) {
+    case StartAtStartup:
+        successful = GUIUtil::SetStartOnSystemStartup(value.toBool());
         break;
-        case ProxyPort: {
-            auto ip_port = GetProxySetting(settings, "addrProxy");
-            if (!ip_port.is_set || ip_port.port != value.toString()) {
-                ip_port.port = value.toString();
-                SetProxySetting(settings, "addrProxy", ip_port);
-                setRestartRequired(true);
-            }
-        }
+    case ShowTrayIcon:
+        m_show_tray_icon = value.toBool();
+        settings.setValue("fHideTrayIcon", !m_show_tray_icon);
+        Q_EMIT showTrayIconChanged(m_show_tray_icon);
+        break;
+    case MinimizeToTray:
+        fMinimizeToTray = value.toBool();
+        settings.setValue("fMinimizeToTray", fMinimizeToTray);
+        break;
+    case MapPortUPnP: // core option - can be changed on-the-fly
+        settings.setValue("fUseUPnP", value.toBool());
+        break;
+    case MapPortNatpmp: // core option - can be changed on-the-fly
+        settings.setValue("fUseNatpmp", value.toBool());
+        break;
+    case MinimizeOnClose:
+        fMinimizeOnClose = value.toBool();
+        settings.setValue("fMinimizeOnClose", fMinimizeOnClose);
         break;
 
-        // separate Tor proxy
-        case ProxyUseTor:
-            if (settings.value("fUseSeparateProxyTor") != value) {
-                settings.setValue("fUseSeparateProxyTor", value.toBool());
-                setRestartRequired(true);
-            }
-            break;
-        case ProxyIPTor: {
-            auto ip_port = GetProxySetting(settings, "addrSeparateProxyTor");
-            if (!ip_port.is_set || ip_port.ip != value.toString()) {
-                ip_port.ip = value.toString();
-                SetProxySetting(settings, "addrSeparateProxyTor", ip_port);
-                setRestartRequired(true);
-            }
+    // default proxy
+    case ProxyUse:
+        if (settings.value("fUseProxy") != value) {
+            settings.setValue("fUseProxy", value.toBool());
+            setRestartRequired(true);
         }
         break;
-        case ProxyPortTor: {
-            auto ip_port = GetProxySetting(settings, "addrSeparateProxyTor");
-            if (!ip_port.is_set || ip_port.port != value.toString()) {
-                ip_port.port = value.toString();
-                SetProxySetting(settings, "addrSeparateProxyTor", ip_port);
-                setRestartRequired(true);
-            }
+    case ProxyIP: {
+        auto ip_port = GetProxySetting(settings, "addrProxy");
+        if (!ip_port.is_set || ip_port.ip != value.toString()) {
+            ip_port.ip = value.toString();
+            SetProxySetting(settings, "addrProxy", ip_port);
+            setRestartRequired(true);
+        }
+    }
+    break;
+    case ProxyPort: {
+        auto ip_port = GetProxySetting(settings, "addrProxy");
+        if (!ip_port.is_set || ip_port.port != value.toString()) {
+            ip_port.port = value.toString();
+            SetProxySetting(settings, "addrProxy", ip_port);
+            setRestartRequired(true);
+        }
+    }
+    break;
+
+    // separate Tor proxy
+    case ProxyUseTor:
+        if (settings.value("fUseSeparateProxyTor") != value) {
+            settings.setValue("fUseSeparateProxyTor", value.toBool());
+            setRestartRequired(true);
         }
         break;
+    case ProxyIPTor: {
+        auto ip_port = GetProxySetting(settings, "addrSeparateProxyTor");
+        if (!ip_port.is_set || ip_port.ip != value.toString()) {
+            ip_port.ip = value.toString();
+            SetProxySetting(settings, "addrSeparateProxyTor", ip_port);
+            setRestartRequired(true);
+        }
+    }
+    break;
+    case ProxyPortTor: {
+        auto ip_port = GetProxySetting(settings, "addrSeparateProxyTor");
+        if (!ip_port.is_set || ip_port.port != value.toString()) {
+            ip_port.port = value.toString();
+            SetProxySetting(settings, "addrSeparateProxyTor", ip_port);
+            setRestartRequired(true);
+        }
+    }
+    break;
 
 #ifdef ENABLE_WALLET
-        case SpendZeroConfChange:
-            if (settings.value("bSpendZeroConfChange") != value) {
-                settings.setValue("bSpendZeroConfChange", value);
-                setRestartRequired(true);
-            }
-            break;
-        case ShowMasternodesTab:
-            if (settings.value("fShowMasternodesTab") != value) {
-                settings.setValue("fShowMasternodesTab", value);
-                setRestartRequired(true);
-            }
-            break;
-        case SubFeeFromAmount:
-            m_sub_fee_from_amount = value.toBool();
-            settings.setValue("SubFeeFromAmount", m_sub_fee_from_amount);
-            break;
-        case ShowGovernanceTab:
-            if (settings.value("fShowGovernanceTab") != value) {
-                settings.setValue("fShowGovernanceTab", value);
-                setRestartRequired(true);
-            }
-            break;
-        case CoinJoinEnabled:
-            if (settings.value("fCoinJoinEnabled") != value) {
-                settings.setValue("fCoinJoinEnabled", value.toBool());
-                Q_EMIT coinJoinEnabledChanged();
-            }
-            break;
-        case ShowAdvancedCJUI:
-            if (settings.value("fShowAdvancedCJUI") != value) {
-                fShowAdvancedCJUI = value.toBool();
-                settings.setValue("fShowAdvancedCJUI", fShowAdvancedCJUI);
-                Q_EMIT AdvancedCJUIChanged(fShowAdvancedCJUI);
-            }
-            break;
-        case ShowCoinJoinPopups:
-            settings.setValue("fShowCoinJoinPopups", value);
-            break;
-        case LowKeysWarning:
-            settings.setValue("fLowKeysWarning", value);
-            break;
-        case CoinJoinSessions:
-            if (settings.value("nCoinJoinSessions") != value) {
-                node().coinJoinOptions().setSessions(value.toInt());
-                settings.setValue("nCoinJoinSessions", node().coinJoinOptions().getSessions());
-                Q_EMIT coinJoinRoundsChanged();
-            }
-            break;
-        case CoinJoinRounds:
-            if (settings.value("nCoinJoinRounds") != value)
-            {
-                node().coinJoinOptions().setRounds(value.toInt());
-                settings.setValue("nCoinJoinRounds", node().coinJoinOptions().getRounds());
-                Q_EMIT coinJoinRoundsChanged();
-            }
-            break;
-        case CoinJoinAmount:
-            if (settings.value("nCoinJoinAmount") != value)
-            {
-                node().coinJoinOptions().setAmount(value.toInt());
-                settings.setValue("nCoinJoinAmount", node().coinJoinOptions().getAmount());
-                Q_EMIT coinJoinAmountChanged();
-            }
-            break;
-        case CoinJoinDenomsGoal:
-            if (settings.value("nCoinJoinDenomsGoal") != value) {
-                node().coinJoinOptions().setDenomsGoal(value.toInt());
-                settings.setValue("nCoinJoinDenomsGoal", node().coinJoinOptions().getDenomsGoal());
-            }
-            break;
-        case CoinJoinDenomsHardCap:
-            if (settings.value("nCoinJoinDenomsHardCap") != value) {
-                node().coinJoinOptions().setDenomsHardCap(value.toInt());
-                settings.setValue("nCoinJoinDenomsHardCap", node().coinJoinOptions().getDenomsHardCap());
-            }
-            break;
-        case CoinJoinMultiSession:
-            if (settings.value("fCoinJoinMultiSession") != value)
-            {
-                node().coinJoinOptions().setMultiSessionEnabled(value.toBool());
-                settings.setValue("fCoinJoinMultiSession", node().coinJoinOptions().isMultiSessionEnabled());
-            }
-            break;
+    case SpendZeroConfChange:
+        if (settings.value("bSpendZeroConfChange") != value) {
+            settings.setValue("bSpendZeroConfChange", value);
+            setRestartRequired(true);
+        }
+        break;
+    case ShowMasternodesTab:
+        if (settings.value("fShowMasternodesTab") != value) {
+            settings.setValue("fShowMasternodesTab", value);
+            setRestartRequired(true);
+        }
+        break;
+    case SubFeeFromAmount:
+        m_sub_fee_from_amount = value.toBool();
+        settings.setValue("SubFeeFromAmount", m_sub_fee_from_amount);
+        break;
+    case ShowGovernanceTab:
+        if (settings.value("fShowGovernanceTab") != value) {
+            settings.setValue("fShowGovernanceTab", value);
+            setRestartRequired(true);
+        }
+        break;
+    case CoinJoinEnabled:
+        if (settings.value("fCoinJoinEnabled") != value) {
+            settings.setValue("fCoinJoinEnabled", value.toBool());
+            Q_EMIT coinJoinEnabledChanged();
+        }
+        break;
+    case ShowAdvancedCJUI:
+        if (settings.value("fShowAdvancedCJUI") != value) {
+            fShowAdvancedCJUI = value.toBool();
+            settings.setValue("fShowAdvancedCJUI", fShowAdvancedCJUI);
+            Q_EMIT AdvancedCJUIChanged(fShowAdvancedCJUI);
+        }
+        break;
+    case ShowCoinJoinPopups:
+        settings.setValue("fShowCoinJoinPopups", value);
+        break;
+    case LowKeysWarning:
+        settings.setValue("fLowKeysWarning", value);
+        break;
+    case CoinJoinSessions:
+        if (settings.value("nCoinJoinSessions") != value) {
+            node().coinJoinOptions().setSessions(value.toInt());
+            settings.setValue("nCoinJoinSessions", node().coinJoinOptions().getSessions());
+            Q_EMIT coinJoinRoundsChanged();
+        }
+        break;
+    case CoinJoinRounds:
+        if (settings.value("nCoinJoinRounds") != value)
+        {
+            node().coinJoinOptions().setRounds(value.toInt());
+            settings.setValue("nCoinJoinRounds", node().coinJoinOptions().getRounds());
+            Q_EMIT coinJoinRoundsChanged();
+        }
+        break;
+    case CoinJoinAmount:
+        if (settings.value("nCoinJoinAmount") != value)
+        {
+            node().coinJoinOptions().setAmount(value.toInt());
+            settings.setValue("nCoinJoinAmount", node().coinJoinOptions().getAmount());
+            Q_EMIT coinJoinAmountChanged();
+        }
+        break;
+    case CoinJoinDenomsGoal:
+        if (settings.value("nCoinJoinDenomsGoal") != value) {
+            node().coinJoinOptions().setDenomsGoal(value.toInt());
+            settings.setValue("nCoinJoinDenomsGoal", node().coinJoinOptions().getDenomsGoal());
+        }
+        break;
+    case CoinJoinDenomsHardCap:
+        if (settings.value("nCoinJoinDenomsHardCap") != value) {
+            node().coinJoinOptions().setDenomsHardCap(value.toInt());
+            settings.setValue("nCoinJoinDenomsHardCap", node().coinJoinOptions().getDenomsHardCap());
+        }
+        break;
+    case CoinJoinMultiSession:
+        if (settings.value("fCoinJoinMultiSession") != value)
+        {
+            node().coinJoinOptions().setMultiSessionEnabled(value.toBool());
+            settings.setValue("fCoinJoinMultiSession", node().coinJoinOptions().isMultiSessionEnabled());
+        }
+        break;
 #endif
-        case DisplayUnit:
-            setDisplayUnit(value);
-            break;
-        case ThirdPartyTxUrls:
-            if (strThirdPartyTxUrls != value.toString()) {
-                strThirdPartyTxUrls = value.toString();
-                settings.setValue("strThirdPartyTxUrls", strThirdPartyTxUrls);
-                setRestartRequired(true);
-            }
-            break;
+    case DisplayUnit:
+        setDisplayUnit(value);
+        break;
+    case ThirdPartyTxUrls:
+        if (strThirdPartyTxUrls != value.toString()) {
+            strThirdPartyTxUrls = value.toString();
+            settings.setValue("strThirdPartyTxUrls", strThirdPartyTxUrls);
+            setRestartRequired(true);
+        }
+        break;
 #ifdef ENABLE_WALLET
-        case Digits:
-            if (settings.value("digits") != value) {
-                settings.setValue("digits", value);
-                setRestartRequired(true);
-            }
-            break;
+    case Digits:
+        if (settings.value("digits") != value) {
+            settings.setValue("digits", value);
+            setRestartRequired(true);
+        }
+        break;
 #endif // ENABLE_WALLET
-        case Theme:
-            // Set in AppearanceWidget::updateTheme slot now
-            // to allow instant theme changes.
-            break;
-        case FontFamily:
-            if (settings.value("fontFamily") != value) {
-                settings.setValue("fontFamily", value);
-            }
-            break;
-        case FontScale:
-            if (settings.value("fontScale") != value) {
-                settings.setValue("fontScale", value);
-            }
-            break;
-        case FontWeightNormal: {
-            int nWeight = GUIUtil::weightToArg(GUIUtil::supportedWeightFromIndex(value.toInt()));
-            if (settings.value("fontWeightNormal") != nWeight) {
-                settings.setValue("fontWeightNormal", nWeight);
-            }
-            break;
+    case Theme:
+        // Set in AppearanceWidget::updateTheme slot now
+        // to allow instant theme changes.
+        break;
+    case FontFamily:
+        if (settings.value("fontFamily") != value) {
+            settings.setValue("fontFamily", value);
         }
-        case FontWeightBold: {
-            int nWeight = GUIUtil::weightToArg(GUIUtil::supportedWeightFromIndex(value.toInt()));
-            if (settings.value("fontWeightBold") != nWeight) {
-                settings.setValue("fontWeightBold", nWeight);
-            }
-            break;
+        break;
+    case FontScale:
+        if (settings.value("fontScale") != value) {
+            settings.setValue("fontScale", value);
         }
-        case Language:
-            if (settings.value("language") != value) {
-                settings.setValue("language", value);
-                setRestartRequired(true);
-            }
-            break;
-        case UseEmbeddedMonospacedFont:
-            m_use_embedded_monospaced_font = value.toBool();
-            settings.setValue("UseEmbeddedMonospacedFont", m_use_embedded_monospaced_font);
-            Q_EMIT useEmbeddedMonospacedFontChanged(m_use_embedded_monospaced_font);
-            break;
+        break;
+    case FontWeightNormal: {
+        int nWeight = GUIUtil::weightToArg(GUIUtil::supportedWeightFromIndex(value.toInt()));
+        if (settings.value("fontWeightNormal") != nWeight) {
+            settings.setValue("fontWeightNormal", nWeight);
+        }
+        break;
+    }
+    case FontWeightBold: {
+        int nWeight = GUIUtil::weightToArg(GUIUtil::supportedWeightFromIndex(value.toInt()));
+        if (settings.value("fontWeightBold") != nWeight) {
+            settings.setValue("fontWeightBold", nWeight);
+        }
+        break;
+    }
+    case Language:
+        if (settings.value("language") != value) {
+            settings.setValue("language", value);
+            setRestartRequired(true);
+        }
+        break;
+    case UseEmbeddedMonospacedFont:
+        m_use_embedded_monospaced_font = value.toBool();
+        settings.setValue("UseEmbeddedMonospacedFont", m_use_embedded_monospaced_font);
+        Q_EMIT useEmbeddedMonospacedFontChanged(m_use_embedded_monospaced_font);
+        break;
 #ifdef ENABLE_WALLET
-        case CoinControlFeatures:
-            fCoinControlFeatures = value.toBool();
-            settings.setValue("fCoinControlFeatures", fCoinControlFeatures);
-            Q_EMIT coinControlFeaturesChanged(fCoinControlFeatures);
-            break;
-        case KeepChangeAddress:
-            fKeepChangeAddress = value.toBool();
-            settings.setValue("fKeepChangeAddress", fKeepChangeAddress);
-            Q_EMIT keepChangeAddressChanged(fKeepChangeAddress);
-            break;
-        case Prune:
-            if (settings.value("bPrune") != value) {
-                settings.setValue("bPrune", value);
-                setRestartRequired(true);
-            }
-            break;
-        case PruneSize:
-            if (settings.value("nPruneSize") != value) {
-                settings.setValue("nPruneSize", value);
-                setRestartRequired(true);
-            }
-            break;
+    case CoinControlFeatures:
+        fCoinControlFeatures = value.toBool();
+        settings.setValue("fCoinControlFeatures", fCoinControlFeatures);
+        Q_EMIT coinControlFeaturesChanged(fCoinControlFeatures);
+        break;
+    case KeepChangeAddress:
+        fKeepChangeAddress = value.toBool();
+        settings.setValue("fKeepChangeAddress", fKeepChangeAddress);
+        Q_EMIT keepChangeAddressChanged(fKeepChangeAddress);
+        break;
+    case Prune:
+        if (settings.value("bPrune") != value) {
+            settings.setValue("bPrune", value);
+            setRestartRequired(true);
+        }
+        break;
+    case PruneSize:
+        if (settings.value("nPruneSize") != value) {
+            settings.setValue("nPruneSize", value);
+            setRestartRequired(true);
+        }
+        break;
 #endif // ENABLE_WALLET
-        case DatabaseCache:
-            if (settings.value("nDatabaseCache") != value) {
-                settings.setValue("nDatabaseCache", value);
-                setRestartRequired(true);
-            }
-            break;
-        case ThreadsScriptVerif:
-            if (settings.value("nThreadsScriptVerif") != value) {
-                settings.setValue("nThreadsScriptVerif", value);
-                setRestartRequired(true);
-            }
-            break;
-        case Listen:
-            if (settings.value("fListen") != value) {
-                settings.setValue("fListen", value);
-                setRestartRequired(true);
-            }
-            break;
-        case Server:
-            if (settings.value("server") != value) {
-                settings.setValue("server", value);
-                setRestartRequired(true);
-            }
-            break;
-        default:
-            break;
+    case DatabaseCache:
+        if (settings.value("nDatabaseCache") != value) {
+            settings.setValue("nDatabaseCache", value);
+            setRestartRequired(true);
+        }
+        break;
+    case ThreadsScriptVerif:
+        if (settings.value("nThreadsScriptVerif") != value) {
+            settings.setValue("nThreadsScriptVerif", value);
+            setRestartRequired(true);
         }
+        break;
+    case Listen:
+        if (settings.value("fListen") != value) {
+            settings.setValue("fListen", value);
+            setRestartRequired(true);
+        }
+        break;
+    case Server:
+        if (settings.value("server") != value) {
+            settings.setValue("server", value);
+            setRestartRequired(true);
+        }
+        break;
+    default:
+        break;
     }
 
-    Q_EMIT dataChanged(index, index);
-
     return successful;
 }
 
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index ac42a8beb687d..c0cde40c88247 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -98,6 +98,8 @@ class OptionsModel : public QAbstractListModel
     int rowCount(const QModelIndex & parent = QModelIndex()) const override;
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
     bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) override;
+    QVariant getOption(OptionID option) const;
+    bool setOption(OptionID option, const QVariant& value);
     /** Updates current unit in memory, settings and emits displayUnitChanged(new_unit) signal */
     void setDisplayUnit(const QVariant& new_unit);
 

From ab0b32d30de66b472a77c69c380e1e06afd29917 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 29 Apr 2019 15:29:00 -0400
Subject: [PATCH 12/31] merge bitcoin-core/gui#601: Pass interfaces::Node
 references to OptionsModel constructor

---
 src/qt/bitcoin.cpp               | 14 +++++++-------
 src/qt/optionsmodel.cpp          |  4 ++--
 src/qt/optionsmodel.h            |  7 +++----
 src/qt/test/addressbooktests.cpp |  2 +-
 src/qt/test/optiontests.cpp      |  7 +++----
 src/qt/test/optiontests.h        |  2 +-
 src/qt/test/wallettests.cpp      |  2 +-
 7 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index b811800709bd2..50eb60e20e290 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -270,7 +270,7 @@ void BitcoinApplication::createPaymentServer()
 
 void BitcoinApplication::createOptionsModel(bool resetSettings)
 {
-    optionsModel = new OptionsModel(this, resetSettings);
+    optionsModel = new OptionsModel(node(), this, resetSettings);
 }
 
 void BitcoinApplication::createWindow(const NetworkStyle *networkStyle)
@@ -296,7 +296,6 @@ void BitcoinApplication::createNode(interfaces::Init& init)
 {
     assert(!m_node);
     m_node = init.makeNode();
-    if (optionsModel) optionsModel->setNode(*m_node);
     if (m_splash) m_splash->setNode(*m_node);
 }
 
@@ -671,6 +670,12 @@ int GuiMain(int argc, char* argv[])
                               QObject::tr("Error: Failed to load application fonts."));
         return EXIT_FAILURE;
     }
+
+    if (gArgs.GetBoolArg("-splash", DEFAULT_SPLASHSCREEN) && !gArgs.GetBoolArg("-min", false))
+        app.createSplashScreen(networkStyle.data());
+
+    app.createNode(*init);
+
     // Load GUI settings from QSettings
     app.createOptionsModel(gArgs.GetBoolArg("-resetguisettings", false));
     // Validate/set font family
@@ -763,11 +768,6 @@ int GuiMain(int argc, char* argv[])
         app.InitPruneSetting(prune_MiB);
     }
 
-    if (gArgs.GetBoolArg("-splash", DEFAULT_SPLASHSCREEN) && !gArgs.GetBoolArg("-min", false))
-        app.createSplashScreen(networkStyle.data());
-
-    app.createNode(*init);
-
     int rv = EXIT_SUCCESS;
     try
     {
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 1a9cbeb45826f..0fb5dd87c543b 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -36,8 +36,8 @@ const char *DEFAULT_GUI_PROXY_HOST = "127.0.0.1";
 
 static QString GetDefaultProxyAddress();
 
-OptionsModel::OptionsModel(QObject *parent, bool resetSettings) :
-    QAbstractListModel(parent)
+OptionsModel::OptionsModel(interfaces::Node& node, QObject *parent, bool resetSettings) :
+    QAbstractListModel(parent), m_node{node}
 {
     Init(resetSettings);
 }
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index c0cde40c88247..8a632d3fcbfa0 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -42,7 +42,7 @@ class OptionsModel : public QAbstractListModel
     Q_OBJECT
 
 public:
-    explicit OptionsModel(QObject *parent = nullptr, bool resetSettings = false);
+    explicit OptionsModel(interfaces::Node& node, QObject *parent = nullptr, bool resetSettings = false);
 
     enum OptionID {
         StartAtStartup,       // bool
@@ -126,11 +126,10 @@ class OptionsModel : public QAbstractListModel
     bool isRestartRequired() const;
     bool resetSettingsOnShutdown{false};
 
-    interfaces::Node& node() const { assert(m_node); return *m_node; }
-    void setNode(interfaces::Node& node) { assert(!m_node); m_node = &node; }
+    interfaces::Node& node() const { return m_node; }
 
 private:
-    interfaces::Node* m_node = nullptr;
+    interfaces::Node& m_node;
     /* Qt-only settings */
     bool m_show_tray_icon;
     bool fMinimizeToTray;
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
index 14eaa0c2a05af..4f47adc48b33b 100644
--- a/src/qt/test/addressbooktests.cpp
+++ b/src/qt/test/addressbooktests.cpp
@@ -119,7 +119,7 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
     check_addbook_size(2);
 
     // Initialize relevant QT models.
-    OptionsModel optionsModel;
+    OptionsModel optionsModel(node);
     ClientModel clientModel(node, &optionsModel);
     WalletContext& context = *node.walletLoader().context();
     AddWallet(context, wallet);
diff --git a/src/qt/test/optiontests.cpp b/src/qt/test/optiontests.cpp
index 343755103cf2d..c3cd78553e992 100644
--- a/src/qt/test/optiontests.cpp
+++ b/src/qt/test/optiontests.cpp
@@ -14,8 +14,7 @@
 
 #include <univalue.h>
 
-//! Entry point for BitcoinApplication tests.
-void OptionTests::optionTests()
+void OptionTests::integerGetArgBug()
 {
     // Test regression https://github.com/bitcoin/bitcoin/issues/24457. Ensure
     // that setting integer prune value doesn't cause an exception to be thrown
@@ -25,7 +24,7 @@ void OptionTests::optionTests()
         settings.rw_settings["prune"] = 3814;
     });
     gArgs.WriteSettingsFile();
-    OptionsModel{};
+    OptionsModel{m_node};
     gArgs.LockSettings([&](util::Settings& settings) {
         settings.rw_settings.erase("prune");
     });
@@ -50,7 +49,7 @@ void OptionTests::parametersInteraction()
     QSettings settings;
     settings.setValue("fListen", false);
 
-    OptionsModel{};
+    OptionsModel{m_node};
 
     const bool expected{false};
 
diff --git a/src/qt/test/optiontests.h b/src/qt/test/optiontests.h
index d5a3bfd6b4a07..78061d8fe8705 100644
--- a/src/qt/test/optiontests.h
+++ b/src/qt/test/optiontests.h
@@ -16,7 +16,7 @@ class OptionTests : public QObject
     explicit OptionTests(interfaces::Node& node) : m_node(node) {}
 
 private Q_SLOTS:
-    void optionTests();
+    void integerGetArgBug();
     void parametersInteraction();
     void extractFilter();
 
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 02f3b88317e1d..377fdeb8b7dfa 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -152,7 +152,7 @@ void TestGUI(interfaces::Node& node)
     // Create widgets for sending coins and listing transactions.
     SendCoinsDialog sendCoinsDialog;
     TransactionView transactionView;
-    OptionsModel optionsModel;
+    OptionsModel optionsModel(node);
     ClientModel clientModel(node, &optionsModel);
     WalletModel walletModel(interfaces::MakeWallet(context, wallet), clientModel);
     sendCoinsDialog.setModel(&walletModel);

From ad250c1fdc9eb76072b8457b1a02ff453fd9cde4 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 29 Apr 2019 15:29:00 -0400
Subject: [PATCH 13/31] merge bitcoin#15936: Expose settings.json methods to
 GUI

---
 src/init.cpp                |  1 -
 src/interfaces/node.h       | 29 ++++++++++++++++++++++-----
 src/node/interfaces.cpp     | 40 +++++++++++++++++++++++++++++++++++++
 src/test/settings_tests.cpp |  8 ++++----
 src/util/settings.cpp       |  4 ++++
 src/util/settings.h         |  6 ++++++
 src/util/system.cpp         | 35 ++++++++++++++++++++++++++++----
 src/util/system.h           | 17 +++++++++++++---
 8 files changed, 123 insertions(+), 17 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 6a96d6dd4a9cc..b560a2eff90ce 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -426,7 +426,6 @@ void Shutdown(NodeContext& node)
         LogPrintf("%s: Unable to remove PID file: %s\n", __func__, fsbridge::get_filesystem_error_message(e));
     }
 
-    node.args = nullptr;
     LogPrintf("%s: done\n", __func__);
 }
 
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 3ea9b5da6450e..aff8f0044d2e9 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -5,13 +5,14 @@
 #ifndef BITCOIN_INTERFACES_NODE_H
 #define BITCOIN_INTERFACES_NODE_H
 
-#include <consensus/amount.h> // For CAmount
-#include <net.h>        // For NodeId
-#include <net_types.h>  // For banmap_t
-#include <netaddress.h> // For Network
-#include <netbase.h>    // For ConnectionDirection
+#include <consensus/amount.h>          // For CAmount
+#include <net.h>                       // For NodeId
+#include <net_types.h>                 // For banmap_t
+#include <netaddress.h>                // For Network
+#include <netbase.h>                   // For ConnectionDirection
 #include <support/allocators/secure.h> // For SecureString
 #include <uint256.h>
+#include <util/settings.h>             // For util::SettingsValue
 #include <util/translation.h>
 
 #include <functional>
@@ -193,6 +194,24 @@ class Node
     //! Return whether shutdown was requested.
     virtual bool shutdownRequested() = 0;
 
+    //! Return whether a particular setting in <datadir>/settings.json is or
+    //! would be ignored because it is also specified in the command line.
+    virtual bool isSettingIgnored(const std::string& name) = 0;
+
+    //! Return setting value from <datadir>/settings.json or bitcoin.conf.
+    virtual util::SettingsValue getPersistentSetting(const std::string& name) = 0;
+
+    //! Update a setting in <datadir>/settings.json.
+    virtual void updateRwSetting(const std::string& name, const util::SettingsValue& value) = 0;
+
+    //! Force a setting value to be applied, overriding any other configuration
+    //! source, but not being persisted.
+    virtual void forceSetting(const std::string& name, const util::SettingsValue& value) = 0;
+
+    //! Clear all settings in <datadir>/settings.json and store a backup of
+    //! previous settings in <datadir>/settings.json.bak.
+    virtual void resetSettings() = 0;
+
     //! Map port.
     virtual void mapPort(bool use_upnp, bool use_natpmp) = 0;
 
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index bccb43aafe594..b269972d2cf1a 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -444,6 +444,46 @@ class NodeImpl : public Node
         }
     }
     bool shutdownRequested() override { return ShutdownRequested(); }
+    bool isSettingIgnored(const std::string& name) override
+    {
+        bool ignored = false;
+        gArgs.LockSettings([&](util::Settings& settings) {
+            if (auto* options = util::FindKey(settings.command_line_options, name)) {
+                ignored = !options->empty();
+            }
+        });
+        return ignored;
+    }
+    util::SettingsValue getPersistentSetting(const std::string& name) override { return gArgs.GetPersistentSetting(name); }
+    void updateRwSetting(const std::string& name, const util::SettingsValue& value) override
+    {
+        gArgs.LockSettings([&](util::Settings& settings) {
+            if (value.isNull()) {
+                settings.rw_settings.erase(name);
+            } else {
+                settings.rw_settings[name] = value;
+            }
+        });
+        gArgs.WriteSettingsFile();
+    }
+    void forceSetting(const std::string& name, const util::SettingsValue& value) override
+    {
+        gArgs.LockSettings([&](util::Settings& settings) {
+            if (value.isNull()) {
+                settings.forced_settings.erase(name);
+            } else {
+                settings.forced_settings[name] = value;
+            }
+        });
+    }
+    void resetSettings() override
+    {
+        gArgs.WriteSettingsFile(/*errors=*/nullptr, /*backup=*/true);
+        gArgs.LockSettings([&](util::Settings& settings) {
+            settings.rw_settings.clear();
+        });
+        gArgs.WriteSettingsFile();
+    }
     void mapPort(bool use_upnp, bool use_natpmp) override { StartMapPort(use_upnp, use_natpmp); }
     bool getProxy(Network net, Proxy& proxy_info) override { return GetProxy(net, proxy_info); }
     size_t getNodeCount(ConnectionDirection flags) override
diff --git a/src/test/settings_tests.cpp b/src/test/settings_tests.cpp
index 2e5eb54247510..ad12c46561064 100644
--- a/src/test/settings_tests.cpp
+++ b/src/test/settings_tests.cpp
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(ReadWrite)
 //! Check settings struct contents against expected json strings.
 static void CheckValues(const util::Settings& settings, const std::string& single_val, const std::string& list_val)
 {
-    util::SettingsValue single_value = GetSetting(settings, "section", "name", false, false);
+    util::SettingsValue single_value = GetSetting(settings, "section", "name", false, false, false);
     util::SettingsValue list_value(util::SettingsValue::VARR);
     for (const auto& item : GetSettingsList(settings, "section", "name", false)) {
         list_value.push_back(item);
@@ -142,9 +142,9 @@ BOOST_AUTO_TEST_CASE(NullOverride)
 {
     util::Settings settings;
     settings.command_line_options["name"].push_back("value");
-    BOOST_CHECK_EQUAL(R"("value")", GetSetting(settings, "section", "name", false, false).write().c_str());
+    BOOST_CHECK_EQUAL(R"("value")", GetSetting(settings, "section", "name", false, false, false).write().c_str());
     settings.forced_settings["name"] = {};
-    BOOST_CHECK_EQUAL(R"(null)", GetSetting(settings, "section", "name", false, false).write().c_str());
+    BOOST_CHECK_EQUAL(R"(null)", GetSetting(settings, "section", "name", false, false, false).write().c_str());
 }
 
 // Test different ways settings can be merged, and verify results. This test can
@@ -225,7 +225,7 @@ BOOST_FIXTURE_TEST_CASE(Merge, MergeTestingSetup)
         }
 
         desc += " || ";
-        desc += GetSetting(settings, network, name, ignore_default_section_config, /* get_chain_name= */ false).write();
+        desc += GetSetting(settings, network, name, ignore_default_section_config, /*ignore_nonpersistent=*/false, /*get_chain_name=*/false).write();
         desc += " |";
         for (const auto& s : GetSettingsList(settings, network, name, ignore_default_section_config)) {
             desc += " ";
diff --git a/src/util/settings.cpp b/src/util/settings.cpp
index 5e4f80b9aad2b..421b2be4623ce 100644
--- a/src/util/settings.cpp
+++ b/src/util/settings.cpp
@@ -141,6 +141,7 @@ SettingsValue GetSetting(const Settings& settings,
     const std::string& section,
     const std::string& name,
     bool ignore_default_section_config,
+    bool ignore_nonpersistent,
     bool get_chain_name)
 {
     SettingsValue result;
@@ -176,6 +177,9 @@ SettingsValue GetSetting(const Settings& settings,
             return;
         }
 
+        // Ignore nonpersistent settings if requested.
+        if (ignore_nonpersistent && (source == Source::COMMAND_LINE || source == Source::FORCED)) return;
+
         // Skip negated command line settings.
         if (skip_negated_command_line && span.last_negated()) return;
 
diff --git a/src/util/settings.h b/src/util/settings.h
index 261a0a032f5e5..e97158dc0919d 100644
--- a/src/util/settings.h
+++ b/src/util/settings.h
@@ -55,12 +55,18 @@ bool WriteSettings(const fs::path& path,
 //! @param ignore_default_section_config - ignore values in the default section
 //!                                        of the config file (part before any
 //!                                        [section] keywords)
+//! @param ignore_nonpersistent - ignore non-persistent settings values (forced
+//!                               settings values and values specified on the
+//!                               command line). Only return settings in the
+//!                               read-only config and read-write settings
+//!                               files.
 //! @param get_chain_name - enable special backwards compatible behavior
 //!                         for GetChainName
 SettingsValue GetSetting(const Settings& settings,
     const std::string& section,
     const std::string& name,
     bool ignore_default_section_config,
+    bool ignore_nonpersistent,
     bool get_chain_name);
 
 //! Get combined setting value similar to GetSetting(), except if setting was
diff --git a/src/util/system.cpp b/src/util/system.cpp
index caf7972e6fe2b..ccfc8bc89bdc6 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -560,12 +560,15 @@ bool ArgsManager::InitSettings(std::string& error)
     return true;
 }
 
-bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp) const
+bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp, bool backup) const
 {
     fs::path settings = GetPathArg("-settings", BITCOIN_SETTINGS_FILENAME);
     if (settings.empty()) {
         return false;
     }
+    if (backup) {
+        settings += ".bak";
+    }
     if (filepath) {
         *filepath = fsbridge::AbsPathJoin(GetDataDirNet(), temp ? settings + ".tmp" : settings);
     }
@@ -606,10 +609,10 @@ bool ArgsManager::ReadSettingsFile(std::vector<std::string>* errors)
     return true;
 }
 
-bool ArgsManager::WriteSettingsFile(std::vector<std::string>* errors) const
+bool ArgsManager::WriteSettingsFile(std::vector<std::string>* errors, bool backup) const
 {
     fs::path path, path_tmp;
-    if (!GetSettingsPath(&path, /* temp= */ false) || !GetSettingsPath(&path_tmp, /* temp= */ true)) {
+    if (!GetSettingsPath(&path, /*temp=*/false, backup) || !GetSettingsPath(&path_tmp, /*temp=*/true, backup)) {
         throw std::logic_error("Attempt to write settings file when dynamic settings are disabled.");
     }
 
@@ -626,6 +629,13 @@ bool ArgsManager::WriteSettingsFile(std::vector<std::string>* errors) const
     return true;
 }
 
+util::SettingsValue ArgsManager::GetPersistentSetting(const std::string& name) const
+{
+    LOCK(cs_args);
+    return util::GetSetting(m_settings, m_network, name, !UseDefaultSection("-" + name),
+        /*ignore_nonpersistent=*/true, /*get_chain_name=*/false);
+}
+
 bool ArgsManager::IsArgNegated(const std::string& strArg) const
 {
     return GetSetting(strArg).isFalse();
@@ -634,18 +644,33 @@ bool ArgsManager::IsArgNegated(const std::string& strArg) const
 std::string ArgsManager::GetArg(const std::string& strArg, const std::string& strDefault) const
 {
     const util::SettingsValue value = GetSetting(strArg);
+    return SettingToString(value, strDefault);
+}
+
+std::string SettingToString(const util::SettingsValue& value, const std::string& strDefault)
+{
     return value.isNull() ? strDefault : value.isFalse() ? "0" : value.isTrue() ? "1" : value.isNum() ? value.getValStr() : value.get_str();
 }
 
 int64_t ArgsManager::GetIntArg(const std::string& strArg, int64_t nDefault) const
 {
     const util::SettingsValue value = GetSetting(strArg);
+    return SettingToInt(value, nDefault);
+}
+
+int64_t SettingToInt(const util::SettingsValue& value, int64_t nDefault)
+{
     return value.isNull() ? nDefault : value.isFalse() ? 0 : value.isTrue() ? 1 : value.isNum() ? value.getInt<int64_t>() : LocaleIndependentAtoi<int64_t>(value.get_str());
 }
 
 bool ArgsManager::GetBoolArg(const std::string& strArg, bool fDefault) const
 {
     const util::SettingsValue value = GetSetting(strArg);
+    return SettingToBool(value, fDefault);
+}
+
+bool SettingToBool(const util::SettingsValue& value, bool fDefault)
+{
     return value.isNull() ? fDefault : value.isBool() ? value.get_bool() : InterpretBool(value.get_str());
 }
 
@@ -1087,6 +1112,7 @@ std::string ArgsManager::GetChainName() const
         LOCK(cs_args);
         util::SettingsValue value = util::GetSetting(m_settings, /* section= */ "", SettingName(arg),
             /* ignore_default_section_config= */ false,
+            /*ignore_nonpersistent=*/false,
             /* get_chain_name= */ true);
         return value.isNull() ? false : value.isBool() ? value.get_bool() : (!interpret_bool || InterpretBool(value.get_str()));
     };
@@ -1155,7 +1181,8 @@ util::SettingsValue ArgsManager::GetSetting(const std::string& arg) const
 {
     LOCK(cs_args);
     return util::GetSetting(
-        m_settings, m_network, SettingName(arg), !UseDefaultSection(arg), /* get_chain_name= */ false);
+        m_settings, m_network, SettingName(arg), !UseDefaultSection(arg),
+        /*ignore_nonpersistent=*/false, /*get_chain_name=*/false);
 }
 
 std::vector<util::SettingsValue> ArgsManager::GetSettingsList(const std::string& arg) const
diff --git a/src/util/system.h b/src/util/system.h
index 12e14892a3dba..eedd53b246979 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -176,6 +176,10 @@ struct SectionInfo
     int m_line;
 };
 
+std::string SettingToString(const util::SettingsValue&, const std::string&);
+int64_t SettingToInt(const util::SettingsValue&, int64_t);
+bool SettingToBool(const util::SettingsValue&, bool);
+
 class ArgsManager
 {
 public:
@@ -470,7 +474,7 @@ class ArgsManager
      * Get settings file path, or return false if read-write settings were
      * disabled with -nosettings.
      */
-    bool GetSettingsPath(fs::path* filepath = nullptr, bool temp = false) const;
+    bool GetSettingsPath(fs::path* filepath = nullptr, bool temp = false, bool backup = false) const;
 
     /**
      * Read settings file. Push errors to vector, or log them if null.
@@ -478,9 +482,16 @@ class ArgsManager
     bool ReadSettingsFile(std::vector<std::string>* errors = nullptr);
 
     /**
-     * Write settings file. Push errors to vector, or log them if null.
+     * Write settings file or backup settings file. Push errors to vector, or
+     * log them if null.
+     */
+    bool WriteSettingsFile(std::vector<std::string>* errors = nullptr, bool backup = false) const;
+
+    /**
+     * Get current setting from config file or read/write settings file,
+     * ignoring nonpersistent command line or forced settings values.
      */
-    bool WriteSettingsFile(std::vector<std::string>* errors = nullptr) const;
+    util::SettingsValue GetPersistentSetting(const std::string& name) const;
 
     /**
      * Access settings with lock held.

From 489d8534e9350593c9311ad6bccedd2efd807fe7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 30 Aug 2025 11:59:39 +0000
Subject: [PATCH 14/31] qt: remove PrivateSend -> CoinJoin migration logic,
 remove old values

The migration to CoinJoin was done in dash#4038, included in v0.17 and
there's more than a few major releases since then, we should be able to
safely assume that upgrading users are using more recent clients.
---
 src/qt/optionsmodel.cpp | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 0fb5dd87c543b..ddb4ce9e579cd 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -929,6 +929,15 @@ void OptionsModel::checkAndMigrate()
             settings.remove("bUsePrivateSend");
         }
 
+        if (settingsVersion < 230000) {
+            settings.remove("fPrivateSendEnabled");
+            settings.remove("fPrivateSendMultiSession");
+            settings.remove("fShowAdvancedPSUI");
+            settings.remove("fShowPrivateSendPopups");
+            settings.remove("nPrivateSendAmount");
+            settings.remove("nPrivateSendRounds");
+        }
+
         settings.setValue(strSettingsVersionKey, CLIENT_VERSION);
     }
 
@@ -949,31 +958,4 @@ void OptionsModel::checkAndMigrate()
     if (!GUIUtil::isValidTheme(strActiveTheme)) {
         settings.setValue("theme", GUIUtil::getDefaultTheme());
     }
-
-    // begin PrivateSend -> CoinJoin migration
-    if (settings.contains("nPrivateSendRounds") && !settings.contains("nCoinJoinRounds")) {
-        settings.setValue("nCoinJoinRounds", settings.value("nPrivateSendRounds").toInt());
-        settings.remove("nPrivateSendRounds");
-    }
-    if (settings.contains("nPrivateSendAmount") && !settings.contains("nCoinJoinAmount")) {
-        settings.setValue("nCoinJoinAmount", settings.value("nPrivateSendAmount").toInt());
-        settings.remove("nPrivateSendAmount");
-    }
-    if (settings.contains("fPrivateSendEnabled") && !settings.contains("fCoinJoinEnabled")) {
-        settings.setValue("fCoinJoinEnabled", settings.value("fPrivateSendEnabled").toBool());
-        settings.remove("fPrivateSendEnabled");
-    }
-    if (settings.contains("fPrivateSendMultiSession") && !settings.contains("fCoinJoinMultiSession")) {
-        settings.setValue("fCoinJoinMultiSession", settings.value("fPrivateSendMultiSession").toBool());
-        settings.remove("fPrivateSendMultiSession");
-    }
-    if (settings.contains("fShowAdvancedPSUI") && !settings.contains("fShowAdvancedCJUI")) {
-        settings.setValue("fShowAdvancedCJUI", settings.value("fShowAdvancedPSUI").toBool());
-        settings.remove("fShowAdvancedPSUI");
-    }
-    if (settings.contains("fShowPrivateSendPopups") && !settings.contains("fShowCoinJoinPopups")) {
-        settings.setValue("fShowCoinJoinPopups", settings.value("fShowPrivateSendPopups").toBool());
-        settings.remove("fShowPrivateSendPopups");
-    }
-    // end PrivateSend -> CoinJoin migration
 }

From 5ddec6dc1469ee5c35936b4154d98214d6577554 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 30 Aug 2025 12:00:45 +0000
Subject: [PATCH 15/31] qt: move Prune{,Size} handling outside `ENABLE_WALLET`
 gate

---
 src/qt/optionsmodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index ddb4ce9e579cd..2ba36c670d7bd 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -834,6 +834,7 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         settings.setValue("fKeepChangeAddress", fKeepChangeAddress);
         Q_EMIT keepChangeAddressChanged(fKeepChangeAddress);
         break;
+#endif // ENABLE_WALLET
     case Prune:
         if (settings.value("bPrune") != value) {
             settings.setValue("bPrune", value);
@@ -846,7 +847,6 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
             setRestartRequired(true);
         }
         break;
-#endif // ENABLE_WALLET
     case DatabaseCache:
         if (settings.value("nDatabaseCache") != value) {
             settings.setValue("nDatabaseCache", value);

From 89e17f77452ede81c6b6ae09b2cfbd8bfb7b0c94 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 30 Aug 2025 10:35:12 +0000
Subject: [PATCH 16/31] merge bitcoin-core/gui#602: Unify bitcoin-qt and
 bitcoind persistent settings

Changes related to external signers are not included as we don't have
support for them. Additionally, pruning affects governance and txindex.
---
 doc/release-notes-6833.md        |  15 +
 src/qt/bitcoin.cpp               |  28 +-
 src/qt/bitcoin.h                 |   2 +-
 src/qt/forms/optionsdialog.ui    |   2 +-
 src/qt/optionsdialog.cpp         |   5 -
 src/qt/optionsmodel.cpp          | 491 +++++++++++++++++--------------
 src/qt/optionsmodel.h            |  19 +-
 src/qt/test/addressbooktests.cpp |   2 +
 src/qt/test/apptests.cpp         |   7 +-
 src/qt/test/optiontests.cpp      |  65 +++-
 src/qt/test/optiontests.h        |   7 +-
 src/qt/test/test_main.cpp        |   5 +-
 src/qt/test/wallettests.cpp      |   2 +
 13 files changed, 408 insertions(+), 242 deletions(-)
 create mode 100644 doc/release-notes-6833.md

diff --git a/doc/release-notes-6833.md b/doc/release-notes-6833.md
new file mode 100644
index 0000000000000..23e50378905bd
--- /dev/null
+++ b/doc/release-notes-6833.md
@@ -0,0 +1,15 @@
+GUI changes
+-----------
+
+Configuration changes made in the Dash GUI (such as the pruning setting,
+proxy settings, UPNP preferences) are now saved to `<datadir>/settings.json`
+file rather than to the Qt settings backend (windows registry or unix desktop
+config files), so these settings will now apply to dashd, instead of being
+ignored.
+
+Also, the interaction between GUI settings and `dash.conf` settings is
+simplified. Settings from `dash.conf` are now displayed normally in the GUI
+settings dialog, instead of in a separate warning message ("Options set in this
+dialog are overridden by the configuration file: -setting=value"). And these
+settings can now be edited because `settings.json` values take precedence over
+`dash.conf` values.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 50eb60e20e290..7faaca9e8c105 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -268,9 +268,26 @@ void BitcoinApplication::createPaymentServer()
 }
 #endif
 
-void BitcoinApplication::createOptionsModel(bool resetSettings)
+bool BitcoinApplication::createOptionsModel(bool resetSettings)
 {
-    optionsModel = new OptionsModel(node(), this, resetSettings);
+    optionsModel = new OptionsModel(node(), this);
+    if (resetSettings) {
+        optionsModel->Reset();
+    }
+    bilingual_str error;
+    if (!optionsModel->Init(error)) {
+        fs::path settings_path;
+        if (gArgs.GetSettingsPath(&settings_path)) {
+            error += Untranslated("\n");
+            std::string quoted_path = strprintf("%s", fs::quoted(fs::PathToString(settings_path)));
+            error.original += strprintf("Settings file %s might be corrupt or invalid.", quoted_path);
+            error.translated += tr("Settings file %1 might be corrupt or invalid.").arg(QString::fromStdString(quoted_path)).toStdString();
+        }
+        InitError(error);
+        QMessageBox::critical(nullptr, PACKAGE_NAME, QString::fromStdString(error.translated));
+        return false;
+    }
+    return true;
 }
 
 void BitcoinApplication::createWindow(const NetworkStyle *networkStyle)
@@ -332,7 +349,7 @@ void BitcoinApplication::parameterSetup()
 
 void BitcoinApplication::InitPruneSetting(int64_t prune_MiB)
 {
-    optionsModel->SetPruneTargetGB(PruneMiBtoGB(prune_MiB), true);
+    optionsModel->SetPruneTargetGB(PruneMiBtoGB(prune_MiB));
 }
 
 void BitcoinApplication::requestInitialize()
@@ -677,7 +694,10 @@ int GuiMain(int argc, char* argv[])
     app.createNode(*init);
 
     // Load GUI settings from QSettings
-    app.createOptionsModel(gArgs.GetBoolArg("-resetguisettings", false));
+    if (!app.createOptionsModel(gArgs.GetBoolArg("-resetguisettings", false))) {
+        return EXIT_FAILURE;
+    }
+
     // Validate/set font family
     if (gArgs.IsArgSet("-font-family")) {
         GUIUtil::FontFamily family;
diff --git a/src/qt/bitcoin.h b/src/qt/bitcoin.h
index 7aa12efbc2fb3..0cf8ee03bcfcf 100644
--- a/src/qt/bitcoin.h
+++ b/src/qt/bitcoin.h
@@ -46,7 +46,7 @@ class BitcoinApplication: public QApplication
     /// parameter interaction/setup based on rules
     void parameterSetup();
     /// Create options model
-    void createOptionsModel(bool resetSettings);
+    [[nodiscard]] bool createOptionsModel(bool resetSettings);
     /// Initialize prune setting
     void InitPruneSetting(int64_t prune_MiB);
     /// Create main window
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index 2039a7682e1e2..09efc32fa040c 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -1212,7 +1212,7 @@ https://explore.transifex.com/dash/dash/</string>
         <item>
          <widget class="QLabel" name="overriddenByCommandLineInfoLabel">
           <property name="text">
-           <string>Options set in this dialog are overridden by the command line or in the configuration file:</string>
+           <string>Options set in this dialog are overridden by the command line:</string>
           </property>
           <property name="textFormat">
            <enum>Qt::PlainText</enum>
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 0be146e7d4ff8..e6291b5f0c7de 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -32,7 +32,6 @@
 #include <QIntValidator>
 #include <QLocale>
 #include <QMessageBox>
-#include <QSettings>
 #include <QShowEvent>
 #include <QSystemTrayIcon>
 #include <QTimer>
@@ -81,10 +80,6 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
 #ifndef USE_NATPMP
     ui->mapPortNatpmp->setEnabled(false);
 #endif
-    connect(this, &QDialog::accepted, [this](){
-        QSettings settings;
-        model->node().mapPort(settings.value("fUseUPnP").toBool(), settings.value("fUseNatpmp").toBool());
-    });
 
     ui->proxyIp->setEnabled(false);
     ui->proxyPort->setEnabled(false);
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 2ba36c670d7bd..100453186148d 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -21,6 +21,7 @@
 #include <txdb.h>       // for -dbcache defaults
 #include <validation.h> // For DEFAULT_SCRIPTCHECK_THREADS
 #include <util/string.h>
+#include <wallet/wallet.h> // For DEFAULT_SPEND_ZEROCONF_CHANGE
 
 #ifdef ENABLE_WALLET
 #include <coinjoin/options.h>
@@ -32,14 +33,98 @@
 #include <QStringList>
 #include <QVariant>
 
+#include <univalue.h>
+
 const char *DEFAULT_GUI_PROXY_HOST = "127.0.0.1";
 
 static QString GetDefaultProxyAddress();
 
-OptionsModel::OptionsModel(interfaces::Node& node, QObject *parent, bool resetSettings) :
+/** Map GUI option ID to node setting name. */
+static const char* SettingName(OptionsModel::OptionID option)
+{
+    switch (option) {
+    case OptionsModel::DatabaseCache: return "dbcache";
+    case OptionsModel::ThreadsScriptVerif: return "par";
+    case OptionsModel::SpendZeroConfChange: return "spendzeroconfchange";
+    case OptionsModel::MapPortUPnP: return "upnp";
+    case OptionsModel::MapPortNatpmp: return "natpmp";
+    case OptionsModel::Listen: return "listen";
+    case OptionsModel::Server: return "server";
+    case OptionsModel::PruneSize: return "prune";
+    case OptionsModel::Prune: return "prune";
+    case OptionsModel::ProxyIP: return "proxy";
+    case OptionsModel::ProxyPort: return "proxy";
+    case OptionsModel::ProxyUse: return "proxy";
+    case OptionsModel::ProxyIPTor: return "onion";
+    case OptionsModel::ProxyPortTor: return "onion";
+    case OptionsModel::ProxyUseTor: return "onion";
+    case OptionsModel::Language: return "lang";
+    default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
+    }
+}
+
+/** Call node.updateRwSetting() with Bitcoin 22.x workaround. */
+static void UpdateRwSetting(interfaces::Node& node, OptionsModel::OptionID option, const util::SettingsValue& value)
+{
+    if (value.isNum() &&
+        (option == OptionsModel::DatabaseCache ||
+         option == OptionsModel::ThreadsScriptVerif ||
+         option == OptionsModel::Prune ||
+         option == OptionsModel::PruneSize)) {
+        // Write certain old settings as strings, even though they are numbers,
+        // because Bitcoin 22.x releases try to read these specific settings as
+        // strings in addOverriddenOption() calls at startup, triggering
+        // uncaught exceptions in UniValue::get_str(). These errors were fixed
+        // in later releases by https://github.com/bitcoin/bitcoin/pull/24498.
+        // If new numeric settings are added, they can be written as numbers
+        // instead of strings, because bitcoin 22.x will not try to read these.
+        node.updateRwSetting(SettingName(option), value.getValStr());
+    } else {
+        node.updateRwSetting(SettingName(option), value);
+    }
+}
+
+//! Convert enabled/size values to bitcoin -prune setting.
+static util::SettingsValue PruneSetting(bool prune_enabled, int prune_size_gb)
+{
+    assert(!prune_enabled || prune_size_gb >= 1); // PruneSizeGB and ParsePruneSizeGB never return less
+    return prune_enabled ? PruneGBtoMiB(prune_size_gb) : 0;
+}
+
+//! Get pruning enabled value to show in GUI from bitcoin -prune setting.
+static bool PruneEnabled(const util::SettingsValue& prune_setting)
+{
+    // -prune=1 setting is manual pruning mode, so disabled for purposes of the gui
+    return SettingToInt(prune_setting, 0) > 1;
+}
+
+//! Get pruning size value to show in GUI from bitcoin -prune setting. If
+//! pruning is not enabled, just show default recommended pruning size (2GB).
+static int PruneSizeGB(const util::SettingsValue& prune_setting)
+{
+    int value = SettingToInt(prune_setting, 0);
+    return value > 1 ? PruneMiBtoGB(value) : DEFAULT_PRUNE_TARGET_GB;
+}
+
+//! Parse pruning size value provided by user in GUI or loaded from QSettings
+//! (windows registry key or qt .conf file). Smallest value that the GUI can
+//! display is 1 GB, so round up if anything less is parsed.
+static int ParsePruneSizeGB(const QVariant& prune_size)
+{
+    return std::max(1, prune_size.toInt());
+}
+
+struct ProxySetting {
+    bool is_set;
+    QString ip;
+    QString port;
+};
+static ProxySetting ParseProxyString(const std::string& proxy);
+static std::string ProxyString(bool is_set, QString ip, QString port);
+
+OptionsModel::OptionsModel(interfaces::Node& node, QObject *parent) :
     QAbstractListModel(parent), m_node{node}
 {
-    Init(resetSettings);
 }
 
 void OptionsModel::addOverriddenOption(const std::string &option)
@@ -48,10 +133,17 @@ void OptionsModel::addOverriddenOption(const std::string &option)
 }
 
 // Writes all missing QSettings with their default values
-void OptionsModel::Init(bool resetSettings)
+bool OptionsModel::Init(bilingual_str& error)
 {
-    if (resetSettings)
-        Reset();
+    // Initialize display settings from stored settings.
+    m_prune_size_gb = PruneSizeGB(node().getPersistentSetting("prune"));
+    ProxySetting proxy = ParseProxyString(SettingToString(node().getPersistentSetting("proxy"), GetDefaultProxyAddress().toStdString()));
+    m_proxy_ip = proxy.ip;
+    m_proxy_port = proxy.port;
+    ProxySetting onion = ParseProxyString(SettingToString(node().getPersistentSetting("onion"), GetDefaultProxyAddress().toStdString()));
+    m_onion_ip = onion.ip;
+    m_onion_port = onion.port;
+    language = QString::fromStdString(SettingToString(node().getPersistentSetting("lang"), ""));
 
     checkAndMigrate();
 
@@ -186,39 +278,29 @@ void OptionsModel::Init(bool resetSettings)
 
     // These are shared with the core or have a command-line parameter
     // and we want command-line parameters to overwrite the GUI settings.
-    //
+    for (OptionID option : {DatabaseCache, ThreadsScriptVerif, SpendZeroConfChange, MapPortUPnP,
+                            MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language}) {
+        std::string setting = SettingName(option);
+        if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
+        try {
+            getOption(option);
+        } catch (const std::exception& e) {
+            // This handles exceptions thrown by univalue that can happen if
+            // settings in settings.json don't have the expected types.
+            error.original = strprintf("Could not read setting \"%s\", %s.", setting, e.what());
+            error.translated = tr("Could not read setting \"%1\", %2.").arg(QString::fromStdString(setting), e.what()).toStdString();
+            return false;
+        }
+    }
+
     // If setting doesn't exist create it with defaults.
-    //
-    // If gArgs.SoftSetArg() or m_node.softSetBoolArg() return false we were overridden
-    // by command-line and show this in the UI.
 
     // Main
-    if (!settings.contains("bPrune"))
-        settings.setValue("bPrune", false);
-    if (!settings.contains("nPruneSize"))
-        settings.setValue("nPruneSize", DEFAULT_PRUNE_TARGET_GB);
-    SetPruneEnabled(settings.value("bPrune").toBool());
-
-    if (!settings.contains("nDatabaseCache"))
-        settings.setValue("nDatabaseCache", (qint64)nDefaultDbCache);
-    if (!gArgs.SoftSetArg("-dbcache", settings.value("nDatabaseCache").toString().toStdString()))
-        addOverriddenOption("-dbcache");
-
-    if (!settings.contains("nThreadsScriptVerif"))
-        settings.setValue("nThreadsScriptVerif", DEFAULT_SCRIPTCHECK_THREADS);
-    if (!gArgs.SoftSetArg("-par", settings.value("nThreadsScriptVerif").toString().toStdString()))
-        addOverriddenOption("-par");
-
     if (!settings.contains("strDataDir"))
         settings.setValue("strDataDir", GUIUtil::getDefaultDataDirectory());
 
     // Wallet
 #ifdef ENABLE_WALLET
-    if (!settings.contains("bSpendZeroConfChange"))
-        settings.setValue("bSpendZeroConfChange", true);
-    if (!gArgs.SoftSetBoolArg("-spendzeroconfchange", settings.value("bSpendZeroConfChange").toBool()))
-        addOverriddenOption("-spendzeroconfchange");
-
     if (!settings.contains("SubFeeFromAmount")) {
         settings.setValue("SubFeeFromAmount", false);
     }
@@ -256,84 +338,14 @@ void OptionsModel::Init(bool resetSettings)
         addOverriddenOption("-coinjoindenomshardcap");
 #endif
 
-    // Network
-    if (!settings.contains("fUseUPnP"))
-        settings.setValue("fUseUPnP", DEFAULT_UPNP);
-    if (!gArgs.SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool()))
-        addOverriddenOption("-upnp");
-
-    if (!settings.contains("fUseNatpmp")) {
-        settings.setValue("fUseNatpmp", DEFAULT_NATPMP);
-    }
-    if (!gArgs.SoftSetBoolArg("-natpmp", settings.value("fUseNatpmp").toBool())) {
-        addOverriddenOption("-natpmp");
-    }
-
-    if (!settings.contains("fListen"))
-        settings.setValue("fListen", DEFAULT_LISTEN);
-    const bool listen{settings.value("fListen").toBool()};
-    if (!gArgs.SoftSetBoolArg("-listen", listen)) {
-        addOverriddenOption("-listen");
-    } else if (!listen) {
-        // We successfully set -listen=0, thus mimic the logic from InitParameterInteraction():
-        // "parameter interaction: -listen=0 -> setting -listenonion=0".
-        //
-        // Both -listen and -listenonion default to true.
-        //
-        // The call order is:
-        //
-        // InitParameterInteraction()
-        //     would set -listenonion=0 if it sees -listen=0, but for bitcoin-qt with
-        //     fListen=false -listen is 1 at this point
-        //
-        // OptionsModel::Init()
-        //     (this method) can flip -listen from 1 to 0 if fListen=false
-        //
-        // AppInitParameterInteraction()
-        //     raises an error if -listen=0 and -listenonion=1
-        gArgs.SoftSetBoolArg("-listenonion", false);
-    }
-
-    if (!settings.contains("server")) {
-        settings.setValue("server", false);
-    }
-    if (!gArgs.SoftSetBoolArg("-server", settings.value("server").toBool())) {
-        addOverriddenOption("-server");
-    }
-
-    if (!settings.contains("fUseProxy"))
-        settings.setValue("fUseProxy", false);
-    if (!settings.contains("addrProxy"))
-        settings.setValue("addrProxy", GetDefaultProxyAddress());
-    // Only try to set -proxy, if user has enabled fUseProxy
-    if ((settings.value("fUseProxy").toBool() && !gArgs.SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString())))
-        addOverriddenOption("-proxy");
-    else if(!settings.value("fUseProxy").toBool() && !gArgs.GetArg("-proxy", "").empty())
-        addOverriddenOption("-proxy");
-
-    if (!settings.contains("fUseSeparateProxyTor"))
-        settings.setValue("fUseSeparateProxyTor", false);
-    if (!settings.contains("addrSeparateProxyTor"))
-        settings.setValue("addrSeparateProxyTor", GetDefaultProxyAddress());
-    // Only try to set -onion, if user has enabled fUseSeparateProxyTor
-    if ((settings.value("fUseSeparateProxyTor").toBool() && !gArgs.SoftSetArg("-onion", settings.value("addrSeparateProxyTor").toString().toStdString())))
-        addOverriddenOption("-onion");
-    else if(!settings.value("fUseSeparateProxyTor").toBool() && !gArgs.GetArg("-onion", "").empty())
-        addOverriddenOption("-onion");
-
     // Display
-    if (!settings.contains("language"))
-        settings.setValue("language", "");
-    if (!gArgs.SoftSetArg("-lang", settings.value("language").toString().toStdString()))
-        addOverriddenOption("-lang");
-
-    language = settings.value("language").toString();
-
     if (!settings.contains("UseEmbeddedMonospacedFont")) {
         settings.setValue("UseEmbeddedMonospacedFont", "true");
     }
     m_use_embedded_monospaced_font = settings.value("UseEmbeddedMonospacedFont").toBool();
     Q_EMIT useEmbeddedMonospacedFontChanged(m_use_embedded_monospaced_font);
+
+    return true;
 }
 
 /** Helper function to copy contents from one QSettings to another.
@@ -357,6 +369,9 @@ static void BackupSettings(const fs::path& filename, const QSettings& src)
 
 void OptionsModel::Reset()
 {
+    // Backup and reset settings.json
+    node().resetSettings();
+
     QSettings settings;
 
     // Backup old settings to chain-specific datadir for troubleshooting
@@ -385,21 +400,15 @@ int OptionsModel::rowCount(const QModelIndex & parent) const
     return OptionIDRowCount;
 }
 
-struct ProxySetting {
-    bool is_set;
-    QString ip;
-    QString port;
-};
-
-static ProxySetting GetProxySetting(QSettings &settings, const QString &name)
+static ProxySetting ParseProxyString(const QString& proxy)
 {
     static const ProxySetting default_val = {false, DEFAULT_GUI_PROXY_HOST, QString("%1").arg(DEFAULT_GUI_PROXY_PORT)};
     // Handle the case that the setting is not set at all
-    if (!settings.contains(name)) {
+    if (proxy.isEmpty()) {
         return default_val;
     }
     // contains IP at index 0 and port at index 1
-    QStringList ip_port = GUIUtil::SplitSkipEmptyParts(settings.value(name).toString(), ":");
+    QStringList ip_port = GUIUtil::SplitSkipEmptyParts(proxy, ":");
     if (ip_port.size() == 2) {
         return {true, ip_port.at(0), ip_port.at(1)};
     } else { // Invalid: return default
@@ -407,9 +416,14 @@ static ProxySetting GetProxySetting(QSettings &settings, const QString &name)
     }
 }
 
-static void SetProxySetting(QSettings &settings, const QString &name, const ProxySetting &ip_port)
+static ProxySetting ParseProxyString(const std::string& proxy)
 {
-    settings.setValue(name, QString{ip_port.ip + QLatin1Char(':') + ip_port.port});
+    return ParseProxyString(QString::fromStdString(proxy));
+}
+
+static std::string ProxyString(bool is_set, QString ip, QString port)
+{
+    return is_set ? QString(ip + ":" + port).toStdString() : "";
 }
 
 static QString GetDefaultProxyAddress()
@@ -417,37 +431,33 @@ static QString GetDefaultProxyAddress()
     return QString("%1:%2").arg(DEFAULT_GUI_PROXY_HOST).arg(DEFAULT_GUI_PROXY_PORT);
 }
 
-void OptionsModel::SetPruneEnabled(bool prune, bool force)
+void OptionsModel::SetPruneTargetGB(int prune_target_gb)
 {
-    QSettings settings;
-    settings.setValue("bPrune", prune);
-    const int64_t prune_target_mib = PruneGBtoMiB(settings.value("nPruneSize").toInt());
-    std::string prune_val = prune ? ToString(prune_target_mib) : "0";
-    if (force) {
-        gArgs.ForceSetArg("-prune", prune_val);
-        if (prune) {
-            gArgs.ForceSetArg("-disablegovernance", "1");
-            gArgs.ForceSetArg("-txindex", "0");
-        }
-        return;
-    }
-    if (!gArgs.SoftSetArg("-prune", prune_val)) {
-        addOverriddenOption("-prune");
-    }
-    if (gArgs.GetIntArg("-prune", 0) > 0) {
-        gArgs.SoftSetBoolArg("-disablegovernance", true);
-        gArgs.SoftSetBoolArg("-txindex", false);
+    const util::SettingsValue cur_value = node().getPersistentSetting("prune");
+    const util::SettingsValue new_value = PruneSetting(prune_target_gb > 0, prune_target_gb);
+
+    m_prune_size_gb = prune_target_gb;
+
+    // Force setting to take effect. It is still safe to change the value at
+    // this point because this function is only called after the intro screen is
+    // shown, before the node starts.
+    node().forceSetting("prune", new_value);
+
+    // When pruning is enabled, force disable governance and txindex
+    if (prune_target_gb > 0) {
+        node().forceSetting("disablegovernance", "1");
+        node().forceSetting("txindex", "0");
     }
-}
 
-void OptionsModel::SetPruneTargetGB(int prune_target_gb, bool force)
-{
-    const bool prune = prune_target_gb > 0;
-    if (prune) {
-        QSettings settings;
-        settings.setValue("nPruneSize", prune_target_gb);
+    // Update settings.json if value configured in intro screen is different
+    // from saved value. Avoid writing settings.json if bitcoin.conf value
+    // doesn't need to be overridden.
+    if (PruneEnabled(cur_value) != PruneEnabled(new_value) ||
+        PruneSizeGB(cur_value) != PruneSizeGB(new_value)) {
+        // Call UpdateRwSetting() instead of setOption() to avoid setting
+        // RestartRequired flag
+        UpdateRwSetting(node(), Prune, new_value);
     }
-    SetPruneEnabled(prune, force);
 }
 
 // read QSettings values and return them
@@ -476,6 +486,8 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
 
 QVariant OptionsModel::getOption(OptionID option) const
 {
+    auto setting = [&]{ return node().getPersistentSetting(SettingName(option)); };
+
     QSettings settings;
     switch (option) {
     case StartAtStartup:
@@ -486,13 +498,13 @@ QVariant OptionsModel::getOption(OptionID option) const
         return fMinimizeToTray;
     case MapPortUPnP:
 #ifdef USE_UPNP
-        return settings.value("fUseUPnP");
+        return SettingToBool(setting(), DEFAULT_UPNP);
 #else
         return false;
 #endif // USE_UPNP
     case MapPortNatpmp:
 #ifdef USE_NATPMP
-        return settings.value("fUseNatpmp");
+        return SettingToBool(setting(), DEFAULT_NATPMP);
 #else
         return false;
 #endif // USE_NATPMP
@@ -501,23 +513,23 @@ QVariant OptionsModel::getOption(OptionID option) const
 
     // default proxy
     case ProxyUse:
-        return settings.value("fUseProxy", false);
+        return ParseProxyString(SettingToString(setting(), "")).is_set;
     case ProxyIP:
-        return GetProxySetting(settings, "addrProxy").ip;
+        return m_proxy_ip;
     case ProxyPort:
-        return GetProxySetting(settings, "addrProxy").port;
+        return m_proxy_port;
 
     // separate Tor proxy
     case ProxyUseTor:
-        return settings.value("fUseSeparateProxyTor", false);
+        return ParseProxyString(SettingToString(setting(), "")).is_set;
     case ProxyIPTor:
-        return GetProxySetting(settings, "addrSeparateProxyTor").ip;
+        return m_onion_ip;
     case ProxyPortTor:
-        return GetProxySetting(settings, "addrSeparateProxyTor").port;
+        return m_onion_port;
 
 #ifdef ENABLE_WALLET
     case SpendZeroConfChange:
-        return settings.value("bSpendZeroConfChange");
+        return SettingToBool(setting(), wallet::DEFAULT_SPEND_ZEROCONF_CHANGE);
     case SubFeeFromAmount:
         return m_sub_fee_from_amount;
     case ShowMasternodesTab:
@@ -574,7 +586,7 @@ QVariant OptionsModel::getOption(OptionID option) const
         return nIndex;
     }
     case Language:
-        return settings.value("language");
+        return QString::fromStdString(SettingToString(setting(), ""));
     case UseEmbeddedMonospacedFont:
         return m_use_embedded_monospaced_font;
 #ifdef ENABLE_WALLET
@@ -584,17 +596,17 @@ QVariant OptionsModel::getOption(OptionID option) const
         return fKeepChangeAddress;
 #endif // ENABLE_WALLET
     case Prune:
-        return settings.value("bPrune");
+        return PruneEnabled(setting());
     case PruneSize:
-        return settings.value("nPruneSize");
+        return m_prune_size_gb;
     case DatabaseCache:
-        return settings.value("nDatabaseCache");
+        return qlonglong(SettingToInt(setting(), nDefaultDbCache));
     case ThreadsScriptVerif:
-        return settings.value("nThreadsScriptVerif");
+        return qlonglong(SettingToInt(setting(), DEFAULT_SCRIPTCHECK_THREADS));
     case Listen:
-        return settings.value("fListen");
+        return SettingToBool(setting(), DEFAULT_LISTEN);
     case Server:
-        return settings.value("server");
+        return SettingToBool(setting(), false);
     default:
         return QVariant();
     }
@@ -602,6 +614,9 @@ QVariant OptionsModel::getOption(OptionID option) const
 
 bool OptionsModel::setOption(OptionID option, const QVariant& value)
 {
+    auto changed = [&] { return value.isValid() && value != getOption(option); };
+    auto update = [&](const util::SettingsValue& value) { return UpdateRwSetting(node(), option, value); };
+
     bool successful = true; /* set to false on parse error */
     QSettings settings;
 
@@ -619,10 +634,16 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         settings.setValue("fMinimizeToTray", fMinimizeToTray);
         break;
     case MapPortUPnP: // core option - can be changed on-the-fly
-        settings.setValue("fUseUPnP", value.toBool());
+        if (changed()) {
+            update(value.toBool());
+            node().mapPort(value.toBool(), getOption(MapPortNatpmp).toBool());
+        }
         break;
     case MapPortNatpmp: // core option - can be changed on-the-fly
-        settings.setValue("fUseNatpmp", value.toBool());
+        if (changed()) {
+            update(value.toBool());
+            node().mapPort(getOption(MapPortUPnP).toBool(), value.toBool());
+        }
         break;
     case MinimizeOnClose:
         fMinimizeOnClose = value.toBool();
@@ -631,60 +652,60 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
 
     // default proxy
     case ProxyUse:
-        if (settings.value("fUseProxy") != value) {
-            settings.setValue("fUseProxy", value.toBool());
+        if (changed()) {
+            update(ProxyString(value.toBool(), m_proxy_ip, m_proxy_port));
             setRestartRequired(true);
         }
         break;
-    case ProxyIP: {
-        auto ip_port = GetProxySetting(settings, "addrProxy");
-        if (!ip_port.is_set || ip_port.ip != value.toString()) {
-            ip_port.ip = value.toString();
-            SetProxySetting(settings, "addrProxy", ip_port);
-            setRestartRequired(true);
+    case ProxyIP:
+        if (changed()) {
+            m_proxy_ip = value.toString();
+            if (getOption(ProxyUse).toBool()) {
+                update(ProxyString(true, m_proxy_ip, m_proxy_port));
+                setRestartRequired(true);
+            }
         }
-    }
-    break;
-    case ProxyPort: {
-        auto ip_port = GetProxySetting(settings, "addrProxy");
-        if (!ip_port.is_set || ip_port.port != value.toString()) {
-            ip_port.port = value.toString();
-            SetProxySetting(settings, "addrProxy", ip_port);
-            setRestartRequired(true);
+        break;
+    case ProxyPort:
+        if (changed()) {
+            m_proxy_port = value.toString();
+            if (getOption(ProxyUse).toBool()) {
+                update(ProxyString(true, m_proxy_ip, m_proxy_port));
+                setRestartRequired(true);
+            }
         }
-    }
-    break;
+        break;
 
     // separate Tor proxy
     case ProxyUseTor:
-        if (settings.value("fUseSeparateProxyTor") != value) {
-            settings.setValue("fUseSeparateProxyTor", value.toBool());
+        if (changed()) {
+            update(ProxyString(value.toBool(), m_onion_ip, m_onion_port));
             setRestartRequired(true);
         }
         break;
-    case ProxyIPTor: {
-        auto ip_port = GetProxySetting(settings, "addrSeparateProxyTor");
-        if (!ip_port.is_set || ip_port.ip != value.toString()) {
-            ip_port.ip = value.toString();
-            SetProxySetting(settings, "addrSeparateProxyTor", ip_port);
-            setRestartRequired(true);
+    case ProxyIPTor:
+        if (changed()) {
+            m_onion_ip = value.toString();
+            if (getOption(ProxyUseTor).toBool()) {
+                update(ProxyString(true, m_onion_ip, m_onion_port));
+                setRestartRequired(true);
+            }
         }
-    }
-    break;
-    case ProxyPortTor: {
-        auto ip_port = GetProxySetting(settings, "addrSeparateProxyTor");
-        if (!ip_port.is_set || ip_port.port != value.toString()) {
-            ip_port.port = value.toString();
-            SetProxySetting(settings, "addrSeparateProxyTor", ip_port);
-            setRestartRequired(true);
+        break;
+    case ProxyPortTor:
+        if (changed()) {
+            m_onion_port = value.toString();
+            if (getOption(ProxyUseTor).toBool()) {
+                update(ProxyString(true, m_onion_ip, m_onion_port));
+                setRestartRequired(true);
+            }
         }
-    }
-    break;
+        break;
 
 #ifdef ENABLE_WALLET
     case SpendZeroConfChange:
-        if (settings.value("bSpendZeroConfChange") != value) {
-            settings.setValue("bSpendZeroConfChange", value);
+        if (changed()) {
+            update(value.toBool());
             setRestartRequired(true);
         }
         break;
@@ -813,8 +834,8 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         break;
     }
     case Language:
-        if (settings.value("language") != value) {
-            settings.setValue("language", value);
+        if (changed()) {
+            update(value.toString().toStdString());
             setRestartRequired(true);
         }
         break;
@@ -836,38 +857,36 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         break;
 #endif // ENABLE_WALLET
     case Prune:
-        if (settings.value("bPrune") != value) {
-            settings.setValue("bPrune", value);
+        if (changed()) {
+            update(PruneSetting(value.toBool(), m_prune_size_gb));
             setRestartRequired(true);
         }
         break;
     case PruneSize:
-        if (settings.value("nPruneSize") != value) {
-            settings.setValue("nPruneSize", value);
-            setRestartRequired(true);
+        if (changed()) {
+            m_prune_size_gb = ParsePruneSizeGB(value);
+            if (getOption(Prune).toBool()) {
+                update(PruneSetting(true, m_prune_size_gb));
+                setRestartRequired(true);
+            }
         }
         break;
     case DatabaseCache:
-        if (settings.value("nDatabaseCache") != value) {
-            settings.setValue("nDatabaseCache", value);
+        if (changed()) {
+            update(static_cast<int64_t>(value.toLongLong()));
             setRestartRequired(true);
         }
         break;
     case ThreadsScriptVerif:
-        if (settings.value("nThreadsScriptVerif") != value) {
-            settings.setValue("nThreadsScriptVerif", value);
+        if (changed()) {
+            update(static_cast<int64_t>(value.toLongLong()));
             setRestartRequired(true);
         }
         break;
     case Listen:
-        if (settings.value("fListen") != value) {
-            settings.setValue("fListen", value);
-            setRestartRequired(true);
-        }
-        break;
     case Server:
-        if (settings.value("server") != value) {
-            settings.setValue("server", value);
+        if (changed()) {
+            update(value.toBool());
             setRestartRequired(true);
         }
         break;
@@ -958,4 +977,48 @@ void OptionsModel::checkAndMigrate()
     if (!GUIUtil::isValidTheme(strActiveTheme)) {
         settings.setValue("theme", GUIUtil::getDefaultTheme());
     }
+
+    // Migrate and delete legacy GUI settings that have now moved to <datadir>/settings.json.
+    auto migrate_setting = [&](OptionID option, const QString& qt_name) {
+        if (!settings.contains(qt_name)) return;
+        QVariant value = settings.value(qt_name);
+        if (node().getPersistentSetting(SettingName(option)).isNull()) {
+            if (option == ProxyIP) {
+                ProxySetting parsed = ParseProxyString(value.toString());
+                setOption(ProxyIP, parsed.ip);
+                setOption(ProxyPort, parsed.port);
+            } else if (option == ProxyIPTor) {
+                ProxySetting parsed = ParseProxyString(value.toString());
+                setOption(ProxyIPTor, parsed.ip);
+                setOption(ProxyPortTor, parsed.port);
+            } else {
+                setOption(option, value);
+            }
+        }
+        settings.remove(qt_name);
+    };
+
+    migrate_setting(DatabaseCache, "nDatabaseCache");
+    migrate_setting(ThreadsScriptVerif, "nThreadsScriptVerif");
+#ifdef ENABLE_WALLET
+    migrate_setting(SpendZeroConfChange, "bSpendZeroConfChange");
+#endif
+    migrate_setting(MapPortUPnP, "fUseUPnP");
+    migrate_setting(MapPortNatpmp, "fUseNatpmp");
+    migrate_setting(Listen, "fListen");
+    migrate_setting(Server, "server");
+    migrate_setting(PruneSize, "nPruneSize");
+    migrate_setting(Prune, "bPrune");
+    migrate_setting(ProxyIP, "addrProxy");
+    migrate_setting(ProxyUse, "fUseProxy");
+    migrate_setting(ProxyIPTor, "addrSeparateProxyTor");
+    migrate_setting(ProxyUseTor, "fUseSeparateProxyTor");
+    migrate_setting(Language, "language");
+
+    // In case migrating QSettings caused any settings value to change, rerun
+    // parameter interaction code to update other settings. This is particularly
+    // important for the -listen setting, which should cause -listenonion, -upnp,
+    // and other settings to default to false if it was set to false.
+    // (https://github.com/bitcoin-core/gui/issues/567).
+    node().initParameterInteraction();
 }
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 8a632d3fcbfa0..03727c7859bf9 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -14,6 +14,7 @@
 
 #include <assert.h>
 
+struct bilingual_str;
 namespace interfaces {
 class Node;
 }
@@ -42,7 +43,7 @@ class OptionsModel : public QAbstractListModel
     Q_OBJECT
 
 public:
-    explicit OptionsModel(interfaces::Node& node, QObject *parent = nullptr, bool resetSettings = false);
+    explicit OptionsModel(interfaces::Node& node, QObject *parent = nullptr);
 
     enum OptionID {
         StartAtStartup,       // bool
@@ -92,7 +93,7 @@ class OptionsModel : public QAbstractListModel
         OptionIDRowCount,
     };
 
-    void Init(bool resetSettings = false);
+    bool Init(bilingual_str& error);
     void Reset();
 
     int rowCount(const QModelIndex & parent = QModelIndex()) const override;
@@ -118,8 +119,7 @@ class OptionsModel : public QAbstractListModel
     void emitCoinJoinEnabledChanged();
 
     /* Explicit setters */
-    void SetPruneEnabled(bool prune, bool force = false);
-    void SetPruneTargetGB(int prune_target_gb, bool force = false);
+    void SetPruneTargetGB(int prune_target_gb);
 
     /* Restart flag helper */
     void setRestartRequired(bool fRequired);
@@ -142,6 +142,16 @@ class OptionsModel : public QAbstractListModel
     bool m_sub_fee_from_amount;
     bool fKeepChangeAddress;
     bool fShowAdvancedCJUI;
+
+    //! In-memory settings for display. These are stored persistently by the
+    //! bitcoin node but it's also nice to store them in memory to prevent them
+    //! getting cleared when enable/disable toggles are used in the GUI.
+    int m_prune_size_gb;
+    QString m_proxy_ip;
+    QString m_proxy_port;
+    QString m_onion_ip;
+    QString m_onion_port;
+
     /* settings that were overridden by command-line */
     QString strOverriddenByCommandLine;
 
@@ -150,6 +160,7 @@ class OptionsModel : public QAbstractListModel
 
     // Check settings version and upgrade default values if required
     void checkAndMigrate();
+
 Q_SIGNALS:
     void displayUnitChanged(BitcoinUnit unit);
     void coinJoinEnabledChanged();
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
index 4f47adc48b33b..3d09173543095 100644
--- a/src/qt/test/addressbooktests.cpp
+++ b/src/qt/test/addressbooktests.cpp
@@ -120,6 +120,8 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
 
     // Initialize relevant QT models.
     OptionsModel optionsModel(node);
+    bilingual_str error;
+    QVERIFY(optionsModel.Init(error));
     ClientModel clientModel(node, &optionsModel);
     WalletContext& context = *node.walletLoader().context();
     AddWallet(context, wallet);
diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp
index 6e0a498d00484..892de33df4d4a 100644
--- a/src/qt/test/apptests.cpp
+++ b/src/qt/test/apptests.cpp
@@ -72,15 +72,10 @@ void AppTests::appTests()
     }
 #endif
 
-    fs::create_directories([] {
-        BasicTestingSetup test{CBaseChainParams::REGTEST}; // Create a temp data directory to backup the gui settings to
-        return gArgs.GetDataDirNet() / "blocks";
-    }());
-
     qRegisterMetaType<interfaces::BlockAndHeaderTipInfo>("interfaces::BlockAndHeaderTipInfo");
     m_app.parameterSetup();
     GUIUtil::loadFonts();
-    m_app.createOptionsModel(true /* reset settings */);
+    QVERIFY(m_app.createOptionsModel(true /* reset settings */));
     QScopedPointer<const NetworkStyle> style(
         NetworkStyle::instantiate(Params().NetworkIDString()));
     m_app.createWindow(style.data());
diff --git a/src/qt/test/optiontests.cpp b/src/qt/test/optiontests.cpp
index c3cd78553e992..17ffeb220b694 100644
--- a/src/qt/test/optiontests.cpp
+++ b/src/qt/test/optiontests.cpp
@@ -14,6 +14,63 @@
 
 #include <univalue.h>
 
+#include <fstream>
+
+OptionTests::OptionTests(interfaces::Node& node) : m_node(node)
+{
+    gArgs.LockSettings([&](util::Settings& s) { m_previous_settings = s; });
+}
+
+void OptionTests::init()
+{
+    // reset args
+    gArgs.LockSettings([&](util::Settings& s) { s = m_previous_settings; });
+    gArgs.ClearPathCache();
+}
+
+void OptionTests::migrateSettings()
+{
+    // Set legacy QSettings and verify that they get cleared and migrated to
+    // settings.json
+    QSettings settings;
+    settings.setValue("nDatabaseCache", 600);
+    settings.setValue("nThreadsScriptVerif", 12);
+    settings.setValue("fUseUPnP", false);
+    settings.setValue("fListen", false);
+    settings.setValue("bPrune", true);
+    settings.setValue("nPruneSize", 3);
+    settings.setValue("fUseProxy", true);
+    settings.setValue("addrProxy", "proxy:123");
+    settings.setValue("fUseSeparateProxyTor", true);
+    settings.setValue("addrSeparateProxyTor", "onion:234");
+
+    settings.sync();
+
+    OptionsModel options{m_node};
+    bilingual_str error;
+    QVERIFY(options.Init(error));
+    QVERIFY(!settings.contains("nDatabaseCache"));
+    QVERIFY(!settings.contains("nThreadsScriptVerif"));
+    QVERIFY(!settings.contains("fUseUPnP"));
+    QVERIFY(!settings.contains("fListen"));
+    QVERIFY(!settings.contains("bPrune"));
+    QVERIFY(!settings.contains("nPruneSize"));
+    QVERIFY(!settings.contains("fUseProxy"));
+    QVERIFY(!settings.contains("addrProxy"));
+    QVERIFY(!settings.contains("fUseSeparateProxyTor"));
+    QVERIFY(!settings.contains("addrSeparateProxyTor"));
+
+    std::ifstream file(gArgs.GetDataDirNet() / "settings.json");
+    QCOMPARE(std::string(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>()).c_str(), "{\n"
+        "    \"dbcache\": \"600\",\n"
+        "    \"listen\": false,\n"
+        "    \"onion\": \"onion:234\",\n"
+        "    \"par\": \"12\",\n"
+        "    \"proxy\": \"proxy:123\",\n"
+        "    \"prune\": \"2861\"\n"
+        "}\n");
+}
+
 void OptionTests::integerGetArgBug()
 {
     // Test regression https://github.com/bitcoin/bitcoin/issues/24457. Ensure
@@ -24,7 +81,8 @@ void OptionTests::integerGetArgBug()
         settings.rw_settings["prune"] = 3814;
     });
     gArgs.WriteSettingsFile();
-    OptionsModel{m_node};
+    bilingual_str error;
+    QVERIFY(OptionsModel{m_node}.Init(error));
     gArgs.LockSettings([&](util::Settings& settings) {
         settings.rw_settings.erase("prune");
     });
@@ -37,8 +95,6 @@ void OptionTests::parametersInteraction()
     // It was fixed via https://github.com/bitcoin-core/gui/pull/568.
     // With fListen=false in ~/.config/Bitcoin/Bitcoin-Qt.conf and all else left as default,
     // bitcoin-qt should set both -listen and -listenonion to false and start successfully.
-    gArgs.ClearPathCache();
-
     gArgs.LockSettings([&](util::Settings& s) {
         s.forced_settings.erase("listen");
         s.forced_settings.erase("listenonion");
@@ -49,7 +105,8 @@ void OptionTests::parametersInteraction()
     QSettings settings;
     settings.setValue("fListen", false);
 
-    OptionsModel{m_node};
+    bilingual_str error;
+    QVERIFY(OptionsModel{m_node}.Init(error));
 
     const bool expected{false};
 
diff --git a/src/qt/test/optiontests.h b/src/qt/test/optiontests.h
index 78061d8fe8705..57ec8bd0f2ab8 100644
--- a/src/qt/test/optiontests.h
+++ b/src/qt/test/optiontests.h
@@ -6,6 +6,8 @@
 #define BITCOIN_QT_TEST_OPTIONTESTS_H
 
 #include <qt/optionsmodel.h>
+#include <univalue.h>
+#include <util/settings.h>
 
 #include <QObject>
 
@@ -13,15 +15,18 @@ class OptionTests : public QObject
 {
     Q_OBJECT
 public:
-    explicit OptionTests(interfaces::Node& node) : m_node(node) {}
+    explicit OptionTests(interfaces::Node& node);
 
 private Q_SLOTS:
+    void init(); // called before each test function execution.
+    void migrateSettings();
     void integerGetArgBug();
     void parametersInteraction();
     void extractFilter();
 
 private:
     interfaces::Node& m_node;
+    util::Settings m_previous_settings;
 };
 
 #endif // BITCOIN_QT_TEST_OPTIONTESTS_H
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index d2f56ab891d65..a72cabb2e33d3 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -60,9 +60,10 @@ int main(int argc, char* argv[])
     // regtest params.
     //
     // All tests must use their own testing setup (if needed).
-    {
+    fs::create_directories([] {
         BasicTestingSetup dummy{CBaseChainParams::REGTEST};
-    }
+        return gArgs.GetDataDirNet() / "blocks";
+    }());
 
     NodeContext node_context;
     int unused_exit_status;
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 377fdeb8b7dfa..8197f230cd1ac 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -153,6 +153,8 @@ void TestGUI(interfaces::Node& node)
     SendCoinsDialog sendCoinsDialog;
     TransactionView transactionView;
     OptionsModel optionsModel(node);
+    bilingual_str error;
+    QVERIFY(optionsModel.Init(error));
     ClientModel clientModel(node, &optionsModel);
     WalletModel walletModel(interfaces::MakeWallet(context, wallet), clientModel);
     sendCoinsDialog.setModel(&walletModel);

From eacc4cfa5435eb1955a0747e5513ca9ba66f493d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 25 Aug 2025 21:35:27 +0000
Subject: [PATCH 17/31] refactor: spin-off list of option IDs that require
 string workaround

We have a lot more configurable options and the current approach will
get unwieldy as it grows
---
 src/qt/optionsmodel.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 100453186148d..5250823c1eaa1 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -63,14 +63,23 @@ static const char* SettingName(OptionsModel::OptionID option)
     }
 }
 
+static bool RequiresNumWorkaround(OptionsModel::OptionID option)
+{
+    switch (option) {
+    case OptionsModel::DatabaseCache:
+    case OptionsModel::Prune:
+    case OptionsModel::PruneSize:
+    case OptionsModel::ThreadsScriptVerif:
+        return true;
+    default:
+        return false;
+    }
+}
+
 /** Call node.updateRwSetting() with Bitcoin 22.x workaround. */
 static void UpdateRwSetting(interfaces::Node& node, OptionsModel::OptionID option, const util::SettingsValue& value)
 {
-    if (value.isNum() &&
-        (option == OptionsModel::DatabaseCache ||
-         option == OptionsModel::ThreadsScriptVerif ||
-         option == OptionsModel::Prune ||
-         option == OptionsModel::PruneSize)) {
+    if (value.isNum() && RequiresNumWorkaround(option)) {
         // Write certain old settings as strings, even though they are numbers,
         // because Bitcoin 22.x releases try to read these specific settings as
         // strings in addOverriddenOption() calls at startup, triggering

From a2eed11e05ffc04990df9fdaf485c666fde23717 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 26 Aug 2025 08:11:25 +0000
Subject: [PATCH 18/31] qt: migrate `-coinjoinsessions` setting from QSettings
 to settings.json

---
 src/qt/optionsmodel.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 5250823c1eaa1..7052169b8dc83 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -59,6 +59,8 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::ProxyPortTor: return "onion";
     case OptionsModel::ProxyUseTor: return "onion";
     case OptionsModel::Language: return "lang";
+    //! Dash
+    case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
     default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
     }
 }
@@ -66,6 +68,7 @@ static const char* SettingName(OptionsModel::OptionID option)
 static bool RequiresNumWorkaround(OptionsModel::OptionID option)
 {
     switch (option) {
+    case OptionsModel::CoinJoinSessions:
     case OptionsModel::DatabaseCache:
     case OptionsModel::Prune:
     case OptionsModel::PruneSize:
@@ -288,7 +291,8 @@ bool OptionsModel::Init(bilingual_str& error)
     // These are shared with the core or have a command-line parameter
     // and we want command-line parameters to overwrite the GUI settings.
     for (OptionID option : {DatabaseCache, ThreadsScriptVerif, SpendZeroConfChange, MapPortUPnP,
-                            MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language}) {
+                            MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language,
+                            CoinJoinSessions}) {
         std::string setting = SettingName(option);
         if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
         try {
@@ -316,11 +320,6 @@ bool OptionsModel::Init(bilingual_str& error)
     m_sub_fee_from_amount = settings.value("SubFeeFromAmount", false).toBool();
 
     // CoinJoin
-    if (!settings.contains("nCoinJoinSessions"))
-        settings.setValue("nCoinJoinSessions", DEFAULT_COINJOIN_SESSIONS);
-    if (!gArgs.SoftSetArg("-coinjoinsessions", settings.value("nCoinJoinSessions").toString().toStdString()))
-        addOverriddenOption("-coinjoinsessions");
-
     if (!settings.contains("nCoinJoinRounds"))
         settings.setValue("nCoinJoinRounds", DEFAULT_COINJOIN_ROUNDS);
     if (!gArgs.SoftSetArg("-coinjoinrounds", settings.value("nCoinJoinRounds").toString().toStdString()))
@@ -554,7 +553,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case LowKeysWarning:
         return settings.value("fLowKeysWarning");
     case CoinJoinSessions:
-        return settings.value("nCoinJoinSessions");
+        return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_SESSIONS));
     case CoinJoinRounds:
         return settings.value("nCoinJoinRounds");
     case CoinJoinAmount:
@@ -754,9 +753,9 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         settings.setValue("fLowKeysWarning", value);
         break;
     case CoinJoinSessions:
-        if (settings.value("nCoinJoinSessions") != value) {
+        if (changed()) {
             node().coinJoinOptions().setSessions(value.toInt());
-            settings.setValue("nCoinJoinSessions", node().coinJoinOptions().getSessions());
+            update(value.toInt());
             Q_EMIT coinJoinRoundsChanged();
         }
         break;
@@ -1024,6 +1023,11 @@ void OptionsModel::checkAndMigrate()
     migrate_setting(ProxyUseTor, "fUseSeparateProxyTor");
     migrate_setting(Language, "language");
 
+    //! Dash
+#ifdef ENABLE_WALLET
+    migrate_setting(CoinJoinSessions, "nCoinJoinSessions");
+#endif
+
     // In case migrating QSettings caused any settings value to change, rerun
     // parameter interaction code to update other settings. This is particularly
     // important for the -listen setting, which should cause -listenonion, -upnp,

From 856aadc6b95979065adbe7493ea4318a92b2ea3f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 26 Aug 2025 08:11:45 +0000
Subject: [PATCH 19/31] qt: migrate `-coinjoinrounds` setting from QSettings to
 settings.json

---
 src/qt/optionsmodel.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 7052169b8dc83..3edc7b2848e53 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -60,6 +60,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::ProxyUseTor: return "onion";
     case OptionsModel::Language: return "lang";
     //! Dash
+    case OptionsModel::CoinJoinRounds: return "coinjoinrounds";
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
     default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
     }
@@ -68,6 +69,7 @@ static const char* SettingName(OptionsModel::OptionID option)
 static bool RequiresNumWorkaround(OptionsModel::OptionID option)
 {
     switch (option) {
+    case OptionsModel::CoinJoinRounds:
     case OptionsModel::CoinJoinSessions:
     case OptionsModel::DatabaseCache:
     case OptionsModel::Prune:
@@ -292,7 +294,7 @@ bool OptionsModel::Init(bilingual_str& error)
     // and we want command-line parameters to overwrite the GUI settings.
     for (OptionID option : {DatabaseCache, ThreadsScriptVerif, SpendZeroConfChange, MapPortUPnP,
                             MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language,
-                            CoinJoinSessions}) {
+                            CoinJoinRounds, CoinJoinSessions}) {
         std::string setting = SettingName(option);
         if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
         try {
@@ -320,11 +322,6 @@ bool OptionsModel::Init(bilingual_str& error)
     m_sub_fee_from_amount = settings.value("SubFeeFromAmount", false).toBool();
 
     // CoinJoin
-    if (!settings.contains("nCoinJoinRounds"))
-        settings.setValue("nCoinJoinRounds", DEFAULT_COINJOIN_ROUNDS);
-    if (!gArgs.SoftSetArg("-coinjoinrounds", settings.value("nCoinJoinRounds").toString().toStdString()))
-        addOverriddenOption("-coinjoinrounds");
-
     if (!settings.contains("nCoinJoinAmount"))
         settings.setValue("nCoinJoinAmount", DEFAULT_COINJOIN_AMOUNT);
     if (!gArgs.SoftSetArg("-coinjoinamount", settings.value("nCoinJoinAmount").toString().toStdString()))
@@ -555,7 +552,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case CoinJoinSessions:
         return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_SESSIONS));
     case CoinJoinRounds:
-        return settings.value("nCoinJoinRounds");
+        return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_ROUNDS));
     case CoinJoinAmount:
         return settings.value("nCoinJoinAmount");
     case CoinJoinDenomsGoal:
@@ -760,10 +757,9 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case CoinJoinRounds:
-        if (settings.value("nCoinJoinRounds") != value)
-        {
+        if (changed()) {
             node().coinJoinOptions().setRounds(value.toInt());
-            settings.setValue("nCoinJoinRounds", node().coinJoinOptions().getRounds());
+            update(value.toInt());
             Q_EMIT coinJoinRoundsChanged();
         }
         break;
@@ -1025,6 +1021,7 @@ void OptionsModel::checkAndMigrate()
 
     //! Dash
 #ifdef ENABLE_WALLET
+    migrate_setting(CoinJoinRounds, "nCoinJoinRounds");
     migrate_setting(CoinJoinSessions, "nCoinJoinSessions");
 #endif
 

From 3be117bd2e30926c067ab5c96dfa39f88b93edf3 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 26 Aug 2025 08:12:00 +0000
Subject: [PATCH 20/31] qt: migrate `-coinjoinamount` setting from QSettings to
 settings.json

---
 src/qt/optionsmodel.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 3edc7b2848e53..da9cb7f33751e 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -60,6 +60,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::ProxyUseTor: return "onion";
     case OptionsModel::Language: return "lang";
     //! Dash
+    case OptionsModel::CoinJoinAmount: return "coinjoinamount";
     case OptionsModel::CoinJoinRounds: return "coinjoinrounds";
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
     default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
@@ -69,6 +70,7 @@ static const char* SettingName(OptionsModel::OptionID option)
 static bool RequiresNumWorkaround(OptionsModel::OptionID option)
 {
     switch (option) {
+    case OptionsModel::CoinJoinAmount:
     case OptionsModel::CoinJoinRounds:
     case OptionsModel::CoinJoinSessions:
     case OptionsModel::DatabaseCache:
@@ -294,7 +296,7 @@ bool OptionsModel::Init(bilingual_str& error)
     // and we want command-line parameters to overwrite the GUI settings.
     for (OptionID option : {DatabaseCache, ThreadsScriptVerif, SpendZeroConfChange, MapPortUPnP,
                             MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language,
-                            CoinJoinRounds, CoinJoinSessions}) {
+                            CoinJoinAmount, CoinJoinRounds, CoinJoinSessions}) {
         std::string setting = SettingName(option);
         if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
         try {
@@ -322,11 +324,6 @@ bool OptionsModel::Init(bilingual_str& error)
     m_sub_fee_from_amount = settings.value("SubFeeFromAmount", false).toBool();
 
     // CoinJoin
-    if (!settings.contains("nCoinJoinAmount"))
-        settings.setValue("nCoinJoinAmount", DEFAULT_COINJOIN_AMOUNT);
-    if (!gArgs.SoftSetArg("-coinjoinamount", settings.value("nCoinJoinAmount").toString().toStdString()))
-        addOverriddenOption("-coinjoinamount");
-
     if (!settings.contains("fCoinJoinMultiSession"))
         settings.setValue("fCoinJoinMultiSession", DEFAULT_COINJOIN_MULTISESSION);
     if (!gArgs.SoftSetBoolArg("-coinjoinmultisession", settings.value("fCoinJoinMultiSession").toBool()))
@@ -554,7 +551,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case CoinJoinRounds:
         return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_ROUNDS));
     case CoinJoinAmount:
-        return settings.value("nCoinJoinAmount");
+        return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_AMOUNT));
     case CoinJoinDenomsGoal:
         return settings.value("nCoinJoinDenomsGoal");
     case CoinJoinDenomsHardCap:
@@ -764,10 +761,9 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case CoinJoinAmount:
-        if (settings.value("nCoinJoinAmount") != value)
-        {
+        if (changed()) {
             node().coinJoinOptions().setAmount(value.toInt());
-            settings.setValue("nCoinJoinAmount", node().coinJoinOptions().getAmount());
+            update(value.toInt());
             Q_EMIT coinJoinAmountChanged();
         }
         break;
@@ -1021,6 +1017,7 @@ void OptionsModel::checkAndMigrate()
 
     //! Dash
 #ifdef ENABLE_WALLET
+    migrate_setting(CoinJoinAmount, "nCoinJoinAmount");
     migrate_setting(CoinJoinRounds, "nCoinJoinRounds");
     migrate_setting(CoinJoinSessions, "nCoinJoinSessions");
 #endif

From 1b59fb335b700b8f1054f2a4f95ded00b655291b Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 25 Aug 2025 21:49:23 +0000
Subject: [PATCH 21/31] qt: migrate `-coinjoinmultisession` setting from
 QSettings to settings.json

---
 src/qt/optionsmodel.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index da9cb7f33751e..4ba05b9fba30a 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -61,6 +61,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::Language: return "lang";
     //! Dash
     case OptionsModel::CoinJoinAmount: return "coinjoinamount";
+    case OptionsModel::CoinJoinMultiSession: return "coinjoinmultisession";
     case OptionsModel::CoinJoinRounds: return "coinjoinrounds";
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
     default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
@@ -296,7 +297,7 @@ bool OptionsModel::Init(bilingual_str& error)
     // and we want command-line parameters to overwrite the GUI settings.
     for (OptionID option : {DatabaseCache, ThreadsScriptVerif, SpendZeroConfChange, MapPortUPnP,
                             MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language,
-                            CoinJoinAmount, CoinJoinRounds, CoinJoinSessions}) {
+                            CoinJoinAmount, CoinJoinMultiSession, CoinJoinRounds, CoinJoinSessions}) {
         std::string setting = SettingName(option);
         if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
         try {
@@ -324,11 +325,6 @@ bool OptionsModel::Init(bilingual_str& error)
     m_sub_fee_from_amount = settings.value("SubFeeFromAmount", false).toBool();
 
     // CoinJoin
-    if (!settings.contains("fCoinJoinMultiSession"))
-        settings.setValue("fCoinJoinMultiSession", DEFAULT_COINJOIN_MULTISESSION);
-    if (!gArgs.SoftSetBoolArg("-coinjoinmultisession", settings.value("fCoinJoinMultiSession").toBool()))
-        addOverriddenOption("-coinjoinmultisession");
-
     if (!settings.contains("nCoinJoinDenomsGoal"))
         settings.setValue("nCoinJoinDenomsGoal", DEFAULT_COINJOIN_DENOMS_GOAL);
     if (!gArgs.SoftSetArg("-coinjoindenomsgoal", settings.value("nCoinJoinDenomsGoal").toString().toStdString()))
@@ -557,7 +553,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case CoinJoinDenomsHardCap:
         return settings.value("nCoinJoinDenomsHardCap");
     case CoinJoinMultiSession:
-        return settings.value("fCoinJoinMultiSession");
+        return SettingToBool(setting(), DEFAULT_COINJOIN_MULTISESSION);
 #endif
     case DisplayUnit:
         return QVariant::fromValue(m_display_bitcoin_unit);
@@ -780,10 +776,9 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case CoinJoinMultiSession:
-        if (settings.value("fCoinJoinMultiSession") != value)
-        {
+        if (changed()) {
             node().coinJoinOptions().setMultiSessionEnabled(value.toBool());
-            settings.setValue("fCoinJoinMultiSession", node().coinJoinOptions().isMultiSessionEnabled());
+            update(value.toBool());
         }
         break;
 #endif
@@ -1018,6 +1013,7 @@ void OptionsModel::checkAndMigrate()
     //! Dash
 #ifdef ENABLE_WALLET
     migrate_setting(CoinJoinAmount, "nCoinJoinAmount");
+    migrate_setting(CoinJoinMultiSession, "fCoinJoinMultiSession");
     migrate_setting(CoinJoinRounds, "nCoinJoinRounds");
     migrate_setting(CoinJoinSessions, "nCoinJoinSessions");
 #endif

From cc0049004a26cf2991b619546098de27f5ec89ef Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 26 Aug 2025 08:12:26 +0000
Subject: [PATCH 22/31] qt: migrate `-coinjoindenomsgoal` setting from
 QSettings to settings.json

---
 src/qt/optionsmodel.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 4ba05b9fba30a..60a09401bd503 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -61,6 +61,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::Language: return "lang";
     //! Dash
     case OptionsModel::CoinJoinAmount: return "coinjoinamount";
+    case OptionsModel::CoinJoinDenomsGoal: return "coinjoindenomsgoal";
     case OptionsModel::CoinJoinMultiSession: return "coinjoinmultisession";
     case OptionsModel::CoinJoinRounds: return "coinjoinrounds";
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
@@ -72,6 +73,7 @@ static bool RequiresNumWorkaround(OptionsModel::OptionID option)
 {
     switch (option) {
     case OptionsModel::CoinJoinAmount:
+    case OptionsModel::CoinJoinDenomsGoal:
     case OptionsModel::CoinJoinRounds:
     case OptionsModel::CoinJoinSessions:
     case OptionsModel::DatabaseCache:
@@ -297,7 +299,8 @@ bool OptionsModel::Init(bilingual_str& error)
     // and we want command-line parameters to overwrite the GUI settings.
     for (OptionID option : {DatabaseCache, ThreadsScriptVerif, SpendZeroConfChange, MapPortUPnP,
                             MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language,
-                            CoinJoinAmount, CoinJoinMultiSession, CoinJoinRounds, CoinJoinSessions}) {
+                            CoinJoinAmount, CoinJoinDenomsGoal, CoinJoinMultiSession, CoinJoinRounds,
+                            CoinJoinSessions}) {
         std::string setting = SettingName(option);
         if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
         try {
@@ -325,11 +328,6 @@ bool OptionsModel::Init(bilingual_str& error)
     m_sub_fee_from_amount = settings.value("SubFeeFromAmount", false).toBool();
 
     // CoinJoin
-    if (!settings.contains("nCoinJoinDenomsGoal"))
-        settings.setValue("nCoinJoinDenomsGoal", DEFAULT_COINJOIN_DENOMS_GOAL);
-    if (!gArgs.SoftSetArg("-coinjoindenomsgoal", settings.value("nCoinJoinDenomsGoal").toString().toStdString()))
-        addOverriddenOption("-coinjoindenomsgoal");
-
     if (!settings.contains("nCoinJoinDenomsHardCap"))
         settings.setValue("nCoinJoinDenomsHardCap", DEFAULT_COINJOIN_DENOMS_HARDCAP);
     if (!gArgs.SoftSetArg("-coinjoindenomshardcap", settings.value("nCoinJoinDenomsHardCap").toString().toStdString()))
@@ -549,7 +547,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case CoinJoinAmount:
         return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_AMOUNT));
     case CoinJoinDenomsGoal:
-        return settings.value("nCoinJoinDenomsGoal");
+        return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_DENOMS_GOAL));
     case CoinJoinDenomsHardCap:
         return settings.value("nCoinJoinDenomsHardCap");
     case CoinJoinMultiSession:
@@ -764,9 +762,9 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case CoinJoinDenomsGoal:
-        if (settings.value("nCoinJoinDenomsGoal") != value) {
+        if (changed()) {
             node().coinJoinOptions().setDenomsGoal(value.toInt());
-            settings.setValue("nCoinJoinDenomsGoal", node().coinJoinOptions().getDenomsGoal());
+            update(value.toInt());
         }
         break;
     case CoinJoinDenomsHardCap:
@@ -1013,6 +1011,7 @@ void OptionsModel::checkAndMigrate()
     //! Dash
 #ifdef ENABLE_WALLET
     migrate_setting(CoinJoinAmount, "nCoinJoinAmount");
+    migrate_setting(CoinJoinDenomsGoal, "nCoinJoinDenomsGoal");
     migrate_setting(CoinJoinMultiSession, "fCoinJoinMultiSession");
     migrate_setting(CoinJoinRounds, "nCoinJoinRounds");
     migrate_setting(CoinJoinSessions, "nCoinJoinSessions");

From ee02422c4d75db7964ac6d89f71f4a2759331a6c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 26 Aug 2025 08:12:53 +0000
Subject: [PATCH 23/31] qt: migrate `-coinjoindenomshardcap` setting from
 QSettings to settings.json

---
 src/qt/optionsmodel.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 60a09401bd503..b3c0bff9b87fb 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -62,6 +62,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     //! Dash
     case OptionsModel::CoinJoinAmount: return "coinjoinamount";
     case OptionsModel::CoinJoinDenomsGoal: return "coinjoindenomsgoal";
+    case OptionsModel::CoinJoinDenomsHardCap: return "coinjoindenomshardcap";
     case OptionsModel::CoinJoinMultiSession: return "coinjoinmultisession";
     case OptionsModel::CoinJoinRounds: return "coinjoinrounds";
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
@@ -74,6 +75,7 @@ static bool RequiresNumWorkaround(OptionsModel::OptionID option)
     switch (option) {
     case OptionsModel::CoinJoinAmount:
     case OptionsModel::CoinJoinDenomsGoal:
+    case OptionsModel::CoinJoinDenomsHardCap:
     case OptionsModel::CoinJoinRounds:
     case OptionsModel::CoinJoinSessions:
     case OptionsModel::DatabaseCache:
@@ -299,8 +301,8 @@ bool OptionsModel::Init(bilingual_str& error)
     // and we want command-line parameters to overwrite the GUI settings.
     for (OptionID option : {DatabaseCache, ThreadsScriptVerif, SpendZeroConfChange, MapPortUPnP,
                             MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language,
-                            CoinJoinAmount, CoinJoinDenomsGoal, CoinJoinMultiSession, CoinJoinRounds,
-                            CoinJoinSessions}) {
+                            CoinJoinAmount, CoinJoinDenomsGoal, CoinJoinDenomsHardCap, CoinJoinMultiSession,
+                            CoinJoinRounds, CoinJoinSessions}) {
         std::string setting = SettingName(option);
         if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
         try {
@@ -326,12 +328,6 @@ bool OptionsModel::Init(bilingual_str& error)
         settings.setValue("SubFeeFromAmount", false);
     }
     m_sub_fee_from_amount = settings.value("SubFeeFromAmount", false).toBool();
-
-    // CoinJoin
-    if (!settings.contains("nCoinJoinDenomsHardCap"))
-        settings.setValue("nCoinJoinDenomsHardCap", DEFAULT_COINJOIN_DENOMS_HARDCAP);
-    if (!gArgs.SoftSetArg("-coinjoindenomshardcap", settings.value("nCoinJoinDenomsHardCap").toString().toStdString()))
-        addOverriddenOption("-coinjoindenomshardcap");
 #endif
 
     // Display
@@ -549,7 +545,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case CoinJoinDenomsGoal:
         return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_DENOMS_GOAL));
     case CoinJoinDenomsHardCap:
-        return settings.value("nCoinJoinDenomsHardCap");
+        return qlonglong(SettingToInt(setting(), DEFAULT_COINJOIN_DENOMS_HARDCAP));
     case CoinJoinMultiSession:
         return SettingToBool(setting(), DEFAULT_COINJOIN_MULTISESSION);
 #endif
@@ -768,9 +764,9 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case CoinJoinDenomsHardCap:
-        if (settings.value("nCoinJoinDenomsHardCap") != value) {
+        if (changed()) {
             node().coinJoinOptions().setDenomsHardCap(value.toInt());
-            settings.setValue("nCoinJoinDenomsHardCap", node().coinJoinOptions().getDenomsHardCap());
+            update(value.toInt());
         }
         break;
     case CoinJoinMultiSession:
@@ -1012,6 +1008,7 @@ void OptionsModel::checkAndMigrate()
 #ifdef ENABLE_WALLET
     migrate_setting(CoinJoinAmount, "nCoinJoinAmount");
     migrate_setting(CoinJoinDenomsGoal, "nCoinJoinDenomsGoal");
+    migrate_setting(CoinJoinDenomsHardCap, "nCoinJoinDenomsHardCap");
     migrate_setting(CoinJoinMultiSession, "fCoinJoinMultiSession");
     migrate_setting(CoinJoinRounds, "nCoinJoinRounds");
     migrate_setting(CoinJoinSessions, "nCoinJoinSessions");

From 1401cc0da1a9e49a06b472630c7eb09167975f2d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 29 Aug 2025 04:07:20 +0000
Subject: [PATCH 24/31] qt: migrate `-enablecoinjoin` setting from QSettings to
 settings.json

---
 src/qt/optionsmodel.cpp | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index b3c0bff9b87fb..a0b94c47281d6 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -63,6 +63,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::CoinJoinAmount: return "coinjoinamount";
     case OptionsModel::CoinJoinDenomsGoal: return "coinjoindenomsgoal";
     case OptionsModel::CoinJoinDenomsHardCap: return "coinjoindenomshardcap";
+    case OptionsModel::CoinJoinEnabled: return "enablecoinjoin";
     case OptionsModel::CoinJoinMultiSession: return "coinjoinmultisession";
     case OptionsModel::CoinJoinRounds: return "coinjoinrounds";
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
@@ -279,13 +280,6 @@ bool OptionsModel::Init(bilingual_str& error)
         settings.setValue("digits", "2");
 
     // CoinJoin
-    if (!settings.contains("fCoinJoinEnabled")) {
-        settings.setValue("fCoinJoinEnabled", true);
-    }
-    if (!gArgs.SoftSetBoolArg("-enablecoinjoin", settings.value("fCoinJoinEnabled").toBool())) {
-        addOverriddenOption("-enablecoinjoin");
-    }
-
     if (!settings.contains("fShowAdvancedCJUI"))
         settings.setValue("fShowAdvancedCJUI", false);
     fShowAdvancedCJUI = settings.value("fShowAdvancedCJUI", false).toBool();
@@ -301,8 +295,8 @@ bool OptionsModel::Init(bilingual_str& error)
     // and we want command-line parameters to overwrite the GUI settings.
     for (OptionID option : {DatabaseCache, ThreadsScriptVerif, SpendZeroConfChange, MapPortUPnP,
                             MapPortNatpmp, Listen, Server, Prune, ProxyUse, ProxyUseTor, Language,
-                            CoinJoinAmount, CoinJoinDenomsGoal, CoinJoinDenomsHardCap, CoinJoinMultiSession,
-                            CoinJoinRounds, CoinJoinSessions}) {
+                            CoinJoinAmount, CoinJoinDenomsGoal, CoinJoinDenomsHardCap, CoinJoinEnabled,
+                            CoinJoinMultiSession, CoinJoinRounds, CoinJoinSessions}) {
         std::string setting = SettingName(option);
         if (node().isSettingIgnored(setting)) addOverriddenOption("-" + setting);
         try {
@@ -529,7 +523,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case ShowGovernanceTab:
         return settings.value("fShowGovernanceTab");
     case CoinJoinEnabled:
-        return settings.value("fCoinJoinEnabled");
+        return SettingToBool(setting(), /*fDefault=*/true);
     case ShowAdvancedCJUI:
         return fShowAdvancedCJUI;
     case ShowCoinJoinPopups:
@@ -718,8 +712,8 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case CoinJoinEnabled:
-        if (settings.value("fCoinJoinEnabled") != value) {
-            settings.setValue("fCoinJoinEnabled", value.toBool());
+        if (changed()) {
+            update(value.toBool());
             Q_EMIT coinJoinEnabledChanged();
         }
         break;
@@ -1009,6 +1003,7 @@ void OptionsModel::checkAndMigrate()
     migrate_setting(CoinJoinAmount, "nCoinJoinAmount");
     migrate_setting(CoinJoinDenomsGoal, "nCoinJoinDenomsGoal");
     migrate_setting(CoinJoinDenomsHardCap, "nCoinJoinDenomsHardCap");
+    migrate_setting(CoinJoinEnabled, "fCoinJoinEnabled");
     migrate_setting(CoinJoinMultiSession, "fCoinJoinMultiSession");
     migrate_setting(CoinJoinRounds, "nCoinJoinRounds");
     migrate_setting(CoinJoinSessions, "nCoinJoinSessions");

From 350d20c24599281d76a8e337b8d3ace7d58f38b1 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 26 Aug 2025 09:16:00 +0000
Subject: [PATCH 25/31] qt: migrate `-font-family` setting from QSettings to
 settings.json

---
 src/qt/optionsmodel.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index a0b94c47281d6..762795dcf1545 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -67,6 +67,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::CoinJoinMultiSession: return "coinjoinmultisession";
     case OptionsModel::CoinJoinRounds: return "coinjoinrounds";
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
+    case OptionsModel::FontFamily: return "font-family";
     default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
     }
 }
@@ -211,14 +212,13 @@ bool OptionsModel::Init(bilingual_str& error)
     if (!settings.contains("theme"))
         settings.setValue("theme", GUIUtil::getDefaultTheme());
 
-    if (!settings.contains("fontFamily"))
-        settings.setValue("fontFamily", GUIUtil::fontFamilyToString(GUIUtil::g_font_defaults.family));
-    if (gArgs.SoftSetArg("-font-family", settings.value("fontFamily").toString().toStdString())) {
-        if (GUIUtil::fontsLoaded()) {
-            GUIUtil::setFontFamily(GUIUtil::fontFamilyFromString(settings.value("fontFamily").toString()));
-        }
-    } else {
+    if (node().isSettingIgnored("font-family")) {
         addOverriddenOption("-font-family");
+    } else if (GUIUtil::fontsLoaded()) {
+        GUIUtil::setFontFamily(
+            GUIUtil::fontFamilyFromString(QString::fromStdString(
+            SettingToString(node().getPersistentSetting("font-family"),
+                            GUIUtil::fontFamilyToString(GUIUtil::g_font_defaults.family).toStdString()))));
     }
 
     if (!settings.contains("fontScale"))
@@ -554,7 +554,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case Theme:
         return settings.value("theme");
     case FontFamily:
-        return settings.value("fontFamily");
+        return QString::fromStdString(SettingToString(setting(), GUIUtil::fontFamilyToString(GUIUtil::g_font_defaults.family).toStdString()));
     case FontScale:
         return settings.value("fontScale");
     case FontWeightNormal: {
@@ -793,8 +793,8 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         // to allow instant theme changes.
         break;
     case FontFamily:
-        if (settings.value("fontFamily") != value) {
-            settings.setValue("fontFamily", value);
+        if (changed()) {
+            update(value.toString().toStdString());
         }
         break;
     case FontScale:
@@ -999,6 +999,9 @@ void OptionsModel::checkAndMigrate()
     migrate_setting(Language, "language");
 
     //! Dash
+    if (GUIUtil::fontsLoaded()) {
+        migrate_setting(FontFamily, "fontFamily");
+    }
 #ifdef ENABLE_WALLET
     migrate_setting(CoinJoinAmount, "nCoinJoinAmount");
     migrate_setting(CoinJoinDenomsGoal, "nCoinJoinDenomsGoal");

From fd18417cf8b4a2823a506ad2401a81a7b4d88b02 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 26 Aug 2025 09:06:21 +0000
Subject: [PATCH 26/31] qt: migrate `-font-scale` setting from QSettings to
 settings.json

---
 src/qt/optionsmodel.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 762795dcf1545..2e09ffeb0069b 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -68,6 +68,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::CoinJoinRounds: return "coinjoinrounds";
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
     case OptionsModel::FontFamily: return "font-family";
+    case OptionsModel::FontScale: return "font-scale";
     default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
     }
 }
@@ -81,6 +82,7 @@ static bool RequiresNumWorkaround(OptionsModel::OptionID option)
     case OptionsModel::CoinJoinRounds:
     case OptionsModel::CoinJoinSessions:
     case OptionsModel::DatabaseCache:
+    case OptionsModel::FontScale:
     case OptionsModel::Prune:
     case OptionsModel::PruneSize:
     case OptionsModel::ThreadsScriptVerif:
@@ -221,14 +223,10 @@ bool OptionsModel::Init(bilingual_str& error)
                             GUIUtil::fontFamilyToString(GUIUtil::g_font_defaults.family).toStdString()))));
     }
 
-    if (!settings.contains("fontScale"))
-        settings.setValue("fontScale", GUIUtil::g_font_defaults.scale);
-    if (gArgs.SoftSetArg("-font-scale", settings.value("fontScale").toString().toStdString())) {
-        if (GUIUtil::fontsLoaded()) {
-            GUIUtil::setFontScale(settings.value("fontScale").toInt());
-        }
-    } else {
+    if (node().isSettingIgnored("font-scale")) {
         addOverriddenOption("-font-scale");
+    } else if (GUIUtil::fontsLoaded()) {
+        GUIUtil::setFontScale(SettingToInt(node().getPersistentSetting("font-scale"), GUIUtil::g_font_defaults.scale));
     }
 
     if (!settings.contains("fontWeightNormal"))
@@ -556,7 +554,7 @@ QVariant OptionsModel::getOption(OptionID option) const
     case FontFamily:
         return QString::fromStdString(SettingToString(setting(), GUIUtil::fontFamilyToString(GUIUtil::g_font_defaults.family).toStdString()));
     case FontScale:
-        return settings.value("fontScale");
+        return qlonglong(SettingToInt(setting(), GUIUtil::g_font_defaults.scale));
     case FontWeightNormal: {
         QFont::Weight weight;
         GUIUtil::weightFromArg(settings.value("fontWeightNormal").toInt(), weight);
@@ -798,8 +796,8 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case FontScale:
-        if (settings.value("fontScale") != value) {
-            settings.setValue("fontScale", value);
+        if (changed()) {
+            update(value.toInt());
         }
         break;
     case FontWeightNormal: {
@@ -1001,6 +999,7 @@ void OptionsModel::checkAndMigrate()
     //! Dash
     if (GUIUtil::fontsLoaded()) {
         migrate_setting(FontFamily, "fontFamily");
+        migrate_setting(FontScale, "fontScale");
     }
 #ifdef ENABLE_WALLET
     migrate_setting(CoinJoinAmount, "nCoinJoinAmount");

From 74d8f542400c9f9667b555f45ba4d50c0a3187ec Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 30 Aug 2025 10:19:30 +0000
Subject: [PATCH 27/31] qt: migrate `-font-weight-normal` from QSettings to
 settings.json

---
 src/qt/optionsmodel.cpp | 60 ++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 2e09ffeb0069b..e6f4b273370c2 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -69,6 +69,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
     case OptionsModel::FontFamily: return "font-family";
     case OptionsModel::FontScale: return "font-scale";
+    case OptionsModel::FontWeightNormal: return "font-weight-normal";
     default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
     }
 }
@@ -83,6 +84,7 @@ static bool RequiresNumWorkaround(OptionsModel::OptionID option)
     case OptionsModel::CoinJoinSessions:
     case OptionsModel::DatabaseCache:
     case OptionsModel::FontScale:
+    case OptionsModel::FontWeightNormal:
     case OptionsModel::Prune:
     case OptionsModel::PruneSize:
     case OptionsModel::ThreadsScriptVerif:
@@ -147,6 +149,23 @@ struct ProxySetting {
 static ProxySetting ParseProxyString(const std::string& proxy);
 static std::string ProxyString(bool is_set, QString ip, QString port);
 
+static int GetFallbackWeightIndex()
+{
+    // If the currently selected weight is not supported fallback to the lightest weight for normal font.
+    return 0;
+}
+
+static int WeightToIndex(int raw_weight)
+{
+    QFont::Weight weight;
+    if (GUIUtil::weightFromArg(raw_weight, weight)) {
+        if (int index = GUIUtil::supportedWeightToIndex(weight); index != -1) {
+            return index;
+        }
+    }
+    return GetFallbackWeightIndex();
+}
+
 OptionsModel::OptionsModel(interfaces::Node& node, QObject *parent) :
     QAbstractListModel(parent), m_node{node}
 {
@@ -229,21 +248,17 @@ bool OptionsModel::Init(bilingual_str& error)
         GUIUtil::setFontScale(SettingToInt(node().getPersistentSetting("font-scale"), GUIUtil::g_font_defaults.scale));
     }
 
-    if (!settings.contains("fontWeightNormal"))
-        settings.setValue("fontWeightNormal", GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_normal));
-    if (gArgs.SoftSetArg("-font-weight-normal", settings.value("fontWeightNormal").toString().toStdString())) {
-        if (GUIUtil::fontsLoaded()) {
-            QFont::Weight weight;
-            GUIUtil::weightFromArg(settings.value("fontWeightNormal").toInt(), weight);
-            if (!GUIUtil::isSupportedWeight(weight)) {
-                // If the currently selected weight is not supported fallback to the lightest weight for normal font.
-                weight = GUIUtil::getSupportedWeights().front();
-                settings.setValue("fontWeightNormal", GUIUtil::weightToArg(weight));
-            }
-            GUIUtil::setFontWeightNormal(weight);
-        }
-    } else {
+    if (node().isSettingIgnored("font-weight-normal")) {
         addOverriddenOption("-font-weight-normal");
+    } else if (GUIUtil::fontsLoaded()) {
+        int raw_weight = SettingToInt(node().getPersistentSetting("font-weight-normal"), GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_normal));
+        QFont::Weight weight;
+        GUIUtil::weightFromArg(raw_weight, weight);
+        if (!GUIUtil::isSupportedWeight(weight)) {
+            weight = GUIUtil::supportedWeightFromIndex(GetFallbackWeightIndex());
+            node().forceSetting("font-weight-normal", GUIUtil::weightToArg(weight));
+        }
+        GUIUtil::setFontWeightNormal(weight);
     }
 
     if (!settings.contains("fontWeightBold"))
@@ -555,13 +570,8 @@ QVariant OptionsModel::getOption(OptionID option) const
         return QString::fromStdString(SettingToString(setting(), GUIUtil::fontFamilyToString(GUIUtil::g_font_defaults.family).toStdString()));
     case FontScale:
         return qlonglong(SettingToInt(setting(), GUIUtil::g_font_defaults.scale));
-    case FontWeightNormal: {
-        QFont::Weight weight;
-        GUIUtil::weightFromArg(settings.value("fontWeightNormal").toInt(), weight);
-        int nIndex = GUIUtil::supportedWeightToIndex(weight);
-        assert(nIndex != -1);
-        return nIndex;
-    }
+    case FontWeightNormal:
+        return WeightToIndex(SettingToInt(setting(), GUIUtil::g_font_defaults.weight_normal));
     case FontWeightBold: {
         QFont::Weight weight;
         GUIUtil::weightFromArg(settings.value("fontWeightBold").toInt(), weight);
@@ -801,9 +811,8 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         }
         break;
     case FontWeightNormal: {
-        int nWeight = GUIUtil::weightToArg(GUIUtil::supportedWeightFromIndex(value.toInt()));
-        if (settings.value("fontWeightNormal") != nWeight) {
-            settings.setValue("fontWeightNormal", nWeight);
+        if (changed()) {
+            update(GUIUtil::weightToArg(GUIUtil::supportedWeightFromIndex(value.toInt())));
         }
         break;
     }
@@ -972,6 +981,8 @@ void OptionsModel::checkAndMigrate()
                 ProxySetting parsed = ParseProxyString(value.toString());
                 setOption(ProxyIPTor, parsed.ip);
                 setOption(ProxyPortTor, parsed.port);
+            } else if (option == FontWeightNormal) {
+                setOption(option, WeightToIndex(value.toInt()));
             } else {
                 setOption(option, value);
             }
@@ -1000,6 +1011,7 @@ void OptionsModel::checkAndMigrate()
     if (GUIUtil::fontsLoaded()) {
         migrate_setting(FontFamily, "fontFamily");
         migrate_setting(FontScale, "fontScale");
+        migrate_setting(FontWeightNormal, "fontWeightNormal");
     }
 #ifdef ENABLE_WALLET
     migrate_setting(CoinJoinAmount, "nCoinJoinAmount");

From 34d1d1616850b1b45283a1e77ed5ddc055468a57 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 30 Aug 2025 10:19:46 +0000
Subject: [PATCH 28/31] qt: migrate `-font-weight-bold` from QSettings to
 settings.json

---
 src/qt/optionsmodel.cpp | 67 ++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index e6f4b273370c2..14055e30422d8 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -69,6 +69,7 @@ static const char* SettingName(OptionsModel::OptionID option)
     case OptionsModel::CoinJoinSessions: return "coinjoinsessions";
     case OptionsModel::FontFamily: return "font-family";
     case OptionsModel::FontScale: return "font-scale";
+    case OptionsModel::FontWeightBold: return "font-weight-bold";
     case OptionsModel::FontWeightNormal: return "font-weight-normal";
     default: throw std::logic_error(strprintf("GUI option %i has no corresponding node setting.", option));
     }
@@ -84,6 +85,7 @@ static bool RequiresNumWorkaround(OptionsModel::OptionID option)
     case OptionsModel::CoinJoinSessions:
     case OptionsModel::DatabaseCache:
     case OptionsModel::FontScale:
+    case OptionsModel::FontWeightBold:
     case OptionsModel::FontWeightNormal:
     case OptionsModel::Prune:
     case OptionsModel::PruneSize:
@@ -149,13 +151,19 @@ struct ProxySetting {
 static ProxySetting ParseProxyString(const std::string& proxy);
 static std::string ProxyString(bool is_set, QString ip, QString port);
 
-static int GetFallbackWeightIndex()
+static int GetFallbackWeightIndex(bool is_bold)
 {
-    // If the currently selected weight is not supported fallback to the lightest weight for normal font.
-    return 0;
+    if (is_bold) {
+        // If the currently selected weight is not supported fallback to the second lightest weight for bold font
+        // or the lightest if there is only one.
+        return GUIUtil::getSupportedWeights().size() > 1 ? 1 : 0;
+    } else {
+        // If the currently selected weight is not supported fallback to the lightest weight for normal font.
+        return 0;
+    }
 }
 
-static int WeightToIndex(int raw_weight)
+static int WeightToIndex(int raw_weight, bool is_bold)
 {
     QFont::Weight weight;
     if (GUIUtil::weightFromArg(raw_weight, weight)) {
@@ -163,7 +171,7 @@ static int WeightToIndex(int raw_weight)
             return index;
         }
     }
-    return GetFallbackWeightIndex();
+    return GetFallbackWeightIndex(is_bold);
 }
 
 OptionsModel::OptionsModel(interfaces::Node& node, QObject *parent) :
@@ -255,29 +263,23 @@ bool OptionsModel::Init(bilingual_str& error)
         QFont::Weight weight;
         GUIUtil::weightFromArg(raw_weight, weight);
         if (!GUIUtil::isSupportedWeight(weight)) {
-            weight = GUIUtil::supportedWeightFromIndex(GetFallbackWeightIndex());
+            weight = GUIUtil::supportedWeightFromIndex(GetFallbackWeightIndex(/*is_bold=*/false));
             node().forceSetting("font-weight-normal", GUIUtil::weightToArg(weight));
         }
         GUIUtil::setFontWeightNormal(weight);
     }
 
-    if (!settings.contains("fontWeightBold"))
-        settings.setValue("fontWeightBold", GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_bold));
-    if (gArgs.SoftSetArg("-font-weight-bold", settings.value("fontWeightBold").toString().toStdString())) {
-        if (GUIUtil::fontsLoaded()) {
-            QFont::Weight weight;
-            GUIUtil::weightFromArg(settings.value("fontWeightBold").toInt(), weight);
-            if (!GUIUtil::isSupportedWeight(weight)) {
-                // If the currently selected weight is not supported fallback to the second lightest weight for bold font
-                // or the lightest if there is only one.
-                auto vecSupported = GUIUtil::getSupportedWeights();
-                weight = vecSupported[vecSupported.size() > 1 ? 1 : 0];
-                settings.setValue("fontWeightBold", GUIUtil::weightToArg(weight));
-            }
-            GUIUtil::setFontWeightBold(weight);
-        }
-    } else {
+    if (node().isSettingIgnored("font-weight-bold")) {
         addOverriddenOption("-font-weight-bold");
+    } else if (GUIUtil::fontsLoaded()) {
+        QFont::Weight weight;
+        int raw_weight = SettingToInt(node().getPersistentSetting("font-weight-bold"), GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_bold));
+        GUIUtil::weightFromArg(raw_weight, weight);
+        if (!GUIUtil::isSupportedWeight(weight)) {
+            weight = GUIUtil::supportedWeightFromIndex(GetFallbackWeightIndex(/*is_bold=*/true));
+            node().forceSetting("font-weight-bold", GUIUtil::weightToArg(weight));
+        }
+        GUIUtil::setFontWeightBold(weight);
     }
 
 #ifdef ENABLE_WALLET
@@ -571,14 +573,9 @@ QVariant OptionsModel::getOption(OptionID option) const
     case FontScale:
         return qlonglong(SettingToInt(setting(), GUIUtil::g_font_defaults.scale));
     case FontWeightNormal:
-        return WeightToIndex(SettingToInt(setting(), GUIUtil::g_font_defaults.weight_normal));
-    case FontWeightBold: {
-        QFont::Weight weight;
-        GUIUtil::weightFromArg(settings.value("fontWeightBold").toInt(), weight);
-        int nIndex = GUIUtil::supportedWeightToIndex(weight);
-        assert(nIndex != -1);
-        return nIndex;
-    }
+        return WeightToIndex(SettingToInt(setting(), GUIUtil::g_font_defaults.weight_normal), /*is_bold=*/false);
+    case FontWeightBold:
+        return WeightToIndex(SettingToInt(setting(), GUIUtil::g_font_defaults.weight_bold), /*is_bold=*/true);
     case Language:
         return QString::fromStdString(SettingToString(setting(), ""));
     case UseEmbeddedMonospacedFont:
@@ -817,9 +814,8 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
         break;
     }
     case FontWeightBold: {
-        int nWeight = GUIUtil::weightToArg(GUIUtil::supportedWeightFromIndex(value.toInt()));
-        if (settings.value("fontWeightBold") != nWeight) {
-            settings.setValue("fontWeightBold", nWeight);
+        if (changed()) {
+            update(GUIUtil::weightToArg(GUIUtil::supportedWeightFromIndex(value.toInt())));
         }
         break;
     }
@@ -981,8 +977,8 @@ void OptionsModel::checkAndMigrate()
                 ProxySetting parsed = ParseProxyString(value.toString());
                 setOption(ProxyIPTor, parsed.ip);
                 setOption(ProxyPortTor, parsed.port);
-            } else if (option == FontWeightNormal) {
-                setOption(option, WeightToIndex(value.toInt()));
+            } else if (option == FontWeightNormal || option == FontWeightBold) {
+                setOption(option, WeightToIndex(value.toInt(), /*is_bold=*/option == FontWeightBold));
             } else {
                 setOption(option, value);
             }
@@ -1011,6 +1007,7 @@ void OptionsModel::checkAndMigrate()
     if (GUIUtil::fontsLoaded()) {
         migrate_setting(FontFamily, "fontFamily");
         migrate_setting(FontScale, "fontScale");
+        migrate_setting(FontWeightBold, "fontWeightBold");
         migrate_setting(FontWeightNormal, "fontWeightNormal");
     }
 #ifdef ENABLE_WALLET

From 41ee54eee68627a54d62fe97bab2e24b4e70454d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 30 Aug 2025 10:02:50 +0000
Subject: [PATCH 29/31] qt: use fallback weight if weightFromArg fails

---
 src/qt/optionsmodel.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 14055e30422d8..1a88f723ab456 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -261,8 +261,7 @@ bool OptionsModel::Init(bilingual_str& error)
     } else if (GUIUtil::fontsLoaded()) {
         int raw_weight = SettingToInt(node().getPersistentSetting("font-weight-normal"), GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_normal));
         QFont::Weight weight;
-        GUIUtil::weightFromArg(raw_weight, weight);
-        if (!GUIUtil::isSupportedWeight(weight)) {
+        if (!GUIUtil::weightFromArg(raw_weight, weight) || !GUIUtil::isSupportedWeight(weight)) {
             weight = GUIUtil::supportedWeightFromIndex(GetFallbackWeightIndex(/*is_bold=*/false));
             node().forceSetting("font-weight-normal", GUIUtil::weightToArg(weight));
         }
@@ -274,8 +273,7 @@ bool OptionsModel::Init(bilingual_str& error)
     } else if (GUIUtil::fontsLoaded()) {
         QFont::Weight weight;
         int raw_weight = SettingToInt(node().getPersistentSetting("font-weight-bold"), GUIUtil::weightToArg(GUIUtil::g_font_defaults.weight_bold));
-        GUIUtil::weightFromArg(raw_weight, weight);
-        if (!GUIUtil::isSupportedWeight(weight)) {
+        if (!GUIUtil::weightFromArg(raw_weight, weight) || !GUIUtil::isSupportedWeight(weight)) {
             weight = GUIUtil::supportedWeightFromIndex(GetFallbackWeightIndex(/*is_bold=*/true));
             node().forceSetting("font-weight-bold", GUIUtil::weightToArg(weight));
         }

From 171c6a9129dcb8b912c7b2f647fb3062c4dbe8ab Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 23 Jan 2023 19:12:04 -0500
Subject: [PATCH 30/31] merge bitcoin-core/gui#701: Persist Mask Values option

---
 src/qt/bitcoingui.cpp   | 2 ++
 src/qt/optionsmodel.cpp | 8 ++++++++
 src/qt/optionsmodel.h   | 2 ++
 src/qt/overviewpage.cpp | 1 +
 4 files changed, 13 insertions(+)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index f68abf1fcb1e4..bd2206f6a6ca0 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -889,6 +889,8 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
 
             connect(optionsModel, &OptionsModel::coinJoinEnabledChanged, this, &BitcoinGUI::updateCoinJoinVisibility);
         }
+
+        m_mask_values_action->setChecked(_clientModel->getOptionsModel()->getOption(OptionsModel::OptionID::MaskValues).toBool());
     } else {
         if(trayIconMenu)
         {
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 1a88f723ab456..e0d28f5933ad8 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -344,6 +344,8 @@ bool OptionsModel::Init(bilingual_str& error)
     m_use_embedded_monospaced_font = settings.value("UseEmbeddedMonospacedFont").toBool();
     Q_EMIT useEmbeddedMonospacedFontChanged(m_use_embedded_monospaced_font);
 
+    m_mask_values = settings.value("mask_values", false).toBool();
+
     return true;
 }
 
@@ -596,6 +598,8 @@ QVariant OptionsModel::getOption(OptionID option) const
         return SettingToBool(setting(), DEFAULT_LISTEN);
     case Server:
         return SettingToBool(setting(), false);
+    case MaskValues:
+        return m_mask_values;
     default:
         return QVariant();
     }
@@ -874,6 +878,10 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
             setRestartRequired(true);
         }
         break;
+    case MaskValues:
+        m_mask_values = value.toBool();
+        settings.setValue("mask_values", m_mask_values);
+        break;
     default:
         break;
     }
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 03727c7859bf9..ad3842b2e8e5b 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -90,6 +90,7 @@ class OptionsModel : public QAbstractListModel
         CoinJoinMultiSession, // bool
         Listen,               // bool
         Server,               // bool
+        MaskValues,           // bool
         OptionIDRowCount,
     };
 
@@ -140,6 +141,7 @@ class OptionsModel : public QAbstractListModel
     bool m_use_embedded_monospaced_font;
     bool fCoinControlFeatures;
     bool m_sub_fee_from_amount;
+    bool m_mask_values;
     bool fKeepChangeAddress;
     bool fShowAdvancedCJUI;
 
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 9783f80e91961..9184cb195eac7 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -207,6 +207,7 @@ void OverviewPage::handleTransactionClicked(const QModelIndex &index)
 void OverviewPage::setPrivacy(bool privacy)
 {
     m_privacy = privacy;
+    clientModel->getOptionsModel()->setOption(OptionsModel::OptionID::MaskValues, privacy);
     if (m_balances.balance != -1) {
         setBalance(m_balances);
         coinJoinStatus(true);

From 3f3d71bbc252422eebcb13b49711c55a293c5f33 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 22 Apr 2022 19:15:17 -0400
Subject: [PATCH 31/31] merge bitcoin-core/gui#603: Add settings.json
 prune-prev, proxy-prev, onion-prev settings

---
 src/qt/optionsmodel.cpp | 130 +++++++++++++++++++++++-----------------
 src/qt/optionsmodel.h   |  13 +---
 2 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index e0d28f5933ad8..66c654d82717d 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -97,7 +97,7 @@ static bool RequiresNumWorkaround(OptionsModel::OptionID option)
 }
 
 /** Call node.updateRwSetting() with Bitcoin 22.x workaround. */
-static void UpdateRwSetting(interfaces::Node& node, OptionsModel::OptionID option, const util::SettingsValue& value)
+static void UpdateRwSetting(interfaces::Node& node, OptionsModel::OptionID option, const std::string& suffix, const util::SettingsValue& value)
 {
     if (value.isNum() && RequiresNumWorkaround(option)) {
         // Write certain old settings as strings, even though they are numbers,
@@ -107,9 +107,9 @@ static void UpdateRwSetting(interfaces::Node& node, OptionsModel::OptionID optio
         // in later releases by https://github.com/bitcoin/bitcoin/pull/24498.
         // If new numeric settings are added, they can be written as numbers
         // instead of strings, because bitcoin 22.x will not try to read these.
-        node.updateRwSetting(SettingName(option), value.getValStr());
+        node.updateRwSetting(SettingName(option) + suffix, value.getValStr());
     } else {
-        node.updateRwSetting(SettingName(option), value);
+        node.updateRwSetting(SettingName(option) + suffix, value);
     }
 }
 
@@ -188,13 +188,6 @@ void OptionsModel::addOverriddenOption(const std::string &option)
 bool OptionsModel::Init(bilingual_str& error)
 {
     // Initialize display settings from stored settings.
-    m_prune_size_gb = PruneSizeGB(node().getPersistentSetting("prune"));
-    ProxySetting proxy = ParseProxyString(SettingToString(node().getPersistentSetting("proxy"), GetDefaultProxyAddress().toStdString()));
-    m_proxy_ip = proxy.ip;
-    m_proxy_port = proxy.port;
-    ProxySetting onion = ParseProxyString(SettingToString(node().getPersistentSetting("onion"), GetDefaultProxyAddress().toStdString()));
-    m_onion_ip = onion.ip;
-    m_onion_port = onion.port;
     language = QString::fromStdString(SettingToString(node().getPersistentSetting("lang"), ""));
 
     checkAndMigrate();
@@ -437,8 +430,6 @@ void OptionsModel::SetPruneTargetGB(int prune_target_gb)
     const util::SettingsValue cur_value = node().getPersistentSetting("prune");
     const util::SettingsValue new_value = PruneSetting(prune_target_gb > 0, prune_target_gb);
 
-    m_prune_size_gb = prune_target_gb;
-
     // Force setting to take effect. It is still safe to change the value at
     // this point because this function is only called after the intro screen is
     // shown, before the node starts.
@@ -457,7 +448,12 @@ void OptionsModel::SetPruneTargetGB(int prune_target_gb)
         PruneSizeGB(cur_value) != PruneSizeGB(new_value)) {
         // Call UpdateRwSetting() instead of setOption() to avoid setting
         // RestartRequired flag
-        UpdateRwSetting(node(), Prune, new_value);
+        UpdateRwSetting(node(), Prune, "", new_value);
+    }
+
+    // Keep previous pruning size, if pruning was disabled.
+    if (PruneEnabled(cur_value)) {
+        UpdateRwSetting(node(), Prune, "-prev", PruneEnabled(new_value) ? util::SettingsValue{} : cur_value);
     }
 }
 
@@ -485,9 +481,9 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
     return successful;
 }
 
-QVariant OptionsModel::getOption(OptionID option) const
+QVariant OptionsModel::getOption(OptionID option, const std::string& suffix) const
 {
-    auto setting = [&]{ return node().getPersistentSetting(SettingName(option)); };
+    auto setting = [&]{ return node().getPersistentSetting(SettingName(option) + suffix); };
 
     QSettings settings;
     switch (option) {
@@ -514,19 +510,30 @@ QVariant OptionsModel::getOption(OptionID option) const
 
     // default proxy
     case ProxyUse:
+    case ProxyUseTor:
         return ParseProxyString(SettingToString(setting(), "")).is_set;
     case ProxyIP:
-        return m_proxy_ip;
+    case ProxyIPTor: {
+        ProxySetting proxy = ParseProxyString(SettingToString(setting(), ""));
+        if (proxy.is_set) {
+            return proxy.ip;
+        } else if (suffix.empty()) {
+            return getOption(option, "-prev");
+        } else {
+            return ParseProxyString(GetDefaultProxyAddress().toStdString()).ip;
+        }
+    }
     case ProxyPort:
-        return m_proxy_port;
-
-    // separate Tor proxy
-    case ProxyUseTor:
-        return ParseProxyString(SettingToString(setting(), "")).is_set;
-    case ProxyIPTor:
-        return m_onion_ip;
-    case ProxyPortTor:
-        return m_onion_port;
+    case ProxyPortTor: {
+        ProxySetting proxy = ParseProxyString(SettingToString(setting(), ""));
+        if (proxy.is_set) {
+            return proxy.port;
+        } else if (suffix.empty()) {
+            return getOption(option, "-prev");
+        } else {
+            return ParseProxyString(GetDefaultProxyAddress().toStdString()).port;
+        }
+    }
 
 #ifdef ENABLE_WALLET
     case SpendZeroConfChange:
@@ -589,7 +596,9 @@ QVariant OptionsModel::getOption(OptionID option) const
     case Prune:
         return PruneEnabled(setting());
     case PruneSize:
-        return m_prune_size_gb;
+        return PruneEnabled(setting()) ? PruneSizeGB(setting()) :
+               suffix.empty()          ? getOption(option, "-prev") :
+                                         DEFAULT_PRUNE_TARGET_GB;
     case DatabaseCache:
         return qlonglong(SettingToInt(setting(), nDefaultDbCache));
     case ThreadsScriptVerif:
@@ -605,10 +614,10 @@ QVariant OptionsModel::getOption(OptionID option) const
     }
 }
 
-bool OptionsModel::setOption(OptionID option, const QVariant& value)
+bool OptionsModel::setOption(OptionID option, const QVariant& value, const std::string& suffix)
 {
-    auto changed = [&] { return value.isValid() && value != getOption(option); };
-    auto update = [&](const util::SettingsValue& value) { return UpdateRwSetting(node(), option, value); };
+    auto changed = [&] { return value.isValid() && value != getOption(option, suffix); };
+    auto update = [&](const util::SettingsValue& value) { return UpdateRwSetting(node(), option, suffix, value); };
 
     bool successful = true; /* set to false on parse error */
     QSettings settings;
@@ -646,52 +655,60 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
     // default proxy
     case ProxyUse:
         if (changed()) {
-            update(ProxyString(value.toBool(), m_proxy_ip, m_proxy_port));
-            setRestartRequired(true);
+            if (suffix.empty() && !value.toBool()) setOption(option, true, "-prev");
+            update(ProxyString(value.toBool(), getOption(ProxyIP).toString(), getOption(ProxyPort).toString()));
+            if (suffix.empty() && value.toBool()) UpdateRwSetting(node(), option, "-prev", {});
+            if (suffix.empty()) setRestartRequired(true);
         }
         break;
     case ProxyIP:
         if (changed()) {
-            m_proxy_ip = value.toString();
-            if (getOption(ProxyUse).toBool()) {
-                update(ProxyString(true, m_proxy_ip, m_proxy_port));
-                setRestartRequired(true);
+            if (suffix.empty() && !getOption(ProxyUse).toBool()) {
+                setOption(option, value, "-prev");
+            } else {
+                update(ProxyString(true, value.toString(), getOption(ProxyPort).toString()));
             }
+            if (suffix.empty() && getOption(ProxyUse).toBool()) setRestartRequired(true);
         }
         break;
     case ProxyPort:
         if (changed()) {
-            m_proxy_port = value.toString();
-            if (getOption(ProxyUse).toBool()) {
-                update(ProxyString(true, m_proxy_ip, m_proxy_port));
-                setRestartRequired(true);
+            if (suffix.empty() && !getOption(ProxyUse).toBool()) {
+                setOption(option, value, "-prev");
+            } else {
+                update(ProxyString(true, getOption(ProxyIP).toString(), value.toString()));
             }
+            if (suffix.empty() && getOption(ProxyUse).toBool()) setRestartRequired(true);
         }
         break;
 
     // separate Tor proxy
     case ProxyUseTor:
         if (changed()) {
-            update(ProxyString(value.toBool(), m_onion_ip, m_onion_port));
-            setRestartRequired(true);
+            if (suffix.empty() && !value.toBool()) setOption(option, true, "-prev");
+            update(ProxyString(value.toBool(), getOption(ProxyIPTor).toString(), getOption(ProxyPortTor).toString()));
+            if (suffix.empty() && value.toBool()) UpdateRwSetting(node(), option, "-prev", {});
+            if (suffix.empty()) setRestartRequired(true);
         }
         break;
     case ProxyIPTor:
         if (changed()) {
-            m_onion_ip = value.toString();
-            if (getOption(ProxyUseTor).toBool()) {
-                update(ProxyString(true, m_onion_ip, m_onion_port));
-                setRestartRequired(true);
+            if (suffix.empty() && !getOption(ProxyUseTor).toBool()) {
+                setOption(option, value, "-prev");
+            } else {
+                update(ProxyString(true, value.toString(), getOption(ProxyPortTor).toString()));
             }
+            if (suffix.empty() && getOption(ProxyUseTor).toBool()) setRestartRequired(true);
         }
         break;
     case ProxyPortTor:
         if (changed()) {
-            m_onion_port = value.toString();
-            if (getOption(ProxyUseTor).toBool()) {
-                update(ProxyString(true, m_onion_ip, m_onion_port));
-                setRestartRequired(true);
+            if (suffix.empty() && !getOption(ProxyUseTor).toBool()) {
+                setOption(option, value, "-prev");
+            } else {
+                update(ProxyString(true, getOption(ProxyIPTor).toString(), value.toString()));
             }
+            if (suffix.empty() && getOption(ProxyUseTor).toBool()) setRestartRequired(true);
         }
         break;
 
@@ -846,17 +863,20 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value)
 #endif // ENABLE_WALLET
     case Prune:
         if (changed()) {
-            update(PruneSetting(value.toBool(), m_prune_size_gb));
-            setRestartRequired(true);
+            if (suffix.empty() && !value.toBool()) setOption(option, true, "-prev");
+            update(PruneSetting(value.toBool(), getOption(PruneSize).toInt()));
+            if (suffix.empty() && value.toBool()) UpdateRwSetting(node(), option, "-prev", {});
+            if (suffix.empty()) setRestartRequired(true);
         }
         break;
     case PruneSize:
         if (changed()) {
-            m_prune_size_gb = ParsePruneSizeGB(value);
-            if (getOption(Prune).toBool()) {
-                update(PruneSetting(true, m_prune_size_gb));
-                setRestartRequired(true);
+            if (suffix.empty() && !getOption(Prune).toBool()) {
+                setOption(option, value, "-prev");
+            } else {
+                update(PruneSetting(true, ParsePruneSizeGB(value)));
             }
+            if (suffix.empty() && getOption(Prune).toBool()) setRestartRequired(true);
         }
         break;
     case DatabaseCache:
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index ad3842b2e8e5b..4632fa686e682 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -100,8 +100,8 @@ class OptionsModel : public QAbstractListModel
     int rowCount(const QModelIndex & parent = QModelIndex()) const override;
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
     bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) override;
-    QVariant getOption(OptionID option) const;
-    bool setOption(OptionID option, const QVariant& value);
+    QVariant getOption(OptionID option, const std::string& suffix="") const;
+    bool setOption(OptionID option, const QVariant& value, const std::string& suffix="");
     /** Updates current unit in memory, settings and emits displayUnitChanged(new_unit) signal */
     void setDisplayUnit(const QVariant& new_unit);
 
@@ -145,15 +145,6 @@ class OptionsModel : public QAbstractListModel
     bool fKeepChangeAddress;
     bool fShowAdvancedCJUI;
 
-    //! In-memory settings for display. These are stored persistently by the
-    //! bitcoin node but it's also nice to store them in memory to prevent them
-    //! getting cleared when enable/disable toggles are used in the GUI.
-    int m_prune_size_gb;
-    QString m_proxy_ip;
-    QString m_proxy_port;
-    QString m_onion_ip;
-    QString m_onion_port;
-
     /* settings that were overridden by command-line */
     QString strOverriddenByCommandLine;