diff --git a/src/components/layout/Navbar.jsx b/src/components/layout/Navbar.jsx
index de3fea5..77a7d7e 100644
--- a/src/components/layout/Navbar.jsx
+++ b/src/components/layout/Navbar.jsx
@@ -95,7 +95,9 @@ const Navbar = () => {
             <div className="relative" ref={dropdownRef}>
               <button
                 onClick={toggleDropdown}
-                className={`flex items-center space-x-1 px-3 py-2 rounded-md text-sm font-medium transition-colors duration-200 ${location.pathname.startsWith('/forum')
+                aria-expanded={isDropdownOpen}
+                aria-haspopup="true"
+                className={`flex items-center space-x-1 px-3 py-2 rounded-md text-sm font-medium transition-colors duration-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent-500 ${location.pathname.startsWith('/forum')
                     ? 'text-accent-500 bg-accent-50 dark:bg-navy-800'
                     : 'text-gray-700 dark:text-slate-300 hover:text-accent-500 hover:bg-gray-50 dark:hover:bg-navy-800'
                   }`}
@@ -139,7 +141,7 @@ const Navbar = () => {
             {/* Theme Toggle Button */}
             <button
               onClick={toggleTheme}
-              className="p-2 rounded-lg text-gray-600 dark:text-slate-300 hover:bg-gray-100 dark:hover:bg-navy-800 transition-all duration-300"
+              className="p-2 rounded-lg text-gray-600 dark:text-slate-300 hover:bg-gray-100 dark:hover:bg-navy-800 transition-all duration-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent-500"
               aria-label={isDark ? 'Switch to light mode' : 'Switch to dark mode'}
             >
               <FontAwesomeIcon
@@ -161,7 +163,7 @@ const Navbar = () => {
             {/* Theme Toggle - Mobile */}
             <button
               onClick={toggleTheme}
-              className="p-2 rounded-lg text-gray-600 dark:text-slate-300 hover:bg-gray-100 dark:hover:bg-navy-800 transition-colors duration-200"
+              className="p-2 rounded-lg text-gray-600 dark:text-slate-300 hover:bg-gray-100 dark:hover:bg-navy-800 transition-colors duration-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent-500"
               aria-label={isDark ? 'Switch to light mode' : 'Switch to dark mode'}
             >
               <FontAwesomeIcon
@@ -172,7 +174,9 @@ const Navbar = () => {
 
             <button
               onClick={toggleMobile}
-              className="text-gray-700 dark:text-slate-300 hover:text-accent-500 p-2"
+              aria-expanded={isOpen}
+              aria-label={isOpen ? 'Close menu' : 'Open menu'}
+              className="text-gray-700 dark:text-slate-300 hover:text-accent-500 p-2 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent-500"
             >
               <FontAwesomeIcon icon={isOpen ? faTimes : faBars} className="text-xl" />
             </button>