diff --git a/docs/en_US/images/editgrid.png b/docs/en_US/images/editgrid.png
index a4b4dc32d4d..41570cabd17 100644
Binary files a/docs/en_US/images/editgrid.png and b/docs/en_US/images/editgrid.png differ
diff --git a/docs/en_US/images/geometry_viewer.png b/docs/en_US/images/geometry_viewer.png
index 8ecad50ea88..6d1a4c5104f 100644
Binary files a/docs/en_US/images/geometry_viewer.png and b/docs/en_US/images/geometry_viewer.png differ
diff --git a/docs/en_US/images/query_execute_query.png b/docs/en_US/images/query_execute_query.png
index 8d883674069..1e5c93a7785 100644
Binary files a/docs/en_US/images/query_execute_query.png and b/docs/en_US/images/query_execute_query.png differ
diff --git a/docs/en_US/images/query_execute_script.png b/docs/en_US/images/query_execute_script.png
index 2f3b28844e6..b503d4202f8 100644
Binary files a/docs/en_US/images/query_execute_script.png and b/docs/en_US/images/query_execute_script.png differ
diff --git a/docs/en_US/images/query_output_data.png b/docs/en_US/images/query_output_data.png
index 36575f1c98f..c75bb29e343 100644
Binary files a/docs/en_US/images/query_output_data.png and b/docs/en_US/images/query_output_data.png differ
diff --git a/docs/en_US/images/query_tool_editable_columns.png b/docs/en_US/images/query_tool_editable_columns.png
index 21e2784ee87..1ca71dd158a 100644
Binary files a/docs/en_US/images/query_tool_editable_columns.png and b/docs/en_US/images/query_tool_editable_columns.png differ
diff --git a/web/pgadmin/static/js/tree/tree.js b/web/pgadmin/static/js/tree/tree.js
index fc665389935..67d649b5a48 100644
--- a/web/pgadmin/static/js/tree/tree.js
+++ b/web/pgadmin/static/js/tree/tree.js
@@ -477,7 +477,7 @@ export class Tree {
     let result = {};
     if (identifier === undefined) return;
     let item = TreeNode.prototype.isPrototypeOf(identifier) ? identifier : this.findNode(identifier.path);
-    if (item === undefined) return;
+    if (item === undefined || item === null) return;
     do {
       const currentNodeData = item.getData();
       if (currentNodeData._type in this.Nodes && this.Nodes[currentNodeData._type].hasId) {
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
index a8c8766a285..a3c6d99dcd1 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
@@ -53,6 +53,8 @@ const StyledPgReactDataGrid = styled(PgReactDataGrid)(({theme})=>({
   },
   '& .QueryTool-rowNumCell': {
     padding: '0px 8px',
+    fontWeight: 900,
+    color: theme.otherVars.tree.textFg,
   },
   '& .QueryTool-colHeaderSelected': {
     outlineColor: theme.palette.primary.main,
@@ -63,7 +65,15 @@ const StyledPgReactDataGrid = styled(PgReactDataGrid)(({theme})=>({
     outlineColor: theme.palette.primary.main,
     backgroundColor: theme.palette.primary.light,
     color: theme.otherVars.qtDatagridSelectFg,
-  }
+  },
+  '& .rdg-row': {
+    '&:nth-of-type(even)': {
+      backgroundColor: theme.palette.grey[200],
+    },
+    '& .rdg-cell:nth-of-type(1)': {
+      backgroundColor: theme.palette.background.default + ' !important',
+    },
+  },
 }));
 
 export const RowInfoContext = React.createContext();