diff --git a/wiki/src/doc/encryption_and_privacy/veracrypt.mdwn b/wiki/src/doc/encryption_and_privacy/veracrypt.mdwn
index 18d6d5dba6294804e100016865caffa619f3a24a..1857372d08386da0dd2dd317e1d890ae842bc611 100644
--- a/wiki/src/doc/encryption_and_privacy/veracrypt.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/veracrypt.mdwn
@@ -98,33 +98,21 @@ Unlocking a file container without keyfiles
<span class="menuchoice">
<span class="guimenu">Applications</span> ▸
<span class="guisubmenu">Accessories</span> ▸
- <span class="guisubmenuitem">Files</span></span>
- to start the <span class="application">Files</span> browser.
+ <span class="guisubmenuitem">VeraCrypt Mounter</span></span>.
-1. Navigate to the folder containing the file container that you want to open.
-
-1. Right-click on the file container and choose <span class="guimenuitem">Open
- With Other Application</span>.
-
-1. In the <span class="guilabel">Select Application</span> dialog, click the
- <span class="button">View All Applications</span> button.
-
-1. In the list of applications, choose <span class="application">Disk Image
- Mounter</span>.
-
- [[!img disk-image-mounter.png link="no" alt=""]]
-
-1. Click on the <span class="guilabel">Encrypted</span> label of the new volume
- that appears in the sidebar.
-
- [[!img container-encrypted-label.png link="no" alt="105 MB Encrypted"]]
+1. Click <span class="button">Add</span> and choose the file container
+ that you want to unlock.
1. Enter the parameters to unlock the volume. For more information, see
the [[Unlocking parameters|veracrypt#parameters]] section above.
Click <span class="button">Unlock</span>.
-1. <span class="application">Files</span> opens your volume.
+1. <span class="application">VeraCrypt Mounter</span> opens your volume.
+
+1. If unlocking the volume fails (for example if you mistyped the
+ password), click on <span class="button">Unlock</span> to try
+ unlocking again.
<a id="container-disks"></a>
@@ -196,12 +184,19 @@ Unlocking a file container with keyfiles
Closing a file container
------------------------
-1. Click on the <span class="button">[[!img lib/media-eject.png
- alt="Eject" class="symbolic" link="no"]]</span> button on the label
- of the volume corresponding to your file container in the sidebar of
- the <span class="application">Files</span> browser.
+You can either:
+
+- In the sidebar of the <span class="application">Files</span> browser,
+ click on the <span class="button">[[!img lib/media-eject.png
+ alt="Eject" class="symbolic" link="no"]]</span> button on the label
+ of the volume corresponding to your file container.
+
+ [[!img eject-container.png link="no" alt=""]]
- [[!img eject-container.png link="no" alt=""]]
+- In <span class="application">VeraCrypt Mounter</span>, click on the
+ <span class="button">[[!img lib/window-close.png class="symbolic"
+ link="no" alt=""]]</span> button in the line that corresponds to your
+ file container.
Using a partition (or entire disk)
==================================
@@ -217,8 +212,7 @@ Unlocking a partition (or entire disk) without keyfiles
<span class="menuchoice">
<span class="guimenu">Applications</span> ▸
<span class="guisubmenu">Accessories</span> ▸
- <span class="guisubmenuitem">Files</span></span>
- to start the <span class="application">Files</span> browser.
+ <span class="guisubmenuitem">VeraCrypt Mounter</span></span>.
1. Plug in the USB stick or the hard disk that you want to unlock.
@@ -226,17 +220,19 @@ Unlocking a partition (or entire disk) without keyfiles
partition (or entire disk) with keyfiles|veracrypt#partition-disks]]
instead.
-1. Click on the <span class="guilabel">Encrypted</span> label of the new volume
- that appears in the sidebar.
+1. Click <span class="button">Unlock</span> in the line that appears in
+ the list of partitions.
[[!img partition-encrypted-label.png link="no" alt="Mount and open '8.2 GB Encrypted'"]]
+ XXX: Update screenshot
+
1. Enter the parameters to unlock the volume. For more information, see
the [[Unlocking parameters|veracrypt#parameters]] section above.
Click <span class="button">Unlock</span>.
-1. <span class="application">Files</span> opens your volume.
+1. <span class="application">VeraCrypt Mounter</span> opens your volume.
<a id="partition-disks"></a>
@@ -293,9 +289,16 @@ Unlocking a partition (or entire disk) with keyfiles
Closing a partition (or entire disk)
------------------------------------
-1. Click on the <span class="button">[[!img lib/media-eject.png
- alt="Eject" class="symbolic" link="no"]]</span> button on the label
- of the volume corresponding to your partition in the sidebar of
- the <span class="application">Files</span> browser.
+You can either:
+
+- In the sidebar of the <span class="application">Files</span> browser,
+ click on the <span class="button">[[!img lib/media-eject.png
+ alt="Eject" class="symbolic" link="no"]]</span> button on the label
+ of the volume corresponding to your partition.
+
+ [[!img eject-partition.png link="no" alt=""]]
- [[!img eject-partition.png link="no" alt=""]]
+- In <span class="application">VeraCrypt Mounter</span>, click on the
+ <span class="button">[[!img lib/window-close.png class="symbolic"
+ link="no" alt=""]]</span> button in the line that corresponds to your
+ partition.