diff --git a/lib/Cargo.lock b/lib/Cargo.lock
index e32ab35..540dfaf 100644
--- a/lib/Cargo.lock
+++ b/lib/Cargo.lock
@@ -1051,7 +1051,7 @@ version = "0.1.0"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=96997c5a467b710286bc9c6fea818b9d7d76f254)",
+ "zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=165c22e39e5b43d417f8719edcf91b07c15906bf)",
 ]
 
 [[package]]
@@ -2266,7 +2266,7 @@ dependencies = [
 [[package]]
 name = "zecwalletlitelib"
 version = "0.1.0"
-source = "git+https://github.com/adityapk00/zecwallet-light-cli?rev=96997c5a467b710286bc9c6fea818b9d7d76f254#96997c5a467b710286bc9c6fea818b9d7d76f254"
+source = "git+https://github.com/adityapk00/zecwallet-light-cli?rev=165c22e39e5b43d417f8719edcf91b07c15906bf#165c22e39e5b43d417f8719edcf91b07c15906bf"
 dependencies = [
  "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bellman 0.1.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)",
@@ -2562,4 +2562,4 @@ dependencies = [
 "checksum zcash_client_backend 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "<none>"
 "checksum zcash_primitives 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "<none>"
 "checksum zcash_proofs 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "<none>"
-"checksum zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=96997c5a467b710286bc9c6fea818b9d7d76f254)" = "<none>"
+"checksum zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=165c22e39e5b43d417f8719edcf91b07c15906bf)" = "<none>"
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index ccab1bf..3237cce 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["staticlib"]
 [dependencies]
 libc = "0.2.58"
 lazy_static = "1.4.0"
-zecwalletlitelib = { git = "https://github.com/adityapk00/zecwallet-light-cli", rev = "96997c5a467b710286bc9c6fea818b9d7d76f254" }
+zecwalletlitelib = { git = "https://github.com/adityapk00/zecwallet-light-cli", rev = "165c22e39e5b43d417f8719edcf91b07c15906bf" }
diff --git a/src/connection.cpp b/src/connection.cpp
index f74584f..cb7cb4e 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -139,7 +139,6 @@ Connection* ConnectionLoader::makeConnection(std::shared_ptr<ConnectionConfig> c
 
 // Update the UI with the status
 void ConnectionLoader::showInformation(QString info, QString detail) {
-    qDebug() << "Showing info " << info << ":" << detail;
     connD->status->setText(info);
     connD->statusDetail->setText(detail);
 }
diff --git a/src/controller.h b/src/controller.h
index 981730d..43a8e0b 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -62,6 +62,8 @@ public:
 
     void saveWallet(const std::function<void(json)>& cb) { zrpc->saveWallet(cb); }
 
+    void clearWallet(const std::function<void(json)>& cb) { zrpc->clearWallet(cb); }
+
     void createNewZaddr(bool sapling, const std::function<void(json)>& cb) { 
         unlockIfEncrypted([=] () {
             zrpc->createNewZaddr(sapling, cb);
diff --git a/src/liteinterface.cpp b/src/liteinterface.cpp
index 0f4bfe9..c9e5138 100644
--- a/src/liteinterface.cpp
+++ b/src/liteinterface.cpp
@@ -84,6 +84,13 @@ void LiteInterface::saveWallet(const std::function<void(json)>& cb) {
     conn->doRPCWithDefaultErrorHandling("save", "", cb);
 }
 
+void LiteInterface::clearWallet(const std::function<void(json)>& cb) {
+    if (conn == nullptr)
+        return;
+
+    conn->doRPCWithDefaultErrorHandling("clear", "", cb);
+}
+
 void LiteInterface::unlockWallet(QString password, const std::function<void(json)>& cb) {
     if (conn == nullptr)
         return;
diff --git a/src/liteinterface.h b/src/liteinterface.h
index 70b5732..a1aea04 100644
--- a/src/liteinterface.h
+++ b/src/liteinterface.h
@@ -58,6 +58,7 @@ public:
     void fetchSeed(const std::function<void(json)>&);
 
     void saveWallet(const std::function<void(json)>& cb);
+    void clearWallet(const std::function<void(json)>& cb);
 
     void fetchWalletEncryptionStatus(const std::function<void(json)>& cb);
     void encryptWallet(QString password, const std::function<void(json)>& cb);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d03ef72..c9ccc94 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -105,6 +105,20 @@ MainWindow::MainWindow(QWidget *parent) :
         AppDataServer::getInstance()->connectAppDialog(this);
     });
 
+    // Rescan
+    QObject::connect(ui->actionRescan, &QAction::triggered, [=]() {
+        // To rescan, we clear the wallet state, and then reload the connection
+        // This will start a sync, and show the scanning status. 
+        getRPC()->clearWallet([=] (auto) {
+            // Save the wallet
+            getRPC()->saveWallet([=] (auto) {
+                // Then reload the connection. The ConnectionLoader deletes itself.
+                auto cl = new ConnectionLoader(this, rpc);
+                cl->loadConnection();
+            });
+        });
+    });
+
     // Address Book
     QObject::connect(ui->action_Address_Book, &QAction::triggered, this, &MainWindow::addressBook);
 
@@ -419,12 +433,6 @@ void MainWindow::setupSettingsModal() {
         // Connection tab by default
         settings.tabWidget->setCurrentIndex(0);
 
-        // Enable the troubleshooting options only if using embedded zcashd
-        if (!rpc->isEmbedded()) {
-            settings.chkRescan->setEnabled(false);
-            settings.chkRescan->setToolTip(tr("You're using an external zcashd. Please restart zcashd with -rescan"));
-        }
-
         if (settingsDialog.exec() == QDialog::Accepted) {
             // Check for updates
             Settings::getInstance()->setCheckForUpdates(settings.chkCheckUpdates->isChecked());
@@ -445,7 +453,7 @@ void MainWindow::setupSettingsModal() {
 
                 // Save the wallet
                 getRPC()->saveWallet([=] (auto) {
-                    // Then reload the connection
+                    // Then reload the connection. The ConnectionLoader deletes itself.
                     auto cl = new ConnectionLoader(this, rpc);
                     cl->loadConnection();
                 });
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index cb8260e..7403eff 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -392,8 +392,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>1226</width>
-                <height>504</height>
+                <width>1162</width>
+                <height>344</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="sendToLayout">
@@ -1088,7 +1088,7 @@
      <x>0</x>
      <y>0</y>
      <width>1274</width>
-     <height>22</height>
+     <height>39</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -1130,6 +1130,8 @@
     <addaction name="separator"/>
     <addaction name="actionEncrypt_Wallet"/>
     <addaction name="actionRemove_Wallet_Encryption"/>
+    <addaction name="separator"/>
+    <addaction name="actionRescan"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menu_Edit"/>
@@ -1226,6 +1228,11 @@
     <string>Remove Wallet Encryption</string>
    </property>
   </action>
+  <action name="actionRescan">
+   <property name="text">
+    <string>Rescan</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
diff --git a/src/settings.ui b/src/settings.ui
index ae44092..a0fa476 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>540</width>
+    <width>733</width>
     <height>539</height>
    </rect>
   </property>
@@ -20,7 +20,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -183,50 +183,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_3">
-      <attribute name="title">
-       <string>Troubleshooting</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="5" column="0">
-        <spacer name="verticalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="0">
-        <widget class="Line" name="line_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_9">
-         <property name="text">
-          <string>Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart ZecWallet for this to take effect</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="chkRescan">
-         <property name="text">
-          <string>Rescan</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
    <item>