diff --git a/app/components/component-manuscripts/src/Manuscript.jsx b/app/components/component-manuscripts/src/Manuscript.jsx
index aedc96b0bdf1d36c8e984b519320db65a9a0d54b..95493e7e2e6b66e6edc164e2ede0698991555261 100644
--- a/app/components/component-manuscripts/src/Manuscript.jsx
+++ b/app/components/component-manuscripts/src/Manuscript.jsx
@@ -15,6 +15,7 @@ import {
   ErrorStatus,
   NormalStatus,
   UserAction as Action,
+  StatusBadge,
 } from './style'
 
 import { convertTimestampToDate } from '../../../shared/time-formatting'
@@ -25,14 +26,6 @@ const DELETE_MANUSCRIPT = gql`
   }
 `
 
-const Status = ({ status }) => {
-  if (status === 'accepted') {
-    return <SuccessStatus>{status}</SuccessStatus>
-  } else if (status === 'rejected') {
-    return <ErrorStatus>{status}</ErrorStatus>
-  }
-  return <NormalStatus>{status}</NormalStatus>
-}
 
 const User = ({ manuscript }) => {
   const [deleteManuscript] = useMutation(DELETE_MANUSCRIPT)
@@ -41,17 +34,10 @@ const User = ({ manuscript }) => {
     <Row>
       <Cell>
         {manuscript.meta && manuscript.meta.title}
-        {/* <UserCombo>
-          <UserAvatar manuscript={manuscript} />
-          <UserInfo>
-            <Primary>{manuscript.username}</Primary>
-            <Secondary>{manuscript.email || '(via ORCID)'}</Secondary>
-          </UserInfo>
-        </UserCombo> */}
       </Cell>
       <Cell>{convertTimestampToDate(manuscript.created)}</Cell>
       <Cell>
-        <Status status={manuscript.status} />
+        <StatusBadge status={manuscript.status} />
       </Cell>
       <Cell>
         {manuscript.submitter && (
diff --git a/app/components/component-manuscripts/src/style.js b/app/components/component-manuscripts/src/style.js
index d6e558a0c71d9ec1daed01b9e8efb6d4ef2347d4..6f5c40a4ad1d19e7d5b8fbd2c6ae15dd96d24505 100644
--- a/app/components/component-manuscripts/src/style.js
+++ b/app/components/component-manuscripts/src/style.js
@@ -20,29 +20,15 @@ export {
   CaretDown,
   Spinner,
   Pagination,
+  SuccessStatus,
+  ErrorStatus,
+  NormalStatus,
+  StatusBadge,
 } from '../../shared'
 
 // TODO: Extract common above
 // Specific
 
-const Status = styled.span`
-  border-radius: 8px;
-  font-variant: all-small-caps;
-  padding: ${grid(0.5)} ${grid(1)};
-`
-export const SuccessStatus = styled(Status)`
-  background-color: ${th('colorSuccess')};
-`
-
-export const ErrorStatus = styled(Status)`
-  background-color: ${th('colorError')};
-`
-
-export const NormalStatus = styled(Status)`
-  background-color: ${th('colorWarning')};
-  // color: ${th('colorTextReverse')};
-`
-
 export const UserAction = styled(Action)`
   font-size: inherit;
 `
diff --git a/app/components/shared/Badge.js b/app/components/shared/Badge.js
new file mode 100644
index 0000000000000000000000000000000000000000..f7f1a2e873fa848a66930d08347af8dc5dbe08f4
--- /dev/null
+++ b/app/components/shared/Badge.js
@@ -0,0 +1,73 @@
+import React from 'react'
+import styled, { css } from 'styled-components'
+import { grid, th } from '@pubsweet/ui-toolkit'
+
+const Status = styled.span`
+  border-radius: 8px;
+  font-variant: all-small-caps;
+  font-size: ${th('fontSizeBaseSmall')};
+  ${props =>
+    !props.minimal &&
+    css`
+      padding: ${grid(0.5)} ${grid(1)};
+    `}
+`
+
+export const SuccessStatus = styled(Status)`
+  ${props =>
+    props.minimal
+      ? css`
+          color: ${th('colorSuccess')};
+        `
+      : css`
+          background-color: ${th('colorSuccess')};
+          color: ${th('colorTextReverse')};
+        `}
+`
+
+export const ErrorStatus = styled(Status)`
+  ${props =>
+    props.minimal
+      ? css`
+          color: ${th('colorError')};
+        `
+      : css`
+          background-color: ${th('colorError')};
+          color: ${th('colorTextReverse')};
+        `}
+`
+
+export const NormalStatus = styled(Status)`
+  // background-color: ${th('colorWarning')};
+  // color: ${th('colorTextReverse')};
+  ${props =>
+    props.minimal
+      ? css`
+          color: ${th('colorPrimary')};
+        `
+      : css`
+          background-color: ${th('colorWarning')};
+        `}
+`
+
+const label = status => {
+  const labels = {
+    accepted: 'Accepted',
+    assignedToEditor: 'Assigned to editor',
+    assigningReviewers: 'Assigning reviewers',
+    new: 'Unsubmitted',
+    rejected: 'Rejected',
+    submitted: 'Submitted',
+    revise: 'Revising',
+  }
+  return labels[status] || `Unknown (${status})`
+}
+
+export const StatusBadge = ({ status, minimal }) => {
+  if (status === 'accepted') {
+    return <SuccessStatus minimal={minimal}>{label(status)}</SuccessStatus>
+  } else if (status === 'rejected') {
+    return <ErrorStatus minimal={minimal}>{label(status)}</ErrorStatus>
+  }
+  return <NormalStatus minimal={minimal}>{label(status)}</NormalStatus>
+}