diff --git a/app/client/src/IDE/Structure/Toolbar.tsx b/app/client/src/IDE/Structure/Toolbar.tsx
new file mode 100644
index 00000000000..bd2f4f0ce7a
--- /dev/null
+++ b/app/client/src/IDE/Structure/Toolbar.tsx
@@ -0,0 +1,52 @@
+import React from "react";
+import { Flex } from "@appsmith/ads";
+
+interface ToolbarProps {
+  children?: React.ReactNode[] | React.ReactNode;
+}
+
+const Toolbar = (props: ToolbarProps) => {
+  return (
+    <Flex
+      alignItems="center"
+      borderBottom="1px solid var(--ads-v2-color-border-muted);"
+      flexDirection="row"
+      height="32px"
+      justifyContent="space-between"
+      padding="spaces-2"
+    >
+      {props.children}
+    </Flex>
+  );
+};
+
+const Left = (props: ToolbarProps) => {
+  return (
+    <Flex
+      alignItems="center"
+      flexDirection="row"
+      gap="spaces-2"
+      justifySelf="flex-start"
+    >
+      {props.children}
+    </Flex>
+  );
+};
+
+const Right = (props: ToolbarProps) => {
+  return (
+    <Flex
+      alignItems="center"
+      flexDirection="row"
+      gap="spaces-2"
+      justifySelf="flex-end"
+    >
+      {props.children}
+    </Flex>
+  );
+};
+
+Toolbar.Left = Left;
+Toolbar.Right = Right;
+
+export default Toolbar;
diff --git a/app/client/src/IDE/index.ts b/app/client/src/IDE/index.ts
index 8a12a855b8e..c57c8ea1872 100644
--- a/app/client/src/IDE/index.ts
+++ b/app/client/src/IDE/index.ts
@@ -12,6 +12,14 @@
 export { IDE_HEADER_HEIGHT } from "./Structure/constants";
 export { default as IDEHeader } from "./Structure/Header";
 
+/**
+ * The IDEToolbar gets exported with 2 layout subsections.
+ * IDEToolbar.Left and IDEToolbar.Right
+ * These are composable components that you can use to spread the content of the toolbar
+ * It is possible to use the Toolbar without using these subsections
+ */
+export { default as IDEToolbar } from "./Structure/Toolbar";
+
 /* ====================================================
     **** UI Components ****
     Components that are smaller UI abstractions for easy use and standardisation within the IDE
diff --git a/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx b/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
index 64542de3c66..ee90ecc960b 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionToolbar.tsx
@@ -1,7 +1,43 @@
 import React from "react";
+import { IDEToolbar } from "IDE";
+import { Button, Tooltip } from "@appsmith/ads";
+import { modText } from "../../utils/helpers";
 
-const PluginActionToolbar = () => {
-  return <div />;
+interface PluginActionToolbarProps {
+  runOptions?: React.ReactNode;
+  children?: React.ReactNode[] | React.ReactNode;
+}
+
+const PluginActionToolbar = (props: PluginActionToolbarProps) => {
+  return (
+    <IDEToolbar>
+      <IDEToolbar.Left>{props.children}</IDEToolbar.Left>
+      <IDEToolbar.Right>
+        {props.runOptions}
+        <Tooltip
+          content={modText() + " ⏎"}
+          placement="topRight"
+          showArrow={false}
+        >
+          <Button kind="primary" size="sm">
+            Run
+          </Button>
+        </Tooltip>
+        <Button
+          isIconButton
+          kind="secondary"
+          size="sm"
+          startIcon="settings-2-line"
+        />
+        <Button
+          isIconButton
+          kind="tertiary"
+          size="sm"
+          startIcon="more-2-fill"
+        />
+      </IDEToolbar.Right>
+    </IDEToolbar>
+  );
 };
 
 export default PluginActionToolbar;
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionDrawer.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/ActionDrawer.tsx
deleted file mode 100644
index af612152be8..00000000000
--- a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionDrawer.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, { useEffect, useRef, useState } from "react";
-import styled from "styled-components";
-import { ResizerCSS } from "components/editorComponents/Debugger/Resizer";
-import Resizable from "components/editorComponents/Debugger/Resizer";
-import { ActionExecutionResizerHeight } from "pages/Editor/APIEditor/constants";
-import type { BottomTab } from "components/editorComponents/EntityBottomTabs";
-import EntityBottomTabs from "components/editorComponents/EntityBottomTabs";
-
-const Container = styled.div`
-  ${ResizerCSS};
-  height: ${ActionExecutionResizerHeight}px;
-  // Minimum height of bottom tabs as it can be resized
-  min-height: 36px;
-  width: 100%;
-  background-color: var(--ads-v2-color-bg);
-  border-top: 1px solid var(--ads-v2-color-border);
-  z-index: 6;
-`;
-
-interface Props {
-  onResizeComplete: (height: number) => void;
-  isRunning: boolean;
-  tabs: BottomTab[];
-  height?: number;
-}
-
-const ActionDrawer = (props: Props) => {
-  const panelRef = useRef<HTMLDivElement>(null);
-  const [selectedTab, setSelectedTab] = useState<string>("");
-  useEffect(() => {
-    if (props.tabs.length) {
-      setSelectedTab(props.tabs[0].key);
-    }
-  }, []);
-
-  return (
-    <Container ref={panelRef}>
-      <Resizable
-        initialHeight={props.height || ActionExecutionResizerHeight}
-        onResizeComplete={props.onResizeComplete}
-        openResizer={props.isRunning}
-        panelRef={panelRef}
-        snapToHeight={ActionExecutionResizerHeight}
-      />
-      <EntityBottomTabs
-        onSelect={setSelectedTab}
-        selectedTabKey={selectedTab}
-        tabs={props.tabs}
-      />
-    </Container>
-  );
-};
-
-export default ActionDrawer;
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionEditor.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/ActionEditor.tsx
deleted file mode 100644
index e8335837bba..00000000000
--- a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionEditor.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Flex } from "@appsmith/ads";
-import React, { useCallback, useState } from "react";
-import ActionToolbar from "./ActionToolbar";
-import ActionDrawer from "./ActionDrawer";
-import { useDispatch } from "react-redux";
-import type { BottomTab } from "components/editorComponents/EntityBottomTabs";
-
-interface Props {
-  children: React.ReactNode;
-  onRunClick: () => void;
-  onDocsClick?: () => void;
-  isRunning: boolean;
-  tabs: BottomTab[];
-  runOptionsSelector?: React.ReactNode;
-  settingsRender: React.ReactNode;
-  height?: number;
-  onSetHeight?: (height: number) => void;
-}
-
-const ActionEditor = (props: Props) => {
-  const dispatch = useDispatch();
-  const setDrawerHeight = useCallback((height: number) => {
-    if (props.onSetHeight) {
-      dispatch(props.onSetHeight(height));
-    }
-  }, []);
-  const [settingsOpen, setSettingsOpen] = useState(false);
-
-  return (
-    <Flex flex="1" flexDirection="column" overflow="hidden">
-      <Flex flex="1" flexDirection="column" overflow="hidden">
-        <Flex
-          flex="1 1 0%"
-          flexDirection="column"
-          overflow="auto"
-          padding="spaces-3"
-        >
-          {settingsOpen ? props.settingsRender : props.children}
-        </Flex>
-        <ActionToolbar
-          onDocsClick={props.onDocsClick}
-          onRunClick={props.onRunClick}
-          onSettingsClick={() => setSettingsOpen(!settingsOpen)}
-          runOptionSelector={props.runOptionsSelector}
-        />
-      </Flex>
-      <ActionDrawer
-        height={props.height}
-        isRunning={props.isRunning}
-        onResizeComplete={setDrawerHeight}
-        tabs={props.tabs}
-      />
-    </Flex>
-  );
-};
-
-export default ActionEditor;
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionToolbar.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/ActionToolbar.tsx
deleted file mode 100644
index 3d2be46ca6b..00000000000
--- a/app/client/src/pages/Editor/IDE/EditorPane/components/ActionToolbar.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { Button, Flex, Tooltip } from "@appsmith/ads";
-import React from "react";
-import styled from "styled-components";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import { createMessage, DOCUMENTATION_TOOLTIP } from "ee/constants/messages";
-
-const MutedText = styled.span`
-  opacity: 70%;
-`;
-
-interface Props {
-  onSettingsClick: () => void;
-  onRunClick: () => void;
-  runOptionSelector?: React.ReactNode;
-  onDocsClick?: () => void;
-}
-
-const ActionToolbar = (props: Props) => {
-  const isActionRedesignEnabled = useFeatureFlag(
-    FEATURE_FLAG.release_actions_redesign_enabled,
-  );
-  if (!isActionRedesignEnabled) return null;
-  return (
-    <Flex
-      alignItems="center"
-      borderTop="1px solid var(--ads-v2-color-border);"
-      flexDirection="row"
-      height="32px"
-      justifyContent="space-between"
-      padding="spaces-2"
-    >
-      <Flex flexDirection="row" gap="spaces-3">
-        <Button
-          isIconButton
-          kind="secondary"
-          onClick={props.onSettingsClick}
-          size="sm"
-          startIcon="settings-2-line"
-        />
-        {props.onDocsClick ? (
-          <Tooltip
-            content={createMessage(DOCUMENTATION_TOOLTIP)}
-            placement="top"
-          >
-            <Button
-              isIconButton
-              kind="tertiary"
-              onClick={props.onDocsClick}
-              size="sm"
-              startIcon="book-line"
-            />
-          </Tooltip>
-        ) : null}
-        <Button
-          isIconButton
-          kind="tertiary"
-          size="sm"
-          startIcon="more-2-fill"
-        />
-      </Flex>
-      <Flex alignItems="center" gap="spaces-3">
-        {props.runOptionSelector}
-        <Button kind="primary" onClick={props.onRunClick} size="sm">
-          Run
-          <MutedText>&nbsp;⌘⏎</MutedText>
-        </Button>
-      </Flex>
-    </Flex>
-  );
-};
-
-export default ActionToolbar;
diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
index a3c97d624f1..0721f3ae295 100644
--- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
@@ -11,7 +11,6 @@ import styled from "styled-components";
 import FormRow from "components/editorComponents/FormRow";
 import {
   createMessage,
-  DEBUGGER_RESPONSE,
   DOCUMENTATION,
   DOCUMENTATION_TOOLTIP,
 } from "ee/constants/messages";
@@ -29,17 +28,12 @@ import { setQueryPaneConfigSelectedTabIndex } from "actions/queryPaneActions";
 import type { SourceEntity } from "entities/AppsmithConsole";
 import { ENTITY_TYPE as SOURCE_ENTITY_TYPE } from "ee/entities/AppsmithConsole/utils";
 import { DocsLink, openDoc } from "../../../constants/DocumentationLinks";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
 import { QueryEditorContext } from "./QueryEditorContext";
 import QueryDebuggerTabs from "./QueryDebuggerTabs";
 import useShowSchema from "components/editorComponents/ActionRightPane/useShowSchema";
 import { doesPluginRequireDatasource } from "ee/entities/Engine/actionHelpers";
 import FormRender from "./FormRender";
 import QueryEditorHeader from "./QueryEditorHeader";
-import ActionEditor from "../IDE/EditorPane/components/ActionEditor";
-import QueryResponseTab from "./QueryResponseTab";
-import DatasourceSelector from "./DatasourceSelector";
 import RunHistory from "ee/components/RunHistory";
 
 const QueryFormContainer = styled.form`
@@ -227,10 +221,6 @@ export function EditorJSONtoForm(props: Props) {
     useShowSchema(currentActionConfig?.pluginId || "") &&
     pluginRequireDatasource;
 
-  const isActionRedesignEnabled = useFeatureFlag(
-    FEATURE_FLAG.release_actions_redesign_enabled,
-  );
-
   const dispatch = useDispatch();
 
   const handleDocumentationClick = () => {
@@ -256,59 +246,6 @@ export function EditorJSONtoForm(props: Props) {
     return null;
   }
 
-  if (isActionRedesignEnabled && plugin) {
-    const responseTabs = [];
-    if (currentActionConfig) {
-      responseTabs.push({
-        key: "response",
-        title: createMessage(DEBUGGER_RESPONSE),
-        panelComponent: (
-          <QueryResponseTab
-            actionName={actionName}
-            actionSource={actionSource}
-            currentActionConfig={currentActionConfig}
-            isRunning={isRunning}
-            onRunClick={onRunClick}
-            runErrorMessage={runErrorMessage}
-          />
-        ),
-      });
-    }
-    return (
-      <ActionEditor
-        isRunning={isRunning}
-        onDocsClick={handleDocumentationClick}
-        onRunClick={onRunClick}
-        runOptionsSelector={
-          <DatasourceSelector
-            currentActionConfig={currentActionConfig}
-            dataSources={dataSources}
-            formName={formName}
-            onCreateDatasourceClick={onCreateDatasourceClick}
-            plugin={plugin}
-          />
-        }
-        settingsRender={
-          <SettingsWrapper>
-            <ActionSettings
-              actionSettingsConfig={settingConfig}
-              formName={formName}
-            />
-          </SettingsWrapper>
-        }
-        tabs={responseTabs}
-      >
-        <FormRender
-          editorConfig={editorConfig}
-          formData={props.formData}
-          formEvaluationState={props.formEvaluationState}
-          formName={formName}
-          uiComponent={uiComponent}
-        />
-      </ActionEditor>
-    );
-  }
-
   return (
     <>
       {closeEditorLink}