diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 676e9b6ce..b775b51f6 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,6 +1,6 @@
 name: PR Labeler
 on:
-  pull_request_target:
+  pull_request:
 jobs:
   label:
     runs-on: ubuntu-latest
diff --git a/src/app/dashboard/settings/page.tsx b/src/app/dashboard/settings/page.tsx
index 36ff441cb..ea7f60430 100644
--- a/src/app/dashboard/settings/page.tsx
+++ b/src/app/dashboard/settings/page.tsx
@@ -691,7 +691,7 @@ function SettingsPageContent() {
             </div>
 
             {/* Toggle Switch */}
-            <label className="flex items-center cursor-pointer select-none">
+            <label className="flex items-center cursor-pointer select-none"><span className="sr-only">Toggle setting</span>
               <div className="relative">
                 <input
                   type="checkbox"
@@ -726,7 +726,7 @@ function SettingsPageContent() {
                   type="text"
                   value={`${window.location.origin}/u/${settings.github_login}`}
                   readOnly
-                  className="flex-1 rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus:outline-none"
+                  className="flex-1 rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus-visible:outline-none"
                 />
                 <button
                   type="button"
@@ -821,7 +821,7 @@ function SettingsPageContent() {
               maxLength={500}
               rows={5}
               placeholder="Write a short bio with **bold**, _italic_, `code`, or links."
-              className="w-full resize-y rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-3 text-sm text-[var(--card-foreground)] focus:outline-none focus:ring-2 focus:ring-[var(--accent)]"
+              className="w-full resize-y rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-3 text-sm text-[var(--card-foreground)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
             />
 
             {showBioPreview && (
@@ -883,7 +883,7 @@ function SettingsPageContent() {
                     setTheme("default");
                     setIsDirty(true);
                   }}
-                  className="accent-[var(--accent)] focus:ring-[var(--accent)]"
+                  className="accent-[var(--accent)] focus-visible:ring-[var(--accent)]"
                 />
               </label>
               <label className="flex cursor-pointer items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-3 text-[var(--foreground)]">
@@ -897,7 +897,7 @@ function SettingsPageContent() {
                     setTheme("colour-blind-friendly");
                     setIsDirty(true);
                   }}
-                  className="accent-[var(--accent)] focus:ring-[var(--accent)]"
+                  className="accent-[var(--accent)] focus-visible:ring-[var(--accent)]"
                 />
               </label>
             </div>
@@ -944,7 +944,7 @@ function SettingsPageContent() {
               </p>
             </div>
 
-            <label className="flex items-center cursor-pointer select-none">
+            <label className="flex items-center cursor-pointer select-none"><span className="sr-only">Toggle setting</span>
               <div className="relative">
                 <input
                   type="checkbox"
@@ -1058,7 +1058,7 @@ function SettingsPageContent() {
                 onChange={(e) => setRepoSearchQuery(e.target.value)}
                 placeholder="Type to search your repositories..."
                 aria-label="Search repositories to pin"
-                className="w-full rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] placeholder:text-[var(--muted-foreground)] focus:outline-none focus:ring-2 focus:ring-[var(--accent)] mb-4"
+                className="w-full rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] placeholder:text-[var(--muted-foreground)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)] mb-4"
               />
 
               {loadingRepos ? (
@@ -1118,7 +1118,7 @@ function SettingsPageContent() {
               </p>
             </div>
 
-            <label className="flex items-center cursor-pointer select-none">
+            <label className="flex items-center cursor-pointer select-none"><span className="sr-only">Toggle setting</span>
               <div className="relative">
                 <input
                   type="checkbox"
@@ -1247,7 +1247,7 @@ function SettingsPageContent() {
                   }}
                   placeholder={settings.has_wakatime_key ? "•••••••••••••••• (Configured)" : "Enter your Wakatime API key"}
                   autoComplete="new-password"
-                  className="flex-1 rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus:outline-none focus:ring-2 focus:ring-[var(--accent)]"
+                  className="flex-1 rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
                 />
                 <button
                   type="button"
@@ -1292,7 +1292,7 @@ function SettingsPageContent() {
                     setIsDirty(true);
                   }}
                   placeholder="https://discord.com/api/webhooks/..."
-                  className="flex-1 rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus:outline-none focus:ring-2 focus:ring-[var(--accent)]"
+                  className="flex-1 rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
                 />
               </div>
             </div>
@@ -1308,7 +1308,7 @@ function SettingsPageContent() {
                   setTimezone(e.target.value);
                   setIsDirty(true);
                 }}
-                className="w-full rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus:outline-none focus:ring-2 focus:ring-[var(--accent)]"
+                className="w-full rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-2 text-sm text-[var(--card-foreground)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
               >
                 <option value="UTC">UTC</option>
                 <option value="America/New_York">Eastern Time (ET)</option>
diff --git a/src/components/ActivityRingChart.tsx b/src/components/ActivityRingChart.tsx
index 2b5a125c2..0d1ead566 100644
--- a/src/components/ActivityRingChart.tsx
+++ b/src/components/ActivityRingChart.tsx
@@ -89,7 +89,7 @@ export default function ActivityRingChart() {
         <select
           value={days}
           onChange={(e) => setDays(Number(e.target.value))}
-          className="rounded-lg border border-[var(--border)] bg-[var(--card)] px-2 py-1 text-sm text-[var(--card-foreground)] focus:outline-none focus:border-[var(--accent)]"
+          className="rounded-lg border border-[var(--border)] bg-[var(--card)] px-2 py-1 text-sm text-[var(--card-foreground)] focus-visible:outline-none focus:border-[var(--accent)]"
         >
           <option value={7}>Last 7d</option>
           <option value={30}>Last 30d</option>
diff --git a/src/components/CodingActivityInsightsCard.tsx b/src/components/CodingActivityInsightsCard.tsx
index 37925917b..ad759c79d 100644
--- a/src/components/CodingActivityInsightsCard.tsx
+++ b/src/components/CodingActivityInsightsCard.tsx
@@ -248,7 +248,7 @@ export default function CodingActivityInsightsCard() {
           </p>
         </div>
 
-         <button
+         <button aria-label="Refresh"
   type="button"
   onClick={fetchInsights}
   disabled={loading}
diff --git a/src/components/CommitSearchPanel.tsx b/src/components/CommitSearchPanel.tsx
index 81fcbd298..900f36022 100644
--- a/src/components/CommitSearchPanel.tsx
+++ b/src/components/CommitSearchPanel.tsx
@@ -127,7 +127,7 @@ export default function CommitSearchPanel({ commits, loading }: CommitSearchPane
             onChange={(e) => setSearchQuery(e.target.value)}
             placeholder="Search commits..."
             aria-label="Search commits by message or repository"
-            className="w-full rounded-lg border border-[var(--border)] bg-[var(--background)] py-2 pl-10 pr-10 text-sm text-[var(--foreground)] placeholder:text-[var(--muted-foreground)] focus:outline-none focus:ring-2 focus:ring-[var(--accent)] focus:border-transparent transition-colors"
+            className="w-full rounded-lg border border-[var(--border)] bg-[var(--background)] py-2 pl-10 pr-10 text-sm text-[var(--foreground)] placeholder:text-[var(--muted-foreground)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)] focus:border-transparent transition-colors"
           />
           {searchQuery && (
             <button
diff --git a/src/components/CommitTimeChart.tsx b/src/components/CommitTimeChart.tsx
index 91ab081e6..34cd90ef2 100644
--- a/src/components/CommitTimeChart.tsx
+++ b/src/components/CommitTimeChart.tsx
@@ -105,7 +105,7 @@ export default function CommitTimeChart() {
         <select
           value={days}
           onChange={(e) => setDays(Number(e.target.value))}
-          className="rounded-lg border border-[var(--border)] bg-[var(--control)] px-2 py-1 text-sm text-[var(--card-foreground)] focus:outline-none focus:border-[var(--accent)]"
+          className="rounded-lg border border-[var(--border)] bg-[var(--control)] px-2 py-1 text-sm text-[var(--card-foreground)] focus-visible:outline-none focus:border-[var(--accent)]"
         >
           <option value={7}>Last 7d</option>
           <option value={30}>Last 30d</option>
diff --git a/src/components/ConfirmModal.tsx b/src/components/ConfirmModal.tsx
index 03d513bef..76ef3f4d3 100644
--- a/src/components/ConfirmModal.tsx
+++ b/src/components/ConfirmModal.tsx
@@ -50,6 +50,7 @@ export default function ConfirmModal({
       <div 
         className="fixed inset-0 bg-black/60 backdrop-blur-sm transition-opacity" 
         onClick={onCancel}
+        aria-hidden="true"
       />
       
       {/* Modal Content */}
@@ -72,14 +73,14 @@ export default function ConfirmModal({
           <button
             type="button"
             onClick={onCancel}
-            className="w-full sm:w-auto rounded-xl border border-[var(--border)] bg-[var(--control)] px-5 py-2.5 text-sm font-semibold text-[var(--card-foreground)] transition-all hover:bg-[var(--card-muted)] active:scale-95 focus:outline-none focus:ring-2 focus:ring-[var(--accent)]"
+            className="w-full sm:w-auto rounded-xl border border-[var(--border)] bg-[var(--control)] px-5 py-2.5 text-sm font-semibold text-[var(--card-foreground)] transition-all hover:bg-[var(--card-muted)] active:scale-95 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
           >
             {cancelLabel}
           </button>
           <button
             type="button"
             onClick={onConfirm}
-            className="w-full sm:w-auto rounded-xl bg-[var(--accent)] px-5 py-2.5 text-sm font-semibold text-[var(--accent-foreground)] transition-all hover:opacity-90 active:scale-95 shadow-lg shadow-[var(--accent)]/20 focus:outline-none focus:ring-2 focus:ring-[var(--accent)]"
+            className="w-full sm:w-auto rounded-xl bg-[var(--accent)] px-5 py-2.5 text-sm font-semibold text-[var(--accent-foreground)] transition-all hover:opacity-90 active:scale-95 shadow-lg shadow-[var(--accent)]/20 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
           >
             {confirmLabel}
           </button>
diff --git a/src/components/ContributionHeatmap.tsx b/src/components/ContributionHeatmap.tsx
index c7e2ec57f..e0b64b1ef 100644
--- a/src/components/ContributionHeatmap.tsx
+++ b/src/components/ContributionHeatmap.tsx
@@ -536,7 +536,7 @@ export default function ContributionHeatmap({
                       aria-label={isFuture ? `${cell.dateKey}: future date` : tooltip}
                       disabled={isFuture}
                       onClick={() => !isFuture && setSelectedDate(cell.dateKey)}
-                      className={`group relative z-0 h-4 w-4 rounded-[3px] border transition-transform hover:z-20 hover:scale-110 focus:z-20 focus:outline-none focus:ring-2 focus:ring-[var(--heatmap-focus-ring)] disabled:cursor-default disabled:opacity-20 ${
+                      className={`group relative z-0 h-4 w-4 rounded-[3px] border transition-transform hover:z-20 hover:scale-110 focus:z-20 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--heatmap-focus-ring)] disabled:cursor-default disabled:opacity-20 ${
                         cell.inRange ? "opacity-100" : "opacity-40"
                       }`}
                       style={{
diff --git a/src/components/GoalTracker.tsx b/src/components/GoalTracker.tsx
index cfe78875b..aa61916e9 100644
--- a/src/components/GoalTracker.tsx
+++ b/src/components/GoalTracker.tsx
@@ -1379,6 +1379,10 @@ export default function GoalTracker() {
         )}
 
         {/* Recurrence Picker */}
+        <div role="group" aria-labelledby="recurrence-label">
+          <span id="recurrence-label" className="mb-1 block text-xs font-medium uppercase tracking-wide text-[var(--muted-foreground)]">
+            Recurrence
+          </span>
         <div>
           <label className="mb-1 block text-xs font-medium uppercase tracking-wide text-[var(--muted-foreground)]">
             Recurrence
diff --git a/src/components/InactiveRepositoriesCard.tsx b/src/components/InactiveRepositoriesCard.tsx
index 5f97b0c75..3d06cf740 100644
--- a/src/components/InactiveRepositoriesCard.tsx
+++ b/src/components/InactiveRepositoriesCard.tsx
@@ -86,7 +86,7 @@ export default function InactiveRepositoriesCard() {
             value={thresholdDays}
             onChange={(event) => setThresholdDays(Number(event.target.value) as ThresholdDays)}
             aria-label="Select inactivity threshold"
-            className="rounded-lg border border-[var(--border)] bg-[var(--control)] px-2 py-1 text-sm text-[var(--card-foreground)] focus:border-[var(--accent)] focus:outline-none"
+            className="rounded-lg border border-[var(--border)] bg-[var(--control)] px-2 py-1 text-sm text-[var(--card-foreground)] focus:border-[var(--accent)] focus-visible:outline-none"
           >
             {THRESHOLDS.map((days) => (
               <option key={days} value={days}>
diff --git a/src/components/ProjectMetrics.tsx b/src/components/ProjectMetrics.tsx
index a86f21804..279c8c6e5 100644
--- a/src/components/ProjectMetrics.tsx
+++ b/src/components/ProjectMetrics.tsx
@@ -175,11 +175,12 @@ export default function ProjectMetrics() {
               </h3>
               <form onSubmit={handleConnect} className="space-y-4">
                 <div>
-                  <label className="block text-sm font-medium mb-1 text-[var(--foreground)]">
+                  <label htmlFor="jiraDomain" className="block text-sm font-medium mb-1 text-[var(--foreground)]">
                     Jira Domain
                   </label>
                   <input
                     type="text"
+                    id="jiraDomain"
                     placeholder="your-company.atlassian.net"
                     value={formData.jiraDomain}
                     onChange={(e) =>
@@ -190,10 +191,11 @@ export default function ProjectMetrics() {
                   />
                 </div>
                 <div>
-                  <label className="block text-sm font-medium mb-1 text-[var(--foreground)]">
+                  <label htmlFor="email" className="block text-sm font-medium mb-1 text-[var(--foreground)]">
                     Email
                   </label>
                   <input
+                    id="email"
                     type="email"
                     value={formData.email}
                     onChange={(e) =>
@@ -204,10 +206,11 @@ export default function ProjectMetrics() {
                   />
                 </div>
                 <div>
-                  <label className="block text-sm font-medium mb-1 text-[var(--foreground)]">
+                  <label htmlFor="apiToken" className="block text-sm font-medium mb-1 text-[var(--foreground)]">
                     API Token
                   </label>
                   <input
+                    id="apiToken"
                     type="password"
                     placeholder="Get from id.atlassian.com/manage-profile"
                     value={formData.apiToken}
@@ -219,11 +222,12 @@ export default function ProjectMetrics() {
                   />
                 </div>
                 <div>
-                  <label className="block text-sm font-medium mb-1 text-[var(--foreground)]">
+                  <label htmlFor="projectKey" className="block text-sm font-medium mb-1 text-[var(--foreground)]">
                     Project Key (optional)
                   </label>
                   <input
                     type="text"
+                    id="projectKey"
                     placeholder="e.g. PROJ"
                     value={formData.projectKey}
                     onChange={(e) =>
@@ -293,11 +297,12 @@ export default function ProjectMetrics() {
               </h3>
               <form onSubmit={handleConnect} className="space-y-4">
                 <div>
-                  <label className="block text-sm font-medium mb-1 text-[var(--foreground)]">
+                  <label htmlFor="jiraDomain" className="block text-sm font-medium mb-1 text-[var(--foreground)]">
                     Jira Domain
                   </label>
                   <input
                     type="text"
+                    id="jiraDomain"
                     placeholder="your-company.atlassian.net"
                     value={formData.jiraDomain}
                     onChange={(e) =>
@@ -308,10 +313,11 @@ export default function ProjectMetrics() {
                   />
                 </div>
                 <div>
-                  <label className="block text-sm font-medium mb-1 text-[var(--foreground)]">
+                  <label htmlFor="email" className="block text-sm font-medium mb-1 text-[var(--foreground)]">
                     Email
                   </label>
                   <input
+                    id="email"
                     type="email"
                     value={formData.email}
                     onChange={(e) =>
@@ -322,10 +328,11 @@ export default function ProjectMetrics() {
                   />
                 </div>
                 <div>
-                  <label className="block text-sm font-medium mb-1 text-[var(--foreground)]">
+                  <label htmlFor="apiToken" className="block text-sm font-medium mb-1 text-[var(--foreground)]">
                     API Token
                   </label>
                   <input
+                    id="apiToken"
                     type="password"
                     placeholder="Get from id.atlassian.com/manage-profile"
                     value={formData.apiToken}
@@ -337,11 +344,12 @@ export default function ProjectMetrics() {
                   />
                 </div>
                 <div>
-                  <label className="block text-sm font-medium mb-1 text-[var(--foreground)]">
+                  <label htmlFor="projectKey" className="block text-sm font-medium mb-1 text-[var(--foreground)]">
                     Project Key (optional)
                   </label>
                   <input
                     type="text"
+                    id="projectKey"
                     placeholder="e.g. PROJ"
                     value={formData.projectKey}
                     onChange={(e) =>
diff --git a/src/components/ShareProfileSection.tsx b/src/components/ShareProfileSection.tsx
index 8afa16b77..3833a99ef 100644
--- a/src/components/ShareProfileSection.tsx
+++ b/src/components/ShareProfileSection.tsx
@@ -67,7 +67,7 @@ export default function ShareProfileSection({
               type="button"
               onClick={handleNativeShare}
               aria-label={`Share ${username}'s profile using the device share sheet`}
-              className="inline-flex items-center gap-2 rounded-lg border border-[var(--border)] bg-[var(--accent)] px-3 py-2 text-sm font-medium text-[var(--accent-foreground)] transition-colors hover:opacity-90 focus:outline-none focus:ring-2 focus:ring-[var(--accent)]/50"
+              className="inline-flex items-center gap-2 rounded-lg border border-[var(--border)] bg-[var(--accent)] px-3 py-2 text-sm font-medium text-[var(--accent-foreground)] transition-colors hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]/50"
             >
               <span aria-hidden="true">📲</span>
               <span>Share</span>
@@ -79,7 +79,7 @@ export default function ShareProfileSection({
             target="_blank"
             rel="noreferrer noopener"
             aria-label={`Share ${username}'s profile on X`}
-            className="inline-flex items-center gap-2 rounded-lg border border-[var(--border)] bg-[var(--control)] px-3 py-2 text-sm font-medium text-[var(--card-foreground)] transition-colors hover:bg-[var(--control)]/80 focus:outline-none focus:ring-2 focus:ring-[var(--accent)]/50"
+            className="inline-flex items-center gap-2 rounded-lg border border-[var(--border)] bg-[var(--control)] px-3 py-2 text-sm font-medium text-[var(--card-foreground)] transition-colors hover:bg-[var(--control)]/80 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]/50"
           >
             <span aria-hidden="true">𝕏</span>
             <span>X</span>
@@ -90,7 +90,7 @@ export default function ShareProfileSection({
             target="_blank"
             rel="noreferrer noopener"
             aria-label={`Share ${username}'s profile on LinkedIn`}
-            className="inline-flex items-center gap-2 rounded-lg border border-[var(--border)] bg-[var(--control)] px-3 py-2 text-sm font-medium text-[var(--card-foreground)] transition-colors hover:bg-[var(--control)]/80 focus:outline-none focus:ring-2 focus:ring-[var(--accent)]/50"
+            className="inline-flex items-center gap-2 rounded-lg border border-[var(--border)] bg-[var(--control)] px-3 py-2 text-sm font-medium text-[var(--card-foreground)] transition-colors hover:bg-[var(--control)]/80 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]/50"
           >
             <span aria-hidden="true">in</span>
             <span>LinkedIn</span>
diff --git a/src/components/ShortcutsModal.tsx b/src/components/ShortcutsModal.tsx
index 31e01f401..4deaa7cc5 100644
--- a/src/components/ShortcutsModal.tsx
+++ b/src/components/ShortcutsModal.tsx
@@ -106,7 +106,7 @@ export default function ShortcutsModal({
           ref={closeBtnRef}
           type="button"
           onClick={onClose}
-          className="rounded-lg p-1 text-[var(--muted-foreground)] transition-colors hover:bg-[var(--control)] hover:text-[var(--card-foreground)] focus:outline-none focus:ring-2 focus:ring-[var(--accent)]"
+          className="rounded-lg p-1 text-[var(--muted-foreground)] transition-colors hover:bg-[var(--control)] hover:text-[var(--card-foreground)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
           aria-label="Close shortcuts"
         >
           x
@@ -133,7 +133,7 @@ export default function ShortcutsModal({
         <button
           type="button"
           onClick={onClose}
-          className="rounded-lg bg-[var(--control)] px-4 py-2 text-sm font-medium text-[var(--card-foreground)] transition-colors hover:bg-[var(--accent)] hover:text-[var(--accent-foreground)] focus:outline-none focus:ring-2 focus:ring-[var(--accent)]"
+          className="rounded-lg bg-[var(--control)] px-4 py-2 text-sm font-medium text-[var(--card-foreground)] transition-colors hover:bg-[var(--accent)] hover:text-[var(--accent-foreground)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
         >
           Got it
         </button>
diff --git a/src/components/TodayFocusHero.tsx b/src/components/TodayFocusHero.tsx
index a24b332c5..f3ba5ec10 100644
--- a/src/components/TodayFocusHero.tsx
+++ b/src/components/TodayFocusHero.tsx
@@ -196,7 +196,7 @@ export default function TodayFocusHero({ userName }: TodayFocusHeroProps) {
                     value={inputValue}
                     onChange={(event) => setInputValue(event.target.value)}
                     placeholder="Write your main dev goal for today..."
-                    className="w-full rounded-xl border border-[var(--border)] bg-[var(--background)] px-4 py-3 text-sm text-[var(--foreground)] shadow-sm transition placeholder:text-[var(--muted-foreground)] focus:border-[var(--accent)] focus:outline-none"
+                    className="w-full rounded-xl border border-[var(--border)] bg-[var(--background)] px-4 py-3 text-sm text-[var(--foreground)] shadow-sm transition placeholder:text-[var(--muted-foreground)] focus:border-[var(--accent)] focus-visible:outline-none"
                   />
                 </label>
 
diff --git a/src/components/TopRepos.tsx b/src/components/TopRepos.tsx
index fdcd0d50b..9d0facfc8 100644
--- a/src/components/TopRepos.tsx
+++ b/src/components/TopRepos.tsx
@@ -421,7 +421,7 @@ export default function TopRepos() {
           value={days}
           onChange={(e) => setDays(Number(e.target.value))}
           aria-label="Select time range for top repositories"
-          className="rounded-lg border border-[var(--border)] bg-[var(--control)] px-2 py-1 text-sm text-[var(--card-foreground)] focus:outline-none focus:border-[var(--accent)]"
+          className="rounded-lg border border-[var(--border)] bg-[var(--control)] px-2 py-1 text-sm text-[var(--card-foreground)] focus-visible:outline-none focus:border-[var(--accent)]"
         >
           <option value={7}>Last 7d</option>
           <option value={30}>Last 30d</option>
@@ -467,7 +467,7 @@ export default function TopRepos() {
       onChange={(e) => setSearchQuery(e.target.value)}
       placeholder="Search repositories…"
       aria-label="Search repositories"
-      className="w-full rounded-lg border border-[var(--border)] bg-[var(--control)] px-3 py-1.5 pr-10 text-sm text-[var(--card-foreground)] placeholder:text-[var(--muted-foreground)] focus:outline-none focus:border-[var(--accent)]"
+      className="w-full rounded-lg border border-[var(--border)] bg-[var(--control)] px-3 py-1.5 pr-10 text-sm text-[var(--card-foreground)] placeholder:text-[var(--muted-foreground)] focus-visible:outline-none focus:border-[var(--accent)]"
     />
 
     {searchQuery.length > 0 && (
diff --git a/src/components/UserAvatar.tsx b/src/components/UserAvatar.tsx
index c7ea6ef8d..8316f8860 100644
--- a/src/components/UserAvatar.tsx
+++ b/src/components/UserAvatar.tsx
@@ -23,7 +23,7 @@ export default function UserAvatar() {
       target="_blank"
       rel="noopener noreferrer"
       tabIndex={0}
-      className="inline-flex h-10 items-center gap-2 rounded-full border border-[var(--border)] bg-[var(--card)] px-3 text-sm text-[var(--card-foreground)] hover:bg-[var(--control)] transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
+      className="inline-flex h-10 items-center gap-2 rounded-full border border-[var(--border)] bg-[var(--card)] px-3 text-sm text-[var(--card-foreground)] hover:bg-[var(--control)] transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent)]"
     >
       <div className="flex h-8 w-8 items-center justify-center overflow-hidden rounded-full bg-[var(--control)] text-sm font-semibold text-[var(--card-foreground)]">
         {showImage ? (
diff --git a/src/components/WrappedExperience.tsx b/src/components/WrappedExperience.tsx
index 0e9b50819..872e1339a 100644
--- a/src/components/WrappedExperience.tsx
+++ b/src/components/WrappedExperience.tsx
@@ -204,7 +204,7 @@ export default function WrappedExperience() {
               id="wrapped-year"
               value={selectedYear}
               onChange={(event) => setSelectedYear(Number(event.target.value))}
-              className="h-10 rounded-md border border-white/20 bg-slate-900 px-3 text-sm font-semibold text-white outline-none transition focus:border-cyan-300 focus:ring-2 focus:ring-cyan-300/30"
+              className="h-10 rounded-md border border-white/20 bg-slate-900 px-3 text-sm font-semibold text-white outline-none transition focus:border-cyan-300 focus-visible:ring-2 focus-visible:ring-cyan-300/30"
             >
               {years.map((year) => (
                 <option key={year} value={year}>
@@ -214,7 +214,7 @@ export default function WrappedExperience() {
             </select>
             <Link
               href="/dashboard"
-              className="inline-flex h-10 items-center rounded-md border border-white/20 px-4 text-sm font-semibold text-slate-100 transition hover:border-cyan-300 focus:outline-none focus:ring-2 focus:ring-cyan-300/40"
+              className="inline-flex h-10 items-center rounded-md border border-white/20 px-4 text-sm font-semibold text-slate-100 transition hover:border-cyan-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-cyan-300/40"
             >
               Dashboard
             </Link>
@@ -327,7 +327,7 @@ export default function WrappedExperience() {
                       href={twitterUrl}
                       target="_blank"
                       rel="noreferrer"
-                      className="inline-flex h-10 items-center justify-center rounded-md bg-white px-3 text-sm font-black text-slate-950 transition hover:bg-cyan-100 focus:outline-none focus:ring-2 focus:ring-cyan-300"
+                      className="inline-flex h-10 items-center justify-center rounded-md bg-white px-3 text-sm font-black text-slate-950 transition hover:bg-cyan-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-cyan-300"
                     >
                       Share on X
                     </a>
@@ -335,7 +335,7 @@ export default function WrappedExperience() {
                       href={linkedInUrl}
                       target="_blank"
                       rel="noreferrer"
-                      className="inline-flex h-10 items-center justify-center rounded-md border border-white/20 px-3 text-sm font-bold text-white transition hover:border-cyan-300 focus:outline-none focus:ring-2 focus:ring-cyan-300"
+                      className="inline-flex h-10 items-center justify-center rounded-md border border-white/20 px-3 text-sm font-bold text-white transition hover:border-cyan-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-cyan-300"
                     >
                       LinkedIn
                     </a>
diff --git a/src/components/landing/LandingPage.tsx b/src/components/landing/LandingPage.tsx
index 38e125545..341f9a1fd 100644
--- a/src/components/landing/LandingPage.tsx
+++ b/src/components/landing/LandingPage.tsx
@@ -220,6 +220,7 @@ function ChartWidget() {
             key={i}
             onMouseEnter={() => setHovBar(i)}
             onMouseLeave={() => setHovBar(-1)}
+            role="presentation"
             style={{
               flex: 1, borderRadius: '2px 2px 0 0',
               background: hovBar === i ? '#fff' : A,
diff --git a/src/components/repo-analytics/RepoAnalyticsSheet.tsx b/src/components/repo-analytics/RepoAnalyticsSheet.tsx
index 79951f512..f0cb8fb0f 100644
--- a/src/components/repo-analytics/RepoAnalyticsSheet.tsx
+++ b/src/components/repo-analytics/RepoAnalyticsSheet.tsx
@@ -61,6 +61,7 @@ export default function RepoAnalyticsSheet({ repoFullName, open, onClose }: Repo
         }`}
         style={{ backgroundColor: "color-mix(in srgb, var(--card) 60%, transparent)" }}
         onClick={onClose}
+        aria-hidden="true"
       />
       <aside
         className={`fixed inset-y-0 right-0 z-50 w-full max-w-3xl overflow-y-auto border-l border-[var(--border)] bg-[var(--card)] p-5 shadow-2xl shadow-black/60 sm:p-6 transition-transform duration-300 ease-out`}
diff --git a/src/lib/github-achievements.ts b/src/lib/github-achievements.ts
index 85f3dc268..de3c1bc80 100644
--- a/src/lib/github-achievements.ts
+++ b/src/lib/github-achievements.ts
@@ -211,14 +211,14 @@ function parseAchievementsFromProfileHtml(
     const href = match[1];
     const slug = decodeHtml(match[2]).toLowerCase();
     const anchorHtml = match[3];
-    const imgMatch = anchorHtml.match(/<img\b[^>]*src="([^"]+)"[^>]*>/i);
+    const imgMatch = anchorHtml.match(/<img alt="" aria-hidden="true"\b[^>]*src="([^"]+)"[^>]*>/i);
 
     if (!imgMatch) {
       continue;
     }
 
     const imageUrl = absoluteGitHubUrl(imgMatch[1]);
-    const altMatch = anchorHtml.match(/<img\b[^>]*alt="([^"]*)"[^>]*>/i);
+    const altMatch = anchorHtml.match(/<img alt="" aria-hidden="true"\b[^>]*alt="([^"]*)"[^>]*>/i);
     const ariaMatch = anchorHtml.match(/aria-label="([^"]+)"/i);
     const titleMatch = anchorHtml.match(/title="([^"]+)"/i);
     const rawTitle =
@@ -234,7 +234,7 @@ function parseAchievementsFromProfileHtml(
     });
   }
 
-  const achievementImagePattern = /<img\b[^>]*alt="Achievement:\s*([^"]+)"[^>]*>/gi;
+  const achievementImagePattern = /<img alt="" aria-hidden="true"\b[^>]*alt="Achievement:\s*([^"]+)"[^>]*>/gi;
 
   for (const match of html.matchAll(achievementImagePattern)) {
     const imageTag = match[0];