diff --git a/core/index.d.ts b/core/index.d.ts
index 6b0844d0289..195f2331919 100644
--- a/core/index.d.ts
+++ b/core/index.d.ts
@@ -1103,6 +1103,7 @@ export interface Tool {
     basePolicy: ToolPolicy,
     parsedArgs: Record<string, unknown>,
   ) => ToolPolicy;
+  displayToolArgs?: boolean;
 }
 
 interface ToolChoice {
diff --git a/core/tools/definitions/editFile.ts b/core/tools/definitions/editFile.ts
index 9ca5b6b631f..f56da789c7f 100644
--- a/core/tools/definitions/editFile.ts
+++ b/core/tools/definitions/editFile.ts
@@ -17,8 +17,8 @@ export const editFileTool: Tool = {
   type: "function",
   displayTitle: "Edit File",
   wouldLikeTo: "edit {{{ filepath }}}",
-  isCurrently: "editing {{{ filepath }}}",
-  hasAlready: "edited {{{ filepath }}}",
+  isCurrently: "editing a file",
+  hasAlready: "edited a file",
   group: BUILT_IN_GROUP_NAME,
   readonly: false,
   isInstant: false,
@@ -56,4 +56,5 @@ For example:`,
       ],
     ],
   },
+  displayToolArgs: false,
 };
diff --git a/gui/src/components/StyledMarkdownPreview/index.tsx b/gui/src/components/StyledMarkdownPreview/index.tsx
index 7e87279a011..ad52b2492a5 100644
--- a/gui/src/components/StyledMarkdownPreview/index.tsx
+++ b/gui/src/components/StyledMarkdownPreview/index.tsx
@@ -36,6 +36,7 @@ const StyledMarkdown = styled.div<{
   fontSize?: number;
   whiteSpace: string;
   bgColor: string;
+  padding: number;
 }>`
   h1 {
     font-size: 1.25em;
@@ -103,8 +104,8 @@ const StyledMarkdown = styled.div<{
     "Helvetica Neue",
     sans-serif;
   font-size: ${(props) => props.fontSize || getFontSize()}px;
-  padding-left: 8px;
-  padding-right: 8px;
+  padding-left: ${(props) => props.padding}px;
+  padding-right: ${(props) => props.padding}px;
   color: ${vscForeground};
 
   p,
@@ -135,6 +136,7 @@ interface StyledMarkdownPreviewProps {
   toolCallId?: string;
   expandCodeblocks?: boolean;
   collapsible?: boolean;
+  padding?: boolean;
 }
 
 const HLJS_LANGUAGE_CLASSNAME_PREFIX = "language-";
@@ -366,6 +368,7 @@ const StyledMarkdownPreview = memo(function StyledMarkdownPreview(
       fontSize={getFontSize()}
       whiteSpace={codeWrapState}
       bgColor={props.useParentBackgroundColor ? "" : vscBackground}
+      padding={(props.padding ?? true) ? 8 : 0}
     >
       {reactContent}
     </StyledMarkdown>
diff --git a/gui/src/pages/gui/ToolCallDiv/CreateFile.tsx b/gui/src/pages/gui/ToolCallDiv/CreateFile.tsx
index d0a8431042a..7339ac15f9e 100644
--- a/gui/src/pages/gui/ToolCallDiv/CreateFile.tsx
+++ b/gui/src/pages/gui/ToolCallDiv/CreateFile.tsx
@@ -20,6 +20,7 @@ export function CreateFile(props: CreateFileToolCallProps) {
       disableManualApply
       source={src}
       itemIndex={props.historyIndex}
+      padding={false}
     />
   ) : null;
 }
diff --git a/gui/src/pages/gui/ToolCallDiv/EditFile.tsx b/gui/src/pages/gui/ToolCallDiv/EditFile.tsx
index eaa614a44b2..a7ca6186394 100644
--- a/gui/src/pages/gui/ToolCallDiv/EditFile.tsx
+++ b/gui/src/pages/gui/ToolCallDiv/EditFile.tsx
@@ -29,6 +29,7 @@ export function EditFile(props: EditToolCallProps) {
       toolCallId={props.toolCallId}
       itemIndex={props.historyIndex}
       collapsible={true}
+      padding={false}
     />
   );
 }
diff --git a/gui/src/pages/gui/ToolCallDiv/ToolCallDisplay.tsx b/gui/src/pages/gui/ToolCallDiv/ToolCallDisplay.tsx
index 9eaf1f62a25..bd8f8884a20 100644
--- a/gui/src/pages/gui/ToolCallDiv/ToolCallDisplay.tsx
+++ b/gui/src/pages/gui/ToolCallDiv/ToolCallDisplay.tsx
@@ -23,7 +23,7 @@ export function ToolCallDisplay({
 
   const args: [string, any][] = useMemo(() => {
     return Object.entries(toolCallState.parsedArgs);
-  }, [toolCallState.parsedArgs]);
+  }, [toolCallState.parsedArgs, tool?.displayToolArgs]);
 
   return (
     <div className="flex flex-col justify-center px-4">
@@ -42,7 +42,7 @@ export function ToolCallDisplay({
             {!!toolCallState.output && (
               <ToolTruncateHistoryIcon historyIndex={historyIndex} />
             )}
-            {!!args.length ? (
+            {!!args.length && (tool?.displayToolArgs ?? true) ? (
               <ArgsToggleIcon
                 isShowing={argsExpanded}
                 setIsShowing={setArgsExpanded}