diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index b6f4179429..5574107aa9 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -1,210 +1,210 @@
 // Copyright (c) 2011-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <qt/walletframe.h>
 
 #include <qt/bitcoingui.h>
 #include <qt/walletmodel.h>
 #include <qt/walletview.h>
 
 #include <QHBoxLayout>
 #include <QLabel>
 
 #include <cassert>
 #include <cstdio>
 
 WalletFrame::WalletFrame(const PlatformStyle *_platformStyle, BitcoinGUI *_gui)
     : QFrame(_gui), gui(_gui), platformStyle(_platformStyle) {
     // Leave HBox hook for adding a list view later
     QHBoxLayout *walletFrameLayout = new QHBoxLayout(this);
     setContentsMargins(0, 0, 0, 0);
     walletStack = new QStackedWidget(this);
     walletFrameLayout->setContentsMargins(0, 0, 0, 0);
     walletFrameLayout->addWidget(walletStack);
 
     QLabel *noWallet = new QLabel(tr("No wallet has been loaded."));
     noWallet->setAlignment(Qt::AlignCenter);
     walletStack->addWidget(noWallet);
 }
 
 WalletFrame::~WalletFrame() {}
 
 void WalletFrame::setClientModel(ClientModel *_clientModel) {
     this->clientModel = _clientModel;
 }
 
 bool WalletFrame::addWallet(WalletModel *walletModel) {
     if (!gui || !clientModel || !walletModel) {
         return false;
     }
 
     const QString name = walletModel->getWalletName();
     if (mapWalletViews.count(name) > 0) {
         return false;
     }
 
     WalletView *walletView = new WalletView(platformStyle, walletModel, this);
     walletView->setBitcoinGUI(gui);
     walletView->setClientModel(clientModel);
     walletView->showOutOfSyncWarning(bOutOfSync);
 
     WalletView *current_wallet_view = currentWalletView();
     if (current_wallet_view) {
         walletView->setCurrentIndex(current_wallet_view->currentIndex());
     } else {
         walletView->gotoOverviewPage();
     }
 
     walletStack->addWidget(walletView);
     mapWalletViews[name] = walletView;
 
     // Ensure a walletView is able to show the main window
-    connect(walletView, SIGNAL(showNormalIfMinimized()), gui,
-            SLOT(showNormalIfMinimized()));
+    connect(walletView, &WalletView::showNormalIfMinimized,
+            [this] { gui->showNormalIfMinimized(); });
 
-    connect(walletView, SIGNAL(outOfSyncWarningClicked()), this,
-            SLOT(outOfSyncWarningClicked()));
+    connect(walletView, &WalletView::outOfSyncWarningClicked, this,
+            &WalletFrame::outOfSyncWarningClicked);
 
     return true;
 }
 
 bool WalletFrame::setCurrentWallet(const QString &name) {
     if (mapWalletViews.count(name) == 0) {
         return false;
     }
 
     WalletView *walletView = mapWalletViews.value(name);
     walletStack->setCurrentWidget(walletView);
     assert(walletView);
     walletView->updateEncryptionStatus();
     return true;
 }
 
 bool WalletFrame::removeWallet(const QString &name) {
     if (mapWalletViews.count(name) == 0) {
         return false;
     }
 
     WalletView *walletView = mapWalletViews.take(name);
     walletStack->removeWidget(walletView);
     delete walletView;
     return true;
 }
 
 void WalletFrame::removeAllWallets() {
     QMap<QString, WalletView *>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) {
         walletStack->removeWidget(i.value());
     }
     mapWalletViews.clear();
 }
 
 bool WalletFrame::handlePaymentRequest(const SendCoinsRecipient &recipient) {
     WalletView *walletView = currentWalletView();
     if (!walletView) {
         return false;
     }
 
     return walletView->handlePaymentRequest(recipient);
 }
 
 void WalletFrame::showOutOfSyncWarning(bool fShow) {
     bOutOfSync = fShow;
     QMap<QString, WalletView *>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) {
         i.value()->showOutOfSyncWarning(fShow);
     }
 }
 
 void WalletFrame::gotoOverviewPage() {
     QMap<QString, WalletView *>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) {
         i.value()->gotoOverviewPage();
     }
 }
 
 void WalletFrame::gotoHistoryPage() {
     QMap<QString, WalletView *>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) {
         i.value()->gotoHistoryPage();
     }
 }
 
 void WalletFrame::gotoReceiveCoinsPage() {
     QMap<QString, WalletView *>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) {
         i.value()->gotoReceiveCoinsPage();
     }
 }
 
 void WalletFrame::gotoSendCoinsPage(QString addr) {
     QMap<QString, WalletView *>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) {
         i.value()->gotoSendCoinsPage(addr);
     }
 }
 
 void WalletFrame::gotoSignMessageTab(QString addr) {
     WalletView *walletView = currentWalletView();
     if (walletView) {
         walletView->gotoSignMessageTab(addr);
     }
 }
 
 void WalletFrame::gotoVerifyMessageTab(QString addr) {
     WalletView *walletView = currentWalletView();
     if (walletView) {
         walletView->gotoVerifyMessageTab(addr);
     }
 }
 
 void WalletFrame::encryptWallet(bool status) {
     WalletView *walletView = currentWalletView();
     if (walletView) {
         walletView->encryptWallet(status);
     }
 }
 
 void WalletFrame::backupWallet() {
     WalletView *walletView = currentWalletView();
     if (walletView) {
         walletView->backupWallet();
     }
 }
 
 void WalletFrame::changePassphrase() {
     WalletView *walletView = currentWalletView();
     if (walletView) {
         walletView->changePassphrase();
     }
 }
 
 void WalletFrame::unlockWallet() {
     WalletView *walletView = currentWalletView();
     if (walletView) {
         walletView->unlockWallet();
     }
 }
 
 void WalletFrame::usedSendingAddresses() {
     WalletView *walletView = currentWalletView();
     if (walletView) {
         walletView->usedSendingAddresses();
     }
 }
 
 void WalletFrame::usedReceivingAddresses() {
     WalletView *walletView = currentWalletView();
     if (walletView) {
         walletView->usedReceivingAddresses();
     }
 }
 
 WalletView *WalletFrame::currentWalletView() {
     return qobject_cast<WalletView *>(walletStack->currentWidget());
 }
 
 void WalletFrame::outOfSyncWarningClicked() {
     Q_EMIT requestedSyncWarningInfo();
 }