diff --git a/x-pack/plugins/apm/public/components/app/settings/bottom_bar_actions/index.tsx b/x-pack/plugins/apm/public/components/app/settings/bottom_bar_actions/index.tsx
index 6dc274da4d860..1bdeec63b58ee 100644
--- a/x-pack/plugins/apm/public/components/app/settings/bottom_bar_actions/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/bottom_bar_actions/index.tsx
@@ -42,7 +42,7 @@ export function BottomBarActions({
           }}
         >
           <EuiHealth color="warning" />
-          <EuiText color="ghost">
+          <EuiText>
             {i18n.translate('xpack.apm.bottomBarActions.unsavedChanges', {
               defaultMessage:
                 '{unsavedChangesCount, plural, =0{0 unsaved changes} one {1 unsaved change} other {# unsaved changes}} ',
@@ -55,7 +55,7 @@ export function BottomBarActions({
             <EuiFlexItem grow={false}>
               <EuiButtonEmpty
                 data-test-subj="apmBottomBarActionsDiscardChangesButton"
-                color="ghost"
+                color="text"
                 onClick={onDiscardChanges}
               >
                 {i18n.translate(
diff --git a/x-pack/plugins/monitoring/public/components/renderers/__snapshots__/setup_mode.test.js.snap b/x-pack/plugins/monitoring/public/components/renderers/__snapshots__/setup_mode.test.js.snap
index 2e0caa8472fbd..fbc47109d9be5 100644
--- a/x-pack/plugins/monitoring/public/components/renderers/__snapshots__/setup_mode.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/renderers/__snapshots__/setup_mode.test.js.snap
@@ -49,21 +49,17 @@ exports[`SetupModeRenderer should render the flyout open 1`] = `
           <EuiFlexItem
             grow={false}
           >
-            <EuiTextColor
-              color="ghost"
-            >
-              <FormattedMessage
-                defaultMessage="You are in setup mode. The ({flagIcon}) icon indicates configuration options."
-                id="xpack.monitoring.setupMode.description"
-                values={
-                  Object {
-                    "flagIcon": <EuiIcon
-                      type="flag"
-                    />,
-                  }
+            <FormattedMessage
+              defaultMessage="You are in setup mode. The ({flagIcon}) icon indicates configuration options."
+              id="xpack.monitoring.setupMode.description"
+              values={
+                Object {
+                  "flagIcon": <EuiIcon
+                    type="flag"
+                  />,
                 }
-              />
-            </EuiTextColor>
+              }
+            />
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlexItem>
@@ -142,21 +138,17 @@ exports[`SetupModeRenderer should render with setup mode enabled 1`] = `
           <EuiFlexItem
             grow={false}
           >
-            <EuiTextColor
-              color="ghost"
-            >
-              <FormattedMessage
-                defaultMessage="You are in setup mode. The ({flagIcon}) icon indicates configuration options."
-                id="xpack.monitoring.setupMode.description"
-                values={
-                  Object {
-                    "flagIcon": <EuiIcon
-                      type="flag"
-                    />,
-                  }
+            <FormattedMessage
+              defaultMessage="You are in setup mode. The ({flagIcon}) icon indicates configuration options."
+              id="xpack.monitoring.setupMode.description"
+              values={
+                Object {
+                  "flagIcon": <EuiIcon
+                    type="flag"
+                  />,
                 }
-              />
-            </EuiTextColor>
+              }
+            />
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlexItem>
diff --git a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
index 8119685dc65f6..5022e71a348f2 100644
--- a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
+++ b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
@@ -5,14 +5,7 @@
  * 2.0.
  */
 
-import {
-  EuiBottomBar,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiSpacer,
-  EuiTextColor,
-} from '@elastic/eui';
+import { EuiBottomBar, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Fragment } from 'react';
 import { withKibana } from '@kbn/kibana-react-plugin/public';
@@ -144,15 +137,13 @@ export class WrappedSetupModeRenderer extends React.Component {
             <EuiFlexItem grow={false}>
               <EuiFlexGroup gutterSize="s">
                 <EuiFlexItem grow={false}>
-                  <EuiTextColor color="ghost">
-                    <FormattedMessage
-                      id="xpack.monitoring.setupMode.description"
-                      defaultMessage="You are in setup mode. The ({flagIcon}) icon indicates configuration options."
-                      values={{
-                        flagIcon: <EuiIcon type="flag" />,
-                      }}
-                    />
-                  </EuiTextColor>
+                  <FormattedMessage
+                    id="xpack.monitoring.setupMode.description"
+                    defaultMessage="You are in setup mode. The ({flagIcon}) icon indicates configuration options."
+                    values={{
+                      flagIcon: <EuiIcon type="flag" />,
+                    }}
+                  />
                 </EuiFlexItem>
               </EuiFlexGroup>
             </EuiFlexItem>
diff --git a/x-pack/plugins/uptime/public/legacy_uptime/components/settings/settings_actions.tsx b/x-pack/plugins/uptime/public/legacy_uptime/components/settings/settings_actions.tsx
index c7aec1dd90d70..4e1f1b4c089e1 100644
--- a/x-pack/plugins/uptime/public/legacy_uptime/components/settings/settings_actions.tsx
+++ b/x-pack/plugins/uptime/public/legacy_uptime/components/settings/settings_actions.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiButton, EuiButtonEmpty, EuiText } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiButton, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { SettingsPageFieldErrors } from '../../pages/settings';
@@ -41,8 +41,8 @@ export const SettingsActions = ({
         </WarningText>
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="ghost"
+        <EuiButton
+          color="text"
           size="s"
           iconType="cross"
           data-test-subj="discardSettingsButton"
@@ -55,7 +55,7 @@ export const SettingsActions = ({
             id="xpack.uptime.sourceConfiguration.discardSettingsButtonLabel"
             defaultMessage="Cancel"
           />
-        </EuiButtonEmpty>
+        </EuiButton>
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
         <EuiButton