diff --git a/src/qml/bitcoin.cpp b/src/qml/bitcoin.cpp
index 8506c3ece3..b085ea9618 100644
--- a/src/qml/bitcoin.cpp
+++ b/src/qml/bitcoin.cpp
@@ -92,6 +92,26 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
         LogPrintf("GUI: %s\n", msg.toStdString());
     }
 }
+
+bool ConfigurationFileExists(ArgsManager& argsman)
+{
+    fs::path settings_path;
+    if (!argsman.GetSettingsPath(&settings_path)) {
+        // settings file is disabled
+        return true;
+    }
+    if (fs::exists(settings_path)) {
+        return true;
+    }
+
+    const fs::path rel_config_path = argsman.GetPathArg("-conf", BITCOIN_CONF_FILENAME);
+    const fs::path abs_config_path = AbsPathForConfigVal(rel_config_path, true);
+    if (fs::exists(abs_config_path)) {
+        return true;
+    }
+
+    return false;
+}
 } // namespace
 
 
@@ -146,11 +166,24 @@ int QmlGuiMain(int argc, char* argv[])
     }
 
     /// Read and parse settings.json file.
-    if (!gArgs.InitSettings(error)) {
+    std::vector<std::string> errors;
+    if (!gArgs.ReadSettingsFile(&errors)) {
+        error = strprintf("Failed loading settings file:\n%s\n", MakeUnorderedList(errors));
         InitError(Untranslated(error));
         return EXIT_FAILURE;
     }
 
+    QVariant need_onboarding(true);
+    if (gArgs.IsArgSet("-datadir") && !gArgs.GetPathArg("-datadir").empty()) {
+        need_onboarding.setValue(false);
+    } else if (ConfigurationFileExists(gArgs)) {
+        need_onboarding.setValue(false);
+    }
+
+    if (gArgs.IsArgSet("-resetguisettings")) {
+        need_onboarding.setValue(true);
+    }
+
     // Default printtoconsole to false for the GUI. GUI programs should not
     // print to the console unnecessarily.
     gArgs.SoftSetBoolArg("-printtoconsole", false);
@@ -208,6 +241,7 @@ int QmlGuiMain(int argc, char* argv[])
     OptionsQmlModel options_model{*node};
     engine.rootContext()->setContextProperty("optionsModel", &options_model);
 
+    engine.rootContext()->setContextProperty("needOnboarding", need_onboarding);
 #ifdef __ANDROID__
     AppMode app_mode(AppMode::MOBILE);
 #else
diff --git a/src/qml/chainmodel.h b/src/qml/chainmodel.h
index c25d8d11a1..91e2ddc1dd 100644
--- a/src/qml/chainmodel.h
+++ b/src/qml/chainmodel.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_QML_CHAINMODEL_H
 #define BITCOIN_QML_CHAINMODEL_H
 
+#include <chainparams.h>
 #include <interfaces/chain.h>
 
 #include <QObject>
@@ -23,6 +24,8 @@ class ChainModel : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString currentNetworkName READ currentNetworkName WRITE setCurrentNetworkName NOTIFY currentNetworkNameChanged)
+    Q_PROPERTY(quint64 assumedBlockchainSize READ assumedBlockchainSize CONSTANT)
+    Q_PROPERTY(quint64 assumedChainstateSize READ assumedChainstateSize CONSTANT)
     Q_PROPERTY(QVariantList timeRatioList READ timeRatioList NOTIFY timeRatioListChanged)
 
 public:
@@ -30,6 +33,8 @@ class ChainModel : public QObject
 
     QString currentNetworkName() const { return m_current_network_name; };
     void setCurrentNetworkName(QString network_name);
+    quint64 assumedBlockchainSize() const { return m_assumed_blockchain_size; };
+    quint64 assumedChainstateSize() const { return m_assumed_chainstate_size; };
     QVariantList timeRatioList() const { return m_time_ratio_list; };
 
     int timestampAtMeridian();
@@ -46,6 +51,8 @@ public Q_SLOTS:
 
 private:
     QString m_current_network_name;
+    quint64 m_assumed_blockchain_size{ Params().AssumedBlockchainSize() };
+    quint64 m_assumed_chainstate_size{ Params().AssumedChainStateSize() };
     /* time_ratio: Ratio between the time at which an event
      * happened and 12 hours. So, for example, if a block is
      * found at 4 am or pm, the time_ratio would be 0.3.
diff --git a/src/qml/components/BlockClock.qml b/src/qml/components/BlockClock.qml
index 71ab1d97cb..a12bb1da6f 100644
--- a/src/qml/components/BlockClock.qml
+++ b/src/qml/components/BlockClock.qml
@@ -32,6 +32,7 @@ Item {
         timeRatioList: chainModel.timeRatioList
         verificationProgress: nodeModel.verificationProgress
         paused: root.paused
+        connected: root.connected
         synced: nodeModel.verificationProgress > 0.999
         backgroundColor: Theme.color.neutral2
         timeTickColor: Theme.color.neutral5
@@ -93,7 +94,7 @@ Item {
             name: "IBD"; when: !synced && !paused && connected
             PropertyChanges {
                 target: root
-                header: Math.round(nodeModel.verificationProgress * 100) + "%"
+                header:  formatProgressPercentage(nodeModel.verificationProgress * 100)
                 subText: formatRemainingSyncTime(nodeModel.remainingSyncTime)
             }
         },
@@ -144,6 +145,18 @@ Item {
         }
     ]
 
+    function formatProgressPercentage(progress) {
+        if (progress >= 1) {
+            return Math.round(progress) + "%"
+        } else if (progress >= 0.1) {
+            return progress.toFixed(1) + "%"
+        } else if (progress >= 0.01) {
+            return progress.toFixed(2) + "%"
+        } else {
+            return "0%"
+        }
+    }
+
     function formatRemainingSyncTime(milliseconds) {
         var minutes = Math.floor(milliseconds / 60000);
         var seconds = Math.floor((milliseconds % 60000) / 1000);
diff --git a/src/qml/components/DeveloperOptions.qml b/src/qml/components/DeveloperOptions.qml
index c693d96051..59e47565cf 100644
--- a/src/qml/components/DeveloperOptions.qml
+++ b/src/qml/components/DeveloperOptions.qml
@@ -27,12 +27,19 @@ ColumnLayout {
         id: dbcacheSetting
         Layout.fillWidth: true
         header: qsTr("Database cache size (MiB)")
+        errorText: qsTr("This is not a valid cache size. Please choose a value between %1 and %2 MiB.").arg(optionsModel.minDbcacheSizeMiB).arg(optionsModel.maxDbcacheSizeMiB)
+        showErrorText: false
         actionItem: ValueInput {
             parentState: dbcacheSetting.state
             description: optionsModel.dbcacheSizeMiB
             onEditingFinished: {
-                optionsModel.dbcacheSizeMiB = parseInt(text)
-                dbcacheSetting.forceActiveFocus()
+                if (checkValidity(optionsModel.minDbcacheSizeMiB, optionsModel.maxDbcacheSizeMiB, parseInt(text))) {
+                    optionsModel.dbcacheSizeMiB = parseInt(text)
+                    dbcacheSetting.forceActiveFocus()
+                    dbcacheSetting.showErrorText = false
+                } else {
+                    dbcacheSetting.showErrorText = true
+                }
             }
         }
         onClicked: {
@@ -45,12 +52,19 @@ ColumnLayout {
         id: parSetting
         Layout.fillWidth: true
         header: qsTr("Script verification threads")
+        errorText: qsTr("This is not a valid thread count. Please choose a value between %1 and %2 threads.").arg(optionsModel.minScriptThreads).arg(optionsModel.maxScriptThreads)
+        showErrorText: !loadedItem.acceptableInput && loadedItem.length > 0
         actionItem: ValueInput {
             parentState: parSetting.state
             description: optionsModel.scriptThreads
             onEditingFinished: {
-                optionsModel.scriptThreads = parseInt(text)
-                parSetting.forceActiveFocus()
+                if (checkValidity(optionsModel.minScriptThreads, optionsModel.maxScriptThreads, parseInt(text))) {
+                    optionsModel.scriptThreads = parseInt(text)
+                    parSetting.forceActiveFocus()
+                    parSetting.showErrorText = false
+                } else {
+                    parSetting.showErrorText = true
+                }
             }
         }
         onClicked: {
diff --git a/src/qml/components/PeersIndicator.qml b/src/qml/components/PeersIndicator.qml
index d0f739b9eb..e31f349f4c 100644
--- a/src/qml/components/PeersIndicator.qml
+++ b/src/qml/components/PeersIndicator.qml
@@ -28,6 +28,10 @@ RowLayout {
                 SmoothedAnimation { to: 0; velocity: 2.2 }
                 SmoothedAnimation { to: 1; velocity: 2.2 }
             }
+
+            Behavior on color {
+                ColorAnimation { duration: 150 }
+            }
         }
     }
 }
diff --git a/src/qml/components/Separator.qml b/src/qml/components/Separator.qml
index c5ca656aec..869308568f 100644
--- a/src/qml/components/Separator.qml
+++ b/src/qml/components/Separator.qml
@@ -9,4 +9,8 @@ import "../controls"
 Rectangle {
     height: 1
     color: Theme.color.neutral5
+
+    Behavior on color {
+        ColorAnimation { duration: 150 }
+    }
 }
diff --git a/src/qml/components/StorageOptions.qml b/src/qml/components/StorageOptions.qml
index b8e42a5146..eed962b951 100644
--- a/src/qml/components/StorageOptions.qml
+++ b/src/qml/components/StorageOptions.qml
@@ -5,9 +5,15 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
+
+import org.bitcoincore.qt 1.0
+
 import "../controls"
 
 ColumnLayout {
+    id: root
+    property bool customStorage: false
+    property int customStorageAmount
     ButtonGroup {
         id: group
     }
@@ -16,21 +22,42 @@ ColumnLayout {
         Layout.fillWidth: true
         ButtonGroup.group: group
         text: qsTr("Reduce storage")
-        description: qsTr("Uses about 2GB. For simple wallet use.")
+        description: qsTr("Uses about %1GB. For simple wallet use.").arg(chainModel.assumedChainstateSize + 2)
         recommended: true
-        checked: true
+        checked: !root.customStorage && optionsModel.prune
         onClicked: {
             optionsModel.prune = true
             optionsModel.pruneSizeGB = 2
         }
+        Component.onCompleted: {
+            optionsModel.prune = true
+            optionsModel.pruneSizeGB = 2
+        }
     }
     OptionButton {
         Layout.fillWidth: true
         ButtonGroup.group: group
         text: qsTr("Store all data")
-        description: qsTr("Uses about 550GB. Support the network.")
+        checked: !optionsModel.prune
+        description: qsTr("Uses about %1GB. Support the network.").arg(
+            chainModel.assumedBlockchainSize + chainModel.assumedChainstateSize)
         onClicked: {
             optionsModel.prune = false
         }
     }
+    Loader {
+        Layout.fillWidth: true
+        active: root.customStorage
+        visible: active
+        sourceComponent: OptionButton {
+            ButtonGroup.group: group
+            checked: root.customStorage && optionsModel.prune
+            text: qsTr("Custom")
+            description: qsTr("Storing about %1GB of data.").arg(root.customStorageAmount + chainModel.assumedChainstateSize)
+            onClicked: {
+                optionsModel.prune = true
+                optionsModel.pruneSizeGB = root.customStorageAmount
+            }
+        }
+    }
 }
diff --git a/src/qml/components/StorageSettings.qml b/src/qml/components/StorageSettings.qml
index d00355ec6a..2a2951bfac 100644
--- a/src/qml/components/StorageSettings.qml
+++ b/src/qml/components/StorageSettings.qml
@@ -8,6 +8,9 @@ import QtQuick.Layouts 1.15
 import "../controls"
 
 ColumnLayout {
+    id: root
+    property bool customStorage: false
+    property int customStorageAmount
     spacing: 4
     Setting {
         Layout.fillWidth: true
@@ -32,13 +35,22 @@ ColumnLayout {
     Setting {
         id: pruneTargetSetting
         Layout.fillWidth: true
-        header: qsTr("Storage limit (GB)")
+        header: qsTr("Block Storage limit (GB)")
+        errorText: qsTr("This is not a valid prune target. Please choose a value that is equal to or larger than 1GB")
+        showErrorText: false
         actionItem: ValueInput {
             parentState: pruneTargetSetting.state
             description: optionsModel.pruneSizeGB
             onEditingFinished: {
-                optionsModel.pruneSizeGB = parseInt(text)
-                pruneTargetSetting.forceActiveFocus()
+                if (parseInt(text) < 1) {
+                    pruneTargetSetting.showErrorText = true
+                } else {
+                    root.customStorage = true
+                    root.customStorageAmount = parseInt(text)
+                    optionsModel.pruneSizeGB = parseInt(text)
+                    pruneTargetSetting.forceActiveFocus()
+                    pruneTargetSetting.showErrorText = false
+                }
             }
         }
         onClicked: {
diff --git a/src/qml/components/blockclockdial.cpp b/src/qml/components/blockclockdial.cpp
index e451eb5642..3673649d9a 100644
--- a/src/qml/components/blockclockdial.cpp
+++ b/src/qml/components/blockclockdial.cpp
@@ -4,8 +4,10 @@
 
 #include <qml/components/blockclockdial.h>
 
+#include <QBrush>
 #include <QColor>
 #include <QPainterPath>
+#include <QConicalGradient>
 #include <QPen>
 #include <QtMath>
 
@@ -15,7 +17,39 @@ BlockClockDial::BlockClockDial(QQuickItem *parent)
 , m_background_color{QColor("#2D2D2D")}
 , m_confirmation_colors{QList<QColor>{}}
 , m_time_tick_color{QColor("#000000")}
+, m_animation_timer{QTimer(this)}
+, m_delay_timer{QTimer(this)}
 {
+    m_animation_timer.setTimerType(Qt::PreciseTimer);
+    m_animation_timer.setInterval(16);
+    m_delay_timer.setTimerType(Qt::PreciseTimer);
+    m_delay_timer.setSingleShot(true);
+    m_delay_timer.setInterval(5000);
+    connect(&m_animation_timer, &QTimer::timeout,
+            this, [=]() { this->update(); });
+    connect(&m_delay_timer, &QTimer::timeout,
+            this, [=]() { this->m_animation_timer.start(); });
+    m_delay_timer.start();
+}
+
+void BlockClockDial::setupConnectingGradient(const QPen & pen)
+{
+    m_connecting_gradient.setCenter(getBoundsForPen(pen).center());
+    m_connecting_gradient.setAngle(m_connecting_start_angle);
+    m_connecting_gradient.setColorAt(0, m_confirmation_colors[5]);
+    m_connecting_gradient.setColorAt(0.5, m_confirmation_colors[5]);
+    m_connecting_gradient.setColorAt(0.6, m_confirmation_colors[4]);
+    m_connecting_gradient.setColorAt(0.7, m_confirmation_colors[3]);
+    m_connecting_gradient.setColorAt(1, "transparent");
+}
+
+qreal BlockClockDial::decrementGradientAngle(qreal angle)
+{
+    if (angle == -360) {
+        return 0;
+    } else {
+        return angle -= 4;
+    }
 }
 
 void BlockClockDial::setTimeRatioList(QVariantList new_list)
@@ -30,6 +64,20 @@ void BlockClockDial::setVerificationProgress(double progress)
     update();
 }
 
+void BlockClockDial::setConnected(bool connected)
+{
+    if (m_is_connected != connected) {
+        m_is_connected = connected;
+        m_delay_timer.stop();
+        if (m_is_connected) {
+            m_animation_timer.stop();
+        } else {
+            m_delay_timer.start();
+        }
+    }
+    update();
+}
+
 void BlockClockDial::setSynced(bool synced)
 {
     m_is_synced = synced;
@@ -139,6 +187,19 @@ void BlockClockDial::paintProgress(QPainter * painter)
     painter->drawArc(bounds, startAngle * 16, spanAngle * 16);
 }
 
+void BlockClockDial::paintConnectingAnimation(QPainter * painter)
+{
+    QPen pen;
+    pen.setWidthF(4);
+    setupConnectingGradient(pen);
+    pen.setBrush(QBrush(m_connecting_gradient));
+    pen.setCapStyle(Qt::RoundCap);
+    const QRectF bounds = getBoundsForPen(pen);
+    painter->setPen(pen);
+    painter->drawArc(bounds, m_connecting_start_angle * 16, m_connecting_end_angle * 16);
+    m_connecting_start_angle = decrementGradientAngle(m_connecting_start_angle);
+}
+
 void BlockClockDial::paintBackground(QPainter * painter)
 {
     QPen pen(m_background_color);
@@ -186,9 +247,14 @@ void BlockClockDial::paint(QPainter * painter)
 
     if (paused()) return;
 
-    if (synced()) {
+    if (m_animation_timer.isActive()) {
+        paintConnectingAnimation(painter);
+        return;
+    }
+
+    if (synced() && connected()) {
         paintBlocks(painter);
-    } else {
+    } else if (!synced() && connected()) {
         paintProgress(painter);
     }
 }
diff --git a/src/qml/components/blockclockdial.h b/src/qml/components/blockclockdial.h
index 408fac618b..30a7ba8759 100644
--- a/src/qml/components/blockclockdial.h
+++ b/src/qml/components/blockclockdial.h
@@ -6,13 +6,16 @@
 #define BITCOIN_QML_COMPONENTS_BLOCKCLOCKDIAL_H
 
 #include <QQuickPaintedItem>
+#include <QConicalGradient>
 #include <QPainter>
+#include <QTimer>
 
 class BlockClockDial : public QQuickPaintedItem
 {
     Q_OBJECT
     Q_PROPERTY(QVariantList timeRatioList READ timeRatioList WRITE setTimeRatioList)
     Q_PROPERTY(double verificationProgress READ verificationProgress WRITE setVerificationProgress)
+    Q_PROPERTY(bool connected READ connected WRITE setConnected)
     Q_PROPERTY(bool synced READ synced WRITE setSynced)
     Q_PROPERTY(bool paused READ paused WRITE setPaused)
     Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor)
@@ -25,6 +28,7 @@ class BlockClockDial : public QQuickPaintedItem
 
     QVariantList timeRatioList() const { return m_time_ratio_list; };
     double verificationProgress() const { return m_verification_progress; };
+    bool connected() const { return m_is_connected; };
     bool synced() const { return m_is_synced; };
     bool paused() const { return m_is_paused; };
     QColor backgroundColor() const { return m_background_color; };
@@ -34,6 +38,7 @@ class BlockClockDial : public QQuickPaintedItem
 public Q_SLOTS:
     void setTimeRatioList(QVariantList new_time);
     void setVerificationProgress(double progress);
+    void setConnected(bool connected);
     void setSynced(bool synced);
     void setPaused(bool paused);
     void setBackgroundColor(QColor color);
@@ -41,20 +46,29 @@ public Q_SLOTS:
     void setTimeTickColor(QColor color);
 
 private:
+    void paintConnectingAnimation(QPainter * painter);
     void paintProgress(QPainter * painter);
     void paintBlocks(QPainter * painter);
     void paintBackground(QPainter * painter);
     void paintTimeTicks(QPainter * painter);
     QRectF getBoundsForPen(const QPen & pen);
     double degreesPerPixel();
+    void setupConnectingGradient(const QPen & pen);
+    qreal decrementGradientAngle(qreal angle);
 
     QVariantList m_time_ratio_list;
     double m_verification_progress;
+    bool m_is_connected;
     bool m_is_synced;
     bool m_is_paused;
     QColor m_background_color;
+    QConicalGradient m_connecting_gradient;
+    qreal m_connecting_start_angle = 90;
+    const qreal m_connecting_end_angle = -180;
     QList<QColor> m_confirmation_colors;
     QColor m_time_tick_color;
+    QTimer m_animation_timer;
+    QTimer m_delay_timer;
 };
 
 #endif // BITCOIN_QML_COMPONENTS_BLOCKCLOCKDIAL_H
diff --git a/src/qml/controls/CoreText.qml b/src/qml/controls/CoreText.qml
index 8e10272bbe..050f03b256 100644
--- a/src/qml/controls/CoreText.qml
+++ b/src/qml/controls/CoreText.qml
@@ -15,4 +15,8 @@ Text {
     horizontalAlignment: Text.AlignHCenter
     verticalAlignment: Text.AlignVCenter
     wrapMode: wrap ? Text.WordWrap : Text.NoWrap
+
+    Behavior on color {
+        ColorAnimation { duration: 150 }
+    }
 }
diff --git a/src/qml/controls/Header.qml b/src/qml/controls/Header.qml
index 71cb019daa..58d2835fe2 100644
--- a/src/qml/controls/Header.qml
+++ b/src/qml/controls/Header.qml
@@ -22,6 +22,7 @@ ColumnLayout {
     property string subtext: ""
     property int subtextMargin
     property int subtextSize: 15
+    property color subtextColor: Theme.color.neutral9
     property bool wrap: true
 
     spacing: 0
@@ -53,6 +54,10 @@ ColumnLayout {
             text: root.description
             horizontalAlignment: root.center ? Text.AlignHCenter : Text.AlignLeft
             wrapMode: wrap ? Text.WordWrap : Text.NoWrap
+
+            Behavior on color {
+                ColorAnimation { duration: 150 }
+            }
         }
     }
     Loader {
@@ -64,10 +69,14 @@ ColumnLayout {
             font.family: "Inter"
             font.styleName: "Regular"
             font.pixelSize: root.subtextSize
-            color: Theme.color.neutral9
+            color: root.subtextColor
             text: root.subtext
             horizontalAlignment: root.center ? Text.AlignHCenter : Text.AlignLeft
             wrapMode: wrap ? Text.WordWrap : Text.NoWrap
+
+            Behavior on color {
+                ColorAnimation { duration: 150 }
+            }
         }
     }
 }
diff --git a/src/qml/controls/InformationPage.qml b/src/qml/controls/InformationPage.qml
index 600faefcc8..3f2bd052db 100644
--- a/src/qml/controls/InformationPage.qml
+++ b/src/qml/controls/InformationPage.qml
@@ -12,6 +12,7 @@ Page {
     implicitHeight: parent.height
     property alias bannerItem: banner_loader.sourceComponent
     property alias detailItem: detail_loader.sourceComponent
+    property alias loadedDetailItem: detail_loader.item
     property alias navLeftDetail: navbar.leftDetail
     property alias navMiddleDetail: navbar.middleDetail
     property alias navRightDetail: navbar.rightDetail
diff --git a/src/qml/controls/NavButton.qml b/src/qml/controls/NavButton.qml
index bf2fe051df..d9741bdd8e 100644
--- a/src/qml/controls/NavButton.qml
+++ b/src/qml/controls/NavButton.qml
@@ -66,6 +66,10 @@ AbstractButton {
                icon.height: root.iconHeight
                icon.width: root.iconWidth
                background: root.iconBackground
+
+               Behavior on icon.color {
+                   ColorAnimation { duration: 150 }
+               }
            }
         }
         Loader {
diff --git a/src/qml/controls/OptionButton.qml b/src/qml/controls/OptionButton.qml
index fc3022c6a7..f11ddf07a3 100644
--- a/src/qml/controls/OptionButton.qml
+++ b/src/qml/controls/OptionButton.qml
@@ -47,6 +47,10 @@ Button {
                     background: Rectangle {
                         color: Theme.color.neutral9
                         radius: 3
+
+                        Behavior on color {
+                            ColorAnimation { duration: 150 }
+                        }
                     }
                     font.styleName: "Regular"
                     font.pixelSize: 13
@@ -56,6 +60,10 @@ Button {
                     leftPadding: 7
                     color: Theme.color.neutral0
                     text: qsTr("Recommended")
+
+                    Behavior on color {
+                        ColorAnimation { duration: 150 }
+                    }
                 }
             }
         }
@@ -70,6 +78,10 @@ Button {
                 icon.height: 24
                 icon.width: 24
                 background: null
+
+                Behavior on icon.color {
+                    ColorAnimation { duration: 150 }
+                }
             }
         }
     }
diff --git a/src/qml/controls/OptionSwitch.qml b/src/qml/controls/OptionSwitch.qml
index 32d09af2fd..9a9ec32442 100644
--- a/src/qml/controls/OptionSwitch.qml
+++ b/src/qml/controls/OptionSwitch.qml
@@ -12,6 +12,10 @@ Switch {
     background: Rectangle {
         radius: Math.floor(height / 2)
         color: root.checked ? Theme.color.orange : Theme.color.neutral4
+
+        Behavior on color {
+            ColorAnimation { duration: 150 }
+        }
     }
     indicator: Rectangle {
         property real _margin: Math.round((parent.height - height) / 2)
@@ -25,5 +29,9 @@ Switch {
             SmoothedAnimation {
             }
         }
+
+        Behavior on color {
+            ColorAnimation { duration: 150 }
+        }
     }
 }
diff --git a/src/qml/controls/Setting.qml b/src/qml/controls/Setting.qml
index f5ac3bd8dd..df7102d571 100644
--- a/src/qml/controls/Setting.qml
+++ b/src/qml/controls/Setting.qml
@@ -13,6 +13,8 @@ AbstractButton {
     property alias actionItem: action_loader.sourceComponent
     property alias loadedItem: action_loader.item
     property string description
+    property string errorText: ""
+    property bool showErrorText: false
     property color stateColor
     hoverEnabled: true
     state: "FILLED"
@@ -83,6 +85,8 @@ AbstractButton {
             description: root.description
             descriptionSize: 15
             descriptionMargin: 0
+            subtext: root.showErrorText ? root.errorText : ""
+            subtextColor: Theme.color.blue
         }
         Loader {
             id: action_loader
diff --git a/src/qml/controls/ValueInput.qml b/src/qml/controls/ValueInput.qml
index cf92d183d3..2d550b223a 100644
--- a/src/qml/controls/ValueInput.qml
+++ b/src/qml/controls/ValueInput.qml
@@ -14,6 +14,8 @@ TextInput {
     property color textColor: root.filled ? Theme.color.neutral9 : Theme.color.neutral5
     enabled: true
     state: root.parentState
+    validator: IntValidator{}
+    maximumLength: 5
 
     states: [
         State {
@@ -48,4 +50,12 @@ TextInput {
     Behavior on color {
         ColorAnimation { duration: 150 }
     }
+
+    function checkValidity(minVal, maxVal, input) {
+        if (input < minVal || input > maxVal) {
+            return false
+        } else {
+            return true
+        }
+    }
 }
diff --git a/src/qml/options_model.h b/src/qml/options_model.h
index 8b6d942773..6f7788d195 100644
--- a/src/qml/options_model.h
+++ b/src/qml/options_model.h
@@ -5,7 +5,10 @@
 #ifndef BITCOIN_QML_OPTIONS_MODEL_H
 #define BITCOIN_QML_OPTIONS_MODEL_H
 
+#include <txdb.h>
 #include <util/settings.h>
+#include <util/system.h>
+#include <validation.h>
 
 #include <QObject>
 
@@ -19,6 +22,10 @@ class OptionsQmlModel : public QObject
     Q_OBJECT
     Q_PROPERTY(int dbcacheSizeMiB READ dbcacheSizeMiB WRITE setDbcacheSizeMiB NOTIFY dbcacheSizeMiBChanged)
     Q_PROPERTY(bool listen READ listen WRITE setListen NOTIFY listenChanged)
+    Q_PROPERTY(int maxDbcacheSizeMiB READ maxDbcacheSizeMiB CONSTANT)
+    Q_PROPERTY(int minDbcacheSizeMiB READ minDbcacheSizeMiB CONSTANT)
+    Q_PROPERTY(int maxScriptThreads READ maxScriptThreads CONSTANT)
+    Q_PROPERTY(int minScriptThreads READ minScriptThreads CONSTANT)
     Q_PROPERTY(bool natpmp READ natpmp WRITE setNatpmp NOTIFY natpmpChanged)
     Q_PROPERTY(bool prune READ prune WRITE setPrune NOTIFY pruneChanged)
     Q_PROPERTY(int pruneSizeGB READ pruneSizeGB WRITE setPruneSizeGB NOTIFY pruneSizeGBChanged)
@@ -33,6 +40,10 @@ class OptionsQmlModel : public QObject
     void setDbcacheSizeMiB(int new_dbcache_size_mib);
     bool listen() const { return m_listen; }
     void setListen(bool new_listen);
+    int maxDbcacheSizeMiB() const { return m_max_dbcache_size_mib; }
+    int minDbcacheSizeMiB() const { return m_min_dbcache_size_mib; }
+    int maxScriptThreads() const { return m_max_script_threads; }
+    int minScriptThreads() const { return m_min_script_threads; }
     bool natpmp() const { return m_natpmp; }
     void setNatpmp(bool new_natpmp);
     bool prune() const { return m_prune; }
@@ -61,7 +72,11 @@ class OptionsQmlModel : public QObject
 
     // Properties that are exposed to QML.
     int m_dbcache_size_mib;
+    const int m_min_dbcache_size_mib{nMinDbCache};
+    const int m_max_dbcache_size_mib{nMaxDbCache};
     bool m_listen;
+    const int m_max_script_threads{MAX_SCRIPTCHECK_THREADS};
+    const int m_min_script_threads{-GetNumCores()};
     bool m_natpmp;
     bool m_prune;
     int m_prune_size_gb;
diff --git a/src/qml/pages/main.qml b/src/qml/pages/main.qml
index 72a01a5ef2..7f528ac4ea 100644
--- a/src/qml/pages/main.qml
+++ b/src/qml/pages/main.qml
@@ -19,9 +19,13 @@ ApplicationWindow {
     color: Theme.color.background
     visible: true
 
+    Behavior on color {
+        ColorAnimation { duration: 150 }
+    }
+
     StackView {
         id: main
-        initialItem: onboardingWizard
+        initialItem: needOnboarding ? onboardingWizard : node
         anchors.fill: parent
     }
 
diff --git a/src/qml/pages/onboarding/OnboardingStorageAmount.qml b/src/qml/pages/onboarding/OnboardingStorageAmount.qml
index bb4d913dc1..e4cdf06e20 100644
--- a/src/qml/pages/onboarding/OnboardingStorageAmount.qml
+++ b/src/qml/pages/onboarding/OnboardingStorageAmount.qml
@@ -33,6 +33,8 @@ Page {
             detailItem: ColumnLayout {
                 spacing: 0
                 StorageOptions {
+                    customStorage: advancedStorage.loadedDetailItem.customStorage
+                    customStorageAmount: advancedStorage.loadedDetailItem.customStorageAmount
                     Layout.maximumWidth: 450
                     Layout.alignment: Qt.AlignCenter
                 }
@@ -47,6 +49,7 @@ Page {
             buttonMargin: 20
         }
         SettingsStorage {
+            id: advancedStorage
             navRightDetail: NavButton {
                 text: qsTr("Done")
                 onClicked: {
diff --git a/src/qml/pages/onboarding/OnboardingStorageLocation.qml b/src/qml/pages/onboarding/OnboardingStorageLocation.qml
index b71937d1c1..b2c3aa1e00 100644
--- a/src/qml/pages/onboarding/OnboardingStorageLocation.qml
+++ b/src/qml/pages/onboarding/OnboardingStorageLocation.qml
@@ -19,7 +19,7 @@ InformationPage {
     bold: true
     headerText: qsTr("Storage location")
     headerMargin: 0
-    description: qsTr("Where do you want to store the downloaded block data?\nYou need a minimum of 1GB of storage.")
+    description: qsTr("Where do you want to store the downloaded block data?\nYou need a minimum of %1GB of storage.").arg(chainModel.assumedChainstateSize + 1)
     descriptionMargin: 20
     detailActive: true
     detailItem: StorageLocations {}
diff --git a/src/qml/pages/settings/SettingsStorage.qml b/src/qml/pages/settings/SettingsStorage.qml
index 14233059a8..3c880b416c 100644
--- a/src/qml/pages/settings/SettingsStorage.qml
+++ b/src/qml/pages/settings/SettingsStorage.qml
@@ -14,11 +14,5 @@ InformationPage {
     headerText: qsTr("Storage settings")
     headerMargin: 0
     detailActive: true
-    detailItem: StorageSettings {
-        // Set default prune values
-        Component.onCompleted: {
-            optionsModel.prune = true
-            optionsModel.pruneSizeGB = 2
-        }
-    }
+    detailItem: StorageSettings {}
 }