diff --git a/assets/admin/pages/SubscriptionPage.test.tsx b/assets/admin/pages/SubscriptionPage.test.tsx
index 1c776021..5e56849d 100644
--- a/assets/admin/pages/SubscriptionPage.test.tsx
+++ b/assets/admin/pages/SubscriptionPage.test.tsx
@@ -44,12 +44,14 @@ function mockApi({ my = DEFAULT_MY, plans = PLANS }: { my?: any; plans?: any[] }
 beforeEach(() => { get.mockReset(); mockApi(); });
 
 describe('SubscriptionPage', () => {
-  it('renders the three plans with the most-popular badge on the basic plan', async () => {
+  it('renders the three plans with the most-popular badge on the professional plan', async () => {
     renderWithProviders(<SubscriptionPage />, { route: '/admin/subscription' });
     expect(await screen.findByText('پلن پایه')).toBeInTheDocument();
     expect(screen.getByText('پلن رایگان')).toBeInTheDocument();
     expect(screen.getByText('پلن حرفه‌ای')).toBeInTheDocument();
-    expect(screen.getByText('محبوب‌ترین')).toBeInTheDocument();
+    // most-popular badge sits on the professional (top) card, matching tauri
+    const proCard = within(screen.getByTestId('plan-card-professional'));
+    expect(proCard.getByText('محبوب‌ترین')).toBeInTheDocument();
   });
 
   it('shows the current-plan card without an expiry warning when the plan is healthy', async () => {
diff --git a/assets/admin/pages/SubscriptionPage.tsx b/assets/admin/pages/SubscriptionPage.tsx
index 4983d9b0..53ee41e8 100644
--- a/assets/admin/pages/SubscriptionPage.tsx
+++ b/assets/admin/pages/SubscriptionPage.tsx
@@ -32,8 +32,9 @@ const CARD_FEATURE_LABELS: Record<string, string> = {
   insurance:       'مدیریت بیمه',
 };
 
-/** The plan highlighted as "most popular" in the UI (no backend flag exists). */
-const POPULAR_PLAN_NAME = 'basic';
+/** The plan highlighted as "most popular" in the UI (no backend flag exists);
+ *  matches clinic-pro-tauri, which flags the professional (top) plan. */
+const POPULAR_PLAN_NAME = 'professional';
 
 const PLAN_META: Record<string, { label: string; desc: string; tint: string }> = {
   free:         { label: 'رایگان',  desc: 'مناسب برای شروع کار',              tint: 'var(--surface-2)' },
@@ -137,9 +138,9 @@ export default function SubscriptionPage() {
 
             {/* ── Plan cards ── */}
             {plansLoading ? (
-              <div style={{ display: 'flex', flexWrap: 'wrap', gap: 16, justifyContent: 'flex-end', width: '100%' }}>
+              <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(230px, 1fr))', gap: 16, width: '100%' }}>
                 {[1, 2, 3].map((i) => (
-                  <div key={i} className="skeleton" style={{ flex: '1 1 280px', minWidth: 250, maxWidth: 340, height: 522, borderRadius: 10 }} />
+                  <div key={i} className="skeleton" style={{ height: 522, borderRadius: 10 }} />
                 ))}
               </div>
             ) : plans.length === 0 ? (
@@ -147,7 +148,7 @@ export default function SubscriptionPage() {
                 در حال حاضر پلنی برای نمایش وجود ندارد.
               </div>
             ) : (
-              <div style={{ display: 'flex', flexDirection: 'row', flexWrap: 'wrap', gap: 16, justifyContent: 'flex-end', width: '100%' }}>
+              <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(230px, 1fr))', gap: 16, width: '100%' }}>
                 {plans.map((plan) => (
                   <PlanCard
                     key={plan.uuid}
@@ -364,7 +365,7 @@ function PlanCard({
     <div
       data-testid={`plan-card-${plan.name}`}
       style={{
-        flex: '1 1 280px', minWidth: 250, maxWidth: 340, height: 522, borderRadius: 10,
+        width: '100%', minWidth: 0, height: 522, borderRadius: 10,
         border: isSelected ? '2px solid #494cb3' : '2px solid var(--border)',
         background: 'var(--surface)', display: 'flex', flexDirection: 'column',
         padding: 16, position: 'relative', overflow: 'hidden',