diff --git a/src/__fixtures__/confirmation.ts b/src/__fixtures__/confirmation.ts
new file mode 100644
index 00000000..0c3edc01
--- /dev/null
+++ b/src/__fixtures__/confirmation.ts
@@ -0,0 +1,52 @@
+import { ToolConfirmationPauseReason } from "../services/refact";
+
+export const CONFIRMATIONAL_PAUSE_REASONS_WITH_PATH: ToolConfirmationPauseReason[] =
+  [
+    {
+      command: "SELECT *",
+      rule: "*",
+      type: "confirmation",
+      tool_call_id: "1",
+      integr_config_path:
+        "\\\\?\\d:\\work\\refact.ai\\refact-lsp\\.refact\\integrations\\postgres.yaml",
+    },
+  ];
+export const CONFIRMATIONAL_PAUSE_REASONS: ToolConfirmationPauseReason[] = [
+  {
+    command: "patch",
+    rule: "default",
+    type: "confirmation",
+    tool_call_id: "1",
+    integr_config_path: null,
+  },
+];
+
+export const DENIAL_PAUSE_REASONS_WITH_PATH: ToolConfirmationPauseReason[] = [
+  {
+    command: "SELECT *",
+    rule: "*",
+    type: "denial",
+    tool_call_id: "1",
+    integr_config_path:
+      "\\\\?\\d:\\work\\refact.ai\\refact-lsp\\.refact\\integrations\\postgres.yaml",
+  },
+];
+
+export const MIXED_PAUSE_REASONS: ToolConfirmationPauseReason[] = [
+  {
+    command: "SELECT *",
+    rule: "*",
+    type: "denial",
+    tool_call_id: "1",
+    integr_config_path:
+      "\\\\?\\d:\\work\\refact.ai\\refact-lsp\\.refact\\integrations\\postgres.yaml",
+  },
+  {
+    command: "DROP *",
+    rule: "*",
+    type: "confirmation",
+    tool_call_id: "1",
+    integr_config_path:
+      "\\\\?\\d:\\work\\refact.ai\\refact-lsp\\.refact\\integrations\\postgres.yaml",
+  },
+];
diff --git a/src/components/ChatContent/ChatContent.tsx b/src/components/ChatContent/ChatContent.tsx
index 7e786037..a6c825ec 100644
--- a/src/components/ChatContent/ChatContent.tsx
+++ b/src/components/ChatContent/ChatContent.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useRef } from "react";
+import React, { useCallback, useMemo, useRef } from "react";
 import {
   ChatMessages,
   isChatContextFileMessage,
@@ -18,6 +18,7 @@ import { PlainText } from "./PlainText";
 import { useAppDispatch } from "../../hooks";
 import { useAppSelector } from "../../hooks";
 import {
+  selectIntegration,
   selectIsStreaming,
   selectIsWaiting,
   selectMessages,
@@ -49,6 +50,7 @@ export const ChatContent: React.FC<ChatContentProps> = ({
   const isWaiting = useAppSelector(selectIsWaiting);
   const [sendTelemetryEvent] =
     telemetryApi.useLazySendTelemetryChatEventQuery();
+  const integrationMeta = useAppSelector(selectIntegration);
 
   const {
     handleScroll,
@@ -93,6 +95,10 @@ export const ChatContent: React.FC<ChatContentProps> = ({
     });
   }, [onStopStreaming, sendTelemetryEvent]);
 
+  const shouldConfigButtonBeVisible = useMemo(() => {
+    return isConfig && !integrationMeta?.path?.includes("project_summary");
+  }, [isConfig, integrationMeta?.path]);
+
   return (
     <ScrollArea
       ref={scrollRef}
@@ -134,7 +140,7 @@ export const ChatContent: React.FC<ChatContentProps> = ({
                 Stop
               </Button>
             )}
-            {isConfig && (
+            {shouldConfigButtonBeVisible && (
               <Button
                 // ml="auto"
                 color="gray"
diff --git a/src/components/ChatContent/ContextFiles.tsx b/src/components/ChatContent/ContextFiles.tsx
index 47eabcf7..e37192f0 100644
--- a/src/components/ChatContent/ContextFiles.tsx
+++ b/src/components/ChatContent/ContextFiles.tsx
@@ -22,7 +22,7 @@ export const Markdown: React.FC<{
   return (
     <ReactMarkDown
       components={{
-        code({ style: _style, ...codeProps }) {
+        code({ style: _style, color: _color, ...codeProps }) {
           return (
             <MarkdownCodeBlock
               {...codeProps}
diff --git a/src/components/ChatForm/ChatForm.tsx b/src/components/ChatForm/ChatForm.tsx
index 072d4d9c..a0832a39 100644
--- a/src/components/ChatForm/ChatForm.tsx
+++ b/src/components/ChatForm/ChatForm.tsx
@@ -37,6 +37,7 @@ import {
   selectIsStreaming,
   selectIsWaiting,
   selectMessages,
+  selectPreventSend,
   selectToolUse,
 } from "../../features/Chat";
 
@@ -64,12 +65,13 @@ export const ChatForm: React.FC<ChatFormProps> = ({
   const { disableInput } = useAgentUsage();
   const isOnline = useIsOnline();
   const messages = useAppSelector(selectMessages);
+  const preventSend = useAppSelector(selectPreventSend);
 
   const disableSend = useMemo(() => {
     // TODO: if interrupting chat some errors can occur
     if (messages.length === 0) return false;
-    return isWaiting || isStreaming || !isOnline;
-  }, [isOnline, isStreaming, isWaiting, messages]);
+    return isWaiting || isStreaming || !isOnline || preventSend;
+  }, [isOnline, isStreaming, isWaiting, preventSend, messages]);
 
   const { processAndInsertImages } = useAttachedImages();
   const handlePastingFile = useCallback(
diff --git a/src/components/ChatForm/ToolConfirmation.stories.tsx b/src/components/ChatForm/ToolConfirmation.stories.tsx
new file mode 100644
index 00000000..757c3c04
--- /dev/null
+++ b/src/components/ChatForm/ToolConfirmation.stories.tsx
@@ -0,0 +1,75 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { ToolConfirmation } from "./ToolConfirmation";
+import { Provider } from "react-redux";
+import { setUpStore } from "../../app/store";
+import { Theme } from "../Theme";
+import { ToolConfirmationPauseReason } from "../../services/refact";
+import { AbortControllerProvider } from "../../contexts/AbortControllers";
+import {
+  CONFIRMATIONAL_PAUSE_REASONS,
+  CONFIRMATIONAL_PAUSE_REASONS_WITH_PATH,
+  DENIAL_PAUSE_REASONS_WITH_PATH,
+  MIXED_PAUSE_REASONS,
+} from "../../__fixtures__/confirmation";
+
+const MockedStore: React.FC<{
+  pauseReasons: ToolConfirmationPauseReason[];
+}> = ({ pauseReasons }) => {
+  const store = setUpStore({
+    confirmation: {
+      pauseReasons,
+      pause: true,
+      status: {
+        wasInteracted: false,
+        confirmationStatus: false,
+      },
+    },
+  });
+
+  return (
+    <Provider store={store}>
+      <AbortControllerProvider>
+        <Theme accentColor="gray">
+          <ToolConfirmation pauseReasons={pauseReasons} />
+        </Theme>
+      </AbortControllerProvider>
+    </Provider>
+  );
+};
+
+const meta: Meta<typeof MockedStore> = {
+  title: "ToolConfirmation",
+  component: MockedStore,
+  args: {
+    pauseReasons: [],
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    pauseReasons: CONFIRMATIONAL_PAUSE_REASONS_WITH_PATH,
+  },
+};
+
+export const WithDenial: Story = {
+  args: {
+    pauseReasons: DENIAL_PAUSE_REASONS_WITH_PATH,
+  },
+};
+
+export const Patch: Story = {
+  args: {
+    pauseReasons: CONFIRMATIONAL_PAUSE_REASONS,
+  },
+};
+
+export const Mixed: Story = {
+  args: {
+    pauseReasons: MIXED_PAUSE_REASONS,
+  },
+};
diff --git a/src/components/ChatForm/ToolConfirmation.tsx b/src/components/ChatForm/ToolConfirmation.tsx
index dacc0cb3..088f0745 100644
--- a/src/components/ChatForm/ToolConfirmation.tsx
+++ b/src/components/ChatForm/ToolConfirmation.tsx
@@ -91,16 +91,21 @@ export const ToolConfirmation: React.FC<ToolConfirmationProps> = ({
         gap="4"
       >
         <Flex align="start" direction="column" gap="3" maxWidth="100%">
-          <Text className={styles.ToolConfirmationHeading}>
-            🔨 Model {allConfirmational ? "wants" : "tried"} to run:
-          </Text>
+          <Flex
+            align="baseline"
+            gap="1"
+            className={styles.ToolConfirmationHeading}
+          >
+            <Text as="span">⚠️</Text>
+            <Text>Model {allConfirmational ? "wants" : "tried"} to run:</Text>
+          </Flex>
           {commands.map((command, i) => (
             <Markdown
               key={toolCallIds[i]}
             >{`${"```bash\n"}${command}${"\n```"}`}</Markdown>
           ))}
           <Text className={styles.ToolConfirmationText}>
-            <Markdown>{message.concat("\n\n")}</Markdown>
+            <Markdown color="indigo">{message.concat("\n\n")}</Markdown>
             {maybeIntegrationPath && (
               <Text className={styles.ToolConfirmationText} mt="3">
                 You can modify the ruleset on{" "}
@@ -114,6 +119,7 @@ export const ToolConfirmation: React.FC<ToolConfirmationProps> = ({
                       }),
                     );
                   }}
+                  color="indigo"
                 >
                   Configuration Page
                 </Link>
diff --git a/src/components/IntegrationsView/IntegrationForm/IntegrationAvailability.tsx b/src/components/IntegrationsView/IntegrationForm/IntegrationAvailability.tsx
index 7f42e7a4..fac3674f 100644
--- a/src/components/IntegrationsView/IntegrationForm/IntegrationAvailability.tsx
+++ b/src/components/IntegrationsView/IntegrationForm/IntegrationAvailability.tsx
@@ -21,23 +21,26 @@ export const IntegrationAvailability: FC<IntegrationAvailabilityProps> = ({
   // TODO: temporal solution to hide the switch for isolated mode
   if (fieldName === "when_isolated") return null;
 
+  const handleLabelClick = () => {
+    handleSwitchChange(!value);
+  };
+
   return (
     <Flex style={{ marginBottom: "0.75rem" }}>
-      <Flex align="center" justify="between" gap="1">
-        <label htmlFor={`switch-${fieldName}`}>
-          <CustomLabel
-            label={toPascalCase(
-              fieldName === "on_your_laptop" ? "enabled" : "run_in_docker",
-            )}
-          />
-        </label>
+      <Flex align="center" justify="between" gap="3">
         <Switch
           id={`switch-${fieldName}`}
           size="2"
-          ml="2"
           checked={value}
           onCheckedChange={handleSwitchChange}
         />
+        <label htmlFor={`switch-${fieldName}`} onClick={handleLabelClick}>
+          <CustomLabel
+            label={toPascalCase(
+              fieldName === "on_your_laptop" ? "enable" : "run_in_docker",
+            )}
+          />
+        </label>
       </Flex>
     </Flex>
   );
diff --git a/src/components/IntegrationsView/IntegrationForm/IntegrationForm.tsx b/src/components/IntegrationsView/IntegrationForm/IntegrationForm.tsx
index cb8bfb1e..e52aac31 100644
--- a/src/components/IntegrationsView/IntegrationForm/IntegrationForm.tsx
+++ b/src/components/IntegrationsView/IntegrationForm/IntegrationForm.tsx
@@ -215,7 +215,7 @@ export const IntegrationForm: FC<IntegrationFormProps> = ({
   }
 
   return (
-    <Flex width="100%" direction="column" gap="2">
+    <Flex width="100%" direction="column" gap="2" pb="8">
       {integration.data.integr_schema.description && (
         <Text size="2" color="gray" mb="3">
           {integration.data.integr_schema.description}
@@ -227,26 +227,28 @@ export const IntegrationForm: FC<IntegrationFormProps> = ({
         id={`form-${integration.data.integr_name}`}
       >
         <Flex direction="column" gap="2">
-          <Grid mt="2" mb="0">
+          <Grid mb="0">
             {integration.data.integr_values && (
-              <Flex
-                gap="4"
-                mb="4"
-                align="center"
-                justify="between"
-                className={styles.switchInline}
-              >
-                {integration.data.integr_values.available &&
-                  Object.keys(integration.data.integr_values.available).map(
-                    (key) => (
-                      <IntegrationAvailability
-                        key={key}
-                        fieldName={key}
-                        value={availabilityValues[key]}
-                        onChange={handleAvailabilityChange}
-                      />
-                    ),
-                  )}
+              <Flex align="start" justify="between">
+                <Flex
+                  gap="4"
+                  mb="4"
+                  align="center"
+                  justify="between"
+                  className={styles.switchInline}
+                >
+                  {integration.data.integr_values.available &&
+                    Object.keys(integration.data.integr_values.available).map(
+                      (key) => (
+                        <IntegrationAvailability
+                          key={key}
+                          fieldName={key}
+                          value={availabilityValues[key]}
+                          onChange={handleAvailabilityChange}
+                        />
+                      ),
+                    )}
+                </Flex>
                 <IntegrationDeletePopover
                   integrationName={integration.data.integr_name}
                   integrationConfigPath={integration.data.integr_config_path}
@@ -258,11 +260,11 @@ export const IntegrationForm: FC<IntegrationFormProps> = ({
             )}
             {integration.data.integr_schema.smartlinks &&
               integration.data.integr_schema.smartlinks.length > 0 && (
-                <Flex width="100%" direction="column" gap="2" mb="6">
-                  <Heading as="h4" size="3">
-                    Ask AI to do it for you (experimental)
-                  </Heading>
-                  <Flex align="center" gap="2" mt="2" wrap="wrap">
+                <Flex width="100%" direction="column" gap="1" mb="6">
+                  <Flex align="center" gap="3" mt="2" wrap="wrap">
+                    <Heading as="h6" size="2" weight="medium">
+                      Actions:
+                    </Heading>
                     {integration.data.integr_schema.smartlinks.map(
                       (smartlink, index) => {
                         return (
@@ -281,7 +283,10 @@ export const IntegrationForm: FC<IntegrationFormProps> = ({
                             shouldBeDisabled={
                               smartlink.sl_enable_only_with_tool
                                 ? integration.data?.integr_values === null ||
-                                  !shouldIntegrationFormBeDisabled
+                                  !shouldIntegrationFormBeDisabled ||
+                                  Object.values(availabilityValues).every(
+                                    (value) => !value,
+                                  )
                                 : false
                             }
                           />
@@ -329,7 +334,10 @@ export const IntegrationForm: FC<IntegrationFormProps> = ({
               size="2"
               onClick={() => setAreExtraFieldsRevealed((prev) => !prev)}
               mb="1"
-              mt="3"
+              mt={{
+                initial: "3",
+                xs: "0",
+              }}
               className={styles.advancedButton}
             >
               {areExtraFieldsRevealed
diff --git a/src/components/IntegrationsView/IntegrationsHeader.module.css b/src/components/IntegrationsView/IntegrationsHeader.module.css
index 9a515181..47789272 100644
--- a/src/components/IntegrationsView/IntegrationsHeader.module.css
+++ b/src/components/IntegrationsView/IntegrationsHeader.module.css
@@ -3,8 +3,6 @@
   top: 0;
   left: 0;
   width: 100%;
-  height: 80px;
-  border-bottom: 1px solid var(--mauve-a10);
   z-index: 1000;
 }
 
diff --git a/src/components/IntegrationsView/IntegrationsHeader.tsx b/src/components/IntegrationsView/IntegrationsHeader.tsx
index 04775083..82f4f8a9 100644
--- a/src/components/IntegrationsView/IntegrationsHeader.tsx
+++ b/src/components/IntegrationsView/IntegrationsHeader.tsx
@@ -34,12 +34,12 @@ export const IntegrationsHeader: FC<IntegrationsHeaderProps> = ({
   };
 
   return (
-    <Flex className={styles.IntegrationsHeader} px={leftRightPadding}>
+    <Flex className={styles.IntegrationsHeader} px={leftRightPadding} pt="5">
       <Flex align="center" justify="between" width="100%" px={leftRightPadding}>
         <Flex
           gap={{
             initial: "3",
-            xs: "4",
+            xs: "5",
           }}
           align="center"
         >
@@ -53,19 +53,20 @@ export const IntegrationsHeader: FC<IntegrationsHeaderProps> = ({
               <ArrowLeftIcon width="16" height="16" />
             </IconButton>
           )}
-          <img
-            src={icon}
-            className={styles.IntegrationsHeaderIcon}
-            alt={integrationName}
-          />
-          <Heading as="h5" size="3">
-            Setup{" "}
-            {integrationName.includes("TEMPLATE")
-              ? integrationName.startsWith("cmdline")
-                ? "Command Line Tool"
-                : "Command Line Service"
-              : toPascalCase(integrationName)}
-          </Heading>
+          <Flex gap="2" align="center" mt={width > 500 ? "1" : "0"}>
+            <img
+              src={icon}
+              className={styles.IntegrationsHeaderIcon}
+              alt={integrationName}
+            />
+            <Heading as="h5" size="3">
+              {integrationName.includes("TEMPLATE")
+                ? integrationName.startsWith("cmdline")
+                  ? "Command Line Tool"
+                  : "Command Line Service"
+                : toPascalCase(integrationName)}
+            </Heading>
+          </Flex>
         </Flex>
       </Flex>
     </Flex>
diff --git a/src/components/Markdown/CodeBlock.tsx b/src/components/Markdown/CodeBlock.tsx
index 76da4350..7d8f075f 100644
--- a/src/components/Markdown/CodeBlock.tsx
+++ b/src/components/Markdown/CodeBlock.tsx
@@ -2,7 +2,7 @@ import React, { CSSProperties } from "react";
 import SyntaxHighlighter, {
   type SyntaxHighlighterProps,
 } from "react-syntax-highlighter";
-import { Code, Text } from "@radix-ui/themes";
+import { Code, CodeProps, Text } from "@radix-ui/themes";
 import classNames from "classnames";
 import { PreTag, PreTagProps } from "./Pre";
 // import "./highlightjs.css";
@@ -19,6 +19,7 @@ export type MarkdownCodeBlockProps = React.JSX.IntrinsicElements["code"] & {
   node?: Element | undefined;
   style?: Record<string, CSSProperties> | SyntaxHighlighterProps["style"];
   wrap?: boolean;
+  color?: CodeProps["color"];
 } & Pick<
     SyntaxHighlighterProps,
     "showLineNumbers" | "startingLineNumber" | "useInlineStyles"
@@ -31,6 +32,7 @@ const _MarkdownCodeBlock: React.FC<MarkdownCodeBlockProps> = ({
   style = hljsStyle,
   onCopyClick,
   wrap = false,
+  color = undefined,
 }) => {
   const codeRef = React.useRef<HTMLElement | null>(null);
   const match = /language-(\w+)/.exec(className ?? "");
@@ -76,7 +78,10 @@ const _MarkdownCodeBlock: React.FC<MarkdownCodeBlockProps> = ({
   }
 
   return (
-    <Code className={classNames(styles.code, styles.code_inline, className)}>
+    <Code
+      className={classNames(styles.code, styles.code_inline, className)}
+      color={color}
+    >
       {children}
     </Code>
   );
diff --git a/src/components/Markdown/Markdown.tsx b/src/components/Markdown/Markdown.tsx
index 6820ce2e..c5861c55 100644
--- a/src/components/Markdown/Markdown.tsx
+++ b/src/components/Markdown/Markdown.tsx
@@ -52,7 +52,11 @@ export type MarkdownProps = Pick<
 > &
   Pick<
     MarkdownCodeBlockProps,
-    "startingLineNumber" | "showLineNumbers" | "useInlineStyles" | "style"
+    | "startingLineNumber"
+    | "showLineNumbers"
+    | "useInlineStyles"
+    | "style"
+    | "color"
   > & {
     canHaveInteractiveElements?: boolean;
     wrap?: boolean;
@@ -237,6 +241,7 @@ const _Markdown: React.FC<MarkdownProps> = ({
   allowedElements,
   unwrapDisallowed,
   canHaveInteractiveElements,
+  color,
   ...rest
 }) => {
   const components: Partial<Components> = useMemo(() => {
@@ -251,8 +256,8 @@ const _Markdown: React.FC<MarkdownProps> = ({
           <ul {...props} className={classNames(styles.list, props.className)} />
         );
       },
-      code({ style: _style, ...props }) {
-        return <MarkdownCodeBlock {...props} {...rest} />;
+      code({ style: _style, color: _color, ...props }) {
+        return <MarkdownCodeBlock color={color} {...props} {...rest} />;
       },
       p({ color: _color, ref: _ref, node: _node, ...props }) {
         if (canHaveInteractiveElements) {
@@ -329,7 +334,7 @@ const _Markdown: React.FC<MarkdownProps> = ({
         return <Table.Cell {...props} />;
       },
     };
-  }, [rest, canHaveInteractiveElements]);
+  }, [rest, canHaveInteractiveElements, color]);
   return (
     <ReactMarkdown
       className={styles.markdown}
diff --git a/src/features/App.tsx b/src/features/App.tsx
index 26353d43..36890f73 100644
--- a/src/features/App.tsx
+++ b/src/features/App.tsx
@@ -172,7 +172,7 @@ export const InnerApp: React.FC<AppProps> = ({ style }: AppProps) => {
         alignItems: "stretch",
         height:
           page.name === "integrations page" && isPaddingApplied
-            ? "calc(100vh - 80px)"
+            ? "calc(100vh - 50px)"
             : "100vh",
         ...style,
       }}
diff --git a/src/features/Integrations/Integrations.tsx b/src/features/Integrations/Integrations.tsx
index 625fd51b..dcfbadcf 100644
--- a/src/features/Integrations/Integrations.tsx
+++ b/src/features/Integrations/Integrations.tsx
@@ -69,7 +69,7 @@ export const Integrations: React.FC<IntegrationsProps> = ({
       host={host}
       style={{
         padding: 0,
-        marginTop: isInnerIntegrationSelected ? 80 : 0,
+        marginTop: isInnerIntegrationSelected ? 50 : 0,
       }}
     >
       {!isInnerIntegrationSelected && (
diff --git a/src/features/Integrations/renderIntegrationFormField.module.css b/src/features/Integrations/renderIntegrationFormField.module.css
index aaa6ca3d..bb209c68 100644
--- a/src/features/Integrations/renderIntegrationFormField.module.css
+++ b/src/features/Integrations/renderIntegrationFormField.module.css
@@ -1,7 +1,7 @@
 @media screen and (min-width: 424px) {
   .flexField {
     flex-direction: row;
-    margin-bottom: 15px;
+    /* margin-bottom: 15px; */
   }
   .flexLabel {
     width: 200px;
diff --git a/src/hooks/useSendChatRequest.ts b/src/hooks/useSendChatRequest.ts
index 881314d8..c0f3aeaf 100644
--- a/src/hooks/useSendChatRequest.ts
+++ b/src/hooks/useSendChatRequest.ts
@@ -354,7 +354,7 @@ export function useAutoSend() {
         lastMessage.tool_calls &&
         lastMessage.tool_calls.length > 0
       ) {
-        if (!isIntegration && !wasInteracted) {
+        if (!isIntegration && !wasInteracted && !areToolsConfirmed) {
           abort();
           if (recallCounter < 1) {
             recallCounter++;