diff --git a/docs/en_US/images/object_menu.png b/docs/en_US/images/object_menu.png
index 3406e830e..0151189d7 100644
Binary files a/docs/en_US/images/object_menu.png and b/docs/en_US/images/object_menu.png differ
diff --git a/docs/en_US/menu_bar.rst b/docs/en_US/menu_bar.rst
index d3a1618ba..f0fc200e2 100644
--- a/docs/en_US/menu_bar.rst
+++ b/docs/en_US/menu_bar.rst
@@ -53,20 +53,20 @@ following options (in alphabetical order):
 | *Clear SSH Tunnel Password* | If you have saved the ssh tunnel password, click to clear the saved password.                                            |
 |                             | Enable only when password is already saved.                                                                              |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Connect Server...*         | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server.           |
+| *Connect Server*            | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server.           |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Create*                    | Click *Create* to access a context menu that provides context-sensitive selections.                                      |
 |                             | Your selection opens a *Create* dialog for creating a new object.                                                        |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Delete/Drop*               | Click to delete the currently selected object from the server.                                                           |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Disconnect Server...*      | Click to disconnect the currently selected server.                                                                       |
+| *Disconnect from server*    | Click to disconnect from the currently selected server.                                                                  |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Drop Cascade*              | Click to delete the currently selected object and all dependent objects from the server.                                 |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Properties...*             | Click to review or modify the currently selected object's properties.                                                    |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Refresh...*                | Click to refresh the currently selected object.                                                                          |
+| *Refresh*                   | Click to refresh the currently selected object.                                                                          |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Remove Server*             | Click to remove the currently selected server.                                                                           |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
diff --git a/docs/en_US/release_notes_6_5.rst b/docs/en_US/release_notes_6_5.rst
index effe7cf58..c824d17af 100644
--- a/docs/en_US/release_notes_6_5.rst
+++ b/docs/en_US/release_notes_6_5.rst
@@ -16,6 +16,7 @@ Housekeeping
 
 | `Issue #7016 <https://redmine.postgresql.org/issues/7016>`_ -  Port Dependent, dependencies, statistics panel to React.
 | `Issue #7017 <https://redmine.postgresql.org/issues/7017>`_ -  Port Import/Export dialog to React.
+| `Issue #7163 <https://redmine.postgresql.org/issues/7163>`_ -  Rename the menu 'Disconnect Server' to 'Disconnect from server'.
 
 Bug fixes
 *********
diff --git a/docs/en_US/tree_control.rst b/docs/en_US/tree_control.rst
index 433b89fdf..8091ecc5d 100644
--- a/docs/en_US/tree_control.rst
+++ b/docs/en_US/tree_control.rst
@@ -53,7 +53,7 @@ following selections (options appear in alphabetical order):
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
 | *Disconnect Database...*  | Click to terminate a database connection.                                                                                 |
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
-| *Disconnect Server...*    | Click to refresh the currently selected object.                                                                           |
+| *Disconnect from server*  | Click to disconnect from the currently selected server.                                                                   |
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
 | *Drop Cascade*            | Click to delete the currently selected object and all dependent objects from the server.                                  |
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js
index 2c6ccebf2..7c9816572 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -92,14 +92,14 @@ define('pgadmin.node.server', [
           applies: ['object', 'context'], callback: 'connect_server',
           category: 'connect', priority: 4, label: gettext('Connect Server'),
           icon: 'fa fa-link', enable : 'is_not_connected',data: {
-            data_disabled: gettext('Database is already connected.'),
+            data_disabled: gettext('Database server is already connected.'),
           },
         },{
           name: 'disconnect_server', node: 'server', module: this,
           applies: ['object', 'context'], callback: 'disconnect_server',
-          category: 'drop', priority: 5, label: gettext('Disconnect Server'),
+          category: 'drop', priority: 5, label: gettext('Disconnect from server'),
           icon: 'fa fa-unlink', enable : 'is_connected',data: {
-            data_disabled: gettext('Database is already disconnected.'),
+            data_disabled: gettext('Database server is already disconnected.'),
           },
         },
         {
@@ -285,8 +285,8 @@ define('pgadmin.node.server', [
 
             if (notify) {
               Notify.confirm(
-                gettext('Disconnect server'),
-                gettext('Are you sure you want to disconnect the server %s?', d.label),
+                gettext('Disconnect from server'),
+                gettext('Are you sure you want to disconnect from the server %s?', d.label),
                 function() { disconnect(); },
                 function() { return true;},
               );