diff --git a/pages/02.tutorials/03.Email/00.settings/docs.en.md b/pages/02.tutorials/03.Email/00.settings/docs.en.md
index bc220596..c42a053c 100644
--- a/pages/02.tutorials/03.Email/00.settings/docs.en.md
+++ b/pages/02.tutorials/03.Email/00.settings/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Email: Clients Settings
+title: Clients Settings
 published: true
 visible: true
 indexed: true
diff --git a/pages/02.tutorials/03.Email/01.Alias/docs.en.md b/pages/02.tutorials/03.Email/01.Alias/docs.en.md
index 24bb2e2a..55175ef7 100755
--- a/pages/02.tutorials/03.Email/01.Alias/docs.en.md
+++ b/pages/02.tutorials/03.Email/01.Alias/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: 'Email: Setup alias'
+title: 'Alias setup'
 visible: true
 indexed: true
 updated:
diff --git a/pages/02.tutorials/03.Email/02.Filters/01.forward/docs.en.md b/pages/02.tutorials/03.Email/02.Filters/01.forward/docs.en.md
index 28d03ee9..cb6ee0b7 100755
--- a/pages/02.tutorials/03.Email/02.Filters/01.forward/docs.en.md
+++ b/pages/02.tutorials/03.Email/02.Filters/01.forward/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: "Email: Forwarding from Disroot to another email account"
+title: "Forwarding emails"
 published: true
 visible: true
 indexed: true
diff --git a/pages/02.tutorials/03.Email/02.Filters/docs.en.md b/pages/02.tutorials/03.Email/02.Filters/docs.en.md
index ef02e540..6c83a032 100755
--- a/pages/02.tutorials/03.Email/02.Filters/docs.en.md
+++ b/pages/02.tutorials/03.Email/02.Filters/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Email: Configuring Filters
+title: "Filters: Configuring"
 published: true
 visible: true
 indexed: true
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/docs.en.md
index 59463c9b..bc4005ff 100755
--- a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/docs.en.md
+++ b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/docs.en.md
@@ -1,53 +1,68 @@
 ---
-title: Email clients: Thunderbird
-page-toc:
-  active: true
+title: Thunderbird
 visible: false
 published: true
 updated:
-        last_modified: "April 2019"
-        app: Thunderbird
-        app_version: 60.6.1 for Manjaro Linux
+        last_modified: "April, 2021"
+        app: Mozilla Thunderbird
+        app_version: 78.9.0 on Manjaro Linux
 taxonomy:
     category:
         - docs
     tags:
         - email
 page-toc:
-  active: true
+    active: true
 ---
 
-# Thunderbird
+# Mozilla Thunderbird
 
-![](/home/icons/thunderbird.png)
-**Thunderbird** is a powerful open-source email client, calendar and RSS-Feed manager.
+![](tb_logo.png)
+**Thunderbird** is a powerful open-source email client, calendar and RSS-Feed manager. You can manage all your email accounts, calendars, news feeds, tasks and even chat from one place.
 
-## Install Thunderbird
-If you don't have it installed yet, got to [https://www.mozilla.org/en-US/thunderbird/all/](https://www.mozilla.org/en-US/thunderbird/all/) and choose your language and Operating System.
+# Installing Thunderbird
+If you don't have it installed yet, go to [Thunderbird page](https://www.thunderbird.net/) and choose your language and Operating System.
 
-!! ![](/home/icons/note.png)
-!! NOTE: For **GNU/Linux** users we recommend using your distribution package manager to get the latest and updatable version of **Thunderbird**.
+!! **NOTE**<br>
+!! Most **GNU/Linux** distributions usually have the latest and updatable version of **Thunderbird**. We recommend using your distribution package manager to install it.
 
-## **Open Thunderbird**
-If it's the first time you run it, you will be directly greeted with account setup and you can skip directly to **step 3**.  
-If you're using **Thunderbird** already and have some accounts setup, just select "**New Account**" icon in the root view.
+# Configuring your Disroot account
+If this is the first time you are using **Thunderbird**, you will be greeted by the account setup when you run it and you can skip directly to the third step which is **Set Up Another Account**.
+If you are already using **Thunderbird** then select "**Email**" in the root view.
 
-![](en/thunderbird_setup2.png)
+![](en/tb_setup_01.png)
 
-## **Fill in your account information**
+## Fill in your account information
 
-![](en/thunderbird_setup3.png)
+![](en/tb_setup_02.png)
 
  - **Your name:** *Name that will be displayed in the* "From" *field*
+  ![](en/tb_setup_name.png)
+
  - **Email address:** *your_username @ disroot.org*
+  ![](en/tb_setup_email.png)
+
  - **Password:** *your_super_secret_password*
  - **Remember Password?:** If you want **Thunderbird** to remember your password and not prompt you for it every time you start the client, then select it.
- - Click "**Continue**" button once you're done and verified everything is correct.
+  ![](en/tb_setup_pass.png)
+
+ - Click "**Continue**" button once you are done and verified everything is correct.
+
+   ![](en/tb_setup_03.png)
 
 **Thunderbird** now should auto-detect the needed settings like this:
 
-![](en/thunderbird_setup4.png)
+![](en/tb_setup_04.png)
 
-## **Done!** \o/
+You can click on "**Configure manually**" to check the settings details.
 
-![](en/thunderbird_setup5.png)
+![](en/tb_setup_details.png)
+
+Click on **Done** once you are finished and that's it.
+
+![](en/tb_setup_05.png)
+
+# Exporting / Importing emails and contacts
+**Thunderbird** does not offer native backup tools so you have to do it manually or through an add-on.
+
+## Manual procedure
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/note.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/note.png
deleted file mode 100644
index e4ba6a4e..00000000
Binary files a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/note.png and /dev/null differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_01.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_01.png
new file mode 100644
index 00000000..dd052821
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_01.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_02.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_02.png
new file mode 100644
index 00000000..6549f510
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_02.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_03.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_03.png
new file mode 100644
index 00000000..efd9af7d
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_03.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_04.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_04.png
new file mode 100644
index 00000000..24830542
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_04.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_05.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_05.png
new file mode 100644
index 00000000..72addf49
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_05.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_details.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_details.png
new file mode 100644
index 00000000..bc2b42f0
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_details.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_email.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_email.png
new file mode 100644
index 00000000..866e88a7
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_email.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_name.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_name.png
new file mode 100644
index 00000000..250e1707
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_name.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_pass.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_pass.png
new file mode 100644
index 00000000..798537a2
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/tb_setup_pass.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup1.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup1.png
deleted file mode 100755
index cd22f48e..00000000
Binary files a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup1.png and /dev/null differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup2.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup2.png
deleted file mode 100755
index 5ed7262a..00000000
Binary files a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup2.png and /dev/null differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup3.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup3.png
deleted file mode 100755
index 3b0e6231..00000000
Binary files a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup3.png and /dev/null differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup4.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup4.png
deleted file mode 100755
index 41695717..00000000
Binary files a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup4.png and /dev/null differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup5.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup5.png
deleted file mode 100755
index 061ce674..00000000
Binary files a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/en/thunderbird_setup5.png and /dev/null differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/tb_logo.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/tb_logo.png
new file mode 100644
index 00000000..cc013c60
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/tb_logo.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/docs.en.md
index e48685bb..a08ea6bf 100755
--- a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/docs.en.md
+++ b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: 'Email: Desktop Clients'
+title: 'Desktop Clients'
 published: true
 visible: true
 indexed: true
@@ -15,6 +15,8 @@ page-toc:
     active: false
 ---
 
+![](../thumb.png)
+
 ## Multiplatform Mail Clients
 - [Thunderbird](thunderbird)
 - [Claws Mail](claws-mail)
@@ -27,6 +29,3 @@ page-toc:
 ## GNU/Linux: Email desktop integration
 - [GNOME](gnome-desktop-integration)
 - [KDE](kde-desktop-integration)
-
-
-![](en/email_icon.png)
diff --git a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/docs.en.md
index 6d989af9..9c758d28 100755
--- a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/docs.en.md
+++ b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: 'Email: Mobile Clients'
+title: 'Mobile Clients'
 visible: true
 indexed: true
 updated:
diff --git a/pages/02.tutorials/03.Email/04.Clients/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/docs.en.md
index f4747fe4..7d7f1509 100755
--- a/pages/02.tutorials/03.Email/04.Clients/docs.en.md
+++ b/pages/02.tutorials/03.Email/04.Clients/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Email: Clients
+title: "Email Clients"
 visible: true
 updated:
 taxonomy:
@@ -11,13 +11,13 @@ page-toc:
     active: false
 ---
 
-## [Desktop Mail Client](desktop)
-- [**Multiplatform**](desktop/thunderbird)
+## Desktop Mail Client
+- [**Multiplatform**](desktop)
 - [**GNOME** Desktop integration](desktop/gnome-desktop-integration)
 - [**KDE** Desktop integration](desktop/kde-desktop-integration)
 
 
-## [Mobile Mail Client](mobile)
+## Mobile Mail Client
 - [**Android: K9**](mobile/k9)
 - [**SailfishOS: Mail App**](mobile/sailfishos)
 - [**iOS: Mail App**](mobile/ios)
diff --git a/pages/02.tutorials/03.Email/04.Clients/thumb.png b/pages/02.tutorials/03.Email/04.Clients/thumb.png
index a016de5d..566c40fe 100644
Binary files a/pages/02.tutorials/03.Email/04.Clients/thumb.png and b/pages/02.tutorials/03.Email/04.Clients/thumb.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/thumb_old.png b/pages/02.tutorials/03.Email/04.Clients/thumb_old.png
new file mode 100644
index 00000000..a016de5d
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/thumb_old.png differ