diff --git a/src/api/LocalMoneroApi.h b/src/api/LocalMoneroApi.h
index 14b6c82b..60145b89 100644
--- a/src/api/LocalMoneroApi.h
+++ b/src/api/LocalMoneroApi.h
@@ -45,8 +45,8 @@ private slots:
 private:
     QString getBuySellUrl(bool buy, const QString &currencyCode, const QString &countryCode="", const QString &paymentMethod="", const QString &amount = "", int page = 0);
 
-    QString m_baseUrl;
     UtilsNetworking *m_network;
+    QString m_baseUrl;
 };
 
 
diff --git a/src/appcontext.cpp b/src/appcontext.cpp
index de5c2e16..422df1c6 100644
--- a/src/appcontext.cpp
+++ b/src/appcontext.cpp
@@ -145,7 +145,6 @@ void AppContext::onCreateTransaction(const QString &address, quint64 amount, con
         return;
     }
 
-    auto balance = this->currentWallet->balance();
     auto unlocked_balance = this->currentWallet->unlockedBalance();
     if(!all && amount > unlocked_balance) {
         emit createTransactionError("Not enough money to spend");
@@ -549,7 +548,7 @@ void AppContext::donateBeg() {
     config()->set(Config::donateBeg, donationCounter);
 }
 
-AppContext::~AppContext() {}
+AppContext::~AppContext() = default;
 
 // ############################################## LIBWALLET QT #########################################################
 
diff --git a/src/coinswidget.h b/src/coinswidget.h
index a2f3e5b1..0550c5d2 100644
--- a/src/coinswidget.h
+++ b/src/coinswidget.h
@@ -56,9 +56,9 @@ private:
     Ui::CoinsWidget *ui;
 
     QMenu *m_contextMenu;
+    QMenu *m_headerMenu;
     QMenu *m_copyMenu;
     QAction *m_showSpentAction;
-    QMenu *m_headerMenu;
     QAction *m_freezeOutputAction;
     QAction *m_freezeAllSelectedAction;
     QAction *m_thawOutputAction;
diff --git a/src/dialog/UpdateDialog.h b/src/dialog/UpdateDialog.h
index 70fe3134..86d959a6 100644
--- a/src/dialog/UpdateDialog.h
+++ b/src/dialog/UpdateDialog.h
@@ -34,6 +34,8 @@ signals:
 private:
     void setStatus(const QString &msg, bool success = false);
 
+    Ui::UpdateDialog *ui;
+
     QString m_version;
     QString m_downloadUrl;
     QString m_hash;
@@ -44,8 +46,6 @@ private:
     std::string m_updateZipArchive;
 
     QNetworkReply *m_reply = nullptr;
-
-    Ui::UpdateDialog *ui;
 };
 
 #endif //FEATHER_UPDATEDIALOG_H
diff --git a/src/dialog/WalletCacheDebugDialog.cpp b/src/dialog/WalletCacheDebugDialog.cpp
index b3b9dc87..d02fbb6d 100644
--- a/src/dialog/WalletCacheDebugDialog.cpp
+++ b/src/dialog/WalletCacheDebugDialog.cpp
@@ -9,8 +9,8 @@
 
 WalletCacheDebugDialog::WalletCacheDebugDialog(AppContext *ctx, QWidget *parent)
         : QDialog(parent)
-        , m_ctx(ctx)
         , ui(new Ui::WalletCacheDebugDialog)
+        , m_ctx(ctx)
 {
     ui->setupUi(this);
 
diff --git a/src/dialog/aboutdialog.h b/src/dialog/aboutdialog.h
index e7ce12cb..5f082906 100644
--- a/src/dialog/aboutdialog.h
+++ b/src/dialog/aboutdialog.h
@@ -21,8 +21,8 @@ public:
     ~AboutDialog() override;
 
 private:
-    QStringListModel *m_model;
     Ui::AboutDialog *ui;
+    QStringListModel *m_model;
 };
 
 #endif // ABOUT_H
diff --git a/src/dialog/broadcasttxdialog.cpp b/src/dialog/broadcasttxdialog.cpp
index 9d1ed711..3bb1173e 100644
--- a/src/dialog/broadcasttxdialog.cpp
+++ b/src/dialog/broadcasttxdialog.cpp
@@ -9,8 +9,8 @@
 
 BroadcastTxDialog::BroadcastTxDialog(QWidget *parent, AppContext *ctx, const QString &transactionHex)
         : QDialog(parent)
-        , m_ctx(ctx)
         , ui(new Ui::BroadcastTxDialog)
+        , m_ctx(ctx)
 {
     ui->setupUi(this);
 
diff --git a/src/dialog/broadcasttxdialog.h b/src/dialog/broadcasttxdialog.h
index bc2f5e38..a9a5e340 100644
--- a/src/dialog/broadcasttxdialog.h
+++ b/src/dialog/broadcasttxdialog.h
@@ -26,8 +26,8 @@ private slots:
 
 private:
     Ui::BroadcastTxDialog *ui;
-    UtilsNetworking *m_network;
     AppContext *m_ctx;
+    UtilsNetworking *m_network;
     DaemonRpc *m_rpc;
 };
 
diff --git a/src/dialog/debuginfodialog.h b/src/dialog/debuginfodialog.h
index 1f9821be..44c1c5ed 100644
--- a/src/dialog/debuginfodialog.h
+++ b/src/dialog/debuginfodialog.h
@@ -25,10 +25,10 @@ private:
     void copyToClipboad();
     void updateInfo();
 
-    QTimer m_updateTimer;
+    Ui::DebugInfoDialog *ui;
     AppContext *m_ctx;
 
-    Ui::DebugInfoDialog *ui;
+    QTimer m_updateTimer;
 };
 
 #endif //FEATHER_DEBUGINFODIALOG_H
diff --git a/src/dialog/restoredialog.h b/src/dialog/restoredialog.h
index 065cc907..d7f119dd 100644
--- a/src/dialog/restoredialog.h
+++ b/src/dialog/restoredialog.h
@@ -32,8 +32,8 @@ signals:
     void rejected();
 
 private:
-    AppContext *m_ctx;
     Ui::RestoreDialog *ui;
+    AppContext *m_ctx;
 };
 
 #endif // RESTOREDIALOG_H
diff --git a/src/dialog/signverifydialog.cpp b/src/dialog/signverifydialog.cpp
index f60dbdb8..283c33b4 100644
--- a/src/dialog/signverifydialog.cpp
+++ b/src/dialog/signverifydialog.cpp
@@ -9,8 +9,8 @@
 
 SignVerifyDialog::SignVerifyDialog(Wallet *wallet, QWidget *parent)
         : QDialog(parent)
-        , m_wallet(wallet)
         , ui(new Ui::SignVerifyDialog)
+        , m_wallet(wallet)
 {
     ui->setupUi(this);
 
diff --git a/src/dialog/transactioninfodialog.h b/src/dialog/transactioninfodialog.h
index 02908dc6..575a1815 100644
--- a/src/dialog/transactioninfodialog.h
+++ b/src/dialog/transactioninfodialog.h
@@ -35,9 +35,9 @@ private:
 
     Ui::TransactionInfoDialog *ui;
 
-    TxProofDialog *m_txProofDialog;
-    TransactionInfo *m_txInfo;
     Wallet *m_wallet;
+    TransactionInfo *m_txInfo;
+    TxProofDialog *m_txProofDialog;
     QString m_txKey;
     QString m_txid;
     QTimer m_updateTimer;
diff --git a/src/dialog/tximportdialog.cpp b/src/dialog/tximportdialog.cpp
index 2dcc5f97..6cffd96f 100644
--- a/src/dialog/tximportdialog.cpp
+++ b/src/dialog/tximportdialog.cpp
@@ -9,9 +9,9 @@
 
 TxImportDialog::TxImportDialog(QWidget *parent, AppContext *ctx)
         : QDialog(parent)
+        , ui(new Ui::TxImportDialog)
         , m_ctx(ctx)
         , m_loadTimer(new QTimer(this))
-        , ui(new Ui::TxImportDialog)
 {
     ui->setupUi(this);
     ui->resp->hide();
diff --git a/src/dialog/tximportdialog.h b/src/dialog/tximportdialog.h
index 13294f40..4fdcb702 100644
--- a/src/dialog/tximportdialog.h
+++ b/src/dialog/tximportdialog.h
@@ -27,8 +27,9 @@ private slots:
 
 private:
     Ui::TxImportDialog *ui;
-    UtilsNetworking *m_network;
     AppContext *m_ctx;
+
+    UtilsNetworking *m_network;
     DaemonRpc *m_rpc;
     QTimer *m_loadTimer;
 
diff --git a/src/dialog/verifyproofdialog.cpp b/src/dialog/verifyproofdialog.cpp
index 77493ed8..98b4fa8b 100644
--- a/src/dialog/verifyproofdialog.cpp
+++ b/src/dialog/verifyproofdialog.cpp
@@ -11,8 +11,8 @@
 
 VerifyProofDialog::VerifyProofDialog(Wallet *wallet, QWidget *parent)
         : QDialog(parent)
-        , m_wallet(wallet)
         , ui(new Ui::VerifyProofDialog)
+        , m_wallet(wallet)
 {
     ui->setupUi(this);
 
diff --git a/src/dialog/verifyproofdialog.h b/src/dialog/verifyproofdialog.h
index 89e44e33..9159decb 100644
--- a/src/dialog/verifyproofdialog.h
+++ b/src/dialog/verifyproofdialog.h
@@ -31,11 +31,11 @@ private:
     void checkFormattedProof();
     void proofStatus(bool success, const QString &message);
 
-    QPixmap m_success;
-    QPixmap m_failure;
-
     Ui::VerifyProofDialog *ui;
     Wallet *m_wallet;
+
+    QPixmap m_success;
+    QPixmap m_failure;
 };
 
 #endif //FEATHER_VERIFYPROOFDIALOG_H
diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
index d1feb23d..76220145 100644
--- a/src/libwalletqt/WalletManager.cpp
+++ b/src/libwalletqt/WalletManager.cpp
@@ -455,9 +455,9 @@ bool WalletManager::clearWalletCache(const QString &wallet_path) const
 
 WalletManager::WalletManager(QObject *parent)
     : QObject(parent)
+    , m_currentWallet(nullptr)
     , m_passphraseReceiver(nullptr)
     , m_scheduler(this)
-    , m_currentWallet(nullptr)
 {
     m_pimpl =  Monero::WalletManagerFactory::getWalletManager();
 }
diff --git a/src/main.cpp b/src/main.cpp
index 97dc1914..b73f8ed7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -94,7 +94,6 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
     }
 
     const QStringList args = parser.positionalArguments();
-    bool localTor = parser.isSet(useLocalTorOption);
     bool stagenet = parser.isSet(stagenetOption);
     bool testnet = parser.isSet(testnetOption);
     bool quiet = parser.isSet(quietModeOption);
@@ -167,6 +166,6 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
     qInstallMessageHandler(Utils::applicationLogHandler);
     qRegisterMetaType<QVector<QString>>();
 
-    auto *mainWindow = new MainWindow(ctx);
+    new MainWindow(ctx);
     return QApplication::exec();
 }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 228c4bcd..7b0b72d9 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -636,8 +636,6 @@ void MainWindow::onBalanceUpdated(quint64 balance, quint64 spendable) {
     qDebug() << Q_FUNC_INFO;
     bool hide = config()->get(Config::hideBalance).toBool();
 
-    int amountPrecision = config()->get(Config::amountPrecision).toInt();
-
     QString balance_str = WalletManager::displayAmount(spendable);
     balance_str.remove(QRegExp("0+$"));
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 9faa7d3e..807a4033 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -181,8 +181,6 @@ private:
     void startupWarning();
     bool autoOpenWallet();
 
-    AppContext *m_ctx;
-
     static MainWindow * pMainWindow;
     void closeEvent(QCloseEvent *event) override;
     void cleanupBeforeClose();
@@ -210,6 +208,8 @@ private:
     WalletWizard *createWizard(WalletWizard::Page startPage);
 
     Ui::MainWindow *ui;
+    AppContext *m_ctx;
+
     Settings *m_windowSettings = nullptr;
     CalcWindow *m_windowCalc = nullptr;
     RestoreDialog *m_restoreDialog = nullptr;
diff --git a/src/model/NodeModel.h b/src/model/NodeModel.h
index 5b79a5ea..f7509eab 100644
--- a/src/model/NodeModel.h
+++ b/src/model/NodeModel.h
@@ -32,9 +32,9 @@ public:
 
 private:
     QList<FeatherNode> m_nodes;
+    int m_nodeSource;
     QIcon m_offline;
     QIcon m_online;
-    int m_nodeSource;
 };
 
 #endif //FEATHER_NODEMODEL_H
diff --git a/src/model/SubaddressProxyModel.cpp b/src/model/SubaddressProxyModel.cpp
index a984e398..b14802e6 100644
--- a/src/model/SubaddressProxyModel.cpp
+++ b/src/model/SubaddressProxyModel.cpp
@@ -4,11 +4,11 @@
 #include "SubaddressProxyModel.h"
 
 SubaddressProxyModel::SubaddressProxyModel(QObject *parent, Subaddress *subaddress, bool hidePrimary)
-    : QSortFilterProxyModel(parent),
-    m_searchRegExp(""),
-    m_searchCaseSensitiveRegExp(""),
-    m_subaddress(subaddress),
-    m_hidePrimary(hidePrimary)
+    : QSortFilterProxyModel(parent)
+    , m_subaddress(subaddress)
+    , m_searchRegExp("")
+    , m_searchCaseSensitiveRegExp("")
+    , m_hidePrimary(hidePrimary)
 {
     m_searchRegExp.setCaseSensitivity(Qt::CaseInsensitive);
     m_searchRegExp.setPatternSyntax(QRegExp::FixedString);
diff --git a/src/receivewidget.cpp b/src/receivewidget.cpp
index b86517cf..f40b8816 100644
--- a/src/receivewidget.cpp
+++ b/src/receivewidget.cpp
@@ -146,6 +146,7 @@ void ReceiveWidget::setSearchFilter(const QString &filter) {
 
 void ReceiveWidget::showHeaderMenu(const QPoint& position)
 {
+    Q_UNUSED(position);
     m_showFullAddressesAction->setChecked(m_model->isShowFullAddresses());
     m_headerMenu->exec(QCursor::pos());
 }
diff --git a/src/utils/FeatherSeed.h b/src/utils/FeatherSeed.h
index bf501019..47d6780d 100644
--- a/src/utils/FeatherSeed.h
+++ b/src/utils/FeatherSeed.h
@@ -16,6 +16,8 @@ enum SeedType {
 struct FeatherSeed {
     // TODO: this is spaghetti, needs refactor
 
+    NetworkType::Type netType;
+
     QString coin;
     QString language;
     SeedType seedType;
@@ -24,8 +26,6 @@ struct FeatherSeed {
     QString spendKey;
     QString correction;
 
-    NetworkType::Type netType;
-
     time_t time;
     int restoreHeight = 0;
 
diff --git a/src/utils/brute.h b/src/utils/brute.h
index dddab97d..16801b6b 100644
--- a/src/utils/brute.h
+++ b/src/utils/brute.h
@@ -40,8 +40,8 @@ private:
     std::string m_word;
     strategy m_currentStrategy;
 
-    int iword = 0;
-    int ichar = 0;
+    size_t iword = 0;
+    size_t ichar = 0;
 };
 
 #endif //FEATHER_BRUTE_H
diff --git a/src/utils/nodes.cpp b/src/utils/nodes.cpp
index 2d7b08c4..76b6e45a 100644
--- a/src/utils/nodes.cpp
+++ b/src/utils/nodes.cpp
@@ -5,16 +5,14 @@
 
 #include "nodes.h"
 #include "utils/utils.h"
-#include "utils/WebsocketClient.h"
 #include "appcontext.h"
 
-
 Nodes::Nodes(AppContext *ctx, QObject *parent)
     : QObject(parent)
-    , m_ctx(ctx)
-    , m_connection(FeatherNode())
     , modelWebsocket(new NodeModel(NodeSource::websocket, this))
     , modelCustom(new NodeModel(NodeSource::custom, this))
+    , m_ctx(ctx)
+    , m_connection(FeatherNode())
 {
     this->loadConfig();
     connect(m_ctx, &AppContext::walletRefreshed, this, &Nodes::onWalletRefreshed);
diff --git a/src/utils/txfiathistory.cpp b/src/utils/txfiathistory.cpp
index 6a4eaab7..b0f9fb83 100644
--- a/src/utils/txfiathistory.cpp
+++ b/src/utils/txfiathistory.cpp
@@ -7,10 +7,11 @@
 #include "txfiathistory.h"
 #include "utils/utils.h"
 
-TxFiatHistory::TxFiatHistory(int genesis_timestamp, const QString &configDirectory, QObject *parent) :
-        QObject(parent),
-        m_genesis_timestamp(genesis_timestamp),
-        m_configDirectory(configDirectory) {
+TxFiatHistory::TxFiatHistory(int genesis_timestamp, const QString &configDirectory, QObject *parent)
+    : QObject(parent)
+    , m_genesis_timestamp(genesis_timestamp)
+    , m_configDirectory(configDirectory)
+{
     m_databasePath = QString("%1/fiatHistory.db").arg(configDirectory);
     this->loadDatabase();
 }
@@ -70,7 +71,7 @@ void TxFiatHistory::onUpdateDatabase() {
     }
 
     // keep local fiatTxHistory database up to date, loop for missing dates
-    for(year; year != yearCurrent + 1; year += 1){
+    for(; year != yearCurrent + 1; year += 1){
         for(int month = 1; month != 13; month++) {
             if(year == yearCurrent && month == now.month() && now.day() == 1) break;
             QDateTime _now;
diff --git a/src/utils/txfiathistory.h b/src/utils/txfiathistory.h
index 5587b7f9..cbb7d80d 100644
--- a/src/utils/txfiathistory.h
+++ b/src/utils/txfiathistory.h
@@ -23,11 +23,11 @@ signals:
 private:
     void loadDatabase();
     void writeDatabase();
+    int m_genesis_timestamp;
     QString m_databasePath;
     QString m_configDirectory;
     bool m_initialized = false;
     QMap<QString, double> m_database;
-    int m_genesis_timestamp;
 };
 
 #endif //FEATHER_TXFIATHISTORY_H
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
index 97e38c9e..5ca76771 100644
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@@ -142,7 +142,7 @@ void Utils::desktopNotify(const QString &title, const QString &message, int dura
     QString stderr = process.readAllStandardError();
 #elif defined(Q_OS_MACOS)
     QProcess process;
-    // @TODO: need to escape special chars with \
+    // @TODO: need to escape special chars with "\"
     process.start("osascript", macos);
     process.waitForFinished(-1);
     QString stdout = process.readAllStandardOutput();
diff --git a/src/widgets/ccsprogressdelegate.cpp b/src/widgets/ccsprogressdelegate.cpp
index 51044acf..18c39b36 100644
--- a/src/widgets/ccsprogressdelegate.cpp
+++ b/src/widgets/ccsprogressdelegate.cpp
@@ -6,10 +6,9 @@
 #include <QApplication>
 
 CCSProgressDelegate::CCSProgressDelegate(CCSModel *model, QWidget *parent)
-    : m_model(model)
-    , QStyledItemDelegate(parent)
+    : QStyledItemDelegate(parent)
+    , m_model(model)
 {
-
 }
 
 void CCSProgressDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
diff --git a/src/widgets/tickerwidget.h b/src/widgets/tickerwidget.h
index e6464ebb..74386a1a 100644
--- a/src/widgets/tickerwidget.h
+++ b/src/widgets/tickerwidget.h
@@ -29,10 +29,10 @@ public slots:
 
 private:
     Ui::TickerWidget *ui;
+    AppContext *m_ctx;
     QString m_symbol;
     bool m_convertBalance;
     bool m_hidePercent;
-    AppContext *m_ctx;
 };
 
 #endif // TICKERWIDGET_H
diff --git a/src/widgets/xmrigwidget.h b/src/widgets/xmrigwidget.h
index aa5d7e7d..b38efb83 100644
--- a/src/widgets/xmrigwidget.h
+++ b/src/widgets/xmrigwidget.h
@@ -50,11 +50,11 @@ signals:
 private:
     void showContextMenu(const QPoint &pos);
 
-    AppContext *m_ctx;
     Ui::XMRigWidget *ui;
+    AppContext *m_ctx;
+    XmRig * m_XMRig;
     QStandardItemModel *m_model;
     QMenu *m_contextMenu;
-    XmRig * m_XMRig;
 
     int m_threads;
     QStringList m_urls;
diff --git a/src/wizard/PageHardwareDevice.h b/src/wizard/PageHardwareDevice.h
index 9267c354..d20a6b95 100644
--- a/src/wizard/PageHardwareDevice.h
+++ b/src/wizard/PageHardwareDevice.h
@@ -28,8 +28,8 @@ public:
     bool isComplete() const override;
 
 private:
-    AppContext *m_ctx;
     Ui::PageHardwareDevice *ui;
+    AppContext *m_ctx;
     WizardFields *m_fields;
 };
 
diff --git a/src/wizard/PageMenu.h b/src/wizard/PageMenu.h
index c755a98d..49e19577 100644
--- a/src/wizard/PageMenu.h
+++ b/src/wizard/PageMenu.h
@@ -28,9 +28,9 @@ signals:
     void enableDarkMode(bool enable);
 
 private:
+    Ui::PageMenu *ui;
     AppContext *m_ctx;
     WalletKeysFilesModel *m_walletKeysFilesModel;
-    Ui::PageMenu *ui;
     WizardFields *m_fields;
 };
 
diff --git a/src/wizard/PageNetwork.h b/src/wizard/PageNetwork.h
index 502f3497..7c2aafe3 100644
--- a/src/wizard/PageNetwork.h
+++ b/src/wizard/PageNetwork.h
@@ -26,8 +26,8 @@ public:
     bool isComplete() const override;
 
 private:
-    AppContext *m_ctx;
     Ui::PageNetwork *ui;
+    AppContext *m_ctx;
 };
 
 #endif //FEATHER_WIZARDNETWORK_H
diff --git a/src/wizard/PageNetworkTor.h b/src/wizard/PageNetworkTor.h
index 9863b58b..48056abe 100644
--- a/src/wizard/PageNetworkTor.h
+++ b/src/wizard/PageNetworkTor.h
@@ -26,8 +26,8 @@ signals:
     void initialNetworkConfigured();
 
 private:
-    AppContext *m_ctx;
     Ui::PageNetworkTor *ui;
+    AppContext *m_ctx;
 };
 
 #endif //FEATHER_PAGENETWORKTOR_H
diff --git a/src/wizard/PageOpenWallet.h b/src/wizard/PageOpenWallet.h
index 73309d6a..5342b473 100644
--- a/src/wizard/PageOpenWallet.h
+++ b/src/wizard/PageOpenWallet.h
@@ -31,10 +31,10 @@ signals:
 private:
     void updatePath();
 
+    Ui::PageOpenWallet *ui;
     AppContext *m_ctx;
     WalletKeysFilesModel *m_walletKeysFilesModel;
     WalletKeysFilesProxyModel *m_keysProxy;
-    Ui::PageOpenWallet *ui;
     QStandardItemModel *m_model;
 };
 
diff --git a/src/wizard/PageSetPassword.h b/src/wizard/PageSetPassword.h
index aa89c5c7..263ae1ff 100644
--- a/src/wizard/PageSetPassword.h
+++ b/src/wizard/PageSetPassword.h
@@ -29,9 +29,10 @@ signals:
     void createWallet();
 
 private:
+    Ui::PageSetPassword *ui;
+
     AppContext *m_ctx;
     WizardFields *m_fields;
-    Ui::PageSetPassword *ui;
 };
 
 
diff --git a/src/wizard/PageSetRestoreHeight.h b/src/wizard/PageSetRestoreHeight.h
index 155406bb..4ab90b3d 100644
--- a/src/wizard/PageSetRestoreHeight.h
+++ b/src/wizard/PageSetRestoreHeight.h
@@ -33,9 +33,9 @@ private:
     void showScanWarning(const QDateTime &date);
     void showWalletAgeWarning(const QDateTime &date);
 
+    Ui::PageSetRestoreHeight *ui;
     AppContext *m_ctx;
     WizardFields *m_fields;
-    Ui::PageSetRestoreHeight *ui;
 };
 
 #endif //FEATHER_PAGESETRESTOREHEIGHT_H
diff --git a/src/wizard/PageWalletFile.h b/src/wizard/PageWalletFile.h
index 3d2b495a..3f9c2ba4 100644
--- a/src/wizard/PageWalletFile.h
+++ b/src/wizard/PageWalletFile.h
@@ -34,8 +34,8 @@ private:
     bool walletPathExists(const QString &walletName);
     bool validateWidgets();
 
-    AppContext *m_ctx;
     Ui::PageWalletFile *ui;
+    AppContext *m_ctx;
     WizardFields *m_fields;
     bool m_validated;
 };
diff --git a/src/wizard/PageWalletRestoreKeys.h b/src/wizard/PageWalletRestoreKeys.h
index ff20301f..3be83b92 100644
--- a/src/wizard/PageWalletRestoreKeys.h
+++ b/src/wizard/PageWalletRestoreKeys.h
@@ -27,9 +27,9 @@ public:
     int nextId() const override;
 
 private:
+    Ui::PageWalletRestoreKeys *ui;
     AppContext *m_ctx;
     WizardFields *m_fields;
-    Ui::PageWalletRestoreKeys *ui;
 };
 
 #endif
diff --git a/src/wizard/PageWalletRestoreSeed.h b/src/wizard/PageWalletRestoreSeed.h
index d29c7b23..9b792835 100644
--- a/src/wizard/PageWalletRestoreSeed.h
+++ b/src/wizard/PageWalletRestoreSeed.h
@@ -50,8 +50,8 @@ private:
 
     void onSeedTypeToggled();
 
-    AppContext *m_ctx;
     Ui::PageWalletRestoreSeed *ui;
+    AppContext *m_ctx;
     WizardFields *m_fields;
 
     seedType m_tevador;