diff --git a/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap
index c930457508..83a0140a86 100644
--- a/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap
+++ b/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap
@@ -59,7 +59,7 @@ Object {
                 class="euiForm"
               >
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="nameFormRow"
                   id="random_html_id-row"
                 >
@@ -77,13 +77,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="name"
                           type="text"
@@ -94,7 +94,7 @@ Object {
                   </div>
                 </div>
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="descriptionFormRow"
                   id="random_html_id-row"
                 >
@@ -112,13 +112,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="description"
                           type="text"
@@ -268,7 +268,7 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -303,13 +303,13 @@ Object {
                                       autocapitalize="off"
                                       autocomplete="off"
                                       autocorrect="off"
-                                      class="euiTextArea euiTextArea--resizeVertical"
+                                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                       data-test-subj="searchAutocompleteTextArea"
                                       enterkeyhint="search"
                                       id="autocomplete-textarea"
                                       maxlength="16384"
                                       placeholder="Enter query"
-                                      rows="6"
+                                      rows="3"
                                       spellcheck="false"
                                       style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
@@ -455,7 +455,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -475,18 +475,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select services and entities"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="servicesEntitiesComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -523,7 +523,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -664,13 +664,13 @@ Object {
                               class="euiFlexItem"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
-                                    class="euiFieldSearch"
+                                    class="euiFieldSearch euiFieldSearch--compressed"
                                     placeholder="Service name"
                                     type="search"
                                     value=""
@@ -683,7 +683,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -855,7 +855,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -876,18 +876,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select trace groups"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="traceGroupsComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -924,7 +924,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -1078,7 +1078,7 @@ Object {
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="cancelCreateButton"
                   type="button"
                 >
@@ -1100,7 +1100,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                     data-test-subj="createButton"
                     disabled=""
                     type="button"
@@ -1124,7 +1124,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                     data-test-subj="createAndSetButton"
                     disabled=""
                     type="button"
@@ -1316,7 +1316,7 @@ Object {
               class="euiForm"
             >
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="nameFormRow"
                 id="random_html_id-row"
               >
@@ -1334,13 +1334,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="name"
                         type="text"
@@ -1351,7 +1351,7 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="descriptionFormRow"
                 id="random_html_id-row"
               >
@@ -1369,13 +1369,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="description"
                         type="text"
@@ -1525,7 +1525,7 @@ Object {
                           class="euiFlexItem"
                         >
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -1560,13 +1560,13 @@ Object {
                                     autocapitalize="off"
                                     autocomplete="off"
                                     autocorrect="off"
-                                    class="euiTextArea euiTextArea--resizeVertical"
+                                    class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                     data-test-subj="searchAutocompleteTextArea"
                                     enterkeyhint="search"
                                     id="autocomplete-textarea"
                                     maxlength="16384"
                                     placeholder="Enter query"
-                                    rows="6"
+                                    rows="3"
                                     spellcheck="false"
                                     style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
@@ -1712,7 +1712,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -1732,18 +1732,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select services and entities"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="servicesEntitiesComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -1780,7 +1780,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -1921,13 +1921,13 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <input
-                                  class="euiFieldSearch"
+                                  class="euiFieldSearch euiFieldSearch--compressed"
                                   placeholder="Service name"
                                   type="search"
                                   value=""
@@ -1940,7 +1940,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -2112,7 +2112,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -2133,18 +2133,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select trace groups"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="traceGroupsComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -2181,7 +2181,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -2335,7 +2335,7 @@ Object {
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="cancelCreateButton"
                 type="button"
               >
@@ -2357,7 +2357,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                   data-test-subj="createButton"
                   disabled=""
                   type="button"
@@ -2381,7 +2381,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                   data-test-subj="createAndSetButton"
                   disabled=""
                   type="button"
@@ -2513,7 +2513,7 @@ Object {
                 class="euiForm"
               >
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="nameFormRow"
                   id="random_html_id-row"
                 >
@@ -2531,13 +2531,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="name"
                           type="text"
@@ -2548,7 +2548,7 @@ Object {
                   </div>
                 </div>
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="descriptionFormRow"
                   id="random_html_id-row"
                 >
@@ -2566,13 +2566,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="description"
                           type="text"
@@ -2723,7 +2723,7 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -2758,13 +2758,13 @@ Object {
                                       autocapitalize="off"
                                       autocomplete="off"
                                       autocorrect="off"
-                                      class="euiTextArea euiTextArea--resizeVertical"
+                                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                       data-test-subj="searchAutocompleteTextArea"
                                       enterkeyhint="search"
                                       id="autocomplete-textarea"
                                       maxlength="16384"
                                       placeholder="Enter query"
-                                      rows="6"
+                                      rows="3"
                                       spellcheck="false"
                                       style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
@@ -2908,7 +2908,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -2928,18 +2928,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select services and entities"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="servicesEntitiesComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -2976,7 +2976,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -3117,13 +3117,13 @@ Object {
                               class="euiFlexItem"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
-                                    class="euiFieldSearch"
+                                    class="euiFieldSearch euiFieldSearch--compressed"
                                     placeholder="Service name"
                                     type="search"
                                     value=""
@@ -3136,7 +3136,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -3311,7 +3311,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -3332,18 +3332,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select trace groups"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="traceGroupsComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -3411,7 +3411,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -3565,7 +3565,7 @@ Object {
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="cancelCreateButton"
                   type="button"
                 >
@@ -3587,7 +3587,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                     data-test-subj="createButton"
                     disabled=""
                     type="button"
@@ -3611,7 +3611,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                     data-test-subj="createAndSetButton"
                     disabled=""
                     type="button"
@@ -3684,7 +3684,7 @@ Object {
               class="euiForm"
             >
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="nameFormRow"
                 id="random_html_id-row"
               >
@@ -3702,13 +3702,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="name"
                         type="text"
@@ -3719,7 +3719,7 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="descriptionFormRow"
                 id="random_html_id-row"
               >
@@ -3737,13 +3737,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="description"
                         type="text"
@@ -3894,7 +3894,7 @@ Object {
                           class="euiFlexItem"
                         >
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -3929,13 +3929,13 @@ Object {
                                     autocapitalize="off"
                                     autocomplete="off"
                                     autocorrect="off"
-                                    class="euiTextArea euiTextArea--resizeVertical"
+                                    class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                     data-test-subj="searchAutocompleteTextArea"
                                     enterkeyhint="search"
                                     id="autocomplete-textarea"
                                     maxlength="16384"
                                     placeholder="Enter query"
-                                    rows="6"
+                                    rows="3"
                                     spellcheck="false"
                                     style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
@@ -4079,7 +4079,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -4099,18 +4099,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select services and entities"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="servicesEntitiesComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -4147,7 +4147,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -4288,13 +4288,13 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <input
-                                  class="euiFieldSearch"
+                                  class="euiFieldSearch euiFieldSearch--compressed"
                                   placeholder="Service name"
                                   type="search"
                                   value=""
@@ -4307,7 +4307,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -4482,7 +4482,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -4503,18 +4503,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select trace groups"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="traceGroupsComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -4582,7 +4582,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -4736,7 +4736,7 @@ Object {
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="cancelCreateButton"
                 type="button"
               >
@@ -4758,7 +4758,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                   data-test-subj="createButton"
                   disabled=""
                   type="button"
@@ -4782,7 +4782,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                   data-test-subj="createAndSetButton"
                   disabled=""
                   type="button"
@@ -4914,7 +4914,7 @@ Object {
                 class="euiForm"
               >
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="nameFormRow"
                   id="random_html_id-row"
                 >
@@ -4932,13 +4932,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="name"
                           type="text"
@@ -4949,7 +4949,7 @@ Object {
                   </div>
                 </div>
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="descriptionFormRow"
                   id="random_html_id-row"
                 >
@@ -4967,13 +4967,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="description"
                           type="text"
@@ -5124,7 +5124,7 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -5159,13 +5159,13 @@ Object {
                                       autocapitalize="off"
                                       autocomplete="off"
                                       autocorrect="off"
-                                      class="euiTextArea euiTextArea--resizeVertical"
+                                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                       data-test-subj="searchAutocompleteTextArea"
                                       enterkeyhint="search"
                                       id="autocomplete-textarea"
                                       maxlength="16384"
                                       placeholder="Enter query"
-                                      rows="6"
+                                      rows="3"
                                       spellcheck="false"
                                       style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
@@ -5312,7 +5312,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -5332,18 +5332,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select services and entities"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="servicesEntitiesComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -5411,7 +5411,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -5552,13 +5552,13 @@ Object {
                               class="euiFlexItem"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
-                                    class="euiFieldSearch"
+                                    class="euiFieldSearch euiFieldSearch--compressed"
                                     placeholder="Service name"
                                     type="search"
                                     value=""
@@ -5571,7 +5571,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -5743,7 +5743,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -5764,18 +5764,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select trace groups"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="traceGroupsComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -5812,7 +5812,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -5966,7 +5966,7 @@ Object {
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="cancelCreateButton"
                   type="button"
                 >
@@ -5988,7 +5988,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                     data-test-subj="createButton"
                     disabled=""
                     type="button"
@@ -6012,7 +6012,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                     data-test-subj="createAndSetButton"
                     disabled=""
                     type="button"
@@ -6085,7 +6085,7 @@ Object {
               class="euiForm"
             >
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="nameFormRow"
                 id="random_html_id-row"
               >
@@ -6103,13 +6103,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="name"
                         type="text"
@@ -6120,7 +6120,7 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="descriptionFormRow"
                 id="random_html_id-row"
               >
@@ -6138,13 +6138,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="description"
                         type="text"
@@ -6295,7 +6295,7 @@ Object {
                           class="euiFlexItem"
                         >
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -6330,13 +6330,13 @@ Object {
                                     autocapitalize="off"
                                     autocomplete="off"
                                     autocorrect="off"
-                                    class="euiTextArea euiTextArea--resizeVertical"
+                                    class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                     data-test-subj="searchAutocompleteTextArea"
                                     enterkeyhint="search"
                                     id="autocomplete-textarea"
                                     maxlength="16384"
                                     placeholder="Enter query"
-                                    rows="6"
+                                    rows="3"
                                     spellcheck="false"
                                     style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
@@ -6483,7 +6483,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -6503,18 +6503,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select services and entities"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="servicesEntitiesComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -6582,7 +6582,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -6723,13 +6723,13 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <input
-                                  class="euiFieldSearch"
+                                  class="euiFieldSearch euiFieldSearch--compressed"
                                   placeholder="Service name"
                                   type="search"
                                   value=""
@@ -6742,7 +6742,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -6914,7 +6914,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -6935,18 +6935,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select trace groups"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="traceGroupsComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -6983,7 +6983,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -7137,7 +7137,7 @@ Object {
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="cancelCreateButton"
                 type="button"
               >
@@ -7159,7 +7159,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                   data-test-subj="createButton"
                   disabled=""
                   type="button"
@@ -7183,7 +7183,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                   data-test-subj="createAndSetButton"
                   disabled=""
                   type="button"
@@ -7313,7 +7313,7 @@ Object {
                 class="euiForm"
               >
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="nameFormRow"
                   id="random_html_id-row"
                 >
@@ -7331,13 +7331,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="name"
                           type="text"
@@ -7348,7 +7348,7 @@ Object {
                   </div>
                 </div>
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="descriptionFormRow"
                   id="random_html_id-row"
                 >
@@ -7366,13 +7366,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="description"
                           type="text"
@@ -7522,7 +7522,7 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -7557,13 +7557,13 @@ Object {
                                       autocapitalize="off"
                                       autocomplete="off"
                                       autocorrect="off"
-                                      class="euiTextArea euiTextArea--resizeVertical"
+                                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                       data-test-subj="searchAutocompleteTextArea"
                                       enterkeyhint="search"
                                       id="autocomplete-textarea"
                                       maxlength="16384"
                                       placeholder="Enter query"
-                                      rows="6"
+                                      rows="3"
                                       spellcheck="false"
                                       style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
@@ -7706,7 +7706,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -7726,18 +7726,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select services and entities"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="servicesEntitiesComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -7774,7 +7774,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -7914,13 +7914,13 @@ Object {
                               class="euiFlexItem"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
-                                    class="euiFieldSearch"
+                                    class="euiFieldSearch euiFieldSearch--compressed"
                                     placeholder="Service name"
                                     type="search"
                                     value=""
@@ -7933,7 +7933,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -8104,7 +8104,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -8125,18 +8125,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select trace groups"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="traceGroupsComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -8173,7 +8173,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -8326,7 +8326,7 @@ Object {
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="cancelCreateButton"
                   type="button"
                 >
@@ -8348,7 +8348,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                     data-test-subj="createButton"
                     disabled=""
                     type="button"
@@ -8372,7 +8372,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                     data-test-subj="createAndSetButton"
                     disabled=""
                     type="button"
@@ -8445,7 +8445,7 @@ Object {
               class="euiForm"
             >
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="nameFormRow"
                 id="random_html_id-row"
               >
@@ -8463,13 +8463,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="name"
                         type="text"
@@ -8480,7 +8480,7 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="descriptionFormRow"
                 id="random_html_id-row"
               >
@@ -8498,13 +8498,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="description"
                         type="text"
@@ -8654,7 +8654,7 @@ Object {
                           class="euiFlexItem"
                         >
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -8689,13 +8689,13 @@ Object {
                                     autocapitalize="off"
                                     autocomplete="off"
                                     autocorrect="off"
-                                    class="euiTextArea euiTextArea--resizeVertical"
+                                    class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                     data-test-subj="searchAutocompleteTextArea"
                                     enterkeyhint="search"
                                     id="autocomplete-textarea"
                                     maxlength="16384"
                                     placeholder="Enter query"
-                                    rows="6"
+                                    rows="3"
                                     spellcheck="false"
                                     style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
@@ -8838,7 +8838,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -8858,18 +8858,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select services and entities"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="servicesEntitiesComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -8906,7 +8906,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -9046,13 +9046,13 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <input
-                                  class="euiFieldSearch"
+                                  class="euiFieldSearch euiFieldSearch--compressed"
                                   placeholder="Service name"
                                   type="search"
                                   value=""
@@ -9065,7 +9065,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -9236,7 +9236,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -9257,18 +9257,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select trace groups"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="traceGroupsComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -9305,7 +9305,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -9458,7 +9458,7 @@ Object {
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="cancelCreateButton"
                 type="button"
               >
@@ -9480,7 +9480,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                   data-test-subj="createButton"
                   disabled=""
                   type="button"
@@ -9504,7 +9504,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                   data-test-subj="createAndSetButton"
                   disabled=""
                   type="button"
@@ -9634,7 +9634,7 @@ Object {
                 class="euiForm"
               >
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="nameFormRow"
                   id="random_html_id-row"
                 >
@@ -9652,13 +9652,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="name"
                           type="text"
@@ -9669,7 +9669,7 @@ Object {
                   </div>
                 </div>
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="descriptionFormRow"
                   id="random_html_id-row"
                 >
@@ -9687,13 +9687,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="description"
                           type="text"
@@ -9844,7 +9844,7 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -9879,13 +9879,13 @@ Object {
                                       autocapitalize="off"
                                       autocomplete="off"
                                       autocorrect="off"
-                                      class="euiTextArea euiTextArea--resizeVertical"
+                                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                       data-test-subj="searchAutocompleteTextArea"
                                       enterkeyhint="search"
                                       id="autocomplete-textarea"
                                       maxlength="16384"
                                       placeholder="Enter query"
-                                      rows="6"
+                                      rows="3"
                                       spellcheck="false"
                                       style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
@@ -10031,7 +10031,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -10051,18 +10051,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select services and entities"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="servicesEntitiesComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -10099,7 +10099,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -10240,13 +10240,13 @@ Object {
                               class="euiFlexItem"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
-                                    class="euiFieldSearch"
+                                    class="euiFieldSearch euiFieldSearch--compressed"
                                     placeholder="Service name"
                                     type="search"
                                     value=""
@@ -10259,7 +10259,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -10431,7 +10431,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -10452,18 +10452,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select trace groups"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="traceGroupsComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -10500,7 +10500,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -10654,7 +10654,7 @@ Object {
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="cancelCreateButton"
                   type="button"
                 >
@@ -10676,7 +10676,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="createButton"
                     type="button"
                   >
@@ -10699,7 +10699,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton--fill"
+                    class="euiButton euiButton--primary euiButton--small euiButton--fill"
                     data-test-subj="createAndSetButton"
                     type="button"
                   >
@@ -10771,7 +10771,7 @@ Object {
               class="euiForm"
             >
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="nameFormRow"
                 id="random_html_id-row"
               >
@@ -10789,13 +10789,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="name"
                         type="text"
@@ -10806,7 +10806,7 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="descriptionFormRow"
                 id="random_html_id-row"
               >
@@ -10824,13 +10824,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="description"
                         type="text"
@@ -10981,7 +10981,7 @@ Object {
                           class="euiFlexItem"
                         >
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -11016,13 +11016,13 @@ Object {
                                     autocapitalize="off"
                                     autocomplete="off"
                                     autocorrect="off"
-                                    class="euiTextArea euiTextArea--resizeVertical"
+                                    class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                     data-test-subj="searchAutocompleteTextArea"
                                     enterkeyhint="search"
                                     id="autocomplete-textarea"
                                     maxlength="16384"
                                     placeholder="Enter query"
-                                    rows="6"
+                                    rows="3"
                                     spellcheck="false"
                                     style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
@@ -11168,7 +11168,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -11188,18 +11188,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select services and entities"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="servicesEntitiesComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -11236,7 +11236,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -11377,13 +11377,13 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <input
-                                  class="euiFieldSearch"
+                                  class="euiFieldSearch euiFieldSearch--compressed"
                                   placeholder="Service name"
                                   type="search"
                                   value=""
@@ -11396,7 +11396,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -11568,7 +11568,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -11589,18 +11589,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select trace groups"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="traceGroupsComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -11637,7 +11637,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -11791,7 +11791,7 @@ Object {
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="cancelCreateButton"
                 type="button"
               >
@@ -11813,7 +11813,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="createButton"
                   type="button"
                 >
@@ -11836,7 +11836,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton--fill"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill"
                   data-test-subj="createAndSetButton"
                   type="button"
                 >
@@ -11967,7 +11967,7 @@ Object {
                 class="euiForm"
               >
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="nameFormRow"
                   id="random_html_id-row"
                 >
@@ -11985,13 +11985,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="name"
                           type="text"
@@ -12002,7 +12002,7 @@ Object {
                   </div>
                 </div>
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="descriptionFormRow"
                   id="random_html_id-row"
                 >
@@ -12020,13 +12020,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="description"
                           type="text"
@@ -12177,7 +12177,7 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -12212,13 +12212,13 @@ Object {
                                       autocapitalize="off"
                                       autocomplete="off"
                                       autocorrect="off"
-                                      class="euiTextArea euiTextArea--resizeVertical"
+                                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                       data-test-subj="searchAutocompleteTextArea"
                                       enterkeyhint="search"
                                       id="autocomplete-textarea"
                                       maxlength="16384"
                                       placeholder="Enter query"
-                                      rows="6"
+                                      rows="3"
                                       spellcheck="false"
                                       style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
@@ -12365,7 +12365,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -12385,18 +12385,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select services and entities"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="servicesEntitiesComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -12464,7 +12464,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -12605,13 +12605,13 @@ Object {
                               class="euiFlexItem"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
-                                    class="euiFieldSearch"
+                                    class="euiFieldSearch euiFieldSearch--compressed"
                                     placeholder="Service name"
                                     type="search"
                                     value=""
@@ -12624,7 +12624,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -12796,7 +12796,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -12817,18 +12817,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select trace groups"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="traceGroupsComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -12865,7 +12865,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -13019,7 +13019,7 @@ Object {
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="cancelCreateButton"
                   type="button"
                 >
@@ -13041,7 +13041,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                     data-test-subj="createButton"
                     disabled=""
                     type="button"
@@ -13065,7 +13065,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                     data-test-subj="createAndSetButton"
                     disabled=""
                     type="button"
@@ -13138,7 +13138,7 @@ Object {
               class="euiForm"
             >
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="nameFormRow"
                 id="random_html_id-row"
               >
@@ -13156,13 +13156,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="name"
                         type="text"
@@ -13173,7 +13173,7 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="descriptionFormRow"
                 id="random_html_id-row"
               >
@@ -13191,13 +13191,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="description"
                         type="text"
@@ -13348,7 +13348,7 @@ Object {
                           class="euiFlexItem"
                         >
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -13383,13 +13383,13 @@ Object {
                                     autocapitalize="off"
                                     autocomplete="off"
                                     autocorrect="off"
-                                    class="euiTextArea euiTextArea--resizeVertical"
+                                    class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                     data-test-subj="searchAutocompleteTextArea"
                                     enterkeyhint="search"
                                     id="autocomplete-textarea"
                                     maxlength="16384"
                                     placeholder="Enter query"
-                                    rows="6"
+                                    rows="3"
                                     spellcheck="false"
                                     style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
@@ -13536,7 +13536,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -13556,18 +13556,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select services and entities"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="servicesEntitiesComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -13635,7 +13635,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -13776,13 +13776,13 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <input
-                                  class="euiFieldSearch"
+                                  class="euiFieldSearch euiFieldSearch--compressed"
                                   placeholder="Service name"
                                   type="search"
                                   value=""
@@ -13795,7 +13795,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -13967,7 +13967,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -13988,18 +13988,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select trace groups"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="traceGroupsComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -14036,7 +14036,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -14190,7 +14190,7 @@ Object {
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="cancelCreateButton"
                 type="button"
               >
@@ -14212,7 +14212,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                   data-test-subj="createButton"
                   disabled=""
                   type="button"
@@ -14236,7 +14236,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                   data-test-subj="createAndSetButton"
                   disabled=""
                   type="button"
@@ -14368,7 +14368,7 @@ Object {
                 class="euiForm"
               >
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="nameFormRow"
                   id="random_html_id-row"
                 >
@@ -14386,13 +14386,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="name"
                           type="text"
@@ -14403,7 +14403,7 @@ Object {
                   </div>
                 </div>
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="descriptionFormRow"
                   id="random_html_id-row"
                 >
@@ -14421,13 +14421,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="description"
                           type="text"
@@ -14578,7 +14578,7 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -14613,13 +14613,13 @@ Object {
                                       autocapitalize="off"
                                       autocomplete="off"
                                       autocorrect="off"
-                                      class="euiTextArea euiTextArea--resizeVertical"
+                                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                       data-test-subj="searchAutocompleteTextArea"
                                       enterkeyhint="search"
                                       id="autocomplete-textarea"
                                       maxlength="16384"
                                       placeholder="Enter query"
-                                      rows="6"
+                                      rows="3"
                                       spellcheck="false"
                                       style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
@@ -14763,7 +14763,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -14783,18 +14783,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select services and entities"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="servicesEntitiesComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -14831,7 +14831,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -14972,13 +14972,13 @@ Object {
                               class="euiFlexItem"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
-                                    class="euiFieldSearch"
+                                    class="euiFieldSearch euiFieldSearch--compressed"
                                     placeholder="Service name"
                                     type="search"
                                     value=""
@@ -14991,7 +14991,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -15166,7 +15166,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -15187,18 +15187,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select trace groups"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="traceGroupsComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -15266,7 +15266,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -15420,7 +15420,7 @@ Object {
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="cancelCreateButton"
                   type="button"
                 >
@@ -15442,7 +15442,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                     data-test-subj="createButton"
                     disabled=""
                     type="button"
@@ -15466,7 +15466,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                     data-test-subj="createAndSetButton"
                     disabled=""
                     type="button"
@@ -15539,7 +15539,7 @@ Object {
               class="euiForm"
             >
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="nameFormRow"
                 id="random_html_id-row"
               >
@@ -15557,13 +15557,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="name"
                         type="text"
@@ -15574,7 +15574,7 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="descriptionFormRow"
                 id="random_html_id-row"
               >
@@ -15592,13 +15592,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="description"
                         type="text"
@@ -15749,7 +15749,7 @@ Object {
                           class="euiFlexItem"
                         >
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -15784,13 +15784,13 @@ Object {
                                     autocapitalize="off"
                                     autocomplete="off"
                                     autocorrect="off"
-                                    class="euiTextArea euiTextArea--resizeVertical"
+                                    class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                     data-test-subj="searchAutocompleteTextArea"
                                     enterkeyhint="search"
                                     id="autocomplete-textarea"
                                     maxlength="16384"
                                     placeholder="Enter query"
-                                    rows="6"
+                                    rows="3"
                                     spellcheck="false"
                                     style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
@@ -15934,7 +15934,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -15954,18 +15954,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select services and entities"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="servicesEntitiesComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -16002,7 +16002,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -16143,13 +16143,13 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <input
-                                  class="euiFieldSearch"
+                                  class="euiFieldSearch euiFieldSearch--compressed"
                                   placeholder="Service name"
                                   type="search"
                                   value=""
@@ -16162,7 +16162,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -16337,7 +16337,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -16358,18 +16358,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select trace groups"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="traceGroupsComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -16437,7 +16437,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -16591,7 +16591,7 @@ Object {
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="cancelCreateButton"
                 type="button"
               >
@@ -16613,7 +16613,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                   data-test-subj="createButton"
                   disabled=""
                   type="button"
@@ -16637,7 +16637,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                   data-test-subj="createAndSetButton"
                   disabled=""
                   type="button"
@@ -16772,7 +16772,7 @@ Object {
                 class="euiForm"
               >
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="nameFormRow"
                   id="random_html_id-row"
                 >
@@ -16790,13 +16790,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="name"
                           type="text"
@@ -16807,7 +16807,7 @@ Object {
                   </div>
                 </div>
                 <div
-                  class="euiFormRow"
+                  class="euiFormRow euiFormRow--compressed"
                   data-test-subj="descriptionFormRow"
                   id="random_html_id-row"
                 >
@@ -16825,13 +16825,13 @@ Object {
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiFormControlLayout"
+                      class="euiFormControlLayout euiFormControlLayout--compressed"
                     >
                       <div
                         class="euiFormControlLayout__childrenWrapper"
                       >
                         <input
-                          class="euiFieldText"
+                          class="euiFieldText euiFieldText--compressed"
                           id="random_html_id"
                           name="description"
                           type="text"
@@ -16981,7 +16981,7 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -17016,13 +17016,13 @@ Object {
                                       autocapitalize="off"
                                       autocomplete="off"
                                       autocorrect="off"
-                                      class="euiTextArea euiTextArea--resizeVertical"
+                                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                       data-test-subj="searchAutocompleteTextArea"
                                       enterkeyhint="search"
                                       id="autocomplete-textarea"
                                       maxlength="16384"
                                       placeholder="Enter query"
-                                      rows="6"
+                                      rows="3"
                                       spellcheck="false"
                                       style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
@@ -17168,7 +17168,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -17188,18 +17188,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select services and entities"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="servicesEntitiesComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -17236,7 +17236,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -17377,13 +17377,13 @@ Object {
                               class="euiFlexItem"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
-                                    class="euiFieldSearch"
+                                    class="euiFieldSearch euiFieldSearch--compressed"
                                     placeholder="Service name"
                                     type="search"
                                     value=""
@@ -17396,7 +17396,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -17568,7 +17568,7 @@ Object {
                         class="euiAccordion__padding--l"
                       >
                         <div
-                          class="euiFormRow"
+                          class="euiFormRow euiFormRow--compressed"
                           id="random_html_id-row"
                         >
                           <div
@@ -17589,18 +17589,18 @@ Object {
                               aria-expanded="false"
                               aria-haspopup="listbox"
                               aria-label="Select trace groups"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               data-test-subj="traceGroupsComboBox"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -17637,7 +17637,7 @@ Object {
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -17791,7 +17791,7 @@ Object {
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="cancelCreateButton"
                   type="button"
                 >
@@ -17813,7 +17813,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                     data-test-subj="createButton"
                     disabled=""
                     type="button"
@@ -17837,7 +17837,7 @@ Object {
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                    class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                     data-test-subj="createAndSetButton"
                     disabled=""
                     type="button"
@@ -18029,7 +18029,7 @@ Object {
               class="euiForm"
             >
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="nameFormRow"
                 id="random_html_id-row"
               >
@@ -18047,13 +18047,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="name"
                         type="text"
@@ -18064,7 +18064,7 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFormRow"
+                class="euiFormRow euiFormRow--compressed"
                 data-test-subj="descriptionFormRow"
                 id="random_html_id-row"
               >
@@ -18082,13 +18082,13 @@ Object {
                   class="euiFormRow__fieldWrapper"
                 >
                   <div
-                    class="euiFormControlLayout"
+                    class="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       class="euiFormControlLayout__childrenWrapper"
                     >
                       <input
-                        class="euiFieldText"
+                        class="euiFieldText euiFieldText--compressed"
                         id="random_html_id"
                         name="description"
                         type="text"
@@ -18238,7 +18238,7 @@ Object {
                           class="euiFlexItem"
                         >
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -18273,13 +18273,13 @@ Object {
                                     autocapitalize="off"
                                     autocomplete="off"
                                     autocorrect="off"
-                                    class="euiTextArea euiTextArea--resizeVertical"
+                                    class="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
                                     data-test-subj="searchAutocompleteTextArea"
                                     enterkeyhint="search"
                                     id="autocomplete-textarea"
                                     maxlength="16384"
                                     placeholder="Enter query"
-                                    rows="6"
+                                    rows="3"
                                     spellcheck="false"
                                     style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
@@ -18425,7 +18425,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -18445,18 +18445,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select services and entities"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="servicesEntitiesComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -18493,7 +18493,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -18634,13 +18634,13 @@ Object {
                             class="euiFlexItem"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <input
-                                  class="euiFieldSearch"
+                                  class="euiFieldSearch euiFieldSearch--compressed"
                                   placeholder="Service name"
                                   type="search"
                                   value=""
@@ -18653,7 +18653,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -18825,7 +18825,7 @@ Object {
                       class="euiAccordion__padding--l"
                     >
                       <div
-                        class="euiFormRow"
+                        class="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -18846,18 +18846,18 @@ Object {
                             aria-expanded="false"
                             aria-haspopup="listbox"
                             aria-label="Select trace groups"
-                            class="euiComboBox"
+                            class="euiComboBox euiComboBox--compressed"
                             data-test-subj="traceGroupsComboBox"
                             role="combobox"
                           >
                             <div
-                              class="euiFormControlLayout"
+                              class="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 class="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  class="euiComboBox__inputWrap"
+                                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                   data-test-subj="comboBoxInput"
                                   tabindex="-1"
                                 >
@@ -18894,7 +18894,7 @@ Object {
                                   >
                                     <svg
                                       aria-hidden="true"
-                                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height="16"
                                       role="img"
@@ -19048,7 +19048,7 @@ Object {
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="cancelCreateButton"
                 type="button"
               >
@@ -19070,7 +19070,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                   data-test-subj="createButton"
                   disabled=""
                   type="button"
@@ -19094,7 +19094,7 @@ Object {
                 class="euiToolTipAnchor"
               >
                 <button
-                  class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                   data-test-subj="createAndSetButton"
                   disabled=""
                   type="button"
diff --git a/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap
index 0ccc0ae60f..73a12dc3a8 100644
--- a/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap
+++ b/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap
@@ -410,9 +410,9 @@ exports[`Log Config component renders empty log config 1`] = `
                       <div
                         className="euiFlexItem"
                       >
-                        <EuiFormRow
+                        <EuiCompressedFormRow
                           describedByIds={Array []}
-                          display="row"
+                          display="rowCompressed"
                           fullWidth={false}
                           hasChildLabel={true}
                           hasEmptyLabelSpace={false}
@@ -421,7 +421,7 @@ exports[`Log Config component renders empty log config 1`] = `
                           labelType="label"
                         >
                           <div
-                            className="euiFormRow"
+                            className="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -513,7 +513,7 @@ exports[`Log Config component renders empty log config 1`] = `
                                       id="autocomplete-root"
                                       role="combobox"
                                     >
-                                      <EuiTextArea
+                                      <EuiCompressedTextArea
                                         aria-autocomplete="both"
                                         aria-labelledby="autocomplete-0-label"
                                         autoCapitalize="off"
@@ -542,40 +542,71 @@ exports[`Log Config component renders empty log config 1`] = `
                                         type="search"
                                         value=""
                                       >
-                                        <EuiValidatableControl>
-                                          <textarea
-                                            aria-autocomplete="both"
-                                            aria-labelledby="autocomplete-0-label"
-                                            autoCapitalize="off"
-                                            autoComplete="off"
-                                            autoCorrect="off"
-                                            autoFocus={false}
-                                            className="euiTextArea euiTextArea--resizeVertical"
-                                            data-test-subj="searchAutocompleteTextArea"
-                                            disabled={false}
-                                            enterKeyHint="search"
-                                            id="autocomplete-textarea"
-                                            maxLength={16384}
-                                            onBlur={[Function]}
-                                            onChange={[Function]}
-                                            onClick={[Function]}
-                                            onFocus={[Function]}
-                                            onKeyDown={[Function]}
-                                            placeholder="Enter query"
-                                            rows={6}
-                                            spellCheck="false"
-                                            style={
-                                              Object {
-                                                "height": "18px",
-                                                "marginTop": "0px",
-                                                "padding": "8px",
-                                              }
+                                        <EuiTextArea
+                                          aria-autocomplete="both"
+                                          aria-labelledby="autocomplete-0-label"
+                                          autoCapitalize="off"
+                                          autoComplete="off"
+                                          autoCorrect="off"
+                                          autoFocus={false}
+                                          compressed={true}
+                                          data-test-subj="searchAutocompleteTextArea"
+                                          disabled={false}
+                                          enterKeyHint="search"
+                                          id="autocomplete-textarea"
+                                          maxLength={16384}
+                                          onBlur={[Function]}
+                                          onChange={[Function]}
+                                          onClick={[Function]}
+                                          onFocus={[Function]}
+                                          onKeyDown={[Function]}
+                                          placeholder="Enter query"
+                                          spellCheck="false"
+                                          style={
+                                            Object {
+                                              "height": "18px",
+                                              "marginTop": "0px",
+                                              "padding": "8px",
                                             }
-                                            type="search"
-                                            value=""
-                                          />
-                                        </EuiValidatableControl>
-                                      </EuiTextArea>
+                                          }
+                                          type="search"
+                                          value=""
+                                        >
+                                          <EuiValidatableControl>
+                                            <textarea
+                                              aria-autocomplete="both"
+                                              aria-labelledby="autocomplete-0-label"
+                                              autoCapitalize="off"
+                                              autoComplete="off"
+                                              autoCorrect="off"
+                                              autoFocus={false}
+                                              className="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
+                                              data-test-subj="searchAutocompleteTextArea"
+                                              disabled={false}
+                                              enterKeyHint="search"
+                                              id="autocomplete-textarea"
+                                              maxLength={16384}
+                                              onBlur={[Function]}
+                                              onChange={[Function]}
+                                              onClick={[Function]}
+                                              onFocus={[Function]}
+                                              onKeyDown={[Function]}
+                                              placeholder="Enter query"
+                                              rows={3}
+                                              spellCheck="false"
+                                              style={
+                                                Object {
+                                                  "height": "18px",
+                                                  "marginTop": "0px",
+                                                  "padding": "8px",
+                                                }
+                                              }
+                                              type="search"
+                                              value=""
+                                            />
+                                          </EuiValidatableControl>
+                                        </EuiTextArea>
+                                      </EuiCompressedTextArea>
                                     </div>
                                   </Autocomplete>
                                   <EuiBadge
@@ -620,7 +651,7 @@ exports[`Log Config component renders empty log config 1`] = `
                               </EuiFormHelpText>
                             </div>
                           </div>
-                        </EuiFormRow>
+                        </EuiCompressedFormRow>
                       </div>
                     </EuiFlexItem>
                   </div>
@@ -1046,9 +1077,9 @@ exports[`Log Config component renders with query 1`] = `
                       <div
                         className="euiFlexItem"
                       >
-                        <EuiFormRow
+                        <EuiCompressedFormRow
                           describedByIds={Array []}
-                          display="row"
+                          display="rowCompressed"
                           fullWidth={false}
                           hasChildLabel={true}
                           hasEmptyLabelSpace={false}
@@ -1057,7 +1088,7 @@ exports[`Log Config component renders with query 1`] = `
                           labelType="label"
                         >
                           <div
-                            className="euiFormRow"
+                            className="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -1149,7 +1180,7 @@ exports[`Log Config component renders with query 1`] = `
                                       id="autocomplete-root"
                                       role="combobox"
                                     >
-                                      <EuiTextArea
+                                      <EuiCompressedTextArea
                                         aria-autocomplete="both"
                                         aria-labelledby="autocomplete-1-label"
                                         autoCapitalize="off"
@@ -1178,40 +1209,71 @@ exports[`Log Config component renders with query 1`] = `
                                         type="search"
                                         value="source = openserach_dashboard_sample_logs"
                                       >
-                                        <EuiValidatableControl>
-                                          <textarea
-                                            aria-autocomplete="both"
-                                            aria-labelledby="autocomplete-1-label"
-                                            autoCapitalize="off"
-                                            autoComplete="off"
-                                            autoCorrect="off"
-                                            autoFocus={false}
-                                            className="euiTextArea euiTextArea--resizeVertical"
-                                            data-test-subj="searchAutocompleteTextArea"
-                                            disabled={false}
-                                            enterKeyHint="search"
-                                            id="autocomplete-textarea"
-                                            maxLength={16384}
-                                            onBlur={[Function]}
-                                            onChange={[Function]}
-                                            onClick={[Function]}
-                                            onFocus={[Function]}
-                                            onKeyDown={[Function]}
-                                            placeholder="Enter query"
-                                            rows={6}
-                                            spellCheck="false"
-                                            style={
-                                              Object {
-                                                "height": "18px",
-                                                "marginTop": "0px",
-                                                "padding": "8px",
-                                              }
+                                        <EuiTextArea
+                                          aria-autocomplete="both"
+                                          aria-labelledby="autocomplete-1-label"
+                                          autoCapitalize="off"
+                                          autoComplete="off"
+                                          autoCorrect="off"
+                                          autoFocus={false}
+                                          compressed={true}
+                                          data-test-subj="searchAutocompleteTextArea"
+                                          disabled={false}
+                                          enterKeyHint="search"
+                                          id="autocomplete-textarea"
+                                          maxLength={16384}
+                                          onBlur={[Function]}
+                                          onChange={[Function]}
+                                          onClick={[Function]}
+                                          onFocus={[Function]}
+                                          onKeyDown={[Function]}
+                                          placeholder="Enter query"
+                                          spellCheck="false"
+                                          style={
+                                            Object {
+                                              "height": "18px",
+                                              "marginTop": "0px",
+                                              "padding": "8px",
                                             }
-                                            type="search"
-                                            value="source = openserach_dashboard_sample_logs"
-                                          />
-                                        </EuiValidatableControl>
-                                      </EuiTextArea>
+                                          }
+                                          type="search"
+                                          value="source = openserach_dashboard_sample_logs"
+                                        >
+                                          <EuiValidatableControl>
+                                            <textarea
+                                              aria-autocomplete="both"
+                                              aria-labelledby="autocomplete-1-label"
+                                              autoCapitalize="off"
+                                              autoComplete="off"
+                                              autoCorrect="off"
+                                              autoFocus={false}
+                                              className="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
+                                              data-test-subj="searchAutocompleteTextArea"
+                                              disabled={false}
+                                              enterKeyHint="search"
+                                              id="autocomplete-textarea"
+                                              maxLength={16384}
+                                              onBlur={[Function]}
+                                              onChange={[Function]}
+                                              onClick={[Function]}
+                                              onFocus={[Function]}
+                                              onKeyDown={[Function]}
+                                              placeholder="Enter query"
+                                              rows={3}
+                                              spellCheck="false"
+                                              style={
+                                                Object {
+                                                  "height": "18px",
+                                                  "marginTop": "0px",
+                                                  "padding": "8px",
+                                                }
+                                              }
+                                              type="search"
+                                              value="source = openserach_dashboard_sample_logs"
+                                            />
+                                          </EuiValidatableControl>
+                                        </EuiTextArea>
+                                      </EuiCompressedTextArea>
                                     </div>
                                   </Autocomplete>
                                   <EuiBadge
@@ -1256,7 +1318,7 @@ exports[`Log Config component renders with query 1`] = `
                               </EuiFormHelpText>
                             </div>
                           </div>
-                        </EuiFormRow>
+                        </EuiCompressedFormRow>
                       </div>
                     </EuiFlexItem>
                   </div>
diff --git a/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap
index 2a759f4418..34a531e58b 100644
--- a/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap
+++ b/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap
@@ -407,9 +407,9 @@ exports[`Service Config component renders empty service config 1`] = `
               <div
                 className="euiAccordion__padding--l"
               >
-                <EuiFormRow
+                <EuiCompressedFormRow
                   describedByIds={Array []}
-                  display="row"
+                  display="rowCompressed"
                   fullWidth={false}
                   hasChildLabel={true}
                   hasEmptyLabelSpace={false}
@@ -417,7 +417,7 @@ exports[`Service Config component renders empty service config 1`] = `
                   labelType="label"
                 >
                   <div
-                    className="euiFormRow"
+                    className="euiFormRow euiFormRow--compressed"
                     id="random_html_id-row"
                   >
                     <div
@@ -440,10 +440,10 @@ exports[`Service Config component renders empty service config 1`] = `
                     <div
                       className="euiFormRow__fieldWrapper"
                     >
-                      <EuiComboBox
+                      <EuiCompressedComboBox
                         aria-label="Select services and entities"
                         async={false}
-                        compressed={false}
+                        compressed={true}
                         data-test-subj="servicesEntitiesComboBox"
                         fullWidth={false}
                         id="random_html_id"
@@ -461,14 +461,14 @@ exports[`Service Config component renders empty service config 1`] = `
                           aria-expanded={false}
                           aria-haspopup="listbox"
                           aria-label="Select services and entities"
-                          className="euiComboBox"
+                          className="euiComboBox euiComboBox--compressed"
                           data-test-subj="servicesEntitiesComboBox"
                           onKeyDown={[Function]}
                           role="combobox"
                         >
                           <EuiComboBoxInput
                             autoSizeInputRef={[Function]}
-                            compressed={false}
+                            compressed={true}
                             fullWidth={false}
                             hasSelectedOptions={false}
                             id="random_html_id"
@@ -491,7 +491,7 @@ exports[`Service Config component renders empty service config 1`] = `
                             value=""
                           >
                             <EuiFormControlLayout
-                              compressed={false}
+                              compressed={true}
                               fullWidth={false}
                               icon={
                                 Object {
@@ -506,13 +506,13 @@ exports[`Service Config component renders empty service config 1`] = `
                               }
                             >
                               <div
-                                className="euiFormControlLayout"
+                                className="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   className="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    className="euiComboBox__inputWrap"
+                                    className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     onClick={[Function]}
                                     tabIndex={-1}
@@ -583,7 +583,7 @@ exports[`Service Config component renders empty service config 1`] = `
                                     </AutosizeInput>
                                   </div>
                                   <EuiFormControlLayoutIcons
-                                    compressed={false}
+                                    compressed={true}
                                     icon={
                                       Object {
                                         "aria-label": "Open list of options",
@@ -604,7 +604,7 @@ exports[`Service Config component renders empty service config 1`] = `
                                         data-test-subj="comboBoxToggleListButton"
                                         iconRef={[Function]}
                                         onClick={[Function]}
-                                        size="m"
+                                        size="s"
                                         type="arrowDown"
                                       >
                                         <button
@@ -617,19 +617,19 @@ exports[`Service Config component renders empty service config 1`] = `
                                           <EuiIcon
                                             aria-hidden="true"
                                             className="euiFormControlLayoutCustomIcon__icon"
-                                            size="m"
+                                            size="s"
                                             type="arrowDown"
                                           >
                                             <EuiIconBeaker
                                               aria-hidden={true}
-                                              className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                              className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                               focusable="false"
                                               role="img"
                                               style={null}
                                             >
                                               <svg
                                                 aria-hidden={true}
-                                                className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                                className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                 focusable="false"
                                                 height={16}
                                                 role="img"
@@ -653,10 +653,10 @@ exports[`Service Config component renders empty service config 1`] = `
                             </EuiFormControlLayout>
                           </EuiComboBoxInput>
                         </div>
-                      </EuiComboBox>
+                      </EuiCompressedComboBox>
                     </div>
                   </div>
-                </EuiFormRow>
+                </EuiCompressedFormRow>
                 <EuiSpacer>
                   <div
                     className="euiSpacer euiSpacer--l"
@@ -1007,8 +1007,8 @@ exports[`Service Config component renders empty service config 1`] = `
                             <div
                               className="euiFlexItem"
                             >
-                              <EuiFieldSearch
-                                compressed={false}
+                              <EuiCompressedFieldSearch
+                                compressed={true}
                                 fullWidth={false}
                                 incremental={false}
                                 isClearable={true}
@@ -1020,13 +1020,13 @@ exports[`Service Config component renders empty service config 1`] = `
                                 value=""
                               >
                                 <EuiFormControlLayout
-                                  compressed={false}
+                                  compressed={true}
                                   fullWidth={false}
                                   icon="search"
                                   isLoading={false}
                                 >
                                   <div
-                                    className="euiFormControlLayout"
+                                    className="euiFormControlLayout euiFormControlLayout--compressed"
                                   >
                                     <div
                                       className="euiFormControlLayout__childrenWrapper"
@@ -1035,7 +1035,7 @@ exports[`Service Config component renders empty service config 1`] = `
                                         isInvalid={false}
                                       >
                                         <input
-                                          className="euiFieldSearch"
+                                          className="euiFieldSearch euiFieldSearch--compressed"
                                           onChange={[Function]}
                                           onKeyUp={[Function]}
                                           placeholder="Service name"
@@ -1044,7 +1044,7 @@ exports[`Service Config component renders empty service config 1`] = `
                                         />
                                       </EuiValidatableControl>
                                       <EuiFormControlLayoutIcons
-                                        compressed={false}
+                                        compressed={true}
                                         icon="search"
                                         isLoading={false}
                                       >
@@ -1052,7 +1052,7 @@ exports[`Service Config component renders empty service config 1`] = `
                                           className="euiFormControlLayoutIcons"
                                         >
                                           <EuiFormControlLayoutCustomIcon
-                                            size="m"
+                                            size="s"
                                             type="search"
                                           >
                                             <span
@@ -1061,19 +1061,19 @@ exports[`Service Config component renders empty service config 1`] = `
                                               <EuiIcon
                                                 aria-hidden="true"
                                                 className="euiFormControlLayoutCustomIcon__icon"
-                                                size="m"
+                                                size="s"
                                                 type="search"
                                               >
                                                 <EuiIconBeaker
                                                   aria-hidden={true}
-                                                  className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                                  className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                   focusable="false"
                                                   role="img"
                                                   style={null}
                                                 >
                                                   <svg
                                                     aria-hidden={true}
-                                                    className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                                    className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                     focusable="false"
                                                     height={16}
                                                     role="img"
@@ -1095,7 +1095,7 @@ exports[`Service Config component renders empty service config 1`] = `
                                     </div>
                                   </div>
                                 </EuiFormControlLayout>
-                              </EuiFieldSearch>
+                              </EuiCompressedFieldSearch>
                             </div>
                           </EuiFlexItem>
                         </div>
@@ -1627,9 +1627,9 @@ exports[`Service Config component renders with one service selected 1`] = `
               <div
                 className="euiAccordion__padding--l"
               >
-                <EuiFormRow
+                <EuiCompressedFormRow
                   describedByIds={Array []}
-                  display="row"
+                  display="rowCompressed"
                   fullWidth={false}
                   hasChildLabel={true}
                   hasEmptyLabelSpace={false}
@@ -1637,7 +1637,7 @@ exports[`Service Config component renders with one service selected 1`] = `
                   labelType="label"
                 >
                   <div
-                    className="euiFormRow"
+                    className="euiFormRow euiFormRow--compressed"
                     id="random_html_id-row"
                   >
                     <div
@@ -1660,10 +1660,10 @@ exports[`Service Config component renders with one service selected 1`] = `
                     <div
                       className="euiFormRow__fieldWrapper"
                     >
-                      <EuiComboBox
+                      <EuiCompressedComboBox
                         aria-label="Select services and entities"
                         async={false}
-                        compressed={false}
+                        compressed={true}
                         data-test-subj="servicesEntitiesComboBox"
                         fullWidth={false}
                         id="random_html_id"
@@ -1681,14 +1681,14 @@ exports[`Service Config component renders with one service selected 1`] = `
                           aria-expanded={false}
                           aria-haspopup="listbox"
                           aria-label="Select services and entities"
-                          className="euiComboBox"
+                          className="euiComboBox euiComboBox--compressed"
                           data-test-subj="servicesEntitiesComboBox"
                           onKeyDown={[Function]}
                           role="combobox"
                         >
                           <EuiComboBoxInput
                             autoSizeInputRef={[Function]}
-                            compressed={false}
+                            compressed={true}
                             fullWidth={false}
                             hasSelectedOptions={false}
                             id="random_html_id"
@@ -1711,7 +1711,7 @@ exports[`Service Config component renders with one service selected 1`] = `
                             value=""
                           >
                             <EuiFormControlLayout
-                              compressed={false}
+                              compressed={true}
                               fullWidth={false}
                               icon={
                                 Object {
@@ -1726,13 +1726,13 @@ exports[`Service Config component renders with one service selected 1`] = `
                               }
                             >
                               <div
-                                className="euiFormControlLayout"
+                                className="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   className="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    className="euiComboBox__inputWrap"
+                                    className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     onClick={[Function]}
                                     tabIndex={-1}
@@ -1803,7 +1803,7 @@ exports[`Service Config component renders with one service selected 1`] = `
                                     </AutosizeInput>
                                   </div>
                                   <EuiFormControlLayoutIcons
-                                    compressed={false}
+                                    compressed={true}
                                     icon={
                                       Object {
                                         "aria-label": "Open list of options",
@@ -1824,7 +1824,7 @@ exports[`Service Config component renders with one service selected 1`] = `
                                         data-test-subj="comboBoxToggleListButton"
                                         iconRef={[Function]}
                                         onClick={[Function]}
-                                        size="m"
+                                        size="s"
                                         type="arrowDown"
                                       >
                                         <button
@@ -1837,19 +1837,19 @@ exports[`Service Config component renders with one service selected 1`] = `
                                           <EuiIcon
                                             aria-hidden="true"
                                             className="euiFormControlLayoutCustomIcon__icon"
-                                            size="m"
+                                            size="s"
                                             type="arrowDown"
                                           >
                                             <EuiIconArrowDown
                                               aria-hidden={true}
-                                              className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                              className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                               focusable="false"
                                               role="img"
                                               style={null}
                                             >
                                               <svg
                                                 aria-hidden={true}
-                                                className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                                className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                                 focusable="false"
                                                 height={16}
                                                 role="img"
@@ -1874,10 +1874,10 @@ exports[`Service Config component renders with one service selected 1`] = `
                             </EuiFormControlLayout>
                           </EuiComboBoxInput>
                         </div>
-                      </EuiComboBox>
+                      </EuiCompressedComboBox>
                     </div>
                   </div>
-                </EuiFormRow>
+                </EuiCompressedFormRow>
                 <EuiSpacer>
                   <div
                     className="euiSpacer euiSpacer--l"
@@ -2228,8 +2228,8 @@ exports[`Service Config component renders with one service selected 1`] = `
                             <div
                               className="euiFlexItem"
                             >
-                              <EuiFieldSearch
-                                compressed={false}
+                              <EuiCompressedFieldSearch
+                                compressed={true}
                                 fullWidth={false}
                                 incremental={false}
                                 isClearable={true}
@@ -2241,13 +2241,13 @@ exports[`Service Config component renders with one service selected 1`] = `
                                 value=""
                               >
                                 <EuiFormControlLayout
-                                  compressed={false}
+                                  compressed={true}
                                   fullWidth={false}
                                   icon="search"
                                   isLoading={false}
                                 >
                                   <div
-                                    className="euiFormControlLayout"
+                                    className="euiFormControlLayout euiFormControlLayout--compressed"
                                   >
                                     <div
                                       className="euiFormControlLayout__childrenWrapper"
@@ -2256,7 +2256,7 @@ exports[`Service Config component renders with one service selected 1`] = `
                                         isInvalid={false}
                                       >
                                         <input
-                                          className="euiFieldSearch"
+                                          className="euiFieldSearch euiFieldSearch--compressed"
                                           onChange={[Function]}
                                           onKeyUp={[Function]}
                                           placeholder="Service name"
@@ -2265,7 +2265,7 @@ exports[`Service Config component renders with one service selected 1`] = `
                                         />
                                       </EuiValidatableControl>
                                       <EuiFormControlLayoutIcons
-                                        compressed={false}
+                                        compressed={true}
                                         icon="search"
                                         isLoading={false}
                                       >
@@ -2273,7 +2273,7 @@ exports[`Service Config component renders with one service selected 1`] = `
                                           className="euiFormControlLayoutIcons"
                                         >
                                           <EuiFormControlLayoutCustomIcon
-                                            size="m"
+                                            size="s"
                                             type="search"
                                           >
                                             <span
@@ -2282,19 +2282,19 @@ exports[`Service Config component renders with one service selected 1`] = `
                                               <EuiIcon
                                                 aria-hidden="true"
                                                 className="euiFormControlLayoutCustomIcon__icon"
-                                                size="m"
+                                                size="s"
                                                 type="search"
                                               >
                                                 <EuiIconSearch
                                                   aria-hidden={true}
-                                                  className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                                  className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                                   focusable="false"
                                                   role="img"
                                                   style={null}
                                                 >
                                                   <svg
                                                     aria-hidden={true}
-                                                    className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                                    className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                                     focusable="false"
                                                     height={16}
                                                     role="img"
@@ -2316,7 +2316,7 @@ exports[`Service Config component renders with one service selected 1`] = `
                                     </div>
                                   </div>
                                 </EuiFormControlLayout>
-                              </EuiFieldSearch>
+                              </EuiCompressedFieldSearch>
                             </div>
                           </EuiFlexItem>
                         </div>
diff --git a/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap
index 9750299fa2..db13f48f7a 100644
--- a/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap
+++ b/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap
@@ -403,9 +403,9 @@ exports[`Trace Config component renders empty trace config 1`] = `
               <div
                 className="euiAccordion__padding--l"
               >
-                <EuiFormRow
+                <EuiCompressedFormRow
                   describedByIds={Array []}
-                  display="row"
+                  display="rowCompressed"
                   fullWidth={false}
                   hasChildLabel={true}
                   hasEmptyLabelSpace={false}
@@ -414,7 +414,7 @@ exports[`Trace Config component renders empty trace config 1`] = `
                   labelType="label"
                 >
                   <div
-                    className="euiFormRow"
+                    className="euiFormRow euiFormRow--compressed"
                     id="random_html_id-row"
                   >
                     <div
@@ -437,11 +437,11 @@ exports[`Trace Config component renders empty trace config 1`] = `
                     <div
                       className="euiFormRow__fieldWrapper"
                     >
-                      <EuiComboBox
+                      <EuiCompressedComboBox
                         aria-describedby="random_html_id-help-0"
                         aria-label="Select trace groups"
                         async={false}
-                        compressed={false}
+                        compressed={true}
                         data-test-subj="traceGroupsComboBox"
                         fullWidth={false}
                         id="random_html_id"
@@ -461,14 +461,14 @@ exports[`Trace Config component renders empty trace config 1`] = `
                           aria-expanded={false}
                           aria-haspopup="listbox"
                           aria-label="Select trace groups"
-                          className="euiComboBox"
+                          className="euiComboBox euiComboBox--compressed"
                           data-test-subj="traceGroupsComboBox"
                           onKeyDown={[Function]}
                           role="combobox"
                         >
                           <EuiComboBoxInput
                             autoSizeInputRef={[Function]}
-                            compressed={false}
+                            compressed={true}
                             fullWidth={false}
                             hasSelectedOptions={false}
                             id="random_html_id"
@@ -491,7 +491,7 @@ exports[`Trace Config component renders empty trace config 1`] = `
                             value=""
                           >
                             <EuiFormControlLayout
-                              compressed={false}
+                              compressed={true}
                               fullWidth={false}
                               icon={
                                 Object {
@@ -506,13 +506,13 @@ exports[`Trace Config component renders empty trace config 1`] = `
                               }
                             >
                               <div
-                                className="euiFormControlLayout"
+                                className="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   className="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    className="euiComboBox__inputWrap"
+                                    className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     onClick={[Function]}
                                     tabIndex={-1}
@@ -583,7 +583,7 @@ exports[`Trace Config component renders empty trace config 1`] = `
                                     </AutosizeInput>
                                   </div>
                                   <EuiFormControlLayoutIcons
-                                    compressed={false}
+                                    compressed={true}
                                     icon={
                                       Object {
                                         "aria-label": "Open list of options",
@@ -604,7 +604,7 @@ exports[`Trace Config component renders empty trace config 1`] = `
                                         data-test-subj="comboBoxToggleListButton"
                                         iconRef={[Function]}
                                         onClick={[Function]}
-                                        size="m"
+                                        size="s"
                                         type="arrowDown"
                                       >
                                         <button
@@ -617,19 +617,19 @@ exports[`Trace Config component renders empty trace config 1`] = `
                                           <EuiIcon
                                             aria-hidden="true"
                                             className="euiFormControlLayoutCustomIcon__icon"
-                                            size="m"
+                                            size="s"
                                             type="arrowDown"
                                           >
                                             <EuiIconBeaker
                                               aria-hidden={true}
-                                              className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                              className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                               focusable="false"
                                               role="img"
                                               style={null}
                                             >
                                               <svg
                                                 aria-hidden={true}
-                                                className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                                className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                 focusable="false"
                                                 height={16}
                                                 role="img"
@@ -653,7 +653,7 @@ exports[`Trace Config component renders empty trace config 1`] = `
                             </EuiFormControlLayout>
                           </EuiComboBoxInput>
                         </div>
-                      </EuiComboBox>
+                      </EuiCompressedComboBox>
                       <EuiFormHelpText
                         className="euiFormRow__text"
                         id="random_html_id-help-0"
@@ -668,7 +668,7 @@ exports[`Trace Config component renders empty trace config 1`] = `
                       </EuiFormHelpText>
                     </div>
                   </div>
-                </EuiFormRow>
+                </EuiCompressedFormRow>
                 <EuiSpacer>
                   <div
                     className="euiSpacer euiSpacer--l"
@@ -1336,9 +1336,9 @@ exports[`Trace Config component renders with one trace selected 1`] = `
               <div
                 className="euiAccordion__padding--l"
               >
-                <EuiFormRow
+                <EuiCompressedFormRow
                   describedByIds={Array []}
-                  display="row"
+                  display="rowCompressed"
                   fullWidth={false}
                   hasChildLabel={true}
                   hasEmptyLabelSpace={false}
@@ -1347,7 +1347,7 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                   labelType="label"
                 >
                   <div
-                    className="euiFormRow"
+                    className="euiFormRow euiFormRow--compressed"
                     id="random_html_id-row"
                   >
                     <div
@@ -1370,11 +1370,11 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                     <div
                       className="euiFormRow__fieldWrapper"
                     >
-                      <EuiComboBox
+                      <EuiCompressedComboBox
                         aria-describedby="random_html_id-help-0"
                         aria-label="Select trace groups"
                         async={false}
-                        compressed={false}
+                        compressed={true}
                         data-test-subj="traceGroupsComboBox"
                         fullWidth={false}
                         id="random_html_id"
@@ -1394,14 +1394,14 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                           aria-expanded={false}
                           aria-haspopup="listbox"
                           aria-label="Select trace groups"
-                          className="euiComboBox"
+                          className="euiComboBox euiComboBox--compressed"
                           data-test-subj="traceGroupsComboBox"
                           onKeyDown={[Function]}
                           role="combobox"
                         >
                           <EuiComboBoxInput
                             autoSizeInputRef={[Function]}
-                            compressed={false}
+                            compressed={true}
                             fullWidth={false}
                             hasSelectedOptions={false}
                             id="random_html_id"
@@ -1424,7 +1424,7 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                             value=""
                           >
                             <EuiFormControlLayout
-                              compressed={false}
+                              compressed={true}
                               fullWidth={false}
                               icon={
                                 Object {
@@ -1439,13 +1439,13 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                               }
                             >
                               <div
-                                className="euiFormControlLayout"
+                                className="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   className="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    className="euiComboBox__inputWrap"
+                                    className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed"
                                     data-test-subj="comboBoxInput"
                                     onClick={[Function]}
                                     tabIndex={-1}
@@ -1516,7 +1516,7 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                                     </AutosizeInput>
                                   </div>
                                   <EuiFormControlLayoutIcons
-                                    compressed={false}
+                                    compressed={true}
                                     icon={
                                       Object {
                                         "aria-label": "Open list of options",
@@ -1537,7 +1537,7 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                                         data-test-subj="comboBoxToggleListButton"
                                         iconRef={[Function]}
                                         onClick={[Function]}
-                                        size="m"
+                                        size="s"
                                         type="arrowDown"
                                       >
                                         <button
@@ -1550,19 +1550,19 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                                           <EuiIcon
                                             aria-hidden="true"
                                             className="euiFormControlLayoutCustomIcon__icon"
-                                            size="m"
+                                            size="s"
                                             type="arrowDown"
                                           >
                                             <EuiIconArrowDown
                                               aria-hidden={true}
-                                              className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                              className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                               focusable="false"
                                               role="img"
                                               style={null}
                                             >
                                               <svg
                                                 aria-hidden={true}
-                                                className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                                className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                                 focusable="false"
                                                 height={16}
                                                 role="img"
@@ -1587,7 +1587,7 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                             </EuiFormControlLayout>
                           </EuiComboBoxInput>
                         </div>
-                      </EuiComboBox>
+                      </EuiCompressedComboBox>
                       <EuiFormHelpText
                         className="euiFormRow__text"
                         id="random_html_id-help-0"
@@ -1602,7 +1602,7 @@ exports[`Trace Config component renders with one trace selected 1`] = `
                       </EuiFormHelpText>
                     </div>
                   </div>
-                </EuiFormRow>
+                </EuiCompressedFormRow>
                 <EuiSpacer>
                   <div
                     className="euiSpacer euiSpacer--l"
diff --git a/public/components/common/live_tail/__tests__/__snapshots__/live_tail_button.test.tsx.snap b/public/components/common/live_tail/__tests__/__snapshots__/live_tail_button.test.tsx.snap
index d16f1b4662..560b5b030b 100644
--- a/public/components/common/live_tail/__tests__/__snapshots__/live_tail_button.test.tsx.snap
+++ b/public/components/common/live_tail/__tests__/__snapshots__/live_tail_button.test.tsx.snap
@@ -8,89 +8,98 @@ exports[`Live tail button change live tail to 10s interval 1`] = `
   liveTailName="10s"
   setIsLiveTailPopoverOpen={[MockFunction]}
 >
-  <EuiButton
+  <EuiSmallButton
     data-test-subj=""
     iconSide="left"
     iconType="stop"
     onClick={[Function]}
   >
-    <EuiButtonDisplay
-      baseClassName="euiButton"
+    <EuiButton
       data-test-subj=""
-      disabled={false}
-      element="button"
       iconSide="left"
       iconType="stop"
-      isDisabled={false}
       onClick={[Function]}
-      type="button"
+      size="s"
     >
-      <button
-        className="euiButton euiButton--primary"
+      <EuiButtonDisplay
+        baseClassName="euiButton"
         data-test-subj=""
         disabled={false}
+        element="button"
+        iconSide="left"
+        iconType="stop"
+        isDisabled={false}
         onClick={[Function]}
-        style={
-          Object {
-            "minWidth": undefined,
-          }
-        }
+        size="s"
         type="button"
       >
-        <EuiButtonContent
-          className="euiButton__content"
-          iconSide="left"
-          iconType="stop"
-          textProps={
+        <button
+          className="euiButton euiButton--primary euiButton--small"
+          data-test-subj=""
+          disabled={false}
+          onClick={[Function]}
+          style={
             Object {
-              "className": "euiButton__text",
+              "minWidth": undefined,
             }
           }
+          type="button"
         >
-          <span
-            className="euiButtonContent euiButton__content"
+          <EuiButtonContent
+            className="euiButton__content"
+            iconSide="left"
+            iconType="stop"
+            textProps={
+              Object {
+                "className": "euiButton__text",
+              }
+            }
           >
-            <EuiIcon
-              className="euiButtonContent__icon"
-              color="inherit"
-              size="m"
-              type="stop"
+            <span
+              className="euiButtonContent euiButton__content"
             >
-              <EuiIconStop
-                aria-hidden={true}
-                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                focusable="false"
-                role="img"
-                style={null}
+              <EuiIcon
+                className="euiButtonContent__icon"
+                color="inherit"
+                size="m"
+                type="stop"
               >
-                <svg
+                <EuiIconStop
                   aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                   focusable="false"
-                  height={16}
                   role="img"
                   style={null}
-                  viewBox="0 0 16 16"
-                  width={16}
-                  xmlns="http://www.w3.org/2000/svg"
                 >
-                  <path
-                    d="M4 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2Zm0 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4Z"
-                    fillRule="evenodd"
-                  />
-                </svg>
-              </EuiIconStop>
-            </EuiIcon>
-            <span
-              className="euiButton__text"
-            >
-              10s
+                  <svg
+                    aria-hidden={true}
+                    className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                    focusable="false"
+                    height={16}
+                    role="img"
+                    style={null}
+                    viewBox="0 0 16 16"
+                    width={16}
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M4 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2Zm0 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4Z"
+                      fillRule="evenodd"
+                    />
+                  </svg>
+                </EuiIconStop>
+              </EuiIcon>
+              <span
+                className="euiButton__text"
+              >
+                10s
+              </span>
             </span>
-          </span>
-        </EuiButtonContent>
-      </button>
-    </EuiButtonDisplay>
-  </EuiButton>
+          </EuiButtonContent>
+        </button>
+      </EuiButtonDisplay>
+    </EuiButton>
+  </EuiSmallButton>
 </LiveTailButton>
 `;
 
@@ -102,88 +111,97 @@ exports[`Live tail button starts live tail with 5s interval 1`] = `
   liveTailName="5s"
   setIsLiveTailPopoverOpen={[MockFunction]}
 >
-  <EuiButton
+  <EuiSmallButton
     data-test-subj=""
     iconSide="left"
     iconType="stop"
     onClick={[Function]}
   >
-    <EuiButtonDisplay
-      baseClassName="euiButton"
+    <EuiButton
       data-test-subj=""
-      disabled={false}
-      element="button"
       iconSide="left"
       iconType="stop"
-      isDisabled={false}
       onClick={[Function]}
-      type="button"
+      size="s"
     >
-      <button
-        className="euiButton euiButton--primary"
+      <EuiButtonDisplay
+        baseClassName="euiButton"
         data-test-subj=""
         disabled={false}
+        element="button"
+        iconSide="left"
+        iconType="stop"
+        isDisabled={false}
         onClick={[Function]}
-        style={
-          Object {
-            "minWidth": undefined,
-          }
-        }
+        size="s"
         type="button"
       >
-        <EuiButtonContent
-          className="euiButton__content"
-          iconSide="left"
-          iconType="stop"
-          textProps={
+        <button
+          className="euiButton euiButton--primary euiButton--small"
+          data-test-subj=""
+          disabled={false}
+          onClick={[Function]}
+          style={
             Object {
-              "className": "euiButton__text",
+              "minWidth": undefined,
             }
           }
+          type="button"
         >
-          <span
-            className="euiButtonContent euiButton__content"
+          <EuiButtonContent
+            className="euiButton__content"
+            iconSide="left"
+            iconType="stop"
+            textProps={
+              Object {
+                "className": "euiButton__text",
+              }
+            }
           >
-            <EuiIcon
-              className="euiButtonContent__icon"
-              color="inherit"
-              size="m"
-              type="stop"
+            <span
+              className="euiButtonContent euiButton__content"
             >
-              <EuiIconBeaker
-                aria-hidden={true}
-                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                focusable="false"
-                role="img"
-                style={null}
+              <EuiIcon
+                className="euiButtonContent__icon"
+                color="inherit"
+                size="m"
+                type="stop"
               >
-                <svg
+                <EuiIconBeaker
                   aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                   focusable="false"
-                  height={16}
                   role="img"
                   style={null}
-                  viewBox="0 0 16 16"
-                  width={16}
-                  xmlns="http://www.w3.org/2000/svg"
                 >
-                  <path
-                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                  />
-                </svg>
-              </EuiIconBeaker>
-            </EuiIcon>
-            <span
-              className="euiButton__text"
-            >
-              5s
+                  <svg
+                    aria-hidden={true}
+                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                    focusable="false"
+                    height={16}
+                    role="img"
+                    style={null}
+                    viewBox="0 0 16 16"
+                    width={16}
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
+                </EuiIconBeaker>
+              </EuiIcon>
+              <span
+                className="euiButton__text"
+              >
+                5s
+              </span>
             </span>
-          </span>
-        </EuiButtonContent>
-      </button>
-    </EuiButtonDisplay>
-  </EuiButton>
+          </EuiButtonContent>
+        </button>
+      </EuiButtonDisplay>
+    </EuiButton>
+  </EuiSmallButton>
 </LiveTailButton>
 `;
 
@@ -192,88 +210,97 @@ exports[`Live tail off button stop live tail 1`] = `
   StopLive={[MockFunction]}
   dataTestSubj=""
 >
-  <EuiButton
+  <EuiSmallButton
     color="danger"
     data-test-subj=""
     iconType="stop"
     onClick={[Function]}
   >
-    <EuiButtonDisplay
-      baseClassName="euiButton"
+    <EuiButton
       color="danger"
       data-test-subj=""
-      disabled={false}
-      element="button"
       iconType="stop"
-      isDisabled={false}
       onClick={[Function]}
-      type="button"
+      size="s"
     >
-      <button
-        className="euiButton euiButton--danger"
+      <EuiButtonDisplay
+        baseClassName="euiButton"
+        color="danger"
         data-test-subj=""
         disabled={false}
+        element="button"
+        iconType="stop"
+        isDisabled={false}
         onClick={[Function]}
-        style={
-          Object {
-            "minWidth": undefined,
-          }
-        }
+        size="s"
         type="button"
       >
-        <EuiButtonContent
-          className="euiButton__content"
-          iconSide="left"
-          iconType="stop"
-          textProps={
+        <button
+          className="euiButton euiButton--danger euiButton--small"
+          data-test-subj=""
+          disabled={false}
+          onClick={[Function]}
+          style={
             Object {
-              "className": "euiButton__text",
+              "minWidth": undefined,
             }
           }
+          type="button"
         >
-          <span
-            className="euiButtonContent euiButton__content"
+          <EuiButtonContent
+            className="euiButton__content"
+            iconSide="left"
+            iconType="stop"
+            textProps={
+              Object {
+                "className": "euiButton__text",
+              }
+            }
           >
-            <EuiIcon
-              className="euiButtonContent__icon"
-              color="inherit"
-              size="m"
-              type="stop"
+            <span
+              className="euiButtonContent euiButton__content"
             >
-              <EuiIconStop
-                aria-hidden={true}
-                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                focusable="false"
-                role="img"
-                style={null}
+              <EuiIcon
+                className="euiButtonContent__icon"
+                color="inherit"
+                size="m"
+                type="stop"
               >
-                <svg
+                <EuiIconStop
                   aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                   focusable="false"
-                  height={16}
                   role="img"
                   style={null}
-                  viewBox="0 0 16 16"
-                  width={16}
-                  xmlns="http://www.w3.org/2000/svg"
                 >
-                  <path
-                    d="M4 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2Zm0 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4Z"
-                    fillRule="evenodd"
-                  />
-                </svg>
-              </EuiIconStop>
-            </EuiIcon>
-            <span
-              className="euiButton__text"
-            >
-              Stop
+                  <svg
+                    aria-hidden={true}
+                    className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                    focusable="false"
+                    height={16}
+                    role="img"
+                    style={null}
+                    viewBox="0 0 16 16"
+                    width={16}
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M4 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2Zm0 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4Z"
+                      fillRule="evenodd"
+                    />
+                  </svg>
+                </EuiIconStop>
+              </EuiIcon>
+              <span
+                className="euiButton__text"
+              >
+                Stop
+              </span>
             </span>
-          </span>
-        </EuiButtonContent>
-      </button>
-    </EuiButtonDisplay>
-  </EuiButton>
+          </EuiButtonContent>
+        </button>
+      </EuiButtonDisplay>
+    </EuiButton>
+  </EuiSmallButton>
 </StopLiveButton>
 `;
diff --git a/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap b/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap
index 3991cb057d..79f3070e59 100644
--- a/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap
+++ b/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap
@@ -49,14 +49,14 @@ exports[`Explorer Search component renders basic component 1`] = `
                       <EuiPopover
                         anchorPosition="downLeft"
                         button={
-                          <EuiButton
+                          <EuiSmallButton
                             color="text"
                             iconSide="right"
                             iconType="arrowDown"
                             onClick={[Function]}
                           >
                             PPL
-                          </EuiButton>
+                          </EuiSmallButton>
                         }
                         closePopover={[Function]}
                         display="inlineBlock"
@@ -73,87 +73,96 @@ exports[`Explorer Search component renders basic component 1`] = `
                           <div
                             className="euiPopover__anchor"
                           >
-                            <EuiButton
+                            <EuiSmallButton
                               color="text"
                               iconSide="right"
                               iconType="arrowDown"
                               onClick={[Function]}
                             >
-                              <EuiButtonDisplay
-                                baseClassName="euiButton"
+                              <EuiButton
                                 color="text"
-                                disabled={false}
-                                element="button"
                                 iconSide="right"
                                 iconType="arrowDown"
-                                isDisabled={false}
                                 onClick={[Function]}
-                                type="button"
+                                size="s"
                               >
-                                <button
-                                  className="euiButton euiButton--text"
+                                <EuiButtonDisplay
+                                  baseClassName="euiButton"
+                                  color="text"
                                   disabled={false}
+                                  element="button"
+                                  iconSide="right"
+                                  iconType="arrowDown"
+                                  isDisabled={false}
                                   onClick={[Function]}
-                                  style={
-                                    Object {
-                                      "minWidth": undefined,
-                                    }
-                                  }
+                                  size="s"
                                   type="button"
                                 >
-                                  <EuiButtonContent
-                                    className="euiButton__content"
-                                    iconSide="right"
-                                    iconType="arrowDown"
-                                    textProps={
+                                  <button
+                                    className="euiButton euiButton--text euiButton--small"
+                                    disabled={false}
+                                    onClick={[Function]}
+                                    style={
                                       Object {
-                                        "className": "euiButton__text",
+                                        "minWidth": undefined,
                                       }
                                     }
+                                    type="button"
                                   >
-                                    <span
-                                      className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                                    <EuiButtonContent
+                                      className="euiButton__content"
+                                      iconSide="right"
+                                      iconType="arrowDown"
+                                      textProps={
+                                        Object {
+                                          "className": "euiButton__text",
+                                        }
+                                      }
                                     >
-                                      <EuiIcon
-                                        className="euiButtonContent__icon"
-                                        color="inherit"
-                                        size="m"
-                                        type="arrowDown"
+                                      <span
+                                        className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                                       >
-                                        <EuiIconBeaker
-                                          aria-hidden={true}
-                                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                          focusable="false"
-                                          role="img"
-                                          style={null}
+                                        <EuiIcon
+                                          className="euiButtonContent__icon"
+                                          color="inherit"
+                                          size="m"
+                                          type="arrowDown"
                                         >
-                                          <svg
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                             focusable="false"
-                                            height={16}
                                             role="img"
                                             style={null}
-                                            viewBox="0 0 16 16"
-                                            width={16}
-                                            xmlns="http://www.w3.org/2000/svg"
                                           >
-                                            <path
-                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                            />
-                                          </svg>
-                                        </EuiIconBeaker>
-                                      </EuiIcon>
-                                      <span
-                                        className="euiButton__text"
-                                      >
-                                        PPL
+                                            <svg
+                                              aria-hidden={true}
+                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                              focusable="false"
+                                              height={16}
+                                              role="img"
+                                              style={null}
+                                              viewBox="0 0 16 16"
+                                              width={16}
+                                              xmlns="http://www.w3.org/2000/svg"
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
+                                        </EuiIcon>
+                                        <span
+                                          className="euiButton__text"
+                                        >
+                                          PPL
+                                        </span>
                                       </span>
-                                    </span>
-                                  </EuiButtonContent>
-                                </button>
-                              </EuiButtonDisplay>
-                            </EuiButton>
+                                    </EuiButtonContent>
+                                  </button>
+                                </EuiButtonDisplay>
+                              </EuiButton>
+                            </EuiSmallButton>
                           </div>
                         </div>
                       </EuiPopover>
@@ -240,7 +249,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                           id="autocomplete-root"
                           role="combobox"
                         >
-                          <EuiTextArea
+                          <EuiCompressedTextArea
                             aria-autocomplete="both"
                             aria-labelledby="autocomplete-0-label"
                             autoCapitalize="off"
@@ -268,39 +277,69 @@ exports[`Explorer Search component renders basic component 1`] = `
                             type="search"
                             value=""
                           >
-                            <EuiValidatableControl>
-                              <textarea
-                                aria-autocomplete="both"
-                                aria-labelledby="autocomplete-0-label"
-                                autoCapitalize="off"
-                                autoComplete="off"
-                                autoCorrect="off"
-                                autoFocus={false}
-                                className="euiTextArea euiTextArea--resizeVertical"
-                                data-test-subj="searchAutocompleteTextArea"
-                                enterKeyHint="search"
-                                id="autocomplete-textarea"
-                                maxLength={16384}
-                                onBlur={[Function]}
-                                onChange={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                onKeyDown={[Function]}
-                                placeholder="Enter query"
-                                rows={6}
-                                spellCheck="false"
-                                style={
-                                  Object {
-                                    "height": "18px",
-                                    "marginTop": "0px",
-                                    "padding": "8px",
-                                  }
+                            <EuiTextArea
+                              aria-autocomplete="both"
+                              aria-labelledby="autocomplete-0-label"
+                              autoCapitalize="off"
+                              autoComplete="off"
+                              autoCorrect="off"
+                              autoFocus={false}
+                              compressed={true}
+                              data-test-subj="searchAutocompleteTextArea"
+                              enterKeyHint="search"
+                              id="autocomplete-textarea"
+                              maxLength={16384}
+                              onBlur={[Function]}
+                              onChange={[Function]}
+                              onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyDown={[Function]}
+                              placeholder="Enter query"
+                              spellCheck="false"
+                              style={
+                                Object {
+                                  "height": "18px",
+                                  "marginTop": "0px",
+                                  "padding": "8px",
                                 }
-                                type="search"
-                                value=""
-                              />
-                            </EuiValidatableControl>
-                          </EuiTextArea>
+                              }
+                              type="search"
+                              value=""
+                            >
+                              <EuiValidatableControl>
+                                <textarea
+                                  aria-autocomplete="both"
+                                  aria-labelledby="autocomplete-0-label"
+                                  autoCapitalize="off"
+                                  autoComplete="off"
+                                  autoCorrect="off"
+                                  autoFocus={false}
+                                  className="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
+                                  data-test-subj="searchAutocompleteTextArea"
+                                  enterKeyHint="search"
+                                  id="autocomplete-textarea"
+                                  maxLength={16384}
+                                  onBlur={[Function]}
+                                  onChange={[Function]}
+                                  onClick={[Function]}
+                                  onFocus={[Function]}
+                                  onKeyDown={[Function]}
+                                  placeholder="Enter query"
+                                  rows={3}
+                                  spellCheck="false"
+                                  style={
+                                    Object {
+                                      "height": "18px",
+                                      "marginTop": "0px",
+                                      "padding": "8px",
+                                    }
+                                  }
+                                  type="search"
+                                  value=""
+                                />
+                              </EuiValidatableControl>
+                            </EuiTextArea>
+                          </EuiCompressedTextArea>
                         </div>
                       </Autocomplete>
                       <EuiBadge
@@ -349,7 +388,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                         handleTimePickerChange={[Function]}
                         handleTimeRangePickerRefresh={[Function]}
                       >
-                        <EuiSuperDatePicker
+                        <EuiCompressedSuperDatePicker
                           className="osdQueryBar__datePicker"
                           commonlyUsedRanges={
                             Array [
@@ -395,7 +434,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                               },
                             ]
                           }
-                          compressed={false}
+                          compressed={true}
                           data-test-subj="pplSearchDatePicker"
                           dateFormat=""
                           end="now"
@@ -424,7 +463,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                                 >
                                   <EuiFormControlLayout
                                     className="euiSuperDatePicker"
-                                    compressed={false}
+                                    compressed={true}
                                     isDisabled={false}
                                     prepend={
                                       <EuiQuickSelectPopover
@@ -485,7 +524,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                                     }
                                   >
                                     <div
-                                      className="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+                                      className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group euiSuperDatePicker"
                                     >
                                       <EuiQuickSelectPopover
                                         applyTime={[Function]}
@@ -701,7 +740,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                                             className="euiDatePickerRange euiDatePickerRange--inGroup"
                                           >
                                             <button
-                                              className="euiSuperDatePicker__prettyFormat"
+                                              className="euiSuperDatePicker__prettyFormat euiSuperDatePicker__prettyFormat--compressed"
                                               data-test-subj="superDatePickerShowDatesButton"
                                               disabled={false}
                                               onClick={[Function]}
@@ -721,7 +760,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                                           </div>
                                         </EuiDatePickerRange>
                                         <EuiFormControlLayoutIcons
-                                          compressed={false}
+                                          compressed={true}
                                         />
                                       </div>
                                     </div>
@@ -730,7 +769,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                               </EuiFlexItem>
                             </div>
                           </EuiFlexGroup>
-                        </EuiSuperDatePicker>
+                        </EuiCompressedSuperDatePicker>
                       </DatePicker>
                     </div>
                   </EuiFlexItem>
@@ -751,7 +790,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                           onMouseOut={[Function]}
                           onMouseOver={[Function]}
                         >
-                          <EuiButton
+                          <EuiSmallButton
                             color="primary"
                             data-test-subj="superDatePickerApplyTimeButton"
                             fill={true}
@@ -760,87 +799,99 @@ exports[`Explorer Search component renders basic component 1`] = `
                             onClick={[Function]}
                             onFocus={[Function]}
                           >
-                            <EuiButtonDisplay
-                              baseClassName="euiButton"
+                            <EuiButton
                               color="primary"
                               data-test-subj="superDatePickerApplyTimeButton"
-                              disabled={false}
-                              element="button"
                               fill={true}
                               iconType="play"
-                              isDisabled={false}
                               onBlur={[Function]}
                               onClick={[Function]}
                               onFocus={[Function]}
-                              type="button"
+                              size="s"
                             >
-                              <button
-                                className="euiButton euiButton--primary euiButton--fill"
+                              <EuiButtonDisplay
+                                baseClassName="euiButton"
+                                color="primary"
                                 data-test-subj="superDatePickerApplyTimeButton"
                                 disabled={false}
+                                element="button"
+                                fill={true}
+                                iconType="play"
+                                isDisabled={false}
                                 onBlur={[Function]}
                                 onClick={[Function]}
                                 onFocus={[Function]}
-                                style={
-                                  Object {
-                                    "minWidth": undefined,
-                                  }
-                                }
+                                size="s"
                                 type="button"
                               >
-                                <EuiButtonContent
-                                  className="euiButton__content"
-                                  iconSide="left"
-                                  iconType="play"
-                                  textProps={
+                                <button
+                                  className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                                  data-test-subj="superDatePickerApplyTimeButton"
+                                  disabled={false}
+                                  onBlur={[Function]}
+                                  onClick={[Function]}
+                                  onFocus={[Function]}
+                                  style={
                                     Object {
-                                      "className": "euiButton__text",
+                                      "minWidth": undefined,
                                     }
                                   }
+                                  type="button"
                                 >
-                                  <span
-                                    className="euiButtonContent euiButton__content"
+                                  <EuiButtonContent
+                                    className="euiButton__content"
+                                    iconSide="left"
+                                    iconType="play"
+                                    textProps={
+                                      Object {
+                                        "className": "euiButton__text",
+                                      }
+                                    }
                                   >
-                                    <EuiIcon
-                                      className="euiButtonContent__icon"
-                                      color="inherit"
-                                      size="m"
-                                      type="play"
+                                    <span
+                                      className="euiButtonContent euiButton__content"
                                     >
-                                      <EuiIconBeaker
-                                        aria-hidden={true}
-                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                        focusable="false"
-                                        role="img"
-                                        style={null}
+                                      <EuiIcon
+                                        className="euiButtonContent__icon"
+                                        color="inherit"
+                                        size="m"
+                                        type="play"
                                       >
-                                        <svg
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                           focusable="false"
-                                          height={16}
                                           role="img"
                                           style={null}
-                                          viewBox="0 0 16 16"
-                                          width={16}
-                                          xmlns="http://www.w3.org/2000/svg"
                                         >
-                                          <path
-                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                          />
-                                        </svg>
-                                      </EuiIconBeaker>
-                                    </EuiIcon>
-                                    <span
-                                      className="euiButton__text"
-                                    >
-                                      Run
+                                          <svg
+                                            aria-hidden={true}
+                                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                            focusable="false"
+                                            height={16}
+                                            role="img"
+                                            style={null}
+                                            viewBox="0 0 16 16"
+                                            width={16}
+                                            xmlns="http://www.w3.org/2000/svg"
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
+                                      </EuiIcon>
+                                      <span
+                                        className="euiButton__text"
+                                      >
+                                        Run
+                                      </span>
                                     </span>
-                                  </span>
-                                </EuiButtonContent>
-                              </button>
-                            </EuiButtonDisplay>
-                          </EuiButton>
+                                  </EuiButtonContent>
+                                </button>
+                              </EuiButtonDisplay>
+                            </EuiButton>
+                          </EuiSmallButton>
                         </span>
                       </EuiToolTip>
                     </div>
@@ -873,86 +924,95 @@ exports[`Explorer Search component renders basic component 1`] = `
                             <LiveTailButton
                               dataTestSubj="eventLiveTail"
                             >
-                              <EuiButton
+                              <EuiSmallButton
                                 data-test-subj="eventLiveTail"
                                 iconSide="left"
                                 iconType="clock"
                                 onClick={[Function]}
                               >
-                                <EuiButtonDisplay
-                                  baseClassName="euiButton"
+                                <EuiButton
                                   data-test-subj="eventLiveTail"
-                                  disabled={false}
-                                  element="button"
                                   iconSide="left"
                                   iconType="clock"
-                                  isDisabled={false}
                                   onClick={[Function]}
-                                  type="button"
+                                  size="s"
                                 >
-                                  <button
-                                    className="euiButton euiButton--primary"
+                                  <EuiButtonDisplay
+                                    baseClassName="euiButton"
                                     data-test-subj="eventLiveTail"
                                     disabled={false}
+                                    element="button"
+                                    iconSide="left"
+                                    iconType="clock"
+                                    isDisabled={false}
                                     onClick={[Function]}
-                                    style={
-                                      Object {
-                                        "minWidth": undefined,
-                                      }
-                                    }
+                                    size="s"
                                     type="button"
                                   >
-                                    <EuiButtonContent
-                                      className="euiButton__content"
-                                      iconSide="left"
-                                      iconType="clock"
-                                      textProps={
+                                    <button
+                                      className="euiButton euiButton--primary euiButton--small"
+                                      data-test-subj="eventLiveTail"
+                                      disabled={false}
+                                      onClick={[Function]}
+                                      style={
                                         Object {
-                                          "className": "euiButton__text",
+                                          "minWidth": undefined,
                                         }
                                       }
+                                      type="button"
                                     >
-                                      <span
-                                        className="euiButtonContent euiButton__content"
+                                      <EuiButtonContent
+                                        className="euiButton__content"
+                                        iconSide="left"
+                                        iconType="clock"
+                                        textProps={
+                                          Object {
+                                            "className": "euiButton__text",
+                                          }
+                                        }
                                       >
-                                        <EuiIcon
-                                          className="euiButtonContent__icon"
-                                          color="inherit"
-                                          size="m"
-                                          type="clock"
+                                        <span
+                                          className="euiButtonContent euiButton__content"
                                         >
-                                          <EuiIconBeaker
-                                            aria-hidden={true}
-                                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                            focusable="false"
-                                            role="img"
-                                            style={null}
+                                          <EuiIcon
+                                            className="euiButtonContent__icon"
+                                            color="inherit"
+                                            size="m"
+                                            type="clock"
                                           >
-                                            <svg
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                               focusable="false"
-                                              height={16}
                                               role="img"
                                               style={null}
-                                              viewBox="0 0 16 16"
-                                              width={16}
-                                              xmlns="http://www.w3.org/2000/svg"
                                             >
-                                              <path
-                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                              />
-                                            </svg>
-                                          </EuiIconBeaker>
-                                        </EuiIcon>
-                                        <span
-                                          className="euiButton__text"
-                                        />
-                                      </span>
-                                    </EuiButtonContent>
-                                  </button>
-                                </EuiButtonDisplay>
-                              </EuiButton>
+                                              <svg
+                                                aria-hidden={true}
+                                                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                                focusable="false"
+                                                height={16}
+                                                role="img"
+                                                style={null}
+                                                viewBox="0 0 16 16"
+                                                width={16}
+                                                xmlns="http://www.w3.org/2000/svg"
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
+                                          </EuiIcon>
+                                          <span
+                                            className="euiButton__text"
+                                          />
+                                        </span>
+                                      </EuiButtonContent>
+                                    </button>
+                                  </EuiButtonDisplay>
+                                </EuiButton>
+                              </EuiSmallButton>
                             </LiveTailButton>
                           </div>
                         </div>
diff --git a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_table.test.tsx.snap b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_table.test.tsx.snap
index 4e99a44329..3d8134d0c9 100644
--- a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_table.test.tsx.snap
+++ b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_table.test.tsx.snap
@@ -98,7 +98,7 @@ exports[`Panels Table Component render dashboard table container with panels 1`]
                     class="euiPopover__anchor"
                   >
                     <button
-                      class="euiButton euiButton--primary"
+                      class="euiButton euiButton--primary euiButton--small"
                       data-test-subj="operationalPanelsActionsButton"
                       type="button"
                     >
@@ -134,7 +134,7 @@ exports[`Panels Table Component render dashboard table container with panels 1`]
                 class="euiFlexItem"
               >
                 <a
-                  class="euiButton euiButton--primary euiButton--fill"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill"
                   data-test-subj="customPanels__createNewPanels"
                   href="#/create"
                   rel="noreferrer"
@@ -157,13 +157,13 @@ exports[`Panels Table Component render dashboard table container with panels 1`]
           class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginMedium"
         />
         <div
-          class="euiFormControlLayout euiFormControlLayout--fullWidth"
+          class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
         >
           <div
             class="euiFormControlLayout__childrenWrapper"
           >
             <input
-              class="euiFieldSearch euiFieldSearch--fullWidth"
+              class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
               data-test-subj="operationalPanelSearchBar"
               placeholder="Search Observability Dashboard name"
               type="search"
@@ -177,7 +177,7 @@ exports[`Panels Table Component render dashboard table container with panels 1`]
               >
                 <svg
                   aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                  class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                   focusable="false"
                   height="16"
                   role="img"
@@ -942,7 +942,7 @@ exports[`Panels Table Component renders empty dashboard table container 1`] = `
                     class="euiPopover__anchor"
                   >
                     <button
-                      class="euiButton euiButton--primary"
+                      class="euiButton euiButton--primary euiButton--small"
                       data-test-subj="operationalPanelsActionsButton"
                       type="button"
                     >
@@ -977,7 +977,7 @@ exports[`Panels Table Component renders empty dashboard table container 1`] = `
                 class="euiFlexItem"
               >
                 <a
-                  class="euiButton euiButton--primary euiButton--fill"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill"
                   data-test-subj="customPanels__createNewPanels"
                   href="#/create"
                   rel="noreferrer"
@@ -1039,7 +1039,7 @@ exports[`Panels Table Component renders empty dashboard table container 1`] = `
             class="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <a
-              class="euiButton euiButton--primary"
+              class="euiButton euiButton--primary euiButton--small"
               data-test-subj="customPanels__emptyCreateNewPanels"
               href="#/create"
               rel="noreferrer"
@@ -1059,7 +1059,7 @@ exports[`Panels Table Component renders empty dashboard table container 1`] = `
             class="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              class="euiButton euiButton--primary"
+              class="euiButton euiButton--primary euiButton--small"
               type="button"
             >
               <span
@@ -1181,7 +1181,7 @@ exports[`Panels Table Component renders empty panel table container2 1`] = `
                     class="euiPopover__anchor"
                   >
                     <button
-                      class="euiButton euiButton--primary"
+                      class="euiButton euiButton--primary euiButton--small"
                       data-test-subj="operationalPanelsActionsButton"
                       type="button"
                     >
@@ -1217,7 +1217,7 @@ exports[`Panels Table Component renders empty panel table container2 1`] = `
                 class="euiFlexItem"
               >
                 <a
-                  class="euiButton euiButton--primary euiButton--fill"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill"
                   data-test-subj="customPanels__createNewPanels"
                   href="#/create"
                   rel="noreferrer"
@@ -1240,13 +1240,13 @@ exports[`Panels Table Component renders empty panel table container2 1`] = `
           class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginMedium"
         />
         <div
-          class="euiFormControlLayout euiFormControlLayout--fullWidth"
+          class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
         >
           <div
             class="euiFormControlLayout__childrenWrapper"
           >
             <input
-              class="euiFieldSearch euiFieldSearch--fullWidth"
+              class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
               data-test-subj="operationalPanelSearchBar"
               placeholder="Search Observability Dashboard name"
               type="search"
@@ -1260,7 +1260,7 @@ exports[`Panels Table Component renders empty panel table container2 1`] = `
               >
                 <svg
                   aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                  class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                   focusable="false"
                   height="16"
                   role="img"
diff --git a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
index 060e3fe8c6..f7b35c7f10 100644
--- a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
+++ b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
@@ -39,7 +39,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
               class="euiFlexItem"
             >
               <button
-                class="euiButton euiButton--primary euiButton-isDisabled"
+                class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                 data-test-subj="editPanelButton"
                 disabled=""
                 type="button"
@@ -79,7 +79,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="panelActionContextMenu"
                     type="button"
                   >
@@ -122,7 +122,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
@@ -175,7 +175,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
               role="combobox"
             >
               <div
-                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed euiFormControlLayout--group"
               >
                 <div
                   class="euiFormControlLayout__childrenWrapper"
@@ -186,7 +186,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
                     autocapitalize="off"
                     autocomplete="off"
                     autocorrect="off"
-                    class="euiFieldText euiFieldText--fullWidth euiFieldText--inGroup"
+                    class="euiFieldText euiFieldText--fullWidth euiFieldText--compressed euiFieldText--inGroup"
                     data-test-subj="searchAutocompleteTextArea"
                     disabled=""
                     enterkeyhint="search"
@@ -220,7 +220,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
                 class="euiFlexItem"
               >
                 <div
-                  class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+                  class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group euiSuperDatePicker"
                 >
                   <div
                     class="euiPopover euiPopover--anchorDownLeft"
@@ -282,7 +282,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
                       class="euiDatePickerRange euiDatePickerRange--inGroup"
                     >
                       <button
-                        class="euiSuperDatePicker__prettyFormat"
+                        class="euiSuperDatePicker__prettyFormat euiSuperDatePicker__prettyFormat--compressed"
                         data-test-subj="superDatePickerShowDatesButton"
                       >
                         Last 30 minutes
@@ -303,7 +303,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiSuperUpdateButton"
+                    class="euiButton euiButton--primary euiButton--small euiSuperUpdateButton"
                     data-test-subj="superDatePickerApplyTimeButton"
                     type="button"
                   >
@@ -384,7 +384,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
@@ -470,7 +470,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
               class="euiFlexItem"
             >
               <button
-                class="euiButton euiButton--primary euiButton-isDisabled"
+                class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                 data-test-subj="editPanelButton"
                 disabled=""
                 type="button"
@@ -510,7 +510,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="panelActionContextMenu"
                     type="button"
                   >
@@ -553,7 +553,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
@@ -606,7 +606,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
               role="combobox"
             >
               <div
-                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed euiFormControlLayout--group"
               >
                 <div
                   class="euiFormControlLayout__childrenWrapper"
@@ -617,7 +617,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
                     autocapitalize="off"
                     autocomplete="off"
                     autocorrect="off"
-                    class="euiFieldText euiFieldText--fullWidth euiFieldText--inGroup"
+                    class="euiFieldText euiFieldText--fullWidth euiFieldText--compressed euiFieldText--inGroup"
                     data-test-subj="searchAutocompleteTextArea"
                     disabled=""
                     enterkeyhint="search"
@@ -651,7 +651,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
                 class="euiFlexItem"
               >
                 <div
-                  class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+                  class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group euiSuperDatePicker"
                 >
                   <div
                     class="euiPopover euiPopover--anchorDownLeft"
@@ -713,7 +713,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
                       class="euiDatePickerRange euiDatePickerRange--inGroup"
                     >
                       <button
-                        class="euiSuperDatePicker__prettyFormat"
+                        class="euiSuperDatePicker__prettyFormat euiSuperDatePicker__prettyFormat--compressed"
                         data-test-subj="superDatePickerShowDatesButton"
                       >
                         Last 30 minutes
@@ -734,7 +734,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiSuperUpdateButton"
+                    class="euiButton euiButton--primary euiButton--small euiSuperUpdateButton"
                     data-test-subj="superDatePickerApplyTimeButton"
                     type="button"
                   >
@@ -815,7 +815,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
@@ -1393,87 +1393,96 @@ exports[`Panels View Component renders panel view container with visualizations
                             <div
                               className="euiFlexItem"
                             >
-                              <EuiButton
+                              <EuiSmallButton
                                 data-test-subj="editPanelButton"
                                 disabled={true}
                                 iconType="pencil"
                                 onClick={[Function]}
                               >
-                                <EuiButtonDisplay
-                                  baseClassName="euiButton"
+                                <EuiButton
                                   data-test-subj="editPanelButton"
                                   disabled={true}
-                                  element="button"
                                   iconType="pencil"
-                                  isDisabled={true}
                                   onClick={[Function]}
-                                  type="button"
+                                  size="s"
                                 >
-                                  <button
-                                    className="euiButton euiButton--primary euiButton-isDisabled"
+                                  <EuiButtonDisplay
+                                    baseClassName="euiButton"
                                     data-test-subj="editPanelButton"
                                     disabled={true}
+                                    element="button"
+                                    iconType="pencil"
+                                    isDisabled={true}
                                     onClick={[Function]}
-                                    style={
-                                      Object {
-                                        "minWidth": undefined,
-                                      }
-                                    }
+                                    size="s"
                                     type="button"
                                   >
-                                    <EuiButtonContent
-                                      className="euiButton__content"
-                                      iconSide="left"
-                                      iconType="pencil"
-                                      textProps={
+                                    <button
+                                      className="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
+                                      data-test-subj="editPanelButton"
+                                      disabled={true}
+                                      onClick={[Function]}
+                                      style={
                                         Object {
-                                          "className": "euiButton__text",
+                                          "minWidth": undefined,
                                         }
                                       }
+                                      type="button"
                                     >
-                                      <span
-                                        className="euiButtonContent euiButton__content"
+                                      <EuiButtonContent
+                                        className="euiButton__content"
+                                        iconSide="left"
+                                        iconType="pencil"
+                                        textProps={
+                                          Object {
+                                            "className": "euiButton__text",
+                                          }
+                                        }
                                       >
-                                        <EuiIcon
-                                          className="euiButtonContent__icon"
-                                          color="inherit"
-                                          size="m"
-                                          type="pencil"
+                                        <span
+                                          className="euiButtonContent euiButton__content"
                                         >
-                                          <EuiIconPencil
-                                            aria-hidden={true}
-                                            className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                                            focusable="false"
-                                            role="img"
-                                            style={null}
+                                          <EuiIcon
+                                            className="euiButtonContent__icon"
+                                            color="inherit"
+                                            size="m"
+                                            type="pencil"
                                           >
-                                            <svg
+                                            <EuiIconPencil
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                                               focusable="false"
-                                              height={16}
                                               role="img"
                                               style={null}
-                                              viewBox="0 0 16 16"
-                                              width={16}
-                                              xmlns="http://www.w3.org/2000/svg"
                                             >
-                                              <path
-                                                d="M12.148 3.148 11 2l-9 9v3h3l9-9-1.144-1.144-8.002 7.998a.502.502 0 0 1-.708 0 .502.502 0 0 1 0-.708l8.002-7.998ZM11 1c.256 0 .512.098.707.293l3 3a.999.999 0 0 1 0 1.414l-9 9A.997.997 0 0 1 5 15H2a1 1 0 0 1-1-1v-3c0-.265.105-.52.293-.707l9-9A.997.997 0 0 1 11 1ZM5 14H2v-3l3 3Z"
-                                              />
-                                            </svg>
-                                          </EuiIconPencil>
-                                        </EuiIcon>
-                                        <span
-                                          className="euiButton__text"
-                                        >
-                                          Edit
+                                              <svg
+                                                aria-hidden={true}
+                                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                                focusable="false"
+                                                height={16}
+                                                role="img"
+                                                style={null}
+                                                viewBox="0 0 16 16"
+                                                width={16}
+                                                xmlns="http://www.w3.org/2000/svg"
+                                              >
+                                                <path
+                                                  d="M12.148 3.148 11 2l-9 9v3h3l9-9-1.144-1.144-8.002 7.998a.502.502 0 0 1-.708 0 .502.502 0 0 1 0-.708l8.002-7.998ZM11 1c.256 0 .512.098.707.293l3 3a.999.999 0 0 1 0 1.414l-9 9A.997.997 0 0 1 5 15H2a1 1 0 0 1-1-1v-3c0-.265.105-.52.293-.707l9-9A.997.997 0 0 1 11 1ZM5 14H2v-3l3 3Z"
+                                                />
+                                              </svg>
+                                            </EuiIconPencil>
+                                          </EuiIcon>
+                                          <span
+                                            className="euiButton__text"
+                                          >
+                                            Edit
+                                          </span>
                                         </span>
-                                      </span>
-                                    </EuiButtonContent>
-                                  </button>
-                                </EuiButtonDisplay>
-                              </EuiButton>
+                                      </EuiButtonContent>
+                                    </button>
+                                  </EuiButtonDisplay>
+                                </EuiButton>
+                              </EuiSmallButton>
                             </div>
                           </EuiFlexItem>
                           <EuiFlexItem
@@ -1485,7 +1494,7 @@ exports[`Panels View Component renders panel view container with visualizations
                               <EuiPopover
                                 anchorPosition="downCenter"
                                 button={
-                                  <EuiButton
+                                  <EuiSmallButton
                                     data-test-subj="panelActionContextMenu"
                                     disabled={false}
                                     iconSide="right"
@@ -1493,7 +1502,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                     onClick={[Function]}
                                   >
                                     Dashboard Actions
-                                  </EuiButton>
+                                  </EuiSmallButton>
                                 }
                                 closePopover={[Function]}
                                 display="inlineBlock"
@@ -1510,90 +1519,100 @@ exports[`Panels View Component renders panel view container with visualizations
                                   <div
                                     className="euiPopover__anchor"
                                   >
-                                    <EuiButton
+                                    <EuiSmallButton
                                       data-test-subj="panelActionContextMenu"
                                       disabled={false}
                                       iconSide="right"
                                       iconType="arrowDown"
                                       onClick={[Function]}
                                     >
-                                      <EuiButtonDisplay
-                                        baseClassName="euiButton"
+                                      <EuiButton
                                         data-test-subj="panelActionContextMenu"
                                         disabled={false}
-                                        element="button"
                                         iconSide="right"
                                         iconType="arrowDown"
-                                        isDisabled={false}
                                         onClick={[Function]}
-                                        type="button"
+                                        size="s"
                                       >
-                                        <button
-                                          className="euiButton euiButton--primary"
+                                        <EuiButtonDisplay
+                                          baseClassName="euiButton"
                                           data-test-subj="panelActionContextMenu"
                                           disabled={false}
+                                          element="button"
+                                          iconSide="right"
+                                          iconType="arrowDown"
+                                          isDisabled={false}
                                           onClick={[Function]}
-                                          style={
-                                            Object {
-                                              "minWidth": undefined,
-                                            }
-                                          }
+                                          size="s"
                                           type="button"
                                         >
-                                          <EuiButtonContent
-                                            className="euiButton__content"
-                                            iconSide="right"
-                                            iconType="arrowDown"
-                                            textProps={
+                                          <button
+                                            className="euiButton euiButton--primary euiButton--small"
+                                            data-test-subj="panelActionContextMenu"
+                                            disabled={false}
+                                            onClick={[Function]}
+                                            style={
                                               Object {
-                                                "className": "euiButton__text",
+                                                "minWidth": undefined,
                                               }
                                             }
+                                            type="button"
                                           >
-                                            <span
-                                              className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                                            <EuiButtonContent
+                                              className="euiButton__content"
+                                              iconSide="right"
+                                              iconType="arrowDown"
+                                              textProps={
+                                                Object {
+                                                  "className": "euiButton__text",
+                                                }
+                                              }
                                             >
-                                              <EuiIcon
-                                                className="euiButtonContent__icon"
-                                                color="inherit"
-                                                size="m"
-                                                type="arrowDown"
+                                              <span
+                                                className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                                               >
-                                                <EuiIconArrowDown
-                                                  aria-hidden={true}
-                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                                                  focusable="false"
-                                                  role="img"
-                                                  style={null}
+                                                <EuiIcon
+                                                  className="euiButtonContent__icon"
+                                                  color="inherit"
+                                                  size="m"
+                                                  type="arrowDown"
                                                 >
-                                                  <svg
+                                                  <EuiIconArrowDown
                                                     aria-hidden={true}
                                                     className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                                                     focusable="false"
-                                                    height={16}
                                                     role="img"
                                                     style={null}
-                                                    viewBox="0 0 16 16"
-                                                    width={16}
-                                                    xmlns="http://www.w3.org/2000/svg"
                                                   >
-                                                    <path
-                                                      d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                                                      fillRule="non-zero"
-                                                    />
-                                                  </svg>
-                                                </EuiIconArrowDown>
-                                              </EuiIcon>
-                                              <span
-                                                className="euiButton__text"
-                                              >
-                                                Dashboard Actions
+                                                    <svg
+                                                      aria-hidden={true}
+                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                                      focusable="false"
+                                                      height={16}
+                                                      role="img"
+                                                      style={null}
+                                                      viewBox="0 0 16 16"
+                                                      width={16}
+                                                      xmlns="http://www.w3.org/2000/svg"
+                                                    >
+                                                      <path
+                                                        d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                                                        fillRule="non-zero"
+                                                      />
+                                                    </svg>
+                                                  </EuiIconArrowDown>
+                                                </EuiIcon>
+                                                <span
+                                                  className="euiButton__text"
+                                                >
+                                                  Dashboard Actions
+                                                </span>
                                               </span>
-                                            </span>
-                                          </EuiButtonContent>
-                                        </button>
-                                      </EuiButtonDisplay>
-                                    </EuiButton>
+                                            </EuiButtonContent>
+                                          </button>
+                                        </EuiButtonDisplay>
+                                      </EuiButton>
+                                    </EuiSmallButton>
                                   </div>
                                 </div>
                               </EuiPopover>
@@ -1612,7 +1631,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                 <EuiPopover
                                   anchorPosition="downLeft"
                                   button={
-                                    <EuiButton
+                                    <EuiSmallButton
                                       data-test-subj="addVisualizationButton"
                                       disabled={false}
                                       iconSide="right"
@@ -1620,7 +1639,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                       onClick={[Function]}
                                     >
                                       Add visualization
-                                    </EuiButton>
+                                    </EuiSmallButton>
                                   }
                                   closePopover={[Function]}
                                   display="inlineBlock"
@@ -1637,90 +1656,100 @@ exports[`Panels View Component renders panel view container with visualizations
                                     <div
                                       className="euiPopover__anchor"
                                     >
-                                      <EuiButton
+                                      <EuiSmallButton
                                         data-test-subj="addVisualizationButton"
                                         disabled={false}
                                         iconSide="right"
                                         iconType="arrowDown"
                                         onClick={[Function]}
                                       >
-                                        <EuiButtonDisplay
-                                          baseClassName="euiButton"
+                                        <EuiButton
                                           data-test-subj="addVisualizationButton"
                                           disabled={false}
-                                          element="button"
                                           iconSide="right"
                                           iconType="arrowDown"
-                                          isDisabled={false}
                                           onClick={[Function]}
-                                          type="button"
+                                          size="s"
                                         >
-                                          <button
-                                            className="euiButton euiButton--primary"
+                                          <EuiButtonDisplay
+                                            baseClassName="euiButton"
                                             data-test-subj="addVisualizationButton"
                                             disabled={false}
+                                            element="button"
+                                            iconSide="right"
+                                            iconType="arrowDown"
+                                            isDisabled={false}
                                             onClick={[Function]}
-                                            style={
-                                              Object {
-                                                "minWidth": undefined,
-                                              }
-                                            }
+                                            size="s"
                                             type="button"
                                           >
-                                            <EuiButtonContent
-                                              className="euiButton__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
+                                            <button
+                                              className="euiButton euiButton--primary euiButton--small"
+                                              data-test-subj="addVisualizationButton"
+                                              disabled={false}
+                                              onClick={[Function]}
+                                              style={
                                                 Object {
-                                                  "className": "euiButton__text",
+                                                  "minWidth": undefined,
                                                 }
                                               }
+                                              type="button"
                                             >
-                                              <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                                              <EuiButtonContent
+                                                className="euiButton__content"
+                                                iconSide="right"
+                                                iconType="arrowDown"
+                                                textProps={
+                                                  Object {
+                                                    "className": "euiButton__text",
+                                                  }
+                                                }
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  color="inherit"
-                                                  size="m"
-                                                  type="arrowDown"
+                                                <span
+                                                  className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                                                 >
-                                                  <EuiIconArrowDown
-                                                    aria-hidden={true}
-                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                                                    focusable="false"
-                                                    role="img"
-                                                    style={null}
+                                                  <EuiIcon
+                                                    className="euiButtonContent__icon"
+                                                    color="inherit"
+                                                    size="m"
+                                                    type="arrowDown"
                                                   >
-                                                    <svg
+                                                    <EuiIconArrowDown
                                                       aria-hidden={true}
                                                       className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                                                       focusable="false"
-                                                      height={16}
                                                       role="img"
                                                       style={null}
-                                                      viewBox="0 0 16 16"
-                                                      width={16}
-                                                      xmlns="http://www.w3.org/2000/svg"
                                                     >
-                                                      <path
-                                                        d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                                                        fillRule="non-zero"
-                                                      />
-                                                    </svg>
-                                                  </EuiIconArrowDown>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButton__text"
-                                                >
-                                                  Add visualization
+                                                      <svg
+                                                        aria-hidden={true}
+                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                                        focusable="false"
+                                                        height={16}
+                                                        role="img"
+                                                        style={null}
+                                                        viewBox="0 0 16 16"
+                                                        width={16}
+                                                        xmlns="http://www.w3.org/2000/svg"
+                                                      >
+                                                        <path
+                                                          d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                                                          fillRule="non-zero"
+                                                        />
+                                                      </svg>
+                                                    </EuiIconArrowDown>
+                                                  </EuiIcon>
+                                                  <span
+                                                    className="euiButton__text"
+                                                  >
+                                                    Add visualization
+                                                  </span>
                                                 </span>
-                                              </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonDisplay>
-                                      </EuiButton>
+                                              </EuiButtonContent>
+                                            </button>
+                                          </EuiButtonDisplay>
+                                        </EuiButton>
+                                      </EuiSmallButton>
                                     </div>
                                   </div>
                                 </EuiPopover>
@@ -1797,7 +1826,7 @@ exports[`Panels View Component renders panel view container with visualizations
                               id="autocomplete-root"
                               role="combobox"
                             >
-                              <EuiFieldText
+                              <EuiCompressedFieldText
                                 append={
                                   <EuiLink
                                     aria-label="ppl-info"
@@ -1840,7 +1869,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                 type="search"
                                 value=""
                               >
-                                <EuiFormControlLayout
+                                <EuiFieldText
                                   append={
                                     <EuiLink
                                       aria-label="ppl-info"
@@ -1854,78 +1883,126 @@ exports[`Panels View Component renders panel view container with visualizations
                                       PPL
                                     </EuiLink>
                                   }
+                                  aria-autocomplete="both"
+                                  aria-labelledby="autocomplete-4-label"
+                                  autoCapitalize="off"
+                                  autoComplete="off"
+                                  autoCorrect="off"
+                                  autoFocus={false}
+                                  compressed={true}
+                                  data-test-subj="searchAutocompleteTextArea"
+                                  disabled={true}
+                                  enterKeyHint="search"
                                   fullWidth={true}
-                                  inputId="autocomplete-textarea"
+                                  id="autocomplete-textarea"
+                                  maxLength={16384}
+                                  onBlur={[Function]}
+                                  onChange={[Function]}
+                                  onClick={[Function]}
+                                  onFocus={[Function]}
+                                  onKeyDown={[Function]}
+                                  placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
+                                  spellCheck="false"
+                                  style={
+                                    Object {
+                                      "height": "18px",
+                                      "marginTop": "0px",
+                                      "padding": "8px",
+                                    }
+                                  }
+                                  type="search"
+                                  value=""
                                 >
-                                  <div
-                                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+                                  <EuiFormControlLayout
+                                    append={
+                                      <EuiLink
+                                        aria-label="ppl-info"
+                                        onClick={[Function]}
+                                        style={
+                                          Object {
+                                            "padding": "10px",
+                                          }
+                                        }
+                                      >
+                                        PPL
+                                      </EuiLink>
+                                    }
+                                    compressed={true}
+                                    fullWidth={true}
+                                    inputId="autocomplete-textarea"
                                   >
                                     <div
-                                      className="euiFormControlLayout__childrenWrapper"
+                                      className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed euiFormControlLayout--group"
                                     >
-                                      <EuiValidatableControl>
-                                        <input
-                                          aria-autocomplete="both"
-                                          aria-labelledby="autocomplete-4-label"
-                                          autoCapitalize="off"
-                                          autoComplete="off"
-                                          autoCorrect="off"
-                                          autoFocus={false}
-                                          className="euiFieldText euiFieldText--fullWidth euiFieldText--inGroup"
-                                          data-test-subj="searchAutocompleteTextArea"
-                                          disabled={true}
-                                          enterKeyHint="search"
-                                          id="autocomplete-textarea"
-                                          maxLength={16384}
-                                          onBlur={[Function]}
-                                          onChange={[Function]}
-                                          onClick={[Function]}
-                                          onFocus={[Function]}
-                                          onKeyDown={[Function]}
-                                          placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
-                                          spellCheck="false"
-                                          style={
-                                            Object {
-                                              "height": "18px",
-                                              "marginTop": "0px",
-                                              "padding": "8px",
+                                      <div
+                                        className="euiFormControlLayout__childrenWrapper"
+                                      >
+                                        <EuiValidatableControl>
+                                          <input
+                                            aria-autocomplete="both"
+                                            aria-labelledby="autocomplete-4-label"
+                                            autoCapitalize="off"
+                                            autoComplete="off"
+                                            autoCorrect="off"
+                                            autoFocus={false}
+                                            className="euiFieldText euiFieldText--fullWidth euiFieldText--compressed euiFieldText--inGroup"
+                                            data-test-subj="searchAutocompleteTextArea"
+                                            disabled={true}
+                                            enterKeyHint="search"
+                                            id="autocomplete-textarea"
+                                            maxLength={16384}
+                                            onBlur={[Function]}
+                                            onChange={[Function]}
+                                            onClick={[Function]}
+                                            onFocus={[Function]}
+                                            onKeyDown={[Function]}
+                                            placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
+                                            spellCheck="false"
+                                            style={
+                                              Object {
+                                                "height": "18px",
+                                                "marginTop": "0px",
+                                                "padding": "8px",
+                                              }
                                             }
-                                          }
-                                          type="search"
-                                          value=""
+                                            type="search"
+                                            value=""
+                                          />
+                                        </EuiValidatableControl>
+                                        <EuiFormControlLayoutIcons
+                                          compressed={true}
                                         />
-                                      </EuiValidatableControl>
-                                      <EuiFormControlLayoutIcons />
-                                    </div>
-                                    <EuiLink
-                                      aria-label="ppl-info"
-                                      className="euiFormControlLayout__append"
-                                      key="0/.0"
-                                      onClick={[Function]}
-                                      style={
-                                        Object {
-                                          "padding": "10px",
-                                        }
-                                      }
-                                    >
-                                      <button
+                                      </div>
+                                      <EuiLink
                                         aria-label="ppl-info"
-                                        className="euiLink euiLink--primary euiFormControlLayout__append"
-                                        disabled={false}
+                                        className="euiFormControlLayout__append"
+                                        key="0/.0"
                                         onClick={[Function]}
                                         style={
                                           Object {
                                             "padding": "10px",
                                           }
                                         }
-                                        type="button"
                                       >
-                                        PPL
-                                      </button>
-                                    </EuiLink>
-                                  </div>
-                                </EuiFormControlLayout>
-                              </EuiFieldText>
+                                        <button
+                                          aria-label="ppl-info"
+                                          className="euiLink euiLink--primary euiFormControlLayout__append"
+                                          disabled={false}
+                                          onClick={[Function]}
+                                          style={
+                                            Object {
+                                              "padding": "10px",
+                                            }
+                                          }
+                                          type="button"
+                                        >
+                                          PPL
+                                        </button>
+                                      </EuiLink>
+                                    </div>
+                                  </EuiFormControlLayout>
+                                </EuiFieldText>
+                              </EuiCompressedFieldText>
                             </div>
                           </Autocomplete>
                         </div>
@@ -1936,7 +2013,7 @@ exports[`Panels View Component renders panel view container with visualizations
                         <div
                           className="euiFlexItem euiFlexItem--flexGrowZero"
                         >
-                          <EuiSuperDatePicker
+                          <EuiCompressedSuperDatePicker
                             commonlyUsedRanges={
                               Array [
                                 Object {
@@ -1981,7 +2058,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                 },
                               ]
                             }
-                            compressed={false}
+                            compressed={true}
                             dateFormat=""
                             end="now"
                             isAutoRefreshOnly={false}
@@ -2008,7 +2085,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                   >
                                     <EuiFormControlLayout
                                       className="euiSuperDatePicker"
-                                      compressed={false}
+                                      compressed={true}
                                       isDisabled={false}
                                       prepend={
                                         <EuiQuickSelectPopover
@@ -2069,7 +2146,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                       }
                                     >
                                       <div
-                                        className="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+                                        className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group euiSuperDatePicker"
                                       >
                                         <EuiQuickSelectPopover
                                           applyTime={[Function]}
@@ -2287,7 +2364,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                               className="euiDatePickerRange euiDatePickerRange--inGroup"
                                             >
                                               <button
-                                                className="euiSuperDatePicker__prettyFormat"
+                                                className="euiSuperDatePicker__prettyFormat euiSuperDatePicker__prettyFormat--compressed"
                                                 data-test-subj="superDatePickerShowDatesButton"
                                                 disabled={false}
                                                 onClick={[Function]}
@@ -2307,7 +2384,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                             </div>
                                           </EuiDatePickerRange>
                                           <EuiFormControlLayoutIcons
-                                            compressed={false}
+                                            compressed={true}
                                           />
                                         </div>
                                       </div>
@@ -2321,7 +2398,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                     className="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <EuiSuperUpdateButton
-                                      compressed={false}
+                                      compressed={true}
                                       data-test-subj="superDatePickerApplyTimeButton"
                                       isDisabled={false}
                                       isLoading={false}
@@ -2349,7 +2426,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                             onBlur={[Function]}
                                             onClick={[Function]}
                                             onFocus={[Function]}
-                                            size="m"
+                                            size="s"
                                             textProps={
                                               Object {
                                                 "className": "euiSuperUpdateButton__text",
@@ -2369,7 +2446,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
-                                              size="m"
+                                              size="s"
                                               textProps={
                                                 Object {
                                                   "className": "euiSuperUpdateButton__text",
@@ -2378,7 +2455,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                               type="button"
                                             >
                                               <button
-                                                className="euiButton euiButton--primary euiSuperUpdateButton"
+                                                className="euiButton euiButton--primary euiButton--small euiSuperUpdateButton"
                                                 data-test-subj="superDatePickerApplyTimeButton"
                                                 disabled={false}
                                                 onBlur={[Function]}
@@ -2457,7 +2534,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                 </EuiFlexItem>
                               </div>
                             </EuiFlexGroup>
-                          </EuiSuperDatePicker>
+                          </EuiCompressedSuperDatePicker>
                         </div>
                       </EuiFlexItem>
                     </div>
@@ -2554,7 +2631,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                 <EuiPopover
                                   anchorPosition="downLeft"
                                   button={
-                                    <EuiButton
+                                    <EuiSmallButton
                                       data-test-subj="addVisualizationButton"
                                       disabled={false}
                                       iconSide="right"
@@ -2562,7 +2639,7 @@ exports[`Panels View Component renders panel view container with visualizations
                                       onClick={[Function]}
                                     >
                                       Add visualization
-                                    </EuiButton>
+                                    </EuiSmallButton>
                                   }
                                   closePopover={[Function]}
                                   display="inlineBlock"
@@ -2579,90 +2656,100 @@ exports[`Panels View Component renders panel view container with visualizations
                                     <div
                                       className="euiPopover__anchor"
                                     >
-                                      <EuiButton
+                                      <EuiSmallButton
                                         data-test-subj="addVisualizationButton"
                                         disabled={false}
                                         iconSide="right"
                                         iconType="arrowDown"
                                         onClick={[Function]}
                                       >
-                                        <EuiButtonDisplay
-                                          baseClassName="euiButton"
+                                        <EuiButton
                                           data-test-subj="addVisualizationButton"
                                           disabled={false}
-                                          element="button"
                                           iconSide="right"
                                           iconType="arrowDown"
-                                          isDisabled={false}
                                           onClick={[Function]}
-                                          type="button"
+                                          size="s"
                                         >
-                                          <button
-                                            className="euiButton euiButton--primary"
+                                          <EuiButtonDisplay
+                                            baseClassName="euiButton"
                                             data-test-subj="addVisualizationButton"
                                             disabled={false}
+                                            element="button"
+                                            iconSide="right"
+                                            iconType="arrowDown"
+                                            isDisabled={false}
                                             onClick={[Function]}
-                                            style={
-                                              Object {
-                                                "minWidth": undefined,
-                                              }
-                                            }
+                                            size="s"
                                             type="button"
                                           >
-                                            <EuiButtonContent
-                                              className="euiButton__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
+                                            <button
+                                              className="euiButton euiButton--primary euiButton--small"
+                                              data-test-subj="addVisualizationButton"
+                                              disabled={false}
+                                              onClick={[Function]}
+                                              style={
                                                 Object {
-                                                  "className": "euiButton__text",
+                                                  "minWidth": undefined,
                                                 }
                                               }
+                                              type="button"
                                             >
-                                              <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                                              <EuiButtonContent
+                                                className="euiButton__content"
+                                                iconSide="right"
+                                                iconType="arrowDown"
+                                                textProps={
+                                                  Object {
+                                                    "className": "euiButton__text",
+                                                  }
+                                                }
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  color="inherit"
-                                                  size="m"
-                                                  type="arrowDown"
+                                                <span
+                                                  className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                                                 >
-                                                  <EuiIconArrowDown
-                                                    aria-hidden={true}
-                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                                                    focusable="false"
-                                                    role="img"
-                                                    style={null}
+                                                  <EuiIcon
+                                                    className="euiButtonContent__icon"
+                                                    color="inherit"
+                                                    size="m"
+                                                    type="arrowDown"
                                                   >
-                                                    <svg
+                                                    <EuiIconArrowDown
                                                       aria-hidden={true}
                                                       className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                                                       focusable="false"
-                                                      height={16}
                                                       role="img"
                                                       style={null}
-                                                      viewBox="0 0 16 16"
-                                                      width={16}
-                                                      xmlns="http://www.w3.org/2000/svg"
                                                     >
-                                                      <path
-                                                        d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                                                        fillRule="non-zero"
-                                                      />
-                                                    </svg>
-                                                  </EuiIconArrowDown>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButton__text"
-                                                >
-                                                  Add visualization
+                                                      <svg
+                                                        aria-hidden={true}
+                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                                        focusable="false"
+                                                        height={16}
+                                                        role="img"
+                                                        style={null}
+                                                        viewBox="0 0 16 16"
+                                                        width={16}
+                                                        xmlns="http://www.w3.org/2000/svg"
+                                                      >
+                                                        <path
+                                                          d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                                                          fillRule="non-zero"
+                                                        />
+                                                      </svg>
+                                                    </EuiIconArrowDown>
+                                                  </EuiIcon>
+                                                  <span
+                                                    className="euiButton__text"
+                                                  >
+                                                    Add visualization
+                                                  </span>
                                                 </span>
-                                              </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonDisplay>
-                                      </EuiButton>
+                                              </EuiButtonContent>
+                                            </button>
+                                          </EuiButtonDisplay>
+                                        </EuiButton>
+                                      </EuiSmallButton>
                                     </div>
                                   </div>
                                 </EuiPopover>
@@ -3657,87 +3744,96 @@ exports[`Panels View Component renders panel view container without visualizatio
                             <div
                               className="euiFlexItem"
                             >
-                              <EuiButton
+                              <EuiSmallButton
                                 data-test-subj="editPanelButton"
                                 disabled={true}
                                 iconType="pencil"
                                 onClick={[Function]}
                               >
-                                <EuiButtonDisplay
-                                  baseClassName="euiButton"
+                                <EuiButton
                                   data-test-subj="editPanelButton"
                                   disabled={true}
-                                  element="button"
                                   iconType="pencil"
-                                  isDisabled={true}
                                   onClick={[Function]}
-                                  type="button"
+                                  size="s"
                                 >
-                                  <button
-                                    className="euiButton euiButton--primary euiButton-isDisabled"
+                                  <EuiButtonDisplay
+                                    baseClassName="euiButton"
                                     data-test-subj="editPanelButton"
                                     disabled={true}
+                                    element="button"
+                                    iconType="pencil"
+                                    isDisabled={true}
                                     onClick={[Function]}
-                                    style={
-                                      Object {
-                                        "minWidth": undefined,
-                                      }
-                                    }
+                                    size="s"
                                     type="button"
                                   >
-                                    <EuiButtonContent
-                                      className="euiButton__content"
-                                      iconSide="left"
-                                      iconType="pencil"
-                                      textProps={
+                                    <button
+                                      className="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
+                                      data-test-subj="editPanelButton"
+                                      disabled={true}
+                                      onClick={[Function]}
+                                      style={
                                         Object {
-                                          "className": "euiButton__text",
+                                          "minWidth": undefined,
                                         }
                                       }
+                                      type="button"
                                     >
-                                      <span
-                                        className="euiButtonContent euiButton__content"
+                                      <EuiButtonContent
+                                        className="euiButton__content"
+                                        iconSide="left"
+                                        iconType="pencil"
+                                        textProps={
+                                          Object {
+                                            "className": "euiButton__text",
+                                          }
+                                        }
                                       >
-                                        <EuiIcon
-                                          className="euiButtonContent__icon"
-                                          color="inherit"
-                                          size="m"
-                                          type="pencil"
+                                        <span
+                                          className="euiButtonContent euiButton__content"
                                         >
-                                          <EuiIconBeaker
-                                            aria-hidden={true}
-                                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                            focusable="false"
-                                            role="img"
-                                            style={null}
+                                          <EuiIcon
+                                            className="euiButtonContent__icon"
+                                            color="inherit"
+                                            size="m"
+                                            type="pencil"
                                           >
-                                            <svg
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                               focusable="false"
-                                              height={16}
                                               role="img"
                                               style={null}
-                                              viewBox="0 0 16 16"
-                                              width={16}
-                                              xmlns="http://www.w3.org/2000/svg"
                                             >
-                                              <path
-                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                              />
-                                            </svg>
-                                          </EuiIconBeaker>
-                                        </EuiIcon>
-                                        <span
-                                          className="euiButton__text"
-                                        >
-                                          Edit
+                                              <svg
+                                                aria-hidden={true}
+                                                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                                focusable="false"
+                                                height={16}
+                                                role="img"
+                                                style={null}
+                                                viewBox="0 0 16 16"
+                                                width={16}
+                                                xmlns="http://www.w3.org/2000/svg"
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
+                                          </EuiIcon>
+                                          <span
+                                            className="euiButton__text"
+                                          >
+                                            Edit
+                                          </span>
                                         </span>
-                                      </span>
-                                    </EuiButtonContent>
-                                  </button>
-                                </EuiButtonDisplay>
-                              </EuiButton>
+                                      </EuiButtonContent>
+                                    </button>
+                                  </EuiButtonDisplay>
+                                </EuiButton>
+                              </EuiSmallButton>
                             </div>
                           </EuiFlexItem>
                           <EuiFlexItem
@@ -3749,7 +3845,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                               <EuiPopover
                                 anchorPosition="downCenter"
                                 button={
-                                  <EuiButton
+                                  <EuiSmallButton
                                     data-test-subj="panelActionContextMenu"
                                     disabled={false}
                                     iconSide="right"
@@ -3757,7 +3853,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                     onClick={[Function]}
                                   >
                                     Dashboard Actions
-                                  </EuiButton>
+                                  </EuiSmallButton>
                                 }
                                 closePopover={[Function]}
                                 display="inlineBlock"
@@ -3774,89 +3870,99 @@ exports[`Panels View Component renders panel view container without visualizatio
                                   <div
                                     className="euiPopover__anchor"
                                   >
-                                    <EuiButton
+                                    <EuiSmallButton
                                       data-test-subj="panelActionContextMenu"
                                       disabled={false}
                                       iconSide="right"
                                       iconType="arrowDown"
                                       onClick={[Function]}
                                     >
-                                      <EuiButtonDisplay
-                                        baseClassName="euiButton"
+                                      <EuiButton
                                         data-test-subj="panelActionContextMenu"
                                         disabled={false}
-                                        element="button"
                                         iconSide="right"
                                         iconType="arrowDown"
-                                        isDisabled={false}
                                         onClick={[Function]}
-                                        type="button"
+                                        size="s"
                                       >
-                                        <button
-                                          className="euiButton euiButton--primary"
+                                        <EuiButtonDisplay
+                                          baseClassName="euiButton"
                                           data-test-subj="panelActionContextMenu"
                                           disabled={false}
+                                          element="button"
+                                          iconSide="right"
+                                          iconType="arrowDown"
+                                          isDisabled={false}
                                           onClick={[Function]}
-                                          style={
-                                            Object {
-                                              "minWidth": undefined,
-                                            }
-                                          }
+                                          size="s"
                                           type="button"
                                         >
-                                          <EuiButtonContent
-                                            className="euiButton__content"
-                                            iconSide="right"
-                                            iconType="arrowDown"
-                                            textProps={
+                                          <button
+                                            className="euiButton euiButton--primary euiButton--small"
+                                            data-test-subj="panelActionContextMenu"
+                                            disabled={false}
+                                            onClick={[Function]}
+                                            style={
                                               Object {
-                                                "className": "euiButton__text",
+                                                "minWidth": undefined,
                                               }
                                             }
+                                            type="button"
                                           >
-                                            <span
-                                              className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                                            <EuiButtonContent
+                                              className="euiButton__content"
+                                              iconSide="right"
+                                              iconType="arrowDown"
+                                              textProps={
+                                                Object {
+                                                  "className": "euiButton__text",
+                                                }
+                                              }
                                             >
-                                              <EuiIcon
-                                                className="euiButtonContent__icon"
-                                                color="inherit"
-                                                size="m"
-                                                type="arrowDown"
+                                              <span
+                                                className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                                               >
-                                                <EuiIconBeaker
-                                                  aria-hidden={true}
-                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                                  focusable="false"
-                                                  role="img"
-                                                  style={null}
+                                                <EuiIcon
+                                                  className="euiButtonContent__icon"
+                                                  color="inherit"
+                                                  size="m"
+                                                  type="arrowDown"
                                                 >
-                                                  <svg
+                                                  <EuiIconBeaker
                                                     aria-hidden={true}
                                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                     focusable="false"
-                                                    height={16}
                                                     role="img"
                                                     style={null}
-                                                    viewBox="0 0 16 16"
-                                                    width={16}
-                                                    xmlns="http://www.w3.org/2000/svg"
                                                   >
-                                                    <path
-                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                    />
-                                                  </svg>
-                                                </EuiIconBeaker>
-                                              </EuiIcon>
-                                              <span
-                                                className="euiButton__text"
-                                              >
-                                                Dashboard Actions
+                                                    <svg
+                                                      aria-hidden={true}
+                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                                      focusable="false"
+                                                      height={16}
+                                                      role="img"
+                                                      style={null}
+                                                      viewBox="0 0 16 16"
+                                                      width={16}
+                                                      xmlns="http://www.w3.org/2000/svg"
+                                                    >
+                                                      <path
+                                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                      />
+                                                    </svg>
+                                                  </EuiIconBeaker>
+                                                </EuiIcon>
+                                                <span
+                                                  className="euiButton__text"
+                                                >
+                                                  Dashboard Actions
+                                                </span>
                                               </span>
-                                            </span>
-                                          </EuiButtonContent>
-                                        </button>
-                                      </EuiButtonDisplay>
-                                    </EuiButton>
+                                            </EuiButtonContent>
+                                          </button>
+                                        </EuiButtonDisplay>
+                                      </EuiButton>
+                                    </EuiSmallButton>
                                   </div>
                                 </div>
                               </EuiPopover>
@@ -3875,7 +3981,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                 <EuiPopover
                                   anchorPosition="downLeft"
                                   button={
-                                    <EuiButton
+                                    <EuiSmallButton
                                       data-test-subj="addVisualizationButton"
                                       disabled={false}
                                       iconSide="right"
@@ -3883,7 +3989,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                       onClick={[Function]}
                                     >
                                       Add visualization
-                                    </EuiButton>
+                                    </EuiSmallButton>
                                   }
                                   closePopover={[Function]}
                                   display="inlineBlock"
@@ -3900,89 +4006,99 @@ exports[`Panels View Component renders panel view container without visualizatio
                                     <div
                                       className="euiPopover__anchor"
                                     >
-                                      <EuiButton
+                                      <EuiSmallButton
                                         data-test-subj="addVisualizationButton"
                                         disabled={false}
                                         iconSide="right"
                                         iconType="arrowDown"
                                         onClick={[Function]}
                                       >
-                                        <EuiButtonDisplay
-                                          baseClassName="euiButton"
+                                        <EuiButton
                                           data-test-subj="addVisualizationButton"
                                           disabled={false}
-                                          element="button"
                                           iconSide="right"
                                           iconType="arrowDown"
-                                          isDisabled={false}
                                           onClick={[Function]}
-                                          type="button"
+                                          size="s"
                                         >
-                                          <button
-                                            className="euiButton euiButton--primary"
+                                          <EuiButtonDisplay
+                                            baseClassName="euiButton"
                                             data-test-subj="addVisualizationButton"
                                             disabled={false}
+                                            element="button"
+                                            iconSide="right"
+                                            iconType="arrowDown"
+                                            isDisabled={false}
                                             onClick={[Function]}
-                                            style={
-                                              Object {
-                                                "minWidth": undefined,
-                                              }
-                                            }
+                                            size="s"
                                             type="button"
                                           >
-                                            <EuiButtonContent
-                                              className="euiButton__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
+                                            <button
+                                              className="euiButton euiButton--primary euiButton--small"
+                                              data-test-subj="addVisualizationButton"
+                                              disabled={false}
+                                              onClick={[Function]}
+                                              style={
                                                 Object {
-                                                  "className": "euiButton__text",
+                                                  "minWidth": undefined,
                                                 }
                                               }
+                                              type="button"
                                             >
-                                              <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                                              <EuiButtonContent
+                                                className="euiButton__content"
+                                                iconSide="right"
+                                                iconType="arrowDown"
+                                                textProps={
+                                                  Object {
+                                                    "className": "euiButton__text",
+                                                  }
+                                                }
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  color="inherit"
-                                                  size="m"
-                                                  type="arrowDown"
+                                                <span
+                                                  className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                                                 >
-                                                  <EuiIconBeaker
-                                                    aria-hidden={true}
-                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                                    focusable="false"
-                                                    role="img"
-                                                    style={null}
+                                                  <EuiIcon
+                                                    className="euiButtonContent__icon"
+                                                    color="inherit"
+                                                    size="m"
+                                                    type="arrowDown"
                                                   >
-                                                    <svg
+                                                    <EuiIconBeaker
                                                       aria-hidden={true}
                                                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                       focusable="false"
-                                                      height={16}
                                                       role="img"
                                                       style={null}
-                                                      viewBox="0 0 16 16"
-                                                      width={16}
-                                                      xmlns="http://www.w3.org/2000/svg"
                                                     >
-                                                      <path
-                                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                      />
-                                                    </svg>
-                                                  </EuiIconBeaker>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButton__text"
-                                                >
-                                                  Add visualization
+                                                      <svg
+                                                        aria-hidden={true}
+                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                                        focusable="false"
+                                                        height={16}
+                                                        role="img"
+                                                        style={null}
+                                                        viewBox="0 0 16 16"
+                                                        width={16}
+                                                        xmlns="http://www.w3.org/2000/svg"
+                                                      >
+                                                        <path
+                                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                        />
+                                                      </svg>
+                                                    </EuiIconBeaker>
+                                                  </EuiIcon>
+                                                  <span
+                                                    className="euiButton__text"
+                                                  >
+                                                    Add visualization
+                                                  </span>
                                                 </span>
-                                              </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonDisplay>
-                                      </EuiButton>
+                                              </EuiButtonContent>
+                                            </button>
+                                          </EuiButtonDisplay>
+                                        </EuiButton>
+                                      </EuiSmallButton>
                                     </div>
                                   </div>
                                 </EuiPopover>
@@ -4059,7 +4175,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                               id="autocomplete-root"
                               role="combobox"
                             >
-                              <EuiFieldText
+                              <EuiCompressedFieldText
                                 append={
                                   <EuiLink
                                     aria-label="ppl-info"
@@ -4102,7 +4218,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                 type="search"
                                 value=""
                               >
-                                <EuiFormControlLayout
+                                <EuiFieldText
                                   append={
                                     <EuiLink
                                       aria-label="ppl-info"
@@ -4116,78 +4232,126 @@ exports[`Panels View Component renders panel view container without visualizatio
                                       PPL
                                     </EuiLink>
                                   }
+                                  aria-autocomplete="both"
+                                  aria-labelledby="autocomplete-1-label"
+                                  autoCapitalize="off"
+                                  autoComplete="off"
+                                  autoCorrect="off"
+                                  autoFocus={false}
+                                  compressed={true}
+                                  data-test-subj="searchAutocompleteTextArea"
+                                  disabled={true}
+                                  enterKeyHint="search"
                                   fullWidth={true}
-                                  inputId="autocomplete-textarea"
+                                  id="autocomplete-textarea"
+                                  maxLength={16384}
+                                  onBlur={[Function]}
+                                  onChange={[Function]}
+                                  onClick={[Function]}
+                                  onFocus={[Function]}
+                                  onKeyDown={[Function]}
+                                  placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
+                                  spellCheck="false"
+                                  style={
+                                    Object {
+                                      "height": "18px",
+                                      "marginTop": "0px",
+                                      "padding": "8px",
+                                    }
+                                  }
+                                  type="search"
+                                  value=""
                                 >
-                                  <div
-                                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+                                  <EuiFormControlLayout
+                                    append={
+                                      <EuiLink
+                                        aria-label="ppl-info"
+                                        onClick={[Function]}
+                                        style={
+                                          Object {
+                                            "padding": "10px",
+                                          }
+                                        }
+                                      >
+                                        PPL
+                                      </EuiLink>
+                                    }
+                                    compressed={true}
+                                    fullWidth={true}
+                                    inputId="autocomplete-textarea"
                                   >
                                     <div
-                                      className="euiFormControlLayout__childrenWrapper"
+                                      className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed euiFormControlLayout--group"
                                     >
-                                      <EuiValidatableControl>
-                                        <input
-                                          aria-autocomplete="both"
-                                          aria-labelledby="autocomplete-1-label"
-                                          autoCapitalize="off"
-                                          autoComplete="off"
-                                          autoCorrect="off"
-                                          autoFocus={false}
-                                          className="euiFieldText euiFieldText--fullWidth euiFieldText--inGroup"
-                                          data-test-subj="searchAutocompleteTextArea"
-                                          disabled={true}
-                                          enterKeyHint="search"
-                                          id="autocomplete-textarea"
-                                          maxLength={16384}
-                                          onBlur={[Function]}
-                                          onChange={[Function]}
-                                          onClick={[Function]}
-                                          onFocus={[Function]}
-                                          onKeyDown={[Function]}
-                                          placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
-                                          spellCheck="false"
-                                          style={
-                                            Object {
-                                              "height": "18px",
-                                              "marginTop": "0px",
-                                              "padding": "8px",
+                                      <div
+                                        className="euiFormControlLayout__childrenWrapper"
+                                      >
+                                        <EuiValidatableControl>
+                                          <input
+                                            aria-autocomplete="both"
+                                            aria-labelledby="autocomplete-1-label"
+                                            autoCapitalize="off"
+                                            autoComplete="off"
+                                            autoCorrect="off"
+                                            autoFocus={false}
+                                            className="euiFieldText euiFieldText--fullWidth euiFieldText--compressed euiFieldText--inGroup"
+                                            data-test-subj="searchAutocompleteTextArea"
+                                            disabled={true}
+                                            enterKeyHint="search"
+                                            id="autocomplete-textarea"
+                                            maxLength={16384}
+                                            onBlur={[Function]}
+                                            onChange={[Function]}
+                                            onClick={[Function]}
+                                            onFocus={[Function]}
+                                            onKeyDown={[Function]}
+                                            placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
+                                            spellCheck="false"
+                                            style={
+                                              Object {
+                                                "height": "18px",
+                                                "marginTop": "0px",
+                                                "padding": "8px",
+                                              }
                                             }
-                                          }
-                                          type="search"
-                                          value=""
+                                            type="search"
+                                            value=""
+                                          />
+                                        </EuiValidatableControl>
+                                        <EuiFormControlLayoutIcons
+                                          compressed={true}
                                         />
-                                      </EuiValidatableControl>
-                                      <EuiFormControlLayoutIcons />
-                                    </div>
-                                    <EuiLink
-                                      aria-label="ppl-info"
-                                      className="euiFormControlLayout__append"
-                                      key="0/.0"
-                                      onClick={[Function]}
-                                      style={
-                                        Object {
-                                          "padding": "10px",
-                                        }
-                                      }
-                                    >
-                                      <button
+                                      </div>
+                                      <EuiLink
                                         aria-label="ppl-info"
-                                        className="euiLink euiLink--primary euiFormControlLayout__append"
-                                        disabled={false}
+                                        className="euiFormControlLayout__append"
+                                        key="0/.0"
                                         onClick={[Function]}
                                         style={
                                           Object {
                                             "padding": "10px",
                                           }
                                         }
-                                        type="button"
                                       >
-                                        PPL
-                                      </button>
-                                    </EuiLink>
-                                  </div>
-                                </EuiFormControlLayout>
-                              </EuiFieldText>
+                                        <button
+                                          aria-label="ppl-info"
+                                          className="euiLink euiLink--primary euiFormControlLayout__append"
+                                          disabled={false}
+                                          onClick={[Function]}
+                                          style={
+                                            Object {
+                                              "padding": "10px",
+                                            }
+                                          }
+                                          type="button"
+                                        >
+                                          PPL
+                                        </button>
+                                      </EuiLink>
+                                    </div>
+                                  </EuiFormControlLayout>
+                                </EuiFieldText>
+                              </EuiCompressedFieldText>
                             </div>
                           </Autocomplete>
                         </div>
@@ -4198,7 +4362,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                         <div
                           className="euiFlexItem euiFlexItem--flexGrowZero"
                         >
-                          <EuiSuperDatePicker
+                          <EuiCompressedSuperDatePicker
                             commonlyUsedRanges={
                               Array [
                                 Object {
@@ -4243,7 +4407,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                 },
                               ]
                             }
-                            compressed={false}
+                            compressed={true}
                             dateFormat=""
                             end="now"
                             isAutoRefreshOnly={false}
@@ -4270,7 +4434,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                   >
                                     <EuiFormControlLayout
                                       className="euiSuperDatePicker"
-                                      compressed={false}
+                                      compressed={true}
                                       isDisabled={false}
                                       prepend={
                                         <EuiQuickSelectPopover
@@ -4331,7 +4495,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                       }
                                     >
                                       <div
-                                        className="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+                                        className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group euiSuperDatePicker"
                                       >
                                         <EuiQuickSelectPopover
                                           applyTime={[Function]}
@@ -4547,7 +4711,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                               className="euiDatePickerRange euiDatePickerRange--inGroup"
                                             >
                                               <button
-                                                className="euiSuperDatePicker__prettyFormat"
+                                                className="euiSuperDatePicker__prettyFormat euiSuperDatePicker__prettyFormat--compressed"
                                                 data-test-subj="superDatePickerShowDatesButton"
                                                 disabled={false}
                                                 onClick={[Function]}
@@ -4567,7 +4731,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                             </div>
                                           </EuiDatePickerRange>
                                           <EuiFormControlLayoutIcons
-                                            compressed={false}
+                                            compressed={true}
                                           />
                                         </div>
                                       </div>
@@ -4581,7 +4745,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                     className="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <EuiSuperUpdateButton
-                                      compressed={false}
+                                      compressed={true}
                                       data-test-subj="superDatePickerApplyTimeButton"
                                       isDisabled={false}
                                       isLoading={false}
@@ -4609,7 +4773,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                             onBlur={[Function]}
                                             onClick={[Function]}
                                             onFocus={[Function]}
-                                            size="m"
+                                            size="s"
                                             textProps={
                                               Object {
                                                 "className": "euiSuperUpdateButton__text",
@@ -4629,7 +4793,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
-                                              size="m"
+                                              size="s"
                                               textProps={
                                                 Object {
                                                   "className": "euiSuperUpdateButton__text",
@@ -4638,7 +4802,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                               type="button"
                                             >
                                               <button
-                                                className="euiButton euiButton--primary euiSuperUpdateButton"
+                                                className="euiButton euiButton--primary euiButton--small euiSuperUpdateButton"
                                                 data-test-subj="superDatePickerApplyTimeButton"
                                                 disabled={false}
                                                 onBlur={[Function]}
@@ -4717,7 +4881,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                 </EuiFlexItem>
                               </div>
                             </EuiFlexGroup>
-                          </EuiSuperDatePicker>
+                          </EuiCompressedSuperDatePicker>
                         </div>
                       </EuiFlexItem>
                     </div>
@@ -4814,7 +4978,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                 <EuiPopover
                                   anchorPosition="downLeft"
                                   button={
-                                    <EuiButton
+                                    <EuiSmallButton
                                       data-test-subj="addVisualizationButton"
                                       disabled={false}
                                       iconSide="right"
@@ -4822,7 +4986,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                       onClick={[Function]}
                                     >
                                       Add visualization
-                                    </EuiButton>
+                                    </EuiSmallButton>
                                   }
                                   closePopover={[Function]}
                                   display="inlineBlock"
@@ -4839,89 +5003,99 @@ exports[`Panels View Component renders panel view container without visualizatio
                                     <div
                                       className="euiPopover__anchor"
                                     >
-                                      <EuiButton
+                                      <EuiSmallButton
                                         data-test-subj="addVisualizationButton"
                                         disabled={false}
                                         iconSide="right"
                                         iconType="arrowDown"
                                         onClick={[Function]}
                                       >
-                                        <EuiButtonDisplay
-                                          baseClassName="euiButton"
+                                        <EuiButton
                                           data-test-subj="addVisualizationButton"
                                           disabled={false}
-                                          element="button"
                                           iconSide="right"
                                           iconType="arrowDown"
-                                          isDisabled={false}
                                           onClick={[Function]}
-                                          type="button"
+                                          size="s"
                                         >
-                                          <button
-                                            className="euiButton euiButton--primary"
+                                          <EuiButtonDisplay
+                                            baseClassName="euiButton"
                                             data-test-subj="addVisualizationButton"
                                             disabled={false}
+                                            element="button"
+                                            iconSide="right"
+                                            iconType="arrowDown"
+                                            isDisabled={false}
                                             onClick={[Function]}
-                                            style={
-                                              Object {
-                                                "minWidth": undefined,
-                                              }
-                                            }
+                                            size="s"
                                             type="button"
                                           >
-                                            <EuiButtonContent
-                                              className="euiButton__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
+                                            <button
+                                              className="euiButton euiButton--primary euiButton--small"
+                                              data-test-subj="addVisualizationButton"
+                                              disabled={false}
+                                              onClick={[Function]}
+                                              style={
                                                 Object {
-                                                  "className": "euiButton__text",
+                                                  "minWidth": undefined,
                                                 }
                                               }
+                                              type="button"
                                             >
-                                              <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                                              <EuiButtonContent
+                                                className="euiButton__content"
+                                                iconSide="right"
+                                                iconType="arrowDown"
+                                                textProps={
+                                                  Object {
+                                                    "className": "euiButton__text",
+                                                  }
+                                                }
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  color="inherit"
-                                                  size="m"
-                                                  type="arrowDown"
+                                                <span
+                                                  className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                                                 >
-                                                  <EuiIconBeaker
-                                                    aria-hidden={true}
-                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                                    focusable="false"
-                                                    role="img"
-                                                    style={null}
+                                                  <EuiIcon
+                                                    className="euiButtonContent__icon"
+                                                    color="inherit"
+                                                    size="m"
+                                                    type="arrowDown"
                                                   >
-                                                    <svg
+                                                    <EuiIconBeaker
                                                       aria-hidden={true}
                                                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                       focusable="false"
-                                                      height={16}
                                                       role="img"
                                                       style={null}
-                                                      viewBox="0 0 16 16"
-                                                      width={16}
-                                                      xmlns="http://www.w3.org/2000/svg"
                                                     >
-                                                      <path
-                                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                      />
-                                                    </svg>
-                                                  </EuiIconBeaker>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButton__text"
-                                                >
-                                                  Add visualization
+                                                      <svg
+                                                        aria-hidden={true}
+                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                                        focusable="false"
+                                                        height={16}
+                                                        role="img"
+                                                        style={null}
+                                                        viewBox="0 0 16 16"
+                                                        width={16}
+                                                        xmlns="http://www.w3.org/2000/svg"
+                                                      >
+                                                        <path
+                                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                        />
+                                                      </svg>
+                                                    </EuiIconBeaker>
+                                                  </EuiIcon>
+                                                  <span
+                                                    className="euiButton__text"
+                                                  >
+                                                    Add visualization
+                                                  </span>
                                                 </span>
-                                              </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonDisplay>
-                                      </EuiButton>
+                                              </EuiButtonContent>
+                                            </button>
+                                          </EuiButtonDisplay>
+                                        </EuiButton>
+                                      </EuiSmallButton>
                                     </div>
                                   </div>
                                 </EuiPopover>
diff --git a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view_so.test.tsx.snap b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view_so.test.tsx.snap
index b816b56e3f..f2cf3b5e36 100644
--- a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view_so.test.tsx.snap
+++ b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view_so.test.tsx.snap
@@ -39,7 +39,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
               class="euiFlexItem"
             >
               <button
-                class="euiButton euiButton--primary euiButton-isDisabled"
+                class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                 data-test-subj="editPanelButton"
                 disabled=""
                 type="button"
@@ -79,7 +79,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="panelActionContextMenu"
                     type="button"
                   >
@@ -122,7 +122,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
@@ -175,7 +175,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
               role="combobox"
             >
               <div
-                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed euiFormControlLayout--group"
               >
                 <div
                   class="euiFormControlLayout__childrenWrapper"
@@ -186,7 +186,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
                     autocapitalize="off"
                     autocomplete="off"
                     autocorrect="off"
-                    class="euiFieldText euiFieldText--fullWidth euiFieldText--inGroup"
+                    class="euiFieldText euiFieldText--fullWidth euiFieldText--compressed euiFieldText--inGroup"
                     data-test-subj="searchAutocompleteTextArea"
                     disabled=""
                     enterkeyhint="search"
@@ -220,7 +220,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
                 class="euiFlexItem"
               >
                 <div
-                  class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+                  class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group euiSuperDatePicker"
                 >
                   <div
                     class="euiPopover euiPopover--anchorDownLeft"
@@ -282,7 +282,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
                       class="euiDatePickerRange euiDatePickerRange--inGroup"
                     >
                       <button
-                        class="euiSuperDatePicker__prettyFormat"
+                        class="euiSuperDatePicker__prettyFormat euiSuperDatePicker__prettyFormat--compressed"
                         data-test-subj="superDatePickerShowDatesButton"
                       >
                         Last 1 day
@@ -303,7 +303,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiSuperUpdateButton"
+                    class="euiButton euiButton--primary euiButton--small euiSuperUpdateButton"
                     data-test-subj="superDatePickerApplyTimeButton"
                     type="button"
                   >
@@ -384,7 +384,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
@@ -470,7 +470,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
               class="euiFlexItem"
             >
               <button
-                class="euiButton euiButton--primary euiButton-isDisabled"
+                class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                 data-test-subj="editPanelButton"
                 disabled=""
                 type="button"
@@ -510,7 +510,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="panelActionContextMenu"
                     type="button"
                   >
@@ -553,7 +553,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
@@ -606,7 +606,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
               role="combobox"
             >
               <div
-                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed euiFormControlLayout--group"
               >
                 <div
                   class="euiFormControlLayout__childrenWrapper"
@@ -617,7 +617,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
                     autocapitalize="off"
                     autocomplete="off"
                     autocorrect="off"
-                    class="euiFieldText euiFieldText--fullWidth euiFieldText--inGroup"
+                    class="euiFieldText euiFieldText--fullWidth euiFieldText--compressed euiFieldText--inGroup"
                     data-test-subj="searchAutocompleteTextArea"
                     disabled=""
                     enterkeyhint="search"
@@ -651,7 +651,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
                 class="euiFlexItem"
               >
                 <div
-                  class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+                  class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group euiSuperDatePicker"
                 >
                   <div
                     class="euiPopover euiPopover--anchorDownLeft"
@@ -713,7 +713,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
                       class="euiDatePickerRange euiDatePickerRange--inGroup"
                     >
                       <button
-                        class="euiSuperDatePicker__prettyFormat"
+                        class="euiSuperDatePicker__prettyFormat euiSuperDatePicker__prettyFormat--compressed"
                         data-test-subj="superDatePickerShowDatesButton"
                       >
                         Last 1 day
@@ -734,7 +734,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiSuperUpdateButton"
+                    class="euiButton euiButton--primary euiButton--small euiSuperUpdateButton"
                     data-test-subj="superDatePickerApplyTimeButton"
                     type="button"
                   >
@@ -815,7 +815,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
@@ -903,7 +903,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
               class="euiFlexItem"
             >
               <button
-                class="euiButton euiButton--primary euiButton-isDisabled"
+                class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
                 data-test-subj="editPanelButton"
                 disabled=""
                 type="button"
@@ -943,7 +943,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="panelActionContextMenu"
                     type="button"
                   >
@@ -986,7 +986,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
@@ -1039,7 +1039,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
               role="combobox"
             >
               <div
-                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+                class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed euiFormControlLayout--group"
               >
                 <div
                   class="euiFormControlLayout__childrenWrapper"
@@ -1050,7 +1050,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
                     autocapitalize="off"
                     autocomplete="off"
                     autocorrect="off"
-                    class="euiFieldText euiFieldText--fullWidth euiFieldText--inGroup"
+                    class="euiFieldText euiFieldText--fullWidth euiFieldText--compressed euiFieldText--inGroup"
                     data-test-subj="searchAutocompleteTextArea"
                     disabled=""
                     enterkeyhint="search"
@@ -1084,7 +1084,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
                 class="euiFlexItem"
               >
                 <div
-                  class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+                  class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group euiSuperDatePicker"
                 >
                   <div
                     class="euiPopover euiPopover--anchorDownLeft"
@@ -1146,7 +1146,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
                       class="euiDatePickerRange euiDatePickerRange--inGroup"
                     >
                       <button
-                        class="euiSuperDatePicker__prettyFormat"
+                        class="euiSuperDatePicker__prettyFormat euiSuperDatePicker__prettyFormat--compressed"
                         data-test-subj="superDatePickerShowDatesButton"
                       >
                         Last 1 day
@@ -1167,7 +1167,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
                   class="euiToolTipAnchor"
                 >
                   <button
-                    class="euiButton euiButton--primary euiSuperUpdateButton"
+                    class="euiButton euiButton--primary euiButton--small euiSuperUpdateButton"
                     data-test-subj="superDatePickerApplyTimeButton"
                     type="button"
                   >
@@ -1248,7 +1248,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
                   class="euiPopover__anchor"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="addVisualizationButton"
                     type="button"
                   >
diff --git a/public/components/custom_panels/helpers/__tests__/__snapshots__/custom_input_model.test.tsx.snap b/public/components/custom_panels/helpers/__tests__/__snapshots__/custom_input_model.test.tsx.snap
index bbc895db33..7399b3e415 100644
--- a/public/components/custom_panels/helpers/__tests__/__snapshots__/custom_input_model.test.tsx.snap
+++ b/public/components/custom_panels/helpers/__tests__/__snapshots__/custom_input_model.test.tsx.snap
@@ -13,9 +13,9 @@ exports[`Custom Input Model component renders custom input modal with multiple a
     </EuiModalHeader>
     <EuiModalBody>
       <EuiForm>
-        <EuiFormRow
+        <EuiCompressedFormRow
           describedByIds={Array []}
-          display="row"
+          display="rowCompressed"
           fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
@@ -23,28 +23,28 @@ exports[`Custom Input Model component renders custom input modal with multiple a
           label="test label"
           labelType="label"
         >
-          <EuiFieldText
+          <EuiCompressedFieldText
             data-test-subj="customModalFieldText"
             name="input"
             onChange={[Function]}
             value="Test Panel"
           />
-        </EuiFormRow>
+        </EuiCompressedFormRow>
       </EuiForm>
     </EuiModalBody>
     <EuiModalFooter>
-      <EuiButtonEmpty
+      <EuiSmallButtonEmpty
         onClick={[MockFunction]}
       >
         btn test
-      </EuiButtonEmpty>
-      <EuiButton
+      </EuiSmallButtonEmpty>
+      <EuiSmallButton
         data-test-subj="runModalButton"
         fill={true}
         onClick={[Function]}
       >
         btn test 2
-      </EuiButton>
+      </EuiSmallButton>
     </EuiModalFooter>
   </EuiModal>
 </EuiOverlayMask>
@@ -63,37 +63,37 @@ exports[`Custom Input Model component renders custom input modal with single arg
     </EuiModalHeader>
     <EuiModalBody>
       <EuiForm>
-        <EuiFormRow
+        <EuiCompressedFormRow
           describedByIds={Array []}
-          display="row"
+          display="rowCompressed"
           fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           label="test label"
           labelType="label"
         >
-          <EuiFieldText
+          <EuiCompressedFieldText
             data-test-subj="customModalFieldText"
             name="input"
             onChange={[Function]}
             value=""
           />
-        </EuiFormRow>
+        </EuiCompressedFormRow>
       </EuiForm>
     </EuiModalBody>
     <EuiModalFooter>
-      <EuiButtonEmpty
+      <EuiSmallButtonEmpty
         onClick={[MockFunction]}
       >
         btn test
-      </EuiButtonEmpty>
-      <EuiButton
+      </EuiSmallButtonEmpty>
+      <EuiSmallButton
         data-test-subj="runModalButton"
         fill={true}
         onClick={[Function]}
       >
         btn test 2
-      </EuiButton>
+      </EuiSmallButton>
     </EuiModalFooter>
   </EuiModal>
 </EuiOverlayMask>
diff --git a/public/components/custom_panels/helpers/__tests__/__snapshots__/modal_container.test.tsx.snap b/public/components/custom_panels/helpers/__tests__/__snapshots__/modal_container.test.tsx.snap
index 3d92156d3c..f481b67376 100644
--- a/public/components/custom_panels/helpers/__tests__/__snapshots__/modal_container.test.tsx.snap
+++ b/public/components/custom_panels/helpers/__tests__/__snapshots__/modal_container.test.tsx.snap
@@ -20,32 +20,32 @@ exports[`Modal Container component renders DeleteModal component 1`] = `
       </EuiText>
       <EuiSpacer />
       <EuiForm>
-        <EuiFormRow
+        <EuiCompressedFormRow
           describedByIds={Array []}
-          display="row"
+          display="rowCompressed"
           fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           label="To confirm deletion, enter \\"delete\\" in the text field"
           labelType="label"
         >
-          <EuiFieldText
+          <EuiCompressedFieldText
             data-test-subj="popoverModal__deleteTextInput"
             name="input"
             onChange={[Function]}
             placeholder="delete"
             value=""
           />
-        </EuiFormRow>
+        </EuiCompressedFormRow>
       </EuiForm>
     </EuiModalBody>
     <EuiModalFooter>
-      <EuiButtonEmpty
+      <EuiSmallButtonEmpty
         onClick={[MockFunction]}
       >
         Cancel
-      </EuiButtonEmpty>
-      <EuiButton
+      </EuiSmallButtonEmpty>
+      <EuiSmallButton
         color="danger"
         data-test-subj="popoverModal__deleteButton"
         disabled={true}
@@ -53,7 +53,7 @@ exports[`Modal Container component renders DeleteModal component 1`] = `
         onClick={[Function]}
       >
         Delete
-      </EuiButton>
+      </EuiSmallButton>
     </EuiModalFooter>
   </EuiModal>
 </EuiOverlayMask>
diff --git a/public/components/custom_panels/panel_modules/__tests__/__snapshots__/empty_panel.test.tsx.snap b/public/components/custom_panels/panel_modules/__tests__/__snapshots__/empty_panel.test.tsx.snap
index 9d405d37c0..c81e4a883c 100644
--- a/public/components/custom_panels/panel_modules/__tests__/__snapshots__/empty_panel.test.tsx.snap
+++ b/public/components/custom_panels/panel_modules/__tests__/__snapshots__/empty_panel.test.tsx.snap
@@ -86,7 +86,7 @@ exports[`Empty panel view component renders empty panel view with disabled popov
               <EuiPopover
                 anchorPosition="downLeft"
                 button={
-                  <EuiButton
+                  <EuiSmallButton
                     data-test-subj="addVisualizationButton"
                     disabled={true}
                     iconSide="right"
@@ -94,7 +94,7 @@ exports[`Empty panel view component renders empty panel view with disabled popov
                     onClick={[Function]}
                   >
                     Add visualization
-                  </EuiButton>
+                  </EuiSmallButton>
                 }
                 closePopover={[Function]}
                 display="inlineBlock"
@@ -111,89 +111,99 @@ exports[`Empty panel view component renders empty panel view with disabled popov
                   <div
                     className="euiPopover__anchor"
                   >
-                    <EuiButton
+                    <EuiSmallButton
                       data-test-subj="addVisualizationButton"
                       disabled={true}
                       iconSide="right"
                       iconType="arrowDown"
                       onClick={[Function]}
                     >
-                      <EuiButtonDisplay
-                        baseClassName="euiButton"
+                      <EuiButton
                         data-test-subj="addVisualizationButton"
                         disabled={true}
-                        element="button"
                         iconSide="right"
                         iconType="arrowDown"
-                        isDisabled={true}
                         onClick={[Function]}
-                        type="button"
+                        size="s"
                       >
-                        <button
-                          className="euiButton euiButton--primary euiButton-isDisabled"
+                        <EuiButtonDisplay
+                          baseClassName="euiButton"
                           data-test-subj="addVisualizationButton"
                           disabled={true}
+                          element="button"
+                          iconSide="right"
+                          iconType="arrowDown"
+                          isDisabled={true}
                           onClick={[Function]}
-                          style={
-                            Object {
-                              "minWidth": undefined,
-                            }
-                          }
+                          size="s"
                           type="button"
                         >
-                          <EuiButtonContent
-                            className="euiButton__content"
-                            iconSide="right"
-                            iconType="arrowDown"
-                            textProps={
+                          <button
+                            className="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
+                            data-test-subj="addVisualizationButton"
+                            disabled={true}
+                            onClick={[Function]}
+                            style={
                               Object {
-                                "className": "euiButton__text",
+                                "minWidth": undefined,
                               }
                             }
+                            type="button"
                           >
-                            <span
-                              className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                            <EuiButtonContent
+                              className="euiButton__content"
+                              iconSide="right"
+                              iconType="arrowDown"
+                              textProps={
+                                Object {
+                                  "className": "euiButton__text",
+                                }
+                              }
                             >
-                              <EuiIcon
-                                className="euiButtonContent__icon"
-                                color="inherit"
-                                size="m"
-                                type="arrowDown"
+                              <span
+                                className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                               >
-                                <EuiIconBeaker
-                                  aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                  focusable="false"
-                                  role="img"
-                                  style={null}
+                                <EuiIcon
+                                  className="euiButtonContent__icon"
+                                  color="inherit"
+                                  size="m"
+                                  type="arrowDown"
                                 >
-                                  <svg
+                                  <EuiIconBeaker
                                     aria-hidden={true}
                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                     focusable="false"
-                                    height={16}
                                     role="img"
                                     style={null}
-                                    viewBox="0 0 16 16"
-                                    width={16}
-                                    xmlns="http://www.w3.org/2000/svg"
                                   >
-                                    <path
-                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                    />
-                                  </svg>
-                                </EuiIconBeaker>
-                              </EuiIcon>
-                              <span
-                                className="euiButton__text"
-                              >
-                                Add visualization
+                                    <svg
+                                      aria-hidden={true}
+                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                      focusable="false"
+                                      height={16}
+                                      role="img"
+                                      style={null}
+                                      viewBox="0 0 16 16"
+                                      width={16}
+                                      xmlns="http://www.w3.org/2000/svg"
+                                    >
+                                      <path
+                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                      />
+                                    </svg>
+                                  </EuiIconBeaker>
+                                </EuiIcon>
+                                <span
+                                  className="euiButton__text"
+                                >
+                                  Add visualization
+                                </span>
                               </span>
-                            </span>
-                          </EuiButtonContent>
-                        </button>
-                      </EuiButtonDisplay>
-                    </EuiButton>
+                            </EuiButtonContent>
+                          </button>
+                        </EuiButtonDisplay>
+                      </EuiButton>
+                    </EuiSmallButton>
                   </div>
                 </div>
               </EuiPopover>
@@ -299,7 +309,7 @@ exports[`Empty panel view component renders empty panel view with enabled popove
               <EuiPopover
                 anchorPosition="downLeft"
                 button={
-                  <EuiButton
+                  <EuiSmallButton
                     data-test-subj="addVisualizationButton"
                     disabled={false}
                     iconSide="right"
@@ -307,7 +317,7 @@ exports[`Empty panel view component renders empty panel view with enabled popove
                     onClick={[Function]}
                   >
                     Add visualization
-                  </EuiButton>
+                  </EuiSmallButton>
                 }
                 closePopover={[Function]}
                 display="inlineBlock"
@@ -324,90 +334,100 @@ exports[`Empty panel view component renders empty panel view with enabled popove
                   <div
                     className="euiPopover__anchor"
                   >
-                    <EuiButton
+                    <EuiSmallButton
                       data-test-subj="addVisualizationButton"
                       disabled={false}
                       iconSide="right"
                       iconType="arrowDown"
                       onClick={[Function]}
                     >
-                      <EuiButtonDisplay
-                        baseClassName="euiButton"
+                      <EuiButton
                         data-test-subj="addVisualizationButton"
                         disabled={false}
-                        element="button"
                         iconSide="right"
                         iconType="arrowDown"
-                        isDisabled={false}
                         onClick={[Function]}
-                        type="button"
+                        size="s"
                       >
-                        <button
-                          className="euiButton euiButton--primary"
+                        <EuiButtonDisplay
+                          baseClassName="euiButton"
                           data-test-subj="addVisualizationButton"
                           disabled={false}
+                          element="button"
+                          iconSide="right"
+                          iconType="arrowDown"
+                          isDisabled={false}
                           onClick={[Function]}
-                          style={
-                            Object {
-                              "minWidth": undefined,
-                            }
-                          }
+                          size="s"
                           type="button"
                         >
-                          <EuiButtonContent
-                            className="euiButton__content"
-                            iconSide="right"
-                            iconType="arrowDown"
-                            textProps={
+                          <button
+                            className="euiButton euiButton--primary euiButton--small"
+                            data-test-subj="addVisualizationButton"
+                            disabled={false}
+                            onClick={[Function]}
+                            style={
                               Object {
-                                "className": "euiButton__text",
+                                "minWidth": undefined,
                               }
                             }
+                            type="button"
                           >
-                            <span
-                              className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                            <EuiButtonContent
+                              className="euiButton__content"
+                              iconSide="right"
+                              iconType="arrowDown"
+                              textProps={
+                                Object {
+                                  "className": "euiButton__text",
+                                }
+                              }
                             >
-                              <EuiIcon
-                                className="euiButtonContent__icon"
-                                color="inherit"
-                                size="m"
-                                type="arrowDown"
+                              <span
+                                className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                               >
-                                <EuiIconArrowDown
-                                  aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                                  focusable="false"
-                                  role="img"
-                                  style={null}
+                                <EuiIcon
+                                  className="euiButtonContent__icon"
+                                  color="inherit"
+                                  size="m"
+                                  type="arrowDown"
                                 >
-                                  <svg
+                                  <EuiIconArrowDown
                                     aria-hidden={true}
                                     className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                                     focusable="false"
-                                    height={16}
                                     role="img"
                                     style={null}
-                                    viewBox="0 0 16 16"
-                                    width={16}
-                                    xmlns="http://www.w3.org/2000/svg"
                                   >
-                                    <path
-                                      d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                                      fillRule="non-zero"
-                                    />
-                                  </svg>
-                                </EuiIconArrowDown>
-                              </EuiIcon>
-                              <span
-                                className="euiButton__text"
-                              >
-                                Add visualization
+                                    <svg
+                                      aria-hidden={true}
+                                      className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                      focusable="false"
+                                      height={16}
+                                      role="img"
+                                      style={null}
+                                      viewBox="0 0 16 16"
+                                      width={16}
+                                      xmlns="http://www.w3.org/2000/svg"
+                                    >
+                                      <path
+                                        d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                                        fillRule="non-zero"
+                                      />
+                                    </svg>
+                                  </EuiIconArrowDown>
+                                </EuiIcon>
+                                <span
+                                  className="euiButton__text"
+                                >
+                                  Add visualization
+                                </span>
                               </span>
-                            </span>
-                          </EuiButtonContent>
-                        </button>
-                      </EuiButtonDisplay>
-                    </EuiButton>
+                            </EuiButtonContent>
+                          </button>
+                        </EuiButtonDisplay>
+                      </EuiButton>
+                    </EuiSmallButton>
                   </div>
                 </div>
               </EuiPopover>
diff --git a/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap b/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap
index 6245bf3e5b..ca10206760 100644
--- a/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap
+++ b/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap
@@ -49,23 +49,23 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
           <EuiFlexItem
             grow={false}
           >
-            <EuiButton
+            <EuiSmallButton
               data-test-subj="closeFlyoutButton"
               onClick={[MockFunction]}
             >
               Cancel
-            </EuiButton>
+            </EuiSmallButton>
           </EuiFlexItem>
           <EuiFlexItem
             grow={false}
           >
-            <EuiButton
+            <EuiSmallButton
               data-test-subj="addFlyoutButton"
               fill={true}
               onClick={[Function]}
             >
               Add
-            </EuiButton>
+            </EuiSmallButton>
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlyoutFooter>
@@ -194,7 +194,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                           class="euiFlexItem euiFlexItem--flexGrowZero"
                         >
                           <button
-                            class="euiButton euiButton--primary"
+                            class="euiButton euiButton--primary euiButton--small"
                             data-test-subj="closeFlyoutButton"
                             type="button"
                           >
@@ -213,7 +213,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                           class="euiFlexItem euiFlexItem--flexGrowZero"
                         >
                           <button
-                            class="euiButton euiButton--primary euiButton--fill"
+                            class="euiButton euiButton--primary euiButton--small euiButton--fill"
                             data-test-subj="addFlyoutButton"
                             type="button"
                           >
@@ -410,7 +410,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                   class="euiFlexItem euiFlexItem--flexGrowZero"
                                 >
                                   <button
-                                    class="euiButton euiButton--primary"
+                                    class="euiButton euiButton--primary euiButton--small"
                                     data-test-subj="closeFlyoutButton"
                                     type="button"
                                   >
@@ -429,7 +429,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                   class="euiFlexItem euiFlexItem--flexGrowZero"
                                 >
                                   <button
-                                    class="euiButton euiButton--primary euiButton--fill"
+                                    class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                     data-test-subj="addFlyoutButton"
                                     type="button"
                                   >
@@ -558,7 +558,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                     class="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <button
-                                      class="euiButton euiButton--primary"
+                                      class="euiButton euiButton--primary euiButton--small"
                                       data-test-subj="closeFlyoutButton"
                                       type="button"
                                     >
@@ -577,7 +577,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                     class="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <button
-                                      class="euiButton euiButton--primary euiButton--fill"
+                                      class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                       data-test-subj="addFlyoutButton"
                                       type="button"
                                     >
@@ -706,7 +706,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                       class="euiFlexItem euiFlexItem--flexGrowZero"
                                     >
                                       <button
-                                        class="euiButton euiButton--primary"
+                                        class="euiButton euiButton--primary euiButton--small"
                                         data-test-subj="closeFlyoutButton"
                                         type="button"
                                       >
@@ -725,7 +725,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                       class="euiFlexItem euiFlexItem--flexGrowZero"
                                     >
                                       <button
-                                        class="euiButton euiButton--primary euiButton--fill"
+                                        class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                         data-test-subj="addFlyoutButton"
                                         type="button"
                                       >
@@ -842,7 +842,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                         class="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
                                         <button
-                                          class="euiButton euiButton--primary"
+                                          class="euiButton euiButton--primary euiButton--small"
                                           data-test-subj="closeFlyoutButton"
                                           type="button"
                                         >
@@ -861,7 +861,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                         class="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
                                         <button
-                                          class="euiButton euiButton--primary euiButton--fill"
+                                          class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                           data-test-subj="addFlyoutButton"
                                           type="button"
                                         >
@@ -1076,53 +1076,60 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                       <div
                                         className="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
-                                        <EuiButton
+                                        <EuiSmallButton
                                           data-test-subj="closeFlyoutButton"
                                           onClick={[MockFunction]}
                                         >
-                                          <EuiButtonDisplay
-                                            baseClassName="euiButton"
+                                          <EuiButton
                                             data-test-subj="closeFlyoutButton"
-                                            disabled={false}
-                                            element="button"
-                                            isDisabled={false}
                                             onClick={[MockFunction]}
-                                            type="button"
+                                            size="s"
                                           >
-                                            <button
-                                              className="euiButton euiButton--primary"
+                                            <EuiButtonDisplay
+                                              baseClassName="euiButton"
                                               data-test-subj="closeFlyoutButton"
                                               disabled={false}
+                                              element="button"
+                                              isDisabled={false}
                                               onClick={[MockFunction]}
-                                              style={
-                                                Object {
-                                                  "minWidth": undefined,
-                                                }
-                                              }
+                                              size="s"
                                               type="button"
                                             >
-                                              <EuiButtonContent
-                                                className="euiButton__content"
-                                                iconSide="left"
-                                                textProps={
+                                              <button
+                                                className="euiButton euiButton--primary euiButton--small"
+                                                data-test-subj="closeFlyoutButton"
+                                                disabled={false}
+                                                onClick={[MockFunction]}
+                                                style={
                                                   Object {
-                                                    "className": "euiButton__text",
+                                                    "minWidth": undefined,
                                                   }
                                                 }
+                                                type="button"
                                               >
-                                                <span
-                                                  className="euiButtonContent euiButton__content"
+                                                <EuiButtonContent
+                                                  className="euiButton__content"
+                                                  iconSide="left"
+                                                  textProps={
+                                                    Object {
+                                                      "className": "euiButton__text",
+                                                    }
+                                                  }
                                                 >
                                                   <span
-                                                    className="euiButton__text"
+                                                    className="euiButtonContent euiButton__content"
                                                   >
-                                                    Cancel
+                                                    <span
+                                                      className="euiButton__text"
+                                                    >
+                                                      Cancel
+                                                    </span>
                                                   </span>
-                                                </span>
-                                              </EuiButtonContent>
-                                            </button>
-                                          </EuiButtonDisplay>
-                                        </EuiButton>
+                                                </EuiButtonContent>
+                                              </button>
+                                            </EuiButtonDisplay>
+                                          </EuiButton>
+                                        </EuiSmallButton>
                                       </div>
                                     </EuiFlexItem>
                                     <EuiFlexItem
@@ -1131,55 +1138,63 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                       <div
                                         className="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
-                                        <EuiButton
+                                        <EuiSmallButton
                                           data-test-subj="addFlyoutButton"
                                           fill={true}
                                           onClick={[Function]}
                                         >
-                                          <EuiButtonDisplay
-                                            baseClassName="euiButton"
+                                          <EuiButton
                                             data-test-subj="addFlyoutButton"
-                                            disabled={false}
-                                            element="button"
                                             fill={true}
-                                            isDisabled={false}
                                             onClick={[Function]}
-                                            type="button"
+                                            size="s"
                                           >
-                                            <button
-                                              className="euiButton euiButton--primary euiButton--fill"
+                                            <EuiButtonDisplay
+                                              baseClassName="euiButton"
                                               data-test-subj="addFlyoutButton"
                                               disabled={false}
+                                              element="button"
+                                              fill={true}
+                                              isDisabled={false}
                                               onClick={[Function]}
-                                              style={
-                                                Object {
-                                                  "minWidth": undefined,
-                                                }
-                                              }
+                                              size="s"
                                               type="button"
                                             >
-                                              <EuiButtonContent
-                                                className="euiButton__content"
-                                                iconSide="left"
-                                                textProps={
+                                              <button
+                                                className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                                                data-test-subj="addFlyoutButton"
+                                                disabled={false}
+                                                onClick={[Function]}
+                                                style={
                                                   Object {
-                                                    "className": "euiButton__text",
+                                                    "minWidth": undefined,
                                                   }
                                                 }
+                                                type="button"
                                               >
-                                                <span
-                                                  className="euiButtonContent euiButton__content"
+                                                <EuiButtonContent
+                                                  className="euiButton__content"
+                                                  iconSide="left"
+                                                  textProps={
+                                                    Object {
+                                                      "className": "euiButton__text",
+                                                    }
+                                                  }
                                                 >
                                                   <span
-                                                    className="euiButton__text"
+                                                    className="euiButtonContent euiButton__content"
                                                   >
-                                                    Add
+                                                    <span
+                                                      className="euiButton__text"
+                                                    >
+                                                      Add
+                                                    </span>
                                                   </span>
-                                                </span>
-                                              </EuiButtonContent>
-                                            </button>
-                                          </EuiButtonDisplay>
-                                        </EuiButton>
+                                                </EuiButtonContent>
+                                              </button>
+                                            </EuiButtonDisplay>
+                                          </EuiButton>
+                                        </EuiSmallButton>
                                       </div>
                                     </EuiFlexItem>
                                   </div>
@@ -1335,23 +1350,23 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
           <EuiFlexItem
             grow={false}
           >
-            <EuiButton
+            <EuiSmallButton
               data-test-subj="closeFlyoutButton"
               onClick={[MockFunction]}
             >
               Cancel
-            </EuiButton>
+            </EuiSmallButton>
           </EuiFlexItem>
           <EuiFlexItem
             grow={false}
           >
-            <EuiButton
+            <EuiSmallButton
               data-test-subj="addFlyoutButton"
               fill={true}
               onClick={[Function]}
             >
               Add
-            </EuiButton>
+            </EuiSmallButton>
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlyoutFooter>
@@ -1480,7 +1495,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                           class="euiFlexItem euiFlexItem--flexGrowZero"
                         >
                           <button
-                            class="euiButton euiButton--primary"
+                            class="euiButton euiButton--primary euiButton--small"
                             data-test-subj="closeFlyoutButton"
                             type="button"
                           >
@@ -1499,7 +1514,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                           class="euiFlexItem euiFlexItem--flexGrowZero"
                         >
                           <button
-                            class="euiButton euiButton--primary euiButton--fill"
+                            class="euiButton euiButton--primary euiButton--small euiButton--fill"
                             data-test-subj="addFlyoutButton"
                             type="button"
                           >
@@ -1696,7 +1711,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                   class="euiFlexItem euiFlexItem--flexGrowZero"
                                 >
                                   <button
-                                    class="euiButton euiButton--primary"
+                                    class="euiButton euiButton--primary euiButton--small"
                                     data-test-subj="closeFlyoutButton"
                                     type="button"
                                   >
@@ -1715,7 +1730,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                   class="euiFlexItem euiFlexItem--flexGrowZero"
                                 >
                                   <button
-                                    class="euiButton euiButton--primary euiButton--fill"
+                                    class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                     data-test-subj="addFlyoutButton"
                                     type="button"
                                   >
@@ -1844,7 +1859,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                     class="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <button
-                                      class="euiButton euiButton--primary"
+                                      class="euiButton euiButton--primary euiButton--small"
                                       data-test-subj="closeFlyoutButton"
                                       type="button"
                                     >
@@ -1863,7 +1878,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                     class="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <button
-                                      class="euiButton euiButton--primary euiButton--fill"
+                                      class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                       data-test-subj="addFlyoutButton"
                                       type="button"
                                     >
@@ -1992,7 +2007,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                       class="euiFlexItem euiFlexItem--flexGrowZero"
                                     >
                                       <button
-                                        class="euiButton euiButton--primary"
+                                        class="euiButton euiButton--primary euiButton--small"
                                         data-test-subj="closeFlyoutButton"
                                         type="button"
                                       >
@@ -2011,7 +2026,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                       class="euiFlexItem euiFlexItem--flexGrowZero"
                                     >
                                       <button
-                                        class="euiButton euiButton--primary euiButton--fill"
+                                        class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                         data-test-subj="addFlyoutButton"
                                         type="button"
                                       >
@@ -2128,7 +2143,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                         class="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
                                         <button
-                                          class="euiButton euiButton--primary"
+                                          class="euiButton euiButton--primary euiButton--small"
                                           data-test-subj="closeFlyoutButton"
                                           type="button"
                                         >
@@ -2147,7 +2162,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                         class="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
                                         <button
-                                          class="euiButton euiButton--primary euiButton--fill"
+                                          class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                           data-test-subj="addFlyoutButton"
                                           type="button"
                                         >
@@ -2362,53 +2377,60 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                       <div
                                         className="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
-                                        <EuiButton
+                                        <EuiSmallButton
                                           data-test-subj="closeFlyoutButton"
                                           onClick={[MockFunction]}
                                         >
-                                          <EuiButtonDisplay
-                                            baseClassName="euiButton"
+                                          <EuiButton
                                             data-test-subj="closeFlyoutButton"
-                                            disabled={false}
-                                            element="button"
-                                            isDisabled={false}
                                             onClick={[MockFunction]}
-                                            type="button"
+                                            size="s"
                                           >
-                                            <button
-                                              className="euiButton euiButton--primary"
+                                            <EuiButtonDisplay
+                                              baseClassName="euiButton"
                                               data-test-subj="closeFlyoutButton"
                                               disabled={false}
+                                              element="button"
+                                              isDisabled={false}
                                               onClick={[MockFunction]}
-                                              style={
-                                                Object {
-                                                  "minWidth": undefined,
-                                                }
-                                              }
+                                              size="s"
                                               type="button"
                                             >
-                                              <EuiButtonContent
-                                                className="euiButton__content"
-                                                iconSide="left"
-                                                textProps={
+                                              <button
+                                                className="euiButton euiButton--primary euiButton--small"
+                                                data-test-subj="closeFlyoutButton"
+                                                disabled={false}
+                                                onClick={[MockFunction]}
+                                                style={
                                                   Object {
-                                                    "className": "euiButton__text",
+                                                    "minWidth": undefined,
                                                   }
                                                 }
+                                                type="button"
                                               >
-                                                <span
-                                                  className="euiButtonContent euiButton__content"
+                                                <EuiButtonContent
+                                                  className="euiButton__content"
+                                                  iconSide="left"
+                                                  textProps={
+                                                    Object {
+                                                      "className": "euiButton__text",
+                                                    }
+                                                  }
                                                 >
                                                   <span
-                                                    className="euiButton__text"
+                                                    className="euiButtonContent euiButton__content"
                                                   >
-                                                    Cancel
+                                                    <span
+                                                      className="euiButton__text"
+                                                    >
+                                                      Cancel
+                                                    </span>
                                                   </span>
-                                                </span>
-                                              </EuiButtonContent>
-                                            </button>
-                                          </EuiButtonDisplay>
-                                        </EuiButton>
+                                                </EuiButtonContent>
+                                              </button>
+                                            </EuiButtonDisplay>
+                                          </EuiButton>
+                                        </EuiSmallButton>
                                       </div>
                                     </EuiFlexItem>
                                     <EuiFlexItem
@@ -2417,55 +2439,63 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                       <div
                                         className="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
-                                        <EuiButton
+                                        <EuiSmallButton
                                           data-test-subj="addFlyoutButton"
                                           fill={true}
                                           onClick={[Function]}
                                         >
-                                          <EuiButtonDisplay
-                                            baseClassName="euiButton"
+                                          <EuiButton
                                             data-test-subj="addFlyoutButton"
-                                            disabled={false}
-                                            element="button"
                                             fill={true}
-                                            isDisabled={false}
                                             onClick={[Function]}
-                                            type="button"
+                                            size="s"
                                           >
-                                            <button
-                                              className="euiButton euiButton--primary euiButton--fill"
+                                            <EuiButtonDisplay
+                                              baseClassName="euiButton"
                                               data-test-subj="addFlyoutButton"
                                               disabled={false}
+                                              element="button"
+                                              fill={true}
+                                              isDisabled={false}
                                               onClick={[Function]}
-                                              style={
-                                                Object {
-                                                  "minWidth": undefined,
-                                                }
-                                              }
+                                              size="s"
                                               type="button"
                                             >
-                                              <EuiButtonContent
-                                                className="euiButton__content"
-                                                iconSide="left"
-                                                textProps={
+                                              <button
+                                                className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                                                data-test-subj="addFlyoutButton"
+                                                disabled={false}
+                                                onClick={[Function]}
+                                                style={
                                                   Object {
-                                                    "className": "euiButton__text",
+                                                    "minWidth": undefined,
                                                   }
                                                 }
+                                                type="button"
                                               >
-                                                <span
-                                                  className="euiButtonContent euiButton__content"
+                                                <EuiButtonContent
+                                                  className="euiButton__content"
+                                                  iconSide="left"
+                                                  textProps={
+                                                    Object {
+                                                      "className": "euiButton__text",
+                                                    }
+                                                  }
                                                 >
                                                   <span
-                                                    className="euiButton__text"
+                                                    className="euiButtonContent euiButton__content"
                                                   >
-                                                    Add
+                                                    <span
+                                                      className="euiButton__text"
+                                                    >
+                                                      Add
+                                                    </span>
                                                   </span>
-                                                </span>
-                                              </EuiButtonContent>
-                                            </button>
-                                          </EuiButtonDisplay>
-                                        </EuiButton>
+                                                </EuiButtonContent>
+                                              </button>
+                                            </EuiButtonDisplay>
+                                          </EuiButton>
+                                        </EuiSmallButton>
                                       </div>
                                     </EuiFlexItem>
                                   </div>
diff --git a/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout_so.test.tsx.snap b/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout_so.test.tsx.snap
index dfd4d98b57..f291fdc79b 100644
--- a/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout_so.test.tsx.snap
+++ b/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout_so.test.tsx.snap
@@ -60,23 +60,23 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
             <EuiFlexItem
               grow={false}
             >
-              <EuiButton
+              <EuiSmallButton
                 data-test-subj="closeFlyoutButton"
                 onClick={[MockFunction]}
               >
                 Cancel
-              </EuiButton>
+              </EuiSmallButton>
             </EuiFlexItem>
             <EuiFlexItem
               grow={false}
             >
-              <EuiButton
+              <EuiSmallButton
                 data-test-subj="addFlyoutButton"
                 fill={true}
                 onClick={[Function]}
               >
                 Add
-              </EuiButton>
+              </EuiSmallButton>
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlyoutFooter>
@@ -205,7 +205,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                             class="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <button
-                              class="euiButton euiButton--primary"
+                              class="euiButton euiButton--primary euiButton--small"
                               data-test-subj="closeFlyoutButton"
                               type="button"
                             >
@@ -224,7 +224,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                             class="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <button
-                              class="euiButton euiButton--primary euiButton--fill"
+                              class="euiButton euiButton--primary euiButton--small euiButton--fill"
                               data-test-subj="addFlyoutButton"
                               type="button"
                             >
@@ -421,7 +421,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                     class="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <button
-                                      class="euiButton euiButton--primary"
+                                      class="euiButton euiButton--primary euiButton--small"
                                       data-test-subj="closeFlyoutButton"
                                       type="button"
                                     >
@@ -440,7 +440,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                     class="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <button
-                                      class="euiButton euiButton--primary euiButton--fill"
+                                      class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                       data-test-subj="addFlyoutButton"
                                       type="button"
                                     >
@@ -569,7 +569,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                       class="euiFlexItem euiFlexItem--flexGrowZero"
                                     >
                                       <button
-                                        class="euiButton euiButton--primary"
+                                        class="euiButton euiButton--primary euiButton--small"
                                         data-test-subj="closeFlyoutButton"
                                         type="button"
                                       >
@@ -588,7 +588,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                       class="euiFlexItem euiFlexItem--flexGrowZero"
                                     >
                                       <button
-                                        class="euiButton euiButton--primary euiButton--fill"
+                                        class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                         data-test-subj="addFlyoutButton"
                                         type="button"
                                       >
@@ -717,7 +717,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                         class="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
                                         <button
-                                          class="euiButton euiButton--primary"
+                                          class="euiButton euiButton--primary euiButton--small"
                                           data-test-subj="closeFlyoutButton"
                                           type="button"
                                         >
@@ -736,7 +736,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                         class="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
                                         <button
-                                          class="euiButton euiButton--primary euiButton--fill"
+                                          class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                           data-test-subj="addFlyoutButton"
                                           type="button"
                                         >
@@ -853,7 +853,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                           class="euiFlexItem euiFlexItem--flexGrowZero"
                                         >
                                           <button
-                                            class="euiButton euiButton--primary"
+                                            class="euiButton euiButton--primary euiButton--small"
                                             data-test-subj="closeFlyoutButton"
                                             type="button"
                                           >
@@ -872,7 +872,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                           class="euiFlexItem euiFlexItem--flexGrowZero"
                                         >
                                           <button
-                                            class="euiButton euiButton--primary euiButton--fill"
+                                            class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                             data-test-subj="addFlyoutButton"
                                             type="button"
                                           >
@@ -1087,53 +1087,60 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                         <div
                                           className="euiFlexItem euiFlexItem--flexGrowZero"
                                         >
-                                          <EuiButton
+                                          <EuiSmallButton
                                             data-test-subj="closeFlyoutButton"
                                             onClick={[MockFunction]}
                                           >
-                                            <EuiButtonDisplay
-                                              baseClassName="euiButton"
+                                            <EuiButton
                                               data-test-subj="closeFlyoutButton"
-                                              disabled={false}
-                                              element="button"
-                                              isDisabled={false}
                                               onClick={[MockFunction]}
-                                              type="button"
+                                              size="s"
                                             >
-                                              <button
-                                                className="euiButton euiButton--primary"
+                                              <EuiButtonDisplay
+                                                baseClassName="euiButton"
                                                 data-test-subj="closeFlyoutButton"
                                                 disabled={false}
+                                                element="button"
+                                                isDisabled={false}
                                                 onClick={[MockFunction]}
-                                                style={
-                                                  Object {
-                                                    "minWidth": undefined,
-                                                  }
-                                                }
+                                                size="s"
                                                 type="button"
                                               >
-                                                <EuiButtonContent
-                                                  className="euiButton__content"
-                                                  iconSide="left"
-                                                  textProps={
+                                                <button
+                                                  className="euiButton euiButton--primary euiButton--small"
+                                                  data-test-subj="closeFlyoutButton"
+                                                  disabled={false}
+                                                  onClick={[MockFunction]}
+                                                  style={
                                                     Object {
-                                                      "className": "euiButton__text",
+                                                      "minWidth": undefined,
                                                     }
                                                   }
+                                                  type="button"
                                                 >
-                                                  <span
-                                                    className="euiButtonContent euiButton__content"
+                                                  <EuiButtonContent
+                                                    className="euiButton__content"
+                                                    iconSide="left"
+                                                    textProps={
+                                                      Object {
+                                                        "className": "euiButton__text",
+                                                      }
+                                                    }
                                                   >
                                                     <span
-                                                      className="euiButton__text"
+                                                      className="euiButtonContent euiButton__content"
                                                     >
-                                                      Cancel
+                                                      <span
+                                                        className="euiButton__text"
+                                                      >
+                                                        Cancel
+                                                      </span>
                                                     </span>
-                                                  </span>
-                                                </EuiButtonContent>
-                                              </button>
-                                            </EuiButtonDisplay>
-                                          </EuiButton>
+                                                  </EuiButtonContent>
+                                                </button>
+                                              </EuiButtonDisplay>
+                                            </EuiButton>
+                                          </EuiSmallButton>
                                         </div>
                                       </EuiFlexItem>
                                       <EuiFlexItem
@@ -1142,55 +1149,63 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                         <div
                                           className="euiFlexItem euiFlexItem--flexGrowZero"
                                         >
-                                          <EuiButton
+                                          <EuiSmallButton
                                             data-test-subj="addFlyoutButton"
                                             fill={true}
                                             onClick={[Function]}
                                           >
-                                            <EuiButtonDisplay
-                                              baseClassName="euiButton"
+                                            <EuiButton
                                               data-test-subj="addFlyoutButton"
-                                              disabled={false}
-                                              element="button"
                                               fill={true}
-                                              isDisabled={false}
                                               onClick={[Function]}
-                                              type="button"
+                                              size="s"
                                             >
-                                              <button
-                                                className="euiButton euiButton--primary euiButton--fill"
+                                              <EuiButtonDisplay
+                                                baseClassName="euiButton"
                                                 data-test-subj="addFlyoutButton"
                                                 disabled={false}
+                                                element="button"
+                                                fill={true}
+                                                isDisabled={false}
                                                 onClick={[Function]}
-                                                style={
-                                                  Object {
-                                                    "minWidth": undefined,
-                                                  }
-                                                }
+                                                size="s"
                                                 type="button"
                                               >
-                                                <EuiButtonContent
-                                                  className="euiButton__content"
-                                                  iconSide="left"
-                                                  textProps={
+                                                <button
+                                                  className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                                                  data-test-subj="addFlyoutButton"
+                                                  disabled={false}
+                                                  onClick={[Function]}
+                                                  style={
                                                     Object {
-                                                      "className": "euiButton__text",
+                                                      "minWidth": undefined,
                                                     }
                                                   }
+                                                  type="button"
                                                 >
-                                                  <span
-                                                    className="euiButtonContent euiButton__content"
+                                                  <EuiButtonContent
+                                                    className="euiButton__content"
+                                                    iconSide="left"
+                                                    textProps={
+                                                      Object {
+                                                        "className": "euiButton__text",
+                                                      }
+                                                    }
                                                   >
                                                     <span
-                                                      className="euiButton__text"
+                                                      className="euiButtonContent euiButton__content"
                                                     >
-                                                      Add
+                                                      <span
+                                                        className="euiButton__text"
+                                                      >
+                                                        Add
+                                                      </span>
                                                     </span>
-                                                  </span>
-                                                </EuiButtonContent>
-                                              </button>
-                                            </EuiButtonDisplay>
-                                          </EuiButton>
+                                                  </EuiButtonContent>
+                                                </button>
+                                              </EuiButtonDisplay>
+                                            </EuiButton>
+                                          </EuiSmallButton>
                                         </div>
                                       </EuiFlexItem>
                                     </div>
@@ -1341,23 +1356,23 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
             <EuiFlexItem
               grow={false}
             >
-              <EuiButton
+              <EuiSmallButton
                 data-test-subj="closeFlyoutButton"
                 onClick={[MockFunction]}
               >
                 Cancel
-              </EuiButton>
+              </EuiSmallButton>
             </EuiFlexItem>
             <EuiFlexItem
               grow={false}
             >
-              <EuiButton
+              <EuiSmallButton
                 data-test-subj="addFlyoutButton"
                 fill={true}
                 onClick={[Function]}
               >
                 Add
-              </EuiButton>
+              </EuiSmallButton>
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlyoutFooter>
@@ -1486,7 +1501,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                             class="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <button
-                              class="euiButton euiButton--primary"
+                              class="euiButton euiButton--primary euiButton--small"
                               data-test-subj="closeFlyoutButton"
                               type="button"
                             >
@@ -1505,7 +1520,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                             class="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <button
-                              class="euiButton euiButton--primary euiButton--fill"
+                              class="euiButton euiButton--primary euiButton--small euiButton--fill"
                               data-test-subj="addFlyoutButton"
                               type="button"
                             >
@@ -1702,7 +1717,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                     class="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <button
-                                      class="euiButton euiButton--primary"
+                                      class="euiButton euiButton--primary euiButton--small"
                                       data-test-subj="closeFlyoutButton"
                                       type="button"
                                     >
@@ -1721,7 +1736,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                     class="euiFlexItem euiFlexItem--flexGrowZero"
                                   >
                                     <button
-                                      class="euiButton euiButton--primary euiButton--fill"
+                                      class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                       data-test-subj="addFlyoutButton"
                                       type="button"
                                     >
@@ -1850,7 +1865,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                       class="euiFlexItem euiFlexItem--flexGrowZero"
                                     >
                                       <button
-                                        class="euiButton euiButton--primary"
+                                        class="euiButton euiButton--primary euiButton--small"
                                         data-test-subj="closeFlyoutButton"
                                         type="button"
                                       >
@@ -1869,7 +1884,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                       class="euiFlexItem euiFlexItem--flexGrowZero"
                                     >
                                       <button
-                                        class="euiButton euiButton--primary euiButton--fill"
+                                        class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                         data-test-subj="addFlyoutButton"
                                         type="button"
                                       >
@@ -1998,7 +2013,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                         class="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
                                         <button
-                                          class="euiButton euiButton--primary"
+                                          class="euiButton euiButton--primary euiButton--small"
                                           data-test-subj="closeFlyoutButton"
                                           type="button"
                                         >
@@ -2017,7 +2032,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                         class="euiFlexItem euiFlexItem--flexGrowZero"
                                       >
                                         <button
-                                          class="euiButton euiButton--primary euiButton--fill"
+                                          class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                           data-test-subj="addFlyoutButton"
                                           type="button"
                                         >
@@ -2134,7 +2149,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                           class="euiFlexItem euiFlexItem--flexGrowZero"
                                         >
                                           <button
-                                            class="euiButton euiButton--primary"
+                                            class="euiButton euiButton--primary euiButton--small"
                                             data-test-subj="closeFlyoutButton"
                                             type="button"
                                           >
@@ -2153,7 +2168,7 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                           class="euiFlexItem euiFlexItem--flexGrowZero"
                                         >
                                           <button
-                                            class="euiButton euiButton--primary euiButton--fill"
+                                            class="euiButton euiButton--primary euiButton--small euiButton--fill"
                                             data-test-subj="addFlyoutButton"
                                             type="button"
                                           >
@@ -2368,53 +2383,60 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                         <div
                                           className="euiFlexItem euiFlexItem--flexGrowZero"
                                         >
-                                          <EuiButton
+                                          <EuiSmallButton
                                             data-test-subj="closeFlyoutButton"
                                             onClick={[MockFunction]}
                                           >
-                                            <EuiButtonDisplay
-                                              baseClassName="euiButton"
+                                            <EuiButton
                                               data-test-subj="closeFlyoutButton"
-                                              disabled={false}
-                                              element="button"
-                                              isDisabled={false}
                                               onClick={[MockFunction]}
-                                              type="button"
+                                              size="s"
                                             >
-                                              <button
-                                                className="euiButton euiButton--primary"
+                                              <EuiButtonDisplay
+                                                baseClassName="euiButton"
                                                 data-test-subj="closeFlyoutButton"
                                                 disabled={false}
+                                                element="button"
+                                                isDisabled={false}
                                                 onClick={[MockFunction]}
-                                                style={
-                                                  Object {
-                                                    "minWidth": undefined,
-                                                  }
-                                                }
+                                                size="s"
                                                 type="button"
                                               >
-                                                <EuiButtonContent
-                                                  className="euiButton__content"
-                                                  iconSide="left"
-                                                  textProps={
+                                                <button
+                                                  className="euiButton euiButton--primary euiButton--small"
+                                                  data-test-subj="closeFlyoutButton"
+                                                  disabled={false}
+                                                  onClick={[MockFunction]}
+                                                  style={
                                                     Object {
-                                                      "className": "euiButton__text",
+                                                      "minWidth": undefined,
                                                     }
                                                   }
+                                                  type="button"
                                                 >
-                                                  <span
-                                                    className="euiButtonContent euiButton__content"
+                                                  <EuiButtonContent
+                                                    className="euiButton__content"
+                                                    iconSide="left"
+                                                    textProps={
+                                                      Object {
+                                                        "className": "euiButton__text",
+                                                      }
+                                                    }
                                                   >
                                                     <span
-                                                      className="euiButton__text"
+                                                      className="euiButtonContent euiButton__content"
                                                     >
-                                                      Cancel
+                                                      <span
+                                                        className="euiButton__text"
+                                                      >
+                                                        Cancel
+                                                      </span>
                                                     </span>
-                                                  </span>
-                                                </EuiButtonContent>
-                                              </button>
-                                            </EuiButtonDisplay>
-                                          </EuiButton>
+                                                  </EuiButtonContent>
+                                                </button>
+                                              </EuiButtonDisplay>
+                                            </EuiButton>
+                                          </EuiSmallButton>
                                         </div>
                                       </EuiFlexItem>
                                       <EuiFlexItem
@@ -2423,55 +2445,63 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
                                         <div
                                           className="euiFlexItem euiFlexItem--flexGrowZero"
                                         >
-                                          <EuiButton
+                                          <EuiSmallButton
                                             data-test-subj="addFlyoutButton"
                                             fill={true}
                                             onClick={[Function]}
                                           >
-                                            <EuiButtonDisplay
-                                              baseClassName="euiButton"
+                                            <EuiButton
                                               data-test-subj="addFlyoutButton"
-                                              disabled={false}
-                                              element="button"
                                               fill={true}
-                                              isDisabled={false}
                                               onClick={[Function]}
-                                              type="button"
+                                              size="s"
                                             >
-                                              <button
-                                                className="euiButton euiButton--primary euiButton--fill"
+                                              <EuiButtonDisplay
+                                                baseClassName="euiButton"
                                                 data-test-subj="addFlyoutButton"
                                                 disabled={false}
+                                                element="button"
+                                                fill={true}
+                                                isDisabled={false}
                                                 onClick={[Function]}
-                                                style={
-                                                  Object {
-                                                    "minWidth": undefined,
-                                                  }
-                                                }
+                                                size="s"
                                                 type="button"
                                               >
-                                                <EuiButtonContent
-                                                  className="euiButton__content"
-                                                  iconSide="left"
-                                                  textProps={
+                                                <button
+                                                  className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                                                  data-test-subj="addFlyoutButton"
+                                                  disabled={false}
+                                                  onClick={[Function]}
+                                                  style={
                                                     Object {
-                                                      "className": "euiButton__text",
+                                                      "minWidth": undefined,
                                                     }
                                                   }
+                                                  type="button"
                                                 >
-                                                  <span
-                                                    className="euiButtonContent euiButton__content"
+                                                  <EuiButtonContent
+                                                    className="euiButton__content"
+                                                    iconSide="left"
+                                                    textProps={
+                                                      Object {
+                                                        "className": "euiButton__text",
+                                                      }
+                                                    }
                                                   >
                                                     <span
-                                                      className="euiButton__text"
+                                                      className="euiButtonContent euiButton__content"
                                                     >
-                                                      Add
+                                                      <span
+                                                        className="euiButton__text"
+                                                      >
+                                                        Add
+                                                      </span>
                                                     </span>
-                                                  </span>
-                                                </EuiButtonContent>
-                                              </button>
-                                            </EuiButtonDisplay>
-                                          </EuiButton>
+                                                  </EuiButtonContent>
+                                                </button>
+                                              </EuiButtonDisplay>
+                                            </EuiButton>
+                                          </EuiSmallButton>
                                         </div>
                                       </EuiFlexItem>
                                     </div>
diff --git a/public/components/datasources/components/__tests__/__snapshots__/associated_objects_tab.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/associated_objects_tab.test.tsx.snap
index ae01f99ea1..b16211759a 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/associated_objects_tab.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/associated_objects_tab.test.tsx.snap
@@ -227,87 +227,96 @@ exports[`AssociatedObjectsTab Component renders correctly with associated object
                   isLoading={false}
                   onClick={[Function]}
                 >
-                  <EuiButton
+                  <EuiSmallButton
                     iconType="refresh"
                     isDisabled={false}
                     isLoading={false}
                     onClick={[Function]}
                   >
-                    <EuiButtonDisplay
-                      baseClassName="euiButton"
-                      disabled={false}
-                      element="button"
+                    <EuiButton
                       iconType="refresh"
                       isDisabled={false}
                       isLoading={false}
                       onClick={[Function]}
-                      type="button"
+                      size="s"
                     >
-                      <button
-                        className="euiButton euiButton--primary"
+                      <EuiButtonDisplay
+                        baseClassName="euiButton"
                         disabled={false}
+                        element="button"
+                        iconType="refresh"
+                        isDisabled={false}
+                        isLoading={false}
                         onClick={[Function]}
-                        style={
-                          Object {
-                            "minWidth": undefined,
-                          }
-                        }
+                        size="s"
                         type="button"
                       >
-                        <EuiButtonContent
-                          className="euiButton__content"
-                          iconSide="left"
-                          iconType="refresh"
-                          isLoading={false}
-                          textProps={
+                        <button
+                          className="euiButton euiButton--primary euiButton--small"
+                          disabled={false}
+                          onClick={[Function]}
+                          style={
                             Object {
-                              "className": "euiButton__text",
+                              "minWidth": undefined,
                             }
                           }
+                          type="button"
                         >
-                          <span
-                            className="euiButtonContent euiButton__content"
+                          <EuiButtonContent
+                            className="euiButton__content"
+                            iconSide="left"
+                            iconType="refresh"
+                            isLoading={false}
+                            textProps={
+                              Object {
+                                "className": "euiButton__text",
+                              }
+                            }
                           >
-                            <EuiIcon
-                              className="euiButtonContent__icon"
-                              color="inherit"
-                              size="m"
-                              type="refresh"
+                            <span
+                              className="euiButtonContent euiButton__content"
                             >
-                              <EuiIconRefresh
-                                aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                                focusable="false"
-                                role="img"
-                                style={null}
+                              <EuiIcon
+                                className="euiButtonContent__icon"
+                                color="inherit"
+                                size="m"
+                                type="refresh"
                               >
-                                <svg
+                                <EuiIconRefresh
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                                   focusable="false"
-                                  height={16}
                                   role="img"
                                   style={null}
-                                  viewBox="0 0 16 16"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <path
-                                    d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
-                                  />
-                                </svg>
-                              </EuiIconRefresh>
-                            </EuiIcon>
-                            <span
-                              className="euiButton__text"
-                            >
-                              Refresh
+                                  <svg
+                                    aria-hidden={true}
+                                    className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                    focusable="false"
+                                    height={16}
+                                    role="img"
+                                    style={null}
+                                    viewBox="0 0 16 16"
+                                    width={16}
+                                    xmlns="http://www.w3.org/2000/svg"
+                                  >
+                                    <path
+                                      d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
+                                    />
+                                  </svg>
+                                </EuiIconRefresh>
+                              </EuiIcon>
+                              <span
+                                className="euiButton__text"
+                              >
+                                Refresh
+                              </span>
                             </span>
-                          </span>
-                        </EuiButtonContent>
-                      </button>
-                    </EuiButtonDisplay>
-                  </EuiButton>
+                          </EuiButtonContent>
+                        </button>
+                      </EuiButtonDisplay>
+                    </EuiButton>
+                  </EuiSmallButton>
                 </AssociatedObjectsRefreshButton>
               </div>
             </EuiFlexItem>
@@ -323,52 +332,59 @@ exports[`AssociatedObjectsTab Component renders correctly with associated object
                   handleRefresh={[Function]}
                   renderCreateAccelerationFlyout={[MockFunction]}
                 >
-                  <EuiButton
+                  <EuiSmallButton
                     fill={true}
                     onClick={[Function]}
                   >
-                    <EuiButtonDisplay
-                      baseClassName="euiButton"
-                      disabled={false}
-                      element="button"
+                    <EuiButton
                       fill={true}
-                      isDisabled={false}
                       onClick={[Function]}
-                      type="button"
+                      size="s"
                     >
-                      <button
-                        className="euiButton euiButton--primary euiButton--fill"
+                      <EuiButtonDisplay
+                        baseClassName="euiButton"
                         disabled={false}
+                        element="button"
+                        fill={true}
+                        isDisabled={false}
                         onClick={[Function]}
-                        style={
-                          Object {
-                            "minWidth": undefined,
-                          }
-                        }
+                        size="s"
                         type="button"
                       >
-                        <EuiButtonContent
-                          className="euiButton__content"
-                          iconSide="left"
-                          textProps={
+                        <button
+                          className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                          disabled={false}
+                          onClick={[Function]}
+                          style={
                             Object {
-                              "className": "euiButton__text",
+                              "minWidth": undefined,
                             }
                           }
+                          type="button"
                         >
-                          <span
-                            className="euiButtonContent euiButton__content"
+                          <EuiButtonContent
+                            className="euiButton__content"
+                            iconSide="left"
+                            textProps={
+                              Object {
+                                "className": "euiButton__text",
+                              }
+                            }
                           >
                             <span
-                              className="euiButton__text"
+                              className="euiButtonContent euiButton__content"
                             >
-                              Create acceleration
+                              <span
+                                className="euiButton__text"
+                              >
+                                Create acceleration
+                              </span>
                             </span>
-                          </span>
-                        </EuiButtonContent>
-                      </button>
-                    </EuiButtonDisplay>
-                  </EuiButton>
+                          </EuiButtonContent>
+                        </button>
+                      </EuiButtonDisplay>
+                    </EuiButton>
+                  </EuiSmallButton>
                 </CreateAccelerationFlyoutButton>
               </div>
             </EuiFlexItem>
@@ -1165,6 +1181,7 @@ exports[`AssociatedObjectsTab Component renders correctly with associated object
                                       config={
                                         Object {
                                           "cache": 60000,
+                                          "compressed": undefined,
                                           "field": "accelerations",
                                           "multiSelect": true,
                                           "name": "Accelerations",
@@ -5106,87 +5123,96 @@ exports[`AssociatedObjectsTab Component renders tab with no databases or objects
                   isLoading={false}
                   onClick={[Function]}
                 >
-                  <EuiButton
+                  <EuiSmallButton
                     iconType="refresh"
                     isDisabled={false}
                     isLoading={false}
                     onClick={[Function]}
                   >
-                    <EuiButtonDisplay
-                      baseClassName="euiButton"
-                      disabled={false}
-                      element="button"
+                    <EuiButton
                       iconType="refresh"
                       isDisabled={false}
                       isLoading={false}
                       onClick={[Function]}
-                      type="button"
+                      size="s"
                     >
-                      <button
-                        className="euiButton euiButton--primary"
+                      <EuiButtonDisplay
+                        baseClassName="euiButton"
                         disabled={false}
+                        element="button"
+                        iconType="refresh"
+                        isDisabled={false}
+                        isLoading={false}
                         onClick={[Function]}
-                        style={
-                          Object {
-                            "minWidth": undefined,
-                          }
-                        }
+                        size="s"
                         type="button"
                       >
-                        <EuiButtonContent
-                          className="euiButton__content"
-                          iconSide="left"
-                          iconType="refresh"
-                          isLoading={false}
-                          textProps={
+                        <button
+                          className="euiButton euiButton--primary euiButton--small"
+                          disabled={false}
+                          onClick={[Function]}
+                          style={
                             Object {
-                              "className": "euiButton__text",
+                              "minWidth": undefined,
                             }
                           }
+                          type="button"
                         >
-                          <span
-                            className="euiButtonContent euiButton__content"
+                          <EuiButtonContent
+                            className="euiButton__content"
+                            iconSide="left"
+                            iconType="refresh"
+                            isLoading={false}
+                            textProps={
+                              Object {
+                                "className": "euiButton__text",
+                              }
+                            }
                           >
-                            <EuiIcon
-                              className="euiButtonContent__icon"
-                              color="inherit"
-                              size="m"
-                              type="refresh"
+                            <span
+                              className="euiButtonContent euiButton__content"
                             >
-                              <EuiIconBeaker
-                                aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                focusable="false"
-                                role="img"
-                                style={null}
+                              <EuiIcon
+                                className="euiButtonContent__icon"
+                                color="inherit"
+                                size="m"
+                                type="refresh"
                               >
-                                <svg
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                   focusable="false"
-                                  height={16}
                                   role="img"
                                   style={null}
-                                  viewBox="0 0 16 16"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <path
-                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                  />
-                                </svg>
-                              </EuiIconBeaker>
-                            </EuiIcon>
-                            <span
-                              className="euiButton__text"
-                            >
-                              Refresh
+                                  <svg
+                                    aria-hidden={true}
+                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                    focusable="false"
+                                    height={16}
+                                    role="img"
+                                    style={null}
+                                    viewBox="0 0 16 16"
+                                    width={16}
+                                    xmlns="http://www.w3.org/2000/svg"
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
+                              </EuiIcon>
+                              <span
+                                className="euiButton__text"
+                              >
+                                Refresh
+                              </span>
                             </span>
-                          </span>
-                        </EuiButtonContent>
-                      </button>
-                    </EuiButtonDisplay>
-                  </EuiButton>
+                          </EuiButtonContent>
+                        </button>
+                      </EuiButtonDisplay>
+                    </EuiButton>
+                  </EuiSmallButton>
                 </AssociatedObjectsRefreshButton>
               </div>
             </EuiFlexItem>
@@ -5202,52 +5228,59 @@ exports[`AssociatedObjectsTab Component renders tab with no databases or objects
                   handleRefresh={[Function]}
                   renderCreateAccelerationFlyout={[MockFunction]}
                 >
-                  <EuiButton
+                  <EuiSmallButton
                     fill={true}
                     onClick={[Function]}
                   >
-                    <EuiButtonDisplay
-                      baseClassName="euiButton"
-                      disabled={false}
-                      element="button"
+                    <EuiButton
                       fill={true}
-                      isDisabled={false}
                       onClick={[Function]}
-                      type="button"
+                      size="s"
                     >
-                      <button
-                        className="euiButton euiButton--primary euiButton--fill"
+                      <EuiButtonDisplay
+                        baseClassName="euiButton"
                         disabled={false}
+                        element="button"
+                        fill={true}
+                        isDisabled={false}
                         onClick={[Function]}
-                        style={
-                          Object {
-                            "minWidth": undefined,
-                          }
-                        }
+                        size="s"
                         type="button"
                       >
-                        <EuiButtonContent
-                          className="euiButton__content"
-                          iconSide="left"
-                          textProps={
+                        <button
+                          className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                          disabled={false}
+                          onClick={[Function]}
+                          style={
                             Object {
-                              "className": "euiButton__text",
+                              "minWidth": undefined,
                             }
                           }
+                          type="button"
                         >
-                          <span
-                            className="euiButtonContent euiButton__content"
+                          <EuiButtonContent
+                            className="euiButton__content"
+                            iconSide="left"
+                            textProps={
+                              Object {
+                                "className": "euiButton__text",
+                              }
+                            }
                           >
                             <span
-                              className="euiButton__text"
+                              className="euiButtonContent euiButton__content"
                             >
-                              Create acceleration
+                              <span
+                                className="euiButton__text"
+                              >
+                                Create acceleration
+                              </span>
                             </span>
-                          </span>
-                        </EuiButtonContent>
-                      </button>
-                    </EuiButtonDisplay>
-                  </EuiButton>
+                          </EuiButtonContent>
+                        </button>
+                      </EuiButtonDisplay>
+                    </EuiButton>
+                  </EuiSmallButton>
                 </CreateAccelerationFlyoutButton>
               </div>
             </EuiFlexItem>
@@ -5264,13 +5297,13 @@ exports[`AssociatedObjectsTab Component renders tab with no databases or objects
       >
         <EuiEmptyPrompt
           actions={
-            <EuiButton
+            <EuiSmallButton
               iconSide="right"
               iconType="popout"
               onClick={[Function]}
             >
               Query Workbench
-            </EuiButton>
+            </EuiSmallButton>
           }
           body={
             <React.Fragment>
@@ -5321,85 +5354,93 @@ exports[`AssociatedObjectsTab Component renders tab with no databases or objects
                 className="euiSpacer euiSpacer--l"
               />
             </EuiSpacer>
-            <EuiButton
+            <EuiSmallButton
               iconSide="right"
               iconType="popout"
               onClick={[Function]}
             >
-              <EuiButtonDisplay
-                baseClassName="euiButton"
-                disabled={false}
-                element="button"
+              <EuiButton
                 iconSide="right"
                 iconType="popout"
-                isDisabled={false}
                 onClick={[Function]}
-                type="button"
+                size="s"
               >
-                <button
-                  className="euiButton euiButton--primary"
+                <EuiButtonDisplay
+                  baseClassName="euiButton"
                   disabled={false}
+                  element="button"
+                  iconSide="right"
+                  iconType="popout"
+                  isDisabled={false}
                   onClick={[Function]}
-                  style={
-                    Object {
-                      "minWidth": undefined,
-                    }
-                  }
+                  size="s"
                   type="button"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="right"
-                    iconType="popout"
-                    textProps={
+                  <button
+                    className="euiButton euiButton--primary euiButton--small"
+                    disabled={false}
+                    onClick={[Function]}
+                    style={
                       Object {
-                        "className": "euiButton__text",
+                        "minWidth": undefined,
                       }
                     }
+                    type="button"
                   >
-                    <span
-                      className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                    <EuiButtonContent
+                      className="euiButton__content"
+                      iconSide="right"
+                      iconType="popout"
+                      textProps={
+                        Object {
+                          "className": "euiButton__text",
+                        }
+                      }
                     >
-                      <EuiIcon
-                        className="euiButtonContent__icon"
-                        color="inherit"
-                        size="m"
-                        type="popout"
+                      <span
+                        className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                       >
-                        <EuiIconBeaker
-                          aria-hidden={true}
-                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                          focusable="false"
-                          role="img"
-                          style={null}
+                        <EuiIcon
+                          className="euiButtonContent__icon"
+                          color="inherit"
+                          size="m"
+                          type="popout"
                         >
-                          <svg
+                          <EuiIconBeaker
                             aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                             focusable="false"
-                            height={16}
                             role="img"
                             style={null}
-                            viewBox="0 0 16 16"
-                            width={16}
-                            xmlns="http://www.w3.org/2000/svg"
                           >
-                            <path
-                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                            />
-                          </svg>
-                        </EuiIconBeaker>
-                      </EuiIcon>
-                      <span
-                        className="euiButton__text"
-                      >
-                        Query Workbench
+                            <svg
+                              aria-hidden={true}
+                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                              focusable="false"
+                              height={16}
+                              role="img"
+                              style={null}
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
+                          </EuiIconBeaker>
+                        </EuiIcon>
+                        <span
+                          className="euiButton__text"
+                        >
+                          Query Workbench
+                        </span>
                       </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
-            </EuiButton>
+                    </EuiButtonContent>
+                  </button>
+                </EuiButtonDisplay>
+              </EuiButton>
+            </EuiSmallButton>
           </div>
         </EuiEmptyPrompt>
       </AssociatedObjectsTabEmpty>
diff --git a/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
index d2dba8b67a..ca177f6ae6 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
@@ -71,7 +71,7 @@ exports[`Data Connection Page test Renders Prometheus data connection page with
               Associated objects and accelerations are not available while this connection is inactive.
             </p>
             <button
-              class="euiButton euiButton--warning"
+              class="euiButton euiButton--warning euiButton--small"
               type="button"
             >
               <span
@@ -179,7 +179,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButtonEmpty euiButtonEmpty--primary"
+                  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
                   type="button"
                 >
                   <span
@@ -611,7 +611,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="createButton"
                   type="button"
                 >
diff --git a/public/components/datasources/components/__tests__/__snapshots__/inactive_data_connection.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/inactive_data_connection.test.tsx.snap
index 2587fc5cb0..55a7121d1a 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/inactive_data_connection.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/inactive_data_connection.test.tsx.snap
@@ -38,7 +38,7 @@ exports[`Data Connection Inactive Page test Renders inactive data connection cal
           Associated objects and accelerations are not available while this connection is inactive.
         </p>
         <button
-          class="euiButton euiButton--warning"
+          class="euiButton euiButton--warning euiButton--small"
           type="button"
         >
           <span
diff --git a/public/components/datasources/components/__tests__/__snapshots__/installed_integrations_table.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/installed_integrations_table.test.tsx.snap
index 68748fbe6f..54b235fe03 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/installed_integrations_table.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/installed_integrations_table.test.tsx.snap
@@ -111,50 +111,56 @@ exports[`Installed Integrations Table test Renders the empty installed integrati
                 <AddIntegrationButton
                   toggleFlyout={[Function]}
                 >
-                  <EuiButton
+                  <EuiSmallButton
                     onClick={[Function]}
                   >
-                    <EuiButtonDisplay
-                      baseClassName="euiButton"
-                      disabled={false}
-                      element="button"
-                      isDisabled={false}
+                    <EuiButton
                       onClick={[Function]}
-                      type="button"
+                      size="s"
                     >
-                      <button
-                        className="euiButton euiButton--primary"
+                      <EuiButtonDisplay
+                        baseClassName="euiButton"
                         disabled={false}
+                        element="button"
+                        isDisabled={false}
                         onClick={[Function]}
-                        style={
-                          Object {
-                            "minWidth": undefined,
-                          }
-                        }
+                        size="s"
                         type="button"
                       >
-                        <EuiButtonContent
-                          className="euiButton__content"
-                          iconSide="left"
-                          textProps={
+                        <button
+                          className="euiButton euiButton--primary euiButton--small"
+                          disabled={false}
+                          onClick={[Function]}
+                          style={
                             Object {
-                              "className": "euiButton__text",
+                              "minWidth": undefined,
                             }
                           }
+                          type="button"
                         >
-                          <span
-                            className="euiButtonContent euiButton__content"
+                          <EuiButtonContent
+                            className="euiButton__content"
+                            iconSide="left"
+                            textProps={
+                              Object {
+                                "className": "euiButton__text",
+                              }
+                            }
                           >
                             <span
-                              className="euiButton__text"
+                              className="euiButtonContent euiButton__content"
                             >
-                              Add Integrations
+                              <span
+                                className="euiButton__text"
+                              >
+                                Add Integrations
+                              </span>
                             </span>
-                          </span>
-                        </EuiButtonContent>
-                      </button>
-                    </EuiButtonDisplay>
-                  </EuiButton>
+                          </EuiButtonContent>
+                        </button>
+                      </EuiButtonDisplay>
+                    </EuiButton>
+                  </EuiSmallButton>
                 </AddIntegrationButton>
               </div>
             </EuiFlexItem>
@@ -235,8 +241,8 @@ exports[`Installed Integrations Table test Renders the installed integrations ta
             <div
               className="euiFlexItem"
             >
-              <EuiFieldSearch
-                compressed={false}
+              <EuiCompressedFieldSearch
+                compressed={true}
                 fullWidth={true}
                 incremental={false}
                 isClearable={true}
@@ -245,20 +251,20 @@ exports[`Installed Integrations Table test Renders the installed integrations ta
                 placeholder="Search..."
               >
                 <EuiFormControlLayout
-                  compressed={false}
+                  compressed={true}
                   fullWidth={true}
                   icon="search"
                   isLoading={false}
                 >
                   <div
-                    className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <EuiValidatableControl>
                         <input
-                          className="euiFieldSearch euiFieldSearch--fullWidth"
+                          className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
                           onChange={[Function]}
                           onKeyUp={[Function]}
                           placeholder="Search..."
@@ -266,7 +272,7 @@ exports[`Installed Integrations Table test Renders the installed integrations ta
                         />
                       </EuiValidatableControl>
                       <EuiFormControlLayoutIcons
-                        compressed={false}
+                        compressed={true}
                         icon="search"
                         isLoading={false}
                       >
@@ -274,7 +280,7 @@ exports[`Installed Integrations Table test Renders the installed integrations ta
                           className="euiFormControlLayoutIcons"
                         >
                           <EuiFormControlLayoutCustomIcon
-                            size="m"
+                            size="s"
                             type="search"
                           >
                             <span
@@ -283,19 +289,19 @@ exports[`Installed Integrations Table test Renders the installed integrations ta
                               <EuiIcon
                                 aria-hidden="true"
                                 className="euiFormControlLayoutCustomIcon__icon"
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <EuiIconBeaker
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   role="img"
                                   style={null}
                                 >
                                   <svg
                                     aria-hidden={true}
-                                    className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                    className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height={16}
                                     role="img"
@@ -317,7 +323,7 @@ exports[`Installed Integrations Table test Renders the installed integrations ta
                     </div>
                   </div>
                 </EuiFormControlLayout>
-              </EuiFieldSearch>
+              </EuiCompressedFieldSearch>
             </div>
           </EuiFlexItem>
           <EuiFlexItem
@@ -330,52 +336,59 @@ exports[`Installed Integrations Table test Renders the installed integrations ta
                 fill={true}
                 toggleFlyout={[Function]}
               >
-                <EuiButton
+                <EuiSmallButton
                   fill={true}
                   onClick={[Function]}
                 >
-                  <EuiButtonDisplay
-                    baseClassName="euiButton"
-                    disabled={false}
-                    element="button"
+                  <EuiButton
                     fill={true}
-                    isDisabled={false}
                     onClick={[Function]}
-                    type="button"
+                    size="s"
                   >
-                    <button
-                      className="euiButton euiButton--primary euiButton--fill"
+                    <EuiButtonDisplay
+                      baseClassName="euiButton"
                       disabled={false}
+                      element="button"
+                      fill={true}
+                      isDisabled={false}
                       onClick={[Function]}
-                      style={
-                        Object {
-                          "minWidth": undefined,
-                        }
-                      }
+                      size="s"
                       type="button"
                     >
-                      <EuiButtonContent
-                        className="euiButton__content"
-                        iconSide="left"
-                        textProps={
+                      <button
+                        className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                        disabled={false}
+                        onClick={[Function]}
+                        style={
                           Object {
-                            "className": "euiButton__text",
+                            "minWidth": undefined,
                           }
                         }
+                        type="button"
                       >
-                        <span
-                          className="euiButtonContent euiButton__content"
+                        <EuiButtonContent
+                          className="euiButton__content"
+                          iconSide="left"
+                          textProps={
+                            Object {
+                              "className": "euiButton__text",
+                            }
+                          }
                         >
                           <span
-                            className="euiButton__text"
+                            className="euiButtonContent euiButton__content"
                           >
-                            Add Integrations
+                            <span
+                              className="euiButton__text"
+                            >
+                              Add Integrations
+                            </span>
                           </span>
-                        </span>
-                      </EuiButtonContent>
-                    </button>
-                  </EuiButtonDisplay>
-                </EuiButton>
+                        </EuiButtonContent>
+                      </button>
+                    </EuiButtonDisplay>
+                  </EuiButton>
+                </EuiSmallButton>
               </AddIntegrationButton>
             </div>
           </EuiFlexItem>
diff --git a/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap
index 31368b5ba7..715c3b5d66 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap
@@ -72,83 +72,90 @@ exports[`Manage Data Connections Description test Renders manage data connection
           <div
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
-            <EuiButton
+            <EuiSmallButton
               iconType="refresh"
               onClick={[Function]}
             >
-              <EuiButtonDisplay
-                baseClassName="euiButton"
-                disabled={false}
-                element="button"
+              <EuiButton
                 iconType="refresh"
-                isDisabled={false}
                 onClick={[Function]}
-                type="button"
+                size="s"
               >
-                <button
-                  className="euiButton euiButton--primary"
+                <EuiButtonDisplay
+                  baseClassName="euiButton"
                   disabled={false}
+                  element="button"
+                  iconType="refresh"
+                  isDisabled={false}
                   onClick={[Function]}
-                  style={
-                    Object {
-                      "minWidth": undefined,
-                    }
-                  }
+                  size="s"
                   type="button"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="left"
-                    iconType="refresh"
-                    textProps={
+                  <button
+                    className="euiButton euiButton--primary euiButton--small"
+                    disabled={false}
+                    onClick={[Function]}
+                    style={
                       Object {
-                        "className": "euiButton__text",
+                        "minWidth": undefined,
                       }
                     }
+                    type="button"
                   >
-                    <span
-                      className="euiButtonContent euiButton__content"
+                    <EuiButtonContent
+                      className="euiButton__content"
+                      iconSide="left"
+                      iconType="refresh"
+                      textProps={
+                        Object {
+                          "className": "euiButton__text",
+                        }
+                      }
                     >
-                      <EuiIcon
-                        className="euiButtonContent__icon"
-                        color="inherit"
-                        size="m"
-                        type="refresh"
+                      <span
+                        className="euiButtonContent euiButton__content"
                       >
-                        <EuiIconBeaker
-                          aria-hidden={true}
-                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                          focusable="false"
-                          role="img"
-                          style={null}
+                        <EuiIcon
+                          className="euiButtonContent__icon"
+                          color="inherit"
+                          size="m"
+                          type="refresh"
                         >
-                          <svg
+                          <EuiIconBeaker
                             aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                             focusable="false"
-                            height={16}
                             role="img"
                             style={null}
-                            viewBox="0 0 16 16"
-                            width={16}
-                            xmlns="http://www.w3.org/2000/svg"
                           >
-                            <path
-                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                            />
-                          </svg>
-                        </EuiIconBeaker>
-                      </EuiIcon>
-                      <span
-                        className="euiButton__text"
-                      >
-                        Refresh
+                            <svg
+                              aria-hidden={true}
+                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                              focusable="false"
+                              height={16}
+                              role="img"
+                              style={null}
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
+                          </EuiIconBeaker>
+                        </EuiIcon>
+                        <span
+                          className="euiButton__text"
+                        >
+                          Refresh
+                        </span>
                       </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
-            </EuiButton>
+                    </EuiButtonContent>
+                  </button>
+                </EuiButtonDisplay>
+              </EuiButton>
+            </EuiSmallButton>
           </div>
         </EuiFlexItem>
       </div>
diff --git a/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
index d5205fed5b..36d7f9bf01 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
@@ -139,7 +139,7 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
               class="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 type="button"
               >
                 <span
diff --git a/public/components/datasources/components/__tests__/__snapshots__/no_access.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/no_access.test.tsx.snap
index 5fd77b87ba..d57f96d463 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/no_access.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/no_access.test.tsx.snap
@@ -8,13 +8,13 @@ exports[`No access test Renders no access view of data source 1`] = `
     >
       <EuiEmptyPrompt
         actions={
-          <EuiButton
+          <EuiSmallButton
             color="primary"
             fill={true}
             onClick={[Function]}
           >
             Return to data connections
-          </EuiButton>
+          </EuiSmallButton>
         }
         body={
           <EuiText>
@@ -111,54 +111,62 @@ exports[`No access test Renders no access view of data source 1`] = `
               className="euiSpacer euiSpacer--l"
             />
           </EuiSpacer>
-          <EuiButton
+          <EuiSmallButton
             color="primary"
             fill={true}
             onClick={[Function]}
           >
-            <EuiButtonDisplay
-              baseClassName="euiButton"
+            <EuiButton
               color="primary"
-              disabled={false}
-              element="button"
               fill={true}
-              isDisabled={false}
               onClick={[Function]}
-              type="button"
+              size="s"
             >
-              <button
-                className="euiButton euiButton--primary euiButton--fill"
+              <EuiButtonDisplay
+                baseClassName="euiButton"
+                color="primary"
                 disabled={false}
+                element="button"
+                fill={true}
+                isDisabled={false}
                 onClick={[Function]}
-                style={
-                  Object {
-                    "minWidth": undefined,
-                  }
-                }
+                size="s"
                 type="button"
               >
-                <EuiButtonContent
-                  className="euiButton__content"
-                  iconSide="left"
-                  textProps={
+                <button
+                  className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                  disabled={false}
+                  onClick={[Function]}
+                  style={
                     Object {
-                      "className": "euiButton__text",
+                      "minWidth": undefined,
                     }
                   }
+                  type="button"
                 >
-                  <span
-                    className="euiButtonContent euiButton__content"
+                  <EuiButtonContent
+                    className="euiButton__content"
+                    iconSide="left"
+                    textProps={
+                      Object {
+                        "className": "euiButton__text",
+                      }
+                    }
                   >
                     <span
-                      className="euiButton__text"
+                      className="euiButtonContent euiButton__content"
                     >
-                      Return to data connections
+                      <span
+                        className="euiButton__text"
+                      >
+                        Return to data connections
+                      </span>
                     </span>
-                  </span>
-                </EuiButtonContent>
-              </button>
-            </EuiButtonDisplay>
-          </EuiButton>
+                  </EuiButtonContent>
+                </button>
+              </EuiButtonDisplay>
+            </EuiButton>
+          </EuiSmallButton>
         </div>
       </EuiEmptyPrompt>
     </div>
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap
index 19fcd741b8..82aa93790f 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap
@@ -161,7 +161,7 @@ Array [
                       class="euiSpacer euiSpacer--m"
                     />
                     <div
-                      class="euiFormRow"
+                      class="euiFormRow euiFormRow--compressed"
                       id="random_html_id-row"
                     >
                       <div
@@ -189,17 +189,17 @@ Array [
                             <div
                               aria-expanded="false"
                               aria-haspopup="listbox"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -235,7 +235,7 @@ Array [
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -286,7 +286,7 @@ Array [
                       </div>
                     </div>
                     <div
-                      class="euiFormRow"
+                      class="euiFormRow euiFormRow--compressed"
                       id="random_html_id-row"
                     >
                       <div
@@ -314,17 +314,17 @@ Array [
                             <div
                               aria-expanded="false"
                               aria-haspopup="listbox"
-                              class="euiComboBox"
+                              class="euiComboBox euiComboBox--compressed"
                               role="combobox"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <div
-                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
+                                    class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap"
                                     data-test-subj="comboBoxInput"
                                     tabindex="-1"
                                   >
@@ -360,7 +360,7 @@ Array [
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -425,7 +425,7 @@ Array [
                       class="euiSpacer euiSpacer--s"
                     />
                     <div
-                      class="euiFormRow"
+                      class="euiFormRow euiFormRow--compressed"
                       id="random_html_id-row"
                     >
                       <div
@@ -487,7 +487,7 @@ Array [
                                 value="skipping"
                               />
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
@@ -502,7 +502,7 @@ Array [
                                     aria-describedby="random_html_id-help-0"
                                     aria-haspopup="true"
                                     aria-labelledby="random_html_id random_html_id"
-                                    class="euiSuperSelectControl"
+                                    class="euiSuperSelectControl euiSuperSelectControl--compressed"
                                     type="button"
                                   >
                                     Skipping index
@@ -515,7 +515,7 @@ Array [
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -557,7 +557,7 @@ Array [
                       class="euiSpacer euiSpacer--s"
                     />
                     <div
-                      class="euiFormRow"
+                      class="euiFormRow euiFormRow--compressed"
                       id="random_html_id-row"
                     >
                       <div
@@ -586,7 +586,7 @@ Array [
                                 value="autoInterval"
                               />
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
@@ -601,7 +601,7 @@ Array [
                                     aria-describedby="random_html_id-help-0"
                                     aria-haspopup="true"
                                     aria-labelledby="random_html_id random_html_id"
-                                    class="euiSuperSelectControl"
+                                    class="euiSuperSelectControl euiSuperSelectControl--compressed"
                                     type="button"
                                   >
                                     Auto (Interval)
@@ -614,7 +614,7 @@ Array [
                                     >
                                       <svg
                                         aria-hidden="true"
-                                        class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                        class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height="16"
                                         role="img"
@@ -642,7 +642,7 @@ Array [
                       </div>
                     </div>
                     <div
-                      class="euiFormRow"
+                      class="euiFormRow euiFormRow--compressed"
                       id="random_html_id-row"
                     >
                       <div
@@ -660,7 +660,7 @@ Array [
                         class="euiFormRow__fieldWrapper"
                       >
                         <div
-                          class="euiFormControlLayout euiFormControlLayout--group"
+                          class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                         >
                           <div
                             class="euiFormControlLayout__childrenWrapper"
@@ -668,7 +668,7 @@ Array [
                             <input
                               aria-describedby="random_html_id-help-0"
                               aria-label="Refresh increments"
-                              class="euiFieldNumber euiFieldNumber--inGroup"
+                              class="euiFieldNumber euiFieldNumber--compressed euiFieldNumber--inGroup"
                               id="random_html_id"
                               min="1"
                               placeholder="Refresh increments"
@@ -677,13 +677,13 @@ Array [
                             />
                           </div>
                           <div
-                            class="euiFormControlLayout"
+                            class="euiFormControlLayout euiFormControlLayout--compressed"
                           >
                             <div
                               class="euiFormControlLayout__childrenWrapper"
                             >
                               <select
-                                class="euiSelect euiFormControlLayout__append"
+                                class="euiSelect euiSelect--compressed euiFormControlLayout__append"
                               >
                                 <option
                                   value="minute"
@@ -714,7 +714,7 @@ Array [
                                 >
                                   <svg
                                     aria-hidden="true"
-                                    class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                    class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height="16"
                                     role="img"
@@ -740,7 +740,7 @@ Array [
                       </div>
                     </div>
                     <div
-                      class="euiFormRow"
+                      class="euiFormRow euiFormRow--compressed"
                       id="random_html_id-row"
                     >
                       <div
@@ -791,7 +791,7 @@ Array [
                         class="euiFormRow__fieldWrapper"
                       >
                         <div
-                          class="euiFormControlLayout"
+                          class="euiFormControlLayout euiFormControlLayout--compressed"
                         >
                           <div
                             class="euiFormControlLayout__childrenWrapper"
@@ -799,7 +799,7 @@ Array [
                             <input
                               aria-describedby="random_html_id-help-0"
                               aria-label="Use aria labels when no actual label is in use"
-                              class="euiFieldText"
+                              class="euiFieldText euiFieldText--compressed"
                               id="random_html_id"
                               placeholder="s3://checkpoint/location"
                               type="text"
@@ -967,7 +967,7 @@ Array [
                             class="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <button
-                              class="euiButton euiButton--primary"
+                              class="euiButton euiButton--primary euiButton--small"
                               type="button"
                             >
                               <span
@@ -985,7 +985,7 @@ Array [
                             class="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <button
-                              class="euiButton euiButton--danger"
+                              class="euiButton euiButton--danger euiButton--small"
                               type="button"
                             >
                               <span
@@ -1005,7 +1005,7 @@ Array [
                         class="euiFlexItem euiFlexItem--flexGrowZero"
                       >
                         <button
-                          class="euiButton euiButton--primary"
+                          class="euiButton euiButton--primary euiButton--small"
                           type="button"
                         >
                           <span
@@ -1080,7 +1080,7 @@ Array [
                             class="euiAccordion__padding--l"
                           >
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -1109,7 +1109,7 @@ Array [
                                 class="euiFormRow__fieldWrapper"
                               >
                                 <div
-                                  class="euiFormControlLayout euiFormControlLayout--group"
+                                  class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                                 >
                                   <label
                                     class="euiFormLabel euiFormControlLayout__prepend"
@@ -1143,7 +1143,7 @@ Array [
                                     <input
                                       aria-describedby="random_html_id-help-0"
                                       aria-label="Enter Index Name"
-                                      class="euiFieldText euiFieldText--inGroup"
+                                      class="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
                                       disabled=""
                                       id="random_html_id"
                                       placeholder="Enter index name"
@@ -1167,7 +1167,7 @@ Array [
                               </div>
                             </div>
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -1185,7 +1185,7 @@ Array [
                                 class="euiFormRow__fieldWrapper"
                               >
                                 <div
-                                  class="euiFormControlLayout"
+                                  class="euiFormControlLayout euiFormControlLayout--compressed"
                                 >
                                   <div
                                     class="euiFormControlLayout__childrenWrapper"
@@ -1193,7 +1193,7 @@ Array [
                                     <input
                                       aria-describedby="random_html_id-help-0"
                                       aria-label="Number of primary shards"
-                                      class="euiFieldNumber"
+                                      class="euiFieldNumber euiFieldNumber--compressed"
                                       id="random_html_id"
                                       max="100"
                                       min="1"
@@ -1215,7 +1215,7 @@ Array [
                               class="euiSpacer euiSpacer--l"
                             />
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -1233,7 +1233,7 @@ Array [
                                 class="euiFormRow__fieldWrapper"
                               >
                                 <div
-                                  class="euiFormControlLayout"
+                                  class="euiFormControlLayout euiFormControlLayout--compressed"
                                 >
                                   <div
                                     class="euiFormControlLayout__childrenWrapper"
@@ -1241,7 +1241,7 @@ Array [
                                     <input
                                       aria-describedby="random_html_id-help-0"
                                       aria-label="Number of replicas"
-                                      class="euiFieldNumber"
+                                      class="euiFieldNumber euiFieldNumber--compressed"
                                       id="random_html_id"
                                       max="100"
                                       min="0"
@@ -1329,7 +1329,7 @@ Array [
                                 class="euiFlexItem euiFlexItem--flexGrowZero"
                               >
                                 <button
-                                  class="euiButton euiButton--success"
+                                  class="euiButton euiButton--success euiButton--small"
                                   type="button"
                                 >
                                   <span
@@ -1380,7 +1380,7 @@ Array [
                   class="euiFlexItem euiFlexItem--flexGrowZero"
                 >
                   <button
-                    class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--flushLeft"
+                    class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiButtonEmpty--flushLeft"
                     type="button"
                   >
                     <span
@@ -1412,7 +1412,7 @@ Array [
                   class="euiFlexItem euiFlexItem--flexGrowZero"
                 >
                   <button
-                    class="euiButton euiButton--primary euiButton--fill"
+                    class="euiButton euiButton--primary euiButton--small euiButton--fill"
                     type="button"
                   >
                     <span
@@ -1621,7 +1621,7 @@ Array [
                         className="euiSpacer euiSpacer--m"
                       />,
                       <div
-                        className="euiFormRow"
+                        className="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -1651,18 +1651,18 @@ Array [
                               <div
                                 aria-expanded={false}
                                 aria-haspopup="listbox"
-                                className="euiComboBox"
+                                className="euiComboBox euiComboBox--compressed"
                                 onKeyDown={[Function]}
                                 role="combobox"
                               >
                                 <div
-                                  className="euiFormControlLayout"
+                                  className="euiFormControlLayout euiFormControlLayout--compressed"
                                 >
                                   <div
                                     className="euiFormControlLayout__childrenWrapper"
                                   >
                                     <div
-                                      className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
+                                      className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap"
                                       data-test-subj="comboBoxInput"
                                       onClick={[Function]}
                                       tabIndex={-1}
@@ -1725,7 +1725,7 @@ Array [
                                       >
                                         <svg
                                           aria-hidden={true}
-                                          className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                          className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                           focusable="false"
                                           height={16}
                                           role="img"
@@ -1780,7 +1780,7 @@ Array [
                         </div>
                       </div>,
                       <div
-                        className="euiFormRow"
+                        className="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -1810,18 +1810,18 @@ Array [
                               <div
                                 aria-expanded={false}
                                 aria-haspopup="listbox"
-                                className="euiComboBox"
+                                className="euiComboBox euiComboBox--compressed"
                                 onKeyDown={[Function]}
                                 role="combobox"
                               >
                                 <div
-                                  className="euiFormControlLayout"
+                                  className="euiFormControlLayout euiFormControlLayout--compressed"
                                 >
                                   <div
                                     className="euiFormControlLayout__childrenWrapper"
                                   >
                                     <div
-                                      className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
+                                      className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap"
                                       data-test-subj="comboBoxInput"
                                       onClick={[Function]}
                                       tabIndex={-1}
@@ -1884,7 +1884,7 @@ Array [
                                       >
                                         <svg
                                           aria-hidden={true}
-                                          className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                          className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                           focusable="false"
                                           height={16}
                                           role="img"
@@ -1955,7 +1955,7 @@ Array [
                         className="euiSpacer euiSpacer--s"
                       />,
                       <div
-                        className="euiFormRow"
+                        className="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -2024,7 +2024,7 @@ Array [
                                     value="skipping"
                                   />,
                                   <div
-                                    className="euiFormControlLayout"
+                                    className="euiFormControlLayout euiFormControlLayout--compressed"
                                   >
                                     <div
                                       className="euiFormControlLayout__childrenWrapper"
@@ -2039,7 +2039,7 @@ Array [
                                         aria-describedby="random_html_id-help-0"
                                         aria-haspopup="true"
                                         aria-labelledby="random_html_id random_html_id"
-                                        className="euiSuperSelectControl"
+                                        className="euiSuperSelectControl euiSuperSelectControl--compressed"
                                         onBlur={[Function]}
                                         onClick={[Function]}
                                         onFocus={[Function]}
@@ -2056,7 +2056,7 @@ Array [
                                         >
                                           <svg
                                             aria-hidden={true}
-                                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                             focusable="false"
                                             height={16}
                                             role="img"
@@ -2102,7 +2102,7 @@ Array [
                         className="euiSpacer euiSpacer--s"
                       />,
                       <div
-                        className="euiFormRow"
+                        className="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -2137,7 +2137,7 @@ Array [
                                     value="autoInterval"
                                   />,
                                   <div
-                                    className="euiFormControlLayout"
+                                    className="euiFormControlLayout euiFormControlLayout--compressed"
                                   >
                                     <div
                                       className="euiFormControlLayout__childrenWrapper"
@@ -2152,7 +2152,7 @@ Array [
                                         aria-describedby="random_html_id-help-0"
                                         aria-haspopup="true"
                                         aria-labelledby="random_html_id random_html_id"
-                                        className="euiSuperSelectControl"
+                                        className="euiSuperSelectControl euiSuperSelectControl--compressed"
                                         onBlur={[Function]}
                                         onClick={[Function]}
                                         onFocus={[Function]}
@@ -2169,7 +2169,7 @@ Array [
                                         >
                                           <svg
                                             aria-hidden={true}
-                                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                             focusable="false"
                                             height={16}
                                             role="img"
@@ -2199,7 +2199,7 @@ Array [
                         </div>
                       </div>,
                       <div
-                        className="euiFormRow"
+                        className="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -2217,7 +2217,7 @@ Array [
                           className="euiFormRow__fieldWrapper"
                         >
                           <div
-                            className="euiFormControlLayout euiFormControlLayout--group"
+                            className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                           >
                             <div
                               className="euiFormControlLayout__childrenWrapper"
@@ -2225,7 +2225,7 @@ Array [
                               <input
                                 aria-describedby="random_html_id-help-0"
                                 aria-label="Refresh increments"
-                                className="euiFieldNumber euiFieldNumber--inGroup"
+                                className="euiFieldNumber euiFieldNumber--compressed euiFieldNumber--inGroup"
                                 id="random_html_id"
                                 min={1}
                                 onBlur={[Function]}
@@ -2237,13 +2237,13 @@ Array [
                               />
                             </div>
                             <div
-                              className="euiFormControlLayout"
+                              className="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 className="euiFormControlLayout__childrenWrapper"
                               >
                                 <select
-                                  className="euiSelect euiFormControlLayout__append"
+                                  className="euiSelect euiSelect--compressed euiFormControlLayout__append"
                                   onBlur={[Function]}
                                   onChange={[Function]}
                                   onMouseUp={[Function]}
@@ -2282,7 +2282,7 @@ Array [
                                   >
                                     <svg
                                       aria-hidden={true}
-                                      className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                      className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       height={16}
                                       role="img"
@@ -2309,7 +2309,7 @@ Array [
                         </div>
                       </div>,
                       <div
-                        className="euiFormRow"
+                        className="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -2361,7 +2361,7 @@ Array [
                           className="euiFormRow__fieldWrapper"
                         >
                           <div
-                            className="euiFormControlLayout"
+                            className="euiFormControlLayout euiFormControlLayout--compressed"
                           >
                             <div
                               className="euiFormControlLayout__childrenWrapper"
@@ -2369,7 +2369,7 @@ Array [
                               <input
                                 aria-describedby="random_html_id-help-0"
                                 aria-label="Use aria labels when no actual label is in use"
-                                className="euiFieldText"
+                                className="euiFieldText euiFieldText--compressed"
                                 id="random_html_id"
                                 onBlur={[Function]}
                                 onChange={[Function]}
@@ -2568,7 +2568,7 @@ Array [
                                 className="euiFlexItem euiFlexItem--flexGrowZero"
                               >
                                 <button
-                                  className="euiButton euiButton--primary"
+                                  className="euiButton euiButton--primary euiButton--small"
                                   disabled={false}
                                   onClick={[Function]}
                                   style={
@@ -2593,7 +2593,7 @@ Array [
                                 className="euiFlexItem euiFlexItem--flexGrowZero"
                               >
                                 <button
-                                  className="euiButton euiButton--danger"
+                                  className="euiButton euiButton--danger euiButton--small"
                                   disabled={false}
                                   onClick={[Function]}
                                   style={
@@ -2621,7 +2621,7 @@ Array [
                           >
                             Array [
                               <button
-                                className="euiButton euiButton--primary"
+                                className="euiButton euiButton--primary euiButton--small"
                                 disabled={false}
                                 onClick={[Function]}
                                 style={
@@ -2710,7 +2710,7 @@ Array [
                           >
                             Array [
                               <div
-                                className="euiFormRow"
+                                className="euiFormRow euiFormRow--compressed"
                                 id="random_html_id-row"
                               >
                                 <div
@@ -2741,7 +2741,7 @@ Array [
                                   className="euiFormRow__fieldWrapper"
                                 >
                                   <div
-                                    className="euiFormControlLayout euiFormControlLayout--group"
+                                    className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                                   >
                                     <label
                                       className="euiFormLabel euiFormControlLayout__prepend"
@@ -2781,7 +2781,7 @@ Array [
                                       <input
                                         aria-describedby="random_html_id-help-0"
                                         aria-label="Enter Index Name"
-                                        className="euiFieldText euiFieldText--inGroup"
+                                        className="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
                                         disabled={true}
                                         id="random_html_id"
                                         onBlur={[Function]}
@@ -2810,7 +2810,7 @@ Array [
                               "",
                             ]
                             <div
-                              className="euiFormRow"
+                              className="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -2828,7 +2828,7 @@ Array [
                                 className="euiFormRow__fieldWrapper"
                               >
                                 <div
-                                  className="euiFormControlLayout"
+                                  className="euiFormControlLayout euiFormControlLayout--compressed"
                                 >
                                   <div
                                     className="euiFormControlLayout__childrenWrapper"
@@ -2836,7 +2836,7 @@ Array [
                                     <input
                                       aria-describedby="random_html_id-help-0"
                                       aria-label="Number of primary shards"
-                                      className="euiFieldNumber"
+                                      className="euiFieldNumber euiFieldNumber--compressed"
                                       id="random_html_id"
                                       max={100}
                                       min={1}
@@ -2861,7 +2861,7 @@ Array [
                               className="euiSpacer euiSpacer--l"
                             />
                             <div
-                              className="euiFormRow"
+                              className="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
@@ -2879,7 +2879,7 @@ Array [
                                 className="euiFormRow__fieldWrapper"
                               >
                                 <div
-                                  className="euiFormControlLayout"
+                                  className="euiFormControlLayout euiFormControlLayout--compressed"
                                 >
                                   <div
                                     className="euiFormControlLayout__childrenWrapper"
@@ -2887,7 +2887,7 @@ Array [
                                     <input
                                       aria-describedby="random_html_id-help-0"
                                       aria-label="Number of replicas"
-                                      className="euiFieldNumber"
+                                      className="euiFieldNumber euiFieldNumber--compressed"
                                       id="random_html_id"
                                       max={100}
                                       min={0}
@@ -2980,7 +2980,7 @@ Array [
                                 className="euiFlexItem euiFlexItem--flexGrowZero"
                               >
                                 <button
-                                  className="euiButton euiButton--success"
+                                  className="euiButton euiButton--success euiButton--small"
                                   disabled={false}
                                   onClick={[Function]}
                                   style={
@@ -3040,7 +3040,7 @@ Array [
                   className="euiFlexItem euiFlexItem--flexGrowZero"
                 >
                   <button
-                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--flushLeft"
+                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiButtonEmpty--flushLeft"
                     disabled={false}
                     onClick={[MockFunction]}
                     type="button"
@@ -3075,7 +3075,7 @@ Array [
                   className="euiFlexItem euiFlexItem--flexGrowZero"
                 >
                   <button
-                    className="euiButton euiButton--primary euiButton--fill"
+                    className="euiButton euiButton--primary euiButton--small euiButton--fill"
                     disabled={false}
                     onClick={[Function]}
                     style={
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration_button.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration_button.test.tsx.snap
index 198d8814ec..9d194103d7 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration_button.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration_button.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`Create acceleration button component renders create acceleration button component with mv state 1`] = `
 <button
-  className="euiButton euiButton--primary euiButton--fill"
+  className="euiButton euiButton--primary euiButton--small euiButton--fill"
   disabled={false}
   onClick={[Function]}
   style={
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/define_index_options.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/define_index_options.test.tsx.snap
index ad9200b27a..b0ecc95cdf 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/define_index_options.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/define_index_options.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`Index options acceleration components renders acceleration index options with covering index options 1`] = `
 Array [
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -34,7 +34,7 @@ Array [
       className="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormControlLayout euiFormControlLayout--group"
+        className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
       >
         <label
           className="euiFormLabel euiFormControlLayout__prepend"
@@ -74,7 +74,7 @@ Array [
           <input
             aria-describedby="random_html_id-help-0"
             aria-label="Enter Index Name"
-            className="euiFieldText euiFieldText--inGroup"
+            className="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
             disabled={false}
             id="random_html_id"
             onBlur={[Function]}
@@ -107,7 +107,7 @@ Array [
 exports[`Index options acceleration components renders acceleration index options with default options 1`] = `
 Array [
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -138,7 +138,7 @@ Array [
       className="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormControlLayout euiFormControlLayout--group"
+        className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
       >
         <label
           className="euiFormLabel euiFormControlLayout__prepend"
@@ -178,7 +178,7 @@ Array [
           <input
             aria-describedby="random_html_id-help-0"
             aria-label="Enter Index Name"
-            className="euiFieldText euiFieldText--inGroup"
+            className="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
             disabled={true}
             id="random_html_id"
             onBlur={[Function]}
@@ -211,7 +211,7 @@ Array [
 exports[`Index options acceleration components renders acceleration index options with materialized index options 1`] = `
 Array [
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -242,7 +242,7 @@ Array [
       className="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormControlLayout euiFormControlLayout--group"
+        className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
       >
         <label
           className="euiFormLabel euiFormControlLayout__prepend"
@@ -282,7 +282,7 @@ Array [
           <input
             aria-describedby="random_html_id-help-0"
             aria-label="Enter Index Name"
-            className="euiFieldText euiFieldText--inGroup"
+            className="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
             disabled={false}
             id="random_html_id"
             onBlur={[Function]}
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_advanced_settings.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_advanced_settings.test.tsx.snap
index 40151f9b28..13d48a4079 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_advanced_settings.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_advanced_settings.test.tsx.snap
@@ -61,7 +61,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
       >
         Array [
           <div
-            className="euiFormRow"
+            className="euiFormRow euiFormRow--compressed"
             id="random_html_id-row"
           >
             <div
@@ -92,7 +92,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
               className="euiFormRow__fieldWrapper"
             >
               <div
-                className="euiFormControlLayout euiFormControlLayout--group"
+                className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
               >
                 <label
                   className="euiFormLabel euiFormControlLayout__prepend"
@@ -132,7 +132,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
                   <input
                     aria-describedby="random_html_id-help-0"
                     aria-label="Enter Index Name"
-                    className="euiFieldText euiFieldText--inGroup"
+                    className="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
                     disabled={true}
                     id="random_html_id"
                     onBlur={[Function]}
@@ -161,7 +161,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
           "",
         ]
         <div
-          className="euiFormRow"
+          className="euiFormRow euiFormRow--compressed"
           id="random_html_id-row"
         >
           <div
@@ -179,7 +179,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
             className="euiFormRow__fieldWrapper"
           >
             <div
-              className="euiFormControlLayout"
+              className="euiFormControlLayout euiFormControlLayout--compressed"
             >
               <div
                 className="euiFormControlLayout__childrenWrapper"
@@ -187,7 +187,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
                 <input
                   aria-describedby="random_html_id-help-0"
                   aria-label="Number of primary shards"
-                  className="euiFieldNumber"
+                  className="euiFieldNumber euiFieldNumber--compressed"
                   id="random_html_id"
                   max={100}
                   min={1}
@@ -212,7 +212,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
           className="euiSpacer euiSpacer--l"
         />
         <div
-          className="euiFormRow"
+          className="euiFormRow euiFormRow--compressed"
           id="random_html_id-row"
         >
           <div
@@ -230,7 +230,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
             className="euiFormRow__fieldWrapper"
           >
             <div
-              className="euiFormControlLayout"
+              className="euiFormControlLayout euiFormControlLayout--compressed"
             >
               <div
                 className="euiFormControlLayout__childrenWrapper"
@@ -238,7 +238,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
                 <input
                   aria-describedby="random_html_id-help-0"
                   aria-label="Number of replicas"
-                  className="euiFieldNumber"
+                  className="euiFieldNumber euiFieldNumber--compressed"
                   id="random_html_id"
                   max={100}
                   min={0}
@@ -326,7 +326,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
         className="euiAccordion__padding--l"
       >
         <div
-          className="euiFormRow"
+          className="euiFormRow euiFormRow--compressed"
           id="random_html_id-row"
         >
           <div
@@ -344,7 +344,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
             className="euiFormRow__fieldWrapper"
           >
             <div
-              className="euiFormControlLayout"
+              className="euiFormControlLayout euiFormControlLayout--compressed"
             >
               <div
                 className="euiFormControlLayout__childrenWrapper"
@@ -352,7 +352,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
                 <input
                   aria-describedby="random_html_id-help-0"
                   aria-label="Number of primary shards"
-                  className="euiFieldNumber"
+                  className="euiFieldNumber euiFieldNumber--compressed"
                   id="random_html_id"
                   max={100}
                   min={1}
@@ -377,7 +377,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
           className="euiSpacer euiSpacer--l"
         />
         <div
-          className="euiFormRow"
+          className="euiFormRow euiFormRow--compressed"
           id="random_html_id-row"
         >
           <div
@@ -395,7 +395,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
             className="euiFormRow__fieldWrapper"
           >
             <div
-              className="euiFormControlLayout"
+              className="euiFormControlLayout euiFormControlLayout--compressed"
             >
               <div
                 className="euiFormControlLayout__childrenWrapper"
@@ -403,7 +403,7 @@ exports[`Advanced Index settings acceleration components renders acceleration in
                 <input
                   aria-describedby="random_html_id-help-0"
                   aria-label="Number of replicas"
-                  className="euiFieldNumber"
+                  className="euiFieldNumber euiFieldNumber--compressed"
                   id="random_html_id"
                   max={100}
                   min={0}
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap
index c3755c2ea9..70fe5053b2 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap
@@ -14,7 +14,7 @@ Array [
     className="euiSpacer euiSpacer--s"
   />,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -49,7 +49,7 @@ Array [
                 value="autoInterval"
               />,
               <div
-                className="euiFormControlLayout"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
                 <div
                   className="euiFormControlLayout__childrenWrapper"
@@ -64,7 +64,7 @@ Array [
                     aria-describedby="random_html_id-help-0"
                     aria-haspopup="true"
                     aria-labelledby="random_html_id random_html_id"
-                    className="euiSuperSelectControl"
+                    className="euiSuperSelectControl euiSuperSelectControl--compressed"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -81,7 +81,7 @@ Array [
                     >
                       <svg
                         aria-hidden={true}
-                        className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                        className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                         focusable="false"
                         height={16}
                         role="img"
@@ -111,7 +111,7 @@ Array [
     </div>
   </div>,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -129,7 +129,7 @@ Array [
       className="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormControlLayout euiFormControlLayout--group"
+        className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
       >
         <div
           className="euiFormControlLayout__childrenWrapper"
@@ -137,7 +137,7 @@ Array [
           <input
             aria-describedby="random_html_id-help-0"
             aria-label="Refresh increments"
-            className="euiFieldNumber euiFieldNumber--inGroup"
+            className="euiFieldNumber euiFieldNumber--compressed euiFieldNumber--inGroup"
             id="random_html_id"
             min={1}
             onBlur={[Function]}
@@ -149,13 +149,13 @@ Array [
           />
         </div>
         <div
-          className="euiFormControlLayout"
+          className="euiFormControlLayout euiFormControlLayout--compressed"
         >
           <div
             className="euiFormControlLayout__childrenWrapper"
           >
             <select
-              className="euiSelect euiFormControlLayout__append"
+              className="euiSelect euiSelect--compressed euiFormControlLayout__append"
               onBlur={[Function]}
               onChange={[Function]}
               onMouseUp={[Function]}
@@ -194,7 +194,7 @@ Array [
               >
                 <svg
                   aria-hidden={true}
-                  className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                  className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                   focusable="false"
                   height={16}
                   role="img"
@@ -221,7 +221,7 @@ Array [
     </div>
   </div>,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -273,7 +273,7 @@ Array [
       className="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormControlLayout"
+        className="euiFormControlLayout euiFormControlLayout--compressed"
       >
         <div
           className="euiFormControlLayout__childrenWrapper"
@@ -281,7 +281,7 @@ Array [
           <input
             aria-describedby="random_html_id-help-0"
             aria-label="Use aria labels when no actual label is in use"
-            className="euiFieldText"
+            className="euiFieldText euiFieldText--compressed"
             id="random_html_id"
             onBlur={[Function]}
             onChange={[Function]}
@@ -317,7 +317,7 @@ Array [
     className="euiSpacer euiSpacer--s"
   />,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -352,7 +352,7 @@ Array [
                 value="autoInterval"
               />,
               <div
-                className="euiFormControlLayout"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
                 <div
                   className="euiFormControlLayout__childrenWrapper"
@@ -367,7 +367,7 @@ Array [
                     aria-describedby="random_html_id-help-0"
                     aria-haspopup="true"
                     aria-labelledby="random_html_id random_html_id"
-                    className="euiSuperSelectControl"
+                    className="euiSuperSelectControl euiSuperSelectControl--compressed"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -384,7 +384,7 @@ Array [
                     >
                       <svg
                         aria-hidden={true}
-                        className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                        className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                         focusable="false"
                         height={16}
                         role="img"
@@ -415,7 +415,7 @@ Array [
     </div>
   </div>,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -433,7 +433,7 @@ Array [
       className="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormControlLayout euiFormControlLayout--group"
+        className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
       >
         <div
           className="euiFormControlLayout__childrenWrapper"
@@ -441,7 +441,7 @@ Array [
           <input
             aria-describedby="random_html_id-help-0"
             aria-label="Refresh increments"
-            className="euiFieldNumber euiFieldNumber--inGroup"
+            className="euiFieldNumber euiFieldNumber--compressed euiFieldNumber--inGroup"
             id="random_html_id"
             min={1}
             onBlur={[Function]}
@@ -453,13 +453,13 @@ Array [
           />
         </div>
         <div
-          className="euiFormControlLayout"
+          className="euiFormControlLayout euiFormControlLayout--compressed"
         >
           <div
             className="euiFormControlLayout__childrenWrapper"
           >
             <select
-              className="euiSelect euiFormControlLayout__append"
+              className="euiSelect euiSelect--compressed euiFormControlLayout__append"
               onBlur={[Function]}
               onChange={[Function]}
               onMouseUp={[Function]}
@@ -498,7 +498,7 @@ Array [
               >
                 <svg
                   aria-hidden={true}
-                  className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                  className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                   focusable="false"
                   height={16}
                   role="img"
@@ -526,7 +526,7 @@ Array [
     </div>
   </div>,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -577,7 +577,7 @@ Array [
       className="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormControlLayout"
+        className="euiFormControlLayout euiFormControlLayout--compressed"
       >
         <div
           className="euiFormControlLayout__childrenWrapper"
@@ -585,7 +585,7 @@ Array [
           <input
             aria-describedby="random_html_id-help-0"
             aria-label="Use aria labels when no actual label is in use"
-            className="euiFieldText"
+            className="euiFieldText euiFieldText--compressed"
             id="random_html_id"
             onBlur={[Function]}
             onChange={[Function]}
@@ -621,7 +621,7 @@ Array [
     className="euiSpacer euiSpacer--s"
   />,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -656,7 +656,7 @@ Array [
                 value="autoInterval"
               />,
               <div
-                className="euiFormControlLayout"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
                 <div
                   className="euiFormControlLayout__childrenWrapper"
@@ -671,7 +671,7 @@ Array [
                     aria-describedby="random_html_id-help-0"
                     aria-haspopup="true"
                     aria-labelledby="random_html_id random_html_id"
-                    className="euiSuperSelectControl"
+                    className="euiSuperSelectControl euiSuperSelectControl--compressed"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -688,7 +688,7 @@ Array [
                     >
                       <svg
                         aria-hidden={true}
-                        className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                        className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                         focusable="false"
                         height={16}
                         role="img"
@@ -719,7 +719,7 @@ Array [
     </div>
   </div>,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -737,7 +737,7 @@ Array [
       className="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormControlLayout euiFormControlLayout--group"
+        className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
       >
         <div
           className="euiFormControlLayout__childrenWrapper"
@@ -745,7 +745,7 @@ Array [
           <input
             aria-describedby="random_html_id-help-0"
             aria-label="Refresh increments"
-            className="euiFieldNumber euiFieldNumber--inGroup"
+            className="euiFieldNumber euiFieldNumber--compressed euiFieldNumber--inGroup"
             id="random_html_id"
             min={1}
             onBlur={[Function]}
@@ -757,13 +757,13 @@ Array [
           />
         </div>
         <div
-          className="euiFormControlLayout"
+          className="euiFormControlLayout euiFormControlLayout--compressed"
         >
           <div
             className="euiFormControlLayout__childrenWrapper"
           >
             <select
-              className="euiSelect euiFormControlLayout__append"
+              className="euiSelect euiSelect--compressed euiFormControlLayout__append"
               onBlur={[Function]}
               onChange={[Function]}
               onMouseUp={[Function]}
@@ -802,7 +802,7 @@ Array [
               >
                 <svg
                   aria-hidden={true}
-                  className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                  className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                   focusable="false"
                   height={16}
                   role="img"
@@ -830,7 +830,7 @@ Array [
     </div>
   </div>,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -881,7 +881,7 @@ Array [
       className="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormControlLayout"
+        className="euiFormControlLayout euiFormControlLayout--compressed"
       >
         <div
           className="euiFormControlLayout__childrenWrapper"
@@ -889,7 +889,7 @@ Array [
           <input
             aria-describedby="random_html_id-help-0"
             aria-label="Use aria labels when no actual label is in use"
-            className="euiFieldText"
+            className="euiFieldText euiFieldText--compressed"
             id="random_html_id"
             onBlur={[Function]}
             onChange={[Function]}
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_type_selector.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_type_selector.test.tsx.snap
index 0a4b47c084..82540ef2ce 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_type_selector.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_type_selector.test.tsx.snap
@@ -14,7 +14,7 @@ Array [
     className="euiSpacer euiSpacer--s"
   />,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -83,7 +83,7 @@ Array [
                 value="skipping"
               />,
               <div
-                className="euiFormControlLayout"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
                 <div
                   className="euiFormControlLayout__childrenWrapper"
@@ -98,7 +98,7 @@ Array [
                     aria-describedby="random_html_id-help-0"
                     aria-haspopup="true"
                     aria-labelledby="random_html_id random_html_id"
-                    className="euiSuperSelectControl"
+                    className="euiSuperSelectControl euiSuperSelectControl--compressed"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -115,7 +115,7 @@ Array [
                     >
                       <svg
                         aria-hidden={true}
-                        className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                        className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                         focusable="false"
                         height={16}
                         role="img"
@@ -161,7 +161,7 @@ Array [
     className="euiSpacer euiSpacer--s"
   />,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -229,7 +229,7 @@ Array [
                 value="skipping"
               />,
               <div
-                className="euiFormControlLayout"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
                 <div
                   className="euiFormControlLayout__childrenWrapper"
@@ -244,7 +244,7 @@ Array [
                     aria-describedby="random_html_id-help-0"
                     aria-haspopup="true"
                     aria-labelledby="random_html_id random_html_id"
-                    className="euiSuperSelectControl"
+                    className="euiSuperSelectControl euiSuperSelectControl--compressed"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -261,7 +261,7 @@ Array [
                     >
                       <svg
                         aria-hidden={true}
-                        className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                        className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                         focusable="false"
                         height={16}
                         role="img"
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/preview_sql_defintion.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/preview_sql_defintion.test.tsx.snap
index 802f07f9e8..96c6ac6787 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/preview_sql_defintion.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/preview_sql_defintion.test.tsx.snap
@@ -67,7 +67,7 @@ exports[`Preview SQL acceleration components renders Preview SQL settings with d
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              className="euiButton euiButton--success"
+              className="euiButton euiButton--success euiButton--small"
               disabled={false}
               onClick={[Function]}
               style={
@@ -181,7 +181,7 @@ exports[`Preview SQL acceleration components renders Preview SQL settings with d
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              className="euiButton euiButton--success"
+              className="euiButton euiButton--success euiButton--small"
               disabled={false}
               onClick={[Function]}
               style={
@@ -296,7 +296,7 @@ exports[`Preview SQL acceleration components renders Preview SQL settings with e
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              className="euiButton euiButton--success"
+              className="euiButton euiButton--success euiButton--small"
               disabled={false}
               onClick={[Function]}
               style={
@@ -411,7 +411,7 @@ exports[`Preview SQL acceleration components renders Preview SQL settings with m
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              className="euiButton euiButton--success"
+              className="euiButton euiButton--success euiButton--small"
               disabled={false}
               onClick={[Function]}
               style={
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/source_selector.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/source_selector.test.tsx.snap
index 379583fb4e..b9a4d9c58c 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/source_selector.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/source_selector.test.tsx.snap
@@ -41,7 +41,7 @@ Array [
     className="euiSpacer euiSpacer--m"
   />,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -71,18 +71,18 @@ Array [
           <div
             aria-expanded={false}
             aria-haspopup="listbox"
-            className="euiComboBox"
+            className="euiComboBox euiComboBox--compressed"
             onKeyDown={[Function]}
             role="combobox"
           >
             <div
-              className="euiFormControlLayout"
+              className="euiFormControlLayout euiFormControlLayout--compressed"
             >
               <div
                 className="euiFormControlLayout__childrenWrapper"
               >
                 <div
-                  className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
+                  className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap"
                   data-test-subj="comboBoxInput"
                   onClick={[Function]}
                   tabIndex={-1}
@@ -145,7 +145,7 @@ Array [
                   >
                     <svg
                       aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                      className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height={16}
                       role="img"
@@ -200,7 +200,7 @@ Array [
     </div>
   </div>,
   <div
-    className="euiFormRow"
+    className="euiFormRow euiFormRow--compressed"
     id="random_html_id-row"
   >
     <div
@@ -230,18 +230,18 @@ Array [
           <div
             aria-expanded={false}
             aria-haspopup="listbox"
-            className="euiComboBox"
+            className="euiComboBox euiComboBox--compressed"
             onKeyDown={[Function]}
             role="combobox"
           >
             <div
-              className="euiFormControlLayout"
+              className="euiFormControlLayout euiFormControlLayout--compressed"
             >
               <div
                 className="euiFormControlLayout__childrenWrapper"
               >
                 <div
-                  className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
+                  className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap"
                   data-test-subj="comboBoxInput"
                   onClick={[Function]}
                   tabIndex={-1}
@@ -304,7 +304,7 @@ Array [
                   >
                     <svg
                       aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                      className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height={16}
                       role="img"
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/__tests__/__snapshots__/query_visual_editor.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/__tests__/__snapshots__/query_visual_editor.test.tsx.snap
index 628a20254d..3c065ddd83 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/__tests__/__snapshots__/query_visual_editor.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/__tests__/__snapshots__/query_visual_editor.test.tsx.snap
@@ -263,7 +263,7 @@ Array [
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              className="euiButton euiButton--primary"
+              className="euiButton euiButton--primary euiButton--small"
               disabled={false}
               onClick={[Function]}
               style={
@@ -288,7 +288,7 @@ Array [
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              className="euiButton euiButton--danger"
+              className="euiButton euiButton--danger euiButton--small"
               disabled={false}
               onClick={[Function]}
               style={
@@ -316,7 +316,7 @@ Array [
       >
         Array [
           <button
-            className="euiButton euiButton--primary"
+            className="euiButton euiButton--primary euiButton--small"
             disabled={false}
             onClick={[Function]}
             style={
@@ -701,14 +701,14 @@ Array [
                   className="euiTableCellContent euiTableCellContent--overflowingContent"
                 >
                   <div
-                    className="euiFormControlLayout"
+                    className="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <select
                         aria-label="Use aria labels when no actual label is in use"
-                        className="euiSelect"
+                        className="euiSelect euiSelect--compressed"
                         id="selectDocExample"
                         onChange={[Function]}
                         onMouseUp={[Function]}
@@ -741,7 +741,7 @@ Array [
                         >
                           <svg
                             aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                             focusable="false"
                             height={16}
                             role="img"
@@ -778,7 +778,7 @@ Array [
                   className="euiTableCellContent euiTableCellContent--overflowingContent"
                 >
                   <button
-                    className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall"
+                    className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small"
                     disabled={false}
                     onClick={[Function]}
                     type="button"
@@ -871,14 +871,14 @@ Array [
                   className="euiTableCellContent euiTableCellContent--overflowingContent"
                 >
                   <div
-                    className="euiFormControlLayout"
+                    className="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <select
                         aria-label="Use aria labels when no actual label is in use"
-                        className="euiSelect"
+                        className="euiSelect euiSelect--compressed"
                         id="selectDocExample"
                         onChange={[Function]}
                         onMouseUp={[Function]}
@@ -917,7 +917,7 @@ Array [
                         >
                           <svg
                             aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                             focusable="false"
                             height={16}
                             role="img"
@@ -954,7 +954,7 @@ Array [
                   className="euiTableCellContent euiTableCellContent--overflowingContent"
                 >
                   <button
-                    className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall"
+                    className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small"
                     disabled={false}
                     onClick={[Function]}
                     type="button"
@@ -1134,7 +1134,7 @@ Array [
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              className="euiButton euiButton--primary"
+              className="euiButton euiButton--primary euiButton--small"
               disabled={false}
               onClick={[Function]}
               style={
@@ -1159,7 +1159,7 @@ Array [
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              className="euiButton euiButton--danger"
+              className="euiButton euiButton--danger euiButton--small"
               disabled={false}
               onClick={[Function]}
               style={
@@ -1187,7 +1187,7 @@ Array [
       >
         Array [
           <button
-            className="euiButton euiButton--primary"
+            className="euiButton euiButton--primary euiButton--small"
             disabled={false}
             onClick={[Function]}
             style={
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/materialized_view/__tests__/__snapshots__/column_expression.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/materialized_view/__tests__/__snapshots__/column_expression.test.tsx.snap
index 8812acbe2d..c28ceb1331 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/materialized_view/__tests__/__snapshots__/column_expression.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/materialized_view/__tests__/__snapshots__/column_expression.test.tsx.snap
@@ -63,7 +63,7 @@ exports[`Column expression components in materialized view renders column expres
     >
       <button
         aria-label="delete-column-expression"
-        className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall"
+        className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small"
         disabled={false}
         onClick={[Function]}
         type="button"
@@ -152,7 +152,7 @@ exports[`Column expression components in materialized view renders column expres
     >
       <button
         aria-label="delete-column-expression"
-        className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall"
+        className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small"
         disabled={false}
         onClick={[Function]}
         type="button"
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/add_fields_modal.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/add_fields_modal.test.tsx.snap
index 4ddc4bc212..f1ee69a233 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/add_fields_modal.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/add_fields_modal.test.tsx.snap
@@ -305,7 +305,7 @@ exports[`Add fields modal in skipping index renders add fields modal in skipping
               class="euiModalFooter"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 type="button"
               >
                 <span
@@ -319,7 +319,7 @@ exports[`Add fields modal in skipping index renders add fields modal in skipping
                 </span>
               </button>
               <button
-                class="euiButton euiButton--primary euiButton--fill"
+                class="euiButton euiButton--primary euiButton--small euiButton--fill"
                 type="button"
               >
                 <span
@@ -699,7 +699,7 @@ exports[`Add fields modal in skipping index renders add fields modal in skipping
               className="euiModalFooter"
             >
               <button
-                className="euiButton euiButton--primary"
+                className="euiButton euiButton--primary euiButton--small"
                 disabled={false}
                 onClick={[Function]}
                 style={
@@ -720,7 +720,7 @@ exports[`Add fields modal in skipping index renders add fields modal in skipping
                 </span>
               </button>
               <button
-                className="euiButton euiButton--primary euiButton--fill"
+                className="euiButton euiButton--primary euiButton--small euiButton--fill"
                 disabled={false}
                 onClick={[Function]}
                 style={
@@ -1071,7 +1071,7 @@ exports[`Add fields modal in skipping index renders add fields modal in skipping
               class="euiModalFooter"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 type="button"
               >
                 <span
@@ -1085,7 +1085,7 @@ exports[`Add fields modal in skipping index renders add fields modal in skipping
                 </span>
               </button>
               <button
-                class="euiButton euiButton--primary euiButton--fill"
+                class="euiButton euiButton--primary euiButton--small euiButton--fill"
                 type="button"
               >
                 <span
@@ -1466,7 +1466,7 @@ exports[`Add fields modal in skipping index renders add fields modal in skipping
               className="euiModalFooter"
             >
               <button
-                className="euiButton euiButton--primary"
+                className="euiButton euiButton--primary euiButton--small"
                 disabled={false}
                 onClick={[Function]}
                 style={
@@ -1487,7 +1487,7 @@ exports[`Add fields modal in skipping index renders add fields modal in skipping
                 </span>
               </button>
               <button
-                className="euiButton euiButton--primary euiButton--fill"
+                className="euiButton euiButton--primary euiButton--small euiButton--fill"
                 disabled={false}
                 onClick={[Function]}
                 style={
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/delete_fields_modal.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/delete_fields_modal.test.tsx.snap
index f6ff424f00..1f3054ea61 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/delete_fields_modal.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/delete_fields_modal.test.tsx.snap
@@ -330,7 +330,7 @@ exports[`Delete fields modal in skipping index renders delete fields modal in sk
               class="euiModalFooter"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 type="button"
               >
                 <span
@@ -344,7 +344,7 @@ exports[`Delete fields modal in skipping index renders delete fields modal in sk
                 </span>
               </button>
               <button
-                class="euiButton euiButton--danger euiButton--fill"
+                class="euiButton euiButton--danger euiButton--small euiButton--fill"
                 type="button"
               >
                 <span
@@ -755,7 +755,7 @@ exports[`Delete fields modal in skipping index renders delete fields modal in sk
               className="euiModalFooter"
             >
               <button
-                className="euiButton euiButton--primary"
+                className="euiButton euiButton--primary euiButton--small"
                 disabled={false}
                 onClick={[Function]}
                 style={
@@ -776,7 +776,7 @@ exports[`Delete fields modal in skipping index renders delete fields modal in sk
                 </span>
               </button>
               <button
-                className="euiButton euiButton--danger euiButton--fill"
+                className="euiButton euiButton--danger euiButton--small euiButton--fill"
                 disabled={false}
                 onClick={[Function]}
                 style={
@@ -1426,7 +1426,7 @@ exports[`Delete fields modal in skipping index renders delete fields modal in sk
               class="euiModalFooter"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 type="button"
               >
                 <span
@@ -1440,7 +1440,7 @@ exports[`Delete fields modal in skipping index renders delete fields modal in sk
                 </span>
               </button>
               <button
-                class="euiButton euiButton--danger euiButton--fill"
+                class="euiButton euiButton--danger euiButton--small euiButton--fill"
                 type="button"
               >
                 <span
@@ -2167,7 +2167,7 @@ exports[`Delete fields modal in skipping index renders delete fields modal in sk
               className="euiModalFooter"
             >
               <button
-                className="euiButton euiButton--primary"
+                className="euiButton euiButton--primary euiButton--small"
                 disabled={false}
                 onClick={[Function]}
                 style={
@@ -2188,7 +2188,7 @@ exports[`Delete fields modal in skipping index renders delete fields modal in sk
                 </span>
               </button>
               <button
-                className="euiButton euiButton--danger euiButton--fill"
+                className="euiButton euiButton--danger euiButton--small euiButton--fill"
                 disabled={false}
                 onClick={[Function]}
                 style={
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/generate_fields.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/generate_fields.test.tsx.snap
index decdb88aaa..9dadec708b 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/generate_fields.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/generate_fields.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`Generate fields in skipping index Generate fields in skipping index with default options 1`] = `
 Array [
   <button
-    className="euiButton euiButton--primary"
+    className="euiButton euiButton--primary euiButton--small"
     disabled={false}
     onClick={[Function]}
     style={
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/skipping_index_builder.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/skipping_index_builder.test.tsx.snap
index 669a7fe70c..55bfa3b062 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/skipping_index_builder.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/skipping_index_builder.test.tsx.snap
@@ -173,7 +173,7 @@ Array [
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <button
-            className="euiButton euiButton--primary"
+            className="euiButton euiButton--primary euiButton--small"
             disabled={false}
             onClick={[Function]}
             style={
@@ -198,7 +198,7 @@ Array [
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <button
-            className="euiButton euiButton--danger"
+            className="euiButton euiButton--danger euiButton--small"
             disabled={false}
             onClick={[Function]}
             style={
@@ -226,7 +226,7 @@ Array [
     >
       Array [
         <button
-          className="euiButton euiButton--primary"
+          className="euiButton euiButton--primary euiButton--small"
           disabled={false}
           onClick={[Function]}
           style={
@@ -455,14 +455,14 @@ Array [
                 className="euiTableCellContent euiTableCellContent--overflowingContent"
               >
                 <div
-                  className="euiFormControlLayout"
+                  className="euiFormControlLayout euiFormControlLayout--compressed"
                 >
                   <div
                     className="euiFormControlLayout__childrenWrapper"
                   >
                     <select
                       aria-label="Use aria labels when no actual label is in use"
-                      className="euiSelect"
+                      className="euiSelect euiSelect--compressed"
                       id="selectDocExample"
                       onChange={[Function]}
                       onMouseUp={[Function]}
@@ -495,7 +495,7 @@ Array [
                       >
                         <svg
                           aria-hidden={true}
-                          className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                          className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                           focusable="false"
                           height={16}
                           role="img"
@@ -532,7 +532,7 @@ Array [
                 className="euiTableCellContent euiTableCellContent--overflowingContent"
               >
                 <button
-                  className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall"
+                  className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small"
                   disabled={false}
                   onClick={[Function]}
                   type="button"
@@ -625,14 +625,14 @@ Array [
                 className="euiTableCellContent euiTableCellContent--overflowingContent"
               >
                 <div
-                  className="euiFormControlLayout"
+                  className="euiFormControlLayout euiFormControlLayout--compressed"
                 >
                   <div
                     className="euiFormControlLayout__childrenWrapper"
                   >
                     <select
                       aria-label="Use aria labels when no actual label is in use"
-                      className="euiSelect"
+                      className="euiSelect euiSelect--compressed"
                       id="selectDocExample"
                       onChange={[Function]}
                       onMouseUp={[Function]}
@@ -671,7 +671,7 @@ Array [
                       >
                         <svg
                           aria-hidden={true}
-                          className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                          className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                           focusable="false"
                           height={16}
                           role="img"
@@ -708,7 +708,7 @@ Array [
                 className="euiTableCellContent euiTableCellContent--overflowingContent"
               >
                 <button
-                  className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall"
+                  className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small"
                   disabled={false}
                   onClick={[Function]}
                   type="button"
@@ -888,7 +888,7 @@ Array [
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <button
-            className="euiButton euiButton--primary"
+            className="euiButton euiButton--primary euiButton--small"
             disabled={false}
             onClick={[Function]}
             style={
@@ -913,7 +913,7 @@ Array [
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <button
-            className="euiButton euiButton--danger"
+            className="euiButton euiButton--danger euiButton--small"
             disabled={false}
             onClick={[Function]}
             style={
@@ -941,7 +941,7 @@ Array [
     >
       Array [
         <button
-          className="euiButton euiButton--primary"
+          className="euiButton euiButton--primary euiButton--small"
           disabled={false}
           onClick={[Function]}
           style={
diff --git a/public/components/event_analytics/explorer/events_views/__tests__/__snapshots__/flyout_button.test.tsx.snap b/public/components/event_analytics/explorer/events_views/__tests__/__snapshots__/flyout_button.test.tsx.snap
index ef81a5b967..3aee6f2fd7 100644
--- a/public/components/event_analytics/explorer/events_views/__tests__/__snapshots__/flyout_button.test.tsx.snap
+++ b/public/components/event_analytics/explorer/events_views/__tests__/__snapshots__/flyout_button.test.tsx.snap
@@ -17,50 +17,57 @@ exports[`Datagrid Doc viewer row component Renders Doc viewer row component 1`]
     ]
   }
 >
-  <EuiButtonIcon
+  <EuiSmallButtonIcon
     aria-label="inspect document details"
     iconType="inspect"
     onClick={[Function]}
   >
-    <button
+    <EuiButtonIcon
       aria-label="inspect document details"
-      className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-      disabled={false}
+      iconType="inspect"
       onClick={[Function]}
-      type="button"
+      size="s"
     >
-      <EuiIcon
-        aria-hidden="true"
-        className="euiButtonIcon__icon"
-        color="inherit"
-        size="m"
-        type="inspect"
+      <button
+        aria-label="inspect document details"
+        className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+        disabled={false}
+        onClick={[Function]}
+        type="button"
       >
-        <EuiIconBeaker
-          aria-hidden={true}
-          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-          focusable="false"
-          role="img"
-          style={null}
+        <EuiIcon
+          aria-hidden="true"
+          className="euiButtonIcon__icon"
+          color="inherit"
+          size="m"
+          type="inspect"
         >
-          <svg
+          <EuiIconBeaker
             aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
             focusable="false"
-            height={16}
             role="img"
             style={null}
-            viewBox="0 0 16 16"
-            width={16}
-            xmlns="http://www.w3.org/2000/svg"
           >
-            <path
-              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-            />
-          </svg>
-        </EuiIconBeaker>
-      </EuiIcon>
-    </button>
-  </EuiButtonIcon>
+            <svg
+              aria-hidden={true}
+              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+              focusable="false"
+              height={16}
+              role="img"
+              style={null}
+              viewBox="0 0 16 16"
+              width={16}
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+              />
+            </svg>
+          </EuiIconBeaker>
+        </EuiIcon>
+      </button>
+    </EuiButtonIcon>
+  </EuiSmallButtonIcon>
 </ForwardRef>
 `;
diff --git a/public/components/event_analytics/explorer/log_patterns/__tests__/__snapshots__/patterns_header.test.tsx.snap b/public/components/event_analytics/explorer/log_patterns/__tests__/__snapshots__/patterns_header.test.tsx.snap
index 681b600aed..482927d593 100644
--- a/public/components/event_analytics/explorer/log_patterns/__tests__/__snapshots__/patterns_header.test.tsx.snap
+++ b/public/components/event_analytics/explorer/log_patterns/__tests__/__snapshots__/patterns_header.test.tsx.snap
@@ -66,7 +66,7 @@ exports[`Patterns header component Renders header of log patterns 1`] = `
           <EuiPopover
             anchorPosition="upCenter"
             button={
-              <EuiButtonIcon
+              <EuiSmallButtonIcon
                 iconType="gear"
                 onClick={[Function]}
               />
@@ -84,49 +84,55 @@ exports[`Patterns header component Renders header of log patterns 1`] = `
               <div
                 className="euiPopover__anchor"
               >
-                <EuiButtonIcon
+                <EuiSmallButtonIcon
                   iconType="gear"
                   onClick={[Function]}
                 >
-                  <button
-                    className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                    disabled={false}
+                  <EuiButtonIcon
+                    iconType="gear"
                     onClick={[Function]}
-                    type="button"
+                    size="s"
                   >
-                    <EuiIcon
-                      aria-hidden="true"
-                      className="euiButtonIcon__icon"
-                      color="inherit"
-                      size="m"
-                      type="gear"
+                    <button
+                      className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                      disabled={false}
+                      onClick={[Function]}
+                      type="button"
                     >
-                      <EuiIconBeaker
-                        aria-hidden={true}
-                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                        focusable="false"
-                        role="img"
-                        style={null}
+                      <EuiIcon
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        color="inherit"
+                        size="m"
+                        type="gear"
                       >
-                        <svg
+                        <EuiIconBeaker
                           aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
-                          height={16}
                           role="img"
                           style={null}
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          <path
-                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                          />
-                        </svg>
-                      </EuiIconBeaker>
-                    </EuiIcon>
-                  </button>
-                </EuiButtonIcon>
+                          <svg
+                            aria-hidden={true}
+                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                            focusable="false"
+                            height={16}
+                            role="img"
+                            style={null}
+                            viewBox="0 0 16 16"
+                            width={16}
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
+                        </EuiIconBeaker>
+                      </EuiIcon>
+                    </button>
+                  </EuiButtonIcon>
+                </EuiSmallButtonIcon>
               </div>
               <EuiPortal>
                 <Portal
@@ -180,21 +186,21 @@ exports[`Patterns header component Renders header of log patterns 1`] = `
                               class="euiSpacer euiSpacer--s"
                             />
                             <div
-                              class="euiFormRow"
+                              class="euiFormRow euiFormRow--compressed"
                               id="random_html_id-row"
                             >
                               <div
                                 class="euiFormRow__fieldWrapper"
                               >
                                 <div
-                                  class="euiFormControlLayout"
+                                  class="euiFormControlLayout euiFormControlLayout--compressed"
                                 >
                                   <div
                                     class="euiFormControlLayout__childrenWrapper"
                                   >
                                     <input
                                       aria-describedby="random_html_id-help-0"
-                                      class="euiFieldText"
+                                      class="euiFieldText euiFieldText--compressed"
                                       id="random_html_id"
                                       type="text"
                                       value="[a-zA-Zd]"
@@ -497,9 +503,9 @@ exports[`Patterns header component Renders header of log patterns 1`] = `
                                           className="euiSpacer euiSpacer--s"
                                         />
                                       </EuiSpacer>
-                                      <EuiFormRow
+                                      <EuiCompressedFormRow
                                         describedByIds={Array []}
-                                        display="row"
+                                        display="rowCompressed"
                                         fullWidth={false}
                                         hasChildLabel={true}
                                         hasEmptyLabelSpace={false}
@@ -520,13 +526,13 @@ exports[`Patterns header component Renders header of log patterns 1`] = `
                                         labelType="label"
                                       >
                                         <div
-                                          className="euiFormRow"
+                                          className="euiFormRow euiFormRow--compressed"
                                           id="random_html_id-row"
                                         >
                                           <div
                                             className="euiFormRow__fieldWrapper"
                                           >
-                                            <EuiFieldText
+                                            <EuiCompressedFieldText
                                               aria-describedby="random_html_id-help-0"
                                               id="random_html_id"
                                               onBlur={[Function]}
@@ -534,33 +540,46 @@ exports[`Patterns header component Renders header of log patterns 1`] = `
                                               onFocus={[Function]}
                                               value="[a-zA-Zd]"
                                             >
-                                              <EuiFormControlLayout
-                                                fullWidth={false}
-                                                inputId="random_html_id"
+                                              <EuiFieldText
+                                                aria-describedby="random_html_id-help-0"
+                                                compressed={true}
+                                                id="random_html_id"
+                                                onBlur={[Function]}
+                                                onChange={[Function]}
+                                                onFocus={[Function]}
+                                                value="[a-zA-Zd]"
                                               >
-                                                <div
-                                                  className="euiFormControlLayout"
+                                                <EuiFormControlLayout
+                                                  compressed={true}
+                                                  fullWidth={false}
+                                                  inputId="random_html_id"
                                                 >
                                                   <div
-                                                    className="euiFormControlLayout__childrenWrapper"
+                                                    className="euiFormControlLayout euiFormControlLayout--compressed"
                                                   >
-                                                    <EuiValidatableControl>
-                                                      <input
-                                                        aria-describedby="random_html_id-help-0"
-                                                        className="euiFieldText"
-                                                        id="random_html_id"
-                                                        onBlur={[Function]}
-                                                        onChange={[Function]}
-                                                        onFocus={[Function]}
-                                                        type="text"
-                                                        value="[a-zA-Zd]"
+                                                    <div
+                                                      className="euiFormControlLayout__childrenWrapper"
+                                                    >
+                                                      <EuiValidatableControl>
+                                                        <input
+                                                          aria-describedby="random_html_id-help-0"
+                                                          className="euiFieldText euiFieldText--compressed"
+                                                          id="random_html_id"
+                                                          onBlur={[Function]}
+                                                          onChange={[Function]}
+                                                          onFocus={[Function]}
+                                                          type="text"
+                                                          value="[a-zA-Zd]"
+                                                        />
+                                                      </EuiValidatableControl>
+                                                      <EuiFormControlLayoutIcons
+                                                        compressed={true}
                                                       />
-                                                    </EuiValidatableControl>
-                                                    <EuiFormControlLayoutIcons />
+                                                    </div>
                                                   </div>
-                                                </div>
-                                              </EuiFormControlLayout>
-                                            </EuiFieldText>
+                                                </EuiFormControlLayout>
+                                              </EuiFieldText>
+                                            </EuiCompressedFieldText>
                                             <EuiFormHelpText
                                               className="euiFormRow__text"
                                               id="random_html_id-help-0"
@@ -641,7 +660,7 @@ exports[`Patterns header component Renders header of log patterns 1`] = `
                                             </EuiFormHelpText>
                                           </div>
                                         </div>
-                                      </EuiFormRow>
+                                      </EuiCompressedFormRow>
                                       <EuiPopoverFooter>
                                         <div
                                           className="euiPopoverFooter"
diff --git a/public/components/event_analytics/explorer/save_panel/__tests__/__snapshots__/save_panel.test.tsx.snap b/public/components/event_analytics/explorer/save_panel/__tests__/__snapshots__/save_panel.test.tsx.snap
index bb9969e7c4..ff2d388153 100644
--- a/public/components/event_analytics/explorer/save_panel/__tests__/__snapshots__/save_panel.test.tsx.snap
+++ b/public/components/event_analytics/explorer/save_panel/__tests__/__snapshots__/save_panel.test.tsx.snap
@@ -61,9 +61,9 @@ exports[`Saved query table component Renders saved query table 1`] = `
         Custom operational dashboards/application
       </h3>
     </EuiTitle>
-    <EuiFormRow
+    <EuiCompressedFormRow
       describedByIds={Array []}
-      display="row"
+      display="rowCompressed"
       fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
@@ -71,16 +71,16 @@ exports[`Saved query table component Renders saved query table 1`] = `
       labelType="label"
     >
       <div
-        className="euiFormRow"
+        className="euiFormRow euiFormRow--compressed"
         id="random_html_id-row"
       >
         <div
           className="euiFormRow__fieldWrapper"
         >
-          <EuiComboBox
+          <EuiCompressedComboBox
             aria-describedby="random_html_id-help-0"
             async={false}
-            compressed={false}
+            compressed={true}
             data-test-subj="eventExplorer__querySaveComboBox"
             fullWidth={false}
             id="random_html_id"
@@ -123,14 +123,14 @@ exports[`Saved query table component Renders saved query table 1`] = `
               aria-describedby="random_html_id-help-0"
               aria-expanded={false}
               aria-haspopup="listbox"
-              className="euiComboBox"
+              className="euiComboBox euiComboBox--compressed"
               data-test-subj="eventExplorer__querySaveComboBox"
               onKeyDown={[Function]}
               role="combobox"
             >
               <EuiComboBoxInput
                 autoSizeInputRef={[Function]}
-                compressed={false}
+                compressed={true}
                 fullWidth={false}
                 hasSelectedOptions={true}
                 id="random_html_id"
@@ -185,7 +185,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
                       "onClick": [Function],
                     }
                   }
-                  compressed={false}
+                  compressed={true}
                   fullWidth={false}
                   icon={
                     Object {
@@ -200,13 +200,13 @@ exports[`Saved query table component Renders saved query table 1`] = `
                   }
                 >
                   <div
-                    className="euiFormControlLayout"
+                    className="euiFormControlLayout euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <div
-                        className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isClearable"
+                        className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isClearable"
                         data-test-subj="comboBoxInput"
                         onClick={[Function]}
                         tabIndex={-1}
@@ -354,7 +354,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
                             "onClick": [Function],
                           }
                         }
-                        compressed={false}
+                        compressed={true}
                         icon={
                           Object {
                             "aria-label": "Open list of options",
@@ -373,7 +373,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
                           <EuiFormControlLayoutClearButton
                             data-test-subj="comboBoxClearButton"
                             onClick={[Function]}
-                            size="m"
+                            size="s"
                           >
                             <EuiI18n
                               default="Clear input"
@@ -381,7 +381,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
                             >
                               <button
                                 aria-label="Clear input"
-                                className="euiFormControlLayoutClearButton"
+                                className="euiFormControlLayoutClearButton euiFormControlLayoutClearButton--small"
                                 data-test-subj="comboBoxClearButton"
                                 onClick={[Function]}
                                 type="button"
@@ -422,7 +422,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
                             data-test-subj="comboBoxToggleListButton"
                             iconRef={[Function]}
                             onClick={[Function]}
-                            size="m"
+                            size="s"
                             type="arrowDown"
                           >
                             <button
@@ -435,19 +435,19 @@ exports[`Saved query table component Renders saved query table 1`] = `
                               <EuiIcon
                                 aria-hidden="true"
                                 className="euiFormControlLayoutCustomIcon__icon"
-                                size="m"
+                                size="s"
                                 type="arrowDown"
                               >
                                 <EuiIconBeaker
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   role="img"
                                   style={null}
                                 >
                                   <svg
                                     aria-hidden={true}
-                                    className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                    className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height={16}
                                     role="img"
@@ -471,7 +471,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
                 </EuiFormControlLayout>
               </EuiComboBoxInput>
             </div>
-          </EuiComboBox>
+          </EuiCompressedComboBox>
           <EuiFormHelpText
             className="euiFormRow__text"
             id="random_html_id-help-0"
@@ -486,7 +486,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
           </EuiFormHelpText>
         </div>
       </div>
-    </EuiFormRow>
+    </EuiCompressedFormRow>
     <EuiTitle
       size="xxs"
     >
@@ -496,9 +496,9 @@ exports[`Saved query table component Renders saved query table 1`] = `
         Name
       </h3>
     </EuiTitle>
-    <EuiFormRow
+    <EuiCompressedFormRow
       describedByIds={Array []}
-      display="row"
+      display="rowCompressed"
       fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
@@ -506,13 +506,13 @@ exports[`Saved query table component Renders saved query table 1`] = `
       labelType="label"
     >
       <div
-        className="euiFormRow"
+        className="euiFormRow euiFormRow--compressed"
         id="random_html_id-row"
       >
         <div
           className="euiFormRow__fieldWrapper"
         >
-          <EuiFieldText
+          <EuiCompressedFieldText
             aria-describedby="random_html_id-help-0"
             data-test-subj="eventExplorer__querySaveName"
             id="random_html_id"
@@ -523,36 +523,51 @@ exports[`Saved query table component Renders saved query table 1`] = `
             onFocus={[Function]}
             value="Count by depature"
           >
-            <EuiFormControlLayout
-              fullWidth={false}
-              inputId="random_html_id"
+            <EuiFieldText
+              aria-describedby="random_html_id-help-0"
+              compressed={true}
+              data-test-subj="eventExplorer__querySaveName"
+              id="random_html_id"
+              isInvalid={false}
+              onBlur={[Function]}
+              onChange={[Function]}
+              onFocus={[Function]}
+              value="Count by depature"
             >
-              <div
-                className="euiFormControlLayout"
+              <EuiFormControlLayout
+                compressed={true}
+                fullWidth={false}
+                inputId="random_html_id"
               >
                 <div
-                  className="euiFormControlLayout__childrenWrapper"
+                  className="euiFormControlLayout euiFormControlLayout--compressed"
                 >
-                  <EuiValidatableControl
-                    isInvalid={false}
+                  <div
+                    className="euiFormControlLayout__childrenWrapper"
                   >
-                    <input
-                      aria-describedby="random_html_id-help-0"
-                      className="euiFieldText"
-                      data-test-subj="eventExplorer__querySaveName"
-                      id="random_html_id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      type="text"
-                      value="Count by depature"
+                    <EuiValidatableControl
+                      isInvalid={false}
+                    >
+                      <input
+                        aria-describedby="random_html_id-help-0"
+                        className="euiFieldText euiFieldText--compressed"
+                        data-test-subj="eventExplorer__querySaveName"
+                        id="random_html_id"
+                        onBlur={[Function]}
+                        onChange={[Function]}
+                        onFocus={[Function]}
+                        type="text"
+                        value="Count by depature"
+                      />
+                    </EuiValidatableControl>
+                    <EuiFormControlLayoutIcons
+                      compressed={true}
                     />
-                  </EuiValidatableControl>
-                  <EuiFormControlLayoutIcons />
+                  </div>
                 </div>
-              </div>
-            </EuiFormControlLayout>
-          </EuiFieldText>
+              </EuiFormControlLayout>
+            </EuiFieldText>
+          </EuiCompressedFieldText>
           <EuiFormHelpText
             className="euiFormRow__text"
             id="random_html_id-help-0"
@@ -567,7 +582,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
           </EuiFormHelpText>
         </div>
       </div>
-    </EuiFormRow>
+    </EuiCompressedFormRow>
     <EuiFormRow
       describedByIds={Array []}
       display="columnCompressedSwitch"
diff --git a/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/field.test.tsx.snap b/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/field.test.tsx.snap
index 0c780860f0..df2df9cb99 100644
--- a/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/field.test.tsx.snap
+++ b/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/field.test.tsx.snap
@@ -321,7 +321,7 @@ exports[`Field component Renders a sidebar field 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <EuiButtonIcon
+                <EuiSmallButtonIcon
                   aria-label="Remove agent from table"
                   className="dscSidebarField__actionButton"
                   color="danger"
@@ -329,47 +329,57 @@ exports[`Field component Renders a sidebar field 1`] = `
                   iconType="cross"
                   onClick={[Function]}
                 >
-                  <button
+                  <EuiButtonIcon
                     aria-label="Remove agent from table"
-                    className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                    className="dscSidebarField__actionButton"
+                    color="danger"
                     data-test-subj="fieldToggle-agent"
-                    disabled={false}
+                    iconType="cross"
                     onClick={[Function]}
-                    type="button"
+                    size="s"
                   >
-                    <EuiIcon
-                      aria-hidden="true"
-                      className="euiButtonIcon__icon"
-                      color="inherit"
-                      size="m"
-                      type="cross"
+                    <button
+                      aria-label="Remove agent from table"
+                      className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                      data-test-subj="fieldToggle-agent"
+                      disabled={false}
+                      onClick={[Function]}
+                      type="button"
                     >
-                      <EuiIconBeaker
-                        aria-hidden={true}
-                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                        focusable="false"
-                        role="img"
-                        style={null}
+                      <EuiIcon
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        color="inherit"
+                        size="m"
+                        type="cross"
                       >
-                        <svg
+                        <EuiIconBeaker
                           aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
-                          height={16}
                           role="img"
                           style={null}
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          <path
-                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                          />
-                        </svg>
-                      </EuiIconBeaker>
-                    </EuiIcon>
-                  </button>
-                </EuiButtonIcon>
+                          <svg
+                            aria-hidden={true}
+                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                            focusable="false"
+                            height={16}
+                            role="img"
+                            style={null}
+                            viewBox="0 0 16 16"
+                            width={16}
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
+                        </EuiIconBeaker>
+                      </EuiIcon>
+                    </button>
+                  </EuiButtonIcon>
+                </EuiSmallButtonIcon>
               </span>
             </EuiToolTip>
           </div>
diff --git a/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap b/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
index aff341c85c..a9cb087e18 100644
--- a/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
+++ b/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
@@ -1290,7 +1290,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Remove double_per_ip_bytes from table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="danger"
@@ -1298,46 +1298,56 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="cross"
                                                                         isDisabled={true}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Remove double_per_ip_bytes from table"
-                                                                          className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="danger"
                                                                           data-test-subj="fieldToggle-double_per_ip_bytes"
-                                                                          disabled={true}
-                                                                          type="button"
+                                                                          iconType="cross"
+                                                                          isDisabled={true}
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="cross"
+                                                                          <button
+                                                                            aria-label="Remove double_per_ip_bytes from table"
+                                                                            className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-double_per_ip_bytes"
+                                                                            disabled={true}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="cross"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -1696,7 +1706,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Remove host from table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="danger"
@@ -1704,46 +1714,56 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="cross"
                                                                         isDisabled={true}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Remove host from table"
-                                                                          className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="danger"
                                                                           data-test-subj="fieldToggle-host"
-                                                                          disabled={true}
-                                                                          type="button"
+                                                                          iconType="cross"
+                                                                          isDisabled={true}
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="cross"
+                                                                          <button
+                                                                            aria-label="Remove host from table"
+                                                                            className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-host"
+                                                                            disabled={true}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="cross"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -2102,7 +2122,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Remove ip_count from table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="danger"
@@ -2110,46 +2130,56 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="cross"
                                                                         isDisabled={true}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Remove ip_count from table"
-                                                                          className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="danger"
                                                                           data-test-subj="fieldToggle-ip_count"
-                                                                          disabled={true}
-                                                                          type="button"
+                                                                          iconType="cross"
+                                                                          isDisabled={true}
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="cross"
+                                                                          <button
+                                                                            aria-label="Remove ip_count from table"
+                                                                            className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-ip_count"
+                                                                            disabled={true}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="cross"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -2508,7 +2538,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Remove per_ip_bytes from table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="danger"
@@ -2516,46 +2546,56 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="cross"
                                                                         isDisabled={true}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Remove per_ip_bytes from table"
-                                                                          className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="danger"
                                                                           data-test-subj="fieldToggle-per_ip_bytes"
-                                                                          disabled={true}
-                                                                          type="button"
+                                                                          iconType="cross"
+                                                                          isDisabled={true}
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="cross"
+                                                                          <button
+                                                                            aria-label="Remove per_ip_bytes from table"
+                                                                            className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-per_ip_bytes"
+                                                                            disabled={true}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="cross"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -2914,7 +2954,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Remove resp_code from table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="danger"
@@ -2922,46 +2962,56 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="cross"
                                                                         isDisabled={true}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Remove resp_code from table"
-                                                                          className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="danger"
                                                                           data-test-subj="fieldToggle-resp_code"
-                                                                          disabled={true}
-                                                                          type="button"
+                                                                          iconType="cross"
+                                                                          isDisabled={true}
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="cross"
+                                                                          <button
+                                                                            aria-label="Remove resp_code from table"
+                                                                            className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-resp_code"
+                                                                            disabled={true}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="cross"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -3320,7 +3370,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Remove sum_bytes from table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="danger"
@@ -3328,46 +3378,56 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="cross"
                                                                         isDisabled={true}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Remove sum_bytes from table"
-                                                                          className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="danger"
                                                                           data-test-subj="fieldToggle-sum_bytes"
-                                                                          disabled={true}
-                                                                          type="button"
+                                                                          iconType="cross"
+                                                                          isDisabled={true}
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="cross"
+                                                                          <button
+                                                                            aria-label="Remove sum_bytes from table"
+                                                                            className="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-sum_bytes"
+                                                                            disabled={true}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="cross"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -3944,7 +4004,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add agent to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -3952,47 +4012,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add agent to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-agent"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add agent to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-agent"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -4351,7 +4421,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add bytes to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -4359,47 +4429,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add bytes to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-bytes"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add bytes to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-bytes"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -4758,7 +4838,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add clientip to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -4766,47 +4846,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add clientip to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-clientip"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add clientip to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-clientip"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -5165,7 +5255,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add event to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -5173,47 +5263,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add event to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-event"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add event to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-event"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -5632,7 +5732,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add extension to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -5640,47 +5740,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add extension to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-extension"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add extension to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-extension"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -6039,7 +6149,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add geo to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -6047,47 +6157,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add geo to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-geo"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add geo to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-geo"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -6506,7 +6626,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add host to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -6514,47 +6634,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add host to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-host"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add host to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-host"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -6973,7 +7103,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add index to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -6981,47 +7111,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add index to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-index"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add index to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-index"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -7380,7 +7520,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add ip to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -7388,47 +7528,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add ip to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-ip"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add ip to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-ip"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -7787,7 +7937,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add machine to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -7795,47 +7945,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add machine to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-machine"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add machine to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-machine"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -8194,7 +8354,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add memory to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -8202,47 +8362,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add memory to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-memory"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add memory to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-memory"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -8661,7 +8831,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add message to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -8669,47 +8839,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add message to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-message"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
-                                                                          >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                          <button
+                                                                            aria-label="Add message to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-message"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
+                                                                          >
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -9068,7 +9248,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add phpmemory to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -9076,47 +9256,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add phpmemory to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-phpmemory"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add phpmemory to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-phpmemory"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -9535,7 +9725,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add referer to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -9543,47 +9733,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add referer to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-referer"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add referer to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-referer"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -10002,7 +10202,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add request to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -10010,47 +10210,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add request to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-request"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add request to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-request"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -10469,7 +10679,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add response to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -10477,47 +10687,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add response to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-response"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add response to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-response"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -10936,7 +11156,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add tags to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -10944,47 +11164,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add tags to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-tags"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add tags to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-tags"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -11384,7 +11614,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add timestamp to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -11392,47 +11622,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add timestamp to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-timestamp"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add timestamp to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-timestamp"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -11851,7 +12091,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add url to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -11859,47 +12099,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add url to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-url"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add url to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-url"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
@@ -12318,7 +12568,7 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                       onMouseOut={[Function]}
                                                                       onMouseOver={[Function]}
                                                                     >
-                                                                      <EuiButtonIcon
+                                                                      <EuiSmallButtonIcon
                                                                         aria-label="Add utc_time to table"
                                                                         className="dscSidebarField__actionButton"
                                                                         color="primary"
@@ -12326,47 +12576,57 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                         iconType="plusInCircleFilled"
                                                                         onClick={[Function]}
                                                                       >
-                                                                        <button
+                                                                        <EuiButtonIcon
                                                                           aria-label="Add utc_time to table"
-                                                                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall dscSidebarField__actionButton"
+                                                                          className="dscSidebarField__actionButton"
+                                                                          color="primary"
                                                                           data-test-subj="fieldToggle-utc_time"
-                                                                          disabled={false}
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
-                                                                          type="button"
+                                                                          size="s"
                                                                         >
-                                                                          <EuiIcon
-                                                                            aria-hidden="true"
-                                                                            className="euiButtonIcon__icon"
-                                                                            color="inherit"
-                                                                            size="m"
-                                                                            type="plusInCircleFilled"
+                                                                          <button
+                                                                            aria-label="Add utc_time to table"
+                                                                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small dscSidebarField__actionButton"
+                                                                            data-test-subj="fieldToggle-utc_time"
+                                                                            disabled={false}
+                                                                            onClick={[Function]}
+                                                                            type="button"
                                                                           >
-                                                                            <EuiIconBeaker
-                                                                              aria-hidden={true}
-                                                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                              focusable="false"
-                                                                              role="img"
-                                                                              style={null}
+                                                                            <EuiIcon
+                                                                              aria-hidden="true"
+                                                                              className="euiButtonIcon__icon"
+                                                                              color="inherit"
+                                                                              size="m"
+                                                                              type="plusInCircleFilled"
                                                                             >
-                                                                              <svg
+                                                                              <EuiIconBeaker
                                                                                 aria-hidden={true}
                                                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                                                 focusable="false"
-                                                                                height={16}
                                                                                 role="img"
                                                                                 style={null}
-                                                                                viewBox="0 0 16 16"
-                                                                                width={16}
-                                                                                xmlns="http://www.w3.org/2000/svg"
                                                                               >
-                                                                                <path
-                                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                                                />
-                                                                              </svg>
-                                                                            </EuiIconBeaker>
-                                                                          </EuiIcon>
-                                                                        </button>
-                                                                      </EuiButtonIcon>
+                                                                                <svg
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  height={16}
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  viewBox="0 0 16 16"
+                                                                                  width={16}
+                                                                                  xmlns="http://www.w3.org/2000/svg"
+                                                                                >
+                                                                                  <path
+                                                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                                  />
+                                                                                </svg>
+                                                                              </EuiIconBeaker>
+                                                                            </EuiIcon>
+                                                                          </button>
+                                                                        </EuiButtonIcon>
+                                                                      </EuiSmallButtonIcon>
                                                                     </span>
                                                                   </EuiToolTip>
                                                                 </div>
diff --git a/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap b/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap
index 1c8c8ecd68..4268e4b7bf 100644
--- a/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap
+++ b/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap
@@ -671,10 +671,10 @@ exports[`Config panel component Renders config panel with visualization data 1`]
     <div
       className="cp__rightHeader"
     >
-      <EuiComboBox
+      <EuiCompressedComboBox
         aria-label="config chart selector"
         async={false}
-        compressed={false}
+        compressed={true}
         fullWidth={true}
         isClearable={false}
         onChange={[Function]}
@@ -2691,13 +2691,13 @@ exports[`Config panel component Renders config panel with visualization data 1`]
           aria-expanded={false}
           aria-haspopup="listbox"
           aria-label="config chart selector"
-          className="euiComboBox euiComboBox--fullWidth"
+          className="euiComboBox euiComboBox--compressed euiComboBox--fullWidth"
           onKeyDown={[Function]}
           role="combobox"
         >
           <EuiComboBoxInput
             autoSizeInputRef={[Function]}
-            compressed={false}
+            compressed={true}
             fullWidth={true}
             hasSelectedOptions={true}
             inputRef={[Function]}
@@ -3027,7 +3027,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
             value="Vertical bar"
           >
             <EuiFormControlLayout
-              compressed={false}
+              compressed={true}
               fullWidth={true}
               icon={
                 Object {
@@ -3042,13 +3042,13 @@ exports[`Config panel component Renders config panel with visualization data 1`]
               }
             >
               <div
-                className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
               >
                 <div
                   className="euiFormControlLayout__childrenWrapper"
                 >
                   <div
-                    className="euiComboBox__inputWrap euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
+                    className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
                     data-test-subj="comboBoxInput"
                     onClick={[Function]}
                     tabIndex={-1}
@@ -4400,7 +4400,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                     </AutosizeInput>
                   </div>
                   <EuiFormControlLayoutIcons
-                    compressed={false}
+                    compressed={true}
                     icon={
                       Object {
                         "aria-label": "Open list of options",
@@ -4421,7 +4421,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                         data-test-subj="comboBoxToggleListButton"
                         iconRef={[Function]}
                         onClick={[Function]}
-                        size="m"
+                        size="s"
                         type="arrowDown"
                       >
                         <button
@@ -4434,19 +4434,19 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                           <EuiIcon
                             aria-hidden="true"
                             className="euiFormControlLayoutCustomIcon__icon"
-                            size="m"
+                            size="s"
                             type="arrowDown"
                           >
                             <EuiIconBeaker
                               aria-hidden={true}
-                              className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                              className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                               focusable="false"
                               role="img"
                               style={null}
                             >
                               <svg
                                 aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                 focusable="false"
                                 height={16}
                                 role="img"
@@ -4470,7 +4470,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
             </EuiFormControlLayout>
           </EuiComboBoxInput>
         </div>
-      </EuiComboBox>
+      </EuiCompressedComboBox>
     </div>
     <div
       className="cp__rightSettings"
@@ -7350,16 +7350,16 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                   <div
                     className="euiForm visEditorSidebar__form"
                   >
-                    <EuiFormRow
+                    <EuiCompressedFormRow
                       describedByIds={Array []}
-                      display="row"
+                      display="rowCompressed"
                       fullWidth={false}
                       hasChildLabel={true}
                       hasEmptyLabelSpace={false}
                       labelType="label"
                     >
                       <div
-                        className="euiFormRow"
+                        className="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -8114,9 +8114,9 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                           <form
                                             className="euiForm"
                                           >
-                                            <EuiFormRow
+                                            <EuiCompressedFormRow
                                               describedByIds={Array []}
-                                              display="row"
+                                              display="rowCompressed"
                                               fullWidth={true}
                                               hasChildLabel={true}
                                               hasEmptyLabelSpace={false}
@@ -8125,7 +8125,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                               labelType="label"
                                             >
                                               <div
-                                                className="euiFormRow euiFormRow--fullWidth"
+                                                className="euiFormRow euiFormRow--fullWidth euiFormRow--compressed"
                                                 id="random_html_id-row"
                                               >
                                                 <div
@@ -8148,7 +8148,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                                 <div
                                                   className="euiFormRow__fieldWrapper"
                                                 >
-                                                  <EuiFieldText
+                                                  <EuiCompressedFieldText
                                                     aria-describedby="random_html_id-help-0"
                                                     id="random_html_id"
                                                     name="title"
@@ -8158,35 +8158,50 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                                     placeholder="Title"
                                                     value=""
                                                   >
-                                                    <EuiFormControlLayout
-                                                      fullWidth={false}
-                                                      inputId="random_html_id"
+                                                    <EuiFieldText
+                                                      aria-describedby="random_html_id-help-0"
+                                                      compressed={true}
+                                                      id="random_html_id"
+                                                      name="title"
+                                                      onBlur={[Function]}
+                                                      onChange={[Function]}
+                                                      onFocus={[Function]}
+                                                      placeholder="Title"
+                                                      value=""
                                                     >
-                                                      <div
-                                                        className="euiFormControlLayout"
+                                                      <EuiFormControlLayout
+                                                        compressed={true}
+                                                        fullWidth={false}
+                                                        inputId="random_html_id"
                                                       >
                                                         <div
-                                                          className="euiFormControlLayout__childrenWrapper"
+                                                          className="euiFormControlLayout euiFormControlLayout--compressed"
                                                         >
-                                                          <EuiValidatableControl>
-                                                            <input
-                                                              aria-describedby="random_html_id-help-0"
-                                                              className="euiFieldText"
-                                                              id="random_html_id"
-                                                              name="title"
-                                                              onBlur={[Function]}
-                                                              onChange={[Function]}
-                                                              onFocus={[Function]}
-                                                              placeholder="Title"
-                                                              type="text"
-                                                              value=""
+                                                          <div
+                                                            className="euiFormControlLayout__childrenWrapper"
+                                                          >
+                                                            <EuiValidatableControl>
+                                                              <input
+                                                                aria-describedby="random_html_id-help-0"
+                                                                className="euiFieldText euiFieldText--compressed"
+                                                                id="random_html_id"
+                                                                name="title"
+                                                                onBlur={[Function]}
+                                                                onChange={[Function]}
+                                                                onFocus={[Function]}
+                                                                placeholder="Title"
+                                                                type="text"
+                                                                value=""
+                                                              />
+                                                            </EuiValidatableControl>
+                                                            <EuiFormControlLayoutIcons
+                                                              compressed={true}
                                                             />
-                                                          </EuiValidatableControl>
-                                                          <EuiFormControlLayoutIcons />
+                                                          </div>
                                                         </div>
-                                                      </div>
-                                                    </EuiFormControlLayout>
-                                                  </EuiFieldText>
+                                                      </EuiFormControlLayout>
+                                                    </EuiFieldText>
+                                                  </EuiCompressedFieldText>
                                                   <EuiFormHelpText
                                                     className="euiFormRow__text"
                                                     id="random_html_id-help-0"
@@ -8201,10 +8216,10 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                                   </EuiFormHelpText>
                                                 </div>
                                               </div>
-                                            </EuiFormRow>
-                                            <EuiFormRow
+                                            </EuiCompressedFormRow>
+                                            <EuiCompressedFormRow
                                               describedByIds={Array []}
-                                              display="row"
+                                              display="rowCompressed"
                                               fullWidth={false}
                                               hasChildLabel={true}
                                               hasEmptyLabelSpace={false}
@@ -8212,7 +8227,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                               labelType="label"
                                             >
                                               <div
-                                                className="euiFormRow"
+                                                className="euiFormRow euiFormRow--compressed"
                                                 id="random_html_id-row"
                                               >
                                                 <div
@@ -8235,7 +8250,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                                 <div
                                                   className="euiFormRow__fieldWrapper"
                                                 >
-                                                  <EuiTextArea
+                                                  <EuiCompressedTextArea
                                                     aria-label="Use aria labels when no actual label is in use"
                                                     id="random_html_id"
                                                     name="description"
@@ -8245,24 +8260,36 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                                     placeholder="Description"
                                                     value=""
                                                   >
-                                                    <EuiValidatableControl>
-                                                      <textarea
-                                                        aria-label="Use aria labels when no actual label is in use"
-                                                        className="euiTextArea euiTextArea--resizeVertical"
-                                                        id="random_html_id"
-                                                        name="description"
-                                                        onBlur={[Function]}
-                                                        onChange={[Function]}
-                                                        onFocus={[Function]}
-                                                        placeholder="Description"
-                                                        rows={6}
-                                                        value=""
-                                                      />
-                                                    </EuiValidatableControl>
-                                                  </EuiTextArea>
+                                                    <EuiTextArea
+                                                      aria-label="Use aria labels when no actual label is in use"
+                                                      compressed={true}
+                                                      id="random_html_id"
+                                                      name="description"
+                                                      onBlur={[Function]}
+                                                      onChange={[Function]}
+                                                      onFocus={[Function]}
+                                                      placeholder="Description"
+                                                      value=""
+                                                    >
+                                                      <EuiValidatableControl>
+                                                        <textarea
+                                                          aria-label="Use aria labels when no actual label is in use"
+                                                          className="euiTextArea euiTextArea--resizeVertical euiTextArea--compressed"
+                                                          id="random_html_id"
+                                                          name="description"
+                                                          onBlur={[Function]}
+                                                          onChange={[Function]}
+                                                          onFocus={[Function]}
+                                                          placeholder="Description"
+                                                          rows={3}
+                                                          value=""
+                                                        />
+                                                      </EuiValidatableControl>
+                                                    </EuiTextArea>
+                                                  </EuiCompressedTextArea>
                                                 </div>
                                               </div>
-                                            </EuiFormRow>
+                                            </EuiCompressedFormRow>
                                           </form>
                                         </EuiForm>
                                       </div>
@@ -8274,10 +8301,10 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                           </ConfigPanelOptions>
                         </div>
                       </div>
-                    </EuiFormRow>
-                    <EuiFormRow
+                    </EuiCompressedFormRow>
+                    <EuiCompressedFormRow
                       describedByIds={Array []}
-                      display="row"
+                      display="rowCompressed"
                       fullWidth={true}
                       hasChildLabel={true}
                       hasEmptyLabelSpace={false}
@@ -8285,7 +8312,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                       labelType="label"
                     >
                       <div
-                        className="euiFormRow euiFormRow--fullWidth"
+                        className="euiFormRow euiFormRow--fullWidth euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -9753,10 +9780,10 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                           </ConfigTooltip>
                         </div>
                       </div>
-                    </EuiFormRow>
-                    <EuiFormRow
+                    </EuiCompressedFormRow>
+                    <EuiCompressedFormRow
                       describedByIds={Array []}
-                      display="row"
+                      display="rowCompressed"
                       fullWidth={true}
                       hasChildLabel={true}
                       hasEmptyLabelSpace={false}
@@ -9764,7 +9791,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                       labelType="label"
                     >
                       <div
-                        className="euiFormRow euiFormRow--fullWidth"
+                        className="euiFormRow euiFormRow--fullWidth euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -11145,7 +11172,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                               className="euiSpacer euiSpacer--s"
                                             />
                                           </EuiSpacer>
-                                          <EuiFieldNumber
+                                          <EuiCompressedFieldNumber
                                             data-test-subj="valueFieldNumber"
                                             fullWidth={true}
                                             id="random_html_id"
@@ -11154,38 +11181,49 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                             placeholder="auto"
                                             value=""
                                           >
-                                            <EuiFormControlLayout
-                                              compressed={false}
+                                            <EuiFieldNumber
+                                              compressed={true}
+                                              data-test-subj="valueFieldNumber"
                                               fullWidth={true}
-                                              inputId="random_html_id"
-                                              isLoading={false}
+                                              id="random_html_id"
+                                              onBlur={[Function]}
+                                              onChange={[Function]}
+                                              placeholder="auto"
+                                              value=""
                                             >
-                                              <div
-                                                className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                                              <EuiFormControlLayout
+                                                compressed={true}
+                                                fullWidth={true}
+                                                inputId="random_html_id"
+                                                isLoading={false}
                                               >
                                                 <div
-                                                  className="euiFormControlLayout__childrenWrapper"
+                                                  className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                                                 >
-                                                  <EuiValidatableControl>
-                                                    <input
-                                                      className="euiFieldNumber euiFieldNumber--fullWidth"
-                                                      data-test-subj="valueFieldNumber"
-                                                      id="random_html_id"
-                                                      onBlur={[Function]}
-                                                      onChange={[Function]}
-                                                      placeholder="auto"
-                                                      type="number"
-                                                      value=""
+                                                  <div
+                                                    className="euiFormControlLayout__childrenWrapper"
+                                                  >
+                                                    <EuiValidatableControl>
+                                                      <input
+                                                        className="euiFieldNumber euiFieldNumber--fullWidth euiFieldNumber--compressed"
+                                                        data-test-subj="valueFieldNumber"
+                                                        id="random_html_id"
+                                                        onBlur={[Function]}
+                                                        onChange={[Function]}
+                                                        placeholder="auto"
+                                                        type="number"
+                                                        value=""
+                                                      />
+                                                    </EuiValidatableControl>
+                                                    <EuiFormControlLayoutIcons
+                                                      compressed={true}
+                                                      isLoading={false}
                                                     />
-                                                  </EuiValidatableControl>
-                                                  <EuiFormControlLayoutIcons
-                                                    compressed={false}
-                                                    isLoading={false}
-                                                  />
+                                                  </div>
                                                 </div>
-                                              </div>
-                                            </EuiFormControlLayout>
-                                          </EuiFieldNumber>
+                                              </EuiFormControlLayout>
+                                            </EuiFieldNumber>
+                                          </EuiCompressedFieldNumber>
                                         </InputFieldItem>
                                         <EuiSpacer
                                           size="s"
@@ -11203,10 +11241,10 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                           </ConfigLegend>
                         </div>
                       </div>
-                    </EuiFormRow>
-                    <EuiFormRow
+                    </EuiCompressedFormRow>
+                    <EuiCompressedFormRow
                       describedByIds={Array []}
-                      display="row"
+                      display="rowCompressed"
                       fullWidth={true}
                       hasChildLabel={true}
                       hasEmptyLabelSpace={false}
@@ -11214,7 +11252,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                       labelType="label"
                     >
                       <div
-                        className="euiFormRow euiFormRow--fullWidth"
+                        className="euiFormRow euiFormRow--fullWidth euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -12373,7 +12411,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                               className="euiSpacer euiSpacer--s"
                                             />
                                           </EuiSpacer>
-                                          <EuiFieldNumber
+                                          <EuiCompressedFieldNumber
                                             data-test-subj="valueFieldNumber"
                                             fullWidth={true}
                                             id="random_html_id"
@@ -12382,38 +12420,49 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                             placeholder="auto"
                                             value=""
                                           >
-                                            <EuiFormControlLayout
-                                              compressed={false}
+                                            <EuiFieldNumber
+                                              compressed={true}
+                                              data-test-subj="valueFieldNumber"
                                               fullWidth={true}
-                                              inputId="random_html_id"
-                                              isLoading={false}
+                                              id="random_html_id"
+                                              onBlur={[Function]}
+                                              onChange={[Function]}
+                                              placeholder="auto"
+                                              value=""
                                             >
-                                              <div
-                                                className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                                              <EuiFormControlLayout
+                                                compressed={true}
+                                                fullWidth={true}
+                                                inputId="random_html_id"
+                                                isLoading={false}
                                               >
                                                 <div
-                                                  className="euiFormControlLayout__childrenWrapper"
+                                                  className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                                                 >
-                                                  <EuiValidatableControl>
-                                                    <input
-                                                      className="euiFieldNumber euiFieldNumber--fullWidth"
-                                                      data-test-subj="valueFieldNumber"
-                                                      id="random_html_id"
-                                                      onBlur={[Function]}
-                                                      onChange={[Function]}
-                                                      placeholder="auto"
-                                                      type="number"
-                                                      value=""
+                                                  <div
+                                                    className="euiFormControlLayout__childrenWrapper"
+                                                  >
+                                                    <EuiValidatableControl>
+                                                      <input
+                                                        className="euiFieldNumber euiFieldNumber--fullWidth euiFieldNumber--compressed"
+                                                        data-test-subj="valueFieldNumber"
+                                                        id="random_html_id"
+                                                        onBlur={[Function]}
+                                                        onChange={[Function]}
+                                                        placeholder="auto"
+                                                        type="number"
+                                                        value=""
+                                                      />
+                                                    </EuiValidatableControl>
+                                                    <EuiFormControlLayoutIcons
+                                                      compressed={true}
+                                                      isLoading={false}
                                                     />
-                                                  </EuiValidatableControl>
-                                                  <EuiFormControlLayoutIcons
-                                                    compressed={false}
-                                                    isLoading={false}
-                                                  />
+                                                  </div>
                                                 </div>
-                                              </div>
-                                            </EuiFormControlLayout>
-                                          </EuiFieldNumber>
+                                              </EuiFormControlLayout>
+                                            </EuiFieldNumber>
+                                          </EuiCompressedFieldNumber>
                                         </InputFieldItem>
                                         <EuiSpacer
                                           size="s"
@@ -14400,10 +14449,10 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                           </ConfigBarChartStyles>
                         </div>
                       </div>
-                    </EuiFormRow>
-                    <EuiFormRow
+                    </EuiCompressedFormRow>
+                    <EuiCompressedFormRow
                       describedByIds={Array []}
-                      display="row"
+                      display="rowCompressed"
                       fullWidth={true}
                       hasChildLabel={true}
                       hasEmptyLabelSpace={false}
@@ -14411,7 +14460,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                       labelType="label"
                     >
                       <div
-                        className="euiFormRow euiFormRow--fullWidth"
+                        className="euiFormRow euiFormRow--fullWidth euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -15229,7 +15278,7 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                           </ConfigColorTheme>
                         </div>
                       </div>
-                    </EuiFormRow>
+                    </EuiCompressedFormRow>
                   </div>
                 </EuiForm>
               </div>
diff --git a/public/components/event_analytics/home/__tests__/__snapshots__/saved_query_table.test.tsx.snap b/public/components/event_analytics/home/__tests__/__snapshots__/saved_query_table.test.tsx.snap
index b543738ae2..f473f273da 100644
--- a/public/components/event_analytics/home/__tests__/__snapshots__/saved_query_table.test.tsx.snap
+++ b/public/components/event_analytics/home/__tests__/__snapshots__/saved_query_table.test.tsx.snap
@@ -393,6 +393,7 @@ exports[`Saved query table component Renders saved query table 1`] = `
                       <FieldValueSelectionFilter
                         config={
                           Object {
+                            "compressed": undefined,
                             "field": "type",
                             "multiSelect": "or",
                             "name": "Type",
diff --git a/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
index 0c52dc1e85..86d99ea846 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
@@ -227,54 +227,63 @@ exports[`Added Integration View Test Renders added integration view using dummy
                             <div
                               className="euiFlexItem euiFlexItem--flexGrowZero"
                             >
-                              <EuiButtonIcon
+                              <EuiSmallButtonIcon
                                 aria-label="Delete"
                                 color="danger"
                                 data-test-subj="deleteInstanceButton"
                                 iconType="trash"
                                 onClick={[Function]}
                               >
-                                <button
+                                <EuiButtonIcon
                                   aria-label="Delete"
-                                  className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--xSmall"
+                                  color="danger"
                                   data-test-subj="deleteInstanceButton"
-                                  disabled={false}
+                                  iconType="trash"
                                   onClick={[Function]}
-                                  type="button"
+                                  size="s"
                                 >
-                                  <EuiIcon
-                                    aria-hidden="true"
-                                    className="euiButtonIcon__icon"
-                                    color="inherit"
-                                    size="m"
-                                    type="trash"
+                                  <button
+                                    aria-label="Delete"
+                                    className="euiButtonIcon euiButtonIcon--danger euiButtonIcon--empty euiButtonIcon--small"
+                                    data-test-subj="deleteInstanceButton"
+                                    disabled={false}
+                                    onClick={[Function]}
+                                    type="button"
                                   >
-                                    <EuiIconBeaker
-                                      aria-hidden={true}
-                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                      focusable="false"
-                                      role="img"
-                                      style={null}
+                                    <EuiIcon
+                                      aria-hidden="true"
+                                      className="euiButtonIcon__icon"
+                                      color="inherit"
+                                      size="m"
+                                      type="trash"
                                     >
-                                      <svg
+                                      <EuiIconBeaker
                                         aria-hidden={true}
                                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                         focusable="false"
-                                        height={16}
                                         role="img"
                                         style={null}
-                                        viewBox="0 0 16 16"
-                                        width={16}
-                                        xmlns="http://www.w3.org/2000/svg"
                                       >
-                                        <path
-                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                        />
-                                      </svg>
-                                    </EuiIconBeaker>
-                                  </EuiIcon>
-                                </button>
-                              </EuiButtonIcon>
+                                        <svg
+                                          aria-hidden={true}
+                                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                          focusable="false"
+                                          height={16}
+                                          role="img"
+                                          style={null}
+                                          viewBox="0 0 16 16"
+                                          width={16}
+                                          xmlns="http://www.w3.org/2000/svg"
+                                        >
+                                          <path
+                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                          />
+                                        </svg>
+                                      </EuiIconBeaker>
+                                    </EuiIcon>
+                                  </button>
+                                </EuiButtonIcon>
+                              </EuiSmallButtonIcon>
                             </div>
                           </EuiFlexItem>
                         </div>
@@ -700,6 +709,7 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                   <FieldValueSelectionFilter
                                     config={
                                       Object {
+                                        "compressed": undefined,
                                         "field": "assetType",
                                         "multiSelect": false,
                                         "name": "Type",
diff --git a/public/components/integrations/components/__tests__/__snapshots__/added_integration_flyout.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/added_integration_flyout.test.tsx.snap
index c08ba9003e..fd3980b103 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/added_integration_flyout.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/added_integration_flyout.test.tsx.snap
@@ -93,7 +93,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                       >
                         <div>
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -144,14 +144,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                               class="euiFormRow__fieldWrapper"
                             >
                               <div
-                                class="euiFormControlLayout euiFormControlLayout--group"
+                                class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
                                     aria-describedby="random_html_id-help-0"
-                                    class="euiFieldText euiFieldText--inGroup"
+                                    class="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
                                     data-test-subj="data-source-name"
                                     id="random_html_id"
                                     name="first"
@@ -160,7 +160,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                   />
                                 </div>
                                 <button
-                                  class="euiButton euiButton--primary euiButton-isDisabled euiFormControlLayout__append"
+                                  class="euiButton euiButton--primary euiButton--small euiButton-isDisabled euiFormControlLayout__append"
                                   data-test-subj="validateIndex"
                                   disabled=""
                                   type="button"
@@ -185,7 +185,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                             </div>
                           </div>
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--compressed"
                             id="random_html_id-row"
                           >
                             <div
@@ -202,14 +202,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                               class="euiFormRow__fieldWrapper"
                             >
                               <div
-                                class="euiFormControlLayout"
+                                class="euiFormControlLayout euiFormControlLayout--compressed"
                               >
                                 <div
                                   class="euiFormControlLayout__childrenWrapper"
                                 >
                                   <input
                                     aria-describedby="random_html_id-help-0"
-                                    class="euiFieldText"
+                                    class="euiFieldText euiFieldText--compressed"
                                     data-test-subj="new-instance-name"
                                     id="random_html_id"
                                     name="first"
@@ -241,7 +241,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                       class="euiFlexItem"
                     >
                       <button
-                        class="euiButton euiButton--danger"
+                        class="euiButton euiButton--danger euiButton--small"
                         type="button"
                       >
                         <span
@@ -259,7 +259,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                       class="euiFlexItem"
                     >
                       <button
-                        class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                        class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                         data-click-metric-element="integrations.create_from_setup"
                         data-test-subj="createInstanceButton"
                         disabled=""
@@ -428,7 +428,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                               >
                                 <div>
                                   <div
-                                    class="euiFormRow"
+                                    class="euiFormRow euiFormRow--compressed"
                                     id="random_html_id-row"
                                   >
                                     <div
@@ -479,14 +479,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                       class="euiFormRow__fieldWrapper"
                                     >
                                       <div
-                                        class="euiFormControlLayout euiFormControlLayout--group"
+                                        class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                                       >
                                         <div
                                           class="euiFormControlLayout__childrenWrapper"
                                         >
                                           <input
                                             aria-describedby="random_html_id-help-0"
-                                            class="euiFieldText euiFieldText--inGroup"
+                                            class="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
                                             data-test-subj="data-source-name"
                                             id="random_html_id"
                                             name="first"
@@ -495,7 +495,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                           />
                                         </div>
                                         <button
-                                          class="euiButton euiButton--primary euiButton-isDisabled euiFormControlLayout__append"
+                                          class="euiButton euiButton--primary euiButton--small euiButton-isDisabled euiFormControlLayout__append"
                                           data-test-subj="validateIndex"
                                           disabled=""
                                           type="button"
@@ -520,7 +520,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFormRow"
+                                    class="euiFormRow euiFormRow--compressed"
                                     id="random_html_id-row"
                                   >
                                     <div
@@ -537,14 +537,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                       class="euiFormRow__fieldWrapper"
                                     >
                                       <div
-                                        class="euiFormControlLayout"
+                                        class="euiFormControlLayout euiFormControlLayout--compressed"
                                       >
                                         <div
                                           class="euiFormControlLayout__childrenWrapper"
                                         >
                                           <input
                                             aria-describedby="random_html_id-help-0"
-                                            class="euiFieldText"
+                                            class="euiFieldText euiFieldText--compressed"
                                             data-test-subj="new-instance-name"
                                             id="random_html_id"
                                             name="first"
@@ -576,7 +576,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                               class="euiFlexItem"
                             >
                               <button
-                                class="euiButton euiButton--danger"
+                                class="euiButton euiButton--danger euiButton--small"
                                 type="button"
                               >
                                 <span
@@ -594,7 +594,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                               class="euiFlexItem"
                             >
                               <button
-                                class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                                class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                                 data-click-metric-element="integrations.create_from_setup"
                                 data-test-subj="createInstanceButton"
                                 disabled=""
@@ -695,7 +695,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                 >
                                   <div>
                                     <div
-                                      class="euiFormRow"
+                                      class="euiFormRow euiFormRow--compressed"
                                       id="random_html_id-row"
                                     >
                                       <div
@@ -746,14 +746,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                         class="euiFormRow__fieldWrapper"
                                       >
                                         <div
-                                          class="euiFormControlLayout euiFormControlLayout--group"
+                                          class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                                         >
                                           <div
                                             class="euiFormControlLayout__childrenWrapper"
                                           >
                                             <input
                                               aria-describedby="random_html_id-help-0"
-                                              class="euiFieldText euiFieldText--inGroup"
+                                              class="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
                                               data-test-subj="data-source-name"
                                               id="random_html_id"
                                               name="first"
@@ -762,7 +762,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                             />
                                           </div>
                                           <button
-                                            class="euiButton euiButton--primary euiButton-isDisabled euiFormControlLayout__append"
+                                            class="euiButton euiButton--primary euiButton--small euiButton-isDisabled euiFormControlLayout__append"
                                             data-test-subj="validateIndex"
                                             disabled=""
                                             type="button"
@@ -787,7 +787,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                       </div>
                                     </div>
                                     <div
-                                      class="euiFormRow"
+                                      class="euiFormRow euiFormRow--compressed"
                                       id="random_html_id-row"
                                     >
                                       <div
@@ -804,14 +804,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                         class="euiFormRow__fieldWrapper"
                                       >
                                         <div
-                                          class="euiFormControlLayout"
+                                          class="euiFormControlLayout euiFormControlLayout--compressed"
                                         >
                                           <div
                                             class="euiFormControlLayout__childrenWrapper"
                                           >
                                             <input
                                               aria-describedby="random_html_id-help-0"
-                                              class="euiFieldText"
+                                              class="euiFieldText euiFieldText--compressed"
                                               data-test-subj="new-instance-name"
                                               id="random_html_id"
                                               name="first"
@@ -843,7 +843,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                 class="euiFlexItem"
                               >
                                 <button
-                                  class="euiButton euiButton--danger"
+                                  class="euiButton euiButton--danger euiButton--small"
                                   type="button"
                                 >
                                   <span
@@ -861,7 +861,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                 class="euiFlexItem"
                               >
                                 <button
-                                  class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                                  class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                                   data-click-metric-element="integrations.create_from_setup"
                                   data-test-subj="createInstanceButton"
                                   disabled=""
@@ -962,7 +962,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                   >
                                     <div>
                                       <div
-                                        class="euiFormRow"
+                                        class="euiFormRow euiFormRow--compressed"
                                         id="random_html_id-row"
                                       >
                                         <div
@@ -1013,14 +1013,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                           class="euiFormRow__fieldWrapper"
                                         >
                                           <div
-                                            class="euiFormControlLayout euiFormControlLayout--group"
+                                            class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                                           >
                                             <div
                                               class="euiFormControlLayout__childrenWrapper"
                                             >
                                               <input
                                                 aria-describedby="random_html_id-help-0"
-                                                class="euiFieldText euiFieldText--inGroup"
+                                                class="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
                                                 data-test-subj="data-source-name"
                                                 id="random_html_id"
                                                 name="first"
@@ -1029,7 +1029,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                               />
                                             </div>
                                             <button
-                                              class="euiButton euiButton--primary euiButton-isDisabled euiFormControlLayout__append"
+                                              class="euiButton euiButton--primary euiButton--small euiButton-isDisabled euiFormControlLayout__append"
                                               data-test-subj="validateIndex"
                                               disabled=""
                                               type="button"
@@ -1054,7 +1054,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                         </div>
                                       </div>
                                       <div
-                                        class="euiFormRow"
+                                        class="euiFormRow euiFormRow--compressed"
                                         id="random_html_id-row"
                                       >
                                         <div
@@ -1071,14 +1071,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                           class="euiFormRow__fieldWrapper"
                                         >
                                           <div
-                                            class="euiFormControlLayout"
+                                            class="euiFormControlLayout euiFormControlLayout--compressed"
                                           >
                                             <div
                                               class="euiFormControlLayout__childrenWrapper"
                                             >
                                               <input
                                                 aria-describedby="random_html_id-help-0"
-                                                class="euiFieldText"
+                                                class="euiFieldText euiFieldText--compressed"
                                                 data-test-subj="new-instance-name"
                                                 id="random_html_id"
                                                 name="first"
@@ -1110,7 +1110,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                   class="euiFlexItem"
                                 >
                                   <button
-                                    class="euiButton euiButton--danger"
+                                    class="euiButton euiButton--danger euiButton--small"
                                     type="button"
                                   >
                                     <span
@@ -1128,7 +1128,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                   class="euiFlexItem"
                                 >
                                   <button
-                                    class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                                    class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                                     data-click-metric-element="integrations.create_from_setup"
                                     data-test-subj="createInstanceButton"
                                     disabled=""
@@ -1217,7 +1217,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                     >
                                       <div>
                                         <div
-                                          class="euiFormRow"
+                                          class="euiFormRow euiFormRow--compressed"
                                           id="random_html_id-row"
                                         >
                                           <div
@@ -1268,14 +1268,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                             class="euiFormRow__fieldWrapper"
                                           >
                                             <div
-                                              class="euiFormControlLayout euiFormControlLayout--group"
+                                              class="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                                             >
                                               <div
                                                 class="euiFormControlLayout__childrenWrapper"
                                               >
                                                 <input
                                                   aria-describedby="random_html_id-help-0"
-                                                  class="euiFieldText euiFieldText--inGroup"
+                                                  class="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
                                                   data-test-subj="data-source-name"
                                                   id="random_html_id"
                                                   name="first"
@@ -1284,7 +1284,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                                 />
                                               </div>
                                               <button
-                                                class="euiButton euiButton--primary euiButton-isDisabled euiFormControlLayout__append"
+                                                class="euiButton euiButton--primary euiButton--small euiButton-isDisabled euiFormControlLayout__append"
                                                 data-test-subj="validateIndex"
                                                 disabled=""
                                                 type="button"
@@ -1309,7 +1309,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                           </div>
                                         </div>
                                         <div
-                                          class="euiFormRow"
+                                          class="euiFormRow euiFormRow--compressed"
                                           id="random_html_id-row"
                                         >
                                           <div
@@ -1326,14 +1326,14 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                             class="euiFormRow__fieldWrapper"
                                           >
                                             <div
-                                              class="euiFormControlLayout"
+                                              class="euiFormControlLayout euiFormControlLayout--compressed"
                                             >
                                               <div
                                                 class="euiFormControlLayout__childrenWrapper"
                                               >
                                                 <input
                                                   aria-describedby="random_html_id-help-0"
-                                                  class="euiFieldText"
+                                                  class="euiFieldText euiFieldText--compressed"
                                                   data-test-subj="new-instance-name"
                                                   id="random_html_id"
                                                   name="first"
@@ -1365,7 +1365,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                     class="euiFlexItem"
                                   >
                                     <button
-                                      class="euiButton euiButton--danger"
+                                      class="euiButton euiButton--danger euiButton--small"
                                       type="button"
                                     >
                                       <span
@@ -1383,7 +1383,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                     class="euiFlexItem"
                                   >
                                     <button
-                                      class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                                      class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                                       data-click-metric-element="integrations.create_from_setup"
                                       data-test-subj="createInstanceButton"
                                       disabled=""
@@ -1540,9 +1540,9 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                     className="euiForm"
                                   >
                                     <div>
-                                      <EuiFormRow
+                                      <EuiCompressedFormRow
                                         describedByIds={Array []}
-                                        display="row"
+                                        display="rowCompressed"
                                         error={Array []}
                                         fullWidth={false}
                                         hasChildLabel={true}
@@ -1566,7 +1566,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                         labelType="label"
                                       >
                                         <div
-                                          className="euiFormRow"
+                                          className="euiFormRow euiFormRow--compressed"
                                           id="random_html_id-row"
                                         >
                                           <div
@@ -1659,15 +1659,15 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                           <div
                                             className="euiFormRow__fieldWrapper"
                                           >
-                                            <EuiFieldText
+                                            <EuiCompressedFieldText
                                               append={
-                                                <EuiButton
+                                                <EuiSmallButton
                                                   data-test-subj="validateIndex"
                                                   disabled={true}
                                                   onClick={[Function]}
                                                 >
                                                   Validate
-                                                </EuiButton>
+                                                </EuiSmallButton>
                                               }
                                               aria-describedby="random_html_id-help-0"
                                               data-test-subj="data-source-name"
@@ -1679,97 +1679,131 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                               onFocus={[Function]}
                                               value=""
                                             >
-                                              <EuiFormControlLayout
+                                              <EuiFieldText
                                                 append={
-                                                  <EuiButton
+                                                  <EuiSmallButton
                                                     data-test-subj="validateIndex"
                                                     disabled={true}
                                                     onClick={[Function]}
                                                   >
                                                     Validate
-                                                  </EuiButton>
+                                                  </EuiSmallButton>
                                                 }
-                                                fullWidth={false}
-                                                inputId="random_html_id"
+                                                aria-describedby="random_html_id-help-0"
+                                                compressed={true}
+                                                data-test-subj="data-source-name"
+                                                id="random_html_id"
+                                                isInvalid={false}
+                                                name="first"
+                                                onBlur={[Function]}
+                                                onChange={[Function]}
+                                                onFocus={[Function]}
+                                                value=""
                                               >
-                                                <div
-                                                  className="euiFormControlLayout euiFormControlLayout--group"
+                                                <EuiFormControlLayout
+                                                  append={
+                                                    <EuiSmallButton
+                                                      data-test-subj="validateIndex"
+                                                      disabled={true}
+                                                      onClick={[Function]}
+                                                    >
+                                                      Validate
+                                                    </EuiSmallButton>
+                                                  }
+                                                  compressed={true}
+                                                  fullWidth={false}
+                                                  inputId="random_html_id"
                                                 >
                                                   <div
-                                                    className="euiFormControlLayout__childrenWrapper"
+                                                    className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                                                   >
-                                                    <EuiValidatableControl
-                                                      isInvalid={false}
+                                                    <div
+                                                      className="euiFormControlLayout__childrenWrapper"
                                                     >
-                                                      <input
-                                                        aria-describedby="random_html_id-help-0"
-                                                        className="euiFieldText euiFieldText--inGroup"
-                                                        data-test-subj="data-source-name"
-                                                        id="random_html_id"
-                                                        name="first"
-                                                        onBlur={[Function]}
-                                                        onChange={[Function]}
-                                                        onFocus={[Function]}
-                                                        type="text"
-                                                        value=""
+                                                      <EuiValidatableControl
+                                                        isInvalid={false}
+                                                      >
+                                                        <input
+                                                          aria-describedby="random_html_id-help-0"
+                                                          className="euiFieldText euiFieldText--compressed euiFieldText--inGroup"
+                                                          data-test-subj="data-source-name"
+                                                          id="random_html_id"
+                                                          name="first"
+                                                          onBlur={[Function]}
+                                                          onChange={[Function]}
+                                                          onFocus={[Function]}
+                                                          type="text"
+                                                          value=""
+                                                        />
+                                                      </EuiValidatableControl>
+                                                      <EuiFormControlLayoutIcons
+                                                        compressed={true}
                                                       />
-                                                    </EuiValidatableControl>
-                                                    <EuiFormControlLayoutIcons />
-                                                  </div>
-                                                  <EuiButton
-                                                    className="euiFormControlLayout__append"
-                                                    data-test-subj="validateIndex"
-                                                    disabled={true}
-                                                    key="0/.0"
-                                                    onClick={[Function]}
-                                                  >
-                                                    <EuiButtonDisplay
-                                                      baseClassName="euiButton"
+                                                    </div>
+                                                    <EuiSmallButton
                                                       className="euiFormControlLayout__append"
                                                       data-test-subj="validateIndex"
                                                       disabled={true}
-                                                      element="button"
-                                                      isDisabled={true}
+                                                      key="0/.0"
                                                       onClick={[Function]}
-                                                      type="button"
                                                     >
-                                                      <button
-                                                        className="euiButton euiButton--primary euiButton-isDisabled euiFormControlLayout__append"
+                                                      <EuiButton
+                                                        className="euiFormControlLayout__append"
                                                         data-test-subj="validateIndex"
                                                         disabled={true}
                                                         onClick={[Function]}
-                                                        style={
-                                                          Object {
-                                                            "minWidth": undefined,
-                                                          }
-                                                        }
-                                                        type="button"
+                                                        size="s"
                                                       >
-                                                        <EuiButtonContent
-                                                          className="euiButton__content"
-                                                          iconSide="left"
-                                                          textProps={
-                                                            Object {
-                                                              "className": "euiButton__text",
-                                                            }
-                                                          }
+                                                        <EuiButtonDisplay
+                                                          baseClassName="euiButton"
+                                                          className="euiFormControlLayout__append"
+                                                          data-test-subj="validateIndex"
+                                                          disabled={true}
+                                                          element="button"
+                                                          isDisabled={true}
+                                                          onClick={[Function]}
+                                                          size="s"
+                                                          type="button"
                                                         >
-                                                          <span
-                                                            className="euiButtonContent euiButton__content"
+                                                          <button
+                                                            className="euiButton euiButton--primary euiButton--small euiButton-isDisabled euiFormControlLayout__append"
+                                                            data-test-subj="validateIndex"
+                                                            disabled={true}
+                                                            onClick={[Function]}
+                                                            style={
+                                                              Object {
+                                                                "minWidth": undefined,
+                                                              }
+                                                            }
+                                                            type="button"
                                                           >
-                                                            <span
-                                                              className="euiButton__text"
+                                                            <EuiButtonContent
+                                                              className="euiButton__content"
+                                                              iconSide="left"
+                                                              textProps={
+                                                                Object {
+                                                                  "className": "euiButton__text",
+                                                                }
+                                                              }
                                                             >
-                                                              Validate
-                                                            </span>
-                                                          </span>
-                                                        </EuiButtonContent>
-                                                      </button>
-                                                    </EuiButtonDisplay>
-                                                  </EuiButton>
-                                                </div>
-                                              </EuiFormControlLayout>
-                                            </EuiFieldText>
+                                                              <span
+                                                                className="euiButtonContent euiButton__content"
+                                                              >
+                                                                <span
+                                                                  className="euiButton__text"
+                                                                >
+                                                                  Validate
+                                                                </span>
+                                                              </span>
+                                                            </EuiButtonContent>
+                                                          </button>
+                                                        </EuiButtonDisplay>
+                                                      </EuiButton>
+                                                    </EuiSmallButton>
+                                                  </div>
+                                                </EuiFormControlLayout>
+                                              </EuiFieldText>
+                                            </EuiCompressedFieldText>
                                             <EuiFormHelpText
                                               className="euiFormRow__text"
                                               id="random_html_id-help-0"
@@ -1784,10 +1818,10 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                             </EuiFormHelpText>
                                           </div>
                                         </div>
-                                      </EuiFormRow>
-                                      <EuiFormRow
+                                      </EuiCompressedFormRow>
+                                      <EuiCompressedFormRow
                                         describedByIds={Array []}
-                                        display="row"
+                                        display="rowCompressed"
                                         fullWidth={false}
                                         hasChildLabel={true}
                                         hasEmptyLabelSpace={false}
@@ -1796,7 +1830,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                         labelType="label"
                                       >
                                         <div
-                                          className="euiFormRow"
+                                          className="euiFormRow euiFormRow--compressed"
                                           id="random_html_id-row"
                                         >
                                           <div
@@ -1819,7 +1853,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                           <div
                                             className="euiFormRow__fieldWrapper"
                                           >
-                                            <EuiFieldText
+                                            <EuiCompressedFieldText
                                               aria-describedby="random_html_id-help-0"
                                               data-test-subj="new-instance-name"
                                               id="random_html_id"
@@ -1829,35 +1863,50 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                               onFocus={[Function]}
                                               value="test"
                                             >
-                                              <EuiFormControlLayout
-                                                fullWidth={false}
-                                                inputId="random_html_id"
+                                              <EuiFieldText
+                                                aria-describedby="random_html_id-help-0"
+                                                compressed={true}
+                                                data-test-subj="new-instance-name"
+                                                id="random_html_id"
+                                                name="first"
+                                                onBlur={[Function]}
+                                                onChange={[Function]}
+                                                onFocus={[Function]}
+                                                value="test"
                                               >
-                                                <div
-                                                  className="euiFormControlLayout"
+                                                <EuiFormControlLayout
+                                                  compressed={true}
+                                                  fullWidth={false}
+                                                  inputId="random_html_id"
                                                 >
                                                   <div
-                                                    className="euiFormControlLayout__childrenWrapper"
+                                                    className="euiFormControlLayout euiFormControlLayout--compressed"
                                                   >
-                                                    <EuiValidatableControl>
-                                                      <input
-                                                        aria-describedby="random_html_id-help-0"
-                                                        className="euiFieldText"
-                                                        data-test-subj="new-instance-name"
-                                                        id="random_html_id"
-                                                        name="first"
-                                                        onBlur={[Function]}
-                                                        onChange={[Function]}
-                                                        onFocus={[Function]}
-                                                        type="text"
-                                                        value="test"
+                                                    <div
+                                                      className="euiFormControlLayout__childrenWrapper"
+                                                    >
+                                                      <EuiValidatableControl>
+                                                        <input
+                                                          aria-describedby="random_html_id-help-0"
+                                                          className="euiFieldText euiFieldText--compressed"
+                                                          data-test-subj="new-instance-name"
+                                                          id="random_html_id"
+                                                          name="first"
+                                                          onBlur={[Function]}
+                                                          onChange={[Function]}
+                                                          onFocus={[Function]}
+                                                          type="text"
+                                                          value="test"
+                                                        />
+                                                      </EuiValidatableControl>
+                                                      <EuiFormControlLayoutIcons
+                                                        compressed={true}
                                                       />
-                                                    </EuiValidatableControl>
-                                                    <EuiFormControlLayoutIcons />
+                                                    </div>
                                                   </div>
-                                                </div>
-                                              </EuiFormControlLayout>
-                                            </EuiFieldText>
+                                                </EuiFormControlLayout>
+                                              </EuiFieldText>
+                                            </EuiCompressedFieldText>
                                             <EuiFormHelpText
                                               className="euiFormRow__text"
                                               id="random_html_id-help-0"
@@ -1872,7 +1921,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                             </EuiFormHelpText>
                                           </div>
                                         </div>
-                                      </EuiFormRow>
+                                      </EuiCompressedFormRow>
                                     </div>
                                   </form>
                                 </EuiForm>
@@ -1892,111 +1941,128 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                   <div
                                     className="euiFlexItem"
                                   >
-                                    <EuiButton
+                                    <EuiSmallButton
                                       color="danger"
                                       onClick={[Function]}
                                     >
-                                      <EuiButtonDisplay
-                                        baseClassName="euiButton"
+                                      <EuiButton
                                         color="danger"
-                                        disabled={false}
-                                        element="button"
-                                        isDisabled={false}
                                         onClick={[Function]}
-                                        type="button"
+                                        size="s"
                                       >
-                                        <button
-                                          className="euiButton euiButton--danger"
+                                        <EuiButtonDisplay
+                                          baseClassName="euiButton"
+                                          color="danger"
                                           disabled={false}
+                                          element="button"
+                                          isDisabled={false}
                                           onClick={[Function]}
-                                          style={
-                                            Object {
-                                              "minWidth": undefined,
-                                            }
-                                          }
+                                          size="s"
                                           type="button"
                                         >
-                                          <EuiButtonContent
-                                            className="euiButton__content"
-                                            iconSide="left"
-                                            textProps={
+                                          <button
+                                            className="euiButton euiButton--danger euiButton--small"
+                                            disabled={false}
+                                            onClick={[Function]}
+                                            style={
                                               Object {
-                                                "className": "euiButton__text",
+                                                "minWidth": undefined,
                                               }
                                             }
+                                            type="button"
                                           >
-                                            <span
-                                              className="euiButtonContent euiButton__content"
+                                            <EuiButtonContent
+                                              className="euiButton__content"
+                                              iconSide="left"
+                                              textProps={
+                                                Object {
+                                                  "className": "euiButton__text",
+                                                }
+                                              }
                                             >
                                               <span
-                                                className="euiButton__text"
+                                                className="euiButtonContent euiButton__content"
                                               >
-                                                Cancel
+                                                <span
+                                                  className="euiButton__text"
+                                                >
+                                                  Cancel
+                                                </span>
                                               </span>
-                                            </span>
-                                          </EuiButtonContent>
-                                        </button>
-                                      </EuiButtonDisplay>
-                                    </EuiButton>
+                                            </EuiButtonContent>
+                                          </button>
+                                        </EuiButtonDisplay>
+                                      </EuiButton>
+                                    </EuiSmallButton>
                                   </div>
                                 </EuiFlexItem>
                                 <EuiFlexItem>
                                   <div
                                     className="euiFlexItem"
                                   >
-                                    <EuiButton
+                                    <EuiSmallButton
                                       data-click-metric-element="integrations.create_from_setup"
                                       data-test-subj="createInstanceButton"
                                       disabled={true}
                                       fill={true}
                                       onClick={[Function]}
                                     >
-                                      <EuiButtonDisplay
-                                        baseClassName="euiButton"
+                                      <EuiButton
                                         data-click-metric-element="integrations.create_from_setup"
                                         data-test-subj="createInstanceButton"
                                         disabled={true}
-                                        element="button"
                                         fill={true}
-                                        isDisabled={true}
                                         onClick={[Function]}
-                                        type="button"
+                                        size="s"
                                       >
-                                        <button
-                                          className="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                                        <EuiButtonDisplay
+                                          baseClassName="euiButton"
                                           data-click-metric-element="integrations.create_from_setup"
                                           data-test-subj="createInstanceButton"
                                           disabled={true}
+                                          element="button"
+                                          fill={true}
+                                          isDisabled={true}
                                           onClick={[Function]}
-                                          style={
-                                            Object {
-                                              "minWidth": undefined,
-                                            }
-                                          }
+                                          size="s"
                                           type="button"
                                         >
-                                          <EuiButtonContent
-                                            className="euiButton__content"
-                                            iconSide="left"
-                                            textProps={
+                                          <button
+                                            className="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
+                                            data-click-metric-element="integrations.create_from_setup"
+                                            data-test-subj="createInstanceButton"
+                                            disabled={true}
+                                            onClick={[Function]}
+                                            style={
                                               Object {
-                                                "className": "euiButton__text",
+                                                "minWidth": undefined,
                                               }
                                             }
+                                            type="button"
                                           >
-                                            <span
-                                              className="euiButtonContent euiButton__content"
+                                            <EuiButtonContent
+                                              className="euiButton__content"
+                                              iconSide="left"
+                                              textProps={
+                                                Object {
+                                                  "className": "euiButton__text",
+                                                }
+                                              }
                                             >
                                               <span
-                                                className="euiButton__text"
+                                                className="euiButtonContent euiButton__content"
                                               >
-                                                Add Integration
+                                                <span
+                                                  className="euiButton__text"
+                                                >
+                                                  Add Integration
+                                                </span>
                                               </span>
-                                            </span>
-                                          </EuiButtonContent>
-                                        </button>
-                                      </EuiButtonDisplay>
-                                    </EuiButton>
+                                            </EuiButtonContent>
+                                          </button>
+                                        </EuiButtonDisplay>
+                                      </EuiButton>
+                                    </EuiSmallButton>
                                   </div>
                                 </EuiFlexItem>
                               </div>
diff --git a/public/components/integrations/components/__tests__/__snapshots__/added_integration_table.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/added_integration_table.test.tsx.snap
index c0871a84ff..0deff9fa09 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/added_integration_table.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/added_integration_table.test.tsx.snap
@@ -384,6 +384,7 @@ exports[`Added Integration Table View Test Renders added integration table view
                             <FieldValueSelectionFilter
                               config={
                                 Object {
+                                  "compressed": undefined,
                                   "field": "templateName",
                                   "multiSelect": false,
                                   "name": "Type",
diff --git a/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
index f778bc8ead..43bc018f09 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
@@ -76,8 +76,8 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
             <div
               className="euiFlexItem"
             >
-              <EuiFieldSearch
-                compressed={false}
+              <EuiCompressedFieldSearch
+                compressed={true}
                 data-test-subj="search-bar-input-box"
                 fullWidth={true}
                 incremental={false}
@@ -87,20 +87,20 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                 placeholder="Search..."
               >
                 <EuiFormControlLayout
-                  compressed={false}
+                  compressed={true}
                   fullWidth={true}
                   icon="search"
                   isLoading={false}
                 >
                   <div
-                    className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <EuiValidatableControl>
                         <input
-                          className="euiFieldSearch euiFieldSearch--fullWidth"
+                          className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
                           data-test-subj="search-bar-input-box"
                           onChange={[Function]}
                           onKeyUp={[Function]}
@@ -109,7 +109,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                         />
                       </EuiValidatableControl>
                       <EuiFormControlLayoutIcons
-                        compressed={false}
+                        compressed={true}
                         icon="search"
                         isLoading={false}
                       >
@@ -117,7 +117,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                           className="euiFormControlLayoutIcons"
                         >
                           <EuiFormControlLayoutCustomIcon
-                            size="m"
+                            size="s"
                             type="search"
                           >
                             <span
@@ -126,19 +126,19 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                               <EuiIcon
                                 aria-hidden="true"
                                 className="euiFormControlLayoutCustomIcon__icon"
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <EuiIconBeaker
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   role="img"
                                   style={null}
                                 >
                                   <svg
                                     aria-hidden={true}
-                                    className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                    className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height={16}
                                     role="img"
@@ -160,7 +160,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                     </div>
                   </div>
                 </EuiFormControlLayout>
-              </EuiFieldSearch>
+              </EuiCompressedFieldSearch>
             </div>
           </EuiFlexItem>
           <EuiFlexItem
diff --git a/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap
index 574594d3a5..cd01eee6c1 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap
@@ -34,13 +34,13 @@ exports[`Integration Header Test Renders integration header as expected 1`] = `
               <EuiPopover
                 anchorPosition="downLeft"
                 button={
-                  <EuiButton
+                  <EuiSmallButton
                     fill={true}
                     iconType="arrowDown"
                     onClick={[Function]}
                   >
                     Catalog
-                  </EuiButton>
+                  </EuiSmallButton>
                 }
                 closePopover={[Function]}
                 display="inlineBlock"
@@ -57,85 +57,93 @@ exports[`Integration Header Test Renders integration header as expected 1`] = `
                   <div
                     className="euiPopover__anchor"
                   >
-                    <EuiButton
+                    <EuiSmallButton
                       fill={true}
                       iconType="arrowDown"
                       onClick={[Function]}
                     >
-                      <EuiButtonDisplay
-                        baseClassName="euiButton"
-                        disabled={false}
-                        element="button"
+                      <EuiButton
                         fill={true}
                         iconType="arrowDown"
-                        isDisabled={false}
                         onClick={[Function]}
-                        type="button"
+                        size="s"
                       >
-                        <button
-                          className="euiButton euiButton--primary euiButton--fill"
+                        <EuiButtonDisplay
+                          baseClassName="euiButton"
                           disabled={false}
+                          element="button"
+                          fill={true}
+                          iconType="arrowDown"
+                          isDisabled={false}
                           onClick={[Function]}
-                          style={
-                            Object {
-                              "minWidth": undefined,
-                            }
-                          }
+                          size="s"
                           type="button"
                         >
-                          <EuiButtonContent
-                            className="euiButton__content"
-                            iconSide="left"
-                            iconType="arrowDown"
-                            textProps={
+                          <button
+                            className="euiButton euiButton--primary euiButton--small euiButton--fill"
+                            disabled={false}
+                            onClick={[Function]}
+                            style={
                               Object {
-                                "className": "euiButton__text",
+                                "minWidth": undefined,
                               }
                             }
+                            type="button"
                           >
-                            <span
-                              className="euiButtonContent euiButton__content"
+                            <EuiButtonContent
+                              className="euiButton__content"
+                              iconSide="left"
+                              iconType="arrowDown"
+                              textProps={
+                                Object {
+                                  "className": "euiButton__text",
+                                }
+                              }
                             >
-                              <EuiIcon
-                                className="euiButtonContent__icon"
-                                color="inherit"
-                                size="m"
-                                type="arrowDown"
+                              <span
+                                className="euiButtonContent euiButton__content"
                               >
-                                <EuiIconBeaker
-                                  aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                  focusable="false"
-                                  role="img"
-                                  style={null}
+                                <EuiIcon
+                                  className="euiButtonContent__icon"
+                                  color="inherit"
+                                  size="m"
+                                  type="arrowDown"
                                 >
-                                  <svg
+                                  <EuiIconBeaker
                                     aria-hidden={true}
                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                     focusable="false"
-                                    height={16}
                                     role="img"
                                     style={null}
-                                    viewBox="0 0 16 16"
-                                    width={16}
-                                    xmlns="http://www.w3.org/2000/svg"
                                   >
-                                    <path
-                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                    />
-                                  </svg>
-                                </EuiIconBeaker>
-                              </EuiIcon>
-                              <span
-                                className="euiButton__text"
-                              >
-                                Catalog
+                                    <svg
+                                      aria-hidden={true}
+                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                      focusable="false"
+                                      height={16}
+                                      role="img"
+                                      style={null}
+                                      viewBox="0 0 16 16"
+                                      width={16}
+                                      xmlns="http://www.w3.org/2000/svg"
+                                    >
+                                      <path
+                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                      />
+                                    </svg>
+                                  </EuiIconBeaker>
+                                </EuiIcon>
+                                <span
+                                  className="euiButton__text"
+                                >
+                                  Catalog
+                                </span>
                               </span>
-                            </span>
-                          </EuiButtonContent>
-                        </button>
-                      </EuiButtonDisplay>
-                    </EuiButton>
+                            </EuiButtonContent>
+                          </button>
+                        </EuiButtonDisplay>
+                      </EuiButton>
+                    </EuiSmallButton>
                   </div>
                 </div>
               </EuiPopover>
diff --git a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
index 557fa046a2..34a8bed648 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
@@ -119,9 +119,9 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                               }
                               updateConfig={[Function]}
                             >
-                              <EuiFormRow
+                              <EuiCompressedFormRow
                                 describedByIds={Array []}
-                                display="row"
+                                display="rowCompressed"
                                 error={
                                   Array [
                                     "Must be at least 1 character.",
@@ -135,7 +135,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                 labelType="label"
                               >
                                 <div
-                                  className="euiFormRow"
+                                  className="euiFormRow euiFormRow--compressed"
                                   id="random_html_id-row"
                                 >
                                   <div
@@ -161,7 +161,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   <div
                                     className="euiFormRow__fieldWrapper"
                                   >
-                                    <EuiFieldText
+                                    <EuiCompressedFieldText
                                       data-test-subj="new-instance-name"
                                       id="random_html_id"
                                       isInvalid={false}
@@ -171,39 +171,54 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                       placeholder="sample Integration"
                                       value="sample Integration"
                                     >
-                                      <EuiFormControlLayout
-                                        fullWidth={false}
-                                        inputId="random_html_id"
+                                      <EuiFieldText
+                                        compressed={true}
+                                        data-test-subj="new-instance-name"
+                                        id="random_html_id"
+                                        isInvalid={false}
+                                        onBlur={[Function]}
+                                        onChange={[Function]}
+                                        onFocus={[Function]}
+                                        placeholder="sample Integration"
+                                        value="sample Integration"
                                       >
-                                        <div
-                                          className="euiFormControlLayout"
+                                        <EuiFormControlLayout
+                                          compressed={true}
+                                          fullWidth={false}
+                                          inputId="random_html_id"
                                         >
                                           <div
-                                            className="euiFormControlLayout__childrenWrapper"
+                                            className="euiFormControlLayout euiFormControlLayout--compressed"
                                           >
-                                            <EuiValidatableControl
-                                              isInvalid={false}
+                                            <div
+                                              className="euiFormControlLayout__childrenWrapper"
                                             >
-                                              <input
-                                                className="euiFieldText"
-                                                data-test-subj="new-instance-name"
-                                                id="random_html_id"
-                                                onBlur={[Function]}
-                                                onChange={[Function]}
-                                                onFocus={[Function]}
-                                                placeholder="sample Integration"
-                                                type="text"
-                                                value="sample Integration"
+                                              <EuiValidatableControl
+                                                isInvalid={false}
+                                              >
+                                                <input
+                                                  className="euiFieldText euiFieldText--compressed"
+                                                  data-test-subj="new-instance-name"
+                                                  id="random_html_id"
+                                                  onBlur={[Function]}
+                                                  onChange={[Function]}
+                                                  onFocus={[Function]}
+                                                  placeholder="sample Integration"
+                                                  type="text"
+                                                  value="sample Integration"
+                                                />
+                                              </EuiValidatableControl>
+                                              <EuiFormControlLayoutIcons
+                                                compressed={true}
                                               />
-                                            </EuiValidatableControl>
-                                            <EuiFormControlLayoutIcons />
+                                            </div>
                                           </div>
-                                        </div>
-                                      </EuiFormControlLayout>
-                                    </EuiFieldText>
+                                        </EuiFormControlLayout>
+                                      </EuiFieldText>
+                                    </EuiCompressedFieldText>
                                   </div>
                                 </div>
-                              </EuiFormRow>
+                              </EuiCompressedFormRow>
                             </IntegrationDetailsInputs>
                             <EuiSpacer>
                               <div
@@ -249,9 +264,9 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                               lockConnectionType={false}
                               updateConfig={[Function]}
                             >
-                              <EuiFormRow
+                              <EuiCompressedFormRow
                                 describedByIds={Array []}
-                                display="row"
+                                display="rowCompressed"
                                 fullWidth={false}
                                 hasChildLabel={true}
                                 hasEmptyLabelSpace={false}
@@ -260,7 +275,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                 labelType="label"
                               >
                                 <div
-                                  className="euiFormRow"
+                                  className="euiFormRow euiFormRow--compressed"
                                   id="random_html_id-row"
                                 >
                                   <div
@@ -283,7 +298,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   <div
                                     className="euiFormRow__fieldWrapper"
                                   >
-                                    <EuiSelect
+                                    <EuiCompressedSelect
                                       aria-describedby="random_html_id-help-0"
                                       disabled={false}
                                       id="random_html_id"
@@ -293,95 +308,107 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                       options={Array []}
                                       value="index"
                                     >
-                                      <EuiFormControlLayout
-                                        compressed={false}
-                                        fullWidth={false}
-                                        icon={
-                                          Object {
-                                            "side": "right",
-                                            "type": "arrowDown",
-                                          }
-                                        }
-                                        inputId="random_html_id"
-                                        isLoading={false}
+                                      <EuiSelect
+                                        aria-describedby="random_html_id-help-0"
+                                        compressed={true}
+                                        disabled={false}
+                                        id="random_html_id"
+                                        onBlur={[Function]}
+                                        onChange={[Function]}
+                                        onFocus={[Function]}
+                                        options={Array []}
+                                        value="index"
                                       >
-                                        <div
-                                          className="euiFormControlLayout"
+                                        <EuiFormControlLayout
+                                          compressed={true}
+                                          fullWidth={false}
+                                          icon={
+                                            Object {
+                                              "side": "right",
+                                              "type": "arrowDown",
+                                            }
+                                          }
+                                          inputId="random_html_id"
+                                          isLoading={false}
                                         >
                                           <div
-                                            className="euiFormControlLayout__childrenWrapper"
+                                            className="euiFormControlLayout euiFormControlLayout--compressed"
                                           >
-                                            <EuiValidatableControl>
-                                              <select
-                                                aria-describedby="random_html_id-help-0"
-                                                className="euiSelect"
-                                                disabled={false}
-                                                id="random_html_id"
-                                                onBlur={[Function]}
-                                                onChange={[Function]}
-                                                onFocus={[Function]}
-                                                onMouseUp={[Function]}
-                                                value="index"
-                                              />
-                                            </EuiValidatableControl>
-                                            <EuiFormControlLayoutIcons
-                                              compressed={false}
-                                              icon={
-                                                Object {
-                                                  "side": "right",
-                                                  "type": "arrowDown",
-                                                }
-                                              }
-                                              isLoading={false}
+                                            <div
+                                              className="euiFormControlLayout__childrenWrapper"
                                             >
-                                              <div
-                                                className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+                                              <EuiValidatableControl>
+                                                <select
+                                                  aria-describedby="random_html_id-help-0"
+                                                  className="euiSelect euiSelect--compressed"
+                                                  disabled={false}
+                                                  id="random_html_id"
+                                                  onBlur={[Function]}
+                                                  onChange={[Function]}
+                                                  onFocus={[Function]}
+                                                  onMouseUp={[Function]}
+                                                  value="index"
+                                                />
+                                              </EuiValidatableControl>
+                                              <EuiFormControlLayoutIcons
+                                                compressed={true}
+                                                icon={
+                                                  Object {
+                                                    "side": "right",
+                                                    "type": "arrowDown",
+                                                  }
+                                                }
+                                                isLoading={false}
                                               >
-                                                <EuiFormControlLayoutCustomIcon
-                                                  size="m"
-                                                  type="arrowDown"
+                                                <div
+                                                  className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                                                 >
-                                                  <span
-                                                    className="euiFormControlLayoutCustomIcon"
+                                                  <EuiFormControlLayoutCustomIcon
+                                                    size="s"
+                                                    type="arrowDown"
                                                   >
-                                                    <EuiIcon
-                                                      aria-hidden="true"
-                                                      className="euiFormControlLayoutCustomIcon__icon"
-                                                      size="m"
-                                                      type="arrowDown"
+                                                    <span
+                                                      className="euiFormControlLayoutCustomIcon"
                                                     >
-                                                      <EuiIconBeaker
-                                                        aria-hidden={true}
-                                                        className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                                                        focusable="false"
-                                                        role="img"
-                                                        style={null}
+                                                      <EuiIcon
+                                                        aria-hidden="true"
+                                                        className="euiFormControlLayoutCustomIcon__icon"
+                                                        size="s"
+                                                        type="arrowDown"
                                                       >
-                                                        <svg
+                                                        <EuiIconBeaker
                                                           aria-hidden={true}
-                                                          className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                                          className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                           focusable="false"
-                                                          height={16}
                                                           role="img"
                                                           style={null}
-                                                          viewBox="0 0 16 16"
-                                                          width={16}
-                                                          xmlns="http://www.w3.org/2000/svg"
                                                         >
-                                                          <path
-                                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                          />
-                                                        </svg>
-                                                      </EuiIconBeaker>
-                                                    </EuiIcon>
-                                                  </span>
-                                                </EuiFormControlLayoutCustomIcon>
-                                              </div>
-                                            </EuiFormControlLayoutIcons>
+                                                          <svg
+                                                            aria-hidden={true}
+                                                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                                            focusable="false"
+                                                            height={16}
+                                                            role="img"
+                                                            style={null}
+                                                            viewBox="0 0 16 16"
+                                                            width={16}
+                                                            xmlns="http://www.w3.org/2000/svg"
+                                                          >
+                                                            <path
+                                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                            />
+                                                          </svg>
+                                                        </EuiIconBeaker>
+                                                      </EuiIcon>
+                                                    </span>
+                                                  </EuiFormControlLayoutCustomIcon>
+                                                </div>
+                                              </EuiFormControlLayoutIcons>
+                                            </div>
                                           </div>
-                                        </div>
-                                      </EuiFormControlLayout>
-                                    </EuiSelect>
+                                        </EuiFormControlLayout>
+                                      </EuiSelect>
+                                    </EuiCompressedSelect>
                                     <EuiFormHelpText
                                       className="euiFormRow__text"
                                       id="random_html_id-help-0"
@@ -396,10 +423,10 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                     </EuiFormHelpText>
                                   </div>
                                 </div>
-                              </EuiFormRow>
-                              <EuiFormRow
+                              </EuiCompressedFormRow>
+                              <EuiCompressedFormRow
                                 describedByIds={Array []}
-                                display="row"
+                                display="rowCompressed"
                                 fullWidth={false}
                                 hasChildLabel={true}
                                 hasEmptyLabelSpace={false}
@@ -408,7 +435,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                 labelType="label"
                               >
                                 <div
-                                  className="euiFormRow"
+                                  className="euiFormRow euiFormRow--compressed"
                                   id="random_html_id-row"
                                 >
                                   <div
@@ -431,10 +458,10 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   <div
                                     className="euiFormRow__fieldWrapper"
                                   >
-                                    <EuiComboBox
+                                    <EuiCompressedComboBox
                                       aria-describedby="random_html_id-help-0"
                                       async={false}
-                                      compressed={false}
+                                      compressed={true}
                                       customOptionText="Select {searchValue} as your index"
                                       data-test-subj="data-source-name"
                                       fullWidth={false}
@@ -465,14 +492,14 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                         aria-describedby="random_html_id-help-0"
                                         aria-expanded={false}
                                         aria-haspopup="listbox"
-                                        className="euiComboBox"
+                                        className="euiComboBox euiComboBox--compressed"
                                         data-test-subj="data-source-name"
                                         onKeyDown={[Function]}
                                         role="combobox"
                                       >
                                         <EuiComboBoxInput
                                           autoSizeInputRef={[Function]}
-                                          compressed={false}
+                                          compressed={true}
                                           fullWidth={false}
                                           hasSelectedOptions={true}
                                           id="random_html_id"
@@ -513,7 +540,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                 "onClick": [Function],
                                               }
                                             }
-                                            compressed={false}
+                                            compressed={true}
                                             fullWidth={false}
                                             icon={
                                               Object {
@@ -529,13 +556,13 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                             isLoading={true}
                                           >
                                             <div
-                                              className="euiFormControlLayout"
+                                              className="euiFormControlLayout euiFormControlLayout--compressed"
                                             >
                                               <div
                                                 className="euiFormControlLayout__childrenWrapper"
                                               >
                                                 <div
-                                                  className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isLoading euiComboBox__inputWrap-isClearable"
+                                                  className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isLoading euiComboBox__inputWrap-isClearable"
                                                   data-test-subj="comboBoxInput"
                                                   onClick={[Function]}
                                                   tabIndex={-1}
@@ -623,7 +650,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                       "onClick": [Function],
                                                     }
                                                   }
-                                                  compressed={false}
+                                                  compressed={true}
                                                   icon={
                                                     Object {
                                                       "aria-label": "Open list of options",
@@ -643,7 +670,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                     <EuiFormControlLayoutClearButton
                                                       data-test-subj="comboBoxClearButton"
                                                       onClick={[Function]}
-                                                      size="m"
+                                                      size="s"
                                                     >
                                                       <EuiI18n
                                                         default="Clear input"
@@ -651,7 +678,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                       >
                                                         <button
                                                           aria-label="Clear input"
-                                                          className="euiFormControlLayoutClearButton"
+                                                          className="euiFormControlLayoutClearButton euiFormControlLayoutClearButton--small"
                                                           data-test-subj="comboBoxClearButton"
                                                           onClick={[Function]}
                                                           type="button"
@@ -700,7 +727,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                       disabled={false}
                                                       iconRef={[Function]}
                                                       onClick={[Function]}
-                                                      size="m"
+                                                      size="s"
                                                       type="arrowDown"
                                                     >
                                                       <button
@@ -714,19 +741,19 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                         <EuiIcon
                                                           aria-hidden="true"
                                                           className="euiFormControlLayoutCustomIcon__icon"
-                                                          size="m"
+                                                          size="s"
                                                           type="arrowDown"
                                                         >
                                                           <EuiIconBeaker
                                                             aria-hidden={true}
-                                                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                             focusable="false"
                                                             role="img"
                                                             style={null}
                                                           >
                                                             <svg
                                                               aria-hidden={true}
-                                                              className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                                              className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                               focusable="false"
                                                               height={16}
                                                               role="img"
@@ -750,7 +777,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                           </EuiFormControlLayout>
                                         </EuiComboBoxInput>
                                       </div>
-                                    </EuiComboBox>
+                                    </EuiCompressedComboBox>
                                     <EuiFormHelpText
                                       className="euiFormRow__text"
                                       id="random_html_id-help-0"
@@ -765,7 +792,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                     </EuiFormHelpText>
                                   </div>
                                 </div>
-                              </EuiFormRow>
+                              </EuiCompressedFormRow>
                             </IntegrationConnectionInputs>
                           </div>
                         </EuiForm>
@@ -796,7 +823,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                             class="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <button
-                              class="euiButtonEmpty euiButtonEmpty--text"
+                              class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small"
                               type="button"
                             >
                               <span
@@ -828,7 +855,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                             class="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <button
-                              class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                              class="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
                               data-test-subj="create-instance-button"
                               disabled=""
                               type="button"
@@ -930,71 +957,79 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                               <div
                                 className="euiFlexItem euiFlexItem--flexGrowZero"
                               >
-                                <EuiButtonEmpty
+                                <EuiSmallButtonEmpty
                                   color="text"
                                   disabled={false}
                                   iconType="cross"
                                   onClick={[Function]}
                                 >
-                                  <button
-                                    className="euiButtonEmpty euiButtonEmpty--text"
+                                  <EuiButtonEmpty
+                                    color="text"
                                     disabled={false}
+                                    iconType="cross"
                                     onClick={[Function]}
-                                    type="button"
+                                    size="s"
                                   >
-                                    <EuiButtonContent
-                                      className="euiButtonEmpty__content"
-                                      iconSide="left"
-                                      iconSize="m"
-                                      iconType="cross"
-                                      textProps={
-                                        Object {
-                                          "className": "euiButtonEmpty__text",
-                                        }
-                                      }
+                                    <button
+                                      className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small"
+                                      disabled={false}
+                                      onClick={[Function]}
+                                      type="button"
                                     >
-                                      <span
-                                        className="euiButtonContent euiButtonEmpty__content"
+                                      <EuiButtonContent
+                                        className="euiButtonEmpty__content"
+                                        iconSide="left"
+                                        iconSize="m"
+                                        iconType="cross"
+                                        textProps={
+                                          Object {
+                                            "className": "euiButtonEmpty__text",
+                                          }
+                                        }
                                       >
-                                        <EuiIcon
-                                          className="euiButtonContent__icon"
-                                          color="inherit"
-                                          size="m"
-                                          type="cross"
+                                        <span
+                                          className="euiButtonContent euiButtonEmpty__content"
                                         >
-                                          <EuiIconBeaker
-                                            aria-hidden={true}
-                                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                            focusable="false"
-                                            role="img"
-                                            style={null}
+                                          <EuiIcon
+                                            className="euiButtonContent__icon"
+                                            color="inherit"
+                                            size="m"
+                                            type="cross"
                                           >
-                                            <svg
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                               focusable="false"
-                                              height={16}
                                               role="img"
                                               style={null}
-                                              viewBox="0 0 16 16"
-                                              width={16}
-                                              xmlns="http://www.w3.org/2000/svg"
                                             >
-                                              <path
-                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                              />
-                                            </svg>
-                                          </EuiIconBeaker>
-                                        </EuiIcon>
-                                        <span
-                                          className="euiButtonEmpty__text"
-                                        >
-                                          Discard
+                                              <svg
+                                                aria-hidden={true}
+                                                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                                focusable="false"
+                                                height={16}
+                                                role="img"
+                                                style={null}
+                                                viewBox="0 0 16 16"
+                                                width={16}
+                                                xmlns="http://www.w3.org/2000/svg"
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
+                                          </EuiIcon>
+                                          <span
+                                            className="euiButtonEmpty__text"
+                                          >
+                                            Discard
+                                          </span>
                                         </span>
-                                      </span>
-                                    </EuiButtonContent>
-                                  </button>
-                                </EuiButtonEmpty>
+                                      </EuiButtonContent>
+                                    </button>
+                                  </EuiButtonEmpty>
+                                </EuiSmallButtonEmpty>
                               </div>
                             </EuiFlexItem>
                             <EuiFlexItem
@@ -1003,7 +1038,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                               <div
                                 className="euiFlexItem euiFlexItem--flexGrowZero"
                               >
-                                <EuiButton
+                                <EuiSmallButton
                                   data-test-subj="create-instance-button"
                                   disabled={true}
                                   fill={true}
@@ -1012,85 +1047,97 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   isLoading={false}
                                   onClick={[Function]}
                                 >
-                                  <EuiButtonDisplay
-                                    baseClassName="euiButton"
+                                  <EuiButton
                                     data-test-subj="create-instance-button"
                                     disabled={true}
-                                    element="button"
                                     fill={true}
                                     iconSide="right"
                                     iconType="arrowRight"
-                                    isDisabled={true}
                                     isLoading={false}
                                     onClick={[Function]}
-                                    type="button"
+                                    size="s"
                                   >
-                                    <button
-                                      className="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                                    <EuiButtonDisplay
+                                      baseClassName="euiButton"
                                       data-test-subj="create-instance-button"
                                       disabled={true}
+                                      element="button"
+                                      fill={true}
+                                      iconSide="right"
+                                      iconType="arrowRight"
+                                      isDisabled={true}
+                                      isLoading={false}
                                       onClick={[Function]}
-                                      style={
-                                        Object {
-                                          "minWidth": undefined,
-                                        }
-                                      }
+                                      size="s"
                                       type="button"
                                     >
-                                      <EuiButtonContent
-                                        className="euiButton__content"
-                                        iconSide="right"
-                                        iconType="arrowRight"
-                                        isLoading={false}
-                                        textProps={
+                                      <button
+                                        className="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
+                                        data-test-subj="create-instance-button"
+                                        disabled={true}
+                                        onClick={[Function]}
+                                        style={
                                           Object {
-                                            "className": "euiButton__text",
+                                            "minWidth": undefined,
                                           }
                                         }
+                                        type="button"
                                       >
-                                        <span
-                                          className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                                        <EuiButtonContent
+                                          className="euiButton__content"
+                                          iconSide="right"
+                                          iconType="arrowRight"
+                                          isLoading={false}
+                                          textProps={
+                                            Object {
+                                              "className": "euiButton__text",
+                                            }
+                                          }
                                         >
-                                          <EuiIcon
-                                            className="euiButtonContent__icon"
-                                            color="inherit"
-                                            size="m"
-                                            type="arrowRight"
+                                          <span
+                                            className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                                           >
-                                            <EuiIconBeaker
-                                              aria-hidden={true}
-                                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                                              focusable="false"
-                                              role="img"
-                                              style={null}
+                                            <EuiIcon
+                                              className="euiButtonContent__icon"
+                                              color="inherit"
+                                              size="m"
+                                              type="arrowRight"
                                             >
-                                              <svg
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
-                                                height={16}
                                                 role="img"
                                                 style={null}
-                                                viewBox="0 0 16 16"
-                                                width={16}
-                                                xmlns="http://www.w3.org/2000/svg"
                                               >
-                                                <path
-                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                />
-                                              </svg>
-                                            </EuiIconBeaker>
-                                          </EuiIcon>
-                                          <span
-                                            className="euiButton__text"
-                                          >
-                                            Add Integration
+                                                <svg
+                                                  aria-hidden={true}
+                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                                  focusable="false"
+                                                  height={16}
+                                                  role="img"
+                                                  style={null}
+                                                  viewBox="0 0 16 16"
+                                                  width={16}
+                                                  xmlns="http://www.w3.org/2000/svg"
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
+                                            </EuiIcon>
+                                            <span
+                                              className="euiButton__text"
+                                            >
+                                              Add Integration
+                                            </span>
                                           </span>
-                                        </span>
-                                      </EuiButtonContent>
-                                    </button>
-                                  </EuiButtonDisplay>
-                                </EuiButton>
+                                        </EuiButtonContent>
+                                      </button>
+                                    </EuiButtonDisplay>
+                                  </EuiButton>
+                                </EuiSmallButton>
                               </div>
                             </EuiFlexItem>
                           </div>
diff --git a/public/components/integrations/components/__tests__/__snapshots__/setup_integration_inputs.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/setup_integration_inputs.test.tsx.snap
index 253e068f95..3361237a30 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/setup_integration_inputs.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/setup_integration_inputs.test.tsx.snap
@@ -116,9 +116,9 @@ exports[`Integration Setup Inputs Renders the S3 connector form as expected 1`]
       Query Fields
     </h3>
   </EuiText>
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -132,7 +132,7 @@ exports[`Integration Setup Inputs Renders the S3 connector form as expected 1`]
         To set up the integration, we need to know some information about how to process your data.
       </p>
     </EuiText>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
   <EuiSpacer />
   <IntegrationQueryInputs
     config={
@@ -184,9 +184,9 @@ exports[`Integration Setup Inputs Renders the S3 connector form as expected 1`]
       Integration Resources
     </h3>
   </EuiText>
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -200,7 +200,7 @@ exports[`Integration Setup Inputs Renders the S3 connector form as expected 1`]
         This integration offers different kinds of resources compatible with your data source. These can include dashboards, visualizations, indexes, and queries. Select at least one of the following options.
       </p>
     </EuiText>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
   <EuiSpacer />
   <IntegrationWorkflowsInputs
     config={
@@ -347,9 +347,9 @@ exports[`Integration Setup Inputs Renders the S3 connector form without workflow
       Query Fields
     </h3>
   </EuiText>
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -363,7 +363,7 @@ exports[`Integration Setup Inputs Renders the S3 connector form without workflow
         To set up the integration, we need to know some information about how to process your data.
       </p>
     </EuiText>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
   <EuiSpacer />
   <IntegrationQueryInputs
     config={
@@ -415,9 +415,9 @@ exports[`Integration Setup Inputs Renders the S3 connector form without workflow
       Integration Resources
     </h3>
   </EuiText>
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -431,7 +431,7 @@ exports[`Integration Setup Inputs Renders the S3 connector form without workflow
         This integration offers different kinds of resources compatible with your data source. These can include dashboards, visualizations, indexes, and queries. Select at least one of the following options.
       </p>
     </EuiText>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
   <EuiSpacer />
   <IntegrationWorkflowsInputs
     config={
@@ -507,9 +507,9 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
   }
   updateConfig={[Function]}
 >
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -518,7 +518,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -541,7 +541,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
       <div
         className="euiFormRow__fieldWrapper"
       >
-        <EuiSelect
+        <EuiCompressedSelect
           aria-describedby="random_html_id-help-0"
           id="random_html_id"
           onBlur={[Function]}
@@ -557,101 +557,119 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
           }
           value="s3"
         >
-          <EuiFormControlLayout
-            compressed={false}
-            fullWidth={false}
-            icon={
-              Object {
-                "side": "right",
-                "type": "arrowDown",
-              }
+          <EuiSelect
+            aria-describedby="random_html_id-help-0"
+            compressed={true}
+            id="random_html_id"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            options={
+              Array [
+                Object {
+                  "text": "OpenSearch Index",
+                  "value": "index",
+                },
+              ]
             }
-            inputId="random_html_id"
-            isLoading={false}
+            value="s3"
           >
-            <div
-              className="euiFormControlLayout"
+            <EuiFormControlLayout
+              compressed={true}
+              fullWidth={false}
+              icon={
+                Object {
+                  "side": "right",
+                  "type": "arrowDown",
+                }
+              }
+              inputId="random_html_id"
+              isLoading={false}
             >
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
-                <EuiValidatableControl>
-                  <select
-                    aria-describedby="random_html_id-help-0"
-                    className="euiSelect"
-                    id="random_html_id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    onMouseUp={[Function]}
-                    value="s3"
-                  >
-                    <option
-                      key="0"
-                      value="index"
+                <div
+                  className="euiFormControlLayout__childrenWrapper"
+                >
+                  <EuiValidatableControl>
+                    <select
+                      aria-describedby="random_html_id-help-0"
+                      className="euiSelect euiSelect--compressed"
+                      id="random_html_id"
+                      onBlur={[Function]}
+                      onChange={[Function]}
+                      onFocus={[Function]}
+                      onMouseUp={[Function]}
+                      value="s3"
                     >
-                      OpenSearch Index
-                    </option>
-                  </select>
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons
-                  compressed={false}
-                  icon={
-                    Object {
-                      "side": "right",
-                      "type": "arrowDown",
+                      <option
+                        key="0"
+                        value="index"
+                      >
+                        OpenSearch Index
+                      </option>
+                    </select>
+                  </EuiValidatableControl>
+                  <EuiFormControlLayoutIcons
+                    compressed={true}
+                    icon={
+                      Object {
+                        "side": "right",
+                        "type": "arrowDown",
+                      }
                     }
-                  }
-                  isLoading={false}
-                >
-                  <div
-                    className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+                    isLoading={false}
                   >
-                    <EuiFormControlLayoutCustomIcon
-                      size="m"
-                      type="arrowDown"
+                    <div
+                      className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                     >
-                      <span
-                        className="euiFormControlLayoutCustomIcon"
+                      <EuiFormControlLayoutCustomIcon
+                        size="s"
+                        type="arrowDown"
                       >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiFormControlLayoutCustomIcon__icon"
-                          size="m"
-                          type="arrowDown"
+                        <span
+                          className="euiFormControlLayoutCustomIcon"
                         >
-                          <EuiIconBeaker
-                            aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                            focusable="false"
-                            role="img"
-                            style={null}
+                          <EuiIcon
+                            aria-hidden="true"
+                            className="euiFormControlLayoutCustomIcon__icon"
+                            size="s"
+                            type="arrowDown"
                           >
-                            <svg
+                            <EuiIconBeaker
                               aria-hidden={true}
-                              className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                              className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                               focusable="false"
-                              height={16}
                               role="img"
                               style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                              />
-                            </svg>
-                          </EuiIconBeaker>
-                        </EuiIcon>
-                      </span>
-                    </EuiFormControlLayoutCustomIcon>
-                  </div>
-                </EuiFormControlLayoutIcons>
+                              <svg
+                                aria-hidden={true}
+                                className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
+                            </EuiIconBeaker>
+                          </EuiIcon>
+                        </span>
+                      </EuiFormControlLayoutCustomIcon>
+                    </div>
+                  </EuiFormControlLayoutIcons>
+                </div>
               </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiSelect>
+            </EuiFormControlLayout>
+          </EuiSelect>
+        </EuiCompressedSelect>
         <EuiFormHelpText
           className="euiFormRow__text"
           id="random_html_id-help-0"
@@ -666,10 +684,10 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
         </EuiFormHelpText>
       </div>
     </div>
-  </EuiFormRow>
-  <EuiFormRow
+  </EuiCompressedFormRow>
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -678,7 +696,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -701,10 +719,10 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
       <div
         className="euiFormRow__fieldWrapper"
       >
-        <EuiComboBox
+        <EuiCompressedComboBox
           aria-describedby="random_html_id-help-0"
           async={false}
-          compressed={false}
+          compressed={true}
           customOptionText="Select {searchValue} as your data_source"
           data-test-subj="data-source-name"
           fullWidth={false}
@@ -734,14 +752,14 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
             aria-describedby="random_html_id-help-0"
             aria-expanded={false}
             aria-haspopup="listbox"
-            className="euiComboBox"
+            className="euiComboBox euiComboBox--compressed"
             data-test-subj="data-source-name"
             onKeyDown={[Function]}
             role="combobox"
           >
             <EuiComboBoxInput
               autoSizeInputRef={[Function]}
-              compressed={false}
+              compressed={true}
               fullWidth={false}
               hasSelectedOptions={true}
               id="random_html_id"
@@ -781,7 +799,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
                     "onClick": [Function],
                   }
                 }
-                compressed={false}
+                compressed={true}
                 fullWidth={false}
                 icon={
                   Object {
@@ -797,13 +815,13 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
                 isLoading={true}
               >
                 <div
-                  className="euiFormControlLayout"
+                  className="euiFormControlLayout euiFormControlLayout--compressed"
                 >
                   <div
                     className="euiFormControlLayout__childrenWrapper"
                   >
                     <div
-                      className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isLoading euiComboBox__inputWrap-isClearable"
+                      className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isLoading euiComboBox__inputWrap-isClearable"
                       data-test-subj="comboBoxInput"
                       onClick={[Function]}
                       tabIndex={-1}
@@ -891,7 +909,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
                           "onClick": [Function],
                         }
                       }
-                      compressed={false}
+                      compressed={true}
                       icon={
                         Object {
                           "aria-label": "Open list of options",
@@ -911,7 +929,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
                         <EuiFormControlLayoutClearButton
                           data-test-subj="comboBoxClearButton"
                           onClick={[Function]}
-                          size="m"
+                          size="s"
                         >
                           <EuiI18n
                             default="Clear input"
@@ -919,7 +937,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
                           >
                             <button
                               aria-label="Clear input"
-                              className="euiFormControlLayoutClearButton"
+                              className="euiFormControlLayoutClearButton euiFormControlLayoutClearButton--small"
                               data-test-subj="comboBoxClearButton"
                               onClick={[Function]}
                               type="button"
@@ -967,7 +985,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
                           data-test-subj="comboBoxToggleListButton"
                           iconRef={[Function]}
                           onClick={[Function]}
-                          size="m"
+                          size="s"
                           type="arrowDown"
                         >
                           <button
@@ -980,19 +998,19 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
                             <EuiIcon
                               aria-hidden="true"
                               className="euiFormControlLayoutCustomIcon__icon"
-                              size="m"
+                              size="s"
                               type="arrowDown"
                             >
                               <EuiIconBeaker
                                 aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                 focusable="false"
                                 role="img"
                                 style={null}
                               >
                                 <svg
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   height={16}
                                   role="img"
@@ -1016,7 +1034,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
               </EuiFormControlLayout>
             </EuiComboBoxInput>
           </div>
-        </EuiComboBox>
+        </EuiCompressedComboBox>
         <EuiFormHelpText
           className="euiFormRow__text"
           id="random_html_id-help-0"
@@ -1031,7 +1049,7 @@ exports[`Integration Setup Inputs Renders the connection inputs 1`] = `
         </EuiFormHelpText>
       </div>
     </div>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
 </IntegrationConnectionInputs>
 `;
 
@@ -1081,9 +1099,9 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
   lockConnectionType={true}
   updateConfig={[Function]}
 >
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -1092,7 +1110,7 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -1115,7 +1133,7 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
       <div
         className="euiFormRow__fieldWrapper"
       >
-        <EuiSelect
+        <EuiCompressedSelect
           aria-describedby="random_html_id-help-0"
           disabled={true}
           id="random_html_id"
@@ -1132,103 +1150,122 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
           }
           value="s3"
         >
-          <EuiFormControlLayout
-            compressed={false}
-            fullWidth={false}
-            icon={
-              Object {
-                "side": "right",
-                "type": "arrowDown",
-              }
+          <EuiSelect
+            aria-describedby="random_html_id-help-0"
+            compressed={true}
+            disabled={true}
+            id="random_html_id"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            options={
+              Array [
+                Object {
+                  "text": "OpenSearch Index",
+                  "value": "index",
+                },
+              ]
             }
-            inputId="random_html_id"
-            isLoading={false}
+            value="s3"
           >
-            <div
-              className="euiFormControlLayout"
+            <EuiFormControlLayout
+              compressed={true}
+              fullWidth={false}
+              icon={
+                Object {
+                  "side": "right",
+                  "type": "arrowDown",
+                }
+              }
+              inputId="random_html_id"
+              isLoading={false}
             >
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
-                <EuiValidatableControl>
-                  <select
-                    aria-describedby="random_html_id-help-0"
-                    className="euiSelect"
-                    disabled={true}
-                    id="random_html_id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    onMouseUp={[Function]}
-                    value="s3"
-                  >
-                    <option
-                      key="0"
-                      value="index"
+                <div
+                  className="euiFormControlLayout__childrenWrapper"
+                >
+                  <EuiValidatableControl>
+                    <select
+                      aria-describedby="random_html_id-help-0"
+                      className="euiSelect euiSelect--compressed"
+                      disabled={true}
+                      id="random_html_id"
+                      onBlur={[Function]}
+                      onChange={[Function]}
+                      onFocus={[Function]}
+                      onMouseUp={[Function]}
+                      value="s3"
                     >
-                      OpenSearch Index
-                    </option>
-                  </select>
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons
-                  compressed={false}
-                  icon={
-                    Object {
-                      "side": "right",
-                      "type": "arrowDown",
+                      <option
+                        key="0"
+                        value="index"
+                      >
+                        OpenSearch Index
+                      </option>
+                    </select>
+                  </EuiValidatableControl>
+                  <EuiFormControlLayoutIcons
+                    compressed={true}
+                    icon={
+                      Object {
+                        "side": "right",
+                        "type": "arrowDown",
+                      }
                     }
-                  }
-                  isLoading={false}
-                >
-                  <div
-                    className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+                    isLoading={false}
                   >
-                    <EuiFormControlLayoutCustomIcon
-                      size="m"
-                      type="arrowDown"
+                    <div
+                      className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                     >
-                      <span
-                        className="euiFormControlLayoutCustomIcon"
+                      <EuiFormControlLayoutCustomIcon
+                        size="s"
+                        type="arrowDown"
                       >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiFormControlLayoutCustomIcon__icon"
-                          size="m"
-                          type="arrowDown"
+                        <span
+                          className="euiFormControlLayoutCustomIcon"
                         >
-                          <EuiIconArrowDown
-                            aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
-                            focusable="false"
-                            role="img"
-                            style={null}
+                          <EuiIcon
+                            aria-hidden="true"
+                            className="euiFormControlLayoutCustomIcon__icon"
+                            size="s"
+                            type="arrowDown"
                           >
-                            <svg
+                            <EuiIconArrowDown
                               aria-hidden={true}
-                              className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                              className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                               focusable="false"
-                              height={16}
                               role="img"
                               style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                                fillRule="non-zero"
-                              />
-                            </svg>
-                          </EuiIconArrowDown>
-                        </EuiIcon>
-                      </span>
-                    </EuiFormControlLayoutCustomIcon>
-                  </div>
-                </EuiFormControlLayoutIcons>
+                              <svg
+                                aria-hidden={true}
+                                className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                                  fillRule="non-zero"
+                                />
+                              </svg>
+                            </EuiIconArrowDown>
+                          </EuiIcon>
+                        </span>
+                      </EuiFormControlLayoutCustomIcon>
+                    </div>
+                  </EuiFormControlLayoutIcons>
+                </div>
               </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiSelect>
+            </EuiFormControlLayout>
+          </EuiSelect>
+        </EuiCompressedSelect>
         <EuiFormHelpText
           className="euiFormRow__text"
           id="random_html_id-help-0"
@@ -1243,10 +1280,10 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
         </EuiFormHelpText>
       </div>
     </div>
-  </EuiFormRow>
-  <EuiFormRow
+  </EuiCompressedFormRow>
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -1255,7 +1292,7 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -1278,10 +1315,10 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
       <div
         className="euiFormRow__fieldWrapper"
       >
-        <EuiComboBox
+        <EuiCompressedComboBox
           aria-describedby="random_html_id-help-0"
           async={false}
-          compressed={false}
+          compressed={true}
           customOptionText="Select {searchValue} as your data_source"
           data-test-subj="data-source-name"
           fullWidth={false}
@@ -1312,14 +1349,14 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
             aria-describedby="random_html_id-help-0"
             aria-expanded={false}
             aria-haspopup="listbox"
-            className="euiComboBox euiComboBox-isDisabled"
+            className="euiComboBox euiComboBox--compressed euiComboBox-isDisabled"
             data-test-subj="data-source-name"
             onKeyDown={[Function]}
             role="combobox"
           >
             <EuiComboBoxInput
               autoSizeInputRef={[Function]}
-              compressed={false}
+              compressed={true}
               fullWidth={false}
               hasSelectedOptions={true}
               id="random_html_id"
@@ -1353,7 +1390,7 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
               value="ss4o_logs-nginx-test"
             >
               <EuiFormControlLayout
-                compressed={false}
+                compressed={true}
                 fullWidth={false}
                 icon={
                   Object {
@@ -1369,13 +1406,13 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
                 isLoading={true}
               >
                 <div
-                  className="euiFormControlLayout"
+                  className="euiFormControlLayout euiFormControlLayout--compressed"
                 >
                   <div
                     className="euiFormControlLayout__childrenWrapper"
                   >
                     <div
-                      className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isLoading"
+                      className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isLoading"
                       data-test-subj="comboBoxInput"
                       onClick={[Function]}
                       tabIndex={-1}
@@ -1459,7 +1496,7 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
                       </AutosizeInput>
                     </div>
                     <EuiFormControlLayoutIcons
-                      compressed={false}
+                      compressed={true}
                       icon={
                         Object {
                           "aria-label": "Open list of options",
@@ -1489,7 +1526,7 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
                           disabled={true}
                           iconRef={[Function]}
                           onClick={[Function]}
-                          size="m"
+                          size="s"
                           type="arrowDown"
                         >
                           <button
@@ -1503,19 +1540,19 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
                             <EuiIcon
                               aria-hidden="true"
                               className="euiFormControlLayoutCustomIcon__icon"
-                              size="m"
+                              size="s"
                               type="arrowDown"
                             >
                               <EuiIconArrowDown
                                 aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                 focusable="false"
                                 role="img"
                                 style={null}
                               >
                                 <svg
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   height={16}
                                   role="img"
@@ -1540,7 +1577,7 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
               </EuiFormControlLayout>
             </EuiComboBoxInput>
           </div>
-        </EuiComboBox>
+        </EuiCompressedComboBox>
         <EuiFormHelpText
           className="euiFormRow__text"
           id="random_html_id-help-0"
@@ -1555,7 +1592,7 @@ exports[`Integration Setup Inputs Renders the connection inputs with a locked co
         </EuiFormHelpText>
       </div>
     </div>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
 </IntegrationConnectionInputs>
 `;
 
@@ -1604,9 +1641,9 @@ exports[`Integration Setup Inputs Renders the details inputs 1`] = `
   }
   updateConfig={[Function]}
 >
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     error={
       Array [
         "Must be at least 1 character.",
@@ -1620,7 +1657,7 @@ exports[`Integration Setup Inputs Renders the details inputs 1`] = `
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -1646,7 +1683,7 @@ exports[`Integration Setup Inputs Renders the details inputs 1`] = `
       <div
         className="euiFormRow__fieldWrapper"
       >
-        <EuiFieldText
+        <EuiCompressedFieldText
           data-test-subj="new-instance-name"
           id="random_html_id"
           isInvalid={false}
@@ -1656,39 +1693,54 @@ exports[`Integration Setup Inputs Renders the details inputs 1`] = `
           placeholder="sample Integration"
           value="Test Instance Name"
         >
-          <EuiFormControlLayout
-            fullWidth={false}
-            inputId="random_html_id"
+          <EuiFieldText
+            compressed={true}
+            data-test-subj="new-instance-name"
+            id="random_html_id"
+            isInvalid={false}
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="sample Integration"
+            value="Test Instance Name"
           >
-            <div
-              className="euiFormControlLayout"
+            <EuiFormControlLayout
+              compressed={true}
+              fullWidth={false}
+              inputId="random_html_id"
             >
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
-                <EuiValidatableControl
-                  isInvalid={false}
+                <div
+                  className="euiFormControlLayout__childrenWrapper"
                 >
-                  <input
-                    className="euiFieldText"
-                    data-test-subj="new-instance-name"
-                    id="random_html_id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    placeholder="sample Integration"
-                    type="text"
-                    value="Test Instance Name"
+                  <EuiValidatableControl
+                    isInvalid={false}
+                  >
+                    <input
+                      className="euiFieldText euiFieldText--compressed"
+                      data-test-subj="new-instance-name"
+                      id="random_html_id"
+                      onBlur={[Function]}
+                      onChange={[Function]}
+                      onFocus={[Function]}
+                      placeholder="sample Integration"
+                      type="text"
+                      value="Test Instance Name"
+                    />
+                  </EuiValidatableControl>
+                  <EuiFormControlLayoutIcons
+                    compressed={true}
                   />
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons />
+                </div>
               </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiFieldText>
+            </EuiFormControlLayout>
+          </EuiFieldText>
+        </EuiCompressedFieldText>
       </div>
     </div>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
 </IntegrationDetailsInputs>
 `;
 
@@ -1850,9 +1902,9 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
   }
   updateConfig={[Function]}
 >
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     error={
       Array [
         "Must be at least 1 character.",
@@ -1867,7 +1919,7 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -1893,7 +1945,7 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
       <div
         className="euiFormRow__fieldWrapper"
       >
-        <EuiFieldText
+        <EuiCompressedFieldText
           aria-describedby="random_html_id-help-0 random_html_id-error-0"
           id="random_html_id"
           isInvalid={true}
@@ -1903,36 +1955,51 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
           placeholder="sample"
           value=""
         >
-          <EuiFormControlLayout
-            fullWidth={false}
-            inputId="random_html_id"
+          <EuiFieldText
+            aria-describedby="random_html_id-help-0 random_html_id-error-0"
+            compressed={true}
+            id="random_html_id"
+            isInvalid={true}
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="sample"
+            value=""
           >
-            <div
-              className="euiFormControlLayout"
+            <EuiFormControlLayout
+              compressed={true}
+              fullWidth={false}
+              inputId="random_html_id"
             >
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
-                <EuiValidatableControl
-                  isInvalid={true}
+                <div
+                  className="euiFormControlLayout__childrenWrapper"
                 >
-                  <input
-                    aria-describedby="random_html_id-help-0 random_html_id-error-0"
-                    className="euiFieldText"
-                    id="random_html_id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    placeholder="sample"
-                    type="text"
-                    value=""
+                  <EuiValidatableControl
+                    isInvalid={true}
+                  >
+                    <input
+                      aria-describedby="random_html_id-help-0 random_html_id-error-0"
+                      className="euiFieldText euiFieldText--compressed"
+                      id="random_html_id"
+                      onBlur={[Function]}
+                      onChange={[Function]}
+                      onFocus={[Function]}
+                      placeholder="sample"
+                      type="text"
+                      value=""
+                    />
+                  </EuiValidatableControl>
+                  <EuiFormControlLayoutIcons
+                    compressed={true}
                   />
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons />
+                </div>
               </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiFieldText>
+            </EuiFormControlLayout>
+          </EuiFieldText>
+        </EuiCompressedFieldText>
         <EuiFormErrorText
           className="euiFormRow__text"
           id="random_html_id-error-0"
@@ -1960,10 +2027,10 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
         </EuiFormHelpText>
       </div>
     </div>
-  </EuiFormRow>
-  <EuiFormRow
+  </EuiCompressedFormRow>
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     error={
       Array [
         "Must be a URL starting with 's3://'.",
@@ -1977,7 +2044,7 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -2003,7 +2070,7 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
       <div
         className="euiFormRow__fieldWrapper"
       >
-        <EuiFieldText
+        <EuiCompressedFieldText
           id="random_html_id"
           isInvalid={false}
           onBlur={[Function]}
@@ -2012,41 +2079,55 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
           placeholder="s3://"
           value=""
         >
-          <EuiFormControlLayout
-            fullWidth={false}
-            inputId="random_html_id"
+          <EuiFieldText
+            compressed={true}
+            id="random_html_id"
+            isInvalid={false}
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="s3://"
+            value=""
           >
-            <div
-              className="euiFormControlLayout"
+            <EuiFormControlLayout
+              compressed={true}
+              fullWidth={false}
+              inputId="random_html_id"
             >
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
-                <EuiValidatableControl
-                  isInvalid={false}
+                <div
+                  className="euiFormControlLayout__childrenWrapper"
                 >
-                  <input
-                    className="euiFieldText"
-                    id="random_html_id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    placeholder="s3://"
-                    type="text"
-                    value=""
+                  <EuiValidatableControl
+                    isInvalid={false}
+                  >
+                    <input
+                      className="euiFieldText euiFieldText--compressed"
+                      id="random_html_id"
+                      onBlur={[Function]}
+                      onChange={[Function]}
+                      onFocus={[Function]}
+                      placeholder="s3://"
+                      type="text"
+                      value=""
+                    />
+                  </EuiValidatableControl>
+                  <EuiFormControlLayoutIcons
+                    compressed={true}
                   />
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons />
+                </div>
               </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiFieldText>
+            </EuiFormControlLayout>
+          </EuiFieldText>
+        </EuiCompressedFieldText>
       </div>
     </div>
-  </EuiFormRow>
-  <EuiFormRow
+  </EuiCompressedFormRow>
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     error={
       Array [
         "Must be a URL starting with 's3://'.",
@@ -2061,7 +2142,7 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -2087,7 +2168,7 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
       <div
         className="euiFormRow__fieldWrapper"
       >
-        <EuiFieldText
+        <EuiCompressedFieldText
           aria-describedby="random_html_id-help-0"
           id="random_html_id"
           isInvalid={false}
@@ -2097,36 +2178,51 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
           placeholder="s3://"
           value=""
         >
-          <EuiFormControlLayout
-            fullWidth={false}
-            inputId="random_html_id"
+          <EuiFieldText
+            aria-describedby="random_html_id-help-0"
+            compressed={true}
+            id="random_html_id"
+            isInvalid={false}
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="s3://"
+            value=""
           >
-            <div
-              className="euiFormControlLayout"
+            <EuiFormControlLayout
+              compressed={true}
+              fullWidth={false}
+              inputId="random_html_id"
             >
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
-                <EuiValidatableControl
-                  isInvalid={false}
+                <div
+                  className="euiFormControlLayout__childrenWrapper"
                 >
-                  <input
-                    aria-describedby="random_html_id-help-0"
-                    className="euiFieldText"
-                    id="random_html_id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    placeholder="s3://"
-                    type="text"
-                    value=""
+                  <EuiValidatableControl
+                    isInvalid={false}
+                  >
+                    <input
+                      aria-describedby="random_html_id-help-0"
+                      className="euiFieldText euiFieldText--compressed"
+                      id="random_html_id"
+                      onBlur={[Function]}
+                      onChange={[Function]}
+                      onFocus={[Function]}
+                      placeholder="s3://"
+                      type="text"
+                      value=""
+                    />
+                  </EuiValidatableControl>
+                  <EuiFormControlLayoutIcons
+                    compressed={true}
                   />
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons />
+                </div>
               </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiFieldText>
+            </EuiFormControlLayout>
+          </EuiFieldText>
+        </EuiCompressedFieldText>
         <EuiFormHelpText
           className="euiFormRow__text"
           id="random_html_id-help-0"
@@ -2141,7 +2237,7 @@ exports[`Integration Setup Inputs Renders the query inputs 1`] = `
         </EuiFormHelpText>
       </div>
     </div>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
 </IntegrationQueryInputs>
 `;
 
@@ -2190,9 +2286,9 @@ exports[`Integration Setup Inputs Renders the workflows inputs 1`] = `
   }
   updateConfig={[Function]}
 >
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     error={
       Array [
         "Must select at least one workflow.",
@@ -2205,7 +2301,7 @@ exports[`Integration Setup Inputs Renders the workflows inputs 1`] = `
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -2245,7 +2341,7 @@ exports[`Integration Setup Inputs Renders the workflows inputs 1`] = `
         </EuiFormErrorText>
       </div>
     </div>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
 </IntegrationWorkflowsInputs>
 `;
 
@@ -2303,9 +2399,9 @@ exports[`Integration Setup Inputs Renders the workflows inputs with conditional
   }
   updateConfig={[Function]}
 >
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     error={
       Array [
         "Must select at least one workflow.",
@@ -2318,7 +2414,7 @@ exports[`Integration Setup Inputs Renders the workflows inputs with conditional
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -2358,6 +2454,6 @@ exports[`Integration Setup Inputs Renders the workflows inputs with conditional
         </EuiFormErrorText>
       </div>
     </div>
-  </EuiFormRow>
+  </EuiCompressedFormRow>
 </IntegrationWorkflowsInputs>
 `;
diff --git a/public/components/integrations/components/__tests__/__snapshots__/upload_flyout.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/upload_flyout.test.tsx.snap
index 6fb54a8fe8..a784634fa5 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/upload_flyout.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/upload_flyout.test.tsx.snap
@@ -22,22 +22,22 @@ exports[`Integration Upload Flyout Renders integration upload flyout as expected
       <EuiFlexItem
         grow={false}
       >
-        <EuiButton
+        <EuiSmallButton
           onClick={[Function]}
         >
           Cancel
-        </EuiButton>
+        </EuiSmallButton>
       </EuiFlexItem>
       <EuiFlexItem
         grow={false}
       >
-        <EuiButton
+        <EuiSmallButton
           disabled={true}
           fill={true}
           onClick={[Function]}
         >
           Upload
-        </EuiButton>
+        </EuiSmallButton>
       </EuiFlexItem>
     </EuiFlexGroup>
   </EuiFlyoutFooter>
@@ -46,9 +46,9 @@ exports[`Integration Upload Flyout Renders integration upload flyout as expected
 
 exports[`Integration Upload Flyout Renders the clean integration picker as expected 1`] = `
 <EuiForm>
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     error={
       Array [
         "Must be an ndjson bundle of integration templates",
@@ -61,8 +61,8 @@ exports[`Integration Upload Flyout Renders the clean integration picker as expec
     label="Select file"
     labelType="label"
   >
-    <EuiFilePicker
-      compressed={false}
+    <EuiCompressedFilePicker
+      compressed={true}
       display="large"
       id="integrationBundlePicker"
       initialPromptText="Select or drag and drop integration bundles"
@@ -70,6 +70,6 @@ exports[`Integration Upload Flyout Renders the clean integration picker as expec
       onBlur={[Function]}
       onChange={[Function]}
     />
-  </EuiFormRow>
+  </EuiCompressedFormRow>
 </EuiForm>
 `;
diff --git a/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap b/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
index 87363c0133..3cb90caa7d 100644
--- a/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
+++ b/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
@@ -165,7 +165,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                     Metrics source
                   </h5>
                 </EuiTitle>
-                <EuiComboBox
+                <EuiCompressedComboBox
                   async={false}
                   compressed={true}
                   data-test-subj="metricsDataSourcePicker"
@@ -390,7 +390,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                       </EuiFormControlLayout>
                     </EuiComboBoxInput>
                   </div>
-                </EuiComboBox>
+                </EuiCompressedComboBox>
               </div>
             </DataSourcePicker>
             <EuiSpacer
diff --git a/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap b/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap
index 3a5bc32eae..c187070fcb 100644
--- a/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap
+++ b/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap
@@ -110,9 +110,9 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                   <div
                     className="euiFlexItem"
                   >
-                    <EuiFormRow
+                    <EuiCompressedFormRow
                       describedByIds={Array []}
-                      display="row"
+                      display="rowCompressed"
                       fullWidth={false}
                       hasChildLabel={true}
                       hasEmptyLabelSpace={false}
@@ -120,7 +120,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                       labelType="label"
                     >
                       <div
-                        className="euiFormRow"
+                        className="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -143,7 +143,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                         <div
                           className="euiFormRow__fieldWrapper"
                         >
-                          <EuiFieldText
+                          <EuiCompressedFieldText
                             data-test-subj="metrics__querySaveName"
                             id="random_html_id"
                             key="metric-name-input-id-0"
@@ -152,36 +152,49 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                             onFocus={[Function]}
                             value="my_prometheus.go_memstats_alloc_bytes"
                           >
-                            <EuiFormControlLayout
-                              fullWidth={false}
-                              inputId="random_html_id"
+                            <EuiFieldText
+                              compressed={true}
+                              data-test-subj="metrics__querySaveName"
+                              id="random_html_id"
+                              onBlur={[Function]}
+                              onChange={[Function]}
+                              onFocus={[Function]}
+                              value="my_prometheus.go_memstats_alloc_bytes"
                             >
-                              <div
-                                className="euiFormControlLayout"
+                              <EuiFormControlLayout
+                                compressed={true}
+                                fullWidth={false}
+                                inputId="random_html_id"
                               >
                                 <div
-                                  className="euiFormControlLayout__childrenWrapper"
+                                  className="euiFormControlLayout euiFormControlLayout--compressed"
                                 >
-                                  <EuiValidatableControl>
-                                    <input
-                                      className="euiFieldText"
-                                      data-test-subj="metrics__querySaveName"
-                                      id="random_html_id"
-                                      onBlur={[Function]}
-                                      onChange={[Function]}
-                                      onFocus={[Function]}
-                                      type="text"
-                                      value="my_prometheus.go_memstats_alloc_bytes"
+                                  <div
+                                    className="euiFormControlLayout__childrenWrapper"
+                                  >
+                                    <EuiValidatableControl>
+                                      <input
+                                        className="euiFieldText euiFieldText--compressed"
+                                        data-test-subj="metrics__querySaveName"
+                                        id="random_html_id"
+                                        onBlur={[Function]}
+                                        onChange={[Function]}
+                                        onFocus={[Function]}
+                                        type="text"
+                                        value="my_prometheus.go_memstats_alloc_bytes"
+                                      />
+                                    </EuiValidatableControl>
+                                    <EuiFormControlLayoutIcons
+                                      compressed={true}
                                     />
-                                  </EuiValidatableControl>
-                                  <EuiFormControlLayoutIcons />
+                                  </div>
                                 </div>
-                              </div>
-                            </EuiFormControlLayout>
-                          </EuiFieldText>
+                              </EuiFormControlLayout>
+                            </EuiFieldText>
+                          </EuiCompressedFieldText>
                         </div>
                       </div>
-                    </EuiFormRow>
+                    </EuiCompressedFormRow>
                   </div>
                 </EuiFlexItem>
               </div>
@@ -203,9 +216,9 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                   <div
                     className="euiFlexItem"
                   >
-                    <EuiFormRow
+                    <EuiCompressedFormRow
                       describedByIds={Array []}
-                      display="row"
+                      display="rowCompressed"
                       fullWidth={false}
                       hasChildLabel={true}
                       hasEmptyLabelSpace={false}
@@ -213,7 +226,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                       labelType="label"
                     >
                       <div
-                        className="euiFormRow"
+                        className="euiFormRow euiFormRow--compressed"
                         id="random_html_id-row"
                       >
                         <div
@@ -236,7 +249,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                         <div
                           className="euiFormRow__fieldWrapper"
                         >
-                          <EuiFieldText
+                          <EuiCompressedFieldText
                             data-test-subj="metrics__querySaveName"
                             id="random_html_id"
                             key="metric-name-input-id-1"
@@ -245,36 +258,49 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                             onFocus={[Function]}
                             value="my_prometheus.go_memstats_alloc_bytes_total"
                           >
-                            <EuiFormControlLayout
-                              fullWidth={false}
-                              inputId="random_html_id"
+                            <EuiFieldText
+                              compressed={true}
+                              data-test-subj="metrics__querySaveName"
+                              id="random_html_id"
+                              onBlur={[Function]}
+                              onChange={[Function]}
+                              onFocus={[Function]}
+                              value="my_prometheus.go_memstats_alloc_bytes_total"
                             >
-                              <div
-                                className="euiFormControlLayout"
+                              <EuiFormControlLayout
+                                compressed={true}
+                                fullWidth={false}
+                                inputId="random_html_id"
                               >
                                 <div
-                                  className="euiFormControlLayout__childrenWrapper"
+                                  className="euiFormControlLayout euiFormControlLayout--compressed"
                                 >
-                                  <EuiValidatableControl>
-                                    <input
-                                      className="euiFieldText"
-                                      data-test-subj="metrics__querySaveName"
-                                      id="random_html_id"
-                                      onBlur={[Function]}
-                                      onChange={[Function]}
-                                      onFocus={[Function]}
-                                      type="text"
-                                      value="my_prometheus.go_memstats_alloc_bytes_total"
+                                  <div
+                                    className="euiFormControlLayout__childrenWrapper"
+                                  >
+                                    <EuiValidatableControl>
+                                      <input
+                                        className="euiFieldText euiFieldText--compressed"
+                                        data-test-subj="metrics__querySaveName"
+                                        id="random_html_id"
+                                        onBlur={[Function]}
+                                        onChange={[Function]}
+                                        onFocus={[Function]}
+                                        type="text"
+                                        value="my_prometheus.go_memstats_alloc_bytes_total"
+                                      />
+                                    </EuiValidatableControl>
+                                    <EuiFormControlLayoutIcons
+                                      compressed={true}
                                     />
-                                  </EuiValidatableControl>
-                                  <EuiFormControlLayoutIcons />
+                                  </div>
                                 </div>
-                              </div>
-                            </EuiFormControlLayout>
-                          </EuiFieldText>
+                              </EuiFormControlLayout>
+                            </EuiFieldText>
+                          </EuiCompressedFieldText>
                         </div>
                       </div>
-                    </EuiFormRow>
+                    </EuiCompressedFormRow>
                   </div>
                 </EuiFlexItem>
               </div>
@@ -323,9 +349,9 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                 }
               }
             >
-              <EuiFormRow
+              <EuiCompressedFormRow
                 describedByIds={Array []}
-                display="row"
+                display="rowCompressed"
                 fullWidth={false}
                 hasChildLabel={true}
                 hasEmptyLabelSpace={false}
@@ -333,7 +359,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                 labelType="label"
               >
                 <div
-                  className="euiFormRow"
+                  className="euiFormRow euiFormRow--compressed"
                   id="random_html_id-row"
                 >
                   <div
@@ -356,9 +382,9 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                   <div
                     className="euiFormRow__fieldWrapper"
                   >
-                    <EuiComboBox
+                    <EuiCompressedComboBox
                       async={false}
-                      compressed={false}
+                      compressed={true}
                       data-test-subj="eventExplorer__querySaveComboBox"
                       fullWidth={false}
                       id="random_html_id"
@@ -400,14 +426,14 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                       <div
                         aria-expanded={false}
                         aria-haspopup="listbox"
-                        className="euiComboBox"
+                        className="euiComboBox euiComboBox--compressed"
                         data-test-subj="eventExplorer__querySaveComboBox"
                         onKeyDown={[Function]}
                         role="combobox"
                       >
                         <EuiComboBoxInput
                           autoSizeInputRef={[Function]}
-                          compressed={false}
+                          compressed={true}
                           fullWidth={false}
                           hasSelectedOptions={false}
                           id="random_html_id"
@@ -431,7 +457,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                           value=""
                         >
                           <EuiFormControlLayout
-                            compressed={false}
+                            compressed={true}
                             fullWidth={false}
                             icon={
                               Object {
@@ -446,13 +472,13 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                             }
                           >
                             <div
-                              className="euiFormControlLayout"
+                              className="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
                                 className="euiFormControlLayout__childrenWrapper"
                               >
                                 <div
-                                  className="euiComboBox__inputWrap euiComboBox__inputWrap-isClearable"
+                                  className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap-isClearable"
                                   data-test-subj="comboBoxInput"
                                   onClick={[Function]}
                                   tabIndex={-1}
@@ -523,7 +549,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                                   </AutosizeInput>
                                 </div>
                                 <EuiFormControlLayoutIcons
-                                  compressed={false}
+                                  compressed={true}
                                   icon={
                                     Object {
                                       "aria-label": "Open list of options",
@@ -544,7 +570,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                                       data-test-subj="comboBoxToggleListButton"
                                       iconRef={[Function]}
                                       onClick={[Function]}
-                                      size="m"
+                                      size="s"
                                       type="arrowDown"
                                     >
                                       <button
@@ -557,19 +583,19 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                                         <EuiIcon
                                           aria-hidden="true"
                                           className="euiFormControlLayoutCustomIcon__icon"
-                                          size="m"
+                                          size="s"
                                           type="arrowDown"
                                         >
                                           <EuiIconBeaker
                                             aria-hidden={true}
-                                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                             focusable="false"
                                             role="img"
                                             style={null}
                                           >
                                             <svg
                                               aria-hidden={true}
-                                              className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                              className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                               focusable="false"
                                               height={16}
                                               role="img"
@@ -593,10 +619,10 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                           </EuiFormControlLayout>
                         </EuiComboBoxInput>
                       </div>
-                    </EuiComboBox>
+                    </EuiCompressedComboBox>
                   </div>
                 </div>
-              </EuiFormRow>
+              </EuiCompressedFormRow>
             </div>
           </EuiFlexItem>
         </div>
diff --git a/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap b/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
index de619ec373..59ac205e5a 100644
--- a/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
+++ b/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
@@ -30,9 +30,9 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
             <div
               className="resolutionSelect"
             >
-              <EuiFieldText
+              <EuiCompressedFieldText
                 append={
-                  <EuiSelect
+                  <EuiCompressedSelect
                     aria-label="resolutionSelect"
                     className="resolutionSelectOption"
                     data-test-subj="metrics__spanResolutionSelect"
@@ -66,16 +66,15 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                 }
                 aria-label="resolutionField"
                 className="resolutionSelectText"
-                compressed={true}
                 data-test-subj="metrics__spanValue"
                 isInvalid={false}
                 onChange={[Function]}
                 prepend="Span Interval"
                 value={1}
               >
-                <EuiFormControlLayout
+                <EuiFieldText
                   append={
-                    <EuiSelect
+                    <EuiCompressedSelect
                       aria-label="resolutionSelect"
                       className="resolutionSelectOption"
                       data-test-subj="metrics__spanResolutionSelect"
@@ -107,192 +106,269 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                       value="h"
                     />
                   }
+                  aria-label="resolutionField"
+                  className="resolutionSelectText"
                   compressed={true}
-                  fullWidth={false}
+                  data-test-subj="metrics__spanValue"
+                  isInvalid={false}
+                  onChange={[Function]}
                   prepend="Span Interval"
+                  value={1}
                 >
-                  <div
-                    className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
+                  <EuiFormControlLayout
+                    append={
+                      <EuiCompressedSelect
+                        aria-label="resolutionSelect"
+                        className="resolutionSelectOption"
+                        data-test-subj="metrics__spanResolutionSelect"
+                        onChange={[Function]}
+                        options={
+                          Array [
+                            Object {
+                              "text": "seconds",
+                              "value": "s",
+                            },
+                            Object {
+                              "text": "minutes",
+                              "value": "m",
+                            },
+                            Object {
+                              "text": "hours",
+                              "value": "h",
+                            },
+                            Object {
+                              "text": "days",
+                              "value": "d",
+                            },
+                            Object {
+                              "text": "years",
+                              "value": "y",
+                            },
+                          ]
+                        }
+                        value="h"
+                      />
+                    }
+                    compressed={true}
+                    fullWidth={false}
+                    prepend="Span Interval"
                   >
-                    <EuiFormLabel
-                      className="euiFormControlLayout__prepend"
-                    >
-                      <label
-                        className="euiFormLabel euiFormControlLayout__prepend"
-                      >
-                        Span Interval
-                      </label>
-                    </EuiFormLabel>
                     <div
-                      className="euiFormControlLayout__childrenWrapper"
+                      className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group"
                     >
-                      <EuiValidatableControl
-                        isInvalid={false}
+                      <EuiFormLabel
+                        className="euiFormControlLayout__prepend"
                       >
-                        <input
-                          aria-label="resolutionField"
-                          className="euiFieldText resolutionSelectText euiFieldText--compressed euiFieldText--inGroup"
-                          data-test-subj="metrics__spanValue"
-                          onChange={[Function]}
-                          type="text"
-                          value={1}
+                        <label
+                          className="euiFormLabel euiFormControlLayout__prepend"
+                        >
+                          Span Interval
+                        </label>
+                      </EuiFormLabel>
+                      <div
+                        className="euiFormControlLayout__childrenWrapper"
+                      >
+                        <EuiValidatableControl
+                          isInvalid={false}
+                        >
+                          <input
+                            aria-label="resolutionField"
+                            className="euiFieldText resolutionSelectText euiFieldText--compressed euiFieldText--inGroup"
+                            data-test-subj="metrics__spanValue"
+                            onChange={[Function]}
+                            type="text"
+                            value={1}
+                          />
+                        </EuiValidatableControl>
+                        <EuiFormControlLayoutIcons
+                          compressed={true}
                         />
-                      </EuiValidatableControl>
-                      <EuiFormControlLayoutIcons
-                        compressed={true}
-                      />
-                    </div>
-                    <EuiSelect
-                      aria-label="resolutionSelect"
-                      className="euiFormControlLayout__append resolutionSelectOption"
-                      data-test-subj="metrics__spanResolutionSelect"
-                      key="0/.0"
-                      onChange={[Function]}
-                      options={
-                        Array [
-                          Object {
-                            "text": "seconds",
-                            "value": "s",
-                          },
-                          Object {
-                            "text": "minutes",
-                            "value": "m",
-                          },
-                          Object {
-                            "text": "hours",
-                            "value": "h",
-                          },
-                          Object {
-                            "text": "days",
-                            "value": "d",
-                          },
-                          Object {
-                            "text": "years",
-                            "value": "y",
-                          },
-                        ]
-                      }
-                      value="h"
-                    >
-                      <EuiFormControlLayout
-                        compressed={false}
-                        fullWidth={false}
-                        icon={
-                          Object {
-                            "side": "right",
-                            "type": "arrowDown",
-                          }
+                      </div>
+                      <EuiCompressedSelect
+                        aria-label="resolutionSelect"
+                        className="euiFormControlLayout__append resolutionSelectOption"
+                        data-test-subj="metrics__spanResolutionSelect"
+                        key="0/.0"
+                        onChange={[Function]}
+                        options={
+                          Array [
+                            Object {
+                              "text": "seconds",
+                              "value": "s",
+                            },
+                            Object {
+                              "text": "minutes",
+                              "value": "m",
+                            },
+                            Object {
+                              "text": "hours",
+                              "value": "h",
+                            },
+                            Object {
+                              "text": "days",
+                              "value": "d",
+                            },
+                            Object {
+                              "text": "years",
+                              "value": "y",
+                            },
+                          ]
                         }
-                        isLoading={false}
+                        value="h"
                       >
-                        <div
-                          className="euiFormControlLayout"
+                        <EuiSelect
+                          aria-label="resolutionSelect"
+                          className="euiFormControlLayout__append resolutionSelectOption"
+                          compressed={true}
+                          data-test-subj="metrics__spanResolutionSelect"
+                          onChange={[Function]}
+                          options={
+                            Array [
+                              Object {
+                                "text": "seconds",
+                                "value": "s",
+                              },
+                              Object {
+                                "text": "minutes",
+                                "value": "m",
+                              },
+                              Object {
+                                "text": "hours",
+                                "value": "h",
+                              },
+                              Object {
+                                "text": "days",
+                                "value": "d",
+                              },
+                              Object {
+                                "text": "years",
+                                "value": "y",
+                              },
+                            ]
+                          }
+                          value="h"
                         >
-                          <div
-                            className="euiFormControlLayout__childrenWrapper"
-                          >
-                            <EuiValidatableControl>
-                              <select
-                                aria-label="resolutionSelect"
-                                className="euiSelect euiFormControlLayout__append resolutionSelectOption"
-                                data-test-subj="metrics__spanResolutionSelect"
-                                onChange={[Function]}
-                                onMouseUp={[Function]}
-                                value="h"
-                              >
-                                <option
-                                  key="0"
-                                  value="s"
-                                >
-                                  seconds
-                                </option>
-                                <option
-                                  key="1"
-                                  value="m"
-                                >
-                                  minutes
-                                </option>
-                                <option
-                                  key="2"
-                                  value="h"
-                                >
-                                  hours
-                                </option>
-                                <option
-                                  key="3"
-                                  value="d"
-                                >
-                                  days
-                                </option>
-                                <option
-                                  key="4"
-                                  value="y"
-                                >
-                                  years
-                                </option>
-                              </select>
-                            </EuiValidatableControl>
-                            <EuiFormControlLayoutIcons
-                              compressed={false}
-                              icon={
-                                Object {
-                                  "side": "right",
-                                  "type": "arrowDown",
-                                }
+                          <EuiFormControlLayout
+                            compressed={true}
+                            fullWidth={false}
+                            icon={
+                              Object {
+                                "side": "right",
+                                "type": "arrowDown",
                               }
-                              isLoading={false}
+                            }
+                            isLoading={false}
+                          >
+                            <div
+                              className="euiFormControlLayout euiFormControlLayout--compressed"
                             >
                               <div
-                                className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+                                className="euiFormControlLayout__childrenWrapper"
                               >
-                                <EuiFormControlLayoutCustomIcon
-                                  size="m"
-                                  type="arrowDown"
+                                <EuiValidatableControl>
+                                  <select
+                                    aria-label="resolutionSelect"
+                                    className="euiSelect euiSelect--compressed euiFormControlLayout__append resolutionSelectOption"
+                                    data-test-subj="metrics__spanResolutionSelect"
+                                    onChange={[Function]}
+                                    onMouseUp={[Function]}
+                                    value="h"
+                                  >
+                                    <option
+                                      key="0"
+                                      value="s"
+                                    >
+                                      seconds
+                                    </option>
+                                    <option
+                                      key="1"
+                                      value="m"
+                                    >
+                                      minutes
+                                    </option>
+                                    <option
+                                      key="2"
+                                      value="h"
+                                    >
+                                      hours
+                                    </option>
+                                    <option
+                                      key="3"
+                                      value="d"
+                                    >
+                                      days
+                                    </option>
+                                    <option
+                                      key="4"
+                                      value="y"
+                                    >
+                                      years
+                                    </option>
+                                  </select>
+                                </EuiValidatableControl>
+                                <EuiFormControlLayoutIcons
+                                  compressed={true}
+                                  icon={
+                                    Object {
+                                      "side": "right",
+                                      "type": "arrowDown",
+                                    }
+                                  }
+                                  isLoading={false}
                                 >
-                                  <span
-                                    className="euiFormControlLayoutCustomIcon"
+                                  <div
+                                    className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                                   >
-                                    <EuiIcon
-                                      aria-hidden="true"
-                                      className="euiFormControlLayoutCustomIcon__icon"
-                                      size="m"
+                                    <EuiFormControlLayoutCustomIcon
+                                      size="s"
                                       type="arrowDown"
                                     >
-                                      <EuiIconBeaker
-                                        aria-hidden={true}
-                                        className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                                        focusable="false"
-                                        role="img"
-                                        style={null}
+                                      <span
+                                        className="euiFormControlLayoutCustomIcon"
                                       >
-                                        <svg
-                                          aria-hidden={true}
-                                          className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                                          focusable="false"
-                                          height={16}
-                                          role="img"
-                                          style={null}
-                                          viewBox="0 0 16 16"
-                                          width={16}
-                                          xmlns="http://www.w3.org/2000/svg"
+                                        <EuiIcon
+                                          aria-hidden="true"
+                                          className="euiFormControlLayoutCustomIcon__icon"
+                                          size="s"
+                                          type="arrowDown"
                                         >
-                                          <path
-                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                          />
-                                        </svg>
-                                      </EuiIconBeaker>
-                                    </EuiIcon>
-                                  </span>
-                                </EuiFormControlLayoutCustomIcon>
+                                          <EuiIconBeaker
+                                            aria-hidden={true}
+                                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                            focusable="false"
+                                            role="img"
+                                            style={null}
+                                          >
+                                            <svg
+                                              aria-hidden={true}
+                                              className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                              focusable="false"
+                                              height={16}
+                                              role="img"
+                                              style={null}
+                                              viewBox="0 0 16 16"
+                                              width={16}
+                                              xmlns="http://www.w3.org/2000/svg"
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
+                                        </EuiIcon>
+                                      </span>
+                                    </EuiFormControlLayoutCustomIcon>
+                                  </div>
+                                </EuiFormControlLayoutIcons>
                               </div>
-                            </EuiFormControlLayoutIcons>
-                          </div>
-                        </div>
-                      </EuiFormControlLayout>
-                    </EuiSelect>
-                  </div>
-                </EuiFormControlLayout>
-              </EuiFieldText>
+                            </div>
+                          </EuiFormControlLayout>
+                        </EuiSelect>
+                      </EuiCompressedSelect>
+                    </div>
+                  </EuiFormControlLayout>
+                </EuiFieldText>
+              </EuiCompressedFieldText>
             </div>
           </div>
         </EuiFlexItem>
@@ -315,7 +391,7 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                   <div
                     className="euiFlexItem euiFlexItem--flexGrowZero metrics-search-bar-datepicker"
                   >
-                    <EuiSuperDatePicker
+                    <EuiCompressedSuperDatePicker
                       commonlyUsedRanges={
                         Array [
                           Object {
@@ -834,7 +910,7 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                           </EuiFlexItem>
                         </div>
                       </EuiFlexGroup>
-                    </EuiSuperDatePicker>
+                    </EuiCompressedSuperDatePicker>
                   </div>
                 </EuiFlexItem>
                 <EuiFlexItem
diff --git a/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap b/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap
index ba620dd302..59bd9e38f2 100644
--- a/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap
+++ b/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap
@@ -100,7 +100,7 @@ exports[`<NoteTable /> spec renders the component 1`] = `
                     class="euiPopover__anchor"
                   >
                     <button
-                      class="euiButton euiButton--primary"
+                      class="euiButton euiButton--primary euiButton--small"
                       data-test-subj="notebookTableActionBtn"
                       type="button"
                     >
@@ -136,7 +136,7 @@ exports[`<NoteTable /> spec renders the component 1`] = `
                 class="euiFlexItem"
               >
                 <a
-                  class="euiButton euiButton--primary euiButton--fill"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill"
                   data-test-subj="createNotebookPrimaryBtn"
                   href="#/create"
                   rel="noreferrer"
@@ -159,13 +159,13 @@ exports[`<NoteTable /> spec renders the component 1`] = `
           class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginMedium"
         />
         <div
-          class="euiFormControlLayout euiFormControlLayout--fullWidth"
+          class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
         >
           <div
             class="euiFormControlLayout__childrenWrapper"
           >
             <input
-              class="euiFieldSearch euiFieldSearch--fullWidth"
+              class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
               placeholder="Search notebook name"
               type="search"
               value=""
@@ -178,7 +178,7 @@ exports[`<NoteTable /> spec renders the component 1`] = `
               >
                 <svg
                   aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                  class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                   focusable="false"
                   height="16"
                   role="img"
@@ -1020,7 +1020,7 @@ exports[`<NoteTable /> spec renders the empty component 1`] = `
                     class="euiPopover__anchor"
                   >
                     <button
-                      class="euiButton euiButton--primary"
+                      class="euiButton euiButton--primary euiButton--small"
                       data-test-subj="notebookTableActionBtn"
                       type="button"
                     >
@@ -1055,7 +1055,7 @@ exports[`<NoteTable /> spec renders the empty component 1`] = `
                 class="euiFlexItem"
               >
                 <a
-                  class="euiButton euiButton--primary euiButton--fill"
+                  class="euiButton euiButton--primary euiButton--small euiButton--fill"
                   data-test-subj="createNotebookPrimaryBtn"
                   href="#/create"
                   rel="noreferrer"
@@ -1116,7 +1116,7 @@ exports[`<NoteTable /> spec renders the empty component 1`] = `
             class="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <a
-              class="euiButton euiButton--primary"
+              class="euiButton euiButton--primary euiButton--small"
               data-test-subj="notebookEmptyTableCreateBtn"
               href="#/create"
               rel="noreferrer"
@@ -1136,7 +1136,7 @@ exports[`<NoteTable /> spec renders the empty component 1`] = `
             class="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <button
-              class="euiButton euiButton--primary"
+              class="euiButton euiButton--primary euiButton--small"
               data-test-subj="notebookEmptyTableAddSamplesBtn"
               type="button"
             >
diff --git a/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap b/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap
index b24deae861..5e491534f9 100644
--- a/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap
+++ b/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap
@@ -33,7 +33,7 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
                 class="euiPopover__anchor"
               >
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   id="reportingActionsButton"
                   type="button"
                 >
@@ -76,7 +76,7 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
               class="euiPopover__anchor"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="notebook-paragraph-actions-button"
                 type="button"
               >
@@ -117,7 +117,7 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
               class="euiPopover__anchor"
             >
               <button
-                class="euiButton euiButton--primary"
+                class="euiButton euiButton--primary euiButton--small"
                 data-test-subj="notebook-notebook-actions-button"
                 type="button"
               >
@@ -264,7 +264,7 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
                   class="euiCard__footer"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     data-test-subj="emptyNotebookAddCodeBlockBtn"
                     style="margin-bottom: 17px;"
                     type="button"
@@ -328,7 +328,7 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
                   class="euiCard__footer"
                 >
                   <button
-                    class="euiButton euiButton--primary"
+                    class="euiButton euiButton--primary euiButton--small"
                     style="margin-bottom: 17px;"
                     type="button"
                   >
@@ -388,7 +388,7 @@ exports[`<Notebook /> spec Renders the visualization component 1`] = `
           class="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <button
-            class="euiButton euiButton--primary"
+            class="euiButton euiButton--primary euiButton--small"
             data-test-subj="upgrade-notebook-callout"
             type="button"
           >
@@ -407,7 +407,7 @@ exports[`<Notebook /> spec Renders the visualization component 1`] = `
           class="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <button
-            class="euiButton euiButton--primary"
+            class="euiButton euiButton--primary euiButton--small"
             data-test-subj="delete-notebook"
             type="button"
           >
@@ -453,7 +453,7 @@ exports[`<Notebook /> spec Renders the visualization component 1`] = `
                   class="euiSpacer euiSpacer--s"
                 />
                 <button
-                  class="euiButton euiButton--primary"
+                  class="euiButton euiButton--primary euiButton--small"
                   data-test-subj="upgrade-notebook"
                   type="button"
                 >
diff --git a/public/components/notebooks/components/helpers/__tests__/__snapshots__/modal_containers.test.tsx.snap b/public/components/notebooks/components/helpers/__tests__/__snapshots__/modal_containers.test.tsx.snap
index 5ed44ca009..e4bd51e8a1 100644
--- a/public/components/notebooks/components/helpers/__tests__/__snapshots__/modal_containers.test.tsx.snap
+++ b/public/components/notebooks/components/helpers/__tests__/__snapshots__/modal_containers.test.tsx.snap
@@ -20,32 +20,32 @@ exports[`modal_containers spec render delete notebooks modal 1`] = `
       </EuiText>
       <EuiSpacer />
       <EuiForm>
-        <EuiFormRow
+        <EuiCompressedFormRow
           describedByIds={Array []}
-          display="row"
+          display="rowCompressed"
           fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           label="To confirm deletion, enter \\"delete\\" in the text field"
           labelType="label"
         >
-          <EuiFieldText
+          <EuiCompressedFieldText
             data-test-subj="delete-notebook-modal-input"
             name="input"
             onChange={[Function]}
             placeholder="delete"
             value=""
           />
-        </EuiFormRow>
+        </EuiCompressedFormRow>
       </EuiForm>
     </EuiModalBody>
     <EuiModalFooter>
-      <EuiButtonEmpty
+      <EuiSmallButtonEmpty
         onClick={[MockFunction]}
       >
         Cancel
-      </EuiButtonEmpty>
-      <EuiButton
+      </EuiSmallButtonEmpty>
+      <EuiSmallButton
         color="danger"
         data-test-subj="delete-notebook-modal-delete-button"
         disabled={true}
@@ -53,7 +53,7 @@ exports[`modal_containers spec render delete notebooks modal 1`] = `
         onClick={[Function]}
       >
         Delete
-      </EuiButton>
+      </EuiSmallButton>
     </EuiModalFooter>
   </EuiModal>
 </EuiOverlayMask>
@@ -74,9 +74,9 @@ exports[`modal_containers spec render get custom modal 1`] = `
     </EuiModalHeader>
     <EuiModalBody>
       <EuiForm>
-        <EuiFormRow
+        <EuiCompressedFormRow
           describedByIds={Array []}
-          display="row"
+          display="rowCompressed"
           fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
@@ -84,28 +84,28 @@ exports[`modal_containers spec render get custom modal 1`] = `
           label="label"
           labelType="label"
         >
-          <EuiFieldText
+          <EuiCompressedFieldText
             data-test-subj="custom-input-modal-input"
             name="input"
             onChange={[Function]}
             value="mock-path"
           />
-        </EuiFormRow>
+        </EuiCompressedFormRow>
       </EuiForm>
     </EuiModalBody>
     <EuiModalFooter>
-      <EuiButtonEmpty
+      <EuiSmallButtonEmpty
         onClick={[MockFunction]}
       >
         Cancel
-      </EuiButtonEmpty>
-      <EuiButton
+      </EuiSmallButtonEmpty>
+      <EuiSmallButton
         data-test-subj="custom-input-modal-confirm-button"
         fill={true}
         onClick={[Function]}
       >
         Confirm
-      </EuiButton>
+      </EuiSmallButton>
     </EuiModalFooter>
   </EuiModal>
 </EuiOverlayMask>
diff --git a/public/components/notebooks/components/helpers/custom_modals/__tests__/__snapshots__/custom_input_modal.test.tsx.snap b/public/components/notebooks/components/helpers/custom_modals/__tests__/__snapshots__/custom_input_modal.test.tsx.snap
index 69461a2540..e90e493993 100644
--- a/public/components/notebooks/components/helpers/custom_modals/__tests__/__snapshots__/custom_input_modal.test.tsx.snap
+++ b/public/components/notebooks/components/helpers/custom_modals/__tests__/__snapshots__/custom_input_modal.test.tsx.snap
@@ -13,9 +13,9 @@ exports[`<CustomInputModal /> spec renders the component 1`] = `
     </EuiModalHeader>
     <EuiModalBody>
       <EuiForm>
-        <EuiFormRow
+        <EuiCompressedFormRow
           describedByIds={Array []}
-          display="row"
+          display="rowCompressed"
           fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
@@ -23,28 +23,28 @@ exports[`<CustomInputModal /> spec renders the component 1`] = `
           label="label"
           labelType="label"
         >
-          <EuiFieldText
+          <EuiCompressedFieldText
             data-test-subj="custom-input-modal-input"
             name="input"
             onChange={[Function]}
             value="mock-path"
           />
-        </EuiFormRow>
+        </EuiCompressedFormRow>
       </EuiForm>
     </EuiModalBody>
     <EuiModalFooter>
-      <EuiButtonEmpty
+      <EuiSmallButtonEmpty
         onClick={[MockFunction]}
       >
         Cancel
-      </EuiButtonEmpty>
-      <EuiButton
+      </EuiSmallButtonEmpty>
+      <EuiSmallButton
         data-test-subj="custom-input-modal-confirm-button"
         fill={true}
         onClick={[Function]}
       >
         Confirm
-      </EuiButton>
+      </EuiSmallButton>
     </EuiModalFooter>
   </EuiModal>
 </EuiOverlayMask>
@@ -63,9 +63,9 @@ exports[`<CustomInputModal /> spec renders the component 2`] = `
     </EuiModalHeader>
     <EuiModalBody>
       <EuiForm>
-        <EuiFormRow
+        <EuiCompressedFormRow
           describedByIds={Array []}
-          display="row"
+          display="rowCompressed"
           fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
@@ -73,28 +73,28 @@ exports[`<CustomInputModal /> spec renders the component 2`] = `
           label="label"
           labelType="label"
         >
-          <EuiFieldText
+          <EuiCompressedFieldText
             data-test-subj="custom-input-modal-input"
             name="input"
             onChange={[Function]}
             value=""
           />
-        </EuiFormRow>
+        </EuiCompressedFormRow>
       </EuiForm>
     </EuiModalBody>
     <EuiModalFooter>
-      <EuiButtonEmpty
+      <EuiSmallButtonEmpty
         onClick={[MockFunction]}
       >
         Cancel
-      </EuiButtonEmpty>
-      <EuiButton
+      </EuiSmallButtonEmpty>
+      <EuiSmallButton
         data-test-subj="custom-input-modal-confirm-button"
         fill={true}
         onClick={[Function]}
       >
         Confirm
-      </EuiButton>
+      </EuiSmallButton>
     </EuiModalFooter>
   </EuiModal>
 </EuiOverlayMask>
diff --git a/public/components/notebooks/components/notebook.tsx b/public/components/notebooks/components/notebook.tsx
index 1862fc4306..146dcbc935 100644
--- a/public/components/notebooks/components/notebook.tsx
+++ b/public/components/notebooks/components/notebook.tsx
@@ -1098,12 +1098,12 @@ export class Notebook extends Component<NotebookProps, NotebookState> {
                     </EuiSmallButton>
                   </EuiFlexItem>
                   <EuiFlexItem grow={false}>
-                    <EuiButton
+                    <EuiSmallButton
                       data-test-subj="delete-notebook"
                       onClick={() => this.showDeleteNotebookModal()}
                     >
                       Delete this notebook
-                    </EuiButton>
+                    </EuiSmallButton>
                   </EuiFlexItem>
                 </>
               )}
diff --git a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_input.test.tsx.snap b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_input.test.tsx.snap
index 07c3e28155..baf6b48136 100644
--- a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_input.test.tsx.snap
+++ b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_input.test.tsx.snap
@@ -69,7 +69,7 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
       class="euiFlexItem euiFlexItem--flexGrow6"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow euiFormRow--fullWidth euiFormRow--compressed"
         id="random_html_id-row"
       >
         <div
@@ -88,17 +88,17 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
           <div
             aria-expanded="false"
             aria-haspopup="listbox"
-            class="euiComboBox"
+            class="euiComboBox euiComboBox--compressed"
             role="combobox"
           >
             <div
-              class="euiFormControlLayout"
+              class="euiFormControlLayout euiFormControlLayout--compressed"
             >
               <div
                 class="euiFormControlLayout__childrenWrapper"
               >
                 <div
-                  class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isClearable"
+                  class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isClearable"
                   data-test-subj="comboBoxInput"
                   tabindex="-1"
                 >
@@ -129,7 +129,7 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
                 >
                   <button
                     aria-label="Clear input"
-                    class="euiFormControlLayoutClearButton"
+                    class="euiFormControlLayoutClearButton euiFormControlLayoutClearButton--small"
                     data-test-subj="comboBoxClearButton"
                     type="button"
                   >
@@ -156,7 +156,7 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
                   >
                     <svg
                       aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                      class="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height="16"
                       role="img"
@@ -180,7 +180,7 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
       class="euiFlexItem euiFlexItem--flexGrowZero"
     >
       <button
-        class="euiButton euiButton--primary"
+        class="euiButton euiButton--primary euiButton--small"
         data-test-subj="para-input-visualization-browse-button"
         type="button"
       >
@@ -202,7 +202,7 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
       class="euiFlexItem euiFlexItem--flexGrow9"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow euiFormRow--fullWidth euiFormRow--compressed"
         id="random_html_id-row"
       >
         <div
diff --git a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap
index ec8ae4936c..df03d616a8 100644
--- a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap
+++ b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
         [1] Code block 
         <button
           aria-label="Toggle show input"
-          class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+          class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
           data-test-subj="paragraphToggleInputBtn"
           type="button"
         >
@@ -49,7 +49,7 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
         >
           <button
             aria-label="Open paragraph menu"
-            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+            class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
             type="button"
           >
             <svg
@@ -84,7 +84,7 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
       class="euiSpacer euiSpacer--s"
     />
     <div
-      class="euiFormRow euiFormRow--fullWidth"
+      class="euiFormRow euiFormRow--fullWidth euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -253,7 +253,7 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
         class="euiFlexItem euiFlexItem--flexGrowZero"
       >
         <button
-          class="euiButton euiButton--primary euiButton--fill"
+          class="euiButton euiButton--primary euiButton--small euiButton--fill"
           data-test-subj="runRefreshBtn-0"
           type="button"
         >
diff --git a/public/components/trace_analytics/components/common/__tests__/__snapshots__/helper_functions.test.tsx.snap b/public/components/trace_analytics/components/common/__tests__/__snapshots__/helper_functions.test.tsx.snap
index 0d6dad1ca0..2134ba8e61 100644
--- a/public/components/trace_analytics/components/common/__tests__/__snapshots__/helper_functions.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/__tests__/__snapshots__/helper_functions.test.tsx.snap
@@ -93,14 +93,14 @@ exports[`Helper functions renders no match and missing configuration messages 2`
 <Fragment>
   <EuiEmptyPrompt
     actions={
-      <EuiButton
+      <EuiSmallButton
         color="primary"
         iconSide="right"
         iconType="popout"
         onClick={[Function]}
       >
         Learn more
-      </EuiButton>
+      </EuiSmallButton>
     }
     body={
       <EuiText>
diff --git a/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap b/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
index 264f31b5fe..082f5b831f 100644
--- a/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
@@ -408,8 +408,8 @@ exports[`Search bar components renders search bar 1`] = `
         <div
           className="euiFlexItem"
         >
-          <EuiFieldSearch
-            compressed={false}
+          <EuiCompressedFieldSearch
+            compressed={true}
             data-test-subj="search-bar-input-box"
             fullWidth={true}
             incremental={false}
@@ -421,20 +421,20 @@ exports[`Search bar components renders search bar 1`] = `
             value="test"
           >
             <EuiFormControlLayout
-              compressed={false}
+              compressed={true}
               fullWidth={true}
               icon="search"
               isLoading={false}
             >
               <div
-                className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
               >
                 <div
                   className="euiFormControlLayout__childrenWrapper"
                 >
                   <EuiValidatableControl>
                     <input
-                      className="euiFieldSearch euiFieldSearch--fullWidth"
+                      className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
                       data-test-subj="search-bar-input-box"
                       onChange={[Function]}
                       onKeyUp={[Function]}
@@ -444,7 +444,7 @@ exports[`Search bar components renders search bar 1`] = `
                     />
                   </EuiValidatableControl>
                   <EuiFormControlLayoutIcons
-                    compressed={false}
+                    compressed={true}
                     icon="search"
                     isLoading={false}
                   >
@@ -452,7 +452,7 @@ exports[`Search bar components renders search bar 1`] = `
                       className="euiFormControlLayoutIcons"
                     >
                       <EuiFormControlLayoutCustomIcon
-                        size="m"
+                        size="s"
                         type="search"
                       >
                         <span
@@ -461,19 +461,19 @@ exports[`Search bar components renders search bar 1`] = `
                           <EuiIcon
                             aria-hidden="true"
                             className="euiFormControlLayoutCustomIcon__icon"
-                            size="m"
+                            size="s"
                             type="search"
                           >
                             <EuiIconBeaker
                               aria-hidden={true}
-                              className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                              className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                               focusable="false"
                               role="img"
                               style={null}
                             >
                               <svg
                                 aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                 focusable="false"
                                 height={16}
                                 role="img"
@@ -495,7 +495,7 @@ exports[`Search bar components renders search bar 1`] = `
                 </div>
               </div>
             </EuiFormControlLayout>
-          </EuiFieldSearch>
+          </EuiCompressedFieldSearch>
         </div>
       </EuiFlexItem>
       <EuiFlexItem
@@ -903,89 +903,98 @@ exports[`Search bar components renders search bar 1`] = `
         <div
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
-          <EuiButton
+          <EuiSmallButton
             data-click-metric-element="trace_analytics.refresh_button"
             data-test-subj="superDatePickerApplyTimeButton"
             iconType="refresh"
             onClick={[Function]}
           >
-            <EuiButtonDisplay
-              baseClassName="euiButton"
+            <EuiButton
               data-click-metric-element="trace_analytics.refresh_button"
               data-test-subj="superDatePickerApplyTimeButton"
-              disabled={false}
-              element="button"
               iconType="refresh"
-              isDisabled={false}
               onClick={[Function]}
-              type="button"
+              size="s"
             >
-              <button
-                className="euiButton euiButton--primary"
+              <EuiButtonDisplay
+                baseClassName="euiButton"
                 data-click-metric-element="trace_analytics.refresh_button"
                 data-test-subj="superDatePickerApplyTimeButton"
                 disabled={false}
+                element="button"
+                iconType="refresh"
+                isDisabled={false}
                 onClick={[Function]}
-                style={
-                  Object {
-                    "minWidth": undefined,
-                  }
-                }
+                size="s"
                 type="button"
               >
-                <EuiButtonContent
-                  className="euiButton__content"
-                  iconSide="left"
-                  iconType="refresh"
-                  textProps={
+                <button
+                  className="euiButton euiButton--primary euiButton--small"
+                  data-click-metric-element="trace_analytics.refresh_button"
+                  data-test-subj="superDatePickerApplyTimeButton"
+                  disabled={false}
+                  onClick={[Function]}
+                  style={
                     Object {
-                      "className": "euiButton__text",
+                      "minWidth": undefined,
                     }
                   }
+                  type="button"
                 >
-                  <span
-                    className="euiButtonContent euiButton__content"
+                  <EuiButtonContent
+                    className="euiButton__content"
+                    iconSide="left"
+                    iconType="refresh"
+                    textProps={
+                      Object {
+                        "className": "euiButton__text",
+                      }
+                    }
                   >
-                    <EuiIcon
-                      className="euiButtonContent__icon"
-                      color="inherit"
-                      size="m"
-                      type="refresh"
+                    <span
+                      className="euiButtonContent euiButton__content"
                     >
-                      <EuiIconBeaker
-                        aria-hidden={true}
-                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                        focusable="false"
-                        role="img"
-                        style={null}
+                      <EuiIcon
+                        className="euiButtonContent__icon"
+                        color="inherit"
+                        size="m"
+                        type="refresh"
                       >
-                        <svg
+                        <EuiIconBeaker
                           aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                           focusable="false"
-                          height={16}
                           role="img"
                           style={null}
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
                         >
-                          <path
-                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                          />
-                        </svg>
-                      </EuiIconBeaker>
-                    </EuiIcon>
-                    <span
-                      className="euiButton__text"
-                    >
-                      Refresh
+                          <svg
+                            aria-hidden={true}
+                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                            focusable="false"
+                            height={16}
+                            role="img"
+                            style={null}
+                            viewBox="0 0 16 16"
+                            width={16}
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
+                        </EuiIconBeaker>
+                      </EuiIcon>
+                      <span
+                        className="euiButton__text"
+                      >
+                        Refresh
+                      </span>
                     </span>
-                  </span>
-                </EuiButtonContent>
-              </button>
-            </EuiButtonDisplay>
-          </EuiButton>
+                  </EuiButtonContent>
+                </button>
+              </EuiButtonDisplay>
+            </EuiButton>
+          </EuiSmallButton>
         </div>
       </EuiFlexItem>
     </div>
@@ -1033,7 +1042,7 @@ exports[`Search bar components renders search bar 1`] = `
               <EuiPopover
                 anchorPosition="rightUp"
                 button={
-                  <EuiButtonIcon
+                  <EuiSmallButtonIcon
                     aria-label="Change all filters"
                     iconType="filter"
                     onClick={[Function]}
@@ -1057,53 +1066,61 @@ exports[`Search bar components renders search bar 1`] = `
                   <div
                     className="euiPopover__anchor"
                   >
-                    <EuiButtonIcon
+                    <EuiSmallButtonIcon
                       aria-label="Change all filters"
                       iconType="filter"
                       onClick={[Function]}
                       title="Change all filters"
                     >
-                      <button
+                      <EuiButtonIcon
                         aria-label="Change all filters"
-                        className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                        disabled={false}
+                        iconType="filter"
                         onClick={[Function]}
+                        size="s"
                         title="Change all filters"
-                        type="button"
                       >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          color="inherit"
-                          size="m"
-                          type="filter"
+                        <button
+                          aria-label="Change all filters"
+                          className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                          disabled={false}
+                          onClick={[Function]}
+                          title="Change all filters"
+                          type="button"
                         >
-                          <EuiIconBeaker
-                            aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                            focusable="false"
-                            role="img"
-                            style={null}
+                          <EuiIcon
+                            aria-hidden="true"
+                            className="euiButtonIcon__icon"
+                            color="inherit"
+                            size="m"
+                            type="filter"
                           >
-                            <svg
+                            <EuiIconBeaker
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                               focusable="false"
-                              height={16}
                               role="img"
                               style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                              />
-                            </svg>
-                          </EuiIconBeaker>
-                        </EuiIcon>
-                      </button>
-                    </EuiButtonIcon>
+                              <svg
+                                aria-hidden={true}
+                                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
+                            </EuiIconBeaker>
+                          </EuiIcon>
+                        </button>
+                      </EuiButtonIcon>
+                    </EuiSmallButtonIcon>
                   </div>
                 </div>
               </EuiPopover>
diff --git a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
index fddb183b02..1e988ea2fe 100644
--- a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
@@ -55,9 +55,9 @@ exports[`Filter popover component renders filter popover 1`] = `
           <div
             className="euiFlexItem euiFlexItem--flexGrow6"
           >
-            <EuiFormRow
+            <EuiCompressedFormRow
               describedByIds={Array []}
-              display="row"
+              display="rowCompressed"
               fullWidth={false}
               hasChildLabel={true}
               hasEmptyLabelSpace={false}
@@ -65,7 +65,7 @@ exports[`Filter popover component renders filter popover 1`] = `
               labelType="label"
             >
               <div
-                className="euiFormRow"
+                className="euiFormRow euiFormRow--compressed"
                 id="random_html_id-row"
               >
                 <div
@@ -88,9 +88,9 @@ exports[`Filter popover component renders filter popover 1`] = `
                 <div
                   className="euiFormRow__fieldWrapper"
                 >
-                  <EuiComboBox
+                  <EuiCompressedComboBox
                     async={false}
-                    compressed={false}
+                    compressed={true}
                     fullWidth={false}
                     id="random_html_id"
                     isClearable={false}
@@ -128,13 +128,13 @@ exports[`Filter popover component renders filter popover 1`] = `
                     <div
                       aria-expanded={false}
                       aria-haspopup="listbox"
-                      className="euiComboBox"
+                      className="euiComboBox euiComboBox--compressed"
                       onKeyDown={[Function]}
                       role="combobox"
                     >
                       <EuiComboBoxInput
                         autoSizeInputRef={[Function]}
-                        compressed={false}
+                        compressed={true}
                         fullWidth={false}
                         hasSelectedOptions={false}
                         id="random_html_id"
@@ -161,7 +161,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                         value=""
                       >
                         <EuiFormControlLayout
-                          compressed={false}
+                          compressed={true}
                           fullWidth={false}
                           icon={
                             Object {
@@ -176,13 +176,13 @@ exports[`Filter popover component renders filter popover 1`] = `
                           }
                         >
                           <div
-                            className="euiFormControlLayout"
+                            className="euiFormControlLayout euiFormControlLayout--compressed"
                           >
                             <div
                               className="euiFormControlLayout__childrenWrapper"
                             >
                               <div
-                                className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
+                                className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap"
                                 data-test-subj="comboBoxInput"
                                 onClick={[Function]}
                                 tabIndex={-1}
@@ -253,7 +253,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                                 </AutosizeInput>
                               </div>
                               <EuiFormControlLayoutIcons
-                                compressed={false}
+                                compressed={true}
                                 icon={
                                   Object {
                                     "aria-label": "Open list of options",
@@ -274,7 +274,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                                     data-test-subj="comboBoxToggleListButton"
                                     iconRef={[Function]}
                                     onClick={[Function]}
-                                    size="m"
+                                    size="s"
                                     type="arrowDown"
                                   >
                                     <button
@@ -287,19 +287,19 @@ exports[`Filter popover component renders filter popover 1`] = `
                                       <EuiIcon
                                         aria-hidden="true"
                                         className="euiFormControlLayoutCustomIcon__icon"
-                                        size="m"
+                                        size="s"
                                         type="arrowDown"
                                       >
                                         <EuiIconBeaker
                                           aria-hidden={true}
-                                          className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                          className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                           focusable="false"
                                           role="img"
                                           style={null}
                                         >
                                           <svg
                                             aria-hidden={true}
-                                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                             focusable="false"
                                             height={16}
                                             role="img"
@@ -323,10 +323,10 @@ exports[`Filter popover component renders filter popover 1`] = `
                         </EuiFormControlLayout>
                       </EuiComboBoxInput>
                     </div>
-                  </EuiComboBox>
+                  </EuiCompressedComboBox>
                 </div>
               </div>
-            </EuiFormRow>
+            </EuiCompressedFormRow>
           </div>
         </EuiFlexItem>
         <EuiFlexItem
@@ -335,9 +335,9 @@ exports[`Filter popover component renders filter popover 1`] = `
           <div
             className="euiFlexItem euiFlexItem--flexGrow5"
           >
-            <EuiFormRow
+            <EuiCompressedFormRow
               describedByIds={Array []}
-              display="row"
+              display="rowCompressed"
               fullWidth={false}
               hasChildLabel={true}
               hasEmptyLabelSpace={false}
@@ -345,7 +345,7 @@ exports[`Filter popover component renders filter popover 1`] = `
               labelType="label"
             >
               <div
-                className="euiFormRow"
+                className="euiFormRow euiFormRow--compressed"
                 id="random_html_id-row"
               >
                 <div
@@ -368,9 +368,9 @@ exports[`Filter popover component renders filter popover 1`] = `
                 <div
                   className="euiFormRow__fieldWrapper"
                 >
-                  <EuiComboBox
+                  <EuiCompressedComboBox
                     async={false}
-                    compressed={false}
+                    compressed={true}
                     fullWidth={false}
                     id="random_html_id"
                     isClearable={false}
@@ -391,13 +391,13 @@ exports[`Filter popover component renders filter popover 1`] = `
                     <div
                       aria-expanded={false}
                       aria-haspopup="listbox"
-                      className="euiComboBox euiComboBox-isDisabled"
+                      className="euiComboBox euiComboBox--compressed euiComboBox-isDisabled"
                       onKeyDown={[Function]}
                       role="combobox"
                     >
                       <EuiComboBoxInput
                         autoSizeInputRef={[Function]}
-                        compressed={false}
+                        compressed={true}
                         fullWidth={false}
                         hasSelectedOptions={false}
                         id="random_html_id"
@@ -425,7 +425,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                         value=""
                       >
                         <EuiFormControlLayout
-                          compressed={false}
+                          compressed={true}
                           fullWidth={false}
                           icon={
                             Object {
@@ -440,13 +440,13 @@ exports[`Filter popover component renders filter popover 1`] = `
                           }
                         >
                           <div
-                            className="euiFormControlLayout"
+                            className="euiFormControlLayout euiFormControlLayout--compressed"
                           >
                             <div
                               className="euiFormControlLayout__childrenWrapper"
                             >
                               <div
-                                className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
+                                className="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap"
                                 data-test-subj="comboBoxInput"
                                 onClick={[Function]}
                                 tabIndex={-1}
@@ -519,7 +519,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                                 </AutosizeInput>
                               </div>
                               <EuiFormControlLayoutIcons
-                                compressed={false}
+                                compressed={true}
                                 icon={
                                   Object {
                                     "aria-label": "Open list of options",
@@ -541,7 +541,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                                     disabled={true}
                                     iconRef={[Function]}
                                     onClick={[Function]}
-                                    size="m"
+                                    size="s"
                                     type="arrowDown"
                                   >
                                     <button
@@ -555,19 +555,19 @@ exports[`Filter popover component renders filter popover 1`] = `
                                       <EuiIcon
                                         aria-hidden="true"
                                         className="euiFormControlLayoutCustomIcon__icon"
-                                        size="m"
+                                        size="s"
                                         type="arrowDown"
                                       >
                                         <EuiIconBeaker
                                           aria-hidden={true}
-                                          className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                          className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                           focusable="false"
                                           role="img"
                                           style={null}
                                         >
                                           <svg
                                             aria-hidden={true}
-                                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                            className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                             focusable="false"
                                             height={16}
                                             role="img"
@@ -591,10 +591,10 @@ exports[`Filter popover component renders filter popover 1`] = `
                         </EuiFormControlLayout>
                       </EuiComboBoxInput>
                     </div>
-                  </EuiComboBox>
+                  </EuiCompressedComboBox>
                 </div>
               </div>
-            </EuiFormRow>
+            </EuiCompressedFormRow>
           </div>
         </EuiFlexItem>
       </div>
@@ -619,39 +619,45 @@ exports[`Filter popover component renders filter popover 1`] = `
           <div
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
-            <EuiButtonEmpty
+            <EuiSmallButtonEmpty
               data-test-subj="filter-popover-cancel-button"
               onClick={[MockFunction]}
             >
-              <button
-                className="euiButtonEmpty euiButtonEmpty--primary"
+              <EuiButtonEmpty
                 data-test-subj="filter-popover-cancel-button"
-                disabled={false}
                 onClick={[MockFunction]}
-                type="button"
+                size="s"
               >
-                <EuiButtonContent
-                  className="euiButtonEmpty__content"
-                  iconSide="left"
-                  iconSize="m"
-                  textProps={
-                    Object {
-                      "className": "euiButtonEmpty__text",
-                    }
-                  }
+                <button
+                  className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
+                  data-test-subj="filter-popover-cancel-button"
+                  disabled={false}
+                  onClick={[MockFunction]}
+                  type="button"
                 >
-                  <span
-                    className="euiButtonContent euiButtonEmpty__content"
+                  <EuiButtonContent
+                    className="euiButtonEmpty__content"
+                    iconSide="left"
+                    iconSize="m"
+                    textProps={
+                      Object {
+                        "className": "euiButtonEmpty__text",
+                      }
+                    }
                   >
                     <span
-                      className="euiButtonEmpty__text"
+                      className="euiButtonContent euiButtonEmpty__content"
                     >
-                      Cancel
+                      <span
+                        className="euiButtonEmpty__text"
+                      >
+                        Cancel
+                      </span>
                     </span>
-                  </span>
-                </EuiButtonContent>
-              </button>
-            </EuiButtonEmpty>
+                  </EuiButtonContent>
+                </button>
+              </EuiButtonEmpty>
+            </EuiSmallButtonEmpty>
           </div>
         </EuiFlexItem>
         <EuiFlexItem
@@ -660,53 +666,61 @@ exports[`Filter popover component renders filter popover 1`] = `
           <div
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
-            <EuiButton
+            <EuiSmallButton
               disabled={true}
               fill={true}
               onClick={[Function]}
             >
-              <EuiButtonDisplay
-                baseClassName="euiButton"
+              <EuiButton
                 disabled={true}
-                element="button"
                 fill={true}
-                isDisabled={true}
                 onClick={[Function]}
-                type="button"
+                size="s"
               >
-                <button
-                  className="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                <EuiButtonDisplay
+                  baseClassName="euiButton"
                   disabled={true}
+                  element="button"
+                  fill={true}
+                  isDisabled={true}
                   onClick={[Function]}
-                  style={
-                    Object {
-                      "minWidth": undefined,
-                    }
-                  }
+                  size="s"
                   type="button"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="left"
-                    textProps={
+                  <button
+                    className="euiButton euiButton--primary euiButton--small euiButton--fill euiButton-isDisabled"
+                    disabled={true}
+                    onClick={[Function]}
+                    style={
                       Object {
-                        "className": "euiButton__text",
+                        "minWidth": undefined,
                       }
                     }
+                    type="button"
                   >
-                    <span
-                      className="euiButtonContent euiButton__content"
+                    <EuiButtonContent
+                      className="euiButton__content"
+                      iconSide="left"
+                      textProps={
+                        Object {
+                          "className": "euiButton__text",
+                        }
+                      }
                     >
                       <span
-                        className="euiButton__text"
+                        className="euiButtonContent euiButton__content"
                       >
-                        Save
+                        <span
+                          className="euiButton__text"
+                        >
+                          Save
+                        </span>
                       </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
-            </EuiButton>
+                    </EuiButtonContent>
+                  </button>
+                </EuiButtonDisplay>
+              </EuiButton>
+            </EuiSmallButton>
           </div>
         </EuiFlexItem>
       </div>
diff --git a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_helpers.test.tsx.snap b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_helpers.test.tsx.snap
index 48b5ff946e..064bc81b96 100644
--- a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_helpers.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_helpers.test.tsx.snap
@@ -9,9 +9,9 @@ Array [
       className="euiSpacer euiSpacer--s"
     />
   </EuiSpacer>,
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -19,7 +19,7 @@ Array [
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -121,7 +121,7 @@ Array [
         </EuiFormControlLayoutDelimited>
       </div>
     </div>
-  </EuiFormRow>,
+  </EuiCompressedFormRow>,
 ]
 `;
 
@@ -134,9 +134,9 @@ Array [
       className="euiSpacer euiSpacer--s"
     />
   </EuiSpacer>,
-  <EuiFormRow
+  <EuiCompressedFormRow
     describedByIds={Array []}
-    display="row"
+    display="rowCompressed"
     fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
@@ -144,7 +144,7 @@ Array [
     labelType="label"
   >
     <div
-      className="euiFormRow"
+      className="euiFormRow euiFormRow--compressed"
       id="random_html_id-row"
     >
       <div
@@ -167,7 +167,7 @@ Array [
       <div
         className="euiFormRow__fieldWrapper"
       >
-        <EuiFieldText
+        <EuiCompressedFieldText
           id="random_html_id"
           onBlur={[Function]}
           onChange={[Function]}
@@ -175,35 +175,48 @@ Array [
           placeholder="Enter a value"
           value={0}
         >
-          <EuiFormControlLayout
-            fullWidth={false}
-            inputId="random_html_id"
+          <EuiFieldText
+            compressed={true}
+            id="random_html_id"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            placeholder="Enter a value"
+            value={0}
           >
-            <div
-              className="euiFormControlLayout"
+            <EuiFormControlLayout
+              compressed={true}
+              fullWidth={false}
+              inputId="random_html_id"
             >
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                className="euiFormControlLayout euiFormControlLayout--compressed"
               >
-                <EuiValidatableControl>
-                  <input
-                    className="euiFieldText"
-                    id="random_html_id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    placeholder="Enter a value"
-                    type="text"
-                    value={0}
+                <div
+                  className="euiFormControlLayout__childrenWrapper"
+                >
+                  <EuiValidatableControl>
+                    <input
+                      className="euiFieldText euiFieldText--compressed"
+                      id="random_html_id"
+                      onBlur={[Function]}
+                      onChange={[Function]}
+                      onFocus={[Function]}
+                      placeholder="Enter a value"
+                      type="text"
+                      value={0}
+                    />
+                  </EuiValidatableControl>
+                  <EuiFormControlLayoutIcons
+                    compressed={true}
                   />
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons />
+                </div>
               </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiFieldText>
+            </EuiFormControlLayout>
+          </EuiFieldText>
+        </EuiCompressedFieldText>
       </div>
     </div>
-  </EuiFormRow>,
+  </EuiCompressedFormRow>,
 ]
 `;
diff --git a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
index e886fa6400..a32700c7b7 100644
--- a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
@@ -35,7 +35,7 @@ exports[`Filter component renders filters 1`] = `
             <EuiPopover
               anchorPosition="rightUp"
               button={
-                <EuiButtonIcon
+                <EuiSmallButtonIcon
                   aria-label="Change all filters"
                   iconType="filter"
                   onClick={[Function]}
@@ -59,53 +59,61 @@ exports[`Filter component renders filters 1`] = `
                 <div
                   className="euiPopover__anchor"
                 >
-                  <EuiButtonIcon
+                  <EuiSmallButtonIcon
                     aria-label="Change all filters"
                     iconType="filter"
                     onClick={[Function]}
                     title="Change all filters"
                   >
-                    <button
+                    <EuiButtonIcon
                       aria-label="Change all filters"
-                      className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                      disabled={false}
+                      iconType="filter"
                       onClick={[Function]}
+                      size="s"
                       title="Change all filters"
-                      type="button"
                     >
-                      <EuiIcon
-                        aria-hidden="true"
-                        className="euiButtonIcon__icon"
-                        color="inherit"
-                        size="m"
-                        type="filter"
+                      <button
+                        aria-label="Change all filters"
+                        className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                        disabled={false}
+                        onClick={[Function]}
+                        title="Change all filters"
+                        type="button"
                       >
-                        <EuiIconBeaker
-                          aria-hidden={true}
-                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                          focusable="false"
-                          role="img"
-                          style={null}
+                        <EuiIcon
+                          aria-hidden="true"
+                          className="euiButtonIcon__icon"
+                          color="inherit"
+                          size="m"
+                          type="filter"
                         >
-                          <svg
+                          <EuiIconBeaker
                             aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
-                            height={16}
                             role="img"
                             style={null}
-                            viewBox="0 0 16 16"
-                            width={16}
-                            xmlns="http://www.w3.org/2000/svg"
                           >
-                            <path
-                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                            />
-                          </svg>
-                        </EuiIconBeaker>
-                      </EuiIcon>
-                    </button>
-                  </EuiButtonIcon>
+                            <svg
+                              aria-hidden={true}
+                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                              focusable="false"
+                              height={16}
+                              role="img"
+                              style={null}
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
+                          </EuiIconBeaker>
+                        </EuiIcon>
+                      </button>
+                    </EuiButtonIcon>
+                  </EuiSmallButtonIcon>
                 </div>
               </div>
             </EuiPopover>
diff --git a/public/components/trace_analytics/components/common/plots/__tests__/__snapshots__/service_map.test.tsx.snap b/public/components/trace_analytics/components/common/plots/__tests__/__snapshots__/service_map.test.tsx.snap
index 7be6207757..a048c67739 100644
--- a/public/components/trace_analytics/components/common/plots/__tests__/__snapshots__/service_map.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/plots/__tests__/__snapshots__/service_map.test.tsx.snap
@@ -46,8 +46,8 @@ exports[`Service map component renders service map 1`] = `
         </EuiText>
       </EuiFlexItem>
       <EuiFlexItem>
-        <EuiFieldSearch
-          compressed={false}
+        <EuiCompressedFieldSearch
+          compressed={true}
           fullWidth={false}
           incremental={false}
           isClearable={true}
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
index f416ed9600..87ff562cc1 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
@@ -269,7 +269,7 @@ exports[`Dashboard component renders dashboard 1`] = `
       anchorClassName="eui-textTruncate"
       anchorPosition="downCenter"
       button={
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -280,7 +280,7 @@ exports[`Dashboard component renders dashboard 1`] = `
           title="data_prepper"
         >
           Data Prepper
-        </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       }
       className="eui-textTruncate"
       closePopover={[Function]}
@@ -296,7 +296,7 @@ exports[`Dashboard component renders dashboard 1`] = `
         <div
           className="euiPopover__anchor eui-textTruncate"
         >
-          <EuiButtonEmpty
+          <EuiSmallButtonEmpty
             className="dscIndexPattern__triggerButton"
             color="text"
             data-test-subj="indexPattern-switch-link"
@@ -306,68 +306,80 @@ exports[`Dashboard component renders dashboard 1`] = `
             onClick={[Function]}
             title="data_prepper"
           >
-            <button
-              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+            <EuiButtonEmpty
+              className="dscIndexPattern__triggerButton"
+              color="text"
               data-test-subj="indexPattern-switch-link"
-              disabled={false}
+              flush="left"
+              iconSide="right"
+              iconType="arrowDown"
               onClick={[Function]}
+              size="s"
               title="data_prepper"
-              type="button"
             >
-              <EuiButtonContent
-                className="euiButtonEmpty__content"
-                iconSide="right"
-                iconSize="m"
-                iconType="arrowDown"
-                textProps={
-                  Object {
-                    "className": "euiButtonEmpty__text",
-                  }
-                }
+              <button
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+                data-test-subj="indexPattern-switch-link"
+                disabled={false}
+                onClick={[Function]}
+                title="data_prepper"
+                type="button"
               >
-                <span
-                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="right"
+                  iconSize="m"
+                  iconType="arrowDown"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text",
+                    }
+                  }
                 >
-                  <EuiIcon
-                    className="euiButtonContent__icon"
-                    color="inherit"
-                    size="m"
-                    type="arrowDown"
+                  <span
+                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <EuiIconArrowDown
-                      aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      role="img"
-                      style={null}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowDown"
                     >
-                      <svg
+                      <EuiIconArrowDown
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                         focusable="false"
-                        height={16}
                         role="img"
                         style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                          fillRule="non-zero"
-                        />
-                      </svg>
-                    </EuiIconArrowDown>
-                  </EuiIcon>
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Data Prepper
+                        <svg
+                          aria-hidden={true}
+                          className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                          focusable="false"
+                          height={16}
+                          role="img"
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                            fillRule="non-zero"
+                          />
+                        </svg>
+                      </EuiIconArrowDown>
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Data Prepper
+                    </span>
                   </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonEmpty>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiSmallButtonEmpty>
         </div>
       </div>
     </EuiPopover>
@@ -1490,7 +1502,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
       anchorClassName="eui-textTruncate"
       anchorPosition="downCenter"
       button={
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -1501,7 +1513,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
           title="data_prepper"
         >
           Data Prepper
-        </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       }
       className="eui-textTruncate"
       closePopover={[Function]}
@@ -1517,7 +1529,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
         <div
           className="euiPopover__anchor eui-textTruncate"
         >
-          <EuiButtonEmpty
+          <EuiSmallButtonEmpty
             className="dscIndexPattern__triggerButton"
             color="text"
             data-test-subj="indexPattern-switch-link"
@@ -1527,67 +1539,79 @@ exports[`Dashboard component renders empty dashboard 1`] = `
             onClick={[Function]}
             title="data_prepper"
           >
-            <button
-              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+            <EuiButtonEmpty
+              className="dscIndexPattern__triggerButton"
+              color="text"
               data-test-subj="indexPattern-switch-link"
-              disabled={false}
+              flush="left"
+              iconSide="right"
+              iconType="arrowDown"
               onClick={[Function]}
+              size="s"
               title="data_prepper"
-              type="button"
             >
-              <EuiButtonContent
-                className="euiButtonEmpty__content"
-                iconSide="right"
-                iconSize="m"
-                iconType="arrowDown"
-                textProps={
-                  Object {
-                    "className": "euiButtonEmpty__text",
-                  }
-                }
+              <button
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+                data-test-subj="indexPattern-switch-link"
+                disabled={false}
+                onClick={[Function]}
+                title="data_prepper"
+                type="button"
               >
-                <span
-                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="right"
+                  iconSize="m"
+                  iconType="arrowDown"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text",
+                    }
+                  }
                 >
-                  <EuiIcon
-                    className="euiButtonContent__icon"
-                    color="inherit"
-                    size="m"
-                    type="arrowDown"
+                  <span
+                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <EuiIconBeaker
-                      aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                      focusable="false"
-                      role="img"
-                      style={null}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowDown"
                     >
-                      <svg
+                      <EuiIconBeaker
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                         focusable="false"
-                        height={16}
                         role="img"
                         style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                        />
-                      </svg>
-                    </EuiIconBeaker>
-                  </EuiIcon>
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Data Prepper
+                        <svg
+                          aria-hidden={true}
+                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                          focusable="false"
+                          height={16}
+                          role="img"
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                          />
+                        </svg>
+                      </EuiIconBeaker>
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Data Prepper
+                    </span>
                   </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonEmpty>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiSmallButtonEmpty>
         </div>
       </div>
     </EuiPopover>
@@ -2711,7 +2735,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
       anchorClassName="eui-textTruncate"
       anchorPosition="downCenter"
       button={
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -2722,7 +2746,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
           title="jaeger"
         >
           Jaeger
-        </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       }
       className="eui-textTruncate"
       closePopover={[Function]}
@@ -2738,7 +2762,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
         <div
           className="euiPopover__anchor eui-textTruncate"
         >
-          <EuiButtonEmpty
+          <EuiSmallButtonEmpty
             className="dscIndexPattern__triggerButton"
             color="text"
             data-test-subj="indexPattern-switch-link"
@@ -2748,68 +2772,80 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
             onClick={[Function]}
             title="jaeger"
           >
-            <button
-              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+            <EuiButtonEmpty
+              className="dscIndexPattern__triggerButton"
+              color="text"
               data-test-subj="indexPattern-switch-link"
-              disabled={false}
+              flush="left"
+              iconSide="right"
+              iconType="arrowDown"
               onClick={[Function]}
+              size="s"
               title="jaeger"
-              type="button"
             >
-              <EuiButtonContent
-                className="euiButtonEmpty__content"
-                iconSide="right"
-                iconSize="m"
-                iconType="arrowDown"
-                textProps={
-                  Object {
-                    "className": "euiButtonEmpty__text",
-                  }
-                }
+              <button
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+                data-test-subj="indexPattern-switch-link"
+                disabled={false}
+                onClick={[Function]}
+                title="jaeger"
+                type="button"
               >
-                <span
-                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="right"
+                  iconSize="m"
+                  iconType="arrowDown"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text",
+                    }
+                  }
                 >
-                  <EuiIcon
-                    className="euiButtonContent__icon"
-                    color="inherit"
-                    size="m"
-                    type="arrowDown"
+                  <span
+                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <EuiIconArrowDown
-                      aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      role="img"
-                      style={null}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowDown"
                     >
-                      <svg
+                      <EuiIconArrowDown
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                         focusable="false"
-                        height={16}
                         role="img"
                         style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                          fillRule="non-zero"
-                        />
-                      </svg>
-                    </EuiIconArrowDown>
-                  </EuiIcon>
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Jaeger
+                        <svg
+                          aria-hidden={true}
+                          className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                          focusable="false"
+                          height={16}
+                          role="img"
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                            fillRule="non-zero"
+                          />
+                        </svg>
+                      </EuiIconArrowDown>
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Jaeger
+                    </span>
                   </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonEmpty>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiSmallButtonEmpty>
         </div>
       </div>
     </EuiPopover>
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap
index 95690a4bae..d466c9859d 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap
@@ -21,7 +21,7 @@ exports[`Mode picker component renders mode picker 1`] = `
     anchorClassName="eui-textTruncate"
     anchorPosition="downCenter"
     button={
-      <EuiButtonEmpty
+      <EuiSmallButtonEmpty
         className="dscIndexPattern__triggerButton"
         color="text"
         data-test-subj="indexPattern-switch-link"
@@ -32,7 +32,7 @@ exports[`Mode picker component renders mode picker 1`] = `
         title="jaeger"
       >
         Jaeger
-      </EuiButtonEmpty>
+      </EuiSmallButtonEmpty>
     }
     className="eui-textTruncate"
     closePopover={[Function]}
@@ -48,7 +48,7 @@ exports[`Mode picker component renders mode picker 1`] = `
       <div
         className="euiPopover__anchor eui-textTruncate"
       >
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -58,67 +58,79 @@ exports[`Mode picker component renders mode picker 1`] = `
           onClick={[Function]}
           title="jaeger"
         >
-          <button
-            className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+          <EuiButtonEmpty
+            className="dscIndexPattern__triggerButton"
+            color="text"
             data-test-subj="indexPattern-switch-link"
-            disabled={false}
+            flush="left"
+            iconSide="right"
+            iconType="arrowDown"
             onClick={[Function]}
+            size="s"
             title="jaeger"
-            type="button"
           >
-            <EuiButtonContent
-              className="euiButtonEmpty__content"
-              iconSide="right"
-              iconSize="m"
-              iconType="arrowDown"
-              textProps={
-                Object {
-                  "className": "euiButtonEmpty__text",
-                }
-              }
+            <button
+              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+              data-test-subj="indexPattern-switch-link"
+              disabled={false}
+              onClick={[Function]}
+              title="jaeger"
+              type="button"
             >
-              <span
-                className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+              <EuiButtonContent
+                className="euiButtonEmpty__content"
+                iconSide="right"
+                iconSize="m"
+                iconType="arrowDown"
+                textProps={
+                  Object {
+                    "className": "euiButtonEmpty__text",
+                  }
+                }
               >
-                <EuiIcon
-                  className="euiButtonContent__icon"
-                  color="inherit"
-                  size="m"
-                  type="arrowDown"
+                <span
+                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <EuiIconBeaker
-                    aria-hidden={true}
-                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                    focusable="false"
-                    role="img"
-                    style={null}
+                  <EuiIcon
+                    className="euiButtonContent__icon"
+                    color="inherit"
+                    size="m"
+                    type="arrowDown"
                   >
-                    <svg
+                    <EuiIconBeaker
                       aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                       focusable="false"
-                      height={16}
                       role="img"
                       style={null}
-                      viewBox="0 0 16 16"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <path
-                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                      />
-                    </svg>
-                  </EuiIconBeaker>
-                </EuiIcon>
-                <span
-                  className="euiButtonEmpty__text"
-                >
-                  Jaeger
+                      <svg
+                        aria-hidden={true}
+                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                        focusable="false"
+                        height={16}
+                        role="img"
+                        style={null}
+                        viewBox="0 0 16 16"
+                        width={16}
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
+                    </EuiIconBeaker>
+                  </EuiIcon>
+                  <span
+                    className="euiButtonEmpty__text"
+                  >
+                    Jaeger
+                  </span>
                 </span>
-              </span>
-            </EuiButtonContent>
-          </button>
-        </EuiButtonEmpty>
+              </EuiButtonContent>
+            </button>
+          </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       </div>
     </div>
   </EuiPopover>
@@ -146,7 +158,7 @@ exports[`Mode picker component renders mode picker 2`] = `
     anchorClassName="eui-textTruncate"
     anchorPosition="downCenter"
     button={
-      <EuiButtonEmpty
+      <EuiSmallButtonEmpty
         className="dscIndexPattern__triggerButton"
         color="text"
         data-test-subj="indexPattern-switch-link"
@@ -157,7 +169,7 @@ exports[`Mode picker component renders mode picker 2`] = `
         title="jaeger"
       >
         Jaeger
-      </EuiButtonEmpty>
+      </EuiSmallButtonEmpty>
     }
     className="eui-textTruncate"
     closePopover={[Function]}
@@ -173,7 +185,7 @@ exports[`Mode picker component renders mode picker 2`] = `
       <div
         className="euiPopover__anchor eui-textTruncate"
       >
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -183,67 +195,79 @@ exports[`Mode picker component renders mode picker 2`] = `
           onClick={[Function]}
           title="jaeger"
         >
-          <button
-            className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+          <EuiButtonEmpty
+            className="dscIndexPattern__triggerButton"
+            color="text"
             data-test-subj="indexPattern-switch-link"
-            disabled={false}
+            flush="left"
+            iconSide="right"
+            iconType="arrowDown"
             onClick={[Function]}
+            size="s"
             title="jaeger"
-            type="button"
           >
-            <EuiButtonContent
-              className="euiButtonEmpty__content"
-              iconSide="right"
-              iconSize="m"
-              iconType="arrowDown"
-              textProps={
-                Object {
-                  "className": "euiButtonEmpty__text",
-                }
-              }
+            <button
+              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+              data-test-subj="indexPattern-switch-link"
+              disabled={false}
+              onClick={[Function]}
+              title="jaeger"
+              type="button"
             >
-              <span
-                className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+              <EuiButtonContent
+                className="euiButtonEmpty__content"
+                iconSide="right"
+                iconSize="m"
+                iconType="arrowDown"
+                textProps={
+                  Object {
+                    "className": "euiButtonEmpty__text",
+                  }
+                }
               >
-                <EuiIcon
-                  className="euiButtonContent__icon"
-                  color="inherit"
-                  size="m"
-                  type="arrowDown"
+                <span
+                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <EuiIconBeaker
-                    aria-hidden={true}
-                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                    focusable="false"
-                    role="img"
-                    style={null}
+                  <EuiIcon
+                    className="euiButtonContent__icon"
+                    color="inherit"
+                    size="m"
+                    type="arrowDown"
                   >
-                    <svg
+                    <EuiIconBeaker
                       aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                       focusable="false"
-                      height={16}
                       role="img"
                       style={null}
-                      viewBox="0 0 16 16"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <path
-                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                      />
-                    </svg>
-                  </EuiIconBeaker>
-                </EuiIcon>
-                <span
-                  className="euiButtonEmpty__text"
-                >
-                  Jaeger
+                      <svg
+                        aria-hidden={true}
+                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                        focusable="false"
+                        height={16}
+                        role="img"
+                        style={null}
+                        viewBox="0 0 16 16"
+                        width={16}
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
+                    </EuiIconBeaker>
+                  </EuiIcon>
+                  <span
+                    className="euiButtonEmpty__text"
+                  >
+                    Jaeger
+                  </span>
                 </span>
-              </span>
-            </EuiButtonContent>
-          </button>
-        </EuiButtonEmpty>
+              </EuiButtonContent>
+            </button>
+          </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       </div>
       <EuiPortal>
         <Portal
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/mode_picker.test.tsx b/public/components/trace_analytics/components/dashboard/__tests__/mode_picker.test.tsx
index 66a46d31ce..2e447b41fb 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/mode_picker.test.tsx
+++ b/public/components/trace_analytics/components/dashboard/__tests__/mode_picker.test.tsx
@@ -24,7 +24,7 @@ describe('Mode picker component', () => {
     );
 
     expect(wrapper).toMatchSnapshot();
-    wrapper.find('[className="dscIndexPattern__triggerButton"]').simulate('click');
+    wrapper.find('EuiSmallButtonEmpty[className="dscIndexPattern__triggerButton"]').simulate('click');
     expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
index ed324808ee..9bf97cbe29 100644
--- a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
+++ b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
@@ -248,7 +248,7 @@ exports[`Services component renders empty services page 1`] = `
       anchorClassName="eui-textTruncate"
       anchorPosition="downCenter"
       button={
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -259,7 +259,7 @@ exports[`Services component renders empty services page 1`] = `
           title="data_prepper"
         >
           Data Prepper
-        </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       }
       className="eui-textTruncate"
       closePopover={[Function]}
@@ -275,7 +275,7 @@ exports[`Services component renders empty services page 1`] = `
         <div
           className="euiPopover__anchor eui-textTruncate"
         >
-          <EuiButtonEmpty
+          <EuiSmallButtonEmpty
             className="dscIndexPattern__triggerButton"
             color="text"
             data-test-subj="indexPattern-switch-link"
@@ -285,67 +285,79 @@ exports[`Services component renders empty services page 1`] = `
             onClick={[Function]}
             title="data_prepper"
           >
-            <button
-              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+            <EuiButtonEmpty
+              className="dscIndexPattern__triggerButton"
+              color="text"
               data-test-subj="indexPattern-switch-link"
-              disabled={false}
+              flush="left"
+              iconSide="right"
+              iconType="arrowDown"
               onClick={[Function]}
+              size="s"
               title="data_prepper"
-              type="button"
             >
-              <EuiButtonContent
-                className="euiButtonEmpty__content"
-                iconSide="right"
-                iconSize="m"
-                iconType="arrowDown"
-                textProps={
-                  Object {
-                    "className": "euiButtonEmpty__text",
-                  }
-                }
+              <button
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+                data-test-subj="indexPattern-switch-link"
+                disabled={false}
+                onClick={[Function]}
+                title="data_prepper"
+                type="button"
               >
-                <span
-                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="right"
+                  iconSize="m"
+                  iconType="arrowDown"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text",
+                    }
+                  }
                 >
-                  <EuiIcon
-                    className="euiButtonContent__icon"
-                    color="inherit"
-                    size="m"
-                    type="arrowDown"
+                  <span
+                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <EuiIconBeaker
-                      aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                      focusable="false"
-                      role="img"
-                      style={null}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowDown"
                     >
-                      <svg
+                      <EuiIconBeaker
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                         focusable="false"
-                        height={16}
                         role="img"
                         style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                        />
-                      </svg>
-                    </EuiIconBeaker>
-                  </EuiIcon>
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Data Prepper
+                        <svg
+                          aria-hidden={true}
+                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                          focusable="false"
+                          height={16}
+                          role="img"
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                          />
+                        </svg>
+                      </EuiIconBeaker>
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Data Prepper
+                    </span>
                   </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonEmpty>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiSmallButtonEmpty>
         </div>
       </div>
     </EuiPopover>
@@ -617,8 +629,8 @@ exports[`Services component renders empty services page 1`] = `
             <div
               className="euiFlexItem"
             >
-              <EuiFieldSearch
-                compressed={false}
+              <EuiCompressedFieldSearch
+                compressed={true}
                 data-test-subj="search-bar-input-box"
                 fullWidth={true}
                 incremental={false}
@@ -630,20 +642,20 @@ exports[`Services component renders empty services page 1`] = `
                 value=""
               >
                 <EuiFormControlLayout
-                  compressed={false}
+                  compressed={true}
                   fullWidth={true}
                   icon="search"
                   isLoading={false}
                 >
                   <div
-                    className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <EuiValidatableControl>
                         <input
-                          className="euiFieldSearch euiFieldSearch--fullWidth"
+                          className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
                           data-test-subj="search-bar-input-box"
                           onChange={[Function]}
                           onKeyUp={[Function]}
@@ -653,7 +665,7 @@ exports[`Services component renders empty services page 1`] = `
                         />
                       </EuiValidatableControl>
                       <EuiFormControlLayoutIcons
-                        compressed={false}
+                        compressed={true}
                         icon="search"
                         isLoading={false}
                       >
@@ -661,7 +673,7 @@ exports[`Services component renders empty services page 1`] = `
                           className="euiFormControlLayoutIcons"
                         >
                           <EuiFormControlLayoutCustomIcon
-                            size="m"
+                            size="s"
                             type="search"
                           >
                             <span
@@ -670,19 +682,19 @@ exports[`Services component renders empty services page 1`] = `
                               <EuiIcon
                                 aria-hidden="true"
                                 className="euiFormControlLayoutCustomIcon__icon"
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <EuiIconBeaker
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   role="img"
                                   style={null}
                                 >
                                   <svg
                                     aria-hidden={true}
-                                    className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                    className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height={16}
                                     role="img"
@@ -704,7 +716,7 @@ exports[`Services component renders empty services page 1`] = `
                     </div>
                   </div>
                 </EuiFormControlLayout>
-              </EuiFieldSearch>
+              </EuiCompressedFieldSearch>
             </div>
           </EuiFlexItem>
           <EuiFlexItem
@@ -1110,89 +1122,98 @@ exports[`Services component renders empty services page 1`] = `
             <div
               className="euiFlexItem euiFlexItem--flexGrowZero"
             >
-              <EuiButton
+              <EuiSmallButton
                 data-click-metric-element="trace_analytics.refresh_button"
                 data-test-subj="superDatePickerApplyTimeButton"
                 iconType="refresh"
                 onClick={[Function]}
               >
-                <EuiButtonDisplay
-                  baseClassName="euiButton"
+                <EuiButton
                   data-click-metric-element="trace_analytics.refresh_button"
                   data-test-subj="superDatePickerApplyTimeButton"
-                  disabled={false}
-                  element="button"
                   iconType="refresh"
-                  isDisabled={false}
                   onClick={[Function]}
-                  type="button"
+                  size="s"
                 >
-                  <button
-                    className="euiButton euiButton--primary"
+                  <EuiButtonDisplay
+                    baseClassName="euiButton"
                     data-click-metric-element="trace_analytics.refresh_button"
                     data-test-subj="superDatePickerApplyTimeButton"
                     disabled={false}
+                    element="button"
+                    iconType="refresh"
+                    isDisabled={false}
                     onClick={[Function]}
-                    style={
-                      Object {
-                        "minWidth": undefined,
-                      }
-                    }
+                    size="s"
                     type="button"
                   >
-                    <EuiButtonContent
-                      className="euiButton__content"
-                      iconSide="left"
-                      iconType="refresh"
-                      textProps={
+                    <button
+                      className="euiButton euiButton--primary euiButton--small"
+                      data-click-metric-element="trace_analytics.refresh_button"
+                      data-test-subj="superDatePickerApplyTimeButton"
+                      disabled={false}
+                      onClick={[Function]}
+                      style={
                         Object {
-                          "className": "euiButton__text",
+                          "minWidth": undefined,
                         }
                       }
+                      type="button"
                     >
-                      <span
-                        className="euiButtonContent euiButton__content"
+                      <EuiButtonContent
+                        className="euiButton__content"
+                        iconSide="left"
+                        iconType="refresh"
+                        textProps={
+                          Object {
+                            "className": "euiButton__text",
+                          }
+                        }
                       >
-                        <EuiIcon
-                          className="euiButtonContent__icon"
-                          color="inherit"
-                          size="m"
-                          type="refresh"
+                        <span
+                          className="euiButtonContent euiButton__content"
                         >
-                          <EuiIconBeaker
-                            aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                            focusable="false"
-                            role="img"
-                            style={null}
+                          <EuiIcon
+                            className="euiButtonContent__icon"
+                            color="inherit"
+                            size="m"
+                            type="refresh"
                           >
-                            <svg
+                            <EuiIconBeaker
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                               focusable="false"
-                              height={16}
                               role="img"
                               style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                              />
-                            </svg>
-                          </EuiIconBeaker>
-                        </EuiIcon>
-                        <span
-                          className="euiButton__text"
-                        >
-                          Refresh
+                              <svg
+                                aria-hidden={true}
+                                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
+                            </EuiIconBeaker>
+                          </EuiIcon>
+                          <span
+                            className="euiButton__text"
+                          >
+                            Refresh
+                          </span>
                         </span>
-                      </span>
-                    </EuiButtonContent>
-                  </button>
-                </EuiButtonDisplay>
-              </EuiButton>
+                      </EuiButtonContent>
+                    </button>
+                  </EuiButtonDisplay>
+                </EuiButton>
+              </EuiSmallButton>
             </div>
           </EuiFlexItem>
         </div>
@@ -1254,7 +1275,7 @@ exports[`Services component renders empty services page 1`] = `
                   <EuiPopover
                     anchorPosition="rightUp"
                     button={
-                      <EuiButtonIcon
+                      <EuiSmallButtonIcon
                         aria-label="Change all filters"
                         iconType="filter"
                         onClick={[Function]}
@@ -1278,53 +1299,61 @@ exports[`Services component renders empty services page 1`] = `
                       <div
                         className="euiPopover__anchor"
                       >
-                        <EuiButtonIcon
+                        <EuiSmallButtonIcon
                           aria-label="Change all filters"
                           iconType="filter"
                           onClick={[Function]}
                           title="Change all filters"
                         >
-                          <button
+                          <EuiButtonIcon
                             aria-label="Change all filters"
-                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            disabled={false}
+                            iconType="filter"
                             onClick={[Function]}
+                            size="s"
                             title="Change all filters"
-                            type="button"
                           >
-                            <EuiIcon
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              color="inherit"
-                              size="m"
-                              type="filter"
+                            <button
+                              aria-label="Change all filters"
+                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                              disabled={false}
+                              onClick={[Function]}
+                              title="Change all filters"
+                              type="button"
                             >
-                              <EuiIconBeaker
-                                aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                role="img"
-                                style={null}
+                              <EuiIcon
+                                aria-hidden="true"
+                                className="euiButtonIcon__icon"
+                                color="inherit"
+                                size="m"
+                                type="filter"
                               >
-                                <svg
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                   focusable="false"
-                                  height={16}
                                   role="img"
                                   style={null}
-                                  viewBox="0 0 16 16"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <path
-                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                  />
-                                </svg>
-                              </EuiIconBeaker>
-                            </EuiIcon>
-                          </button>
-                        </EuiButtonIcon>
+                                  <svg
+                                    aria-hidden={true}
+                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                    focusable="false"
+                                    height={16}
+                                    role="img"
+                                    style={null}
+                                    viewBox="0 0 16 16"
+                                    width={16}
+                                    xmlns="http://www.w3.org/2000/svg"
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
+                              </EuiIcon>
+                            </button>
+                          </EuiButtonIcon>
+                        </EuiSmallButtonIcon>
                       </div>
                     </div>
                   </EuiPopover>
@@ -2022,8 +2051,8 @@ exports[`Services component renders empty services page 1`] = `
                 <div
                   className="euiFlexItem"
                 >
-                  <EuiFieldSearch
-                    compressed={false}
+                  <EuiCompressedFieldSearch
+                    compressed={true}
                     fullWidth={false}
                     incremental={false}
                     isClearable={true}
@@ -2035,13 +2064,13 @@ exports[`Services component renders empty services page 1`] = `
                     value=""
                   >
                     <EuiFormControlLayout
-                      compressed={false}
+                      compressed={true}
                       fullWidth={false}
                       icon="search"
                       isLoading={false}
                     >
                       <div
-                        className="euiFormControlLayout"
+                        className="euiFormControlLayout euiFormControlLayout--compressed"
                       >
                         <div
                           className="euiFormControlLayout__childrenWrapper"
@@ -2050,7 +2079,7 @@ exports[`Services component renders empty services page 1`] = `
                             isInvalid={false}
                           >
                             <input
-                              className="euiFieldSearch"
+                              className="euiFieldSearch euiFieldSearch--compressed"
                               onChange={[Function]}
                               onKeyUp={[Function]}
                               placeholder="Service name"
@@ -2059,7 +2088,7 @@ exports[`Services component renders empty services page 1`] = `
                             />
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
-                            compressed={false}
+                            compressed={true}
                             icon="search"
                             isLoading={false}
                           >
@@ -2067,7 +2096,7 @@ exports[`Services component renders empty services page 1`] = `
                               className="euiFormControlLayoutIcons"
                             >
                               <EuiFormControlLayoutCustomIcon
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <span
@@ -2076,19 +2105,19 @@ exports[`Services component renders empty services page 1`] = `
                                   <EuiIcon
                                     aria-hidden="true"
                                     className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
+                                    size="s"
                                     type="search"
                                   >
                                     <EuiIconBeaker
                                       aria-hidden={true}
-                                      className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                      className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       role="img"
                                       style={null}
                                     >
                                       <svg
                                         aria-hidden={true}
-                                        className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                        className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height={16}
                                         role="img"
@@ -2110,7 +2139,7 @@ exports[`Services component renders empty services page 1`] = `
                         </div>
                       </div>
                     </EuiFormControlLayout>
-                  </EuiFieldSearch>
+                  </EuiCompressedFieldSearch>
                 </div>
               </EuiFlexItem>
             </div>
@@ -2462,7 +2491,7 @@ exports[`Services component renders jaeger services page 1`] = `
       anchorClassName="eui-textTruncate"
       anchorPosition="downCenter"
       button={
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -2473,7 +2502,7 @@ exports[`Services component renders jaeger services page 1`] = `
           title="jaeger"
         >
           Jaeger
-        </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       }
       className="eui-textTruncate"
       closePopover={[Function]}
@@ -2489,7 +2518,7 @@ exports[`Services component renders jaeger services page 1`] = `
         <div
           className="euiPopover__anchor eui-textTruncate"
         >
-          <EuiButtonEmpty
+          <EuiSmallButtonEmpty
             className="dscIndexPattern__triggerButton"
             color="text"
             data-test-subj="indexPattern-switch-link"
@@ -2499,68 +2528,80 @@ exports[`Services component renders jaeger services page 1`] = `
             onClick={[Function]}
             title="jaeger"
           >
-            <button
-              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+            <EuiButtonEmpty
+              className="dscIndexPattern__triggerButton"
+              color="text"
               data-test-subj="indexPattern-switch-link"
-              disabled={false}
+              flush="left"
+              iconSide="right"
+              iconType="arrowDown"
               onClick={[Function]}
+              size="s"
               title="jaeger"
-              type="button"
             >
-              <EuiButtonContent
-                className="euiButtonEmpty__content"
-                iconSide="right"
-                iconSize="m"
-                iconType="arrowDown"
-                textProps={
-                  Object {
-                    "className": "euiButtonEmpty__text",
-                  }
-                }
+              <button
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+                data-test-subj="indexPattern-switch-link"
+                disabled={false}
+                onClick={[Function]}
+                title="jaeger"
+                type="button"
               >
-                <span
-                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="right"
+                  iconSize="m"
+                  iconType="arrowDown"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text",
+                    }
+                  }
                 >
-                  <EuiIcon
-                    className="euiButtonContent__icon"
-                    color="inherit"
-                    size="m"
-                    type="arrowDown"
+                  <span
+                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <EuiIconArrowDown
-                      aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      role="img"
-                      style={null}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowDown"
                     >
-                      <svg
+                      <EuiIconArrowDown
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                         focusable="false"
-                        height={16}
                         role="img"
                         style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                          fillRule="non-zero"
-                        />
-                      </svg>
-                    </EuiIconArrowDown>
-                  </EuiIcon>
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Jaeger
+                        <svg
+                          aria-hidden={true}
+                          className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                          focusable="false"
+                          height={16}
+                          role="img"
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                            fillRule="non-zero"
+                          />
+                        </svg>
+                      </EuiIconArrowDown>
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Jaeger
+                    </span>
                   </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonEmpty>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiSmallButtonEmpty>
         </div>
       </div>
     </EuiPopover>
@@ -2832,8 +2873,8 @@ exports[`Services component renders jaeger services page 1`] = `
             <div
               className="euiFlexItem"
             >
-              <EuiFieldSearch
-                compressed={false}
+              <EuiCompressedFieldSearch
+                compressed={true}
                 data-test-subj="search-bar-input-box"
                 fullWidth={true}
                 incremental={false}
@@ -2845,20 +2886,20 @@ exports[`Services component renders jaeger services page 1`] = `
                 value=""
               >
                 <EuiFormControlLayout
-                  compressed={false}
+                  compressed={true}
                   fullWidth={true}
                   icon="search"
                   isLoading={false}
                 >
                   <div
-                    className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <EuiValidatableControl>
                         <input
-                          className="euiFieldSearch euiFieldSearch--fullWidth"
+                          className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
                           data-test-subj="search-bar-input-box"
                           onChange={[Function]}
                           onKeyUp={[Function]}
@@ -2868,7 +2909,7 @@ exports[`Services component renders jaeger services page 1`] = `
                         />
                       </EuiValidatableControl>
                       <EuiFormControlLayoutIcons
-                        compressed={false}
+                        compressed={true}
                         icon="search"
                         isLoading={false}
                       >
@@ -2876,7 +2917,7 @@ exports[`Services component renders jaeger services page 1`] = `
                           className="euiFormControlLayoutIcons"
                         >
                           <EuiFormControlLayoutCustomIcon
-                            size="m"
+                            size="s"
                             type="search"
                           >
                             <span
@@ -2885,19 +2926,19 @@ exports[`Services component renders jaeger services page 1`] = `
                               <EuiIcon
                                 aria-hidden="true"
                                 className="euiFormControlLayoutCustomIcon__icon"
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <EuiIconSearch
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   role="img"
                                   style={null}
                                 >
                                   <svg
                                     aria-hidden={true}
-                                    className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                    className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height={16}
                                     role="img"
@@ -2919,7 +2960,7 @@ exports[`Services component renders jaeger services page 1`] = `
                     </div>
                   </div>
                 </EuiFormControlLayout>
-              </EuiFieldSearch>
+              </EuiCompressedFieldSearch>
             </div>
           </EuiFlexItem>
           <EuiFlexItem
@@ -3327,89 +3368,98 @@ exports[`Services component renders jaeger services page 1`] = `
             <div
               className="euiFlexItem euiFlexItem--flexGrowZero"
             >
-              <EuiButton
+              <EuiSmallButton
                 data-click-metric-element="trace_analytics.refresh_button"
                 data-test-subj="superDatePickerApplyTimeButton"
                 iconType="refresh"
                 onClick={[Function]}
               >
-                <EuiButtonDisplay
-                  baseClassName="euiButton"
+                <EuiButton
                   data-click-metric-element="trace_analytics.refresh_button"
                   data-test-subj="superDatePickerApplyTimeButton"
-                  disabled={false}
-                  element="button"
                   iconType="refresh"
-                  isDisabled={false}
                   onClick={[Function]}
-                  type="button"
+                  size="s"
                 >
-                  <button
-                    className="euiButton euiButton--primary"
+                  <EuiButtonDisplay
+                    baseClassName="euiButton"
                     data-click-metric-element="trace_analytics.refresh_button"
                     data-test-subj="superDatePickerApplyTimeButton"
                     disabled={false}
+                    element="button"
+                    iconType="refresh"
+                    isDisabled={false}
                     onClick={[Function]}
-                    style={
-                      Object {
-                        "minWidth": undefined,
-                      }
-                    }
+                    size="s"
                     type="button"
                   >
-                    <EuiButtonContent
-                      className="euiButton__content"
-                      iconSide="left"
-                      iconType="refresh"
-                      textProps={
+                    <button
+                      className="euiButton euiButton--primary euiButton--small"
+                      data-click-metric-element="trace_analytics.refresh_button"
+                      data-test-subj="superDatePickerApplyTimeButton"
+                      disabled={false}
+                      onClick={[Function]}
+                      style={
                         Object {
-                          "className": "euiButton__text",
+                          "minWidth": undefined,
                         }
                       }
+                      type="button"
                     >
-                      <span
-                        className="euiButtonContent euiButton__content"
+                      <EuiButtonContent
+                        className="euiButton__content"
+                        iconSide="left"
+                        iconType="refresh"
+                        textProps={
+                          Object {
+                            "className": "euiButton__text",
+                          }
+                        }
                       >
-                        <EuiIcon
-                          className="euiButtonContent__icon"
-                          color="inherit"
-                          size="m"
-                          type="refresh"
+                        <span
+                          className="euiButtonContent euiButton__content"
                         >
-                          <EuiIconRefresh
-                            aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                            focusable="false"
-                            role="img"
-                            style={null}
+                          <EuiIcon
+                            className="euiButtonContent__icon"
+                            color="inherit"
+                            size="m"
+                            type="refresh"
                           >
-                            <svg
+                            <EuiIconRefresh
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                               focusable="false"
-                              height={16}
                               role="img"
                               style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
-                              />
-                            </svg>
-                          </EuiIconRefresh>
-                        </EuiIcon>
-                        <span
-                          className="euiButton__text"
-                        >
-                          Refresh
+                              <svg
+                                aria-hidden={true}
+                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
+                                />
+                              </svg>
+                            </EuiIconRefresh>
+                          </EuiIcon>
+                          <span
+                            className="euiButton__text"
+                          >
+                            Refresh
+                          </span>
                         </span>
-                      </span>
-                    </EuiButtonContent>
-                  </button>
-                </EuiButtonDisplay>
-              </EuiButton>
+                      </EuiButtonContent>
+                    </button>
+                  </EuiButtonDisplay>
+                </EuiButton>
+              </EuiSmallButton>
             </div>
           </EuiFlexItem>
         </div>
@@ -3471,7 +3521,7 @@ exports[`Services component renders jaeger services page 1`] = `
                   <EuiPopover
                     anchorPosition="rightUp"
                     button={
-                      <EuiButtonIcon
+                      <EuiSmallButtonIcon
                         aria-label="Change all filters"
                         iconType="filter"
                         onClick={[Function]}
@@ -3495,54 +3545,62 @@ exports[`Services component renders jaeger services page 1`] = `
                       <div
                         className="euiPopover__anchor"
                       >
-                        <EuiButtonIcon
+                        <EuiSmallButtonIcon
                           aria-label="Change all filters"
                           iconType="filter"
                           onClick={[Function]}
                           title="Change all filters"
                         >
-                          <button
+                          <EuiButtonIcon
                             aria-label="Change all filters"
-                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            disabled={false}
+                            iconType="filter"
                             onClick={[Function]}
+                            size="s"
                             title="Change all filters"
-                            type="button"
                           >
-                            <EuiIcon
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              color="inherit"
-                              size="m"
-                              type="filter"
+                            <button
+                              aria-label="Change all filters"
+                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                              disabled={false}
+                              onClick={[Function]}
+                              title="Change all filters"
+                              type="button"
                             >
-                              <EuiIconFilter
-                                aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                role="img"
-                                style={null}
+                              <EuiIcon
+                                aria-hidden="true"
+                                className="euiButtonIcon__icon"
+                                color="inherit"
+                                size="m"
+                                type="filter"
                               >
-                                <svg
+                                <EuiIconFilter
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
                                   focusable="false"
-                                  height={16}
                                   role="img"
                                   style={null}
-                                  viewBox="0 0 16 16"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <path
-                                    d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
-                                    fillRule="evenodd"
-                                  />
-                                </svg>
-                              </EuiIconFilter>
-                            </EuiIcon>
-                          </button>
-                        </EuiButtonIcon>
+                                  <svg
+                                    aria-hidden={true}
+                                    className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
+                                    focusable="false"
+                                    height={16}
+                                    role="img"
+                                    style={null}
+                                    viewBox="0 0 16 16"
+                                    width={16}
+                                    xmlns="http://www.w3.org/2000/svg"
+                                  >
+                                    <path
+                                      d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
+                                      fillRule="evenodd"
+                                    />
+                                  </svg>
+                                </EuiIconFilter>
+                              </EuiIcon>
+                            </button>
+                          </EuiButtonIcon>
+                        </EuiSmallButtonIcon>
                       </div>
                     </div>
                   </EuiPopover>
@@ -4109,7 +4167,7 @@ exports[`Services component renders services page 1`] = `
       anchorClassName="eui-textTruncate"
       anchorPosition="downCenter"
       button={
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -4120,7 +4178,7 @@ exports[`Services component renders services page 1`] = `
           title="data_prepper"
         >
           Data Prepper
-        </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       }
       className="eui-textTruncate"
       closePopover={[Function]}
@@ -4136,7 +4194,7 @@ exports[`Services component renders services page 1`] = `
         <div
           className="euiPopover__anchor eui-textTruncate"
         >
-          <EuiButtonEmpty
+          <EuiSmallButtonEmpty
             className="dscIndexPattern__triggerButton"
             color="text"
             data-test-subj="indexPattern-switch-link"
@@ -4146,68 +4204,80 @@ exports[`Services component renders services page 1`] = `
             onClick={[Function]}
             title="data_prepper"
           >
-            <button
-              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+            <EuiButtonEmpty
+              className="dscIndexPattern__triggerButton"
+              color="text"
               data-test-subj="indexPattern-switch-link"
-              disabled={false}
+              flush="left"
+              iconSide="right"
+              iconType="arrowDown"
               onClick={[Function]}
+              size="s"
               title="data_prepper"
-              type="button"
             >
-              <EuiButtonContent
-                className="euiButtonEmpty__content"
-                iconSide="right"
-                iconSize="m"
-                iconType="arrowDown"
-                textProps={
-                  Object {
-                    "className": "euiButtonEmpty__text",
-                  }
-                }
+              <button
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+                data-test-subj="indexPattern-switch-link"
+                disabled={false}
+                onClick={[Function]}
+                title="data_prepper"
+                type="button"
               >
-                <span
-                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="right"
+                  iconSize="m"
+                  iconType="arrowDown"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text",
+                    }
+                  }
                 >
-                  <EuiIcon
-                    className="euiButtonContent__icon"
-                    color="inherit"
-                    size="m"
-                    type="arrowDown"
+                  <span
+                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <EuiIconArrowDown
-                      aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      role="img"
-                      style={null}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowDown"
                     >
-                      <svg
+                      <EuiIconArrowDown
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                         focusable="false"
-                        height={16}
                         role="img"
                         style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                          fillRule="non-zero"
-                        />
-                      </svg>
-                    </EuiIconArrowDown>
-                  </EuiIcon>
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Data Prepper
+                        <svg
+                          aria-hidden={true}
+                          className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                          focusable="false"
+                          height={16}
+                          role="img"
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                            fillRule="non-zero"
+                          />
+                        </svg>
+                      </EuiIconArrowDown>
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Data Prepper
+                    </span>
                   </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonEmpty>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiSmallButtonEmpty>
         </div>
       </div>
     </EuiPopover>
@@ -4478,8 +4548,8 @@ exports[`Services component renders services page 1`] = `
             <div
               className="euiFlexItem"
             >
-              <EuiFieldSearch
-                compressed={false}
+              <EuiCompressedFieldSearch
+                compressed={true}
                 data-test-subj="search-bar-input-box"
                 fullWidth={true}
                 incremental={false}
@@ -4491,20 +4561,20 @@ exports[`Services component renders services page 1`] = `
                 value=""
               >
                 <EuiFormControlLayout
-                  compressed={false}
+                  compressed={true}
                   fullWidth={true}
                   icon="search"
                   isLoading={false}
                 >
                   <div
-                    className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <EuiValidatableControl>
                         <input
-                          className="euiFieldSearch euiFieldSearch--fullWidth"
+                          className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
                           data-test-subj="search-bar-input-box"
                           onChange={[Function]}
                           onKeyUp={[Function]}
@@ -4514,7 +4584,7 @@ exports[`Services component renders services page 1`] = `
                         />
                       </EuiValidatableControl>
                       <EuiFormControlLayoutIcons
-                        compressed={false}
+                        compressed={true}
                         icon="search"
                         isLoading={false}
                       >
@@ -4522,7 +4592,7 @@ exports[`Services component renders services page 1`] = `
                           className="euiFormControlLayoutIcons"
                         >
                           <EuiFormControlLayoutCustomIcon
-                            size="m"
+                            size="s"
                             type="search"
                           >
                             <span
@@ -4531,19 +4601,19 @@ exports[`Services component renders services page 1`] = `
                               <EuiIcon
                                 aria-hidden="true"
                                 className="euiFormControlLayoutCustomIcon__icon"
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <EuiIconSearch
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   role="img"
                                   style={null}
                                 >
                                   <svg
                                     aria-hidden={true}
-                                    className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                    className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height={16}
                                     role="img"
@@ -4565,7 +4635,7 @@ exports[`Services component renders services page 1`] = `
                     </div>
                   </div>
                 </EuiFormControlLayout>
-              </EuiFieldSearch>
+              </EuiCompressedFieldSearch>
             </div>
           </EuiFlexItem>
           <EuiFlexItem
@@ -4973,89 +5043,98 @@ exports[`Services component renders services page 1`] = `
             <div
               className="euiFlexItem euiFlexItem--flexGrowZero"
             >
-              <EuiButton
+              <EuiSmallButton
                 data-click-metric-element="trace_analytics.refresh_button"
                 data-test-subj="superDatePickerApplyTimeButton"
                 iconType="refresh"
                 onClick={[Function]}
               >
-                <EuiButtonDisplay
-                  baseClassName="euiButton"
+                <EuiButton
                   data-click-metric-element="trace_analytics.refresh_button"
                   data-test-subj="superDatePickerApplyTimeButton"
-                  disabled={false}
-                  element="button"
                   iconType="refresh"
-                  isDisabled={false}
                   onClick={[Function]}
-                  type="button"
+                  size="s"
                 >
-                  <button
-                    className="euiButton euiButton--primary"
+                  <EuiButtonDisplay
+                    baseClassName="euiButton"
                     data-click-metric-element="trace_analytics.refresh_button"
                     data-test-subj="superDatePickerApplyTimeButton"
                     disabled={false}
+                    element="button"
+                    iconType="refresh"
+                    isDisabled={false}
                     onClick={[Function]}
-                    style={
-                      Object {
-                        "minWidth": undefined,
-                      }
-                    }
+                    size="s"
                     type="button"
                   >
-                    <EuiButtonContent
-                      className="euiButton__content"
-                      iconSide="left"
-                      iconType="refresh"
-                      textProps={
+                    <button
+                      className="euiButton euiButton--primary euiButton--small"
+                      data-click-metric-element="trace_analytics.refresh_button"
+                      data-test-subj="superDatePickerApplyTimeButton"
+                      disabled={false}
+                      onClick={[Function]}
+                      style={
                         Object {
-                          "className": "euiButton__text",
+                          "minWidth": undefined,
                         }
                       }
+                      type="button"
                     >
-                      <span
-                        className="euiButtonContent euiButton__content"
+                      <EuiButtonContent
+                        className="euiButton__content"
+                        iconSide="left"
+                        iconType="refresh"
+                        textProps={
+                          Object {
+                            "className": "euiButton__text",
+                          }
+                        }
                       >
-                        <EuiIcon
-                          className="euiButtonContent__icon"
-                          color="inherit"
-                          size="m"
-                          type="refresh"
+                        <span
+                          className="euiButtonContent euiButton__content"
                         >
-                          <EuiIconRefresh
-                            aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                            focusable="false"
-                            role="img"
-                            style={null}
+                          <EuiIcon
+                            className="euiButtonContent__icon"
+                            color="inherit"
+                            size="m"
+                            type="refresh"
                           >
-                            <svg
+                            <EuiIconRefresh
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                               focusable="false"
-                              height={16}
                               role="img"
                               style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
-                              />
-                            </svg>
-                          </EuiIconRefresh>
-                        </EuiIcon>
-                        <span
-                          className="euiButton__text"
-                        >
-                          Refresh
+                              <svg
+                                aria-hidden={true}
+                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
+                                />
+                              </svg>
+                            </EuiIconRefresh>
+                          </EuiIcon>
+                          <span
+                            className="euiButton__text"
+                          >
+                            Refresh
+                          </span>
                         </span>
-                      </span>
-                    </EuiButtonContent>
-                  </button>
-                </EuiButtonDisplay>
-              </EuiButton>
+                      </EuiButtonContent>
+                    </button>
+                  </EuiButtonDisplay>
+                </EuiButton>
+              </EuiSmallButton>
             </div>
           </EuiFlexItem>
         </div>
@@ -5117,7 +5196,7 @@ exports[`Services component renders services page 1`] = `
                   <EuiPopover
                     anchorPosition="rightUp"
                     button={
-                      <EuiButtonIcon
+                      <EuiSmallButtonIcon
                         aria-label="Change all filters"
                         iconType="filter"
                         onClick={[Function]}
@@ -5141,54 +5220,62 @@ exports[`Services component renders services page 1`] = `
                       <div
                         className="euiPopover__anchor"
                       >
-                        <EuiButtonIcon
+                        <EuiSmallButtonIcon
                           aria-label="Change all filters"
                           iconType="filter"
                           onClick={[Function]}
                           title="Change all filters"
                         >
-                          <button
+                          <EuiButtonIcon
                             aria-label="Change all filters"
-                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            disabled={false}
+                            iconType="filter"
                             onClick={[Function]}
+                            size="s"
                             title="Change all filters"
-                            type="button"
                           >
-                            <EuiIcon
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              color="inherit"
-                              size="m"
-                              type="filter"
+                            <button
+                              aria-label="Change all filters"
+                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                              disabled={false}
+                              onClick={[Function]}
+                              title="Change all filters"
+                              type="button"
                             >
-                              <EuiIconFilter
-                                aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                role="img"
-                                style={null}
+                              <EuiIcon
+                                aria-hidden="true"
+                                className="euiButtonIcon__icon"
+                                color="inherit"
+                                size="m"
+                                type="filter"
                               >
-                                <svg
+                                <EuiIconFilter
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
                                   focusable="false"
-                                  height={16}
                                   role="img"
                                   style={null}
-                                  viewBox="0 0 16 16"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <path
-                                    d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
-                                    fillRule="evenodd"
-                                  />
-                                </svg>
-                              </EuiIconFilter>
-                            </EuiIcon>
-                          </button>
-                        </EuiButtonIcon>
+                                  <svg
+                                    aria-hidden={true}
+                                    className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
+                                    focusable="false"
+                                    height={16}
+                                    role="img"
+                                    style={null}
+                                    viewBox="0 0 16 16"
+                                    width={16}
+                                    xmlns="http://www.w3.org/2000/svg"
+                                  >
+                                    <path
+                                      d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
+                                      fillRule="evenodd"
+                                    />
+                                  </svg>
+                                </EuiIconFilter>
+                              </EuiIcon>
+                            </button>
+                          </EuiButtonIcon>
+                        </EuiSmallButtonIcon>
                       </div>
                     </div>
                   </EuiPopover>
@@ -5886,8 +5973,8 @@ exports[`Services component renders services page 1`] = `
                 <div
                   className="euiFlexItem"
                 >
-                  <EuiFieldSearch
-                    compressed={false}
+                  <EuiCompressedFieldSearch
+                    compressed={true}
                     fullWidth={false}
                     incremental={false}
                     isClearable={true}
@@ -5899,13 +5986,13 @@ exports[`Services component renders services page 1`] = `
                     value=""
                   >
                     <EuiFormControlLayout
-                      compressed={false}
+                      compressed={true}
                       fullWidth={false}
                       icon="search"
                       isLoading={false}
                     >
                       <div
-                        className="euiFormControlLayout"
+                        className="euiFormControlLayout euiFormControlLayout--compressed"
                       >
                         <div
                           className="euiFormControlLayout__childrenWrapper"
@@ -5914,7 +6001,7 @@ exports[`Services component renders services page 1`] = `
                             isInvalid={false}
                           >
                             <input
-                              className="euiFieldSearch"
+                              className="euiFieldSearch euiFieldSearch--compressed"
                               onChange={[Function]}
                               onKeyUp={[Function]}
                               placeholder="Service name"
@@ -5923,7 +6010,7 @@ exports[`Services component renders services page 1`] = `
                             />
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
-                            compressed={false}
+                            compressed={true}
                             icon="search"
                             isLoading={false}
                           >
@@ -5931,7 +6018,7 @@ exports[`Services component renders services page 1`] = `
                               className="euiFormControlLayoutIcons"
                             >
                               <EuiFormControlLayoutCustomIcon
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <span
@@ -5940,19 +6027,19 @@ exports[`Services component renders services page 1`] = `
                                   <EuiIcon
                                     aria-hidden="true"
                                     className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
+                                    size="s"
                                     type="search"
                                   >
                                     <EuiIconSearch
                                       aria-hidden={true}
-                                      className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                      className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
                                       role="img"
                                       style={null}
                                     >
                                       <svg
                                         aria-hidden={true}
-                                        className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                        className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
                                         height={16}
                                         role="img"
@@ -5974,7 +6061,7 @@ exports[`Services component renders services page 1`] = `
                         </div>
                       </div>
                     </EuiFormControlLayout>
-                  </EuiFieldSearch>
+                  </EuiCompressedFieldSearch>
                 </div>
               </EuiFlexItem>
             </div>
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
index 1cdc7e0986..c6a9200401 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
@@ -257,7 +257,7 @@ exports[`Traces component renders empty traces page 1`] = `
       anchorClassName="eui-textTruncate"
       anchorPosition="downCenter"
       button={
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -268,7 +268,7 @@ exports[`Traces component renders empty traces page 1`] = `
           title="data_prepper"
         >
           Data Prepper
-        </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       }
       className="eui-textTruncate"
       closePopover={[Function]}
@@ -284,7 +284,7 @@ exports[`Traces component renders empty traces page 1`] = `
         <div
           className="euiPopover__anchor eui-textTruncate"
         >
-          <EuiButtonEmpty
+          <EuiSmallButtonEmpty
             className="dscIndexPattern__triggerButton"
             color="text"
             data-test-subj="indexPattern-switch-link"
@@ -294,67 +294,79 @@ exports[`Traces component renders empty traces page 1`] = `
             onClick={[Function]}
             title="data_prepper"
           >
-            <button
-              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+            <EuiButtonEmpty
+              className="dscIndexPattern__triggerButton"
+              color="text"
               data-test-subj="indexPattern-switch-link"
-              disabled={false}
+              flush="left"
+              iconSide="right"
+              iconType="arrowDown"
               onClick={[Function]}
+              size="s"
               title="data_prepper"
-              type="button"
             >
-              <EuiButtonContent
-                className="euiButtonEmpty__content"
-                iconSide="right"
-                iconSize="m"
-                iconType="arrowDown"
-                textProps={
-                  Object {
-                    "className": "euiButtonEmpty__text",
-                  }
-                }
+              <button
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+                data-test-subj="indexPattern-switch-link"
+                disabled={false}
+                onClick={[Function]}
+                title="data_prepper"
+                type="button"
               >
-                <span
-                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="right"
+                  iconSize="m"
+                  iconType="arrowDown"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text",
+                    }
+                  }
                 >
-                  <EuiIcon
-                    className="euiButtonContent__icon"
-                    color="inherit"
-                    size="m"
-                    type="arrowDown"
+                  <span
+                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <EuiIconBeaker
-                      aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                      focusable="false"
-                      role="img"
-                      style={null}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowDown"
                     >
-                      <svg
+                      <EuiIconBeaker
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                         focusable="false"
-                        height={16}
                         role="img"
                         style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                        />
-                      </svg>
-                    </EuiIconBeaker>
-                  </EuiIcon>
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Data Prepper
+                        <svg
+                          aria-hidden={true}
+                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                          focusable="false"
+                          height={16}
+                          role="img"
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                          />
+                        </svg>
+                      </EuiIconBeaker>
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Data Prepper
+                    </span>
                   </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonEmpty>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiSmallButtonEmpty>
         </div>
       </div>
     </EuiPopover>
@@ -635,8 +647,8 @@ exports[`Traces component renders empty traces page 1`] = `
             <div
               className="euiFlexItem"
             >
-              <EuiFieldSearch
-                compressed={false}
+              <EuiCompressedFieldSearch
+                compressed={true}
                 data-test-subj="search-bar-input-box"
                 fullWidth={true}
                 incremental={false}
@@ -648,20 +660,20 @@ exports[`Traces component renders empty traces page 1`] = `
                 value=""
               >
                 <EuiFormControlLayout
-                  compressed={false}
+                  compressed={true}
                   fullWidth={true}
                   icon="search"
                   isLoading={false}
                 >
                   <div
-                    className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <EuiValidatableControl>
                         <input
-                          className="euiFieldSearch euiFieldSearch--fullWidth"
+                          className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
                           data-test-subj="search-bar-input-box"
                           onChange={[Function]}
                           onKeyUp={[Function]}
@@ -671,7 +683,7 @@ exports[`Traces component renders empty traces page 1`] = `
                         />
                       </EuiValidatableControl>
                       <EuiFormControlLayoutIcons
-                        compressed={false}
+                        compressed={true}
                         icon="search"
                         isLoading={false}
                       >
@@ -679,7 +691,7 @@ exports[`Traces component renders empty traces page 1`] = `
                           className="euiFormControlLayoutIcons"
                         >
                           <EuiFormControlLayoutCustomIcon
-                            size="m"
+                            size="s"
                             type="search"
                           >
                             <span
@@ -688,19 +700,19 @@ exports[`Traces component renders empty traces page 1`] = `
                               <EuiIcon
                                 aria-hidden="true"
                                 className="euiFormControlLayoutCustomIcon__icon"
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <EuiIconBeaker
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   role="img"
                                   style={null}
                                 >
                                   <svg
                                     aria-hidden={true}
-                                    className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                                    className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height={16}
                                     role="img"
@@ -722,7 +734,7 @@ exports[`Traces component renders empty traces page 1`] = `
                     </div>
                   </div>
                 </EuiFormControlLayout>
-              </EuiFieldSearch>
+              </EuiCompressedFieldSearch>
             </div>
           </EuiFlexItem>
           <EuiFlexItem
@@ -1128,89 +1140,98 @@ exports[`Traces component renders empty traces page 1`] = `
             <div
               className="euiFlexItem euiFlexItem--flexGrowZero"
             >
-              <EuiButton
+              <EuiSmallButton
                 data-click-metric-element="trace_analytics.refresh_button"
                 data-test-subj="superDatePickerApplyTimeButton"
                 iconType="refresh"
                 onClick={[Function]}
               >
-                <EuiButtonDisplay
-                  baseClassName="euiButton"
+                <EuiButton
                   data-click-metric-element="trace_analytics.refresh_button"
                   data-test-subj="superDatePickerApplyTimeButton"
-                  disabled={false}
-                  element="button"
                   iconType="refresh"
-                  isDisabled={false}
                   onClick={[Function]}
-                  type="button"
+                  size="s"
                 >
-                  <button
-                    className="euiButton euiButton--primary"
+                  <EuiButtonDisplay
+                    baseClassName="euiButton"
                     data-click-metric-element="trace_analytics.refresh_button"
                     data-test-subj="superDatePickerApplyTimeButton"
                     disabled={false}
+                    element="button"
+                    iconType="refresh"
+                    isDisabled={false}
                     onClick={[Function]}
-                    style={
-                      Object {
-                        "minWidth": undefined,
-                      }
-                    }
+                    size="s"
                     type="button"
                   >
-                    <EuiButtonContent
-                      className="euiButton__content"
-                      iconSide="left"
-                      iconType="refresh"
-                      textProps={
+                    <button
+                      className="euiButton euiButton--primary euiButton--small"
+                      data-click-metric-element="trace_analytics.refresh_button"
+                      data-test-subj="superDatePickerApplyTimeButton"
+                      disabled={false}
+                      onClick={[Function]}
+                      style={
                         Object {
-                          "className": "euiButton__text",
+                          "minWidth": undefined,
                         }
                       }
+                      type="button"
                     >
-                      <span
-                        className="euiButtonContent euiButton__content"
+                      <EuiButtonContent
+                        className="euiButton__content"
+                        iconSide="left"
+                        iconType="refresh"
+                        textProps={
+                          Object {
+                            "className": "euiButton__text",
+                          }
+                        }
                       >
-                        <EuiIcon
-                          className="euiButtonContent__icon"
-                          color="inherit"
-                          size="m"
-                          type="refresh"
+                        <span
+                          className="euiButtonContent euiButton__content"
                         >
-                          <EuiIconBeaker
-                            aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                            focusable="false"
-                            role="img"
-                            style={null}
+                          <EuiIcon
+                            className="euiButtonContent__icon"
+                            color="inherit"
+                            size="m"
+                            type="refresh"
                           >
-                            <svg
+                            <EuiIconBeaker
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                               focusable="false"
-                              height={16}
                               role="img"
                               style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                              />
-                            </svg>
-                          </EuiIconBeaker>
-                        </EuiIcon>
-                        <span
-                          className="euiButton__text"
-                        >
-                          Refresh
+                              <svg
+                                aria-hidden={true}
+                                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
+                            </EuiIconBeaker>
+                          </EuiIcon>
+                          <span
+                            className="euiButton__text"
+                          >
+                            Refresh
+                          </span>
                         </span>
-                      </span>
-                    </EuiButtonContent>
-                  </button>
-                </EuiButtonDisplay>
-              </EuiButton>
+                      </EuiButtonContent>
+                    </button>
+                  </EuiButtonDisplay>
+                </EuiButton>
+              </EuiSmallButton>
             </div>
           </EuiFlexItem>
         </div>
@@ -1272,7 +1293,7 @@ exports[`Traces component renders empty traces page 1`] = `
                   <EuiPopover
                     anchorPosition="rightUp"
                     button={
-                      <EuiButtonIcon
+                      <EuiSmallButtonIcon
                         aria-label="Change all filters"
                         iconType="filter"
                         onClick={[Function]}
@@ -1296,53 +1317,61 @@ exports[`Traces component renders empty traces page 1`] = `
                       <div
                         className="euiPopover__anchor"
                       >
-                        <EuiButtonIcon
+                        <EuiSmallButtonIcon
                           aria-label="Change all filters"
                           iconType="filter"
                           onClick={[Function]}
                           title="Change all filters"
                         >
-                          <button
+                          <EuiButtonIcon
                             aria-label="Change all filters"
-                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            disabled={false}
+                            iconType="filter"
                             onClick={[Function]}
+                            size="s"
                             title="Change all filters"
-                            type="button"
                           >
-                            <EuiIcon
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              color="inherit"
-                              size="m"
-                              type="filter"
+                            <button
+                              aria-label="Change all filters"
+                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                              disabled={false}
+                              onClick={[Function]}
+                              title="Change all filters"
+                              type="button"
                             >
-                              <EuiIconBeaker
-                                aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                focusable="false"
-                                role="img"
-                                style={null}
+                              <EuiIcon
+                                aria-hidden="true"
+                                className="euiButtonIcon__icon"
+                                color="inherit"
+                                size="m"
+                                type="filter"
                               >
-                                <svg
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                   focusable="false"
-                                  height={16}
                                   role="img"
                                   style={null}
-                                  viewBox="0 0 16 16"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <path
-                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                  />
-                                </svg>
-                              </EuiIconBeaker>
-                            </EuiIcon>
-                          </button>
-                        </EuiButtonIcon>
+                                  <svg
+                                    aria-hidden={true}
+                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                    focusable="false"
+                                    height={16}
+                                    role="img"
+                                    style={null}
+                                    viewBox="0 0 16 16"
+                                    width={16}
+                                    xmlns="http://www.w3.org/2000/svg"
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
+                              </EuiIcon>
+                            </button>
+                          </EuiButtonIcon>
+                        </EuiSmallButtonIcon>
                       </div>
                     </div>
                   </EuiPopover>
@@ -1942,7 +1971,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
       anchorClassName="eui-textTruncate"
       anchorPosition="downCenter"
       button={
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -1953,7 +1982,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
           title="jaeger"
         >
           Jaeger
-        </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       }
       className="eui-textTruncate"
       closePopover={[Function]}
@@ -1969,7 +1998,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
         <div
           className="euiPopover__anchor eui-textTruncate"
         >
-          <EuiButtonEmpty
+          <EuiSmallButtonEmpty
             className="dscIndexPattern__triggerButton"
             color="text"
             data-test-subj="indexPattern-switch-link"
@@ -1979,68 +2008,80 @@ exports[`Traces component renders jaeger traces page 1`] = `
             onClick={[Function]}
             title="jaeger"
           >
-            <button
-              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+            <EuiButtonEmpty
+              className="dscIndexPattern__triggerButton"
+              color="text"
               data-test-subj="indexPattern-switch-link"
-              disabled={false}
+              flush="left"
+              iconSide="right"
+              iconType="arrowDown"
               onClick={[Function]}
+              size="s"
               title="jaeger"
-              type="button"
             >
-              <EuiButtonContent
-                className="euiButtonEmpty__content"
-                iconSide="right"
-                iconSize="m"
-                iconType="arrowDown"
-                textProps={
-                  Object {
-                    "className": "euiButtonEmpty__text",
-                  }
-                }
+              <button
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+                data-test-subj="indexPattern-switch-link"
+                disabled={false}
+                onClick={[Function]}
+                title="jaeger"
+                type="button"
               >
-                <span
-                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="right"
+                  iconSize="m"
+                  iconType="arrowDown"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text",
+                    }
+                  }
                 >
-                  <EuiIcon
-                    className="euiButtonContent__icon"
-                    color="inherit"
-                    size="m"
-                    type="arrowDown"
+                  <span
+                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <EuiIconArrowDown
-                      aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      role="img"
-                      style={null}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowDown"
                     >
-                      <svg
+                      <EuiIconArrowDown
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                         focusable="false"
-                        height={16}
                         role="img"
                         style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                          fillRule="non-zero"
-                        />
-                      </svg>
-                    </EuiIconArrowDown>
-                  </EuiIcon>
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Jaeger
+                        <svg
+                          aria-hidden={true}
+                          className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                          focusable="false"
+                          height={16}
+                          role="img"
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                            fillRule="non-zero"
+                          />
+                        </svg>
+                      </EuiIconArrowDown>
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Jaeger
+                    </span>
                   </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonEmpty>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiSmallButtonEmpty>
         </div>
       </div>
     </EuiPopover>
@@ -2321,8 +2362,8 @@ exports[`Traces component renders jaeger traces page 1`] = `
             <div
               className="euiFlexItem"
             >
-              <EuiFieldSearch
-                compressed={false}
+              <EuiCompressedFieldSearch
+                compressed={true}
                 data-test-subj="search-bar-input-box"
                 fullWidth={true}
                 incremental={false}
@@ -2334,20 +2375,20 @@ exports[`Traces component renders jaeger traces page 1`] = `
                 value=""
               >
                 <EuiFormControlLayout
-                  compressed={false}
+                  compressed={true}
                   fullWidth={true}
                   icon="search"
                   isLoading={false}
                 >
                   <div
-                    className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <EuiValidatableControl>
                         <input
-                          className="euiFieldSearch euiFieldSearch--fullWidth"
+                          className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
                           data-test-subj="search-bar-input-box"
                           onChange={[Function]}
                           onKeyUp={[Function]}
@@ -2357,7 +2398,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
                         />
                       </EuiValidatableControl>
                       <EuiFormControlLayoutIcons
-                        compressed={false}
+                        compressed={true}
                         icon="search"
                         isLoading={false}
                       >
@@ -2365,7 +2406,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
                           className="euiFormControlLayoutIcons"
                         >
                           <EuiFormControlLayoutCustomIcon
-                            size="m"
+                            size="s"
                             type="search"
                           >
                             <span
@@ -2374,19 +2415,19 @@ exports[`Traces component renders jaeger traces page 1`] = `
                               <EuiIcon
                                 aria-hidden="true"
                                 className="euiFormControlLayoutCustomIcon__icon"
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <EuiIconSearch
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   role="img"
                                   style={null}
                                 >
                                   <svg
                                     aria-hidden={true}
-                                    className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                    className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height={16}
                                     role="img"
@@ -2408,7 +2449,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
                     </div>
                   </div>
                 </EuiFormControlLayout>
-              </EuiFieldSearch>
+              </EuiCompressedFieldSearch>
             </div>
           </EuiFlexItem>
           <EuiFlexItem
@@ -2816,89 +2857,98 @@ exports[`Traces component renders jaeger traces page 1`] = `
             <div
               className="euiFlexItem euiFlexItem--flexGrowZero"
             >
-              <EuiButton
+              <EuiSmallButton
                 data-click-metric-element="trace_analytics.refresh_button"
                 data-test-subj="superDatePickerApplyTimeButton"
                 iconType="refresh"
                 onClick={[Function]}
               >
-                <EuiButtonDisplay
-                  baseClassName="euiButton"
+                <EuiButton
                   data-click-metric-element="trace_analytics.refresh_button"
                   data-test-subj="superDatePickerApplyTimeButton"
-                  disabled={false}
-                  element="button"
                   iconType="refresh"
-                  isDisabled={false}
                   onClick={[Function]}
-                  type="button"
+                  size="s"
                 >
-                  <button
-                    className="euiButton euiButton--primary"
+                  <EuiButtonDisplay
+                    baseClassName="euiButton"
                     data-click-metric-element="trace_analytics.refresh_button"
                     data-test-subj="superDatePickerApplyTimeButton"
                     disabled={false}
+                    element="button"
+                    iconType="refresh"
+                    isDisabled={false}
                     onClick={[Function]}
-                    style={
-                      Object {
-                        "minWidth": undefined,
-                      }
-                    }
+                    size="s"
                     type="button"
                   >
-                    <EuiButtonContent
-                      className="euiButton__content"
-                      iconSide="left"
-                      iconType="refresh"
-                      textProps={
+                    <button
+                      className="euiButton euiButton--primary euiButton--small"
+                      data-click-metric-element="trace_analytics.refresh_button"
+                      data-test-subj="superDatePickerApplyTimeButton"
+                      disabled={false}
+                      onClick={[Function]}
+                      style={
                         Object {
-                          "className": "euiButton__text",
+                          "minWidth": undefined,
                         }
                       }
+                      type="button"
                     >
-                      <span
-                        className="euiButtonContent euiButton__content"
+                      <EuiButtonContent
+                        className="euiButton__content"
+                        iconSide="left"
+                        iconType="refresh"
+                        textProps={
+                          Object {
+                            "className": "euiButton__text",
+                          }
+                        }
                       >
-                        <EuiIcon
-                          className="euiButtonContent__icon"
-                          color="inherit"
-                          size="m"
-                          type="refresh"
+                        <span
+                          className="euiButtonContent euiButton__content"
                         >
-                          <EuiIconRefresh
-                            aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                            focusable="false"
-                            role="img"
-                            style={null}
+                          <EuiIcon
+                            className="euiButtonContent__icon"
+                            color="inherit"
+                            size="m"
+                            type="refresh"
                           >
-                            <svg
+                            <EuiIconRefresh
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                               focusable="false"
-                              height={16}
                               role="img"
                               style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
-                              />
-                            </svg>
-                          </EuiIconRefresh>
-                        </EuiIcon>
-                        <span
-                          className="euiButton__text"
-                        >
-                          Refresh
+                              <svg
+                                aria-hidden={true}
+                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
+                                />
+                              </svg>
+                            </EuiIconRefresh>
+                          </EuiIcon>
+                          <span
+                            className="euiButton__text"
+                          >
+                            Refresh
+                          </span>
                         </span>
-                      </span>
-                    </EuiButtonContent>
-                  </button>
-                </EuiButtonDisplay>
-              </EuiButton>
+                      </EuiButtonContent>
+                    </button>
+                  </EuiButtonDisplay>
+                </EuiButton>
+              </EuiSmallButton>
             </div>
           </EuiFlexItem>
         </div>
@@ -2960,7 +3010,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
                   <EuiPopover
                     anchorPosition="rightUp"
                     button={
-                      <EuiButtonIcon
+                      <EuiSmallButtonIcon
                         aria-label="Change all filters"
                         iconType="filter"
                         onClick={[Function]}
@@ -2984,54 +3034,62 @@ exports[`Traces component renders jaeger traces page 1`] = `
                       <div
                         className="euiPopover__anchor"
                       >
-                        <EuiButtonIcon
+                        <EuiSmallButtonIcon
                           aria-label="Change all filters"
                           iconType="filter"
                           onClick={[Function]}
                           title="Change all filters"
                         >
-                          <button
+                          <EuiButtonIcon
                             aria-label="Change all filters"
-                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            disabled={false}
+                            iconType="filter"
                             onClick={[Function]}
+                            size="s"
                             title="Change all filters"
-                            type="button"
                           >
-                            <EuiIcon
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              color="inherit"
-                              size="m"
-                              type="filter"
+                            <button
+                              aria-label="Change all filters"
+                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                              disabled={false}
+                              onClick={[Function]}
+                              title="Change all filters"
+                              type="button"
                             >
-                              <EuiIconFilter
-                                aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                role="img"
-                                style={null}
+                              <EuiIcon
+                                aria-hidden="true"
+                                className="euiButtonIcon__icon"
+                                color="inherit"
+                                size="m"
+                                type="filter"
                               >
-                                <svg
+                                <EuiIconFilter
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
                                   focusable="false"
-                                  height={16}
                                   role="img"
                                   style={null}
-                                  viewBox="0 0 16 16"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <path
-                                    d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
-                                    fillRule="evenodd"
-                                  />
-                                </svg>
-                              </EuiIconFilter>
-                            </EuiIcon>
-                          </button>
-                        </EuiButtonIcon>
+                                  <svg
+                                    aria-hidden={true}
+                                    className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
+                                    focusable="false"
+                                    height={16}
+                                    role="img"
+                                    style={null}
+                                    viewBox="0 0 16 16"
+                                    width={16}
+                                    xmlns="http://www.w3.org/2000/svg"
+                                  >
+                                    <path
+                                      d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
+                                      fillRule="evenodd"
+                                    />
+                                  </svg>
+                                </EuiIconFilter>
+                              </EuiIcon>
+                            </button>
+                          </EuiButtonIcon>
+                        </EuiSmallButtonIcon>
                       </div>
                     </div>
                   </EuiPopover>
@@ -3632,7 +3690,7 @@ exports[`Traces component renders traces page 1`] = `
       anchorClassName="eui-textTruncate"
       anchorPosition="downCenter"
       button={
-        <EuiButtonEmpty
+        <EuiSmallButtonEmpty
           className="dscIndexPattern__triggerButton"
           color="text"
           data-test-subj="indexPattern-switch-link"
@@ -3643,7 +3701,7 @@ exports[`Traces component renders traces page 1`] = `
           title="data_prepper"
         >
           Data Prepper
-        </EuiButtonEmpty>
+        </EuiSmallButtonEmpty>
       }
       className="eui-textTruncate"
       closePopover={[Function]}
@@ -3659,7 +3717,7 @@ exports[`Traces component renders traces page 1`] = `
         <div
           className="euiPopover__anchor eui-textTruncate"
         >
-          <EuiButtonEmpty
+          <EuiSmallButtonEmpty
             className="dscIndexPattern__triggerButton"
             color="text"
             data-test-subj="indexPattern-switch-link"
@@ -3669,68 +3727,80 @@ exports[`Traces component renders traces page 1`] = `
             onClick={[Function]}
             title="data_prepper"
           >
-            <button
-              className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+            <EuiButtonEmpty
+              className="dscIndexPattern__triggerButton"
+              color="text"
               data-test-subj="indexPattern-switch-link"
-              disabled={false}
+              flush="left"
+              iconSide="right"
+              iconType="arrowDown"
               onClick={[Function]}
+              size="s"
               title="data_prepper"
-              type="button"
             >
-              <EuiButtonContent
-                className="euiButtonEmpty__content"
-                iconSide="right"
-                iconSize="m"
-                iconType="arrowDown"
-                textProps={
-                  Object {
-                    "className": "euiButtonEmpty__text",
-                  }
-                }
+              <button
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty--flushLeft dscIndexPattern__triggerButton"
+                data-test-subj="indexPattern-switch-link"
+                disabled={false}
+                onClick={[Function]}
+                title="data_prepper"
+                type="button"
               >
-                <span
-                  className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                <EuiButtonContent
+                  className="euiButtonEmpty__content"
+                  iconSide="right"
+                  iconSize="m"
+                  iconType="arrowDown"
+                  textProps={
+                    Object {
+                      "className": "euiButtonEmpty__text",
+                    }
+                  }
                 >
-                  <EuiIcon
-                    className="euiButtonContent__icon"
-                    color="inherit"
-                    size="m"
-                    type="arrowDown"
+                  <span
+                    className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <EuiIconArrowDown
-                      aria-hidden={true}
-                      className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      role="img"
-                      style={null}
+                    <EuiIcon
+                      className="euiButtonContent__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowDown"
                     >
-                      <svg
+                      <EuiIconArrowDown
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                         focusable="false"
-                        height={16}
                         role="img"
                         style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
                       >
-                        <path
-                          d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                          fillRule="non-zero"
-                        />
-                      </svg>
-                    </EuiIconArrowDown>
-                  </EuiIcon>
-                  <span
-                    className="euiButtonEmpty__text"
-                  >
-                    Data Prepper
+                        <svg
+                          aria-hidden={true}
+                          className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                          focusable="false"
+                          height={16}
+                          role="img"
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
+                            fillRule="non-zero"
+                          />
+                        </svg>
+                      </EuiIconArrowDown>
+                    </EuiIcon>
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Data Prepper
+                    </span>
                   </span>
-                </span>
-              </EuiButtonContent>
-            </button>
-          </EuiButtonEmpty>
+                </EuiButtonContent>
+              </button>
+            </EuiButtonEmpty>
+          </EuiSmallButtonEmpty>
         </div>
       </div>
     </EuiPopover>
@@ -4010,8 +4080,8 @@ exports[`Traces component renders traces page 1`] = `
             <div
               className="euiFlexItem"
             >
-              <EuiFieldSearch
-                compressed={false}
+              <EuiCompressedFieldSearch
+                compressed={true}
                 data-test-subj="search-bar-input-box"
                 fullWidth={true}
                 incremental={false}
@@ -4023,20 +4093,20 @@ exports[`Traces component renders traces page 1`] = `
                 value=""
               >
                 <EuiFormControlLayout
-                  compressed={false}
+                  compressed={true}
                   fullWidth={true}
                   icon="search"
                   isLoading={false}
                 >
                   <div
-                    className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                    className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed"
                   >
                     <div
                       className="euiFormControlLayout__childrenWrapper"
                     >
                       <EuiValidatableControl>
                         <input
-                          className="euiFieldSearch euiFieldSearch--fullWidth"
+                          className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed"
                           data-test-subj="search-bar-input-box"
                           onChange={[Function]}
                           onKeyUp={[Function]}
@@ -4046,7 +4116,7 @@ exports[`Traces component renders traces page 1`] = `
                         />
                       </EuiValidatableControl>
                       <EuiFormControlLayoutIcons
-                        compressed={false}
+                        compressed={true}
                         icon="search"
                         isLoading={false}
                       >
@@ -4054,7 +4124,7 @@ exports[`Traces component renders traces page 1`] = `
                           className="euiFormControlLayoutIcons"
                         >
                           <EuiFormControlLayoutCustomIcon
-                            size="m"
+                            size="s"
                             type="search"
                           >
                             <span
@@ -4063,19 +4133,19 @@ exports[`Traces component renders traces page 1`] = `
                               <EuiIcon
                                 aria-hidden="true"
                                 className="euiFormControlLayoutCustomIcon__icon"
-                                size="m"
+                                size="s"
                                 type="search"
                               >
                                 <EuiIconSearch
                                   aria-hidden={true}
-                                  className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                  className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
                                   role="img"
                                   style={null}
                                 >
                                   <svg
                                     aria-hidden={true}
-                                    className="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                                    className="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height={16}
                                     role="img"
@@ -4097,7 +4167,7 @@ exports[`Traces component renders traces page 1`] = `
                     </div>
                   </div>
                 </EuiFormControlLayout>
-              </EuiFieldSearch>
+              </EuiCompressedFieldSearch>
             </div>
           </EuiFlexItem>
           <EuiFlexItem
@@ -4505,89 +4575,98 @@ exports[`Traces component renders traces page 1`] = `
             <div
               className="euiFlexItem euiFlexItem--flexGrowZero"
             >
-              <EuiButton
+              <EuiSmallButton
                 data-click-metric-element="trace_analytics.refresh_button"
                 data-test-subj="superDatePickerApplyTimeButton"
                 iconType="refresh"
                 onClick={[Function]}
               >
-                <EuiButtonDisplay
-                  baseClassName="euiButton"
+                <EuiButton
                   data-click-metric-element="trace_analytics.refresh_button"
                   data-test-subj="superDatePickerApplyTimeButton"
-                  disabled={false}
-                  element="button"
                   iconType="refresh"
-                  isDisabled={false}
                   onClick={[Function]}
-                  type="button"
+                  size="s"
                 >
-                  <button
-                    className="euiButton euiButton--primary"
+                  <EuiButtonDisplay
+                    baseClassName="euiButton"
                     data-click-metric-element="trace_analytics.refresh_button"
                     data-test-subj="superDatePickerApplyTimeButton"
                     disabled={false}
+                    element="button"
+                    iconType="refresh"
+                    isDisabled={false}
                     onClick={[Function]}
-                    style={
-                      Object {
-                        "minWidth": undefined,
-                      }
-                    }
+                    size="s"
                     type="button"
                   >
-                    <EuiButtonContent
-                      className="euiButton__content"
-                      iconSide="left"
-                      iconType="refresh"
-                      textProps={
+                    <button
+                      className="euiButton euiButton--primary euiButton--small"
+                      data-click-metric-element="trace_analytics.refresh_button"
+                      data-test-subj="superDatePickerApplyTimeButton"
+                      disabled={false}
+                      onClick={[Function]}
+                      style={
                         Object {
-                          "className": "euiButton__text",
+                          "minWidth": undefined,
                         }
                       }
+                      type="button"
                     >
-                      <span
-                        className="euiButtonContent euiButton__content"
+                      <EuiButtonContent
+                        className="euiButton__content"
+                        iconSide="left"
+                        iconType="refresh"
+                        textProps={
+                          Object {
+                            "className": "euiButton__text",
+                          }
+                        }
                       >
-                        <EuiIcon
-                          className="euiButtonContent__icon"
-                          color="inherit"
-                          size="m"
-                          type="refresh"
+                        <span
+                          className="euiButtonContent euiButton__content"
                         >
-                          <EuiIconRefresh
-                            aria-hidden={true}
-                            className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                            focusable="false"
-                            role="img"
-                            style={null}
+                          <EuiIcon
+                            className="euiButtonContent__icon"
+                            color="inherit"
+                            size="m"
+                            type="refresh"
                           >
-                            <svg
+                            <EuiIconRefresh
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
                               focusable="false"
-                              height={16}
                               role="img"
                               style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
                             >
-                              <path
-                                d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
-                              />
-                            </svg>
-                          </EuiIconRefresh>
-                        </EuiIcon>
-                        <span
-                          className="euiButton__text"
-                        >
-                          Refresh
+                              <svg
+                                aria-hidden={true}
+                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
+                                />
+                              </svg>
+                            </EuiIconRefresh>
+                          </EuiIcon>
+                          <span
+                            className="euiButton__text"
+                          >
+                            Refresh
+                          </span>
                         </span>
-                      </span>
-                    </EuiButtonContent>
-                  </button>
-                </EuiButtonDisplay>
-              </EuiButton>
+                      </EuiButtonContent>
+                    </button>
+                  </EuiButtonDisplay>
+                </EuiButton>
+              </EuiSmallButton>
             </div>
           </EuiFlexItem>
         </div>
@@ -4649,7 +4728,7 @@ exports[`Traces component renders traces page 1`] = `
                   <EuiPopover
                     anchorPosition="rightUp"
                     button={
-                      <EuiButtonIcon
+                      <EuiSmallButtonIcon
                         aria-label="Change all filters"
                         iconType="filter"
                         onClick={[Function]}
@@ -4673,54 +4752,62 @@ exports[`Traces component renders traces page 1`] = `
                       <div
                         className="euiPopover__anchor"
                       >
-                        <EuiButtonIcon
+                        <EuiSmallButtonIcon
                           aria-label="Change all filters"
                           iconType="filter"
                           onClick={[Function]}
                           title="Change all filters"
                         >
-                          <button
+                          <EuiButtonIcon
                             aria-label="Change all filters"
-                            className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                            disabled={false}
+                            iconType="filter"
                             onClick={[Function]}
+                            size="s"
                             title="Change all filters"
-                            type="button"
                           >
-                            <EuiIcon
-                              aria-hidden="true"
-                              className="euiButtonIcon__icon"
-                              color="inherit"
-                              size="m"
-                              type="filter"
+                            <button
+                              aria-label="Change all filters"
+                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                              disabled={false}
+                              onClick={[Function]}
+                              title="Change all filters"
+                              type="button"
                             >
-                              <EuiIconFilter
-                                aria-hidden={true}
-                                className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                focusable="false"
-                                role="img"
-                                style={null}
+                              <EuiIcon
+                                aria-hidden="true"
+                                className="euiButtonIcon__icon"
+                                color="inherit"
+                                size="m"
+                                type="filter"
                               >
-                                <svg
+                                <EuiIconFilter
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
                                   focusable="false"
-                                  height={16}
                                   role="img"
                                   style={null}
-                                  viewBox="0 0 16 16"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
                                 >
-                                  <path
-                                    d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
-                                    fillRule="evenodd"
-                                  />
-                                </svg>
-                              </EuiIconFilter>
-                            </EuiIcon>
-                          </button>
-                        </EuiButtonIcon>
+                                  <svg
+                                    aria-hidden={true}
+                                    className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
+                                    focusable="false"
+                                    height={16}
+                                    role="img"
+                                    style={null}
+                                    viewBox="0 0 16 16"
+                                    width={16}
+                                    xmlns="http://www.w3.org/2000/svg"
+                                  >
+                                    <path
+                                      d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
+                                      fillRule="evenodd"
+                                    />
+                                  </svg>
+                                </EuiIconFilter>
+                              </EuiIcon>
+                            </button>
+                          </EuiButtonIcon>
+                        </EuiSmallButtonIcon>
                       </div>
                     </div>
                   </EuiPopover>
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap
index 0662d5db1e..bb86e197a7 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap
@@ -73,14 +73,14 @@ exports[`Traces table component renders empty traces table message 1`] = `
       >
         <EuiEmptyPrompt
           actions={
-            <EuiButton
+            <EuiSmallButton
               color="primary"
               iconSide="right"
               iconType="popout"
               onClick={[Function]}
             >
               Learn more
-            </EuiButton>
+            </EuiSmallButton>
           }
           body={
             <EuiText>
@@ -140,87 +140,96 @@ exports[`Traces table component renders empty traces table message 1`] = `
                 className="euiSpacer euiSpacer--l"
               />
             </EuiSpacer>
-            <EuiButton
+            <EuiSmallButton
               color="primary"
               iconSide="right"
               iconType="popout"
               onClick={[Function]}
             >
-              <EuiButtonDisplay
-                baseClassName="euiButton"
+              <EuiButton
                 color="primary"
-                disabled={false}
-                element="button"
                 iconSide="right"
                 iconType="popout"
-                isDisabled={false}
                 onClick={[Function]}
-                type="button"
+                size="s"
               >
-                <button
-                  className="euiButton euiButton--primary"
+                <EuiButtonDisplay
+                  baseClassName="euiButton"
+                  color="primary"
                   disabled={false}
+                  element="button"
+                  iconSide="right"
+                  iconType="popout"
+                  isDisabled={false}
                   onClick={[Function]}
-                  style={
-                    Object {
-                      "minWidth": undefined,
-                    }
-                  }
+                  size="s"
                   type="button"
                 >
-                  <EuiButtonContent
-                    className="euiButton__content"
-                    iconSide="right"
-                    iconType="popout"
-                    textProps={
+                  <button
+                    className="euiButton euiButton--primary euiButton--small"
+                    disabled={false}
+                    onClick={[Function]}
+                    style={
                       Object {
-                        "className": "euiButton__text",
+                        "minWidth": undefined,
                       }
                     }
+                    type="button"
                   >
-                    <span
-                      className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                    <EuiButtonContent
+                      className="euiButton__content"
+                      iconSide="right"
+                      iconType="popout"
+                      textProps={
+                        Object {
+                          "className": "euiButton__text",
+                        }
+                      }
                     >
-                      <EuiIcon
-                        className="euiButtonContent__icon"
-                        color="inherit"
-                        size="m"
-                        type="popout"
+                      <span
+                        className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                       >
-                        <EuiIconBeaker
-                          aria-hidden={true}
-                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
-                          focusable="false"
-                          role="img"
-                          style={null}
+                        <EuiIcon
+                          className="euiButtonContent__icon"
+                          color="inherit"
+                          size="m"
+                          type="popout"
                         >
-                          <svg
+                          <EuiIconBeaker
                             aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                             focusable="false"
-                            height={16}
                             role="img"
                             style={null}
-                            viewBox="0 0 16 16"
-                            width={16}
-                            xmlns="http://www.w3.org/2000/svg"
                           >
-                            <path
-                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                            />
-                          </svg>
-                        </EuiIconBeaker>
-                      </EuiIcon>
-                      <span
-                        className="euiButton__text"
-                      >
-                        Learn more
+                            <svg
+                              aria-hidden={true}
+                              className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
+                              focusable="false"
+                              height={16}
+                              role="img"
+                              style={null}
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
+                          </EuiIconBeaker>
+                        </EuiIcon>
+                        <span
+                          className="euiButton__text"
+                        >
+                          Learn more
+                        </span>
                       </span>
-                    </span>
-                  </EuiButtonContent>
-                </button>
-              </EuiButtonDisplay>
-            </EuiButton>
+                    </EuiButtonContent>
+                  </button>
+                </EuiButtonDisplay>
+              </EuiButton>
+            </EuiSmallButton>
           </div>
         </EuiEmptyPrompt>
       </MissingConfigurationMessage>
@@ -1155,58 +1164,67 @@ exports[`Traces table component renders jaeger traces table 1`] = `
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
                                             >
-                                              <EuiButtonIcon
+                                              <EuiSmallButtonIcon
                                                 aria-label="Copy trace id"
                                                 iconType="copyClipboard"
                                                 onBlur={[Function]}
                                                 onClick={[Function]}
                                                 onFocus={[Function]}
                                               >
-                                                <button
+                                                <EuiButtonIcon
                                                   aria-label="Copy trace id"
-                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                  disabled={false}
+                                                  iconType="copyClipboard"
                                                   onBlur={[Function]}
                                                   onClick={[Function]}
                                                   onFocus={[Function]}
-                                                  type="button"
+                                                  size="s"
                                                 >
-                                                  <EuiIcon
-                                                    aria-hidden="true"
-                                                    className="euiButtonIcon__icon"
-                                                    color="inherit"
-                                                    size="m"
-                                                    type="copyClipboard"
+                                                  <button
+                                                    aria-label="Copy trace id"
+                                                    className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                                                    disabled={false}
+                                                    onBlur={[Function]}
+                                                    onClick={[Function]}
+                                                    onFocus={[Function]}
+                                                    type="button"
                                                   >
-                                                    <EuiIconCopyClipboard
-                                                      aria-hidden={true}
-                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                                                      focusable="false"
-                                                      role="img"
-                                                      style={null}
+                                                    <EuiIcon
+                                                      aria-hidden="true"
+                                                      className="euiButtonIcon__icon"
+                                                      color="inherit"
+                                                      size="m"
+                                                      type="copyClipboard"
                                                     >
-                                                      <svg
+                                                      <EuiIconCopyClipboard
                                                         aria-hidden={true}
                                                         className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
                                                         focusable="false"
-                                                        height={16}
                                                         role="img"
                                                         style={null}
-                                                        viewBox="0 0 16 16"
-                                                        width={16}
-                                                        xmlns="http://www.w3.org/2000/svg"
                                                       >
-                                                        <path
-                                                          d="M0 2.729V2a1 1 0 0 1 1-1h2v1H1v12h4v1H1a1 1 0 0 1-1-1V2.729zM12 5V2a1 1 0 0 0-1-1H9v1h2v3h1zm-1 1h2v9H6V6h5V5H6a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h7a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-2v1z"
-                                                        />
-                                                        <path
-                                                          d="M7 10h5V9H7zM7 8h5V7H7zM7 12h5v-1H7zM7 14h5v-1H7zM9 2V1a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v1h1V1h4v1h1ZM3 3h6V2H3z"
-                                                        />
-                                                      </svg>
-                                                    </EuiIconCopyClipboard>
-                                                  </EuiIcon>
-                                                </button>
-                                              </EuiButtonIcon>
+                                                        <svg
+                                                          aria-hidden={true}
+                                                          className="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
+                                                          focusable="false"
+                                                          height={16}
+                                                          role="img"
+                                                          style={null}
+                                                          viewBox="0 0 16 16"
+                                                          width={16}
+                                                          xmlns="http://www.w3.org/2000/svg"
+                                                        >
+                                                          <path
+                                                            d="M0 2.729V2a1 1 0 0 1 1-1h2v1H1v12h4v1H1a1 1 0 0 1-1-1V2.729zM12 5V2a1 1 0 0 0-1-1H9v1h2v3h1zm-1 1h2v9H6V6h5V5H6a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h7a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-2v1z"
+                                                          />
+                                                          <path
+                                                            d="M7 10h5V9H7zM7 8h5V7H7zM7 12h5v-1H7zM7 14h5v-1H7zM9 2V1a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v1h1V1h4v1h1ZM3 3h6V2H3z"
+                                                          />
+                                                        </svg>
+                                                      </EuiIconCopyClipboard>
+                                                    </EuiIcon>
+                                                  </button>
+                                                </EuiButtonIcon>
+                                              </EuiSmallButtonIcon>
                                             </span>
                                           </EuiToolTip>
                                         </EuiCopy>
@@ -2708,55 +2726,64 @@ exports[`Traces table component renders traces table 1`] = `
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
                                             >
-                                              <EuiButtonIcon
+                                              <EuiSmallButtonIcon
                                                 aria-label="Copy trace id"
                                                 iconType="copyClipboard"
                                                 onBlur={[Function]}
                                                 onClick={[Function]}
                                                 onFocus={[Function]}
                                               >
-                                                <button
+                                                <EuiButtonIcon
                                                   aria-label="Copy trace id"
-                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                  disabled={false}
+                                                  iconType="copyClipboard"
                                                   onBlur={[Function]}
                                                   onClick={[Function]}
                                                   onFocus={[Function]}
-                                                  type="button"
+                                                  size="s"
                                                 >
-                                                  <EuiIcon
-                                                    aria-hidden="true"
-                                                    className="euiButtonIcon__icon"
-                                                    color="inherit"
-                                                    size="m"
-                                                    type="copyClipboard"
+                                                  <button
+                                                    aria-label="Copy trace id"
+                                                    className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
+                                                    disabled={false}
+                                                    onBlur={[Function]}
+                                                    onClick={[Function]}
+                                                    onFocus={[Function]}
+                                                    type="button"
                                                   >
-                                                    <EuiIconBeaker
-                                                      aria-hidden={true}
-                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                      focusable="false"
-                                                      role="img"
-                                                      style={null}
+                                                    <EuiIcon
+                                                      aria-hidden="true"
+                                                      className="euiButtonIcon__icon"
+                                                      color="inherit"
+                                                      size="m"
+                                                      type="copyClipboard"
                                                     >
-                                                      <svg
+                                                      <EuiIconBeaker
                                                         aria-hidden={true}
                                                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                         focusable="false"
-                                                        height={16}
                                                         role="img"
                                                         style={null}
-                                                        viewBox="0 0 16 16"
-                                                        width={16}
-                                                        xmlns="http://www.w3.org/2000/svg"
                                                       >
-                                                        <path
-                                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
-                                                        />
-                                                      </svg>
-                                                    </EuiIconBeaker>
-                                                  </EuiIcon>
-                                                </button>
-                                              </EuiButtonIcon>
+                                                        <svg
+                                                          aria-hidden={true}
+                                                          className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                          focusable="false"
+                                                          height={16}
+                                                          role="img"
+                                                          style={null}
+                                                          viewBox="0 0 16 16"
+                                                          width={16}
+                                                          xmlns="http://www.w3.org/2000/svg"
+                                                        >
+                                                          <path
+                                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                          />
+                                                        </svg>
+                                                      </EuiIconBeaker>
+                                                    </EuiIcon>
+                                                  </button>
+                                                </EuiButtonIcon>
+                                              </EuiSmallButtonIcon>
                                             </span>
                                           </EuiToolTip>
                                         </EuiCopy>