diff --git a/packages/billing/gateway/src/components/plan-picker.tsx b/packages/billing/gateway/src/components/plan-picker.tsx
index b39cef2d5..dda8834ba 100644
--- a/packages/billing/gateway/src/components/plan-picker.tsx
+++ b/packages/billing/gateway/src/components/plan-picker.tsx
@@ -265,16 +265,38 @@ export function PlanPicker(
                                 'flex flex-col justify-center space-y-2'
                               }
                             >
-                              <span className="font-semibold">
-                                <Trans
-                                  i18nKey={`billing:products.${product.id}.name`}
-                                  defaults={product.name}
-                                />
-                              </span>
+                              <div className={'flex items-center space-x-2.5'}>
+                                <span className="font-semibold">
+                                  <Trans
+                                    i18nKey={`billing:plans.${product.id}.name`}
+                                    defaults={product.name}
+                                  />
+                                </span>
+
+                                <If
+                                  condition={
+                                    plan.trialDays && props.canStartTrial
+                                  }
+                                >
+                                  <div>
+                                    <Badge
+                                      className={'px-1 py-0.5 text-xs'}
+                                      variant={'success'}
+                                    >
+                                      <Trans
+                                        i18nKey={`billing:trialPeriod`}
+                                        values={{
+                                          period: plan.trialDays,
+                                        }}
+                                      />
+                                    </Badge>
+                                  </div>
+                                </If>
+                              </div>
 
                               <span className={'text-muted-foreground'}>
                                 <Trans
-                                  i18nKey={`billing:products.${product.id}.description`}
+                                  i18nKey={`billing:plans.${product.id}.description`}
                                   defaults={product.description}
                                 />
                               </span>
@@ -285,23 +307,6 @@ export function PlanPicker(
                                 'flex flex-col space-y-2 lg:flex-row lg:items-center lg:space-x-4 lg:space-y-0 lg:text-right'
                               }
                             >
-                              <If
-                                condition={
-                                  plan.trialDays && props.canStartTrial
-                                }
-                              >
-                                <div>
-                                  <Badge variant={'success'}>
-                                    <Trans
-                                      i18nKey={`billing:trialPeriod`}
-                                      values={{
-                                        period: plan.trialDays,
-                                      }}
-                                    />
-                                  </Badge>
-                                </div>
-                              </If>
-
                               <div>
                                 <Price key={plan.id}>
                                   <span>
@@ -416,7 +421,7 @@ function PlanDetails({
         <Heading level={5}>
           <b>
             <Trans
-              i18nKey={`billing:products.${selectedProduct.id}.name`}
+              i18nKey={`billing:plans.${selectedProduct.id}.name`}
               defaults={selectedProduct.name}
             />
           </b>{' '}
@@ -428,7 +433,7 @@ function PlanDetails({
         <p>
           <span className={'text-muted-foreground'}>
             <Trans
-              i18nKey={`billing:products.${selectedProduct.id}.description`}
+              i18nKey={`billing:plans.${selectedProduct.id}.description`}
               defaults={selectedProduct.description}
             />
           </span>
@@ -464,7 +469,7 @@ function PlanDetails({
               <CheckCircle className={'h-4 text-green-500'} />
 
               <span className={'text-secondary-foreground'}>
-                <Trans i18nKey={`billing:features.${item}`} defaults={item} />
+                <Trans i18nKey={item} defaults={item} />
               </span>
             </div>
           );
diff --git a/packages/billing/gateway/src/components/pricing-table.tsx b/packages/billing/gateway/src/components/pricing-table.tsx
index 57a0ab342..00d737067 100644
--- a/packages/billing/gateway/src/components/pricing-table.tsx
+++ b/packages/billing/gateway/src/components/pricing-table.tsx
@@ -4,7 +4,8 @@ import { useState } from 'react';
 
 import Link from 'next/link';
 
-import { ArrowRight, CheckCircle, Circle, Sparkles } from 'lucide-react';
+import { ArrowRight, CheckCircle, Circle } from 'lucide-react';
+import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
 
 import {
@@ -167,7 +168,7 @@ function PricingItem(
     >
       <div className={'flex flex-col space-y-6'}>
         <div className={'flex flex-col space-y-4'}>
-          <div className={'flex items-center space-x-4'}>
+          <div className={'flex items-center space-x-6'}>
             <b
               className={
                 'text-current-foreground font-heading font-semibold uppercase'
@@ -181,10 +182,6 @@ function PricingItem(
 
             <If condition={props.product.badge}>
               <Badge variant={highlighted ? 'default' : 'outline'}>
-                <If condition={highlighted}>
-                  <Sparkles className={'h-3'} />
-                </If>
-
                 <span>
                   <Trans
                     i18nKey={props.product.badge}
@@ -195,7 +192,7 @@ function PricingItem(
             </If>
           </div>
 
-          <span className={cn(`text-muted-foreground h-8 text-base`)}>
+          <span className={cn(`text-muted-foreground h-10 text-base`)}>
             <Trans
               i18nKey={props.product.description}
               defaults={props.product.description}
@@ -203,6 +200,8 @@ function PricingItem(
           </span>
         </div>
 
+        <Separator />
+
         <div className={'flex flex-col space-y-1'}>
           <Price>
             {formatCurrency(props.product.currency, props.primaryLineItem.cost)}
@@ -311,10 +310,7 @@ function FeaturesList(
       {props.features.map((feature) => {
         return (
           <ListItem key={feature}>
-            <Trans
-              i18nKey={`common:plans.features.${feature}`}
-              defaults={feature}
-            />
+            <Trans i18nKey={feature} defaults={feature} />
           </ListItem>
         );
       })}
@@ -426,6 +422,8 @@ function DefaultCheckoutButton(
     ? '?redirectToCheckout=true'
     : '';
 
+  const { t } = useTranslation('billing');
+
   const planId = props.plan.id;
   const signUpPath = props.paths.signUp;
   const subscriptionPath = props.paths.subscription;
@@ -449,7 +447,9 @@ function DefaultCheckoutButton(
             i18nKey={label}
             defaults={label}
             values={{
-              plan: props.product.name,
+              plan: t(props.product.name, {
+                defaultValue: props.product.name,
+              }),
             }}
           />
         </span>