diff --git a/doc/integrations/images/win10-keepass-application-menu.png b/doc/integrations/images/win10-keepass-application-menu.png
index f19f51c..afd9208 100644
Binary files a/doc/integrations/images/win10-keepass-application-menu.png and b/doc/integrations/images/win10-keepass-application-menu.png differ
diff --git a/doc/integrations/images/win10-keepass-context-menu-expanded.png b/doc/integrations/images/win10-keepass-context-menu-expanded.png
index 0d4b6ae..74de745 100644
Binary files a/doc/integrations/images/win10-keepass-context-menu-expanded.png and b/doc/integrations/images/win10-keepass-context-menu-expanded.png differ
diff --git a/doc/integrations/images/win10-keepass-entry-menu-expanded.png b/doc/integrations/images/win10-keepass-entry-menu-expanded.png
new file mode 100644
index 0000000..628e62c
Binary files /dev/null and b/doc/integrations/images/win10-keepass-entry-menu-expanded.png differ
diff --git a/doc/integrations/images/win10-keepass-group-menu.png b/doc/integrations/images/win10-keepass-group-menu.png
new file mode 100644
index 0000000..0563a54
Binary files /dev/null and b/doc/integrations/images/win10-keepass-group-menu.png differ
diff --git a/doc/integrations/menu-items.rst b/doc/integrations/menu-items.rst
index 85d45e3..3dc246d 100644
--- a/doc/integrations/menu-items.rst
+++ b/doc/integrations/menu-items.rst
@@ -13,38 +13,38 @@ This is the KeePass application menu.
 .. figure:: images/win10-keepass-application-menu.png
     :alt: KeePass - Application Menu
 
-Tools Menu
+
+Group Menu
 ----------
 
-KeeAgent adds one item to the Tools menu.
+The *Group Menu* is accessed by clicking on *Group* in the main application menu
+or by right-clicking on an group in the group navigation pane on the left side
+of the main window in KeePass.
 
-.. figure:: images/win10-keepass-tools-menu.png
-    :alt: KeePass - Tools menu - KeeAgent
+.. figure:: images/win10-keepass-group-menu.png
+        :alt: Screenshot of KeePass main window group menu on Windows 10
 
-KeeAgent
-    Opens the KeeAgent Manager dialog.
-
-.. todo:: Add link to page on KeeAgent manager.
-
-Help Menu
----------
+.. figure:: images/win10-keepass-group-context-menu.png
+        :alt: Screenshot of KeePass main window group context menu on Windows 10
 
-KeeAgent adds one item to the Help menu.
+**Load SSH Keys** (Ctrl+M)
+    Loads keys from the selected group in to the agent.
 
-.. figure:: images/win10-keepass-help-menu.png
-    :alt: KeePass - Help menu - KeeAgent
+    .. note:: This menu item is only visible if the selected group contains any
+        SSH keys.
 
-KeeAgent
-    Opens the KeeAgent documentation in a web browser.
 
+Entry Menu
+----------
 
-Entry Context Menu
-==================
+The *Entry Menu* is accessed by clicking *Entry* in the main application menu
+or by right-clicking on an entry in the entry list.
 
-The Entry Context Menu is accessed by right-clicking on an entry in the entry list.
+.. figure:: images/win10-keepass-entry-menu-expanded.png
+        :alt: Screenshot of KeePass main window entry menu on Windows 10
 
 .. figure:: images/win10-keepass-context-menu-expanded.png
-        :alt: Context Menu - Load SSH Key
+        :alt: Screenshot of KeePass main window entry context menu on Windows 10
 
 **Load SSH Key** (Ctrl+M)
     Loads key from the selected entry in to the agent.
@@ -63,20 +63,30 @@ The Entry Context Menu is accessed by right-clicking on an entry in the entry li
     and *URL(s) > Open* menu items.
 
 
-Group Context Menu
-==================
+Tools Menu
+----------
+
+KeeAgent adds one item to the Tools menu.
 
-The Group Context Menu is accessed by right-clicking on an group in the group
-navigation pane on the left side of the main window in KeePass.
+.. figure:: images/win10-keepass-tools-menu.png
+    :alt: KeePass - Tools menu - KeeAgent
 
-.. figure:: images/win10-keepass-group-context-menu.png
-        :alt: Screenshot of KeePass main window group context menu on Windows 10
+KeeAgent
+    Opens the KeeAgent Manager dialog.
 
-**Load SSH Keys** (Ctrl+M)
-    Loads keys from the selected group in to the agent.
+.. todo:: Add link to page on KeeAgent manager.
 
-    .. note:: This menu item is only visible if the selected group contains any
-        SSH keys.
+
+Help Menu
+---------
+
+KeeAgent adds one item to the Help menu.
+
+.. figure:: images/win10-keepass-help-menu.png
+    :alt: KeePass - Help menu - KeeAgent
+
+KeeAgent
+    Opens the KeeAgent documentation in a web browser.
 
 
 Notification Tray Icon Menu