diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.scss b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.scss
index bf1a5bddfe800e..32ab1bd7b1821b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.scss
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.scss
@@ -1,3 +1,9 @@
 .actCheckActionTypeEnabled__disabledActionWarningCard {
   background-color: $euiColorLightestShade;
 }
+
+.actAccordionActionForm {
+  .euiCard {
+    box-shadow: none;
+  }
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.tsx b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.tsx
index ed4380a439df6d..7691c3741468c7 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.tsx
@@ -39,6 +39,7 @@ export function checkActionTypeEnabled(
       ),
       messageCard: (
         <EuiCard
+          titleSize="xs"
           title={i18n.translate(
             'xpack.triggersActionsUI.sections.alertForm.actionTypeDisabledByLicenseMessageTitle',
             {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.scss b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.scss
deleted file mode 100644
index e4e84f9abc0a2b..00000000000000
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.actActionForm__disabledActionWarningTitle {
-  @include euiFontSizeS;
-  color: $euiColorDanger;
-  margin-left: $euiSizeS;
-}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
index 4b609447845830..0b370a94bae9f7 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
@@ -22,6 +22,7 @@ import {
   EuiEmptyPrompt,
   EuiButtonEmpty,
   EuiToolTip,
+  EuiIconTip,
   EuiLink,
 } from '@elastic/eui';
 import { HttpSetup, ToastsApi } from 'kibana/public';
@@ -40,7 +41,6 @@ import { TypeRegistry } from '../../type_registry';
 import { actionTypeCompare } from '../../lib/action_type_compare';
 import { checkActionTypeEnabled } from '../../lib/check_action_type_enabled';
 import { VIEW_LICENSE_OPTIONS_LINK } from '../../../common/constants';
-import './action_form.scss';
 
 interface ActionAccordionFormProps {
   actions: AlertAction[];
@@ -263,8 +263,8 @@ export const ActionForm = ({
         initialIsOpen={true}
         key={index}
         id={index.toString()}
-        className="euiAccordionForm"
-        buttonContentClassName="euiAccordionForm__button"
+        className="actAccordionActionForm"
+        buttonContentClassName="actAccordionActionForm__button"
         data-test-subj={`alertActionAccordion-${defaultActionGroupId}`}
         buttonContent={
           <EuiFlexGroup gutterSize="s" alignItems="center">
@@ -274,24 +274,35 @@ export const ActionForm = ({
             <EuiFlexItem>
               <EuiTitle size="s">
                 <h5>
-                  <FormattedMessage
-                    defaultMessage="Action: {actionConnectorName}"
-                    id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeEditTitle"
-                    values={{
-                      actionConnectorName: actionConnector.name,
-                    }}
-                  />
-                  {checkEnabledResult.isEnabled === false && (
-                    <Fragment>
-                      <span className="actActionForm__disabledActionWarningTitle">
-                        <EuiIcon type="alert" />
-                        <FormattedMessage
-                          defaultMessage="This action is disabled"
-                          id="xpack.triggersActionsUI.sections.alertForm.actionDisabledTitle"
-                        />
-                      </span>
-                    </Fragment>
-                  )}
+                  <EuiFlexGroup gutterSize="s">
+                    <EuiFlexItem grow={false}>
+                      <FormattedMessage
+                        defaultMessage="Action: {actionConnectorName}"
+                        id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeEditTitle"
+                        values={{
+                          actionConnectorName: actionConnector.name,
+                        }}
+                      />
+                    </EuiFlexItem>
+                    <EuiFlexItem grow={false}>
+                      {checkEnabledResult.isEnabled === false && (
+                        <Fragment>
+                          <EuiIconTip
+                            type="alert"
+                            color="danger"
+                            label="Beta"
+                            content={i18n.translate(
+                              'xpack.triggersActionsUI.sections.alertForm.actionDisabledTitle',
+                              {
+                                defaultMessage: 'This action is disabled',
+                              }
+                            )}
+                            position="right"
+                          />
+                        </Fragment>
+                      )}
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
                 </h5>
               </EuiTitle>
             </EuiFlexItem>
@@ -301,7 +312,7 @@ export const ActionForm = ({
           <EuiButtonIcon
             iconType="cross"
             color="danger"
-            className="euiAccordionForm__extraAction"
+            className="actAccordionActionForm__extraAction"
             aria-label={i18n.translate(
               'xpack.triggersActionsUI.sections.alertForm.accordion.deleteIconAriaLabel',
               {
@@ -338,8 +349,8 @@ export const ActionForm = ({
         initialIsOpen={true}
         key={index}
         id={index.toString()}
-        className="euiAccordionForm"
-        buttonContentClassName="euiAccordionForm__button"
+        className="actAccordionActionForm"
+        buttonContentClassName="actAccordionActionForm__button"
         data-test-subj={`alertActionAccordion-${defaultActionGroupId}`}
         buttonContent={
           <EuiFlexGroup gutterSize="s" alignItems="center">
@@ -365,7 +376,7 @@ export const ActionForm = ({
           <EuiButtonIcon
             iconType="cross"
             color="danger"
-            className="euiAccordionForm__extraAction"
+            className="actAccordionActionForm__extraAction"
             aria-label={i18n.translate(
               'xpack.triggersActionsUI.sections.alertForm.accordion.deleteIconAriaLabel',
               {
@@ -549,7 +560,6 @@ export const ActionForm = ({
                       target="_blank"
                       className="actActionForm__getMoreActionsLink"
                     >
-                      <EuiIcon type="starEmptySpace" />
                       <FormattedMessage
                         defaultMessage="Get more actions"
                         id="xpack.triggersActionsUI.sections.actionForm.getMoreActionsTitle"
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
index e071c19af4b124..2dd5e413faf9c5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
@@ -74,6 +74,7 @@ export const ActionTypeMenu = ({
       const checkEnabledResult = checkActionTypeEnabled(item.actionType);
       const card = (
         <EuiCard
+          titleSize="xs"
           data-test-subj={`${item.actionType.id}-card`}
           icon={<EuiIcon size="l" type={item.iconClass} />}
           title={item.name}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
index 00dfbabc80060b..9584f6c01e7944 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
@@ -271,7 +271,6 @@ const upgradeYourLicenseCallOut = (
       'xpack.triggersActionsUI.sections.actionConnectorAdd.upgradeYourPlanBannerTitle',
       { defaultMessage: 'Upgrade your plan to access more connector types' }
     )}
-    iconType="starEmptySpace"
   >
     <FormattedMessage
       id="xpack.triggersActionsUI.sections.actionConnectorAdd.upgradeYourPlanBannerMessage"
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
index 5902446616790a..c023f9087d70e6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
@@ -15,7 +15,7 @@ import {
   EuiTitle,
   EuiLink,
   EuiLoadingSpinner,
-  EuiToolTip,
+  EuiIconTip,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -159,12 +159,14 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
         return checkEnabledResult.isEnabled ? (
           link
         ) : (
-          <EuiToolTip position="top" content={checkEnabledResult.message}>
-            <Fragment>
-              {link}
-              <EuiIcon type="questionInCircle" />
-            </Fragment>
-          </EuiToolTip>
+          <Fragment>
+            {link}
+            <EuiIconTip
+              type="questionInCircle"
+              content={checkEnabledResult.message}
+              position="right"
+            />
+          </Fragment>
         );
       },
     },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
index 5152704dc3fae5..cd368193e5fa4c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
@@ -147,6 +147,7 @@ export const AlertEdit = ({
           {hasActionsDisabled && (
             <Fragment>
               <EuiCallOut
+                size="s"
                 color="danger"
                 iconType="alert"
                 title={i18n.translate(