diff --git a/.oxlintrc.json b/.oxlintrc.json
index 17a03ad38a3..5672a370478 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -74,8 +74,8 @@
     "react/forward-ref-uses-ref": "error",
     "react/iframe-missing-sandbox": "error",
     "react/no-unknown-property": "error",
-    "jsx-a11y/alt-text": "off",
-    "jsx-a11y/aria-role": "off",
+    "jsx-a11y/alt-text": "error",
+    "jsx-a11y/aria-role": "error",
     "jsx-a11y/click-events-have-key-events": "off",
     "jsx-a11y/control-has-associated-label": "off",
     "jsx-a11y/label-has-associated-control": "off",
diff --git a/apps/webapp/app/components/dashboard-agent/DashboardAgentMessages.tsx b/apps/webapp/app/components/dashboard-agent/DashboardAgentMessages.tsx
index ab8d9656ece..f3c9382d896 100644
--- a/apps/webapp/app/components/dashboard-agent/DashboardAgentMessages.tsx
+++ b/apps/webapp/app/components/dashboard-agent/DashboardAgentMessages.tsx
@@ -259,8 +259,8 @@ const DashboardAgentTurn = memo(function DashboardAgentTurn({
 }) {
   if (message.role === "user") {
     return (
-      <ChatTurn role="user">
-        <ChatText role="user" text={userText(message)} />
+      <ChatTurn speaker="user">
+        <ChatText speaker="user" text={userText(message)} />
       </ChatTurn>
     );
   }
diff --git a/apps/webapp/app/components/dashboard-agent/chat-layout.tsx b/apps/webapp/app/components/dashboard-agent/chat-layout.tsx
index 298965d9295..d1c7a32f946 100644
--- a/apps/webapp/app/components/dashboard-agent/chat-layout.tsx
+++ b/apps/webapp/app/components/dashboard-agent/chat-layout.tsx
@@ -57,11 +57,11 @@ export function ChatTranscript({
 }
 
 export function ChatTurn({
-  role = "assistant",
+  speaker = "assistant",
   bleed = false,
   children,
 }: {
-  role?: ChatRole;
+  speaker?: ChatRole;
   bleed?: boolean;
   children: React.ReactNode;
 }) {
@@ -71,7 +71,7 @@ export function ChatTurn({
         className={cn(
           bleed ? undefined : TRANSCRIPT_INSET_X,
           "min-w-0",
-          role === "user" ? "flex justify-end" : TURN_BODY_GAP
+          speaker === "user" ? "flex justify-end" : TURN_BODY_GAP
         )}
       >
         {children}
@@ -80,8 +80,8 @@ export function ChatTurn({
   );
 }
 
-export function ChatText({ role = "assistant", text }: { role?: ChatRole; text: string }) {
-  if (role === "user") {
+export function ChatText({ speaker = "assistant", text }: { speaker?: ChatRole; text: string }) {
+  if (speaker === "user") {
     return (
       <div className="max-w-[80%] rounded-lg bg-background-raised px-4 py-2.5 text-sm text-text-bright">
         <div className="whitespace-pre-wrap wrap-anywhere">{text}</div>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
index 5830f599a6a..4898da2a505 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
@@ -607,9 +607,10 @@ function HexPopover({ avatar, hex }: { avatar: Avatar; hex: string }) {
   return (
     <Popover>
       <PopoverTrigger
+        aria-label="Choose custom avatar color"
         className={cn(iconTileClass, "border-grid-dimmed hover:border-border-bright")}
       >
-        <img src={colorWheelIcon} className="m-0 block size-[30px] p-0" />
+        <img src={colorWheelIcon} alt="" className="m-0 block size-[30px] p-0" />
       </PopoverTrigger>
       <PopoverContent
         className="overflow-y-auto p-1 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-surface-control"