diff --git a/static/js/ask-ai-accessibility.js b/static/js/ask-ai-accessibility.js
index a7dbcac..790a851 100644
--- a/static/js/ask-ai-accessibility.js
+++ b/static/js/ask-ai-accessibility.js
@@ -16,12 +16,222 @@ $(document).ready(function () {
     if (exists && !isModalPresent) {
       isModalPresent = true;
       $askAiButton.attr("aria-expanded", "true");
+      enhanceModalAccessibility(shadowRoot);
     } else if (!exists && isModalPresent) {
       isModalPresent = false;
       $askAiButton.attr("aria-expanded", "false");
     }
   }
 
+  function setupAnswerButtonsAccessibility(shadowRoot) {
+    const buttons = shadowRoot.querySelectorAll("button.mantine-Button-root");
+    if (!buttons.length) return;
+
+    buttons.forEach((button) => {
+      if (button.hasAttribute("data-button-a11y-setup")) return;
+
+      const buttonText = button.textContent.trim();
+      const actionTypes = ["Good answer", "Bad answer", "New chat", "Copy"];
+
+      if (!actionTypes.some(text => buttonText.includes(text))) return;
+
+      button.setAttribute("data-button-a11y-setup", "true");
+
+      if (!button.getAttribute("aria-label")) {
+        button.setAttribute("aria-label", buttonText);
+      }
+
+      const icon = button.querySelector("svg");
+      if (icon) {
+        icon.setAttribute("role", "img");
+        icon.setAttribute("aria-label", buttonText);
+        icon.setAttribute("aria-hidden", "true");
+      }
+
+      button.addEventListener("click", function () {
+        setTimeout(() => {
+          const popup = shadowRoot.querySelector(".mantine-Popover-dropdown");
+          if (popup) {
+            popup.focus();
+          }
+        }, 50);
+      });
+
+      button.setAttribute("data-button-style-applied", "true");
+    });
+
+    // Watch for dynamically added buttons
+    if (!shadowRoot.getAttribute("data-answer-buttons-observer")) {
+      shadowRoot.setAttribute("data-answer-buttons-observer", "true");
+
+      const answerButtonsObserver = new MutationObserver(() => {
+        setupAnswerButtonsAccessibility(shadowRoot);
+      });
+
+      answerButtonsObserver.observe(shadowRoot, {
+        childList: true,
+        subtree: true
+      });
+    }
+  }
+
+  function setupDeepThinkingButtonAccessibility(shadowRoot) {
+    const deepThinkingIcon = shadowRoot.querySelector(".tabler-icon-file-search");
+    if (!deepThinkingIcon) return;
+
+    const deepThinkingButton = deepThinkingIcon.closest("button");
+    if (!deepThinkingButton || deepThinkingButton.hasAttribute("data-dt-setup")) return;
+
+    deepThinkingButton.setAttribute("data-dt-setup", "true");
+
+    deepThinkingButton.removeAttribute("aria-haspopup");
+    deepThinkingButton.removeAttribute("aria-expanded");
+    deepThinkingButton.removeAttribute("aria-controls");
+
+    deepThinkingButton.setAttribute("aria-pressed", "false");
+    deepThinkingButton.setAttribute("aria-label", "Deep thinking off");
+
+    // Inject styles for better state indication beyond color
+    if (!shadowRoot.getElementById("deep-thinking-styles")) {
+      const style = document.createElement("style");
+      style.id = "deep-thinking-styles";
+      style.textContent = `
+        button[aria-pressed="true"] .tabler-icon-file-search {
+          stroke-width: 2.5;
+        }
+        button[aria-pressed="true"] {
+          box-shadow: inset 0 0 0 1px currentColor, 0 0 0 2px currentColor;
+        }
+      `;
+      shadowRoot.appendChild(style);
+    }
+
+    let isPressed = false;
+
+    deepThinkingButton.addEventListener("click", function (e) {
+      setTimeout(() => {
+        isPressed = !isPressed;
+        deepThinkingButton.setAttribute("aria-pressed", isPressed ? "true" : "false");
+        deepThinkingButton.setAttribute("aria-label", isPressed ? "Deep thinking on" : "Deep thinking off");
+      }, 50);
+    });
+
+    // Monitor popover appearance and attribute changes
+    const buttonObserver = new MutationObserver((mutations) => {
+      mutations.forEach((mutation) => {
+        if (mutation.type === "childList") {
+          const popoverDropdown = shadowRoot.querySelector(".mantine-Popover-dropdown");
+          if (popoverDropdown && popoverDropdown.id) {
+            deepThinkingButton.setAttribute("aria-describedby", popoverDropdown.id);
+          } else if (!popoverDropdown) {
+            deepThinkingButton.removeAttribute("aria-describedby");
+          }
+          setupAnswerButtonsAccessibility(shadowRoot);
+          const kpaInput = shadowRoot.querySelector("#kapa-ask-ai-input");
+          if (kpaInput && !kpaInput.hasAttribute("aria-label")) {
+            kpaInput.setAttribute("aria-label", "Ask me a question about GoodData");
+            kpaInput.setAttribute("autocomplete", "off");
+          }
+        } else if (mutation.type === "attributes") {
+          if (deepThinkingButton.hasAttribute("aria-expanded")) {
+            deepThinkingButton.removeAttribute("aria-expanded");
+          }
+          if (deepThinkingButton.hasAttribute("aria-haspopup")) {
+            deepThinkingButton.removeAttribute("aria-haspopup");
+          }
+          if (deepThinkingButton.hasAttribute("aria-controls")) {
+            deepThinkingButton.removeAttribute("aria-controls");
+          }
+        }
+      });
+    });
+
+    buttonObserver.observe(shadowRoot, {
+      childList: true,
+      subtree: true
+    });
+
+    buttonObserver.observe(deepThinkingButton, {
+      attributes: true,
+      attributeFilter: ["class", "aria-expanded", "aria-haspopup", "aria-controls"]
+    });
+  }
+
+  function enhanceModalAccessibility(shadowRoot) {
+    // Style close button
+    const closeButton = shadowRoot.querySelector(".mantine-Modal-close");
+    if (closeButton && !closeButton.getAttribute("aria-label")) {
+      closeButton.setAttribute("aria-label", "Close");
+    }
+
+    if (closeButton) {
+      const svg = closeButton.querySelector("svg");
+      if (svg && !svg.getAttribute("aria-hidden")) {
+        svg.setAttribute("aria-hidden", "true");
+      }
+    }
+
+    // Style back to top button
+    const backToTopSvg = shadowRoot.querySelector(".tabler-icon-arrow-up");
+    if (backToTopSvg) {
+      const backToTopButton = backToTopSvg.closest("button");
+      if (backToTopButton && !backToTopButton.getAttribute("aria-label")) {
+        backToTopButton.setAttribute("aria-label", "Back to top");
+        if (!backToTopSvg.getAttribute("aria-hidden")) {
+          backToTopSvg.setAttribute("aria-hidden", "true");
+        }
+      }
+    }
+
+    setupDeepThinkingButtonAccessibility(shadowRoot);
+    setupAnswerButtonsAccessibility(shadowRoot);
+
+    // Fix input accessibility
+    const kpaInput = shadowRoot.querySelector("#kapa-ask-ai-input");
+    if (kpaInput) {
+      kpaInput.setAttribute("aria-label", "Ask me a question about GoodData");
+      kpaInput.setAttribute("autocomplete", "off");
+    }
+
+    // Fix reCAPTCHA link accessibility
+    const recaptchaLink = shadowRoot.querySelector("a[data-underline='hover']:not([href])");
+    if (recaptchaLink && recaptchaLink.textContent.includes("reCAPTCHA")) {
+      if (!recaptchaLink.getAttribute("aria-label")) {
+        recaptchaLink.setAttribute("aria-label", "Protected by reCAPTCHA");
+      }
+
+      recaptchaLink.setAttribute("role", "button");
+
+      if (!recaptchaLink.hasAttribute("href")) {
+        recaptchaLink.setAttribute("tabindex", "0");
+      }
+
+      // Setup reCAPTCHA dialog accessibility
+      recaptchaLink.addEventListener("click", function () {
+        setTimeout(() => {
+          const dialog = shadowRoot.querySelector(".mantine-Popover-dropdown[role='dialog']");
+          if (dialog) {
+            const dialogText = dialog.querySelector("p");
+            if (dialogText && !dialogText.id) {
+              dialogText.id = "recaptcha-dialog-description";
+            }
+
+            if (!dialog.getAttribute("aria-label")) {
+              dialog.setAttribute("aria-label", "reCAPTCHA information");
+            }
+
+            if (dialogText && dialogText.id) {
+              dialog.setAttribute("aria-describedby", dialogText.id);
+            }
+
+            dialog.setAttribute("aria-modal", "true");
+            dialog.focus();
+          }
+        }, 100);
+      });
+    }
+  }
+
   setTimeout(function () {
     const $kapaContainer = $("#kapa-widget-container");
 
@@ -37,3 +247,4 @@ $(document).ready(function () {
     }
   }, 700);
 });
+