Switch to KibanaPageTemplate; use template=“empty”

src/plugins/home/public/application/components/_home.scss

@@ -1,7 +1,3 @@
-.homPageHeader--hasOverlap {
-  padding-bottom: ($euiSizeL * 2);
-}
-
 .homData--expanded {
   flex-direction: column;
 

src/plugins/home/public/application/components/_solutions_section.scss

@@ -1,7 +1,3 @@
-.homSolutions {
-  margin-top: -(($euiSizeL * 2) + $euiSizeM);
-}
-
 .homSolutions__content {
   min-height: $euiSize * 16;
 

src/plugins/home/public/application/components/home.js

@@ -9,10 +9,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule, EuiPageTemplate } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
 import {
+  KibanaPageTemplate,
   overviewPageActions,
   OverviewPageFooter,
 } from '../../../../../../src/plugins/kibana_react/public';
@@ -124,9 +125,8 @@ export class Home extends Component {
     }
 
     return (
-      <EuiPageTemplate
+      <KibanaPageTemplate
         pageHeader={{
-          className: `homPageHeader ${solutions.length ? ' homPageHeader--hasOverlap' : null}`,
           pageTitle: <FormattedMessage id="home.header.title" defaultMessage="Home" />,
           rightSideItems: overviewPageActions({
             addBasePath,
@@ -135,6 +135,7 @@ export class Home extends Component {
             showManagementLink: true,
           }),
         }}
+        template="empty"
       >
         {solutions.length ? (
           <SolutionsSection
@@ -172,7 +173,7 @@ export class Home extends Component {
             trackUiMetric(METRIC_TYPE.CLICK, 'change_to_different_default_route');
           }}
         />
-      </EuiPageTemplate>
+      </KibanaPageTemplate>
     );
   }
 

src/plugins/kibana_overview/public/components/overview/overview.tsx

@@ -13,7 +13,6 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiHorizontalRule,
-  EuiPageTemplate,
   EuiScreenReaderOnly,
   EuiSpacer,
   EuiTitle,
@@ -24,6 +23,7 @@ import { CoreStart } from 'kibana/public';
 import {
   RedirectAppLinks,
   useKibana,
+  KibanaPageTemplate,
   overviewPageActions,
   OverviewPageFooter,
 } from '../../../../../../src/plugins/kibana_react/public';
@@ -117,9 +117,8 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
   const remainingApps = kibanaApps.map(({ id }) => id).filter((id) => !mainApps.includes(id));
 
   return (
-    <EuiPageTemplate
+    <KibanaPageTemplate
       pageHeader={{
-        className: 'kbnPageHeader',
         iconType: 'logoKibana',
         pageTitle: <FormattedMessage defaultMessage="Kibana" id="kibanaOverview.header.title" />,
         rightSideItems: overviewPageActions({
@@ -128,6 +127,7 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
           hidden: isNewKibanaInstance,
         }),
       }}
+      template="empty"
     >
       {isNewKibanaInstance ? (
         <GettingStarted addBasePath={addBasePath} isDarkTheme={IS_DARK_THEME} apps={kibanaApps} />
@@ -260,6 +260,6 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
           trackUiMetric(METRIC_TYPE.CLICK, 'change_to_different_default_route');
         }}
       />
-    </EuiPageTemplate>
+    </KibanaPageTemplate>
   );
 };