diff --git a/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputSchemaDisplay.tsx b/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputSchemaDisplay.tsx
index 135c21a1141..3791550edf4 100644
--- a/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputSchemaDisplay.tsx
+++ b/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputSchemaDisplay.tsx
@@ -1,9 +1,16 @@
 import {Button} from '@/components/ui/button';
-import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
+import {ButtonGroup} from '@/components/ui/button-group';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuGroup,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu';
 import PropertyField from '@/pages/platform/workflow-editor/components/PropertyField';
 import SchemaProperties from '@/pages/platform/workflow-editor/components/SchemaProperties';
 import {PropertyAllType} from '@/shared/types';
-import {ChevronDownIcon, PenIcon} from 'lucide-react';
+import {MoreHorizontalIcon} from 'lucide-react';
 
 interface OutputSchemaDisplayProps {
     connectionMissing: boolean;
@@ -40,33 +47,63 @@ const OutputSchemaDisplay = ({
             <div className="mb-2 flex items-center justify-between">
                 <h3 className="text-sm text-gray-500">Output Schema</h3>
 
-                <DropdownMenu>
-                    <DropdownMenuTrigger asChild>
-                        <Button disabled={saveWorkflowNodeTestOutputMutation.isPending} size="sm" variant="outline">
-                            <PenIcon /> Define <ChevronDownIcon className="ml-0.5" />
+                <ButtonGroup>
+                    {!variablePropertiesDefined && (
+                        <Button
+                            disabled={connectionMissing || saveWorkflowNodeTestOutputMutation.isPending}
+                            onClick={handleTestOperationClick}
+                            variant="outline"
+                        >
+                            {`Test ${currentNode.trigger ? 'Trigger' : 'Action'}`}
                         </Button>
-                    </DropdownMenuTrigger>
+                    )}
 
-                    <DropdownMenuContent align="end" className="w-60 cursor-pointer">
-                        {!variablePropertiesDefined && (
-                            <DropdownMenuItem
-                                className="cursor-pointer"
-                                disabled={connectionMissing}
-                                onClick={handleTestOperationClick}
+                    {variablePropertiesDefined && (
+                        <Button
+                            disabled={saveWorkflowNodeTestOutputMutation.isPending}
+                            onClick={() => setShowUploadDialog(true)}
+                            variant="outline"
+                        >
+                            Upload Sample Output
+                        </Button>
+                    )}
+
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button
+                                aria-label="More Options"
+                                asChild
+                                disabled={saveWorkflowNodeTestOutputMutation.isPending}
+                                size="icon"
+                                variant="outline"
                             >
-                                {`Test ${currentNode.trigger ? 'Trigger' : 'Action'}`}
-                            </DropdownMenuItem>
-                        )}
+                                <span>
+                                    <MoreHorizontalIcon />
+                                </span>
+                            </Button>
+                        </DropdownMenuTrigger>
 
-                        <DropdownMenuItem className="cursor-pointer" onClick={() => setShowUploadDialog(true)}>
-                            Upload Sample Output Data
-                        </DropdownMenuItem>
+                        <DropdownMenuContent align="end" className="w-52">
+                            <DropdownMenuGroup>
+                                {!variablePropertiesDefined && (
+                                    <DropdownMenuItem
+                                        className="cursor-pointer"
+                                        onClick={() => setShowUploadDialog(true)}
+                                    >
+                                        Upload Sample Output
+                                    </DropdownMenuItem>
+                                )}
 
-                        <DropdownMenuItem className="cursor-pointer" onClick={handlePredefinedOutputSchemaClick}>
-                            Reset
-                        </DropdownMenuItem>
-                    </DropdownMenuContent>
-                </DropdownMenu>
+                                <DropdownMenuItem
+                                    className="cursor-pointer"
+                                    onClick={handlePredefinedOutputSchemaClick}
+                                >
+                                    Reset
+                                </DropdownMenuItem>
+                            </DropdownMenuGroup>
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                </ButtonGroup>
             </div>
 
             <PropertyField
diff --git a/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTab.tsx b/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTab.tsx
index 0b6459f2d22..5832310642f 100644
--- a/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTab.tsx
+++ b/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTab.tsx
@@ -270,7 +270,7 @@ const OutputTab = ({connectionMissing, currentNode, variablePropertiesDefined =
                         >
                             <div
                                 className={twMerge(
-                                    'flex items-center justify-center',
+                                    'mt-1 flex items-center justify-center',
                                     !currentNode.trigger && 'w-full'
                                 )}
                             >