diff --git a/docs/pages/css/status-key.md b/docs/pages/css/status-key.md
index 38c2565e65..38ed0e25e7 100644
--- a/docs/pages/css/status-key.md
+++ b/docs/pages/css/status-key.md
@@ -2,25 +2,14 @@
 title: Status key
 ---
 
-<p class="f3-light">Primer is constantly evolving and we have many styles to refactor and bring up to standard. The status of each package is shown with it's corresponding documentation so you can be confident which styles are safe to use.</p>
+import StatusLabel from '../../src/StatusLabel'
 
-<span id="stable" class="state bg-green f5 mt-4">Stable</span>
+Primer is constantly evolving and we have many styles to refactor and bring up to standard. The status of each package is shown with it's corresponding documentation so you can be confident which styles are safe to use.
 
-These styles are safe to use in production and there are currently no planned updates. If you find a problem with these styles please [open and issue](https://github.com/github/design-systems/issues).
-
-<span id="new-release" class="State bg-green f5 mt-4">New release</span>
-
-These are newly shipped styles that are safe to use in production. While these styles will have been thoroughly tested before being shipped you may find room for improvements in the documentation, and it's possible you may find the occasional bug. Like all the code we ship, the best test is when lots of people start using it. We'll link to a corresponding feedback issue for new releases so you can comment if you find any problems or have questions.
-
-<span id="experimental" class="State bg-yellow text-gray-dark f5 mt-4">Experimental</span>
-
-These are WIP styles that are safe to use but haven't been battle tested yet. That means they may go through more significant changes in the near future. You can use these styles and help us test out these styles while we're working on, them as long as you are prepared for changes (though we'll handle updates as much as possible for you). We will have a corresponding issue for experimental styles where you can let us know you're using them, and can leave feedback or ask questions.
-
-<span id="in-review" class="state bg-yellow text-gray-dark f5 mt-4">In review</span>
-
-This means we are actively reviewing these styles with a view to refactor or deprecate them. They are still safe to use in production but if you are considering using them on a new feature it would be good to talk to us so we can make sure that our review doesn't disrupt your work. All styles in review will have a corresponding issue explaining why they are in review and will link to any relevant pull requests.
-
-
-<span id="deprecated" class="State bg-red f5 mt-4">Deprecated</span>
-
-These styles are in the process of being removed and should no longer be used in production. The design systems team are responsible for updating existing views that currently use these styles, however you can help us by replacing deprecated classes from views that you are working on (if you have the time). You will get a lint error telling you to replace these styles if you attempt to add new instances. Please contact us if this causes you a problem.
+| Label | Description |
+| :----- | :--- |
+| <StatusLabel id="stable" status="Stable" /> | These styles are safe to use in production and there are currently no planned updates. If you find a problem with these styles please [open and issue](https://github.com/github/design-systems/issues). |
+| <StatusLabel id="new-release" status="New release" /> | These are newly shipped styles that are safe to use in production. While these styles will have been thoroughly tested before being shipped you may find room for improvements in the documentation, and it's possible you may find the occasional bug. Like all the code we ship, the best test is when lots of people start using it. We'll link to a corresponding feedback issue for new releases so you can comment if you find any problems or have questions. |
+| <StatusLabel id="experimental" status="Experimental" /> | These styles are a work in progress that are safe to use, but haven't been battle-tested yet. That means they may go through more significant changes in the near future. You can use these styles and help us test out these styles while we're working on, them as long as you are prepared for changes (though we'll handle updates as much as possible for you). We will have a corresponding issue for experimental styles where you can let us know you're using them, and can leave feedback or ask questions. |
+| <StatusLabel id="in-review" status="In review" /> | This means we are actively reviewing these styles with a view to refactor or deprecate them. They are still safe to use in production but if you are considering using them on a new feature it would be good to talk to us so we can make sure that our review doesn't disrupt your work. All styles in review will have a corresponding issue explaining why they are in review and will link to any relevant pull requests. |
+| <StatusLabel id="deprecated" status="Deprecated" /> | These styles are in the process of being removed and should no longer be used in production. The design systems team are responsible for updating existing views that currently use these styles, however you can help us by replacing deprecated classes from views that you are working on (if you have the time). You will get a lint error telling you to replace these styles if you attempt to add new instances. Please contact us if this causes you a problem. |
diff --git a/docs/src/PackageHeader.js b/docs/src/PackageHeader.js
index 2460468fa8..aeb475bbc5 100644
--- a/docs/src/PackageHeader.js
+++ b/docs/src/PackageHeader.js
@@ -2,6 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import {Comment, Info, FileCode, Alert, PrimitiveDot} from '@githubprimer/octicons-react'
 import {BorderBox, Box, Flex, Link, StyledOcticon as Octicon, Text} from '@primer/components'
+import StatusLabel from './StatusLabel'
 
 export default function PackageHeader(props) {
   const {description, internal = false, package: pkg, source = '', status, status_issue: issue, ...rest} = props
@@ -38,12 +39,7 @@ export default function PackageHeader(props) {
   return (
     <Flex justifyContent="space-between" mb={4} {...rest}>
       <Text is="div" fontSize={1}>
-        {status ? (
-          <BorderBox is="a" href="/css/whats-new/status-key" display="inline-block" px={2} py={1} mr={2}>
-            <Octicon icon={PrimitiveDot} color={getStatusColor(status)} mr={2} />
-            {status}
-          </BorderBox>
-        ) : null}
+        {status ? <StatusLabel status={status} is="a" href="/css/whats-new/status-key" mr={2} /> : null}
         {info}
       </Text>
       <Box>
@@ -69,14 +65,3 @@ PackageHeader.propTypes = {
   source: PropTypes.string,
   status: PropTypes.string
 }
-
-function getStatusColor(status) {
-  return (
-    {
-      stable: 'green.6',
-      'new release': 'yellow.7',
-      deprecated: 'red.7',
-      experimental: 'orange.5'
-    }[status.toLowerCase()] || 'gray.5'
-  )
-}
diff --git a/docs/src/StatusLabel.js b/docs/src/StatusLabel.js
new file mode 100644
index 0000000000..556204569d
--- /dev/null
+++ b/docs/src/StatusLabel.js
@@ -0,0 +1,29 @@
+import styled from 'styled-components'
+import {BorderBox, StyledOcticon as Octicon, Text} from '@primer/components'
+import {PrimitiveDot} from '@githubprimer/octicons-react'
+
+const StyledLabel = styled(BorderBox)`
+  display: inline-block;
+  white-space: nowrap;
+`
+
+export const STATUS_COLORS = {
+  stable: 'green.6',
+  'new release': 'green.6',
+  experimental: 'yellow.7',
+  'in review': 'yellow.7',
+  deprecated: 'red.6'
+}
+
+export default function StatusLabel({status, children, ...rest}) {
+  return (
+    <StyledLabel px={2} py={1} {...rest}>
+      <Octicon icon={PrimitiveDot} color={getStatusColor(status)} mr={2} />
+      <Text color='black' fontSize={1}>{children || status}</Text>
+    </StyledLabel>
+  )
+}
+
+export function getStatusColor(status) {
+  return STATUS_COLORS[status.toLowerCase()] || 'gray.5'
+}