diff --git a/apps/web/src/views/pricing/components/FeatureComparisonTable.tsx b/apps/web/src/views/pricing/components/FeatureComparisonTable.tsx
index ac24c558..11005b2b 100644
--- a/apps/web/src/views/pricing/components/FeatureComparisonTable.tsx
+++ b/apps/web/src/views/pricing/components/FeatureComparisonTable.tsx
@@ -1,293 +1,587 @@
 import { t } from "@lingui/core/macro";
+import React, { useEffect, useRef, useState } from "react";
 import { HiCheckCircle, HiXCircle } from "react-icons/hi2";
-
-interface Feature {
-  key: string;
-  label: string;
-  kan: boolean | string;
-  trello: boolean | string;
-}
-
-interface Section {
-  name: string;
-  features: Feature[];
-}
+import { twMerge } from "tailwind-merge";
 
 type FrequencyValue = "monthly" | "annually";
 
-const CellValue = ({ value }: { value: boolean | string }) => {
-  if (typeof value === "string") {
-    return (
-      <span className="text-sm text-dark-900 dark:text-dark-900">{value}</span>
-    );
-  }
-  return value ? (
-    <HiCheckCircle className="h-5 w-5 text-light-950 dark:text-dark-1000" />
-  ) : (
-    <HiXCircle className="h-5 w-5 text-light-700 dark:text-dark-600" />
-  );
-};
+interface PlanFeature {
+  key: string;
+  label: string;
+  free: string | boolean | { text: string; highlight?: string };
+  teams: string | boolean | { text: string; highlight?: string };
+  pro: string | boolean | { text: string; highlight?: string };
+  enterprise: string | boolean | { text: string; highlight?: string };
+}
+
+interface FeatureSection {
+  name: string;
+  features: PlanFeature[];
+}
 
 const FeatureComparisonTable = ({
-  frequencyValue,
+  frequencyValue: _frequencyValue,
 }: {
   frequencyValue: FrequencyValue;
 }) => {
-  const sections: Section[] = [
+  // Keep pricing column headers visible as you scroll
+  const containerRef = useRef<HTMLDivElement | null>(null);
+  const [isHeaderFixed, setIsHeaderFixed] = useState(false);
+  const [headerRect, setHeaderRect] = useState<{ left: number; width: number }>({
+    left: 0,
+    width: 0,
+  });
+
+  useEffect(() => {
+    const HEADER_OFFSET = 64; // px; matches fixed top nav height
+
+    const handleScroll = () => {
+      if (!containerRef.current) return;
+
+      // Hide fixed header on mobile (screens smaller than 620px)
+      if (window.innerWidth < 620) {
+        setIsHeaderFixed(false);
+        return;
+      }
+
+      const rect = containerRef.current.getBoundingClientRect();
+      const pastHeader = rect.top <= HEADER_OFFSET;
+      const aboveBottom = rect.bottom > HEADER_OFFSET + 40;
+
+      const shouldFix = pastHeader && aboveBottom;
+      setIsHeaderFixed(shouldFix);
+
+      if (shouldFix) {
+        setHeaderRect({
+          left: rect.left,
+          width: rect.width,
+        });
+      }
+    };
+
+    handleScroll();
+    window.addEventListener("scroll", handleScroll, { passive: true });
+    window.addEventListener("resize", handleScroll);
+    return () => {
+      window.removeEventListener("scroll", handleScroll);
+      window.removeEventListener("resize", handleScroll);
+    };
+  }, []);
+  const planSpecificLimits: PlanFeature[] = [
     {
-      name: t`Core features`,
-      features: [
-        {
-          key: "ulimited-workspaces",
-          label: t`Unlimited workspaces`,
-          kan: true,
-          trello: false,
-        },
-        {
-          key: "unlimited-boards",
-          label: t`Unlimited boards`,
-          kan: true,
-          trello: false,
-        },
-        {
-          key: "unlimited-lists",
-          label: t`Unlimited lists`,
-          kan: true,
-          trello: true,
-        },
-        {
-          key: "unlimited-cards",
-          label: t`Unlimited cards`,
-          kan: true,
-          trello: true,
-        },
-        {
-          key: "activity-log",
-          label: t`Activity log`,
-          kan: true,
-          trello: true,
-        },
-        {
-          key: "templates",
-          label: t`Custom templates`,
-          kan: true,
-          trello: false,
-        },
-        { key: "labels", label: t`Labels & filters`, kan: true, trello: true },
-        { key: "checklists", label: t`Checklists`, kan: true, trello: true },
-        {
-          key: "import",
-          label: t`Import from Trello`,
-          kan: true,
-          trello: false,
-        },
-        {
-          key: "visibility",
-          label: t`Board visibility`,
-          kan: true,
-          trello: true,
-        },
-        {
-          key: "search",
-          label: t`Intelligent search`,
-          kan: true,
-          trello: true,
-        },
-        {
-          key: "workspace-url",
-          label: t`Custom workspace link`,
-          kan: true,
-          trello: false,
-        },
-      ],
+      key: "boards",
+      label: t`Boards`,
+      free: { text: t`Unlimited boards`, highlight: "Unlimited" },
+      teams: { text: t`Unlimited boards`, highlight: "Unlimited" },
+      pro: { text: t`Unlimited boards`, highlight: "Unlimited" },
+      enterprise: { text: t`Unlimited boards`, highlight: "Unlimited" },
     },
     {
-      name: t`Teams`,
-      features: [
-        {
-          key: "pricing",
-          label: t`Price per user/month`,
-          kan: frequencyValue === "monthly" ? `$10.00` : `$8.00`,
-          trello: frequencyValue === "monthly" ? `$12.00` : `$10.00`,
-        },
-        {
-          key: "comments",
-          label: t`Comments & mentions`,
-          kan: true,
-          trello: true,
-        },
-        {
-          key: "assignments",
-          label: t`Assignees`,
-          kan: true,
-          trello: true,
-        },
-        {
-          key: "sharing",
-          label: t`Board sharing & invites`,
-          kan: true,
-          trello: true,
-        },
-        {
-          key: "invite-links",
-          label: t`Invite links`,
-          kan: true,
-          trello: true,
-        },
-      ],
+      key: "members",
+      label: t`Members`,
+      free: { text: t`1 user`, highlight: "1" },
+      teams: { text: t`Per-seat pricing`, highlight: "Per-seat" },
+      pro: { text: t`Unlimited members`, highlight: "Unlimited" },
+      enterprise: { text: t`Unlimited members`, highlight: "Unlimited" },
+    },
+    {
+      key: "file-uploads",
+      label: t`File uploads`,
+      free: { text: t`10mb file uploads`, highlight: "10mb" },
+      teams: { text: t`Unlimited file uploads`, highlight: "Unlimited" },
+      pro: { text: t`Unlimited file uploads`, highlight: "Unlimited" },
+      enterprise: { text: t`Unlimited file uploads`, highlight: "Unlimited" },
+    },
+      {
+        key: "workspace-username",
+        label: t`Workspace username`,
+        free: { text: t`Default username`, highlight: "Default" },
+        teams: { text: t`Default username`, highlight: "Default" },
+        pro: { text: t`Custom username`, highlight: "Custom" },
+        enterprise: { text: t`Custom username`, highlight: "Custom" },
+      },
+  ];
+
+  const coreFeatures: PlanFeature[] = [
+    {
+      key: "checklists",
+      label: t`Checklists`,
+      free: true,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "custom-templates",
+      label: t`Board templates`,
+      free: true,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "labels-filters",
+      label: t`Labels & filters`,
+      free: true,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "board-visibility",
+      label: t`Board visibility`,
+      free: true,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "search",
+      label: t`Intelligent search`,
+      free: true,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "activity-log",
+      label: t`Activity log`,
+      free: true,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "comments",
+      label: t`Comments`,
+      free: true,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "roles-permissions",
+      label: t`Roles & permissions`,
+      free: false,
+      teams: false,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "custom-branding",
+      label: t`Custom branding`,
+      free: false,
+      teams: false,
+      pro: true,
+      enterprise: true,
+    },
+  ];
+
+  const collaborationFeatures: PlanFeature[] = [
+    {
+      key: "mentions",
+      label: t`Mentions`,
+      free: false,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "email-notifications",
+      label: t`Email notifications`,
+      free: false,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "assignees",
+      label: t`Assignees`,
+      free: false,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "invite-links",
+      label: t`Invite links`,
+      free: false,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+  ];
+
+  const importsFeatures: PlanFeature[] = [
+    {
+      key: "import-export",
+      label: t`Trello`,
+      free: true,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+  ];
+
+  const platformFeatures: PlanFeature[] = [
+    {
+      key: "open-source",
+      label: t`Open source`,
+      free: true,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "rest-api",
+      label: t`API`,
+      free: { text: t`Limited API access` },
+      teams: { text: t`Full API access` },
+      pro: { text: t`Full API access` },
+      enterprise: { text: t`Full API access` },
+    },
+    {
+      key: "self-hostable",
+      label: t`On-premise`,
+      free: false,
+      teams: false,
+      pro: false,
+      enterprise: true,
+    },
+  ];
+
+  const securityFeatures: PlanFeature[] = [
+    {
+      key: "sso",
+      label: t`SSO`,
+      free: { text: t`Google SSO` },
+      teams: { text: t`Google SSO` },
+      pro: { text: t`Google SSO` },
+      enterprise: { text: t`Google SSO + SAML` },
+    },
+    {
+      key: "admin-roles",
+      label: t`Admin roles`,
+      free: { text: t`Admin roles` },
+      teams: { text: t`Admin roles` },
+      pro: { text: t`Admin roles` },
+      enterprise: { text: t`Advanced admin roles` },
+    },
+  ];
+
+  const supportFeatures: PlanFeature[] = [
+    {
+      key: "priority-email-support",
+      label: t`Priority email support`,
+      free: false,
+      teams: true,
+      pro: true,
+      enterprise: true,
+    },
+    {
+      key: "account-manager",
+      label: t`Account manager`,
+      free: false,
+      teams: false,
+      pro: false,
+      enterprise: true,
+    },
+    {
+      key: "sla",
+      label: t`SLA`,
+      free: false,
+      teams: false,
+      pro: false,
+      enterprise: true,
+    },
+  ];
+
+  const sections: FeatureSection[] = [
+    {
+      name: "",
+      features: planSpecificLimits,
+    },
+    {
+      name: t`Core features`,
+      features: coreFeatures,
+    },
+    {
+      name: t`Collaboration`,
+      features: collaborationFeatures,
+    },
+    {
+      name: t`Imports`,
+      features: importsFeatures,
     },
     {
       name: t`Platform`,
-      features: [
-        {
-          key: "api",
-          label: t`REST API`,
-          kan: true,
-          trello: true,
-        },
-        {
-          key: "open-source",
-          label: t`Open source`,
-          kan: true,
-          trello: false,
-        },
-        {
-          key: "self-hostable",
-          label: t`Self-hostable`,
-          kan: true,
-          trello: false,
-        },
-        {
-          key: "white-label",
-          label: t`White label`,
-          kan: true,
-          trello: false,
-        },
-        {
-          key: "performance",
-          label: t`Fast & lightweight`,
-          kan: true,
-          trello: false,
-        },
-        {
-          key: "this-is-a-joke",
-          label: t`Owned by Atlassian`,
-          kan: false,
-          trello: true,
-        },
-      ],
+      features: platformFeatures,
+    },
+    {
+      name: t`Security`,
+      features: securityFeatures,
+    },
+    {
+      name: t`Support`,
+      features: supportFeatures,
     },
   ];
 
-  const products = [
-    {
-      id: "kan",
-      name: t`Kan`,
-      featured: true,
-    },
-    {
-      id: "trello",
-      name: t`Trello`,
-      featured: false,
-    },
+  const plans = [
+    { id: "free", name: t`Free`, tierId: "tier-free" },
+    { id: "teams", name: t`Teams`, tierId: "tier-teams" },
+    { id: "pro", name: t`Pro`, tierId: "tier-pro" },
+    { id: "enterprise", name: t`Enterprise`, tierId: "tier-enterprise" },
   ];
 
+  const isHighlightValue = (
+    value: string | boolean | { text: string; highlight?: string },
+  ): value is { text: string; highlight?: string } => {
+    return typeof value === "object" && value !== null && "text" in value;
+  };
+
+  const shouldHighlight = (text: string): boolean => {
+    const lowerText = text.toLowerCase();
+    return ["unlimited", "multiple", "per-seat", "custom", "mentions", "full", "sso", "admin"].some(
+      (keyword) => lowerText.includes(keyword),
+    );
+  };
+
+  const CellValue = ({
+    value,
+    label,
+  }: {
+    value: string | boolean | { text: string; highlight?: string };
+    label: string;
+  }) => {
+    // Handle object with text and highlight
+    if (isHighlightValue(value)) {
+      const { text, highlight } = value;
+      const isUnlimited = shouldHighlight(text);
+      
+      let displayText;
+      if (highlight) {
+        const parts = text.split(new RegExp(`(${highlight})`, "gi"));
+        displayText = (
+          <>
+            {parts.map((part, index) =>
+              part.toLowerCase() === highlight.toLowerCase() ? (
+                <span key={index} className="text-light-1000 dark:text-dark-1000">
+                  {part}
+                </span>
+              ) : (
+                <span key={index} className="text-light-950 dark:text-dark-800">
+                  {part}
+                </span>
+              ),
+            )}
+          </>
+        );
+      } else {
+        displayText = text;
+      }
+      
+      return (
+        <div className="flex items-center gap-2.5">
+          <HiCheckCircle
+            className={twMerge(
+              "mt-0.5 h-4 w-4 shrink-0",
+              isUnlimited
+                ? "text-light-1000 dark:text-dark-1000"
+                : "text-light-400 dark:text-dark-600",
+            )}
+          />
+          <span
+            className={twMerge(
+              "text-sm font-medium",
+              isUnlimited
+                ? "text-light-1000 dark:text-dark-950"
+                : "text-light-950 dark:text-dark-800",
+            )}
+          >
+            {displayText}
+          </span>
+        </div>
+      );
+    }
+    
+    if (typeof value === "string") {
+      const isUnlimited = shouldHighlight(value);
+      return (
+        <div className="flex items-center gap-2.5">
+          <HiCheckCircle
+            className={twMerge(
+              "mt-0.5 h-4 w-4 shrink-0",
+              isUnlimited
+                ? "text-light-1000 dark:text-dark-1000"
+                : "text-light-400 dark:text-dark-600",
+            )}
+          />
+          <span
+            className={twMerge(
+              "text-sm font-medium",
+              isUnlimited
+                ? "text-light-1000 dark:text-dark-950"
+                : "text-light-950 dark:text-dark-800",
+            )}
+          >
+            {value}
+          </span>
+        </div>
+      );
+    }
+    if (value) {
+      // Boolean true - show checkmark icon
+      return (
+        <div className="flex items-center gap-2.5">
+          <HiCheckCircle className="mt-0.5 h-4 w-4 shrink-0 text-light-1000 dark:text-dark-1000" />
+          <span className="text-sm font-medium text-light-1000 dark:text-dark-950">
+            {label}
+          </span>
+        </div>
+      );
+    }
+    // Boolean false - show cross icon
+    return (
+      <div className="flex items-center gap-2.5">
+        <HiXCircle className="mt-0.5 h-4 w-4 shrink-0 text-light-400 dark:text-dark-600" />
+        <span className="text-sm font-medium text-light-800 dark:text-dark-800">
+          {label}
+        </span>
+      </div>
+    );
+  };
+
+  const getFeatureValue = (
+    feature: PlanFeature,
+    planId: string,
+  ): string | boolean | { text: string; highlight?: string } => {
+    switch (planId) {
+      case "free":
+        return feature.free;
+      case "teams":
+        return feature.teams;
+      case "pro":
+        return feature.pro;
+      case "enterprise":
+        return feature.enterprise;
+      default:
+        return false;
+    }
+  };
+
   return (
-    <section aria-labelledby="comparison-heading" className="w-full px-4">
-      <div className="mx-auto max-w-6xl py-8 lg:py-10">
-        <div className="grid grid-cols-3 gap-x-8 border-t border-light-500 before:block dark:border-dark-300">
-          {products.map((product) => (
-            <div key={product.id} aria-hidden="true" className="-mt-px">
-              <div
-                className={`${product.featured ? "border-dark-200 dark:border-dark-800" : "border-transparent"} border-t-2 pt-8`}
-              >
-                <p
-                  className={`${product.featured ? "text-dark-50 dark:text-dark-1000" : "text-light-1000 dark:text-dark-1000"} text-center text-sm font-semibold`}
-                >
-                  {product.name}
-                </p>
+    <section aria-labelledby="comparison-heading" className="w-full">
+      <div className="mx-auto max-w-7xl">
+        <div
+          ref={containerRef}
+          className="relative overflow-x-auto rounded-lg border border-light-300 bg-light-50 dark:border-dark-300 dark:bg-dark-50"
+        >
+          {isHeaderFixed && (
+            <div
+              className="hidden sm:block fixed z-40 border-b border-light-300 bg-light-50/95 dark:border-dark-400 dark:bg-dark-50/95"
+              style={{
+                top: 64,
+                left: headerRect.left,
+                width: headerRect.width,
+              }}
+            >
+              <div className="grid grid-cols-4 border-x border-light-300 dark:border-dark-300">
+                {plans.map((plan) => {
+                  const isMostPopular = plan.id === "pro";
+                  return (
+                    <div
+                      key={`fixed-${plan.id}`}
+                      className={twMerge(
+                        "flex items-center px-6 py-3 text-left text-base font-semibold",
+                        isMostPopular
+                          ? "bg-light-200 text-light-1000 dark:bg-dark-100 dark:text-dark-1000"
+                          : "bg-light-50 text-dark-50 dark:bg-dark-50 dark:text-dark-1000",
+                      )}
+                    >
+                      {plan.name}
+                      {plan.id === "pro" && <span className="ml-1 text-xl">∞</span>}
+                    </div>
+                  );
+                })}
               </div>
             </div>
-          ))}
-        </div>
-
-        <div className="-mt-6 space-y-12">
-          {sections.map((section) => (
-            <div key={section.name}>
-              <h4 className="text-sm font-semibold text-light-1000 dark:text-dark-1000">
-                {section.name}
-              </h4>
-              <div className="relative -mx-8 mt-8">
-                <div
-                  aria-hidden="true"
-                  className="absolute inset-x-8 inset-y-0 grid grid-cols-3 gap-x-8 before:block"
-                >
-                  {products.map((product) => (
-                    <div
-                      key={product.id}
-                      className={`size-full rounded-lg ${product.featured ? "bg-white shadow-sm dark:bg-dark-50 dark:shadow-none" : ""}`}
-                    />
-                  ))}
-                </div>
-
-                <table className="relative w-full border-separate border-spacing-x-8">
-                  <thead>
-                    <tr className="text-left">
-                      <th scope="col">
-                        <span className="sr-only">{t`Feature`}</span>
-                      </th>
-                      {products.map((p) => (
-                        <th key={p.id} scope="col">
-                          <span className="sr-only">{p.name}</span>
-                        </th>
-                      ))}
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {section.features.map((feature, featureIdx) => (
-                      <tr key={feature.key}>
-                        <th
-                          scope="row"
-                          className="w-1/3 py-3 pr-4 text-left text-sm font-normal text-light-1000 dark:text-dark-1000"
-                        >
-                          {feature.label}
-                          {featureIdx !== section.features.length - 1 ? (
-                            <div className="absolute inset-x-8 mt-3 h-px bg-light-500 dark:bg-dark-300" />
-                          ) : null}
-                        </th>
-                        {products.map((p) => (
+          )}
+          <table className="w-full border-separate border-spacing-0">
+            <thead>
+              <tr>
+                {plans.map((plan) => {
+                  const isMostPopular = plan.id === "pro";
+                  return (
+                    <th
+                      key={plan.id}
+                      scope="col"
+                      className={twMerge(
+                        "w-1/4 px-6 py-4 text-left text-base font-semibold",
+                        isMostPopular
+                          ? "bg-light-200 text-light-1000 dark:bg-dark-100 dark:text-dark-1000"
+                          : "bg-light-50 text-dark-50 dark:bg-dark-50 dark:text-dark-1000",
+                      )}
+                    >
+                      <span className="flex items-center">
+                        {plan.name}
+                        {plan.id === "pro" && <span className="ml-1 text-xl">∞</span>}
+                      </span>
+                    </th>
+                  );
+                })}
+              </tr>
+            </thead>
+            <tbody>
+              {sections.map((section, sectionIdx) => (
+                <React.Fragment key={section.name || `section-${sectionIdx}`}>
+                  {section.name && (
+                    <tr>
+                      {plans.map((plan) => {
+                        const isPro = plan.id === "pro";
+                        return (
                           <td
-                            key={p.id}
-                            className="relative w-1/3 px-4 py-0 text-center"
+                            key={plan.id}
+                            className={twMerge(
+                              "border-t px-6 py-3 text-left text-sm font-semibold text-dark-900 dark:text-dark-900",
+                              isPro
+                                ? "border-light-400 bg-light-200 dark:border-dark-400 dark:bg-dark-100"
+                                : "border-light-300 bg-light-50 dark:border-dark-400 dark:bg-dark-50",
+                            )}
                           >
-                            <span className="relative inline-flex w-full items-center justify-center py-3">
-                              <CellValue
-                                value={
-                                  p.id === "kan" ? feature.kan : feature.trello
-                                }
-                              />
-                            </span>
+                            {plan.id === "free" ? section.name : ""}
                           </td>
-                        ))}
-                      </tr>
-                    ))}
-                  </tbody>
-                </table>
-
-                <div
-                  aria-hidden="true"
-                  className="pointer-events-none absolute inset-x-8 inset-y-0 grid grid-cols-3 gap-x-8 before:block"
-                >
-                  {products.map((product) => (
-                    <div
-                      key={product.id}
-                      className={`${product.featured ? "ring-1 ring-light-500 dark:ring-dark-800" : "ring-0"} rounded-2xl`}
-                    />
+                        );
+                      })}
+                    </tr>
+                  )}
+                  {section.features.map((feature) => (
+                    <tr key={feature.key}>
+                      {plans.map((plan) => {
+                        const isPro = plan.id === "pro";
+                        return (
+                          <td
+                            key={plan.id}
+                            className={twMerge(
+                              "w-1/4 border-t px-6 py-3 text-left",
+                              isPro
+                                ? "border-light-400 bg-light-200 dark:border-dark-400 dark:bg-dark-100"
+                                : "border-light-300 dark:border-dark-400",
+                            )}
+                          >
+                            <CellValue
+                              value={getFeatureValue(feature, plan.id)}
+                              label={feature.label}
+                            />
+                          </td>
+                        );
+                      })}
+                    </tr>
                   ))}
-                </div>
-              </div>
-            </div>
-          ))}
+                </React.Fragment>
+              ))}
+            </tbody>
+          </table>
         </div>
       </div>
     </section>
diff --git a/apps/web/src/views/pricing/components/PricingTiers.tsx b/apps/web/src/views/pricing/components/PricingTiers.tsx
index 5e5bd51e..1da9e009 100644
--- a/apps/web/src/views/pricing/components/PricingTiers.tsx
+++ b/apps/web/src/views/pricing/components/PricingTiers.tsx
@@ -23,81 +23,115 @@ const Pricing = ({
 }) => {
   const tiers = [
     {
-      name: t`Individuals`,
-      id: "tier-individuals",
+      name: t`Free`,
+      id: "tier-free",
       href: "signup",
-      buttonText: t`Get Started`,
-      price: { monthly: t`Free`, annually: t`Free` },
-      description: t`Everything you need, free forever. Unlimited boards, unlimited lists, unlimited cards. Upgrade any time.`,
-      featureHeader: t`Free, forever`,
+      buttonText: t`Get started`,
+      price: { monthly: t`$0`, annually: t`$0` },
+      description: t`Free for everyone`,
+      bestFor: t`Best for individuals and solo creators getting started`,
+      featureHeader: undefined,
       features: [
-        t`1 user`,
-        t`Unlimited boards`,
-        t`Unlimited cards`,
-        t`Custom board templates`,
-        t`Checklists`,
+        { text: t`1 user` },
+        { text: t`Unlimited boards` },
+        { text: t`Unlimited cards` },
+        { text: t`Custom board templates` },
+        { text: t`Checklists` },
       ],
       showPrice: true,
+      ctaSubtext: undefined,
+      mostPopular: false,
+      highlighted: false,
     },
     {
       name: t`Teams`,
       id: "tier-teams",
       href: "signup",
-      buttonText: t`Get Started`,
-      price: { monthly: "$10.00", annually: "$8.00" },
-      description: t`Kan is better with a team. Perfect for small and growing teams looking to collaborate.`,
-      featureHeader: t`Everything in the free plan, plus:`,
+      buttonText: t`Get started`,
+      price: { monthly: "$10", annually: "$8" },
+      description: t`Perfect for small and growing teams looking to collaborate.`,
+      bestFor: t`Best for small and growing teams that need collaboration`,
+      featureHeader: undefined,
       features: [
-        t`Workspace members`,
-        t`Admin roles`,
-        t`Priority email support`,
-        t`Support the development of the project`,
+        { text: t`All Free features +` },
+        { text: t`Workspace members` },
+        { text: t`Invite links` },
+        { text: t`Unlimited file uploads` },
+        { text: t`Email notifications for mentions` },
+        { text: t`Priority email support` },
+      ],
+      highlighted: false,
+      showPrice: true,
+      showPriceSuffix: true,
+      ctaSubtext: t`14 day free trial · Switch plans or cancel anytime`,
+      mostPopular: false,
+    },
+    {
+      name: t`Pro`,
+      id: "tier-pro",
+      href: "signup",
+      buttonText: t`Get started`,
+      price: { monthly: "$29", annually: "$24" },
+      description: t`Unlimited seats and advanced features for growing teams.`,
+      bestFor: t`Best for teams that want to scale without limits`,
+      featureHeader: undefined,
+      features: [
+        { text: t`All Teams features +` },
+        { text: t`Unlimited members` },
+        { text: t`Custom workspace username` },
+        { text: t`Configurable user roles and permissions` },
+        { text: t`Custom branding` },
       ],
       highlighted: true,
       showPrice: true,
-      showPriceSuffix: true,
+      showPriceSuffix: false,
+      ctaSubtext: t`14 day free trial · Switch plans or cancel anytime`,
+      mostPopular: true,
     },
     {
-      name: t`Self Host`,
-      id: "tier-self-host",
-      href: "https://github.com/kanbn/kan",
-      buttonText: t`View docs`,
-      price: { monthly: "-", annually: "-" },
-      description: t`Host Kan on your own infrastructure. Ideal for organisations that need complete control over their data.`,
-      featureHeader: t`Complete control and ownership:`,
+      name: t`Enterprise`,
+      id: "tier-enterprise",
+      href: "mailto:support@kan.bn?subject=Enterprise Inquiry",
+      buttonText: t`Contact Sales`,
+      price: { monthly: t`Contact us`, annually: t`Contact us` },
+      description: t`Advanced security, compliance, and dedicated support for large organizations.`,
+      bestFor: t`Best for large organizations with advanced needs`,
+      featureHeader: undefined,
       features: [
-        t`Run on your own infrastructure`,
-        t`Own your data`,
-        t`Custom domain`,
+        { text: t`All Pro features +` },
+        { text: t`SAML SSO` },
+        { text: t`Advanced admin controls` },
+        { text: t`Dedicated account manager` },
+        { text: t`Custom SLA` },
+        { text: t`On-premise deployment option` },
       ],
+      highlighted: false,
+      showPrice: true,
+      showPriceSuffix: false,
+      ctaSubtext: undefined,
       mostPopular: false,
-      showPrice: false,
     },
   ];
 
   return (
     <>
-      <div className="flex flex-col items-center justify-center px-4 pb-10">
-        <div className="mt-14 flex flex-col items-center justify-center">
-          <div className="mb-8 flex items-center gap-2 rounded-full border bg-white px-4 py-1.5 text-center text-xs font-bold text-gray-800 dark:border-dark-300 dark:bg-dark-1000 dark:text-gray-800 lg:text-sm">
-            <HiBolt />
-            <p>{t`Launch offer: unlimited seats for just $29/month with Pro`}</p>
-          </div>
+      <div className="mx-auto max-w-7xl px-4">
+        <div className="mb-8 flex items-center justify-center">
           <fieldset aria-label={t`Payment frequency`}>
             <RadioGroup
               value={frequency}
               onChange={(value) => setFrequency(value)}
-              className="grid grid-cols-2 gap-x-1 rounded-full p-1 text-center text-xs/5 font-semibold ring-1 ring-inset ring-light-600 dark:ring-dark-600"
+              className="flex gap-1 rounded-lg border border-light-300 bg-light-50 p-1 dark:border-dark-300 dark:bg-dark-50"
             >
               {frequencies.map((option) => (
                 <Radio
                   key={option.value}
                   value={option}
                   className={twMerge(
-                    "cursor-pointer rounded-full px-2.5 py-1 text-xs transition-colors lg:text-sm",
+                    "cursor-pointer rounded-md px-4 py-1.5 text-sm font-medium transition-colors",
                     frequency?.value === option.value
-                      ? "bg-dark-50 text-white dark:bg-light-50 dark:text-dark-50"
-                      : "text-light-900 hover:bg-light-100 dark:hover:bg-dark-100",
+                      ? "bg-white text-light-1000 shadow-sm dark:bg-dark-100 dark:text-dark-1000"
+                      : "text-light-600 dark:text-dark-700",
                   )}
                 >
                   {option.label}
@@ -106,103 +140,129 @@ const Pricing = ({
             </RadioGroup>
           </fieldset>
         </div>
-      </div>
 
-      <div className="isolate mx-auto mb-10 grid max-w-md grid-cols-1 gap-8 px-4 lg:mx-0 lg:max-w-none lg:grid-cols-3">
+        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
         {tiers.map((tier) => (
           <div
             key={tier.id}
             className={twMerge(
-              tier.highlighted
-                ? "bg-dark-50 ring-1 ring-dark-50 dark:ring-dark-800"
-                : "bg-light-50 ring-1 ring-light-300 dark:bg-dark-50 dark:ring-dark-300",
-              "rounded-3xl p-8 xl:p-10",
+              "relative flex h-full flex-col rounded-lg border p-6",
+              tier.mostPopular
+                ? "border-light-400 bg-light-200 dark:border-dark-400 dark:bg-dark-100"
+                : "border-light-300 bg-light-50 dark:border-dark-300 dark:bg-dark-50",
             )}
           >
-            <div className="flex items-center justify-between gap-x-4">
-              <h3
-                id={tier.id}
-                className={twMerge(
-                  tier.highlighted
-                    ? "text-dark-1000 dark:text-dark-1000"
-                    : "text-dark-50 dark:text-dark-1000",
-                  "text-lg/8 font-semibold",
+            {tier.id === "tier-pro" && (
+              <div className="absolute right-2 top-2 z-10">
+                <span className="inline-flex items-center gap-1 rounded-full border border-light-400 bg-light-100 px-3 py-1 text-center text-xs text-dark-600 dark:border-dark-400 dark:bg-dark-100 dark:text-dark-900">
+                  <HiBolt className="h-3 w-3 -ml-0.5" />
+                  {t`Launch offer`}
+                </span>
+              </div>
+            )}
+            <h3
+              id={tier.id}
+              className={twMerge(
+                "mb-4 flex items-center text-base font-semibold",
+                tier.mostPopular
+                  ? "text-light-1000 dark:text-dark-1000"
+                  : "text-light-1000 dark:text-dark-1000",
+              )}
+            >
+              {tier.name}
+              {tier.id === "tier-pro" && <span className="ml-1 text-xl leading-none">∞</span>}
+            </h3>
+            <div className="mb-4">
+              <p className="flex items-baseline gap-x-1">
+                <span
+                  className={twMerge(
+                    "text-2xl font-semibold",
+                    tier.mostPopular
+                      ? "text-light-1000 dark:text-dark-1000"
+                      : "text-light-1000 dark:text-dark-1000",
+                    !tier.showPrice && "opacity-0",
+                  )}
+                >
+                  {tier.price[frequency?.value ?? "monthly"]}
+                </span>
+                {tier.id === "tier-pro" && (
+                  <span
+                    className={twMerge(
+                      "text-2xl font-semibold line-through",
+                      tier.mostPopular
+                        ? "text-light-600 dark:text-dark-600"
+                        : "text-light-600 dark:text-dark-600",
+                    )}
+                  >
+                    {frequency?.value === "annually" ? "$79" : "$100"}
+                  </span>
                 )}
-              >
-                {tier.name}
-              </h3>
-              {tier.highlighted && (
-                <p className="rounded-full bg-light-50 px-2.5 py-1 text-[12px] font-semibold text-dark-500 dark:bg-dark-1000 dark:text-dark-50">
-                  {t`14 day free trial`}
-                </p>
+                {tier.showPriceSuffix && (
+                  <span className="text-sm font-normal text-dark-400 dark:text-dark-700">
+                    {frequency?.priceSuffix}
+                  </span>
+                )}
+                {tier.id === "tier-pro" && (
+                  <span className="text-sm font-normal text-dark-400 dark:text-dark-700">
+                    {t`/month`}
+                  </span>
+                )}
+              </p>
+            </div>
+            {tier.bestFor && (
+              <p className="mb-6 text-sm text-dark-400 dark:text-dark-700">
+                {tier.bestFor}
+              </p>
+            )}
+            <div className="mb-6">
+              {tier.id === "tier-enterprise" ? (
+                <a
+                  href={tier.href}
+                  aria-describedby={tier.id}
+                  className="block w-full rounded-md border border-dark-200 bg-transparent px-4 py-2 text-center text-sm font-medium text-dark-50 transition-colors hover:bg-dark-50 hover:text-light-50 dark:border-dark-300 dark:text-dark-1000 dark:hover:bg-dark-200"
+                >
+                  {tier.buttonText}
+                </a>
+              ) : (
+                <>
+                  <Link
+                    href={tier.href}
+                    aria-describedby={tier.id}
+                    className={twMerge(
+                      "block w-full rounded-md px-4 py-2 text-center text-sm font-medium transition-colors",
+                      tier.mostPopular
+                        ? "bg-dark-50 text-light-50 shadow-sm hover:bg-dark-100 dark:bg-dark-1000 dark:text-dark-50 dark:hover:bg-dark-900"
+                        : "border border-dark-200 bg-transparent text-dark-50 transition-colors hover:bg-dark-50 hover:text-light-50 dark:border-dark-300 dark:text-dark-1000 dark:hover:bg-dark-200",
+                    )}
+                  >
+                    {tier.buttonText}
+                  </Link>
+                </>
               )}
             </div>
-            <p
-              className={twMerge(
-                "mt-4 text-sm/6 text-dark-950 dark:text-dark-900",
-                tier.highlighted ? "text-light-100" : "text-dark-50",
-              )}
-            >
-              {tier.description}
-            </p>
-            <p className="mt-6 flex items-baseline gap-x-1">
-              <span
-                className={twMerge(
-                  "text-3xl font-semibold tracking-tight text-light-100",
-                  tier.highlighted
-                    ? "text-light-50 dark:text-dark-1000"
-                    : "text-gray-900 dark:text-dark-1000",
-                  !tier.showPrice && "opacity-0",
-                )}
-              >
-                {tier.price[frequency?.value ?? "monthly"]}
-              </span>
-              {tier.showPriceSuffix && (
-                <span className="text-sm/6 font-semibold text-light-50 dark:text-dark-900">
-                  {frequency?.priceSuffix}
-                </span>
-              )}
-            </p>
-            <Link
-              href={tier.href}
-              aria-describedby={tier.id}
-              className={twMerge(
-                tier.highlighted
-                  ? "bg-light-50 text-dark-50 shadow-sm dark:bg-dark-1000 dark:text-dark-50"
-                  : "bg-dark-50 text-light-50 dark:bg-dark-200 dark:text-dark-1000",
-                "mt-6 block rounded-md px-3 py-2 text-center text-sm/6 font-semibold focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600",
-              )}
-            >
-              {tier.buttonText}
-            </Link>
-            <p
-              className={twMerge(
-                "mt-8 text-sm/6 font-bold",
-                tier.highlighted
-                  ? "text-light-100 dark:text-dark-1000"
-                  : "text-dark-50 dark:text-dark-1000",
-              )}
-            >
-              {tier.featureHeader}
-            </p>
-            <ul
-              role="list"
-              className={twMerge(
-                "mt-2 space-y-3 text-sm/6 text-light-600",
-                tier.highlighted
-                  ? "text-light-100 dark:text-dark-1000"
-                  : "text-dark-50 dark:text-dark-1000",
-              )}
-            >
-              {tier.features.map((feature) => (
-                <li key={feature} className="flex items-center gap-x-3">
-                  <HiCheckCircle className="h-5 w-5" />
-                  {feature}
+            <ul role="list" className="space-y-2.5">
+              {tier.features.map((feature, index) => (
+                <li
+                  key={`${tier.id}-feature-${index}`}
+                  className="flex items-start gap-x-2.5"
+                >
+                  <HiCheckCircle
+                    className="mt-0.5 h-4 w-4 shrink-0 text-light-1000 dark:text-dark-1000"
+                  />
+                  <span className="text-sm text-dark-600 dark:text-dark-800">
+                    {feature.text}
+                  </span>
                 </li>
               ))}
             </ul>
           </div>
         ))}
+        </div>
+        <div className="mx-auto mt-8 max-w-3xl px-4 text-center">
+          <div className="inline-flex items-center gap-2 rounded-full border bg-light-50 px-4 py-1 text-center text-xs text-light-1000 dark:border-dark-300 dark:bg-dark-50 dark:text-dark-900">
+            <p>{t`14 day free trial · Switch plans or cancel anytime`}</p>
+          </div>
+        </div>
       </div>
     </>
   );
diff --git a/apps/web/src/views/pricing/index.tsx b/apps/web/src/views/pricing/index.tsx
index d74754c8..2db1a49c 100644
--- a/apps/web/src/views/pricing/index.tsx
+++ b/apps/web/src/views/pricing/index.tsx
@@ -43,8 +43,8 @@ export default function PricingView() {
             <p className="mt-4 text-center text-3xl font-bold text-light-1000 dark:text-dark-1000 lg:text-5xl">
               {t`Simple pricing`}
             </p>
-            <p className="text:md lg:text-md mt-6 max-w-[500px] text-center text-light-950 dark:text-dark-900">
-              {t`Get started for free, with no usage limits. For collaboration, upgrade to a plan that fits the size of your team.`}
+            <p className="text:md lg:text-md mt-6 max-w-[300px] text-center text-light-950 dark:text-dark-900">
+              {t`Start free. Upgrade as your team grows. No hidden fees, no contracts.`}
             </p>
           </div>
           <PricingTiers
@@ -59,23 +59,9 @@ export default function PricingView() {
         </div>
 
         <div className="pb-22 flex flex-col items-center justify-center px-4">
-          <div className="flex items-center gap-2 rounded-full border bg-light-50 px-4 py-1 text-center text-xs text-light-1000 dark:border-dark-300 dark:bg-dark-50 dark:text-dark-900 lg:text-sm">
-            <p>{t`Features`}</p>
-          </div>
+        
 
-          <p className="mt-4 text-center text-3xl font-bold text-light-1000 dark:text-dark-1000 lg:text-4xl">
-            {t`Feature breakdown`}
-          </p>
-          <p className="text-md lg:text-md my-4 max-w-[500px] text-center text-light-950 dark:text-dark-900">
-            {t`Compare our features to see why Kan is the best choice.`}
-          </p>
-          <div className="mt-2">
-            <Button variant="primary" href="/signup">
-              {t`Get started`}
-            </Button>
-          </div>
-
-          <div className="mt-10 w-full max-w-[900px]">
+          <div className="mt-10 w-full">
             <FeatureComparisonTable
               frequencyValue={frequency?.value ?? "annually"}
             />