diff --git a/src/components/charts/compliance-charts.tsx b/src/components/charts/compliance-charts.tsx
index 9f7255afa..2af43b6bb 100644
--- a/src/components/charts/compliance-charts.tsx
+++ b/src/components/charts/compliance-charts.tsx
@@ -103,7 +103,7 @@ export function ComplianceCharts({ medications }: ComplianceChartsProps) {
                   type="button"
                   variant={rangePoints === 30 ? "default" : "ghost"}
                   size="sm"
-                  className="min-h-9 px-2.5 text-xs"
+                  className="min-h-11 px-3 text-xs"
                   onClick={() => setRangePoints(30)}
                   title={t("charts.points30Title")}
                 >
@@ -113,7 +113,7 @@ export function ComplianceCharts({ medications }: ComplianceChartsProps) {
                   type="button"
                   variant={rangePoints === 90 ? "default" : "ghost"}
                   size="sm"
-                  className="min-h-9 px-2.5 text-xs"
+                  className="min-h-11 px-3 text-xs"
                   onClick={() => setRangePoints(90)}
                   title={t("charts.points90Title")}
                 >
@@ -123,7 +123,7 @@ export function ComplianceCharts({ medications }: ComplianceChartsProps) {
                   type="button"
                   variant={rangePoints === 0 ? "default" : "ghost"}
                   size="sm"
-                  className="min-h-9 px-2.5 text-xs"
+                  className="min-h-11 px-3 text-xs"
                   onClick={() => setRangePoints(0)}
                   title={t("charts.pointsAllTitle")}
                 >
diff --git a/src/components/charts/compliance-line-chart.tsx b/src/components/charts/compliance-line-chart.tsx
index e9863de84..e1c6ff500 100644
--- a/src/components/charts/compliance-line-chart.tsx
+++ b/src/components/charts/compliance-line-chart.tsx
@@ -73,7 +73,7 @@ export function ComplianceLineChart({
               key={r.label}
               variant={activeRangePoints === r.points ? "default" : "ghost"}
               size="sm"
-              className="min-h-9 px-2.5 text-xs"
+              className="min-h-11 px-3 text-xs"
               onClick={() => setActiveRangePoints(r.points)}
               title={r.title}
             >
diff --git a/src/components/charts/health-chart.tsx b/src/components/charts/health-chart.tsx
index 2e57c021e..dfbb5229c 100644
--- a/src/components/charts/health-chart.tsx
+++ b/src/components/charts/health-chart.tsx
@@ -879,7 +879,7 @@ export function HealthChart({
                 key={r.labelKey}
                 variant={rangePoints === r.points ? "default" : "ghost"}
                 size="sm"
-                className="min-h-9 px-2.5 text-xs"
+                className="min-h-11 px-3 text-xs"
                 onClick={() => setRangePoints(r.points)}
                 title={t(r.titleKey)}
                 data-slot="chart-range-tab"
diff --git a/src/components/charts/medication-compliance-chart.tsx b/src/components/charts/medication-compliance-chart.tsx
index 4aa48f8f2..6e89e742f 100644
--- a/src/components/charts/medication-compliance-chart.tsx
+++ b/src/components/charts/medication-compliance-chart.tsx
@@ -257,7 +257,7 @@ export function MedicationComplianceChart({
               key={r}
               variant={days === r ? "default" : "ghost"}
               size="sm"
-              className="min-h-9 px-2.5 text-xs"
+              className="min-h-11 px-3 text-xs"
               onClick={() => setDays(r)}
             >
               {r}T
diff --git a/src/components/charts/mood-chart.tsx b/src/components/charts/mood-chart.tsx
index 292f03165..f04e69fdd 100644
--- a/src/components/charts/mood-chart.tsx
+++ b/src/components/charts/mood-chart.tsx
@@ -550,7 +550,7 @@ export function MoodChart({
                   key={r.labelKey}
                   variant={rangePoints === r.points ? "default" : "ghost"}
                   size="sm"
-                  className="min-h-9 px-2.5 text-xs"
+                  className="min-h-11 px-3 text-xs"
                   onClick={() => setRangePoints(r.points)}
                   title={t(r.titleKey)}
                   data-slot="chart-range-tab"
diff --git a/src/components/insights/recommendation-card.tsx b/src/components/insights/recommendation-card.tsx
index b63aaa042..373bf4810 100644
--- a/src/components/insights/recommendation-card.tsx
+++ b/src/components/insights/recommendation-card.tsx
@@ -369,7 +369,7 @@ export function RecommendationCard({
               type="button"
               onClick={() => setExpanded((v) => !v)}
               aria-expanded={expanded}
-              className="text-muted-foreground hover:text-foreground rounded-md p-1 transition-colors"
+              className="text-muted-foreground hover:text-foreground focus-visible:ring-ring/50 inline-flex min-h-11 min-w-11 items-center justify-center rounded-md transition-colors focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none"
               title={
                 expanded
                   ? t("insights.recommendation.rationaleCollapse")
diff --git a/src/components/insights/recommendation-feedback.tsx b/src/components/insights/recommendation-feedback.tsx
index 438eedeb4..4a827c5e5 100644
--- a/src/components/insights/recommendation-feedback.tsx
+++ b/src/components/insights/recommendation-feedback.tsx
@@ -265,7 +265,7 @@ export function RecommendationFeedback({
         title={t("insights.recommendation.feedbackHelpful")}
         disabled={disabled}
         onClick={() => submit(true)}
-        className="text-muted-foreground hover:text-dracula-green disabled:hover:text-muted-foreground inline-flex h-7 w-7 items-center justify-center rounded-md transition-colors disabled:opacity-60"
+        className="text-muted-foreground hover:text-dracula-green disabled:hover:text-muted-foreground focus-visible:ring-ring/50 inline-flex min-h-11 min-w-11 items-center justify-center rounded-md transition-colors focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:opacity-60"
       >
         {submittingUp ? (
           <Loader2 className="h-3.5 w-3.5 animate-spin" aria-hidden="true" />
@@ -280,7 +280,7 @@ export function RecommendationFeedback({
         title={t("insights.recommendation.feedbackNotHelpful")}
         disabled={disabled}
         onClick={() => submit(false)}
-        className="text-muted-foreground hover:text-dracula-orange disabled:hover:text-muted-foreground inline-flex h-7 w-7 items-center justify-center rounded-md transition-colors disabled:opacity-60"
+        className="text-muted-foreground hover:text-dracula-orange disabled:hover:text-muted-foreground focus-visible:ring-ring/50 inline-flex min-h-11 min-w-11 items-center justify-center rounded-md transition-colors focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:opacity-60"
       >
         {submittingDown ? (
           <Loader2 className="h-3.5 w-3.5 animate-spin" aria-hidden="true" />
diff --git a/src/components/settings/export-section.tsx b/src/components/settings/export-section.tsx
index ae5eae283..d619f5995 100644
--- a/src/components/settings/export-section.tsx
+++ b/src/components/settings/export-section.tsx
@@ -33,6 +33,7 @@ import {
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
 import {
   DoctorReportDialog,
   type DoctorReportSubmitPayload,
@@ -453,13 +454,15 @@ function MedicationsCsvCard() {
         setSince={setSince}
         setUntil={setUntil}
       />
-      <label className="flex cursor-pointer items-center gap-2 text-xs">
-        <input
+      <label
+        htmlFor="export-medications-include-intake"
+        className="flex min-h-11 cursor-pointer items-center gap-3 text-xs"
+      >
+        <Switch
+          id="export-medications-include-intake"
           data-testid="export-medications-include-intake"
-          type="checkbox"
           checked={includeIntake}
-          onChange={(e) => setIncludeIntake(e.target.checked)}
-          className="border-border h-4 w-4 cursor-pointer rounded border"
+          onCheckedChange={setIncludeIntake}
         />
         <span className="text-muted-foreground">
           {t("settings.sections.export.cards.medicationsCsv.includeIntake")}