diff --git a/public/components/application_analytics/components/app_table.tsx b/public/components/application_analytics/components/app_table.tsx
index 3c9fc3f9be..0b99a60d04 100644
--- a/public/components/application_analytics/components/app_table.tsx
+++ b/public/components/application_analytics/components/app_table.tsx
@@ -10,7 +10,6 @@ import {
   EuiFieldSearch,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiHorizontalRule,
   EuiInMemoryTable,
   EuiLink,
   EuiLoadingSpinner,
@@ -236,7 +235,7 @@ export function AppTable(props: AppTableProps) {
               </EuiTitle>
             )}
           </EuiPageHeader>
-          <EuiPageContent id="applicationArea">
+          <EuiPageContent id="applicationArea" paddingSize="m">
             <EuiPageContentHeader>
               <EuiFlexGroup gutterSize="s" alignItems="center">
                 <EuiFlexItem>
@@ -261,7 +260,6 @@ export function AppTable(props: AppTableProps) {
                 </EuiFlexItem>
               </EuiFlexGroup>
             </EuiPageContentHeader>
-            <EuiHorizontalRule />
             {filteredApplications.length > 0 ? (
               <EuiInMemoryTable
                 loading={props.loading}
diff --git a/public/components/application_analytics/components/application.tsx b/public/components/application_analytics/components/application.tsx
index ba7bd4299f..ca40bf50c3 100644
--- a/public/components/application_analytics/components/application.tsx
+++ b/public/components/application_analytics/components/application.tsx
@@ -11,7 +11,6 @@ import {
   EuiPageHeaderSection,
   EuiPanel,
   EuiSelectOption,
-  EuiSpacer,
   EuiTabbedContent,
   EuiTabbedContentTab,
   EuiText,
@@ -292,7 +291,6 @@ export function Application(props: AppDetailProps) {
   const getService = () => {
     return (
       <>
-        <EuiSpacer size="m" />
         <ServicesContent
           {...props}
           page="app"
@@ -317,7 +315,6 @@ export function Application(props: AppDetailProps) {
   const getTrace = () => {
     return (
       <>
-        <EuiSpacer size="m" />
         <TracesContent
           {...props}
           page="app"
@@ -330,7 +327,6 @@ export function Application(props: AppDetailProps) {
           setEndTime={setEndTimeForApp}
           dataSourceMDSId={[{ id: '', label: '' }]}
         />
-        <EuiSpacer size="m" />
         <EuiPanel>
           <PanelTitle title="Spans" totalItems={totalSpans} />
           <EuiHorizontalRule margin="m" />
diff --git a/public/components/application_analytics/components/configuration.tsx b/public/components/application_analytics/components/configuration.tsx
index b45a42f44f..aa115d0382 100644
--- a/public/components/application_analytics/components/configuration.tsx
+++ b/public/components/application_analytics/components/configuration.tsx
@@ -36,14 +36,7 @@ interface ConfigProps {
 }
 
 export const Configuration = (props: ConfigProps) => {
-  const {
-    appId,
-    application,
-    parentBreadcrumbs,
-    visWithAvailability,
-    updateApp,
-    switchToAvailability,
-  } = props;
+  const { appId, application, visWithAvailability, updateApp, switchToAvailability } = props;
   const [availabilityVisId, setAvailabilityVisId] = useState(
     application.availability.availabilityVisId || ''
   );
@@ -57,11 +50,11 @@ export const Configuration = (props: ConfigProps) => {
     <div>
       <EuiPage>
         <EuiPageBody component="div">
-          <EuiPageContent>
+          <EuiPageContent paddingSize="m">
             <EuiPageContentHeader>
               <EuiPageContentHeaderSection>
-                <EuiTitle>
-                  <h3 style={{ paddingTop: '10px' }}>Configuration details</h3>
+                <EuiTitle size="s">
+                  <h2>Configuration details</h2>
                 </EuiTitle>
               </EuiPageContentHeaderSection>
               <EuiPageContentHeaderSection>
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 ddff083489..16f6a5490e 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
@@ -21,7 +21,7 @@ exports[`<NoteTable /> spec renders the component 1`] = `
       </div>
     </header>
     <div
-      class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent"
+      class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent"
       id="notebookArea"
       role="main"
     >
@@ -190,8 +190,8 @@ exports[`<NoteTable /> spec renders the component 1`] = `
           </div>
         </div>
       </div>
-      <hr
-        class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginMedium"
+      <div
+        class="euiSpacer euiSpacer--m"
       />
       <div
         class="euiBasicTable"
@@ -933,7 +933,7 @@ exports[`<NoteTable /> spec renders the empty component 1`] = `
       </div>
     </header>
     <div
-      class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent"
+      class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent"
       id="notebookArea"
       role="main"
     >
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 90ebce72dc..f2213e48f9 100644
--- a/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap
+++ b/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap
@@ -29,74 +29,86 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <button
-                  class="euiButtonIcon euiButtonIcon--danger euiButtonIcon--small"
-                  data-test-subj="notebook-delete-icon"
-                  type="button"
+                <span
+                  class="euiToolTipAnchor"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <button
+                    class="euiButtonIcon euiButtonIcon--danger euiButtonIcon--small"
+                    data-test-subj="notebook-delete-icon"
+                    type="button"
                   >
-                    <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>
-                </button>
+                    <svg
+                      aria-hidden="true"
+                      class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                      focusable="false"
+                      height="16"
+                      role="img"
+                      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>
+                  </button>
+                </span>
               </div>
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <button
-                  class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--small"
-                  data-test-subj="notebook-edit-icon"
-                  type="button"
+                <span
+                  class="euiToolTipAnchor"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <button
+                    class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--small"
+                    data-test-subj="notebook-edit-icon"
+                    type="button"
                   >
-                    <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>
-                </button>
+                    <svg
+                      aria-hidden="true"
+                      class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                      focusable="false"
+                      height="16"
+                      role="img"
+                      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>
+                  </button>
+                </span>
               </div>
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <button
-                  class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--small"
-                  data-test-subj="notebook-duplicate-icon"
-                  type="button"
+                <span
+                  class="euiToolTipAnchor"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <button
+                    class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--small"
+                    data-test-subj="notebook-duplicate-icon"
+                    type="button"
                   >
-                    <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>
-                </button>
+                    <svg
+                      aria-hidden="true"
+                      class="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                      focusable="false"
+                      height="16"
+                      role="img"
+                      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>
+                  </button>
+                </span>
               </div>
             </div>
             <div
@@ -482,26 +494,30 @@ exports[`<Notebook /> spec Renders the visualization component 1`] = `
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <button
-                  class="euiButtonIcon euiButtonIcon--danger euiButtonIcon--small"
-                  data-test-subj="notebook-delete-icon"
-                  type="button"
+                <span
+                  class="euiToolTipAnchor"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
+                  <button
+                    class="euiButtonIcon euiButtonIcon--danger euiButtonIcon--small"
+                    data-test-subj="notebook-delete-icon"
+                    type="button"
                   >
-                    <path
-                      d="M11 3h5v1H0V3h5V1a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2Zm-7.056 8H7v1H4.1l.392 2.519c.042.269.254.458.493.458h6.03c.239 0 .451-.189.493-.458l1.498-9.576H14l-1.504 9.73c-.116.747-.74 1.304-1.481 1.304h-6.03c-.741 0-1.365-.557-1.481-1.304l-1.511-9.73H9V5.95H3.157L3.476 8H8v1H3.632l.312 2ZM6 3h4V1H6v2Z"
-                    />
-                  </svg>
-                </button>
+                    <svg
+                      aria-hidden="true"
+                      class="euiIcon euiIcon--medium euiIcon--inherit euiButtonIcon__icon"
+                      focusable="false"
+                      height="16"
+                      role="img"
+                      viewBox="0 0 16 16"
+                      width="16"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M11 3h5v1H0V3h5V1a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2Zm-7.056 8H7v1H4.1l.392 2.519c.042.269.254.458.493.458h6.03c.239 0 .451-.189.493-.458l1.498-9.576H14l-1.504 9.73c-.116.747-.74 1.304-1.481 1.304h-6.03c-.741 0-1.365-.557-1.481-1.304l-1.511-9.73H9V5.95H3.157L3.476 8H8v1H3.632l.312 2ZM6 3h4V1H6v2Z"
+                      />
+                    </svg>
+                  </button>
+                </span>
               </div>
             </div>
             <div
diff --git a/public/components/notebooks/components/note_table.tsx b/public/components/notebooks/components/note_table.tsx
index 40498d16b3..003d30725b 100644
--- a/public/components/notebooks/components/note_table.tsx
+++ b/public/components/notebooks/components/note_table.tsx
@@ -7,7 +7,6 @@ import {
   EuiCompressedFieldSearch,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiHorizontalRule,
   EuiInMemoryTable,
   EuiLink,
   EuiOverlayMask,
@@ -239,7 +238,7 @@ export function NoteTable({
               </EuiPageHeaderSection>
             </EuiPageHeader>
           )}
-          <EuiPageContent id="notebookArea">
+          <EuiPageContent id="notebookArea" paddingSize="m">
             {newNavigation ? (
               <HeaderControlledComponentsWrapper
                 description={
@@ -348,7 +347,7 @@ export function NoteTable({
                     />
                   </EuiFlexItem>
                 </EuiFlexGroup>
-                <EuiHorizontalRule margin="m" />
+                <EuiSpacer size="m" />
                 <EuiInMemoryTable
                   loading={loading}
                   items={
diff --git a/public/components/notebooks/components/notebook.tsx b/public/components/notebooks/components/notebook.tsx
index 3c3e65f221..92b6758999 100644
--- a/public/components/notebooks/components/notebook.tsx
+++ b/public/components/notebooks/components/notebook.tsx
@@ -23,12 +23,14 @@ import {
   EuiText,
   EuiButtonIcon,
   EuiTitle,
+  EuiToolTip,
 } from '@elastic/eui';
 import CSS from 'csstype';
 import moment from 'moment';
 import queryString from 'query-string';
 import React, { Component } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
+import { FormattedMessage } from '@osd/i18n/react';
 import {
   ChromeBreadcrumb,
   CoreStart,
@@ -1003,45 +1005,72 @@ export class Notebook extends Component<NotebookProps, NotebookState> {
         {this.state.savedObjectNotebook ? (
           <>
             <EuiFlexItem grow={false}>
-              <EuiButtonIcon
-                color="danger"
-                display="base"
-                iconType="trash"
-                size="s"
-                onClick={this.showDeleteNotebookModal}
-                data-test-subj="notebook-delete-icon"
-              />
+              <EuiToolTip
+                content={
+                  <FormattedMessage id="notebook.deleteButton.tooltip" defaultMessage="Delete" />
+                }
+              >
+                <EuiButtonIcon
+                  color="danger"
+                  display="base"
+                  iconType="trash"
+                  size="s"
+                  onClick={this.showDeleteNotebookModal}
+                  data-test-subj="notebook-delete-icon"
+                />
+              </EuiToolTip>
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
-              <EuiButtonIcon
-                display="base"
-                iconType="pencil"
-                size="s"
-                onClick={this.showRenameModal}
-                data-test-subj="notebook-edit-icon"
-              />
+              <EuiToolTip
+                content={
+                  <FormattedMessage id="notebook.editButton.tooltip" defaultMessage="Edit name" />
+                }
+              >
+                <EuiButtonIcon
+                  display="base"
+                  iconType="pencil"
+                  size="s"
+                  onClick={this.showRenameModal}
+                  data-test-subj="notebook-edit-icon"
+                />
+              </EuiToolTip>
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
-              <EuiButtonIcon
-                iconType="copy"
-                display="base"
-                size="s"
-                onClick={this.showCloneModal}
-                data-test-subj="notebook-duplicate-icon"
-              />
+              <EuiToolTip
+                content={
+                  <FormattedMessage
+                    id="notebook.duplicateButton.tooltip"
+                    defaultMessage="Duplicate"
+                  />
+                }
+              >
+                <EuiButtonIcon
+                  iconType="copy"
+                  display="base"
+                  size="s"
+                  onClick={this.showCloneModal}
+                  data-test-subj="notebook-duplicate-icon"
+                />
+              </EuiToolTip>
             </EuiFlexItem>
           </>
         ) : (
           <>
             <EuiFlexItem grow={false}>
-              <EuiButtonIcon
-                color="danger"
-                display="base"
-                iconType="trash"
-                size="s"
-                onClick={this.showDeleteNotebookModal}
-                data-test-subj="notebook-delete-icon"
-              />
+              <EuiToolTip
+                content={
+                  <FormattedMessage id="notebook.deleteButton.tooltip" defaultMessage="Delete" />
+                }
+              >
+                <EuiButtonIcon
+                  color="danger"
+                  display="base"
+                  iconType="trash"
+                  size="s"
+                  onClick={this.showDeleteNotebookModal}
+                  data-test-subj="notebook-delete-icon"
+                />
+              </EuiToolTip>
             </EuiFlexItem>
           </>
         )}
diff --git a/public/components/overview/components/card_configs.tsx b/public/components/overview/components/card_configs.tsx
index b4969bf2bf..9ddcfcf5f7 100644
--- a/public/components/overview/components/card_configs.tsx
+++ b/public/components/overview/components/card_configs.tsx
@@ -31,7 +31,7 @@ const GETTING_STARTED_CONFIG: GettingStartedConfig = {
     defaultMessage: 'Set up your Observability workspace',
   }),
   description: 'Get started by collecting and analyzing your metrics, logs, and traces.',
-  footer: 'Getting Started Guide',
+  footer: 'Getting started guide',
   url: observabilityGettingStartedID,
   path: '#/',
 };
@@ -46,7 +46,7 @@ const SAMPLEDATA_CONFIG: GettingStartedConfig = {
     defaultMessage: 'Try OpenSearch',
   }),
   url: tutorialSampleDataPluginId,
-  footer: 'Sample Datasets',
+  footer: 'Sample datasets',
   path: '#/',
 };
 
diff --git a/public/plugin_helpers/plugin_nav.tsx b/public/plugin_helpers/plugin_nav.tsx
index 36c1ab2d3e..75e8e021b3 100644
--- a/public/plugin_helpers/plugin_nav.tsx
+++ b/public/plugin_helpers/plugin_nav.tsx
@@ -53,7 +53,7 @@ export function registerAllPluginNavGroups(core: CoreSetup<AppPluginStartDepende
       id: observabilityMetricsID,
       category: DEFAULT_APP_CATEGORIES.investigate,
       showInAllNavGroup: true,
-      order: 100,
+      order: 200,
     },
   ]);
 
@@ -77,13 +77,13 @@ export function registerAllPluginNavGroups(core: CoreSetup<AppPluginStartDepende
       id: 'observability-traces-nav',
       category: DEFAULT_APP_CATEGORIES.investigate,
       showInAllNavGroup: true,
-      order: 200,
+      order: 300,
     },
     {
       id: 'observability-services-nav',
       category: DEFAULT_APP_CATEGORIES.investigate,
       showInAllNavGroup: true,
-      order: 300,
+      order: 100,
     },
   ]);
 }