diff --git a/docs/en_US/images/toolbar.png b/docs/en_US/images/toolbar.png
index e7d54dd06af1f94ccd6110f384668f0b5d03467d..19c4c574a905fb30ea1828b4825e85af7cdb0c0e 100644
GIT binary patch
diff --git a/web/pgadmin/browser/static/css/browser.css b/web/pgadmin/browser/static/css/browser.css
index 57295ee76..cc32c35d3 100644
--- a/web/pgadmin/browser/static/css/browser.css
+++ b/web/pgadmin/browser/static/css/browser.css
@@ -52,3 +52,11 @@
   font-icon: url('../img/drop_cascade.svg');
   font-size: 1.6em !important;
 }
+
+.icon-filter-table-toolbar:before  {
+  font-icon: url('../img/row_filter.svg');
+}
+
+.icon-query-tool:before  {
+  font-icon: url('../img/query_tool.svg');
+}
diff --git a/web/pgadmin/browser/static/img/query_tool.svg b/web/pgadmin/browser/static/img/query_tool.svg
new file mode 100644
index 000000000..88bf37f56
--- /dev/null
+++ b/web/pgadmin/browser/static/img/query_tool.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<g>
+	<path d="M13.1,9.2c0.4-0.3,0.6-0.6,0.6-0.9v-3C12.6,6,10.8,6.5,8.9,6.6L13.1,9.2z"/>
+	<path d="M7.2,5.8c3.6,0,6.5-1,6.5-2.1V2.4c0-1.2-2.9-2.1-6.5-2.1s-6.5,1-6.5,2.1v1.3C0.7,4.9,3.6,5.8,7.2,5.8z"/>
+	<path d="M0.7,10v3c0,1.2,2.9,2.1,6.5,2.1c0.1,0,0.2,0,0.2,0v-3.7c-0.1,0-0.2,0-0.2,0C4.6,11.4,2.1,11,0.7,10z"/>
+	<path d="M0.7,5.4v3c0,1.2,2.9,2.1,6.5,2.1c0.1,0,0.2,0,0.2,0v-3c0-0.3,0.1-0.6,0.3-0.7c-0.2,0-0.4,0-0.6,0C4.6,6.8,2.1,6.3,0.7,5.4
+		z"/>
+	<path d="M14.9,11.2L9.4,8C9,7.7,8.3,7.9,8.3,8.6V15c0,0.6,0.6,0.9,1.1,0.6l5.5-3.2C15.4,12.2,15.4,11.5,14.9,11.2z"/>
+</g>
+</svg>
diff --git a/web/pgadmin/browser/static/img/row_filter.svg b/web/pgadmin/browser/static/img/row_filter.svg
new file mode 100644
index 000000000..4d6d09361
--- /dev/null
+++ b/web/pgadmin/browser/static/img/row_filter.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<g>
+	<path d="M12.5,3.1c0.4-0.4,0.1-1-0.4-1H0.6c-0.5,0-0.8,0.6-0.4,1l4.6,4.6v5.1c0,0.2,0.1,0.4,0.3,0.5c0,0,1.5,0.9,1.5,0.5V6.5
+		c0-0.5,0.4-1,1-1h2.6L12.5,3.1z"/>
+	<path d="M15.2,6.5H8.3c-0.4,0-0.8,0.4-0.8,0.8v5.8c0,0.4,0.4,0.8,0.8,0.8h6.9c0.4,0,0.8-0.4,0.8-0.8V7.3C16,6.8,15.6,6.5,15.2,6.5z
+		 M11.2,12.8H8.6v-1.6h2.6V12.8z M11.2,10.2H8.6V8.6h2.6V10.2z M14.9,12.8h-2.6v-1.6h2.6V12.8z M14.9,10.2h-2.6V8.6h2.6V10.2z"/>
+</g>
+</svg>
diff --git a/web/pgadmin/browser/static/js/collection.js b/web/pgadmin/browser/static/js/collection.js
index 96e793079..65b61238c 100644
--- a/web/pgadmin/browser/static/js/collection.js
+++ b/web/pgadmin/browser/static/js/collection.js
@@ -57,7 +57,7 @@ define([
               name: 'show_query_tool', node: this.type, module: this,
               applies: ['context'], callback: 'show_query_tool',
               priority: 998, label: gettext('Query Tool...'),
-              icon: 'fa fa-bolt',
+              icon: 'pg-font-icon icon-query-tool',
             }]);
           }
         }
diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index e7e80c8d7..cfe4ed0bc 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -185,7 +185,7 @@ define('pgadmin.browser.node', [
           callback: 'show_query_tool',
           priority: 998,
           label: gettext('Query Tool...'),
-          icon: 'fa fa-bolt',
+          icon: 'pg-font-icon icon-query-tool',
           enable: function(itemData) {
             if (itemData._type == 'database' && itemData.allowConn)
               return true;
diff --git a/web/pgadmin/browser/static/js/toolbar.js b/web/pgadmin/browser/static/js/toolbar.js
index f491bfdbc..75653ad57 100644
--- a/web/pgadmin/browser/static/js/toolbar.js
+++ b/web/pgadmin/browser/static/js/toolbar.js
@@ -18,7 +18,7 @@ let _browserPanel = null;
 let _defaultToolBarButtons = [
   {
     label: gettext('Filtered Rows'),
-    btnClass: 'fa fa-filter',
+    btnClass: 'pg-font-icon icon-filter-table-toolbar',
     text: '',
     toggled: false,
     toggleClass: '',
@@ -36,7 +36,7 @@ let _defaultToolBarButtons = [
   },
   {
     label: gettext('Query Tool'),
-    btnClass: 'fa fa-bolt',
+    btnClass: 'pg-font-icon icon-query-tool',
     text: '',
     toggled: false,
     toggleClass: '',
diff --git a/web/pgadmin/browser/static/scss/_browser.scss b/web/pgadmin/browser/static/scss/_browser.scss
index 9ea1ecc5e..0d1573848 100644
--- a/web/pgadmin/browser/static/scss/_browser.scss
+++ b/web/pgadmin/browser/static/scss/_browser.scss
@@ -51,4 +51,5 @@ samp,
   margin-left: 0.25rem;
   border-style: solid;
   border-width: 1px;
+  font-size: 1.15em;
 }
diff --git a/web/pgadmin/static/js/sqleditor/history/query_sources.js b/web/pgadmin/static/js/sqleditor/history/query_sources.js
index a115fa37f..c96f572df 100644
--- a/web/pgadmin/static/js/sqleditor/history/query_sources.js
+++ b/web/pgadmin/static/js/sqleditor/history/query_sources.js
@@ -12,7 +12,7 @@
 
 export const QuerySources = {
   EXECUTE: {
-    ICON_CSS_CLASS: 'fa fa-bolt',
+    ICON_CSS_CLASS: 'fa fa-play',
   },
   EXPLAIN: {
     ICON_CSS_CLASS: 'fa fa-hand-pointer-o',
diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
index fca37c979..67365e395 100644
--- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss
+++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss
@@ -170,7 +170,7 @@
   background-position: center;
   padding: 0px 10px;
 
-  &.fa{
+  &.fa, &.pg-font-icon{
     padding: 0rem 0.25rem 0rem 0rem
   }
 }
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js
index b4258ee59..8436759e7 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js
@@ -113,7 +113,7 @@ define('pgadmin.datagrid', [
           enable: query_tool_menu_enabled,
           priority: 1,
           label: gettext('Query Tool'),
-          icon: 'fa fa-bolt',
+          icon: 'pg-font-icon icon-query-tool',
         }];
 
         // Create context menu
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js b/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js
index 0672cdd56..d45aca55a 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js
@@ -49,7 +49,7 @@ export function setQueryToolDockerTitle(panel, is_query_tool, panel_title, is_fi
   } else {
     // Query tool titles
     panel_tooltip = gettext('Query Tool - ') + panel_title;
-    panel_icon = 'fa fa-bolt';
+    panel_icon = 'pg-font-icon icon-query-tool';
   }
 
   panel.title('<span title="'+ _.escape(panel_tooltip) +'">'+ _.escape(panel_title) +'</span>');
diff --git a/web/regression/feature_utils/locators.py b/web/regression/feature_utils/locators.py
index 847e457d3..3eeb0fa6e 100644
--- a/web/regression/feature_utils/locators.py
+++ b/web/regression/feature_utils/locators.py
@@ -13,7 +13,7 @@ class BrowserToolBarLocators():
     open_query_tool_button_css = \
         ".wcFrameButton[title='Query Tool']:not(.disabled)"
 
-    query_tool_panel_css = ".wcPanelTab .wcTabIcon.fa.fa-bolt"
+    query_tool_panel_css = ".wcPanelTab .wcTabIcon.pg-font-icon.icon-query-tool"
 
     view_table_data_button_css = \
         ".wcFrameButton[title='View Data']:not(.disabled)"
@@ -205,7 +205,7 @@ class QueryToolLocators:
 
     commit_icon = "icon-commit"
 
-    execute_icon = "fa-bolt"
+    execute_icon = "fa-play"
 
     explain_icon = "fa-hand-pointer-o"
 
