diff --git a/client/components/TestPlanVersionsPage/index.jsx b/client/components/TestPlanVersionsPage/index.jsx
index 405ac9d0f..9e14a20ce 100644
--- a/client/components/TestPlanVersionsPage/index.jsx
+++ b/client/components/TestPlanVersionsPage/index.jsx
@@ -273,10 +273,47 @@ const TestPlanVersionsPage = () => {
                                                     </PhasePill>
                                                 );
 
+                                                const draftPill = (
+                                                    <PhasePill
+                                                        fullWidth={false}
+                                                    >
+                                                        DRAFT
+                                                    </PhasePill>
+                                                );
+
+                                                if (
+                                                    derivedDeprecatedAtPhase ===
+                                                    'RD'
+                                                ) {
+                                                    return (
+                                                        <>
+                                                            {deprecatedPill}
+                                                            {` before `}
+                                                            {draftPill}
+                                                            {` review `}
+                                                        </>
+                                                    );
+                                                }
+
+                                                if (
+                                                    derivedDeprecatedAtPhase ===
+                                                    'RECOMMENDED'
+                                                ) {
+                                                    return (
+                                                        <>
+                                                            {deprecatedPill}
+                                                            {` after being approved as `}
+                                                            {phasePill}
+                                                        </>
+                                                    );
+                                                }
+
                                                 return (
                                                     <>
-                                                        {deprecatedPill} during{' '}
-                                                        {phasePill} review
+                                                        {deprecatedPill}
+                                                        {` during `}
+                                                        {phasePill}
+                                                        {` review `}
                                                     </>
                                                 );
                                             }
diff --git a/client/components/common/PhasePill/index.jsx b/client/components/common/PhasePill/index.jsx
index 78e29be05..992dce3b8 100644
--- a/client/components/common/PhasePill/index.jsx
+++ b/client/components/common/PhasePill/index.jsx
@@ -21,8 +21,8 @@ const PhaseText = styled.span`
         padding: 2px 15px;
         vertical-align: middle;
         position: relative;
-        top: -1px;
-        margin-right: 5px;
+        top: -4px;
+        margin-top: 4px; /* Improve appearance when text wraps */
     }
 
     &.rd {
diff --git a/client/components/common/ThemeTable/index.jsx b/client/components/common/ThemeTable/index.jsx
index 9907130b9..12d2e739c 100644
--- a/client/components/common/ThemeTable/index.jsx
+++ b/client/components/common/ThemeTable/index.jsx
@@ -28,6 +28,7 @@ export const ThemeTable = styled(Table)`
     th {
         padding-left: 1rem;
         min-width: 165px;
+        vertical-align: middle;
     }
 `;