diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewSection.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewSection.tsx
index e4783d5f011..4fc4ccea4ce 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewSection.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewSection.tsx
@@ -23,6 +23,7 @@ export const PreviewSection = ({
       <CollapsibleTrigger asChild>
         <button
           type="button"
+          tabIndex={0}
           className="flex w-full items-center justify-between py-3 text-left text-sm font-medium text-foreground transition-colors hover:text-foreground-light"
         >
           <span className="flex items-center gap-x-2">
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionCompareWidget.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionCompareWidget.tsx
index a904883820f..9d92442ddc1 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionCompareWidget.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionCompareWidget.tsx
@@ -35,6 +35,7 @@ export const VersionCompareWidget = ({
       </p>
       <button
         type="button"
+        tabIndex={0}
         className="ml-auto shrink-0 text-foreground-lighter transition-colors hover:text-foreground"
         onClick={onDismiss}
         aria-label="Cancel comparison"
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.tsx
index 9385c9e5c7b..21b668c7a3f 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.tsx
@@ -52,9 +52,7 @@ const VersionFateLabel = ({ fate }: { fate: VersionFate }) => {
       return (
         <div className="flex flex-col items-end">
           <span className="shrink-0 text-xs text-warning-600">Expires on next upload</span>
-          {fate.daysRemaining !== undefined && (
-            <span className="shrink-0 text-xs text-warning-600">or in {fate.daysRemaining}d</span>
-          )}
+          <span className="shrink-0 text-xs text-warning-600">or in {fate.daysRemaining}d</span>
         </div>
       )
     case 'expiring-now':
@@ -288,6 +286,7 @@ export const VersionHistory = ({
                 ) : (
                   <button
                     type="button"
+                    tabIndex={0}
                     className="flex min-w-0 flex-1 items-center gap-x-2.5 text-left"
                     onClick={() => (version.isCurrent ? clearPreview() : onPreview?.(version))}
                   >
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistoryPolicyRow.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistoryPolicyRow.tsx
index 19f1c45c566..146e9ea1193 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistoryPolicyRow.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistoryPolicyRow.tsx
@@ -34,34 +34,27 @@ interface PolicyRuleProps {
 
 /** The policy spelled out in plain language, for the hover card. */
 const PolicyFullRule = ({ cap, expiryDays, mode }: PolicyRuleProps) => {
+  // A cap always arrives with an age, so there are only three shapes to describe:
+  // age alone, or age combined with the cap under either operator.
   const hasCap = cap !== null && cap > 0
-  const hasExpiryDays = expiryDays !== null && expiryDays > 0
 
-  if (hasCap && hasExpiryDays) {
-    if (mode === 'and') {
-      return (
-        <>
-          A noncurrent version is permanently deleted only once it is <em>both</em> older than{' '}
-          {expiryDays} days and beyond the {cap} newest noncurrent versions.
-        </>
-      )
-    }
+  if (!hasCap) {
+    return <>A noncurrent version is permanently deleted once it is older than {expiryDays} days.</>
+  }
+
+  if (mode === 'and') {
     return (
       <>
-        A noncurrent version is permanently deleted as soon as it is <em>either</em> older than{' '}
-        {expiryDays} days <em>or</em> beyond the {cap} newest noncurrent versions.
+        A noncurrent version is permanently deleted only once it is <em>both</em> older than{' '}
+        {expiryDays} days and beyond the {cap} newest noncurrent versions.
       </>
     )
   }
 
-  if (hasExpiryDays) {
-    return <>A noncurrent version is permanently deleted once it is older than {expiryDays} days.</>
-  }
-
   return (
     <>
-      Only the {cap} newest noncurrent versions are retained. Older ones are deleted on the next
-      upload.
+      A noncurrent version is permanently deleted as soon as it is <em>either</em> older than{' '}
+      {expiryDays} days <em>or</em> beyond the {cap} newest noncurrent versions.
     </>
   )
 }
@@ -91,6 +84,7 @@ export const VersionHistoryPolicyRow = ({
       <HoverCardTrigger asChild>
         <button
           type="button"
+          tabIndex={0}
           onClick={onEditBucket}
           className="flex items-center gap-x-2 text-left"
           aria-label="Lifecycle policy details"
@@ -106,9 +100,6 @@ export const VersionHistoryPolicyRow = ({
               — no retention cap
             </span>
           )}
-          {hasCap && !hasExpiryDays && (
-            <span className="font-mono text-[11px] text-foreground-lighter">— no age limit</span>
-          )}
           <Info size={13} className="text-foreground-lighter" />
         </button>
       </HoverCardTrigger>