diff --git a/docs/docs/assets/setup-guides/icloud/account.png b/docs/docs/assets/setup-guides/icloud/account.png
new file mode 100644
index 0000000000000000000000000000000000000000..35ac9688f05c0b762e4cf5e844238403d82e15cb
Binary files /dev/null and b/docs/docs/assets/setup-guides/icloud/account.png differ
diff --git a/docs/docs/assets/setup-guides/icloud/app-specific.png b/docs/docs/assets/setup-guides/icloud/app-specific.png
new file mode 100644
index 0000000000000000000000000000000000000000..781754704bf91b26ec070c4f40bc2c09d642dde3
Binary files /dev/null and b/docs/docs/assets/setup-guides/icloud/app-specific.png differ
diff --git a/docs/docs/assets/setup-guides/icloud/matcha.png b/docs/docs/assets/setup-guides/icloud/matcha.png
new file mode 100644
index 0000000000000000000000000000000000000000..280248d2bf0a4d7a1971191655b3530839ec71d0
Binary files /dev/null and b/docs/docs/assets/setup-guides/icloud/matcha.png differ
diff --git a/docs/docs/assets/setup-guides/icloud/password.png b/docs/docs/assets/setup-guides/icloud/password.png
new file mode 100644
index 0000000000000000000000000000000000000000..626ba5e3321ed2bf5f43a2749e8e411026b3bd66
Binary files /dev/null and b/docs/docs/assets/setup-guides/icloud/password.png differ
diff --git a/docs/docs/assets/setup-guides/icloud/settings.jpg b/docs/docs/assets/setup-guides/icloud/settings.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6776328449d07e552961e83644b90914f92c0ebe
Binary files /dev/null and b/docs/docs/assets/setup-guides/icloud/settings.jpg differ
diff --git a/docs/docs/setup-guides/icloud.md b/docs/docs/setup-guides/icloud.md
new file mode 100644
index 0000000000000000000000000000000000000000..a9d29b585958ada80f69f7e815af2828764be6c5
--- /dev/null
+++ b/docs/docs/setup-guides/icloud.md
@@ -0,0 +1,69 @@
+---
+title: iCloud
+sidebar_position: 2
+---
+
+# iCloud Mail setup
+
+Matcha requires an app-specific password to access your iCloud Mail account. App-specific passwords are available only after two-factor authentication is turned on for your Apple Account.
+
+## 1. Enable two-factor authentication (if not enabled)
+
+>  If you already use two-factor authentication you can skip this step.
+
+![MacOS settings](../assets/setup-guides/icloud/settings.jpg)
+
+1. On your iPhone or iPad, go to **Settings > [your name] > Sign-In & Security**.
+2. Tap **Turn On Two-Factor Authentication** and follow the prompts.
+
+On a Mac, go to **System Settings > [your name] > Sign-In & Security** and enable it there.
+
+
+
+## 2. Generate an app-specific password
+
+![App-specific password generation](../assets/setup-guides/icloud/account.png)
+
+1. Sign in at [https://account.apple.com](https://account.apple.com).
+2. In the **Sign-In and Security** section, click **App-Specific Passwords**.
+3. Click **Generate an app-specific password**.
+4. Enter a label for the password (e.g., "Matcha").
+
+![App-specific password creation](../assets/setup-guides/icloud/app-specific.png)
+
+5. Click **Create**.
+
+
+6. Copy the password shown on screen.
+ 
+![Generated password](../assets/setup-guides/icloud/password.png)
+
+*This key is revoked, don't worry*
+
+> **Important:** Treat this app-specific password as you would your primary password. Never share it or expose it publicly. The password sits locally on your device and is never shared with us.
+
+![Matcha Add Account view](../assets/setup-guides/icloud/matcha.png)
+
+## 3. Open account setup in Matcha
+
+
+
+From Matcha, open settings and choose to add a new account.
+
+## 4. Enter iCloud credentials in Matcha
+
+In Matcha account setup:
+
+- Provider: icloud
+- Display name: The name that will appear on the emails you send
+- Username: Your iCloud email address (the email you use to sign in to your Apple Account)
+- Email Address: The iCloud email address used to fetch messages from (most likely the same as the Username). If you have multiple iCloud email addresses, or custom domain email addresses, you can add them as separate accounts in Matcha, each with the same app-specific password.
+- Password: The generated app-specific password (not your normal Apple Account password)
+
+## Troubleshooting
+
+| Issue | Solution |
+| --- | --- |
+| **Invalid credentials** | Verify you're using the app-specific password, not your regular Apple Account password. |
+| **"App-Specific Passwords" option missing** | Confirm two-factor authentication is enabled for your Apple Account. |
+| **Connection still fails** | At [account.apple.com](https://account.apple.com), revoke the current app-specific password and generate a new one. Then update your credentials in Matcha. |