diff --git a/user_manual/files/access_webdav.rst b/user_manual/files/access_webdav.rst
index cf1ecb67a..13120cacb 100644
--- a/user_manual/files/access_webdav.rst
+++ b/user_manual/files/access_webdav.rst
@@ -188,14 +188,14 @@ path of your certificate as in this example::
 
  servercert /etc/davfs2/certs/mycertificate.pem
 
-Accessing Files Using Mac OS X
-------------------------------
+Accessing Files Using macOS
+---------------------------
 
-.. note:: The Mac OS X Finder suffers from a `series of implementation problems
+.. note:: The macOS Finder suffers from a `series of implementation problems
    <http://sabre.io/dav/clients/finder/>`_ and should only be used if the
    Nextcloud server runs on **Apache** and **mod_php**, or **Nginx 1.3.8+**.
 
-To access files through the Mac OS X Finder:
+To access files through the macOS Finder:
 
 1. Choose **Go > Connect to Server**.
 
@@ -207,7 +207,7 @@ To access files through the Mac OS X Finder:
      :alt: Screenshot of entering your Nextcloud server address on Mac OS X
 
   For example, the URL used to connect to the Nextcloud server
-  from the Mac OS X Finder is::
+  from the macOS Finder is::
 
     https://example.com/nextcloud/remote.php/dav/files/USERNAME/
 
diff --git a/user_manual/files/access_webgui.rst b/user_manual/files/access_webgui.rst
index 0ea313422..d4e4aee1d 100644
--- a/user_manual/files/access_webgui.rst
+++ b/user_manual/files/access_webgui.rst
@@ -7,7 +7,7 @@ preview, edit, delete, share, and re-share files. Your Nextcloud administrator
 has the option to disable these features, so if any of them are missing on your
 system ask your server administrator.
 
-.. figure:: ../images/files_page.png
+.. figure:: ../images/users-files.png
    :alt: The Files view screen.
 
 Tagging Files
diff --git a/user_manual/images/files_versioning.png b/user_manual/images/files_versioning.png
index 6464fc6e3..e1043e8bc 100644
Binary files a/user_manual/images/files_versioning.png and b/user_manual/images/files_versioning.png differ
diff --git a/user_manual/images/oc_share_expiration_calendar.png b/user_manual/images/oc_share_expiration_calendar.png
index 1406c57ad..dd09abcfd 100644
Binary files a/user_manual/images/oc_share_expiration_calendar.png and b/user_manual/images/oc_share_expiration_calendar.png differ
diff --git a/user_manual/images/osx_webdav1.png b/user_manual/images/osx_webdav1.png
index 29279e268..0967693e1 100644
Binary files a/user_manual/images/osx_webdav1.png and b/user_manual/images/osx_webdav1.png differ
diff --git a/user_manual/images/osx_webdav2.png b/user_manual/images/osx_webdav2.png
index b67e66ae8..15914762d 100644
Binary files a/user_manual/images/osx_webdav2.png and b/user_manual/images/osx_webdav2.png differ
diff --git a/user_manual/images/quota1.png b/user_manual/images/quota1.png
index f05b825dc..607610fb1 100644
Binary files a/user_manual/images/quota1.png and b/user_manual/images/quota1.png differ
diff --git a/user_manual/webinterface.rst b/user_manual/webinterface.rst
index f17d8f6da..f2a18fcc0 100644
--- a/user_manual/webinterface.rst
+++ b/user_manual/webinterface.rst
@@ -49,7 +49,7 @@ The Nextcloud user interface contains the following fields and functions:
   enables you to create new files, new folders, or upload files.
 
 .. note:: You can also drag and drop files from your file manager into the
-  Files Application View to upload them to your instance. Currently,
+   Files Application View to upload them to your instance. Currently,
    the only Web browsers that support drag-and-drop folders are Chrome and
    Chromium.
 
@@ -58,7 +58,7 @@ The Nextcloud user interface contains the following fields and functions:
 
 * **Contacts Menu** (7): Gives you an overview about your contacts and users on
   your server. Dependent on the given details and available apps, you can
-  directly start a video call with them or send emails. 
+  directly start a video call with them or send emails.
 
 * **Gallery** button (8). This looks like four little squares, and takes you
   directly to your image gallery.