diff --git a/app/components/Badge.js b/app/components/Badge.js
index c138111f..ea3ac1f5 100644
--- a/app/components/Badge.js
+++ b/app/components/Badge.js
@@ -7,7 +7,7 @@ const Badge = styled.span`
   background-color: ${({ yellow, primary, theme }) =>
     yellow ? theme.yellow : primary ? theme.primary : theme.textTertiary};
   color: ${({ primary, yellow, theme }) =>
-    primary ? theme.white : yellow ? theme.text : theme.background};
+    primary ? theme.white : yellow ? theme.almostBlack : theme.background};
   border-radius: 4px;
   font-size: 11px;
   font-weight: 500;
diff --git a/app/components/Time.js b/app/components/Time.js
index bee88cf6..927984ee 100644
--- a/app/components/Time.js
+++ b/app/components/Time.js
@@ -50,8 +50,8 @@ class Time extends React.Component<Props> {
     if (shorten) {
       content = content
         .replace("about", "")
-        .replace("minute", "min")
-        .replace("less than a minute ago", "just now");
+        .replace("less than a minute ago", "just now")
+        .replace("minute", "min");
     }
 
     return (