diff --git a/docs/en_US/images/preferences_sql_display.png b/docs/en_US/images/preferences_sql_display.png
index 231521da9..8c16e8bd5 100644
Binary files a/docs/en_US/images/preferences_sql_display.png and b/docs/en_US/images/preferences_sql_display.png differ
diff --git a/docs/en_US/images/query_sql_editor.png b/docs/en_US/images/query_sql_editor.png
index d4eae1d3f..56cec1b6b 100644
Binary files a/docs/en_US/images/query_sql_editor.png and b/docs/en_US/images/query_sql_editor.png differ
diff --git a/docs/en_US/images/query_tool.png b/docs/en_US/images/query_tool.png
index 1f0cf42bd..597790d57 100644
Binary files a/docs/en_US/images/query_tool.png and b/docs/en_US/images/query_tool.png differ
diff --git a/docs/en_US/images/query_tool_connection_status.png b/docs/en_US/images/query_tool_connection_status.png
new file mode 100755
index 000000000..65dc4f712
Binary files /dev/null and b/docs/en_US/images/query_tool_connection_status.png differ
diff --git a/docs/en_US/preferences.rst b/docs/en_US/preferences.rst
index 35719cf89..ce3de7246 100644
--- a/docs/en_US/preferences.rst
+++ b/docs/en_US/preferences.rst
@@ -115,6 +115,10 @@ Use the fields on the *CSV Output* panel to control the CSV output.
 
 Use the fields on the *Display* panel to specify your preferences for the SQL Editor display.
 
+* When the *Connection status* switch is set to *True*, each new instance of the SQL Editor will display connection and transaction status.
+
+* Use the *Connection status refresh rate* field to specify the number of seconds between connection/transaction status updates.
+
 * When the *Open in new browser tab* switch is set to *True*, each new instance of the SQL Editor will open in a new browser tab.
 
 * Use the *Query info notifier timeout* field to control the behaviour of the notifier that is displayed when query execution completes. A value of *-1* will disable the notifier, and a value of 0 will display it until clicked. If a positive value above zero is specified, the notifier will be displayed for the specified number of seconds. The default is *5*.
diff --git a/docs/en_US/query_tool.rst b/docs/en_US/query_tool.rst
index ebd261dce..0c37fac98 100644
--- a/docs/en_US/query_tool.rst
+++ b/docs/en_US/query_tool.rst
@@ -8,6 +8,7 @@ The Query tool is a powerful, feature-rich environment that allows you to execut
 
 * Issue ad-hoc SQL queries.
 * Execute arbitrary SQL commands.
+* Displays current connection and transaction status as configured by the user.
 * Save the data displayed in the output panel to a CSV file.
 * Review the execution plan of a SQL statement in either a text or a graphical format.
 * View analytical information about a SQL statement.
@@ -205,4 +206,9 @@ The Query History tab displays information about recent commands:
 * The amount of time it took the server to process the query and return a result set.
 * Messages returned by the server (not noted on the *Messages* tab).
 
-To erase the content of the *Query History* tab, select *Clear history* from the *Clear* drop-down menu.
\ No newline at end of file
+To erase the content of the *Query History* tab, select *Clear history* from the *Clear* drop-down menu.
+
+Use the *Connection status* feature to view the current connection and transaction status by clicking on the status icon in query tool:
+
+.. image:: images/query_tool_connection_status.png
+    :alt: Query tool connection and transaction statuses
\ No newline at end of file