diff --git a/docs/en_US/images/query_autocomplete.png b/docs/en_US/images/query_autocomplete.png
old mode 100755
new mode 100644
index d61e1b3e487bebedee4fe45dc89ba00fd160cfe1..c5161c8968d9920652f567127f9eee687b6f300f
GIT binary patch
diff --git a/docs/en_US/images/query_execute_section.png b/docs/en_US/images/query_execute_section.png
old mode 100755
new mode 100644
index abd869fde225e9b4ac534838ecf63239fc1f354c..1f8467675be4c65c3b7f6e593b3b07da7da938d0
GIT binary patch
diff --git a/docs/en_US/images/query_explain_analyze_statistics.png b/docs/en_US/images/query_explain_analyze_statistics.png
index eb7fce4a0bbbf4a353ce6c6b18b72a2fa554aba3..a659cdd12254d085622a8d98add798efcab38d2a 100644
GIT binary patch
diff --git a/docs/en_US/images/query_explain_analyze_table.png b/docs/en_US/images/query_explain_analyze_table.png
index fabbc582b4262fbf75cb5469dd2991ffa2487af3..dfedb703b0e6b4d865c6cfd792e29916c62f258a 100644
GIT binary patch
diff --git a/docs/en_US/images/query_output_data.png b/docs/en_US/images/query_output_data.png
index 8bd89a6c9258e460a2d904d909dc72fcbf988e34..1f8467675be4c65c3b7f6e593b3b07da7da938d0 100644
GIT binary patch
diff --git a/docs/en_US/images/query_output_error.png b/docs/en_US/images/query_output_error.png
old mode 100755
new mode 100644
index b02b26269b895007031420183260f06e09e7ed99..e67007259fff8575049abbca14ffa968006f4050
GIT binary patch
diff --git a/docs/en_US/images/query_output_explain_details.png b/docs/en_US/images/query_output_explain_details.png
index d93954113410103daa72621938b6078cc2dafeeb..8b655ee6f28b17d9537a3ef200b127c54fa9f7a4 100644
GIT binary patch
diff --git a/docs/en_US/images/query_output_history.png b/docs/en_US/images/query_output_history.png
index 75acd62fc45d2a19258d95daf40c6739ed52ac45..8f7f3c49912834a7736581639dde3b50f38d909f 100644
GIT binary patch
diff --git a/docs/en_US/images/query_output_messages.png b/docs/en_US/images/query_output_messages.png
old mode 100755
new mode 100644
index f08cceabf26f3e9add7fa5b396c6317df2558afe..7271bdf469e18dce83da76a5d5f34ae9f503a979
GIT binary patch
diff --git a/docs/en_US/images/query_sql_editor.png b/docs/en_US/images/query_sql_editor.png
old mode 100755
new mode 100644
index 9101b7916a5b31ac86a8bc1c483fd598cb8ad71b..dd8dc33fa89df7d97098c46a5fd0f5d8ddfd243e
GIT binary patch
diff --git a/docs/en_US/images/query_tool.png b/docs/en_US/images/query_tool.png
index 410bf4011945bee767ff163c352c6dc4c3997822..27c298ad9528fda5b5c446702099936281b1fc01 100644
GIT binary patch
diff --git a/docs/en_US/images/query_tool_editable_columns.png b/docs/en_US/images/query_tool_editable_columns.png
index 305511b4a4676db7298e92cca01f2967ea34f3d8..bfb7015793c6afc49dd7916a9d444e3e0f918393 100644
GIT binary patch
diff --git a/docs/en_US/images/query_tool_macros_clear_confirmation.png b/docs/en_US/images/query_tool_macros_clear_confirmation.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5f40945bceaa8725be2edef8c25078c62d55ac6
GIT binary patch
diff --git a/docs/en_US/images/query_tool_macros_clear_row.png b/docs/en_US/images/query_tool_macros_clear_row.png
new file mode 100644
index 0000000000000000000000000000000000000000..62ab6b047c025ed2b7c6d200648c2811c87a84c5
GIT binary patch
diff --git a/docs/en_US/images/query_tool_macros_execution.png b/docs/en_US/images/query_tool_macros_execution.png
new file mode 100644
index 0000000000000000000000000000000000000000..34465f5d359c26ef254133e37c04413eb12d0eac
GIT binary patch
diff --git a/docs/en_US/images/query_tool_manage_macros_dialog.png b/docs/en_US/images/query_tool_manage_macros_dialog.png
new file mode 100644
index 0000000000000000000000000000000000000000..a06186d6bc0bf50661996b62cf873947d279a1a9
GIT binary patch
diff --git a/docs/en_US/images/query_tool_message.png b/docs/en_US/images/query_tool_message.png
old mode 100755
new mode 100644
index 5d521dd72cb09fbab2716b331758760561b2a5ed..c578638ee0387bca3a9e291c6846fa793edac203
GIT binary patch
diff --git a/docs/en_US/images/query_toolbar.png b/docs/en_US/images/query_toolbar.png
index a7dfe794d1fa7e6e3f7da2a6ef3222a08e61985e..35e183ca6eaac36869eb2267bbe38d2e131358d7 100644
GIT binary patch
diff --git a/docs/en_US/images/query_toolbar_explain.png b/docs/en_US/images/query_toolbar_explain.png
index ef9072a932cc2c30630977c8d324f16d74602b79..667c656e2febdb589807f18dd4d0c61831e5b55e 100644
GIT binary patch
diff --git a/docs/en_US/query_tool.rst b/docs/en_US/query_tool.rst
index 80f27a5dc..82e6a4a99 100644
--- a/docs/en_US/query_tool.rst
+++ b/docs/en_US/query_tool.rst
@@ -65,7 +65,7 @@ features syntax coloring and autocompletion.
 
 To use autocomplete, begin typing your query; when you would like the Query
 editor to suggest object names or commands that might be next in your query,
-press the Control+Space key combination. For example, type "\*SELECT \* FROM\* "
+press the Control+Space key combination. For example, type "*SELECT \* FROM*"
 (without quotes, but with a trailing space), and then press the Control+Space
 key combination to select from a popup menu of autocomplete options.
 
@@ -321,3 +321,32 @@ User can connect to another server or database from existing open session of que
 
 * A newly created connection will now get listed in the options.
 * To connect, select the newly created connection from the dropdown list.
+
+Macros
+******
+
+Query Tool Macros enable you to execute pre-defined SQL queries with single key press. Pre-defined queries can contain the placeholder $SELECTION$. Upon macro execution, the placeholder will be replaced with the currently selected text in the Query Editor pane of the Query Tool.
+
+To create a macro, select the *Manage Macros* option from the *Macros* menu on the *Query Tool*. Select the key you wish to use, enter the name of the macro, and the query, optionally including the selection placeholder, and then click the Save button to store the macro.
+
+.. image:: images/query_tool_manage_macros_dialog.png
+   :alt: Query Tool Manage Macros dialogue
+   :align: center
+
+To clear a macro, select the macro on the Manage Macros dialogue, and then click the Clear button.
+
+.. image:: images/query_tool_macros_clear_row.png
+   :alt: Query Tool Manage Macros clear the row
+   :align: center
+
+It asks for the confirmation to clear a macro.
+
+.. image:: images/query_tool_macros_clear_confirmation.png
+   :alt: Query Tool Manage Macros Clear row confirmation
+   :align: center
+
+To execute a macro, simply press the appropriate shortcut keys, or select it from the Macros menu.
+
+.. image:: images/query_tool_macros_execution.png
+   :alt: Query Tool Macros Execution
+   :align: center
diff --git a/docs/en_US/query_tool_toolbar.rst b/docs/en_US/query_tool_toolbar.rst
index 63cbd3a6f..ba85603d6 100644
--- a/docs/en_US/query_tool_toolbar.rst
+++ b/docs/en_US/query_tool_toolbar.rst
@@ -184,3 +184,6 @@ Query Execution
    |                      | You can specify the CSV/TXT settings through *Preferences -> SQL Editor -> CSV/TXT output*        |                |
    |                      | dialogue.                                                                                         |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Macros*             | Click the *Macros* icon to manage the macros. You can create, edit or clear the macros through    |                |
+   |                      | *Manage Macros* option.                                                                           |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
