diff --git a/web/pgadmin/static/js/Theme/overrides/jsoneditor.override.js b/web/pgadmin/static/js/Theme/overrides/jsoneditor.override.js
index 8547555d1..9e7ae5c59 100644
--- a/web/pgadmin/static/js/Theme/overrides/jsoneditor.override.js
+++ b/web/pgadmin/static/js/Theme/overrides/jsoneditor.override.js
@@ -200,7 +200,7 @@ export default function jsonEditorOverride(theme) {
 
     /* Set expand icon to none*/
     'div.jsoneditor-tree button.jsoneditor-button:focus': {
-      backgroundColor: theme.palette.text.primary + ' !important',
+      backgroundColor: theme.palette.background.default + ' !important',
       outline: 'none',
     },
 
@@ -252,7 +252,7 @@ export default function jsonEditorOverride(theme) {
       },
       '& .ace_marker-layer .ace_selected-word, & .ace_marker-layer .ace_selection': {
         border: `1px solid ${theme.palette.primary.light}`,
-
+        backgroundColor: theme.otherVars.editor.selectionBg,
       },
 
 
@@ -302,13 +302,17 @@ export default function jsonEditorOverride(theme) {
       fontFamily: theme.typography.fontFamily + ' !important',
       fontSize: '.875rem !important',
       fontWeight: 'bold',
-      backgroundColor: theme.palette.primary.main + ' !important',
-      color: theme.palette.text.primary,
+      backgroundColor: theme.palette.background.default + ' !important',
+      color: theme.palette.text.primary + ' !important',
+      borderBottom: `1px solid ${theme.otherVars.borderColor}`,
     },
 
     /* Body */
     '.pico-content': {
       backgroundColor: theme.palette.background.default + ' !important',
+      '& .pico-close':{
+        color: theme.palette.text.primary + ' !important',
+      }
     },
 
     /* Disable links */
diff --git a/web/pgadmin/static/js/components/Table.jsx b/web/pgadmin/static/js/components/Table.jsx
index 531622bc2..29e2ad979 100644
--- a/web/pgadmin/static/js/components/Table.jsx
+++ b/web/pgadmin/static/js/components/Table.jsx
@@ -20,7 +20,7 @@ const StyledTable = styled('table')(({theme})=>({
   '& tbody td, & thead th': {
     margin: 0,
     padding: theme.spacing(0.5),
-    border: '1px solid '+theme.otherVars.borderColor,
+    border: '1px solid '+ theme.otherVars.borderColor,
     borderBottom: 'none',
     position: 'relative',
     overflow: 'hidden',
diff --git a/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx b/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
index f537b2b68..b989662a1 100644
--- a/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
+++ b/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
@@ -45,6 +45,10 @@ const StyledBox = styled(Box)(({theme}) => ({
     flexDirection: 'column',
     height: '100%',
     minHeight: 0,
+    '& .DebuggerArgument-schema': {
+      padding: 0 + ' !important',
+      backgroundColor: theme.palette.background.default,
+    }
   },
   '& .DebuggerArgument-footer': {
     borderTop: `1px solid ${theme.otherVars.inputBorderColor} !important`,
@@ -810,6 +814,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
               showFooter={false}
               isTabView={false}
               Notifier={pgAdmin.Browser.notifier}
+              formClassName='DebuggerArgument-schema'
               onDataChange={(isChanged, changedData) => {
                 let isValid = false;
                 let skipStep = false;
diff --git a/web/pgadmin/tools/schema_diff/static/js/components/ResultGridComponent.jsx b/web/pgadmin/tools/schema_diff/static/js/components/ResultGridComponent.jsx
index bebc4023a..38d73a929 100644
--- a/web/pgadmin/tools/schema_diff/static/js/components/ResultGridComponent.jsx
+++ b/web/pgadmin/tools/schema_diff/static/js/components/ResultGridComponent.jsx
@@ -82,6 +82,7 @@ const StyledBox = styled(Box)(({theme}) => ({
         },
         '&[aria-selected=true][aria-colindex="1"]': {
           outlineWidth: 0,
+          backgroundColor: theme.palette.default.main + ' !important'
         },
         '& .ResultGridComponent-cellExpand': {
           display: 'table',