diff --git a/public/general_components/multi_select_filter.tsx b/public/general_components/multi_select_filter.tsx
index 815149c1..2cb59ecf 100644
--- a/public/general_components/multi_select_filter.tsx
+++ b/public/general_components/multi_select_filter.tsx
@@ -76,7 +76,7 @@ export function MultiSelectFilter(props: MultiSelectFilterProps) {
           }
           isOpen={isPopoverOpen}
           closePopover={onPopoverClose}
-          panelPaddingSize="none"
+          panelPaddingSize="s"
         >
           <div className="euiFilterSelect__items multi-select-filter--width">
             {filters.map((filter, index) => (
diff --git a/public/general_components/processors_title.tsx b/public/general_components/processors_title.tsx
index 87b2c75d..feebcf82 100644
--- a/public/general_components/processors_title.tsx
+++ b/public/general_components/processors_title.tsx
@@ -4,7 +4,7 @@
  */
 
 import React from 'react';
-import { EuiFlexItem, EuiTitle } from '@elastic/eui';
+import { EuiFlexItem, EuiText } from '@elastic/eui';
 
 interface ProcessorsTitleProps {
   title: string;
@@ -17,17 +17,17 @@ interface ProcessorsTitleProps {
 export function ProcessorsTitle(props: ProcessorsTitleProps) {
   return (
     <EuiFlexItem grow={false}>
-      <EuiTitle size="s">
+      <EuiText size="s">
         <div>
-          <h2
+          <h3
             style={{ display: 'inline-block' }}
-          >{`${props.title} (${props.processorCount}) -`}</h2>
+          >{`${props.title} (${props.processorCount}) -`}</h3>
           &nbsp;
-          <h2 style={{ display: 'inline-block', fontStyle: 'italic' }}>
+          <h3 style={{ display: 'inline-block', fontStyle: 'italic' }}>
             optional
-          </h2>
+          </h3>
         </div>
-      </EuiTitle>
+      </EuiText>
     </EuiFlexItem>
   );
 }
diff --git a/public/general_components/service_card/search_studio_card.tsx b/public/general_components/service_card/search_studio_card.tsx
index 14506d53..6d18b842 100644
--- a/public/general_components/service_card/search_studio_card.tsx
+++ b/public/general_components/service_card/search_studio_card.tsx
@@ -4,7 +4,12 @@
  */
 
 import React from 'react';
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elastic/eui';
+import {
+  EuiSmallButton,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+} from '@elastic/eui';
 import { i18n } from '@osd/i18n';
 import { PLUGIN_ID } from '../../../common';
 import { ContentManagementPluginStart } from '../../../../../src/plugins/content_management/public';
@@ -26,8 +31,7 @@ export const registerSearchStudioCard = (
   const footer = (
     <EuiFlexGroup justifyContent="flexEnd">
       <EuiFlexItem grow={false}>
-        <EuiButton
-          size="s"
+        <EuiSmallButton
           onClick={() => {
             core.application.navigateToApp(PLUGIN_ID);
           }}
@@ -35,7 +39,7 @@ export const registerSearchStudioCard = (
           {i18n.translate('flowFrameworkDashboards.searchStudioCard.footer', {
             defaultMessage: 'Try OpenSearch Studio',
           })}
-        </EuiButton>
+        </EuiSmallButton>
       </EuiFlexItem>
     </EuiFlexGroup>
   );
diff --git a/public/pages/workflow_detail/components/export_modal.tsx b/public/pages/workflow_detail/components/export_modal.tsx
index d0e3b6ed..22c61906 100644
--- a/public/pages/workflow_detail/components/export_modal.tsx
+++ b/public/pages/workflow_detail/components/export_modal.tsx
@@ -83,7 +83,7 @@ export function ExportModal(props: ExportModalProps) {
       <EuiModalBody>
         <EuiFlexGroup direction="column">
           <EuiFlexItem grow={false}>
-            <EuiText>
+            <EuiText size="s">
               {`To build out identical resources in other environments, create and provision a workflow using the below template.`}{' '}
               <EuiLink href={CREATE_WORKFLOW_LINK} target="_blank">
                 Learn more
diff --git a/public/pages/workflow_detail/resizable_workspace.tsx b/public/pages/workflow_detail/resizable_workspace.tsx
index 5f68e2f7..d6a96bd1 100644
--- a/public/pages/workflow_detail/resizable_workspace.tsx
+++ b/public/pages/workflow_detail/resizable_workspace.tsx
@@ -276,7 +276,7 @@ export function ResizableWorkspace(props: ResizableWorkspaceProps) {
           titleSize="s"
           body={
             <>
-              <EuiText>
+              <EuiText size="s">
                 Only valid workflows created from this OpenSearch Dashboards
                 application are editable and viewable.
               </EuiText>
diff --git a/public/pages/workflow_detail/tools/errors/errors.tsx b/public/pages/workflow_detail/tools/errors/errors.tsx
index 0493b1db..a1ca60d5 100644
--- a/public/pages/workflow_detail/tools/errors/errors.tsx
+++ b/public/pages/workflow_detail/tools/errors/errors.tsx
@@ -19,7 +19,7 @@ export function Errors(props: ErrorsProps) {
   return (
     <>
       {isEmpty(props.errorMessage) ? (
-        <EuiText>There are no errors.</EuiText>
+        <EuiText size="s">There are no errors.</EuiText>
       ) : (
         <EuiCodeBlock fontSize="m" isCopyable={false}>
           {props.errorMessage}
diff --git a/public/pages/workflow_detail/tools/resources/resources.tsx b/public/pages/workflow_detail/tools/resources/resources.tsx
index 3a4370bd..4449d998 100644
--- a/public/pages/workflow_detail/tools/resources/resources.tsx
+++ b/public/pages/workflow_detail/tools/resources/resources.tsx
@@ -40,7 +40,7 @@ export function Resources(props: ResourcesProps) {
           titleSize="s"
           body={
             <>
-              <EuiText>
+              <EuiText size="s">
                 Provision the workflow to generate resources in order to start
                 prototyping.
               </EuiText>
diff --git a/public/pages/workflow_detail/tools/tools.tsx b/public/pages/workflow_detail/tools/tools.tsx
index ea324ed2..86b854ee 100644
--- a/public/pages/workflow_detail/tools/tools.tsx
+++ b/public/pages/workflow_detail/tools/tools.tsx
@@ -13,7 +13,7 @@ import {
   EuiPanel,
   EuiTab,
   EuiTabs,
-  EuiTitle,
+  EuiText,
 } from '@elastic/eui';
 import { Workflow } from '../../../../common';
 import { Resources } from './resources';
@@ -117,9 +117,9 @@ export function Tools(props: ToolsProps) {
         }}
       >
         <EuiFlexItem grow={false}>
-          <EuiTitle>
+          <EuiText size="s">
             <h2>Tools</h2>
-          </EuiTitle>
+          </EuiText>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <EuiTabs size="s" expand={false}>
diff --git a/public/pages/workflow_detail/workflow_inputs/ingest_inputs/ingest_data.tsx b/public/pages/workflow_detail/workflow_inputs/ingest_inputs/ingest_data.tsx
index 3e1ff46c..eb3be03d 100644
--- a/public/pages/workflow_detail/workflow_inputs/ingest_inputs/ingest_data.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/ingest_inputs/ingest_data.tsx
@@ -4,7 +4,7 @@
  */
 
 import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { TextField } from '../input_fields';
 import { AdvancedSettings } from './advanced_settings';
 
@@ -17,9 +17,9 @@ export function IngestData(props: IngestDataProps) {
   return (
     <EuiFlexGroup direction="column">
       <EuiFlexItem grow={false}>
-        <EuiTitle size="s">
-          <h2>Ingest data</h2>
-        </EuiTitle>
+        <EuiText size="s">
+          <h3>Ingest data</h3>
+        </EuiText>
       </EuiFlexItem>
       <EuiFlexItem>
         <TextField label="Index name" fieldPath={'ingest.index.name'} />
diff --git a/public/pages/workflow_detail/workflow_inputs/ingest_inputs/source_data.tsx b/public/pages/workflow_detail/workflow_inputs/ingest_inputs/source_data.tsx
index 5c91e643..f99f8d9a 100644
--- a/public/pages/workflow_detail/workflow_inputs/ingest_inputs/source_data.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/ingest_inputs/source_data.tsx
@@ -18,7 +18,6 @@ import {
   EuiModalHeaderTitle,
   EuiSpacer,
   EuiText,
-  EuiTitle,
   EuiFilterGroup,
   EuiSmallFilterButton,
   EuiSuperSelectOption,
@@ -253,7 +252,9 @@ export function SourceData(props: SourceDataProps) {
                       (option) =>
                         ({
                           value: option.name,
-                          inputDisplay: <EuiText>{option.name}</EuiText>,
+                          inputDisplay: (
+                            <EuiText size="s">{option.name}</EuiText>
+                          ),
                           disabled: false,
                         } as EuiSuperSelectOption<string>)
                     )}
@@ -288,9 +289,9 @@ export function SourceData(props: SourceDataProps) {
       )}
       <EuiFlexGroup direction="column" gutterSize="s">
         <EuiFlexItem grow={false}>
-          <EuiTitle size="s">
-            <h2>Import data</h2>
-          </EuiTitle>
+          <EuiText size="s">
+            <h3>Source data</h3>
+          </EuiText>
         </EuiFlexItem>
         {props.lastIngested !== undefined && (
           <EuiFlexItem grow={false}>
diff --git a/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/configure_prompt_modal.tsx b/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/configure_prompt_modal.tsx
index 85b0f874..82f9d6cc 100644
--- a/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/configure_prompt_modal.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/configure_prompt_modal.tsx
@@ -115,6 +115,7 @@ export function ConfigurePromptModal(props: ConfigurePromptModalProps) {
                 anchorPosition="downLeft"
               >
                 <EuiContextMenu
+                  size="s"
                   initialPanelId={0}
                   panels={[
                     {
@@ -140,7 +141,7 @@ export function ConfigurePromptModal(props: ConfigurePromptModalProps) {
                 />
               </EuiPopover>
               <EuiSpacer size="m" />
-              <EuiText>Prompt</EuiText>
+              <EuiText size="s">Prompt</EuiText>
               <EuiSpacer size="s" />
               <EuiCodeEditor
                 mode="json"
@@ -203,6 +204,7 @@ export function ConfigurePromptModal(props: ConfigurePromptModalProps) {
                       <EuiPopover
                         isOpen={schemaPopoverOpen}
                         closePopover={() => setSchemaPopoverOpen(false)}
+                        panelPaddingSize="s"
                         button={
                           <EuiSmallButtonEmpty
                             onClick={() =>
diff --git a/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/input_transform_modal.tsx b/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/input_transform_modal.tsx
index 4ef5fee3..610beeee 100644
--- a/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/input_transform_modal.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/input_transform_modal.tsx
@@ -26,7 +26,7 @@ import {
   EuiCodeBlock,
   EuiPopoverTitle,
   EuiIconTip,
-  EuiSwitch,
+  EuiCompressedSwitch,
   EuiCallOut,
 } from '@elastic/eui';
 import {
@@ -281,7 +281,7 @@ export function InputTransformModal(props: InputTransformModalProps) {
                   <EuiSpacer size="s" />
                 </>
               )}
-              <EuiText>Source input</EuiText>
+              <EuiText size="s">Source input</EuiText>
               <EuiSmallButton
                 style={{ width: '100px' }}
                 isLoading={isFetching}
@@ -436,7 +436,7 @@ export function InputTransformModal(props: InputTransformModalProps) {
           </EuiFlexItem>
           <EuiFlexItem>
             <>
-              <EuiText>Define transform</EuiText>
+              <EuiText size="s">Define transform</EuiText>
               <EuiSpacer size="s" />
               <MapArrayField
                 field={props.inputMapField}
@@ -496,10 +496,12 @@ export function InputTransformModal(props: InputTransformModalProps) {
                 )}
                 <EuiFlexItem grow={true}>
                   {transformOptions.length <= 1 ? (
-                    <EuiText>Transformed input</EuiText>
+                    <EuiText size="s">Transformed input</EuiText>
                   ) : (
                     <EuiCompressedSelect
-                      prepend={<EuiText>Transformed input for</EuiText>}
+                      prepend={
+                        <EuiText size="s">Transformed input for</EuiText>
+                      }
                       options={transformOptions}
                       value={selectedTransformOption}
                       onChange={(e) => {
@@ -513,6 +515,7 @@ export function InputTransformModal(props: InputTransformModalProps) {
                     <EuiPopover
                       isOpen={popoverOpen}
                       closePopover={() => setPopoverOpen(false)}
+                      panelPaddingSize="s"
                       button={
                         <EuiSmallButtonEmpty
                           onClick={() => setPopoverOpen(!popoverOpen)}
@@ -562,10 +565,10 @@ export function InputTransformModal(props: InputTransformModalProps) {
               <>
                 <EuiFlexGroup direction="row">
                   <EuiFlexItem grow={false}>
-                    <EuiText>Transformed prompt</EuiText>
+                    <EuiText size="s">Transformed prompt</EuiText>
                   </EuiFlexItem>
                   <EuiFlexItem grow={false} style={{ marginTop: '16px' }}>
-                    <EuiSwitch
+                    <EuiCompressedSwitch
                       label="Show"
                       checked={viewPromptDetails}
                       onChange={() => setViewPromptDetails(!viewPromptDetails)}
@@ -583,7 +586,7 @@ export function InputTransformModal(props: InputTransformModalProps) {
                 {viewPromptDetails && (
                   <>
                     <EuiSpacer size="s" />
-                    <EuiSwitch
+                    <EuiCompressedSwitch
                       label="With transformed inputs"
                       checked={viewTransformedPrompt}
                       onChange={() =>
diff --git a/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/output_transform_modal.tsx b/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/output_transform_modal.tsx
index 31b27cf6..c877c131 100644
--- a/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/output_transform_modal.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/output_transform_modal.tsx
@@ -203,7 +203,7 @@ export function OutputTransformModal(props: OutputTransformModalProps) {
               )}
               <EuiFlexGroup direction="row" justifyContent="spaceBetween">
                 <EuiFlexItem>
-                  <EuiText>Source output</EuiText>
+                  <EuiText size="s">Source output</EuiText>
                 </EuiFlexItem>
                 {!isEmpty(
                   parseModelOutputsObj(props.modelInterface, fullResponsePath)
@@ -212,6 +212,7 @@ export function OutputTransformModal(props: OutputTransformModalProps) {
                     <EuiPopover
                       isOpen={popoverOpen}
                       closePopover={() => setPopoverOpen(false)}
+                      panelPaddingSize="s"
                       button={
                         <EuiSmallButtonEmpty
                           onClick={() => setPopoverOpen(!popoverOpen)}
@@ -382,7 +383,7 @@ export function OutputTransformModal(props: OutputTransformModalProps) {
           </EuiFlexItem>
           <EuiFlexItem>
             <>
-              <EuiText>Define transform</EuiText>
+              <EuiText size="s">Define transform</EuiText>
               <EuiSpacer size="s" />
               <MapArrayField
                 field={props.outputMapField}
@@ -418,10 +419,10 @@ export function OutputTransformModal(props: OutputTransformModalProps) {
           <EuiFlexItem>
             <>
               {transformOptions.length <= 1 ? (
-                <EuiText>Transformed output</EuiText>
+                <EuiText size="s">Transformed output</EuiText>
               ) : (
                 <EuiCompressedSelect
-                  prepend={<EuiText>Transformed output for</EuiText>}
+                  prepend={<EuiText size="s">Transformed output for</EuiText>}
                   options={transformOptions}
                   value={selectedTransformOption}
                   onChange={(e) => {
diff --git a/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/override_query_modal.tsx b/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/override_query_modal.tsx
index edbab46f..b7d11e57 100644
--- a/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/override_query_modal.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/processor_inputs/modals/override_query_modal.tsx
@@ -112,6 +112,7 @@ export function OverrideQueryModal(props: OverrideQueryModalProps) {
                 anchorPosition="downLeft"
               >
                 <EuiContextMenu
+                  size="s"
                   initialPanelId={0}
                   panels={[
                     {
diff --git a/public/pages/workflow_detail/workflow_inputs/processors_list.tsx b/public/pages/workflow_detail/workflow_inputs/processors_list.tsx
index e18e16fc..4e70c105 100644
--- a/public/pages/workflow_detail/workflow_inputs/processors_list.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/processors_list.tsx
@@ -204,6 +204,7 @@ export function ProcessorsList(props: ProcessorsListProps) {
             anchorPosition="downLeft"
           >
             <EuiContextMenu
+              size="s"
               initialPanelId={PANEL_ID}
               panels={[
                 {
diff --git a/public/pages/workflow_detail/workflow_inputs/search_inputs/configure_search_request.tsx b/public/pages/workflow_detail/workflow_inputs/search_inputs/configure_search_request.tsx
index 83fbd6d9..aff505e1 100644
--- a/public/pages/workflow_detail/workflow_inputs/search_inputs/configure_search_request.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/search_inputs/configure_search_request.tsx
@@ -15,7 +15,6 @@ import {
   EuiCompressedSuperSelect,
   EuiSuperSelectOption,
   EuiText,
-  EuiTitle,
   EuiSpacer,
 } from '@elastic/eui';
 import {
@@ -83,9 +82,9 @@ export function ConfigureSearchRequest(props: ConfigureSearchRequestProps) {
       )}
       <EuiFlexGroup direction="column">
         <EuiFlexItem grow={false}>
-          <EuiTitle size="s">
-            <h2>Configure query</h2>
-          </EuiTitle>
+          <EuiText size="s">
+            <h3>Configure query</h3>
+          </EuiText>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <EuiCompressedFormRow label="Retrieval index">
@@ -100,7 +99,7 @@ export function ConfigureSearchRequest(props: ConfigureSearchRequestProps) {
                   (option) =>
                     ({
                       value: option.name,
-                      inputDisplay: <EuiText>{option.name}</EuiText>,
+                      inputDisplay: <EuiText size="s">{option.name}</EuiText>,
                       disabled: false,
                     } as EuiSuperSelectOption<string>)
                 )}
diff --git a/public/pages/workflow_detail/workflow_inputs/search_inputs/edit_query_modal.tsx b/public/pages/workflow_detail/workflow_inputs/search_inputs/edit_query_modal.tsx
index 7794cf1c..4a639977 100644
--- a/public/pages/workflow_detail/workflow_inputs/search_inputs/edit_query_modal.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/search_inputs/edit_query_modal.tsx
@@ -66,6 +66,7 @@ export function EditQueryModal(props: EditQueryModalProps) {
           anchorPosition="downLeft"
         >
           <EuiContextMenu
+            size="s"
             initialPanelId={0}
             panels={[
               {
diff --git a/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx b/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx
index 3d7e9a79..d55756b9 100644
--- a/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx
@@ -22,7 +22,6 @@ import {
   EuiPanel,
   EuiStepsHorizontal,
   EuiText,
-  EuiTitle,
   EuiSmallButtonIcon,
 } from '@elastic/eui';
 import {
@@ -665,7 +664,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                   </EuiModalHeaderTitle>
                 </EuiModalHeader>
                 <EuiModalBody>
-                  <EuiText>
+                  <EuiText size="s">
                     The resources for this workflow will be permanently deleted.
                     This action cannot be undone.
                   </EuiText>
@@ -725,7 +724,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
             }}
           >
             <EuiFlexItem grow={false}>
-              <EuiTitle>
+              <EuiText size="s">
                 <h2>
                   {onIngestAndUnprovisioned ? (
                     'Define ingest pipeline'
@@ -748,7 +747,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                     'Define search pipeline'
                   )}
                 </h2>
-              </EuiTitle>
+              </EuiText>
             </EuiFlexItem>
             {onIngest ? (
               <>
diff --git a/public/pages/workflow_detail/workspace/workspace.tsx b/public/pages/workflow_detail/workspace/workspace.tsx
index 5c618722..fb795369 100644
--- a/public/pages/workflow_detail/workspace/workspace.tsx
+++ b/public/pages/workflow_detail/workspace/workspace.tsx
@@ -16,7 +16,6 @@ import ReactFlow, {
 import {
   EuiFlexItem,
   EuiFlexGroup,
-  EuiTitle,
   EuiFilterGroup,
   EuiFilterButton,
   EuiCodeEditor,
@@ -127,14 +126,14 @@ export function Workspace(props: WorkspaceProps) {
         <div>
           <EuiFlexGroup direction="row" style={{ padding: '12px' }}>
             <EuiFlexItem grow={false}>
-              <EuiTitle>
+              <EuiText size="s">
                 <h2>Preview</h2>
-              </EuiTitle>
+              </EuiText>
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
               <EuiFilterGroup>
                 <EuiFilterButton
-                  size="l"
+                  size="s"
                   hasActiveFilters={visualSelected}
                   onClick={() => toggleSelection()}
                   data-testid="workspaceVisualButton"
@@ -142,7 +141,7 @@ export function Workspace(props: WorkspaceProps) {
                   Visual
                 </EuiFilterButton>
                 <EuiFilterButton
-                  size="l"
+                  size="s"
                   hasActiveFilters={!visualSelected}
                   onClick={() => toggleSelection()}
                   data-testid="workspaceJSONButton"
@@ -153,11 +152,11 @@ export function Workspace(props: WorkspaceProps) {
             </EuiFlexItem>
             <EuiFlexItem grow={false} style={{ paddingTop: '8px' }}>
               {visualSelected ? (
-                <EuiText>
+                <EuiText size="s">
                   {`A basic visual view representing the configured ingest & search flows.`}
                 </EuiText>
               ) : (
-                <EuiText>
+                <EuiText size="s">
                   {`The Flow Framework provisioning template describing how to build out the configured resources. `}
                   <EuiLink href={WORKFLOW_TUTORIAL_LINK} target="_blank">
                     Learn more
diff --git a/public/pages/workflow_detail/workspace/workspace_components/group_component.tsx b/public/pages/workflow_detail/workspace/workspace_components/group_component.tsx
index 3f34c958..359d7d4e 100644
--- a/public/pages/workflow_detail/workspace/workspace_components/group_component.tsx
+++ b/public/pages/workflow_detail/workspace/workspace_components/group_component.tsx
@@ -4,7 +4,7 @@
  */
 
 import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 
 interface GroupComponentProps {
   data: { label: string };
@@ -20,9 +20,9 @@ export function GroupComponent(props: GroupComponentProps) {
     // overlapping the group node title
     <EuiFlexGroup direction="column">
       <EuiFlexItem style={{ backgroundColor: 'transparent' }}>
-        <EuiTitle size="l">
+        <EuiText size="s">
           <h2 style={{ marginLeft: '8px' }}>{props.data.label}</h2>
-        </EuiTitle>
+        </EuiText>
       </EuiFlexItem>
       <EuiFlexItem></EuiFlexItem>
     </EuiFlexGroup>
diff --git a/public/pages/workflow_detail/workspace/workspace_components/workspace_component.tsx b/public/pages/workflow_detail/workspace/workspace_components/workspace_component.tsx
index fb245a1c..41ce1ae8 100644
--- a/public/pages/workflow_detail/workspace/workspace_components/workspace_component.tsx
+++ b/public/pages/workflow_detail/workspace/workspace_components/workspace_component.tsx
@@ -9,7 +9,6 @@ import {
   EuiFlexItem,
   EuiCard,
   EuiText,
-  EuiTitle,
   EuiSpacer,
 } from '@elastic/eui';
 import { IComponentData } from '../../../../../common';
@@ -38,9 +37,9 @@ export function WorkspaceComponent(props: WorkspaceComponentProps) {
       title={
         <EuiFlexGroup direction="row" justifyContent="spaceBetween">
           <EuiFlexItem grow={false}>
-            <EuiTitle size="s">
+            <EuiText size="s">
               <h3>{component.label}</h3>
-            </EuiTitle>
+            </EuiText>
           </EuiFlexItem>
           <EuiFlexItem grow={false}></EuiFlexItem>
         </EuiFlexGroup>
diff --git a/public/pages/workflows/empty_list_message.tsx b/public/pages/workflows/empty_list_message.tsx
index e30cd343..9b02e226 100644
--- a/public/pages/workflows/empty_list_message.tsx
+++ b/public/pages/workflows/empty_list_message.tsx
@@ -10,7 +10,6 @@ import {
   EuiFlexItem,
   EuiSpacer,
   EuiText,
-  EuiTitle,
 } from '@elastic/eui';
 
 interface EmptyListMessageProps {
@@ -24,9 +23,9 @@ export function EmptyListMessage(props: EmptyListMessageProps) {
         <EuiSpacer size="m" />
       </EuiFlexItem>
       <EuiFlexItem>
-        <EuiTitle size="s">
+        <EuiText size="s">
           <h3>No workflows found</h3>
-        </EuiTitle>
+        </EuiText>
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiText size="s">
diff --git a/public/pages/workflows/new_workflow/use_case.tsx b/public/pages/workflows/new_workflow/use_case.tsx
index 741b9aa1..6c74bce5 100644
--- a/public/pages/workflows/new_workflow/use_case.tsx
+++ b/public/pages/workflows/new_workflow/use_case.tsx
@@ -8,7 +8,6 @@ import {
   EuiText,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiTitle,
   EuiCard,
   EuiHorizontalRule,
   EuiSmallButton,
@@ -34,9 +33,9 @@ export function UseCase(props: UseCaseProps) {
       )}
       <EuiCard
         title={
-          <EuiTitle size="s">
-            <h2>{props.workflow.name}</h2>
-          </EuiTitle>
+          <EuiText size="s">
+            <h3>{props.workflow.name}</h3>
+          </EuiText>
         }
         titleSize="s"
         paddingSize="l"
@@ -45,7 +44,7 @@ export function UseCase(props: UseCaseProps) {
         <EuiFlexGroup direction="column" gutterSize="l">
           <EuiHorizontalRule size="full" margin="m" />
           <EuiFlexItem grow={true}>
-            <EuiText>{props.workflow.description}</EuiText>
+            <EuiText size="s">{props.workflow.description}</EuiText>
           </EuiFlexItem>
           <EuiFlexGroup direction="column" alignItems="center">
             <EuiFlexItem grow={false}>
diff --git a/public/pages/workflows/workflow_list/delete_workflow_modal.tsx b/public/pages/workflows/workflow_list/delete_workflow_modal.tsx
index 649e5723..f542ffae 100644
--- a/public/pages/workflows/workflow_list/delete_workflow_modal.tsx
+++ b/public/pages/workflows/workflow_list/delete_workflow_modal.tsx
@@ -83,7 +83,9 @@ export function DeleteWorkflowModal(props: DeleteWorkflowModalProps) {
       <EuiModalBody>
         <EuiFlexGroup direction="column">
           <EuiFlexItem>
-            <EuiText>The workflow will be permanently deleted.</EuiText>
+            <EuiText size="s">
+              The workflow will be permanently deleted.
+            </EuiText>
           </EuiFlexItem>
           <EuiFlexItem>
             <EuiCheckbox
diff --git a/public/pages/workflows/workflow_list/workflow_list.tsx b/public/pages/workflows/workflow_list/workflow_list.tsx
index 8fdad6e0..fe832f14 100644
--- a/public/pages/workflows/workflow_list/workflow_list.tsx
+++ b/public/pages/workflows/workflow_list/workflow_list.tsx
@@ -16,9 +16,8 @@ import {
   EuiLoadingSpinner,
   EuiFlyout,
   EuiFlyoutHeader,
-  EuiTitle,
-  EuiFlyoutBody,
   EuiText,
+  EuiFlyoutBody,
 } from '@elastic/eui';
 import { AppState } from '../../../store';
 import {
@@ -139,12 +138,12 @@ export function WorkflowList(props: WorkflowListProps) {
           onClose={() => setIsResourcesFlyoutOpen(false)}
         >
           <EuiFlyoutHeader hasBorder={true}>
-            <EuiTitle size="m">
+            <EuiText size="m">
               <h2>{`Active resources with ${getCharacterLimitedString(
                 selectedWorkflow.name,
                 MAX_WORKFLOW_NAME_TO_DISPLAY
               )}`}</h2>
-            </EuiTitle>
+            </EuiText>
           </EuiFlyoutHeader>
           <EuiFlyoutBody>
             <ResourceList workflow={selectedWorkflow} />
diff --git a/public/pages/workflows/workflows.tsx b/public/pages/workflows/workflows.tsx
index e4b81456..e13541a8 100644
--- a/public/pages/workflows/workflows.tsx
+++ b/public/pages/workflows/workflows.tsx
@@ -8,7 +8,6 @@ import { RouteComponentProps, useLocation } from 'react-router-dom';
 import { escape } from 'lodash';
 import {
   EuiPageHeader,
-  EuiTitle,
   EuiPage,
   EuiPageBody,
   EuiPageContent,
@@ -219,9 +218,9 @@ export function Workflows(props: WorkflowsProps) {
     />
   ) : (
     <EuiFlexGroup direction="column" style={{ margin: '0px' }}>
-      <EuiTitle size="l">
+      <EuiText size="m">
         <h1>{PLUGIN_NAME}</h1>
-      </EuiTitle>
+      </EuiText>
       <EuiText color="subdued">{DESCRIPTION}</EuiText>
     </EuiFlexGroup>
   );
@@ -267,13 +266,13 @@ export function Workflows(props: WorkflowsProps) {
             <EuiPageHeader
               style={{ marginTop: '-8px' }}
               pageTitle={
-                <EuiTitle size="m">
+                <EuiText size="s">
                   <h2>
                     {selectedTabId === WORKFLOWS_TAB.MANAGE
                       ? 'Workflows'
                       : 'Create from a template'}
                   </h2>
-                </EuiTitle>
+                </EuiText>
               }
               rightSideItems={
                 selectedTabId === WORKFLOWS_TAB.MANAGE
@@ -289,6 +288,7 @@ export function Workflows(props: WorkflowsProps) {
                             dataSourceId
                           );
                         }}
+                        iconType="plus"
                         data-testid="createWorkflowButton"
                       >
                         Create workflow