diff --git a/src/components/ui/buttons/LoginBtn.astro b/src/components/ui/buttons/LoginBtn.astro
index 1501993..0c38933 100644
--- a/src/components/ui/buttons/LoginBtn.astro
+++ b/src/components/ui/buttons/LoginBtn.astro
@@ -5,7 +5,7 @@ interface Props {
   title?: string;
 }
 
-const baseClasses = "flex items-center gap-x-2 text-base md:text-sm font-medium text-neutral-600 ring-zinc-500 transition duration-300 outline-none";
+const baseClasses = "flex items-center gap-x-2 text-base md:text-sm font-medium text-neutral-600 ring-zinc-500 transition duration-300 focus-visible:ring outline-none";
 const hoverClasses = "hover:text-[#fa5a15] dark:hover:text-[#fb713b]";
 const darkClasses = "dark:border-neutral-700 dark:text-neutral-400 dark:ring-zinc-200 dark:focus:outline-none";
 const mdClasses = "md:my-6 md:border-s md:border-neutral-300 md:ps-6";
diff --git a/src/components/ui/buttons/PrimaryCTA.astro b/src/components/ui/buttons/PrimaryCTA.astro
index 8b885ee..5943a59 100644
--- a/src/components/ui/buttons/PrimaryCTA.astro
+++ b/src/components/ui/buttons/PrimaryCTA.astro
@@ -7,7 +7,7 @@ interface Props {
     noArrow?: boolean;
 }
 
-const baseClasses = "group inline-flex items-center justify-center gap-x-2 rounded-lg px-4 py-3 text-sm font-semibold text-neutral-50 ring-zinc-500 transition duration-300 outline-none";
+const baseClasses = "group inline-flex items-center justify-center gap-x-2 rounded-lg px-4 py-3 text-sm font-bold text-neutral-50 ring-zinc-500 transition duration-300 focus-visible:ring outline-none";
 const borderClasses = "border border-transparent";
 const bgColorClasses = "bg-[#fa5a15] hover:bg-[#e14d0b] active:bg-[#e14d0b] dark:focus:outline-none";
 const disableClasses = "disabled:pointer-events-none disabled:opacity-50";
diff --git a/src/components/ui/buttons/SecondaryCTA.astro b/src/components/ui/buttons/SecondaryCTA.astro
index 660ca10..a56c11b 100644
--- a/src/components/ui/buttons/SecondaryCTA.astro
+++ b/src/components/ui/buttons/SecondaryCTA.astro
@@ -6,7 +6,7 @@ interface Props {
     url?: string;
 }
 
-const baseClasses = "inline-flex items-center justify-center gap-x-2 rounded-lg px-4 py-3 text-center text-sm font-medium text-neutral-600 shadow-sm outline-none ring-zinc-500 transition duration-300";
+const baseClasses = "inline-flex items-center justify-center gap-x-2 rounded-lg px-4 py-3 text-center text-sm font-medium text-neutral-600 shadow-sm outline-none ring-zinc-500 focus-visible:ring transition duration-300";
 const borderClasses = "border border-neutral-200";
 const bgColorClasses = "bg-neutral-300";
 const hoverClasses = "hover:bg-neutral-400/50 hover:text-neutral-600 active:text-neutral-700";
diff --git a/src/components/ui/forms/input/PasswordInput.astro b/src/components/ui/forms/input/PasswordInput.astro
index 0e9f3b3..90258af 100644
--- a/src/components/ui/forms/input/PasswordInput.astro
+++ b/src/components/ui/forms/input/PasswordInput.astro
@@ -28,7 +28,7 @@ interface Props {
     {
       forgot ? (
         <button
-          class="text-sm font-medium text-[#fa5a15] decoration-2 outline-none ring-zinc-500 hover:underline focus-visible:ring dark:text-[#fa5a15] dark:ring-zinc-200 dark:focus:outline-none dark:focus:ring-1"
+          class="text-sm font-medium text-[#fa5a15] decoration-2 rounded-lg outline-none ring-zinc-500 hover:underline focus-visible:ring dark:text-[#fa5a15] dark:ring-zinc-200 dark:focus:outline-none dark:focus:ring-1"
           data-hs-overlay="#hs-toggle-between-modals-recover-modal"
         >
           Forgot password?
diff --git a/src/components/ui/images/ImgSmall.astro b/src/components/ui/images/ImgSmall.astro
index 43cea23..0149ffd 100644
--- a/src/components/ui/images/ImgSmall.astro
+++ b/src/components/ui/images/ImgSmall.astro
@@ -18,7 +18,7 @@ const AnchorSVG = `
 
 <a
   href={url}
-  class="group relative flex h-48 items-end overflow-hidden rounded-xl shadow-lg md:h-80"
+  class="group relative flex h-48 outline-none dark:focus:outline-none ring-zinc-500 focus-visible:ring dark:ring-zinc-200 items-end overflow-hidden rounded-xl shadow-lg md:h-80"
 >
   <Image
     src={src}
diff --git a/src/components/ui/images/ImgWide.astro b/src/components/ui/images/ImgWide.astro
index 5560a1e..825a303 100644
--- a/src/components/ui/images/ImgWide.astro
+++ b/src/components/ui/images/ImgWide.astro
@@ -18,7 +18,7 @@ const AnchorSVG = `
 
 <a
   href={url}
-  class="group relative flex h-48 items-end overflow-hidden rounded-lg shadow-xl md:col-span-2 md:h-80"
+  class="group relative outline-none dark:focus:outline-none ring-zinc-500 focus-visible:ring dark:ring-zinc-200 flex h-48 items-end overflow-hidden rounded-lg shadow-xl md:col-span-2 md:h-80"
 >
   <Image
     src={src}