diff --git a/docs/en_US/images/dashboard_stat.png b/docs/en_US/images/dashboard_stat.png
index c2c754b11..3e326f71a 100644
Binary files a/docs/en_US/images/dashboard_stat.png and b/docs/en_US/images/dashboard_stat.png differ
diff --git a/docs/en_US/images/debug_error_message.png b/docs/en_US/images/debug_error_message.png
index 9ae050caa..0c1b455e4 100644
Binary files a/docs/en_US/images/debug_error_message.png and b/docs/en_US/images/debug_error_message.png differ
diff --git a/docs/en_US/images/debug_ic_step_in.png b/docs/en_US/images/debug_ic_step_in.png
index a49498d6e..c1a6c86a1 100644
Binary files a/docs/en_US/images/debug_ic_step_in.png and b/docs/en_US/images/debug_ic_step_in.png differ
diff --git a/docs/en_US/images/debug_main.png b/docs/en_US/images/debug_main.png
index 69ed72456..acc6ab583 100644
Binary files a/docs/en_US/images/debug_main.png and b/docs/en_US/images/debug_main.png differ
diff --git a/docs/en_US/images/debug_set_breakpoint.png b/docs/en_US/images/debug_set_breakpoint.png
index deedf6865..4b6e12a77 100644
Binary files a/docs/en_US/images/debug_set_breakpoint.png and b/docs/en_US/images/debug_set_breakpoint.png differ
diff --git a/docs/en_US/images/debug_stack.png b/docs/en_US/images/debug_stack.png
index 686a462a7..a834e368f 100644
Binary files a/docs/en_US/images/debug_stack.png and b/docs/en_US/images/debug_stack.png differ
diff --git a/docs/en_US/images/debug_step_in.png b/docs/en_US/images/debug_step_in.png
index a49498d6e..c1a6c86a1 100644
Binary files a/docs/en_US/images/debug_step_in.png and b/docs/en_US/images/debug_step_in.png differ
diff --git a/docs/en_US/images/debug_toolbar.png b/docs/en_US/images/debug_toolbar.png
index 742900897..301e79157 100644
Binary files a/docs/en_US/images/debug_toolbar.png and b/docs/en_US/images/debug_toolbar.png differ
diff --git a/docs/en_US/images/processes_main.png b/docs/en_US/images/processes_main.png
index 37d713902..688b9a49c 100644
Binary files a/docs/en_US/images/processes_main.png and b/docs/en_US/images/processes_main.png differ
diff --git a/docs/en_US/images/query_editing.png b/docs/en_US/images/query_editing.png
index e5e9df2a7..7e757775f 100644
Binary files a/docs/en_US/images/query_editing.png and b/docs/en_US/images/query_editing.png differ
diff --git a/docs/en_US/images/query_execution.png b/docs/en_US/images/query_execution.png
index ef44b4aec..05242f6c5 100644
Binary files a/docs/en_US/images/query_execution.png and b/docs/en_US/images/query_execution.png differ
diff --git a/docs/en_US/images/query_toolbar.png b/docs/en_US/images/query_toolbar.png
index caeac2037..33d123b10 100644
Binary files a/docs/en_US/images/query_toolbar.png and b/docs/en_US/images/query_toolbar.png differ
diff --git a/web/pgadmin/dashboard/static/js/Dashboard.jsx b/web/pgadmin/dashboard/static/js/Dashboard.jsx
index 09f318553..634103568 100644
--- a/web/pgadmin/dashboard/static/js/Dashboard.jsx
+++ b/web/pgadmin/dashboard/static/js/Dashboard.jsx
@@ -18,7 +18,7 @@ import Graphs from './Graphs';
 import { Box, Tab, Tabs } from '@mui/material';
 import { PgIconButton } from '../../../static/js/components/Buttons';
 import CancelIcon from '@mui/icons-material/Cancel';
-import StopSharpIcon from '@mui/icons-material/StopSharp';
+import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
 import WelcomeDashboard from './WelcomeDashboard';
 import ActiveQuery from './ActiveQuery.ui';
 import ServerLog from './ServerLog.ui';
@@ -198,7 +198,7 @@ function getCancelCell(pgAdmin, sid, did, canTakeAction, onSuccess) {
       <PgIconButton
         size="xs"
         noBorder
-        icon={<StopSharpIcon/>}
+        icon={<StopCircleOutlinedIcon/>}
         onClick={() => {
           if (!canTakeAction(row, 'cancel'))
             return;
diff --git a/web/pgadmin/misc/bgprocess/static/js/Processes.jsx b/web/pgadmin/misc/bgprocess/static/js/Processes.jsx
index 69e98b165..da6a2ee24 100644
--- a/web/pgadmin/misc/bgprocess/static/js/Processes.jsx
+++ b/web/pgadmin/misc/bgprocess/static/js/Processes.jsx
@@ -14,7 +14,7 @@ import gettext from 'sources/gettext';
 import PropTypes from 'prop-types';
 import { BgProcessManagerEvents, BgProcessManagerProcessState } from './BgProcessConstants';
 import { PgButtonGroup, PgIconButton } from '../../../../static/js/components/Buttons';
-import CancelIcon from '@mui/icons-material/Cancel';
+import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
 import DescriptionOutlinedIcon from '@mui/icons-material/DescriptionOutlined';
 import DeleteIcon from '@mui/icons-material/Delete';
 import HelpIcon from '@mui/icons-material/HelpRounded';
@@ -76,7 +76,7 @@ function CancelCell({row}) {
     <PgIconButton
       size="xs"
       noBorder
-      icon={<CancelIcon />}
+      icon={<StopCircleOutlinedIcon />}
       className='Processes-stopButton'
       disabled={row.original.process_state != BgProcessManagerProcessState.PROCESS_STARTED
         || row.original.server_id != null}
diff --git a/web/pgadmin/tools/debugger/static/js/components/ToolBar.jsx b/web/pgadmin/tools/debugger/static/js/components/ToolBar.jsx
index 663bf5e6a..38a8c0fcf 100644
--- a/web/pgadmin/tools/debugger/static/js/components/ToolBar.jsx
+++ b/web/pgadmin/tools/debugger/static/js/components/ToolBar.jsx
@@ -17,7 +17,7 @@ import FormatIndentDecreaseIcon from '@mui/icons-material/FormatIndentDecrease';
 import PlayCircleFilledWhiteIcon from '@mui/icons-material/PlayCircleFilledWhite';
 import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
 import NotInterestedIcon from '@mui/icons-material/NotInterested';
-import StopIcon from '@mui/icons-material/Stop';
+import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
 import HelpIcon from '@mui/icons-material/HelpRounded';
 import RotateLeftRoundedIcon from '@mui/icons-material/RotateLeftRounded';
 
@@ -180,7 +180,7 @@ export function ToolBar() {
           }} />
       </PgButtonGroup>
       <PgButtonGroup size="small">
-        <PgIconButton data-test='stop-debugger' title={gettext('Stop')} icon={<StopIcon style={{height: '2rem'}} />} disabled={buttonsDisabled[MENUS.STOP]} onClick={() => { stop(); }}
+        <PgIconButton data-test='stop-debugger' title={gettext('Stop')} icon={<StopCircleOutlinedIcon style={{height: '2rem'}} />} disabled={buttonsDisabled[MENUS.STOP]} onClick={() => { stop(); }}
           shortcut={preferences?.btn_stop} />
       </PgButtonGroup>
       <PgButtonGroup size="small">
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx
index 0b7eb2149..43664535a 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx
@@ -13,7 +13,7 @@ import { PgButtonGroup, PgIconButton } from '../../../../../../static/js/compone
 import FolderRoundedIcon from '@mui/icons-material/FolderRounded';
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import SaveRoundedIcon from '@mui/icons-material/SaveRounded';
-import StopRoundedIcon from '@mui/icons-material/StopRounded';
+import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
 import PlayArrowRoundedIcon from '@mui/icons-material/PlayArrowRounded';
 import { FilterIcon, CommitIcon, RollbackIcon, ExecuteQueryIcon } from '../../../../../../static/js/components/ExternalIcon';
 import EditRoundedIcon from '@mui/icons-material/EditRounded';
@@ -535,7 +535,7 @@ export function MainToolBar({containerRef, onFilterClick, onManageMacros, onAddT
           {label: gettext('100 rows'), value: '100'},
         ]} value={limit} onChange={onLimitChange} disabled={buttonsDisabled['limit'] || queryToolCtx.params.is_query_tool} />
         <PgButtonGroup size="small">
-          <PgIconButton title={gettext('Cancel query')} icon={<StopRoundedIcon style={{height: 'unset'}} />}
+          <PgIconButton title={gettext('Cancel query')} icon={<StopCircleOutlinedIcon style={{height: 'unset'}} />}
             onClick={cancelQuery} disabled={buttonsDisabled['cancel']} shortcut={queryToolPref.btn_cancel_query} />
           <PgIconButton title={gettext('Execute script')} icon={<PlayArrowRoundedIcon style={{height: 'unset'}} />}
             onClick={executeScript} disabled={buttonsDisabled['execute']} shortcut={queryToolPref.execute_script}/>