diff --git a/src/plugins/home/public/application/components/_home.scss b/src/plugins/home/public/application/components/_home.scss
index 22a4b3c229218..77d401d5af43e 100644
--- a/src/plugins/home/public/application/components/_home.scss
+++ b/src/plugins/home/public/application/components/_home.scss
@@ -1,3 +1,28 @@
+// Local page vars
+$homePageHeaderHeight: $euiSize * 8;
+$homePageWidth: 1200px;
+
+.homPageHeader {
+  height: $homePageHeaderHeight;
+  margin: 0 auto;
+  max-width: $homePageWidth;
+  padding: $euiSizeXL $euiSize 0;
+}
+
+.homPageContainer {
+  min-height: calc(100vh - #{$homePageHeaderHeight});
+  background-color: $euiColorEmptyShade;
+  border-top: 1px solid $euiColorLightShade;
+}
+
+.homPage {
+  display: flex;
+  max-width: $homePageWidth;
+  margin: 0 auto;
+  padding: 0 $euiSize $euiSizeXL;
+  background-color: transparent;
+}
+
 .homHome__synopsisItem {
   max-width: 50%;
 }
diff --git a/src/plugins/home/public/application/components/_solutions_panel.scss b/src/plugins/home/public/application/components/_solutions_panel.scss
index bd2b9c56b4454..d7f384c9c514c 100644
--- a/src/plugins/home/public/application/components/_solutions_panel.scss
+++ b/src/plugins/home/public/application/components/_solutions_panel.scss
@@ -1,5 +1,5 @@
 .homSolutionsPanel {
-  margin-top: -$euiSizeXL*2;
+  margin-top: -$euiSizeXL;
 
   .homeSolutionsPanel--restrictHalfWidth {
     max-width: 50%;
@@ -24,32 +24,30 @@
     }
   }
 
+  .homSolutionsPanel__header {
+    border-radius: $euiBorderRadius 0 0 $euiBorderRadius;
+    color: $euiColorEmptyShade;
+
+    img {
+      position: absolute;
+      width: auto;
+    }
+  }
+
   .homSolutionsPanel__enterpriseSearch {
     .homSolutionsPanel__enterpriseSearchHeader {
       background-color: #017d73;
-      color: $euiColorEmptyShade;
-
-      .homSolutionsPanel__enterpriseSearchTopLeftImage {
-        .euiImage__img {
-          position: absolute;
-          top: 0;
-          left: 0;
-          margin-top: $euiSizeS;
-          height: $euiSizeXL;
-          width: auto;
-        }
+
+      .homSolutionsPanel__enterpriseSearchTopLeftImage img {
+        top: $euiSizeS;
+        left: 0;
+        height: $euiSizeXL;
       }
 
-      .homSolutionsPanel__enterpriseSearchBottomRightImage {
-        .euiImage__img {
-          position: absolute;
-          right: 0;
-          bottom: 0;
-          height: $euiSizeXL;
-          width: auto;
-          margin-bottom: $euiSizeS;
-          margin-right: $euiSizeS;
-        }
+      .homSolutionsPanel__enterpriseSearchBottomRightImage img {
+        right: $euiSizeS;
+        bottom: $euiSizeS;
+        height: $euiSizeXL;
       }
     }
   }
@@ -57,18 +55,11 @@
   .homSolutionsPanel__observability {
     .homSolutionsPanel__observabilityHeader {
       background-color: #c42373;
-      color: $euiColorEmptyShade;
-
-      .homSolutionsPanel__observabilityTopRightImage {
-        .euiImage__img {
-          position: absolute;
-          top: 0;
-          right: 0;
-          height: $euiSizeXL;
-          width: auto;
-          margin-top: $euiSizeS;
-          margin-right: $euiSizeS;
-        }
+
+      .homSolutionsPanel__observabilityTopRightImage img {
+        top: $euiSizeS;
+        right: $euiSizeS;
+        height: $euiSizeXL;
       }
     }
   }
@@ -76,18 +67,11 @@
   .homSolutionsPanel__securitySolution {
     .homSolutionsPanel__securitySolutionHeader {
       background-color: #343741;
-      color: $euiColorEmptyShade;
-
-      .homSolutionsPanel__securitySolutionTopLeftImage {
-        .euiImage__img {
-          position: absolute;
-          top: 0;
-          left: 0;
-          height: $euiSizeXXL;
-          width: auto;
-          margin-top: $euiSize;
-          margin-left: $euiSize;
-        }
+
+      .homSolutionsPanel__securitySolutionTopLeftImage img {
+        top: $euiSizeS;
+        left: $euiSizeS;
+        height: $euiSizeXXL;
       }
     }
   }
@@ -95,26 +79,17 @@
   .homSolutionsPanel__kibana {
     .homSolutionsPanel__kibanaHeader {
       background-color: #006bb4;
-      color: $euiColorEmptyShade;
-
-      .homSolutionsPanel__kibanaTopLeftImage {
-        .euiImage__img {
-          position: absolute;
-          top: 0;
-          left: 0;
-          height: $euiSizeXXL * 4;
-          width: auto;
-        }
+
+      .homSolutionsPanel__kibanaTopLeftImage img {
+        top: 0;
+        left: 0;
+        height: $euiSizeXXL * 4;
       }
 
-      .homSolutionsPanel__kibanaBottomRightImage {
-        .euiImage__img {
-          position: absolute;
-          right: 0;
-          bottom: 0;
-          height: $euiSizeXXL * 4;
-          width: auto;
-        }
+      .homSolutionsPanel__kibanaBottomRightImage img {
+        right: 0;
+        bottom: 0;
+        height: $euiSizeXXL * 4;
       }
     }
   }
diff --git a/src/plugins/home/public/application/components/change_home_route/change_home_route.tsx b/src/plugins/home/public/application/components/change_home_route/change_home_route.tsx
index 6229ac49b427e..6c4a6d9a60bc5 100644
--- a/src/plugins/home/public/application/components/change_home_route/change_home_route.tsx
+++ b/src/plugins/home/public/application/components/change_home_route/change_home_route.tsx
@@ -18,7 +18,7 @@
  */
 
 import React, { FunctionComponent } from 'react';
-import { EuiButtonEmpty, EuiText } from '@elastic/eui';
+import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { HOME_APP_BASE_PATH } from '../../../../common/constants';
 import { getServices } from '../../kibana_services';
@@ -32,20 +32,26 @@ export const ChangeHomeRoute: FunctionComponent<Props> = ({ defaultRoute }) => {
   const changeDefaultRoute = () => uiSettings.set('defaultRoute', defaultRoute);
 
   return (
-    <EuiText>
-      <p>
-        <FormattedMessage
-          id="home.changeHomeRouteText"
-          defaultMessage="Would you prefer to have an alternate home page for this Elastic space? "
-        />
-        <EuiButtonEmpty iconType="home" onClick={changeDefaultRoute}>
+    <EuiFlexGroup className="homPage__footer" alignItems="center" gutterSize="s">
+      <EuiFlexItem grow={false}>
+        <EuiText size="s" color="subdued">
+          <p>
+            <FormattedMessage
+              id="home.changeHomeRouteText"
+              defaultMessage="Would you prefer to have an alternate home page for this Elastic space? "
+            />
+          </p>
+        </EuiText>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiButtonEmpty size="xs" iconType="home" onClick={changeDefaultRoute}>
           <FormattedMessage
             id="home.changeHomeRouteLink"
             defaultMessage="Change your home page route"
           />
         </EuiButtonEmpty>
-      </p>
-    </EuiText>
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 };
 
diff --git a/src/plugins/home/public/application/components/home.js b/src/plugins/home/public/application/components/home.js
index 7a40dced19c7e..764ea55c35f7b 100644
--- a/src/plugins/home/public/application/components/home.js
+++ b/src/plugins/home/public/application/components/home.js
@@ -26,13 +26,9 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import {
   EuiButtonEmpty,
-  EuiPage,
   EuiTitle,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiPageBody,
-  EuiPageHeader,
-  EuiPageHeaderSection,
   EuiScreenReaderOnly,
   EuiSpacer,
   EuiHorizontalRule,
@@ -150,28 +146,29 @@ export class Home extends Component {
     const stackManagement = this.findDirectoryById('stack-management');
 
     return (
-      <EuiPage restrictWidth={1200} data-test-subj="homeApp">
-        <EuiPageBody className="eui-displayBlock">
-          <EuiScreenReaderOnly>
-            <h1>
-              <FormattedMessage id="home.welcomeHomePageHeader" defaultMessage="Kibana home" />
-            </h1>
-          </EuiScreenReaderOnly>
-          <EuiSpacer />
-          <EuiPageHeader>
-            <EuiPageHeaderSection>
-              <EuiTitle size="m">
+      <Fragment>
+        <header className="homPageHeader">
+          <EuiFlexGroup gutterSize="none">
+            <EuiFlexItem>
+              <EuiScreenReaderOnly>
                 <h1>
-                  <FormattedMessage
-                    id="home.pageHeader.welcomeNoUserTitle"
-                    defaultMessage="Welcome to {ELASTIC}!"
-                    values={{ ELASTIC: 'Elastic' }}
-                  />
+                  <FormattedMessage id="home.welcomeHomePageHeader" defaultMessage="Kibana home" />
                 </h1>
-              </EuiTitle>
-            </EuiPageHeaderSection>
-            <EuiPageHeaderSection>
-              <EuiFlexGroup>
+              </EuiScreenReaderOnly>
+              <EuiFlexGroup gutterSize="none">
+                <EuiTitle size="m">
+                  <h1>
+                    <FormattedMessage
+                      id="home.pageHeader.welcomeNoUserTitle"
+                      defaultMessage="Welcome to {ELASTIC}!"
+                      values={{ ELASTIC: 'Elastic' }}
+                    />
+                  </h1>
+                </EuiTitle>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiFlexGroup alignItems="flexEnd">
                 <EuiFlexItem>
                   <EuiButtonEmpty href="#/tutorial_directory" iconType="plusInCircle">
                     {i18n.translate('home.pageHeader.addDataButtonLabel', {
@@ -211,110 +208,111 @@ export class Home extends Component {
                   </EuiButtonEmpty>
                 </EuiFlexItem>
               </EuiFlexGroup>
-            </EuiPageHeaderSection>
-          </EuiPageHeader>
-
-          <EuiSpacer />
-
-          <EuiHorizontalRule />
-
-          <div className="homSolutionsPanel">
-            <SolutionsPanel
-              addBasePath={addBasePath}
-              observability={this.findDirectoryById('observability')}
-              enterpriseSearch={this.findDirectoryById('appSearch')}
-              securitySolution={this.findDirectoryById('securitySolution')}
-            />
-
-            <EuiHorizontalRule />
-
-            <div className="homAddData">
-              <EuiFlexGroup justifyContent="spaceBetween">
-                <EuiFlexItem grow={1}>
-                  <EuiTitle size="s">
-                    <h3>
-                      {i18n.translate('home.addData.sectionTitle', {
-                        defaultMessage: 'Add your data',
-                      })}
-                    </h3>
-                  </EuiTitle>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty
-                    iconType="tableDensityExpanded"
-                    href="#/tutorial_directory/sampleData"
-                    size="s"
-                  >
-                    <FormattedMessage
-                      id="home.addData.sampleDataButtonLabel"
-                      defaultMessage="Try our sample data"
-                    />
-                  </EuiButtonEmpty>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-
-              <EuiSpacer />
-
-              <EuiFlexGroup>
-                <EuiFlexItem grow={1}>
-                  <EuiFlexGroup justifyContent="spaceAround">
-                    {this.renderDirectory(fileDataVisualizer)}
-                    <EuiFlexItem className="homHome__synopsisItem">
-                      <Synopsis
-                        description={i18n.translate('home.addData.addIntegrationDescription', {
-                          defaultMessage: 'Add data from a variety of common sources.',
-                        })}
-                        iconType="indexOpen"
-                        title={i18n.translate('home.addData.addIntegrationTitle', {
-                          defaultMessage: 'Add an integration',
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </header>
+        <div className="homPageContainer">
+          <main className="homPage" data-test-subj="homeApp">
+            <div className="homSolutionsPanel">
+              <SolutionsPanel
+                addBasePath={addBasePath}
+                observability={this.findDirectoryById('observability')}
+                enterpriseSearch={this.findDirectoryById('appSearch')}
+                securitySolution={this.findDirectoryById('securitySolution')}
+              />
+
+              <EuiHorizontalRule margin="xl" />
+              <EuiSpacer size="s" />
+
+              <div className="homAddData">
+                <EuiFlexGroup justifyContent="spaceBetween" alignItems="baseline">
+                  <EuiFlexItem grow={1}>
+                    <EuiTitle size="s">
+                      <h3>
+                        {i18n.translate('home.addData.sectionTitle', {
+                          defaultMessage: 'Add your data',
                         })}
-                        url="#/tutorial_directory"
-                        wrapInPanel
+                      </h3>
+                    </EuiTitle>
+                  </EuiFlexItem>
+                  <EuiFlexItem grow={false}>
+                    <EuiButtonEmpty
+                      iconType="tableDensityExpanded"
+                      href="#/tutorial_directory/sampleData"
+                      size="xs"
+                    >
+                      <FormattedMessage
+                        id="home.addData.sampleDataButtonLabel"
+                        defaultMessage="Try our sample data"
                       />
-                    </EuiFlexItem>
-                    {this.renderDirectory(ingestManager, {
-                      isBeta: true,
-                      betaLabel: 'Experimental',
-                    })}
-                  </EuiFlexGroup>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </div>
-
-            {security || monitoring || snapshotRestore || indexLifecycleManagement ? (
-              <Fragment>
-                <EuiHorizontalRule />
-
-                <div className="homManageData">
-                  <EuiTitle size="s">
-                    <h3>
-                      {i18n.translate('home.manageData.sectionTitle', {
-                        defaultMessage: 'Manage your data',
+                    </EuiButtonEmpty>
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+
+                <EuiSpacer />
+
+                <EuiFlexGroup>
+                  <EuiFlexItem grow={1}>
+                    <EuiFlexGroup justifyContent="spaceAround">
+                      {this.renderDirectory(fileDataVisualizer)}
+                      <EuiFlexItem className="homHome__synopsisItem">
+                        <Synopsis
+                          description={i18n.translate('home.addData.addIntegrationDescription', {
+                            defaultMessage: 'Add data from a variety of common sources.',
+                          })}
+                          iconType="indexOpen"
+                          title={i18n.translate('home.addData.addIntegrationTitle', {
+                            defaultMessage: 'Add an integration',
+                          })}
+                          url="#/tutorial_directory"
+                          wrapInPanel
+                        />
+                      </EuiFlexItem>
+                      {this.renderDirectory(ingestManager, {
+                        isBeta: true,
+                        betaLabel: 'Experimental',
                       })}
-                    </h3>
-                  </EuiTitle>
-
-                  <EuiSpacer />
-
-                  <EuiFlexGroup justifyContent="spaceAround">
-                    {this.renderDirectory(security)}
-                    {this.renderDirectory(monitoring)}
-                    {this.renderDirectory(snapshotRestore)}
-                    {this.renderDirectory(indexLifecycleManagement)}
-                  </EuiFlexGroup>
-                </div>
-              </Fragment>
-            ) : null}
-
-            {canChangeHomeRoute && (
-              <Fragment>
-                <EuiHorizontalRule />
-                <ChangeHomeRoute defaultRoute={HOME_APP_BASE_PATH} />
-              </Fragment>
-            )}
-          </div>
-        </EuiPageBody>
-      </EuiPage>
+                    </EuiFlexGroup>
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              </div>
+
+              {security || monitoring || snapshotRestore || indexLifecycleManagement ? (
+                <Fragment>
+                  <EuiHorizontalRule margin="xl" />
+                  <EuiSpacer size="s" />
+
+                  <div className="homManageData">
+                    <EuiTitle size="s">
+                      <h3>
+                        {i18n.translate('home.manageData.sectionTitle', {
+                          defaultMessage: 'Manage your data',
+                        })}
+                      </h3>
+                    </EuiTitle>
+
+                    <EuiSpacer />
+
+                    <EuiFlexGroup justifyContent="spaceAround">
+                      {this.renderDirectory(security)}
+                      {this.renderDirectory(monitoring)}
+                      {this.renderDirectory(snapshotRestore)}
+                      {this.renderDirectory(indexLifecycleManagement)}
+                    </EuiFlexGroup>
+                  </div>
+                </Fragment>
+              ) : null}
+
+              {canChangeHomeRoute && (
+                <Fragment>
+                  <EuiHorizontalRule margin="xl" />
+                  <ChangeHomeRoute defaultRoute={HOME_APP_BASE_PATH} />
+                </Fragment>
+              )}
+            </div>
+          </main>
+        </div>
+      </Fragment>
     );
   }
 
diff --git a/src/plugins/home/public/application/components/solutions_panel/solutions_panel.tsx b/src/plugins/home/public/application/components/solutions_panel/solutions_panel.tsx
index 9904af5bf0c56..a458e6d5c20f4 100644
--- a/src/plugins/home/public/application/components/solutions_panel/solutions_panel.tsx
+++ b/src/plugins/home/public/application/components/solutions_panel/solutions_panel.tsx
@@ -242,7 +242,10 @@ export const SolutionsPanel: FunctionComponent<Props> = ({
                 onClick={createAppNavigationHandler('/app/app_search')} // TODO: double check this url once enterprise search plugin is merged
               >
                 <EuiFlexGroup gutterSize="none">
-                  <EuiFlexItem grow={1} className="homSolutionsPanel__enterpriseSearchHeader">
+                  <EuiFlexItem
+                    grow={1}
+                    className="homSolutionsPanel__header homSolutionsPanel__enterpriseSearchHeader"
+                  >
                     <EuiImage
                       className="homSolutionsPanel__enterpriseSearchTopLeftImage"
                       url={addBasePath(
@@ -278,7 +281,10 @@ export const SolutionsPanel: FunctionComponent<Props> = ({
                 onClick={createAppNavigationHandler(observability.path)}
               >
                 <EuiFlexGroup gutterSize="none">
-                  <EuiFlexItem grow={1} className="homSolutionsPanel__observabilityHeader">
+                  <EuiFlexItem
+                    grow={1}
+                    className="homSolutionsPanel__header homSolutionsPanel__observabilityHeader"
+                  >
                     <EuiImage
                       className="homSolutionsPanel__observabilityTopRightImage"
                       url={addBasePath(
@@ -305,7 +311,10 @@ export const SolutionsPanel: FunctionComponent<Props> = ({
                 onClick={createAppNavigationHandler(securitySolution.path)}
               >
                 <EuiFlexGroup gutterSize="none">
-                  <EuiFlexItem grow={1} className="homSolutionsPanel__securitySolutionHeader">
+                  <EuiFlexItem
+                    grow={1}
+                    className="homSolutionsPanel__header homSolutionsPanel__securitySolutionHeader"
+                  >
                     <EuiImage
                       className="homSolutionsPanel__securitySolutionTopLeftImage"
                       url={addBasePath(
@@ -335,7 +344,10 @@ export const SolutionsPanel: FunctionComponent<Props> = ({
         onClick={createAppNavigationHandler('/app/dashboards')}
       >
         <EuiFlexGroup gutterSize="none">
-          <EuiFlexItem grow={1} className="homSolutionsPanel__kibanaHeader">
+          <EuiFlexItem
+            grow={1}
+            className="homSolutionsPanel__header homSolutionsPanel__kibanaHeader"
+          >
             <EuiImage
               className="homSolutionsPanel__kibanaTopLeftImage"
               url={addBasePath('/plugins/home/assets/background_kibana_top_left_2x.png')}