diff --git a/doc/images/client-7.png b/doc/images/client-7.png
new file mode 100644
index 0000000000..99d9dba335
Binary files /dev/null and b/doc/images/client-7.png differ
diff --git a/doc/images/client6.png b/doc/images/client6.png
index 80656baadb..a2174cf6f6 100644
Binary files a/doc/images/client6.png and b/doc/images/client6.png differ
diff --git a/doc/images/ignored_files_editor.png b/doc/images/ignored_files_editor.png
index b490e4a532..c9d5c1743a 100644
Binary files a/doc/images/ignored_files_editor.png and b/doc/images/ignored_files_editor.png differ
diff --git a/doc/images/menu.png b/doc/images/menu.png
index 6101e5861c..d5f62ec0ce 100644
Binary files a/doc/images/menu.png and b/doc/images/menu.png differ
diff --git a/doc/images/settings_network.png b/doc/images/settings_network.png
index 1a515192b1..596c1261bf 100644
Binary files a/doc/images/settings_network.png and b/doc/images/settings_network.png differ
diff --git a/doc/navigating.rst b/doc/navigating.rst
index 595f8c55a4..4f75a855ab 100644
--- a/doc/navigating.rst
+++ b/doc/navigating.rst
@@ -9,32 +9,39 @@ in the system tray (Windows, KDE), status bar (Mac OS X), or notification area
 (Linux).
 
 .. image:: images/icon.png
+   :alt: Status icon, little cloud with green circle and white checkmark 
 
 The status indicator uses overlay icons to indicate the current status of your 
 synchronization. The green circle with the white checkmark tells you that your 
 synchronization is current and you are connected to your ownCloud server.
 
 .. image:: images/icon-syncing.png
+   :alt: Status icon, little cloud with blue circle and white semi-circles
 
 The blue icon with the white semi-circles means synchronization is in progress.
 
 .. image:: images/icon-paused.png
+   :alt: Status icon, little cloud with yellow circle and vertical parallel 
+    lines
 
 The yellow overlay icon with the parallel lines tells you your synchronization 
-has been paused. (Most likely by you, by opening the client and clicking 
-Account > Pause.)
+has been paused. (Most likely by you.)
 
 .. image:: images/icon-offline.png
+   :alt: Status icon, little gray cloud with gray circle and three horizontal 
+    white dots
 
 The gray icon with three white dots means your sync client has lost its 
 connection with your ownCloud server.
 
 .. image:: images/icon-information.png
+   :alt: Status icon, little cloud with letter "i" in white circle
 
 When you see a white circle with the letter "i" that is the informational icon, 
 so you should click it to see what it has to tell you.
 
 .. image:: images/icon-error.png
+   :alt: Status icon, little cloud with red circle and white x
 
 The red circle with the white "x" indicates a configuration error, such as an 
 incorrect login or server URL.
@@ -50,7 +57,6 @@ A right-click on the icon opens a menu for quick access to multiple operations.
 The Desktop Client menu provides the following options:
 
 * Open ownCloud in browser
-* Managed folder
 * Open folder [your local sync folder]
 * Up to date
 * Recent changes
@@ -65,18 +71,47 @@ Using the Account Settings Window
 .. index:: account settings, user, password, Server URL
 
 Click **Settings** in the right-click menu to see a summary of your ownCloud 
-account settings. This shows which ownCloud account you are connected to (or accounts, if you have more than one) your 
+account settings, or left-click your systray icon. This shows which ownCloud 
+account you are connected to (or accounts, if you have more than one) your 
 quota status, and a window for managing your synchronization settings.
 
 .. image:: images/client6.png
    :alt: Account settings window
 
-At the top of the window are tabs for each configured sync account, and three others for Activity, General and Network settings.
+At the top of the window are tabs for each configured sync account, and three 
+others for Activity, General and Network settings. On your account tabs you 
+have the following features:
+
+* Connection status, showing which ownCloud server you are connected to, and 
+  your ownCloud username.
+* A **Remove Account** button, which deletes your account but does not delete 
+  your data files.
+* Used and available space on the server.
+* Current synchronization status.
+* **Add Folder Sync Connection** button, which is active only when you have 
+  removed synchronization on an account (see **Remove Sync** below).
+
+The little button with three dots that sits to the right of the sync status bar 
+offers three additional options:
+
+* Open Folder
+* Pause Sync
+* Remove Sync
+
+**Pause Sync** pauses sync operations without making any changes to your account.
+
+**Remove Sync** suspends synchronization without removing the account, and it 
+removes your folder sync selection. When you're ready to resume synchronization 
+click the **Add Folder Sync Connection** button, and re-select the folders you 
+want to sync.
+
+.. image:: images/client-7.png
+   :alt: Extra options for sync operations
 
 The Activity window contains the log of your recent activities, including files 
-downloaded and deleted.
+downloaded and deleted, and which local folders your files went into.
 
-The General window has configuration options such as Launch on **System 
+The General window has configuration options such as **Launch on System 
 Startup**, **Use Monochrome Icons**, and **Show Desktop Notifications**. This 
 is where you will find the **Edit Ignored Files** button, to launch the ignored 
 files editor, and two new features: **Ask confirmation before downloading