From 32e932a5026524ff3ba427369b994b49fe90279a Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Mon, 30 Nov 2020 19:14:44 -0500
Subject: [PATCH 1/9] adjust EuiButtonEmpty styles

---
 src-docs/src/views/button/button_empty.js     | 267 ++++--------------
 src-docs/src/views/button/button_icon.js      |   1 +
 .../__snapshots__/button_empty.test.tsx.snap  |  30 ++
 .../button/button_empty/_button_empty.scss    |   2 +
 .../button/button_empty/button_empty.tsx      |  10 +-
 .../__snapshots__/button_icon.test.tsx.snap   |  14 +
 .../button/button_icon/_variables.scss        |   1 +
 .../button/button_icon/button_icon.tsx        |   2 +
 .../overrides/_button_empty.scss              |   4 +
 9 files changed, 111 insertions(+), 220 deletions(-)

diff --git a/src-docs/src/views/button/button_empty.js b/src-docs/src/views/button/button_empty.js
index f340a0c8822..7443e0e08b3 100644
--- a/src-docs/src/views/button/button_empty.js
+++ b/src-docs/src/views/button/button_empty.js
@@ -6,36 +6,59 @@ import {
   EuiFlexItem,
 } from '../../../../src/components/';
 
+const buttons = [
+  'primary',
+  'secondary',
+  'warning',
+  'danger',
+  'text',
+  'disabled',
+];
+
 export default () => (
   <div>
-    <EuiFlexGroup gutterSize="s" alignItems="center">
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty onClick={() => {}}>Primary</EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty size="s" onClick={() => {}}>
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty size="xs" onClick={() => {}}>
-          extra small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+    {buttons.map((value) => (
+      <>
+        <EuiFlexGroup gutterSize="s" alignItems="center">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              style={{
+                textTransform: 'capitalize',
+              }}
+              isDisabled={value === 'disabled' ? true : false}
+              color={value}
+              onClick={() => {}}>
+              {value}
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              isDisabled={value === 'disabled' ? true : false}
+              color={value}
+              size="s"
+              onClick={() => {}}>
+              small
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              isDisabled={value === 'disabled' ? true : false}
+              color={value}
+              size="xs"
+              onClick={() => {}}>
+              extra small
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </>
+    ))}
 
     <EuiFlexGroup gutterSize="s" alignItems="center">
       <EuiFlexItem grow={false}>
         <EuiButtonEmpty onClick={() => {}} iconType="arrowDown">
-          Primary
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty size="s" onClick={() => {}} iconType="arrowDown">
-          small
+          arrowDown
         </EuiButtonEmpty>
       </EuiFlexItem>
 
@@ -44,155 +67,7 @@ export default () => (
           onClick={() => {}}
           iconType="arrowDown"
           iconSide="right">
-          Primary
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          size="s"
-          onClick={() => {}}
-          iconType="arrowDown"
-          iconSide="right">
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-
-    <EuiFlexGroup gutterSize="s" alignItems="center">
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="danger" onClick={() => {}}>
-          Danger
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="danger" size="s" onClick={() => {}}>
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="danger" size="xs" onClick={() => {}}>
-          extra small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-
-    <EuiFlexGroup gutterSize="s" alignItems="center">
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="danger" onClick={() => {}} iconType="arrowDown">
-          Danger
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="danger"
-          size="s"
-          onClick={() => {}}
-          iconType="arrowDown">
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="danger"
-          onClick={() => {}}
-          iconType="arrowDown"
-          iconSide="right">
-          Danger
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="danger"
-          size="s"
-          onClick={() => {}}
-          iconType="arrowDown"
-          iconSide="right">
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-
-    <EuiFlexGroup gutterSize="s" alignItems="center">
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="text" onClick={() => {}}>
-          Text
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="text" size="s" onClick={() => {}}>
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="text" size="xs" onClick={() => {}}>
-          extra small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-
-    <EuiFlexGroup gutterSize="s" alignItems="center">
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="text" onClick={() => {}} iconType="arrowDown">
-          Text
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="text"
-          size="s"
-          onClick={() => {}}
-          iconType="arrowDown">
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="text"
-          onClick={() => {}}
-          iconType="arrowDown"
-          iconSide="right">
-          Text
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="text"
-          size="s"
-          onClick={() => {}}
-          iconType="arrowDown"
-          iconSide="right">
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-
-    <EuiFlexGroup gutterSize="s" alignItems="center">
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="danger" onClick={() => {}} isDisabled>
-          Disabled
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="danger" size="s" onClick={() => {}} isDisabled>
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty color="danger" size="xs" onClick={() => {}} isDisabled>
-          extra small
+          arrowDown right
         </EuiButtonEmpty>
       </EuiFlexItem>
     </EuiFlexGroup>
@@ -210,51 +85,5 @@ export default () => (
         </EuiButtonEmpty>
       </EuiFlexItem>
     </EuiFlexGroup>
-
-    <EuiFlexGroup gutterSize="s" alignItems="center">
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="danger"
-          onClick={() => {}}
-          iconType="arrowDown"
-          isDisabled>
-          Disabled
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="danger"
-          size="s"
-          onClick={() => {}}
-          iconType="arrowDown"
-          isDisabled>
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="danger"
-          onClick={() => {}}
-          iconType="arrowDown"
-          iconSide="right"
-          isDisabled>
-          Disabled
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiButtonEmpty
-          color="danger"
-          size="s"
-          onClick={() => {}}
-          iconType="arrowDown"
-          iconSide="right"
-          isDisabled>
-          small
-        </EuiButtonEmpty>
-      </EuiFlexItem>
-    </EuiFlexGroup>
   </div>
 );
diff --git a/src-docs/src/views/button/button_icon.js b/src-docs/src/views/button/button_icon.js
index 827e6842446..c584efa0f44 100644
--- a/src-docs/src/views/button/button_icon.js
+++ b/src-docs/src/views/button/button_icon.js
@@ -14,6 +14,7 @@ const colors = [
   'success',
   'warning',
   'danger',
+  'secondary',
 ];
 
 export default () => (
diff --git a/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap b/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
index 6331e4f1a20..3b087259f31 100644
--- a/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
+++ b/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
@@ -64,6 +64,21 @@ exports[`EuiButtonEmpty props color primary is rendered 1`] = `
 </button>
 `;
 
+exports[`EuiButtonEmpty props color secondary is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--secondary"
+  type="button"
+>
+  <span
+    class="euiButtonContent euiButtonEmpty__content"
+  >
+    <span
+      class="euiButtonEmpty__text"
+    />
+  </span>
+</button>
+`;
+
 exports[`EuiButtonEmpty props color text is rendered 1`] = `
 <button
   class="euiButtonEmpty euiButtonEmpty--text"
@@ -79,6 +94,21 @@ exports[`EuiButtonEmpty props color text is rendered 1`] = `
 </button>
 `;
 
+exports[`EuiButtonEmpty props color warning is rendered 1`] = `
+<button
+  class="euiButtonEmpty euiButtonEmpty--warning"
+  type="button"
+>
+  <span
+    class="euiButtonContent euiButtonEmpty__content"
+  >
+    <span
+      class="euiButtonEmpty__text"
+    />
+  </span>
+</button>
+`;
+
 exports[`EuiButtonEmpty props contentProps is rendered 1`] = `
 <button
   class="euiButtonEmpty euiButtonEmpty--primary"
diff --git a/src/components/button/button_empty/_button_empty.scss b/src/components/button/button_empty/_button_empty.scss
index 08d14e380a5..e7a742d7be3 100644
--- a/src/components/button/button_empty/_button_empty.scss
+++ b/src/components/button/button_empty/_button_empty.scss
@@ -74,6 +74,8 @@ $euiButtonEmptyTypes: (
   disabled: $euiButtonColorDisabledText,
   ghost: $euiColorGhost,
   text: $euiTextColor,
+  secondary: $euiColorSecondaryText,
+  warning: $euiColorWarningText,
 );
 
 // Create button modifiers based upon the map.
diff --git a/src/components/button/button_empty/button_empty.tsx b/src/components/button/button_empty/button_empty.tsx
index 2599fb74acc..a866db6b0ce 100644
--- a/src/components/button/button_empty/button_empty.tsx
+++ b/src/components/button/button_empty/button_empty.tsx
@@ -34,13 +34,21 @@ import {
   EuiButtonContentType,
 } from '../button_content';
 
-export type EuiButtonEmptyColor = 'primary' | 'danger' | 'text' | 'ghost';
+export type EuiButtonEmptyColor =
+  | 'primary'
+  | 'danger'
+  | 'text'
+  | 'ghost'
+  | 'secondary'
+  | 'warning';
 
 const colorToClassNameMap: { [color in EuiButtonEmptyColor]: string } = {
   primary: 'euiButtonEmpty--primary',
   danger: 'euiButtonEmpty--danger',
   text: 'euiButtonEmpty--text',
   ghost: 'euiButtonEmpty--ghost',
+  secondary: 'euiButtonEmpty--secondary',
+  warning: 'euiButtonEmpty--warning',
 };
 
 export const COLORS = keysOf(colorToClassNameMap);
diff --git a/src/components/button/button_icon/__snapshots__/button_icon.test.tsx.snap b/src/components/button/button_icon/__snapshots__/button_icon.test.tsx.snap
index 7de5c208e0e..628e5d19dd1 100644
--- a/src/components/button/button_icon/__snapshots__/button_icon.test.tsx.snap
+++ b/src/components/button/button_icon/__snapshots__/button_icon.test.tsx.snap
@@ -71,6 +71,20 @@ exports[`EuiButtonIcon props color primary is rendered 1`] = `
 </button>
 `;
 
+exports[`EuiButtonIcon props color secondary is rendered 1`] = `
+<button
+  aria-label="button"
+  class="euiButtonIcon euiButtonIcon--secondary"
+  type="button"
+>
+  <span
+    aria-hidden="true"
+    class="euiButtonIcon__icon"
+    data-euiicon-type="user"
+  />
+</button>
+`;
+
 exports[`EuiButtonIcon props color subdued is rendered 1`] = `
 <button
   aria-label="button"
diff --git a/src/components/button/button_icon/_variables.scss b/src/components/button/button_icon/_variables.scss
index 61519014012..f9d9da7e26c 100644
--- a/src/components/button/button_icon/_variables.scss
+++ b/src/components/button/button_icon/_variables.scss
@@ -9,4 +9,5 @@ $euiButtonIconTypes: (
   success: $euiColorSuccessText,
   text: $euiTextColor,
   warning: $euiColorWarningText,
+  secondary: $euiColorSuccessText,
 );
diff --git a/src/components/button/button_icon/button_icon.tsx b/src/components/button/button_icon/button_icon.tsx
index 95d76cbe5b4..7f122ea092c 100644
--- a/src/components/button/button_icon/button_icon.tsx
+++ b/src/components/button/button_icon/button_icon.tsx
@@ -46,6 +46,7 @@ export type EuiButtonIconColor =
   | 'subdued'
   | 'success'
   | 'text'
+  | 'secondary'
   | 'warning';
 
 export interface EuiButtonIconProps extends CommonProps {
@@ -95,6 +96,7 @@ const colorToClassNameMap: { [color in EuiButtonIconColor]: string } = {
   success: 'euiButtonIcon--success',
   text: 'euiButtonIcon--text',
   warning: 'euiButtonIcon--warning',
+  secondary: 'euiButtonIcon--secondary',
 };
 
 export const COLORS = keysOf(colorToClassNameMap);
diff --git a/src/themes/eui-amsterdam/overrides/_button_empty.scss b/src/themes/eui-amsterdam/overrides/_button_empty.scss
index 54e7b5b6520..acdec07f7f4 100644
--- a/src/themes/eui-amsterdam/overrides/_button_empty.scss
+++ b/src/themes/eui-amsterdam/overrides/_button_empty.scss
@@ -7,6 +7,10 @@
     // so that they don't appear completely rounded
     border-radius: $euiBorderRadius * .667;
   }
+
+  &.euiButtonEmpty--xSmall {
+    font-size: $euiFontSizeXS;
+  }
 }
 
 @each $name, $color in $euiButtonTypes {

From 5c9e249f5c85db67310c656dc7d2358148067a20 Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Mon, 30 Nov 2020 21:31:50 -0500
Subject: [PATCH 2/9] add cl

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c91a9cd7eea..f804973e810 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 ## [`master`](https://github.com/elastic/eui/tree/master)
 
-- Upgraded `highlight.js` to 9.18.5 ([#4313](https://github.com/elastic/eui/pull/4313))
+- Upgraded `highlight.js` to 9.18.5 ([#4313](https://github.com/elastic/eui/pull/4313)) 
+- Added `secondary` and `warning` colors to `EuiButtonEmpty` and `secondary` to `EuiButtonIcon` ([#4325](https://github.com/elastic/eui/pull/4325))
+
+
+**Theme: Amsterdam**
+
+- Reduced font size for `xs` size in `EuiButtonEmpty` ([#4325](https://github.com/elastic/eui/pull/4325))
 
 ## [`30.5.0`](https://github.com/elastic/eui/tree/v30.5.0)
 

From abae4f26f238ffd16048ffcc340e0ddb304a6ab4 Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Mon, 30 Nov 2020 21:42:11 -0500
Subject: [PATCH 3/9] keep only success in the EuiButtonIcon examples

---
 src-docs/src/views/button/button_icon.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src-docs/src/views/button/button_icon.js b/src-docs/src/views/button/button_icon.js
index c584efa0f44..827e6842446 100644
--- a/src-docs/src/views/button/button_icon.js
+++ b/src-docs/src/views/button/button_icon.js
@@ -14,7 +14,6 @@ const colors = [
   'success',
   'warning',
   'danger',
-  'secondary',
 ];
 
 export default () => (

From 007f0caf704d92c55a3c3931cd6c7f453c18def5 Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Tue, 1 Dec 2020 09:14:35 -0500
Subject: [PATCH 4/9] cleanup

---
 src-docs/src/views/button/button_empty.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-docs/src/views/button/button_empty.js b/src-docs/src/views/button/button_empty.js
index 7443e0e08b3..07133ae6353 100644
--- a/src-docs/src/views/button/button_empty.js
+++ b/src-docs/src/views/button/button_empty.js
@@ -19,14 +19,14 @@ export default () => (
   <div>
     {buttons.map((value) => (
       <>
-        <EuiFlexGroup gutterSize="s" alignItems="center">
+        <EuiFlexGroup gutterSize="s" key={value} alignItems="center">
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty
               style={{
                 textTransform: 'capitalize',
               }}
               isDisabled={value === 'disabled' ? true : false}
-              color={value}
+              color={value !== 'disabled' ? value : 'primary'}
               onClick={() => {}}>
               {value}
             </EuiButtonEmpty>
@@ -35,7 +35,7 @@ export default () => (
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty
               isDisabled={value === 'disabled' ? true : false}
-              color={value}
+              color={value !== 'disabled' ? value : 'primary'}
               size="s"
               onClick={() => {}}>
               small
@@ -45,7 +45,7 @@ export default () => (
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty
               isDisabled={value === 'disabled' ? true : false}
-              color={value}
+              color={value !== 'disabled' ? value : 'primary'}
               size="xs"
               onClick={() => {}}>
               extra small

From 4c93f97008c1166ec55fd214973bd0511c761669 Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Tue, 1 Dec 2020 17:36:01 -0500
Subject: [PATCH 5/9] updates

---
 CHANGELOG.md                                       |  2 +-
 src-docs/src/views/button/button_empty.js          |  9 +--------
 .../__snapshots__/button_empty.test.tsx.snap       |  4 ++--
 .../button/button_empty/_button_empty.scss         |  2 +-
 .../button/button_empty/button_empty.tsx           |  4 ++--
 .../__snapshots__/button_icon.test.tsx.snap        | 14 --------------
 src/components/button/button_icon/button_icon.tsx  |  2 --
 7 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f804973e810..82c4c501466 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## [`master`](https://github.com/elastic/eui/tree/master)
 
 - Upgraded `highlight.js` to 9.18.5 ([#4313](https://github.com/elastic/eui/pull/4313)) 
-- Added `secondary` and `warning` colors to `EuiButtonEmpty` and `secondary` to `EuiButtonIcon` ([#4325](https://github.com/elastic/eui/pull/4325))
+- Added `success` and `warning` colors to `EuiButtonEmpty` ([#4325](https://github.com/elastic/eui/pull/4325))
 
 
 **Theme: Amsterdam**
diff --git a/src-docs/src/views/button/button_empty.js b/src-docs/src/views/button/button_empty.js
index 07133ae6353..4877b336a88 100644
--- a/src-docs/src/views/button/button_empty.js
+++ b/src-docs/src/views/button/button_empty.js
@@ -6,14 +6,7 @@ import {
   EuiFlexItem,
 } from '../../../../src/components/';
 
-const buttons = [
-  'primary',
-  'secondary',
-  'warning',
-  'danger',
-  'text',
-  'disabled',
-];
+const buttons = ['primary', 'success', 'warning', 'danger', 'text', 'disabled'];
 
 export default () => (
   <div>
diff --git a/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap b/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
index 3b087259f31..75b3d5d0257 100644
--- a/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
+++ b/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
@@ -64,9 +64,9 @@ exports[`EuiButtonEmpty props color primary is rendered 1`] = `
 </button>
 `;
 
-exports[`EuiButtonEmpty props color secondary is rendered 1`] = `
+exports[`EuiButtonEmpty props color success is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--secondary"
+  class="euiButtonEmpty euiButtonEmpty--success"
   type="button"
 >
   <span
diff --git a/src/components/button/button_empty/_button_empty.scss b/src/components/button/button_empty/_button_empty.scss
index e7a742d7be3..2227c7a77f0 100644
--- a/src/components/button/button_empty/_button_empty.scss
+++ b/src/components/button/button_empty/_button_empty.scss
@@ -74,7 +74,7 @@ $euiButtonEmptyTypes: (
   disabled: $euiButtonColorDisabledText,
   ghost: $euiColorGhost,
   text: $euiTextColor,
-  secondary: $euiColorSecondaryText,
+  success: $euiColorSecondaryText,
   warning: $euiColorWarningText,
 );
 
diff --git a/src/components/button/button_empty/button_empty.tsx b/src/components/button/button_empty/button_empty.tsx
index a866db6b0ce..e42b92c5d58 100644
--- a/src/components/button/button_empty/button_empty.tsx
+++ b/src/components/button/button_empty/button_empty.tsx
@@ -39,7 +39,7 @@ export type EuiButtonEmptyColor =
   | 'danger'
   | 'text'
   | 'ghost'
-  | 'secondary'
+  | 'success'
   | 'warning';
 
 const colorToClassNameMap: { [color in EuiButtonEmptyColor]: string } = {
@@ -47,7 +47,7 @@ const colorToClassNameMap: { [color in EuiButtonEmptyColor]: string } = {
   danger: 'euiButtonEmpty--danger',
   text: 'euiButtonEmpty--text',
   ghost: 'euiButtonEmpty--ghost',
-  secondary: 'euiButtonEmpty--secondary',
+  success: 'euiButtonEmpty--success',
   warning: 'euiButtonEmpty--warning',
 };
 
diff --git a/src/components/button/button_icon/__snapshots__/button_icon.test.tsx.snap b/src/components/button/button_icon/__snapshots__/button_icon.test.tsx.snap
index 628e5d19dd1..7de5c208e0e 100644
--- a/src/components/button/button_icon/__snapshots__/button_icon.test.tsx.snap
+++ b/src/components/button/button_icon/__snapshots__/button_icon.test.tsx.snap
@@ -71,20 +71,6 @@ exports[`EuiButtonIcon props color primary is rendered 1`] = `
 </button>
 `;
 
-exports[`EuiButtonIcon props color secondary is rendered 1`] = `
-<button
-  aria-label="button"
-  class="euiButtonIcon euiButtonIcon--secondary"
-  type="button"
->
-  <span
-    aria-hidden="true"
-    class="euiButtonIcon__icon"
-    data-euiicon-type="user"
-  />
-</button>
-`;
-
 exports[`EuiButtonIcon props color subdued is rendered 1`] = `
 <button
   aria-label="button"
diff --git a/src/components/button/button_icon/button_icon.tsx b/src/components/button/button_icon/button_icon.tsx
index 7f122ea092c..95d76cbe5b4 100644
--- a/src/components/button/button_icon/button_icon.tsx
+++ b/src/components/button/button_icon/button_icon.tsx
@@ -46,7 +46,6 @@ export type EuiButtonIconColor =
   | 'subdued'
   | 'success'
   | 'text'
-  | 'secondary'
   | 'warning';
 
 export interface EuiButtonIconProps extends CommonProps {
@@ -96,7 +95,6 @@ const colorToClassNameMap: { [color in EuiButtonIconColor]: string } = {
   success: 'euiButtonIcon--success',
   text: 'euiButtonIcon--text',
   warning: 'euiButtonIcon--warning',
-  secondary: 'euiButtonIcon--secondary',
 };
 
 export const COLORS = keysOf(colorToClassNameMap);

From e68939098fcfdf52e8e967bd8b82ef27baa831e3 Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Tue, 1 Dec 2020 17:39:25 -0500
Subject: [PATCH 6/9] fix cl

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76d1b452a0f..06769f771fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,5 @@
 ## [`master`](https://github.com/elastic/eui/tree/master)
 
-- Upgraded `highlight.js` to 9.18.5 ([#4313](https://github.com/elastic/eui/pull/4313)) 
 - Added `success` and `warning` colors to `EuiButtonEmpty` ([#4325](https://github.com/elastic/eui/pull/4325))
 
 **Theme: Amsterdam**

From a1442aa8153289b6a4b809fabc75e286f8ae3c04 Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Tue, 1 Dec 2020 17:42:46 -0500
Subject: [PATCH 7/9] removed secondary from button icon types

---
 src/components/button/button_icon/_variables.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/button/button_icon/_variables.scss b/src/components/button/button_icon/_variables.scss
index f9d9da7e26c..61519014012 100644
--- a/src/components/button/button_icon/_variables.scss
+++ b/src/components/button/button_icon/_variables.scss
@@ -9,5 +9,4 @@ $euiButtonIconTypes: (
   success: $euiColorSuccessText,
   text: $euiTextColor,
   warning: $euiColorWarningText,
-  secondary: $euiColorSuccessText,
 );

From d8f87228177e1eb5f1fc011ff4e7b310c5779c68 Mon Sep 17 00:00:00 2001
From: Andrea Del Rio <delrio.andre@gmail.com>
Date: Wed, 2 Dec 2020 13:54:38 -0500
Subject: [PATCH 8/9] pr feedback

---
 src-docs/src/views/button/button_empty.js             | 4 ++--
 src/components/button/button_empty/_button_empty.scss | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-docs/src/views/button/button_empty.js b/src-docs/src/views/button/button_empty.js
index 4877b336a88..16c1a7eb93b 100644
--- a/src-docs/src/views/button/button_empty.js
+++ b/src-docs/src/views/button/button_empty.js
@@ -51,7 +51,7 @@ export default () => (
     <EuiFlexGroup gutterSize="s" alignItems="center">
       <EuiFlexItem grow={false}>
         <EuiButtonEmpty onClick={() => {}} iconType="arrowDown">
-          arrowDown
+          Icon left
         </EuiButtonEmpty>
       </EuiFlexItem>
 
@@ -60,7 +60,7 @@ export default () => (
           onClick={() => {}}
           iconType="arrowDown"
           iconSide="right">
-          arrowDown right
+          Icon right
         </EuiButtonEmpty>
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/src/components/button/button_empty/_button_empty.scss b/src/components/button/button_empty/_button_empty.scss
index 2227c7a77f0..462b525aa25 100644
--- a/src/components/button/button_empty/_button_empty.scss
+++ b/src/components/button/button_empty/_button_empty.scss
@@ -69,8 +69,8 @@
 
 // Modifier naming and colors.
 $euiButtonEmptyTypes: (
-  primary: $euiColorPrimary,
-  danger: $euiColorDanger,
+  primary: $euiColorPrimaryText,
+  danger: $euiColorDangerText,
   disabled: $euiButtonColorDisabledText,
   ghost: $euiColorGhost,
   text: $euiTextColor,

From 7e2585af7ad5807683d65578f4497f4fe03b6ac5 Mon Sep 17 00:00:00 2001
From: Caroline Horn <549577+cchaos@users.noreply.github.com>
Date: Thu, 3 Dec 2020 11:52:31 -0500
Subject: [PATCH 9/9] CL

---
 CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fc6f7374d7..ef3aa15c358 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,10 +13,6 @@
 - Removed the shadow in `EuiComment` ([#4321](https://github.com/elastic/eui/pull/4321))
 - Reduced font size for `xs` size in `EuiButtonEmpty` ([#4325](https://github.com/elastic/eui/pull/4325))
 
-**Bug fixes**
-
-- Expose `EuiErrorBoundary` error message not showing in non-Chromium browsers ([#4324](https://github.com/elastic/eui/pull/4324))
-
 ## [`30.5.1`](https://github.com/elastic/eui/tree/v30.5.1)
 
 - Upgraded `highlight.js` to 9.18.5 ([#4313](https://github.com/elastic/eui/pull/4313))