diff --git a/guide/bonus/bitcoin/bitboxapp.md b/guide/bonus/bitcoin/bitboxapp.md
index 5ebe5b0c7..812f6376a 100644
--- a/guide/bonus/bitcoin/bitboxapp.md
+++ b/guide/bonus/bitcoin/bitboxapp.md
@@ -8,16 +8,19 @@ has_children: false
has_toc: false
---
-# Bonus guide: BitBoxApp
+## Bonus guide: BitBoxApp
+
{: .no_toc }
+---
+
+The [BitBoxApp](https://shiftcrypto.ch/app/){:target="_blank"} is a beginner-friendly companion app to the BitBox02 hardware wallet by Shift Crypto. You can configure it to directly connect to your RaspiBolt without using the servers provided by Shift Crypto. This not only improves privacy, but lets you verify your transactions yourself, without the need to trust anyone else.
+
Difficulty: Easy
{: .label .label-green }
-Status: Not tested v3
-{: .label .label-yellow }
-
-
+Status: Tested v3
+{: .label .label-green }
---
@@ -29,28 +32,48 @@ Table of contents
---
-## Connect BitBoxApp
+## Connecting to your RaspiBolt without Tor
+
+* In the BitBoxApp, open the settings from the sidebar and click on "Connect your own full node".
+* Enter the hostname or IP address together with the port in the field *"Enter the endpoint"*, e.g. `raspibolt.local:50002`.
+* Click the blue "Download remote certificate" button.
+* Test the connection by clicking "Check". You should be prompted with a message like in the screenshot below.
+* Click "Add" to add your RaspiBolt to the server list.
+* Remove the default Shift Crypto servers (`btc1.shiftcrypto.io` and `btc2.shiftcrypto.io`) to exclusively use your RaspiBolt for future connections. You can always revert to the default settings by clicking "Reset to default".
+
+Restart the BitBoxApp to make sure all changes take effect and you're all set!
+
+
+
+## Connecting to your RaspiBolt with Tor
+
+Before configuring the BitBoxApp, make sure Tor (or the Tor Browser) is installed and running on your local system. A Tor hidden service needs to be configured on your RaspiBolt (as explained in [Remote access over Tor in the Electrum server guide](https://raspibolt.org/guide/bitcoin/electrum-server.html#remote-access-over-tor-optional)) in order to connect via Tor to Electrs.
+
+If you have already set up the hidden service but forgot the connection address, you can always reobtain it with the following command (as user "admin" on your RaspiBolt):
-The [BitBoxApp](https://shiftcrypto.ch/app/){:target="_blank"} is a beginner-friendly companion app to the BitBox02 hardware wallet by Shift Crypto.
+```sh
+$ sudo cat /var/lib/tor/hidden_service_electrs/hostname
+> abcdefg..............xyz.onion
+```
-### General
+* In the BitBoxApp, open the settings from the sidebar and click on "Enable tor proxy".
+* Enable the switch and enter the proxy address.
-On your regular computer, configure the BitBoxApp to use your RaspiBolt:
+ * If you are using the Tor deamon, the correct address will most likely be `127.0.0.1:9050`. Make sure the Tor daemon is running in the background.
-* In the sidebar, select `Settings` > `Connect your own full node`
-* In the field "Enter the endpoint" enter the hostname or ip address and the port, e.g. `raspibolt.local:50002`
-* Click on "Download remote certificate"
-* Click "Check", you should be prompted with the message "Successfully establised a connection"
-* Click "Add" to add your server to the list on the top
-* Remove the Shift servers to only connect to your own server
+ * If you are using the Tor Browser, the correct address will most likely be `127.0.0.1:9150`. Note that the Tor Browser needs to be open with a connection established.
-### Tor
+ A restart of the BitBoxApp is required for the changes to take effect.
+* Open the settings once more and click on "Connect your own fullnode".
+* Enter the onion address together with the port in the field *Enter the endpoint*, e.g. `abcdefg..............xyz.onion:50002`.
+* Click the blue "Download remote certificate" button.
+* Test the connection by clicking "Check". This might take a few seconds. You should be prompted with a message like in the screenshot below.
+* Click "Add" to add your RaspiBolt to the server list.
+* Remove the default Shift Crypto servers (`btc1.shiftcrypto.io` and `btc2.shiftcrypto.io`) to exclusively use your RaspiBolt for future connections. You can always revert to the default settings by clicking "Reset to default".
-If you have Tor installed on your computer, you can access your RaspiBolt remotely over Tor.
+Restart the BitBoxApp to make sure all changes take effect and you're all set!
-* In the sidebar, select `Settings` > `Enable tor proxy`
-* Enable it and confirm the proxy address (usually the default `127.0.0.1:9050`)
-* When adding your RaspiBolt full node as described above, use your Tor address (e.g. `gwdllz5g7vky2q4gr45zGuvopjzf33czreca3a3exosftx72ekppkuqd.onion:50002`)
+
diff --git a/images/bitboxapp_success.png b/images/bitboxapp_success.png
new file mode 100644
index 000000000..1f97b1fca
Binary files /dev/null and b/images/bitboxapp_success.png differ
diff --git a/images/bitboxapp_tor_success.png b/images/bitboxapp_tor_success.png
new file mode 100644
index 000000000..87eb55ec5
Binary files /dev/null and b/images/bitboxapp_tor_success.png differ
diff --git a/images/electrum_BitBoxApp.png b/images/electrum_BitBoxApp.png
deleted file mode 100644
index 4ea0201da..000000000
Binary files a/images/electrum_BitBoxApp.png and /dev/null differ