diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts
index eada20721d3e0..83fd3f184e098 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_action_storage.test.ts
@@ -45,7 +45,7 @@ describe('EmbeddableActionStorage', () => {
       const storage = new EmbeddableActionStorage(embeddable);
       const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -63,7 +63,7 @@ describe('EmbeddableActionStorage', () => {
       const storage = new EmbeddableActionStorage(embeddable);
       const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -81,17 +81,17 @@ describe('EmbeddableActionStorage', () => {
 
       const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
       const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
       const event3: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -115,7 +115,7 @@ describe('EmbeddableActionStorage', () => {
       const storage = new EmbeddableActionStorage(embeddable);
       const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -142,14 +142,14 @@ describe('EmbeddableActionStorage', () => {
 
       const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'foo',
         } as any,
       };
       const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'bar',
         } as any,
@@ -168,28 +168,28 @@ describe('EmbeddableActionStorage', () => {
 
       const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'foo',
         } as any,
       };
       const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'bar',
         } as any,
       };
       const event22: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'baz',
         } as any,
       };
       const event3: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'qux',
         } as any,
@@ -219,7 +219,7 @@ describe('EmbeddableActionStorage', () => {
 
       const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -237,12 +237,12 @@ describe('EmbeddableActionStorage', () => {
 
       const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
       const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -269,7 +269,7 @@ describe('EmbeddableActionStorage', () => {
 
       const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -286,21 +286,21 @@ describe('EmbeddableActionStorage', () => {
 
       const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'foo',
         } as any,
       };
       const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'bar',
         } as any,
       };
       const event3: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {
           name: 'qux',
         } as any,
@@ -347,7 +347,7 @@ describe('EmbeddableActionStorage', () => {
 
       const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -375,7 +375,7 @@ describe('EmbeddableActionStorage', () => {
 
       const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -403,7 +403,7 @@ describe('EmbeddableActionStorage', () => {
 
       const event: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID',
-        triggerId: 'TRIGGER-ID',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -422,17 +422,17 @@ describe('EmbeddableActionStorage', () => {
 
       const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
       const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID2',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
       const event3: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID3',
-        triggerId: 'TRIGGER-ID3',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
@@ -476,7 +476,7 @@ describe('EmbeddableActionStorage', () => {
 
       await storage.create({
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       });
 
@@ -484,7 +484,7 @@ describe('EmbeddableActionStorage', () => {
 
       await storage.create({
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       });
 
@@ -522,13 +522,13 @@ describe('EmbeddableActionStorage', () => {
 
       const event1: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID1',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
       const event2: UiActionsSerializedEvent = {
         eventId: 'EVENT_ID2',
-        triggerId: 'TRIGGER-ID1',
+        triggers: ['TRIGGER-ID'],
         action: {} as any,
       };
 
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
index fd46dafd36b73..94f1485a8cbc3 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
@@ -23,7 +23,7 @@ export const MenuItem: React.FC<{ context: EmbeddableContext }> = ({ context })
   }, [context.embeddable.dynamicActions, isMounted]);
 
   const badge = !count ? null : (
-    <EuiNotificationBadge style={{ float: 'right' }}>{count}</EuiNotificationBadge>
+    <EuiNotificationBadge style={{ float: 'right', marginTop: 1 }}>{count}</EuiNotificationBadge>
   );
 
   return (
diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx
index fb3a50eb77f2c..8c6739a8ad6c8 100644
--- a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx
+++ b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx
@@ -35,7 +35,9 @@ export const DrilldownHelloBar: React.FC<DrilldownHelloBarProps> = ({
       title={
         <EuiFlexGroup className="drdHelloBar__content">
           <EuiFlexItem grow={false}>
-            <EuiIcon type="help" />
+            <div style={{ marginLeft: '8px' }}>
+              <EuiIcon type="help" />
+            </div>
           </EuiFlexItem>
           <EuiFlexItem grow={true}>
             <EuiText size={'s'}>
diff --git a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx
index fc803af16a266..b55cbd88d0dc0 100644
--- a/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx
+++ b/x-pack/plugins/drilldowns/public/components/flyout_frame/flyout_frame.tsx
@@ -42,12 +42,14 @@ export const FlyoutFrame: React.FC<FlyoutFrameProps> = ({
         <EuiFlexGroup alignItems="center" gutterSize={'s'} responsive={false}>
           {onBack && (
             <EuiFlexItem grow={false}>
-              <EuiButtonIcon
-                color={'subdued'}
-                onClick={onBack}
-                iconType="arrowLeft"
-                aria-label={txtBack}
-              />
+              <div style={{ marginLeft: '-8px', marginTop: '-4px' }}>
+                <EuiButtonIcon
+                  color={'subdued'}
+                  onClick={onBack}
+                  iconType="arrowLeft"
+                  aria-label={txtBack}
+                />
+              </div>
             </EuiFlexItem>
           )}
           {title && (