diff --git a/packages/jupyter-ai/src/components/code-blocks/code-toolbar.tsx b/packages/jupyter-ai/src/components/code-blocks/code-toolbar.tsx
index ccb46eb40..315e5d4d6 100644
--- a/packages/jupyter-ai/src/components/code-blocks/code-toolbar.tsx
+++ b/packages/jupyter-ai/src/components/code-blocks/code-toolbar.tsx
@@ -44,7 +44,7 @@ export function CodeToolbar(props: CodeToolbarProps): JSX.Element {
         display: 'flex',
         justifyContent: 'flex-end',
         alignItems: 'center',
-        padding: '6px 2px',
+        padding: '2px 2px',
         marginBottom: '1em',
         border: '1px solid var(--jp-cell-editor-border-color)',
         borderTop: 'none'
diff --git a/packages/jupyter-ai/src/components/mui-extras/tooltipped-icon-button.tsx b/packages/jupyter-ai/src/components/mui-extras/tooltipped-icon-button.tsx
index 31279b4d9..e379ab39e 100644
--- a/packages/jupyter-ai/src/components/mui-extras/tooltipped-icon-button.tsx
+++ b/packages/jupyter-ai/src/components/mui-extras/tooltipped-icon-button.tsx
@@ -80,6 +80,7 @@ export function TooltippedIconButton(
           onClick={props.onClick}
           disabled={props.disabled}
           sx={{
+            ml: '8px',
             lineHeight: 0,
             ...(props.disabled && { opacity: 0.5 }),
             ...props.sx