diff --git a/artifacts/pr/plans-need-more-hover.webp b/artifacts/pr/plans-need-more-hover.webp
new file mode 100644
index 0000000000..aaef2fd41c
Binary files /dev/null and b/artifacts/pr/plans-need-more-hover.webp differ
diff --git a/artifacts/pr/plans-need-more-pill.webp b/artifacts/pr/plans-need-more-pill.webp
new file mode 100644
index 0000000000..ce6b7f8373
Binary files /dev/null and b/artifacts/pr/plans-need-more-pill.webp differ
diff --git a/artifacts/pr/plans-org-warn-after-cards.webp b/artifacts/pr/plans-org-warn-after-cards.webp
new file mode 100644
index 0000000000..b66c59f8d1
Binary files /dev/null and b/artifacts/pr/plans-org-warn-after-cards.webp differ
diff --git a/src/pages/settings/organization/Plans.vue b/src/pages/settings/organization/Plans.vue
index ec544494f8..f5ec3bff87 100644
--- a/src/pages/settings/organization/Plans.vue
+++ b/src/pages/settings/organization/Plans.vue
@@ -482,7 +482,7 @@ function buttonStyle(p: Database['public']['Tables']['plans']['Row']) {
       <!-- Header Section -->
       <div class="flex flex-col items-center justify-between gap-4 mb-6 sm:flex-row shrink-0">
         <div class="flex-1">
-          <div class="flex items-center gap-3">
+          <div class="flex flex-wrap items-center gap-3">
             <h1 class="text-3xl font-bold text-gray-900 dark:text-white">
               {{ t(showExpiredTrialState ? 'trial-ended-title' : 'plan-pricing-plans') }}
             </h1>
@@ -494,9 +494,9 @@ function buttonStyle(p: Database['public']['Tables']['plans']['Row']) {
             </span>
             <!-- Custom Plan Trigger -->
             <button
-              type="button"
               v-if="!isMobile"
-              class="items-center hidden px-3 py-1 text-xs font-medium text-blue-700 transition-colors rounded-full bg-blue-50 lg:inline-flex dark:text-blue-300 hover:bg-blue-100 dark:bg-blue-900/30"
+              type="button"
+              class="d-btn d-btn-sm inline-flex h-auto min-h-0 w-fit max-w-full shrink-0 items-center whitespace-nowrap rounded-full border-none bg-blue-50 px-3 py-1 text-xs font-medium text-blue-700 transition-colors hover:bg-blue-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2 dark:bg-blue-900/40 dark:text-blue-100 dark:hover:bg-blue-800 dark:hover:text-white dark:focus-visible:ring-offset-gray-800"
               @click="openSupport()"
             >
               {{ t('need-more-contact-us') }}
@@ -627,6 +627,12 @@ function buttonStyle(p: Database['public']['Tables']['plans']['Row']) {
         </div>
       </div>
 
+      <!-- Org billing scope: keep next to plan cards, before later CTAs -->
+      <div v-if="!isMobile" class="mt-4 text-xs text-center text-gray-500 dark:text-gray-400 shrink-0">
+        {{ t('plan-page-warn').replace('%ORG_NAME%', currentOrganization?.name ?? '') }}
+        <a class="text-blue-600 hover:underline dark:text-blue-300" href="https://capgo.app/docs/docs/webapp/payment/">{{ t('plan-page-warn-2') }}</a>
+      </div>
+
       <!-- Credits CTA: under prices so plan cards stay visible without scrolling -->
       <CreditsCta v-if="!isMobile" class="mt-6 shrink-0" :credits-only="isCreditsOnly" />
 
@@ -652,12 +658,6 @@ function buttonStyle(p: Database['public']['Tables']['plans']['Row']) {
           </a>
         </div>
       </div>
-
-      <!-- Footer / Contact -->
-      <div v-if="!isMobile" class="mt-4 text-xs text-center text-gray-500 dark:text-gray-400 shrink-0">
-        {{ t('plan-page-warn').replace('%ORG_NAME%', currentOrganization?.name ?? '') }}
-        <a class="text-blue-600 hover:underline" href="https://capgo.app/docs/docs/webapp/payment/">{{ t('plan-page-warn-2') }}</a>
-      </div>
     </div>
 
     <!-- Thank You Page -->
diff --git a/tests/plans-expired-trial-layout.unit.test.ts b/tests/plans-expired-trial-layout.unit.test.ts
index c8fae0b584..e99884c8b6 100644
--- a/tests/plans-expired-trial-layout.unit.test.ts
+++ b/tests/plans-expired-trial-layout.unit.test.ts
@@ -6,11 +6,13 @@ const plansSource = readFileSync(new URL('../src/pages/settings/organization/Pla
 describe('expired trial plans layout', () => {
   it('keeps the credits and premium support banners below the plans', () => {
     const plansIndex = plansSource.indexOf('<!-- Plans Grid -->')
+    const warnIndex = plansSource.indexOf('plan-page-warn')
     const creditsIndex = plansSource.indexOf('<CreditsCta')
-    const expertSupportIndex = plansSource.indexOf("'expert-service-title'")
+    const expertSupportIndex = plansSource.indexOf('expert-service-title')
 
     expect(plansIndex).toBeGreaterThanOrEqual(0)
-    expect(creditsIndex).toBeGreaterThan(plansIndex)
+    expect(warnIndex).toBeGreaterThan(plansIndex)
+    expect(creditsIndex).toBeGreaterThan(warnIndex)
     expect(expertSupportIndex).toBeGreaterThan(creditsIndex)
   })
 })