diff --git a/plugins/catalog/src/components/EntityNotFound/EntityNotFound.tsx b/plugins/catalog/src/components/EntityNotFound/EntityNotFound.tsx
index 8f57b67b7e..be38d8f025 100644
--- a/plugins/catalog/src/components/EntityNotFound/EntityNotFound.tsx
+++ b/plugins/catalog/src/components/EntityNotFound/EntityNotFound.tsx
@@ -17,28 +17,20 @@
 import React, { FC } from 'react';
 import { Grid, Button, Typography } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
-import {
-  Header,
-  Page,
-  Content,
-  ContentHeader,
-  HeaderLabel,
-  pageTheme,
-  SupportButton,
-} from '@backstage/core';
 import { BackstageTheme } from '@backstage/theme';
 
 import { Illo } from './Illo';
 
 const useStyles = makeStyles<BackstageTheme>(theme => ({
   container: {
-    paddingTop: theme.spacing(6),
+    paddingTop: theme.spacing(24),
+    paddingLeft: theme.spacing(8),
   },
   title: {
     paddingBottom: theme.spacing(2),
   },
   body: {
-    paddingBottom: theme.spacing(4),
+    paddingBottom: theme.spacing(6),
   },
 }));
 
@@ -46,45 +38,24 @@ export const EntityNotFound: FC<{}> = () => {
   const classes = useStyles();
 
   return (
-    <Page theme={pageTheme.tool}>
+    <Grid container className={classes.container}>
       <Illo />
-      <Header title="Component" subtitle="Component information">
-        <HeaderLabel label="Owner" value="Spotify" />
-        <HeaderLabel label="Lifecycle" value="Alpha" />
-      </Header>
-      <Content>
-        <ContentHeader
-          title="Component Name"
-          description="Subtitle for component"
+      <Grid item xs={12} sm={6}>
+        <Typography variant="h2" className={classes.title}>
+          Entity was not found
+        </Typography>
+        <Typography variant="body1" className={classes.body}>
+          Want to help us build this? Check out our Getting Started
+          documentation.
+        </Typography>
+        <Button
+          variant="contained"
+          color="primary"
+          href="https://backstage.io/docs"
         >
-          <Button
-            variant="contained"
-            color="primary"
-            onClick={() => window.location.reload()}
-          >
-            Refresh
-          </Button>
-          <SupportButton>All your software catalog entities</SupportButton>
-        </ContentHeader>
-        <Grid container className={classes.container}>
-          <Grid item xs={12} sm={6}>
-            <Typography variant="h4" className={classes.title}>
-              Entity was not found
-            </Typography>
-            <Typography variant="body1" className={classes.body}>
-              Want to help us build this? Check out our Getting Started
-              documentation.{' '}
-            </Typography>
-            <Button
-              variant="contained"
-              color="primary"
-              href="https://backstage.io/docs"
-            >
-              DOCS
-            </Button>
-          </Grid>
-        </Grid>
-      </Content>
-    </Page>
+          DOCS
+        </Button>
+      </Grid>
+    </Grid>
   );
 };
diff --git a/plugins/catalog/src/components/EntityNotFound/Illo.jsx b/plugins/catalog/src/components/EntityNotFound/Illo.jsx
index 47dc1b3131..36b8d84f5d 100644
--- a/plugins/catalog/src/components/EntityNotFound/Illo.jsx
+++ b/plugins/catalog/src/components/EntityNotFound/Illo.jsx
@@ -21,7 +21,7 @@ import IlloSvgUrl from './illo.svg';
 const useStyles = makeStyles({
   illo: {
     maxWidth: '60%',
-    top: 200,
+    top: 100,
     right: 20,
     position: 'absolute',
   },