diff --git a/src/app/extensions/ExtensionsPageClient.tsx b/src/app/extensions/ExtensionsPageClient.tsx
index 6bac55d..daeaaa2 100644
--- a/src/app/extensions/ExtensionsPageClient.tsx
+++ b/src/app/extensions/ExtensionsPageClient.tsx
@@ -124,7 +124,9 @@ export function ExtensionsPageClient() {
             <div className="mx-auto max-w-5xl py-8 fade-in-up-delay-1">
               <div className="flex gap-2 overflow-x-auto pb-1 scrollbar-hide mb-4">
                 <button
+                  type="button"
                   onClick={() => setSelectedCategory('')}
+                  aria-pressed={selectedCategory === ''}
                   className={cn(
                     'shrink-0 rounded-full px-3 py-1 text-xs font-medium transition-colors',
                     selectedCategory === ''
@@ -136,8 +138,10 @@ export function ExtensionsPageClient() {
                 </button>
                 {extensionCategories.map((cat) => (
                   <button
+                    type="button"
                     key={cat}
                     onClick={() => setSelectedCategory(cat)}
+                    aria-pressed={selectedCategory === cat}
                     className={cn(
                       'shrink-0 rounded-full px-3 py-1 text-xs font-medium transition-colors',
                       selectedCategory === cat
@@ -155,6 +159,7 @@ export function ExtensionsPageClient() {
                   <Input
                     type="search"
                     placeholder="Search extensions..."
+                    aria-label="Search extensions"
                     className="w-full bg-background/50 backdrop-blur-sm pl-8 border-cyan-500/20 focus:border-cyan-500/40 transition-all duration-300"
                     value={searchQuery}
                     onChange={handleSearchChange}
diff --git a/src/app/templates/TemplatesPageClient.tsx b/src/app/templates/TemplatesPageClient.tsx
index b361cd5..a192ace 100644
--- a/src/app/templates/TemplatesPageClient.tsx
+++ b/src/app/templates/TemplatesPageClient.tsx
@@ -108,7 +108,9 @@ export function TemplatesPageClient() {
             <div className="mx-auto max-w-5xl py-4 fade-in-up-delay-1">
               <div className="flex gap-2 overflow-x-auto pb-1 scrollbar-hide mb-4">
                 <button
+                  type="button"
                   onClick={() => setSelectedCategory('')}
+                  aria-pressed={selectedCategory === ''}
                   className={cn(
                     'shrink-0 rounded-full px-3 py-1 text-xs font-medium transition-colors',
                     selectedCategory === ''
@@ -120,8 +122,10 @@ export function TemplatesPageClient() {
                 </button>
                 {categories.map((cat) => (
                   <button
+                    type="button"
                     key={cat.slug}
                     onClick={() => setSelectedCategory(cat.slug)}
+                    aria-pressed={selectedCategory === cat.slug}
                     className={cn(
                       'shrink-0 rounded-full px-3 py-1 text-xs font-medium transition-colors',
                       selectedCategory === cat.slug
@@ -139,6 +143,7 @@ export function TemplatesPageClient() {
                   <Input
                     type="search"
                     placeholder="Search templates..."
+                    aria-label="Search templates"
                     className="w-full bg-background/50 backdrop-blur-sm pl-8 border-primary/20 focus:border-primary/40 transition-all duration-300"
                     value={searchQuery}
                     onChange={handleSearchChange}
diff --git a/src/components/theme-toggle.tsx b/src/components/theme-toggle.tsx
index d1ccf7b..3c13fad 100644
--- a/src/components/theme-toggle.tsx
+++ b/src/components/theme-toggle.tsx
@@ -16,9 +16,17 @@ export function ThemeToggle() {
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
-        <Button variant="ghost" size="icon" className="relative h-9 w-9 rounded-full">
-          <Sun className="h-5 w-5 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
-          <Moon className="absolute h-5 w-5 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
+        <Button
+          variant="ghost"
+          size="icon"
+          className="relative h-9 w-9 rounded-full"
+          aria-label="Toggle theme"
+        >
+          <Sun className="h-5 w-5 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" aria-hidden="true" />
+          <Moon
+            className="absolute h-5 w-5 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100"
+            aria-hidden="true"
+          />
           <span className="sr-only">Toggle theme</span>
         </Button>
       </DropdownMenuTrigger>