diff --git a/app/components/affiliate-page/affiliate-referred-user-item.hbs b/app/components/affiliate-page/affiliate-referred-user-item.hbs
index b8217f68bd..ef75c0cfeb 100644
--- a/app/components/affiliate-page/affiliate-referred-user-item.hbs
+++ b/app/components/affiliate-page/affiliate-referred-user-item.hbs
@@ -22,44 +22,44 @@
       </div>
     </div>
   </a>
-  <div class="flex items-center flex-wrap gap-y-2">
+  <div class="flex items-center flex-wrap gap-2">
     {{#if (gt @affiliateReferral.totalEarningsAmountInDollars 0)}}
-      <div class="flex shrink-0">
-        <span
-          class="inline-flex border border-green-300 rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-700 mr-2"
-        >${{@affiliateReferral.spentAmountInDollars}} spent</span>
+      <Pill @color="green" class="shrink-0">
+        ${{@affiliateReferral.spentAmountInDollars}}
+        spent
+
         <EmberTooltip @text="This is the amount {{@affiliateReferral.customer.username}} has spent so far." />
-      </div>
+      </Pill>
     {{/if}}
+
     {{#if (gt @affiliateReferral.upcomingPaymentAmountInDollars 0)}}
-      <div class="flex shrink-0">
-        <span
-          class="inline-flex border border-yellow-300 rounded-full bg-yellow-100 px-2 text-xs font-semibold leading-5 text-yellow-700 mr-2"
-        >${{@affiliateReferral.upcomingPaymentAmountInDollars}} pending</span>
+      <Pill @color="yellow" class="shrink-0">
+        ${{@affiliateReferral.upcomingPaymentAmountInDollars}}
+        pending
+
         <EmberTooltip @text="This is the value of {{@affiliateReferral.customer.username}}'s upcoming payment." />
-      </div>
+      </Pill>
     {{/if}}
-    <div class="flex shrink-0">
-      {{#if @affiliateReferral.statusIsTrialing}}
-        <span
-          class="inline-flex border border-yellow-300 rounded-full bg-yellow-100 px-2 text-xs font-semibold leading-5 text-yellow-700 mr-2"
-        >Trialing</span>
-        <EmberTooltip @text="This user has started a trial. We haven't received their first payment yet." />
-      {{else if @affiliateReferral.statusIsPendingTrial}}
-        <span class="inline-flex border border-gray-300 rounded-full bg-gray-100 px-2 text-xs font-semibold leading-5 text-gray-700 mr-2">Signed up</span>
-        <EmberTooltip @text="This user has accepted your referral offer but hasn't started a trial yet." />
-      {{else if @affiliateReferral.statusIsFirstChargeSuccessful}}
-        <span
-          class="inline-flex border border-green-300 rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-700 mr-2"
-        >Paid</span>
+
+    {{#if @affiliateReferral.statusIsAwaitingFirstCharge}}
+      <Pill @color="gray" class="shrink-0">
+        Signed up
+
+        <EmberTooltip @text="This user has accepted your referral offer but hasn't made a payment yet." />
+      </Pill>
+    {{else if @affiliateReferral.statusIsFirstChargeSuccessful}}
+      <Pill @color="green" class="shrink-0">
+        Paid
+
         <EmberTooltip @text="This user has made at least one payment that is attributable to you." />
-      {{else}}
-        <span
-          class="inline-flex border border-gray-300 rounded-full bg-gray-100 px-2 text-xs font-semibold leading-5 text-gray-700 mr-2"
-        >Inactive</span>
-        <EmberTooltip @text="This user either cancelled their trial, joined a paid team account or availed a separate discount." />
-      {{/if}}
-    </div>
+      </Pill>
+    {{else}}
+      <Pill @color="gray" class="shrink-0">
+        Inactive
+
+        <EmberTooltip @text="This user either joined a paid team account or availed a separate discount." />
+      </Pill>
+    {{/if}}
 
     <span class="text-gray-400 text-xs hidden lg:block">{{date-from-now @affiliateReferral.activatedAt}}</span>
   </div>
diff --git a/app/models/affiliate-referral.ts b/app/models/affiliate-referral.ts
index 6f98be6385..f1d2120cdb 100644
--- a/app/models/affiliate-referral.ts
+++ b/app/models/affiliate-referral.ts
@@ -8,20 +8,20 @@ export default class AffiliateReferralModel extends Model {
   @belongsTo('affiliate-link', { async: false, inverse: 'referrals' }) declare affiliateLink: AffiliateLinkModel;
 
   @attr('date') declare activatedAt: Date;
-  @attr('string') declare status: 'pending_trial' | 'trialing' | 'first_charge_successful' | 'trial_cancelled' | 'inactive';
+  @attr('string') declare status: 'awaiting_first_charge' | 'first_charge_successful' | 'inactive';
   @attr('number') declare spentAmountInCents: number;
   @attr('number') declare upcomingPaymentAmountInCents: number;
   @attr('number') declare withdrawableEarningsAmountInCents: number;
   @attr('number') declare withheldEarningsAmountInCents: number;
 
-  get hasStartedTrial() {
-    return this.statusIsTrialing || this.statusIsFirstChargeSuccessful || this.statusIsTrialCancelled;
-  }
-
   get spentAmountInDollars() {
     return this.spentAmountInCents / 100;
   }
 
+  get statusIsAwaitingFirstCharge() {
+    return this.status === 'awaiting_first_charge';
+  }
+
   get statusIsFirstChargeSuccessful() {
     return this.status === 'first_charge_successful';
   }
@@ -30,18 +30,6 @@ export default class AffiliateReferralModel extends Model {
     return this.status === 'inactive';
   }
 
-  get statusIsPendingTrial() {
-    return this.status === 'pending_trial';
-  }
-
-  get statusIsTrialCancelled() {
-    return this.status === 'trial_cancelled';
-  }
-
-  get statusIsTrialing() {
-    return this.status === 'trialing';
-  }
-
   get totalEarningsAmountInCents() {
     return this.withdrawableEarningsAmountInCents + this.withheldEarningsAmountInCents;
   }