diff --git a/site/source/_static/images/nextcloud/thunderbird-ca-1.png b/site/source/_static/images/nextcloud/thunderbird-ca-1.png
new file mode 100644
index 0000000..cef3a52
Binary files /dev/null and b/site/source/_static/images/nextcloud/thunderbird-ca-1.png differ
diff --git a/site/source/_static/images/nextcloud/thunderbird-ca-2.png b/site/source/_static/images/nextcloud/thunderbird-ca-2.png
new file mode 100644
index 0000000..ee661b9
Binary files /dev/null and b/site/source/_static/images/nextcloud/thunderbird-ca-2.png differ
diff --git a/site/source/_static/images/nextcloud/thunderbird-ca-3.png b/site/source/_static/images/nextcloud/thunderbird-ca-3.png
new file mode 100644
index 0000000..3cfccb0
Binary files /dev/null and b/site/source/_static/images/nextcloud/thunderbird-ca-3.png differ
diff --git a/site/source/_static/images/nextcloud/thunderbird-proxy-1.png b/site/source/_static/images/nextcloud/thunderbird-proxy-1.png
new file mode 100644
index 0000000..d4187a0
Binary files /dev/null and b/site/source/_static/images/nextcloud/thunderbird-proxy-1.png differ
diff --git a/site/source/_static/images/nextcloud/thunderbird-proxy-2.png b/site/source/_static/images/nextcloud/thunderbird-proxy-2.png
new file mode 100644
index 0000000..0a431b7
Binary files /dev/null and b/site/source/_static/images/nextcloud/thunderbird-proxy-2.png differ
diff --git a/site/source/_static/images/ssl/integrations/thunderbird_1.png b/site/source/_static/images/ssl/integrations/thunderbird_1.png
deleted file mode 100644
index 0c5c6fd..0000000
Binary files a/site/source/_static/images/ssl/integrations/thunderbird_1.png and /dev/null differ
diff --git a/site/source/_static/images/ssl/integrations/thunderbird_2.png b/site/source/_static/images/ssl/integrations/thunderbird_2.png
deleted file mode 100644
index cf87da4..0000000
Binary files a/site/source/_static/images/ssl/integrations/thunderbird_2.png and /dev/null differ
diff --git a/site/source/_static/images/ssl/integrations/thunderbird_3.png b/site/source/_static/images/ssl/integrations/thunderbird_3.png
deleted file mode 100644
index 2a08b70..0000000
Binary files a/site/source/_static/images/ssl/integrations/thunderbird_3.png and /dev/null differ
diff --git a/site/source/guides/misc-guides/lan-thunderbird.rst b/site/source/guides/misc-guides/lan-thunderbird.rst
index 903fe1b..581d07b 100644
--- a/site/source/guides/misc-guides/lan-thunderbird.rst
+++ b/site/source/guides/misc-guides/lan-thunderbird.rst
@@ -1,35 +1,63 @@
 .. _lan-thunderbird:
 
-======================================
-Trusting Your Start9 CA in Thunderbird
-======================================
+=========================
+Thunderbird Configuration
+=========================
 .. caution:: You will first need to complete :ref:`device-guides` for your client before continuing.  Take special note of the Thunderbird-specific instructions there.
 
-.. tabs::
+Trusting Your Start9 CA in Thunderbird
+======================================
 
-    .. group-tab:: Linux/Mac/Windows
+#. Open Thunderbird and do the following:
 
-        #. Open Thunderbird and do the following:
+    a. Select the hamburger menu and click **Settings** from the resulting drop-down menu.
+  
+    .. figure:: /_static/images/nextcloud/thunderbird-ca-1.png
+        :width: 60%
+        :alt: Thunderbird settings
 
-            a. Select the hamburger menu bar near the top right of the tab
-            b. Select *Settings* from the resulting drop-down menu
+    b. Search for the term ``config`` in the search bar and click **Config Editor...**.
 
-            .. figure:: /_static/images/ssl/integrations/thunderbird_1.png
-                :width: 80%
-                :alt: Thunderbird config editor
+    .. figure:: /_static/images/nextcloud/thunderbird-ca-2.png
+        :width: 60%
+        :alt: Thunderbird config editor
 
-            c. In the search bar in the top right, type "*config*"
-            d. Select *Config Editor...*
+#. Search for ``security.enterprise_roots.enabled``, and click the toggle button to ``true``.
 
-            .. figure:: /_static/images/ssl/integrations/thunderbird_2.png
-                :width: 80%
-                :alt: Thunderbird config editor
-        
-        #. Search for **security.enterprise_roots.enabled**, and click the toggle button so that it turns to **true**:
+    .. figure:: /_static/images/nextcloud/thunderbird-ca-3.png
+        :width: 60%
+        :alt: Thunderbird enterprise_roots settings
 
-            .. figure:: /_static/images/ssl/integrations/thunderbird_3.png
-                :width: 80%
-                :alt: Thunderbird enterprise_roots settings
+Configure Tor in Thunderbird
+============================
+
+.. note:: This is not required if you have enabled a system-wide proxy configuration. 
+
+#. Open Thunderbird and do the following:
+
+    a. Select the hamburger menu bar and click **Settings** from the resulting drop-down menu.
+
+    .. figure:: /_static/images/nextcloud/thunderbird-ca-1.png
+        :width: 60%
+        :alt: Thunderbird settings
+
+    b. Search for the term ``proxy`` in the search bar and click **Settings...**:
+
+    .. figure:: /_static/images/nextcloud/thunderbird-proxy-1.png
+        :width: 60%
+        :alt: Thunderbird proxy settings
+
+#. Choose **Automatic proxy configuration URL** and paste the appropriate URL:
+
+    .. caution:: This step assumes you saved the proxy.pac file as suggested in the :ref:`device-guides`. If you saved this file in different location please provide correct the path.
+
+   - For Linux: ``file:///etc/tor/proxy.pac``
+   - For macOS: ``file:///Library/WebServer/Documents/proxy.pac``
+   - For Windows: ``file://C:/Program Files/Tor Browser/proxy.pac``
+
+    .. figure:: /_static/images/nextcloud/thunderbird-proxy-2.png
+        :width: 60%
+        :alt: Thunderbird proxy url