diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index 1edf35a7d..ec9a0e2e7 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -3,7 +3,7 @@ import { NavLink } from 'react-router-dom'
 import { motion, AnimatePresence } from 'framer-motion'
 import { routes } from '../routes'
 import { useAuth } from './AuthContext'
-import ThemeToggle from './ThemeToggle'
+import { useTheme } from './ThemeContext'
 import { useSidebar } from '../context/SidebarContext'
 
 interface NavItemProps {
@@ -22,7 +22,7 @@ const NavItem = ({ to, icon, label, isExpanded, highlight = false }: NavItemProp
             onClick={(e) => e.stopPropagation()}
             className={({ isActive }) => `
                 relative flex items-center transition-all duration-300 group
-                ${isExpanded ? 'gap-3 px-5 py-2.5 mx-2 rounded-lg' : 'justify-center py-3 px-2 mx-2 rounded-lg'}
+                ${isExpanded ? 'gap-3 px-5 py-3 mx-2 rounded-lg' : 'justify-center py-3 px-2 mx-2 rounded-lg'}
                 ${isActive
                     ? 'bg-accent-silver/10 text-primary shadow-[inset_0_1px_1px_rgba(255,255,255,0.05)]'
                     : highlight
@@ -103,6 +103,8 @@ const NavSection = ({ label, isExpanded }: { label: string, isExpanded: boolean
 )
 
 export default function Sidebar() {
+    const { theme, toggleTheme } = useTheme()
+
     const { isExpanded, toggleSidebar } = useSidebar()
     const { isAuthenticated, signOut } = useAuth()
 
@@ -157,10 +159,8 @@ export default function Sidebar() {
 
                 <NavSection label="Analyze" isExpanded={isExpanded} />
                 <NavItem to={routes.findings} icon="emergency_home" label="Findings" isExpanded={isExpanded} />
-
                 <NavItem to={routes.reports} icon="summarize" label="Reports" isExpanded={isExpanded} />
                 <NavItem to={routes.workflows} icon="account_tree" label="Workflows" isExpanded={isExpanded} />
-
             </div>
 
             {/* Bottom Actions */}
@@ -183,19 +183,29 @@ export default function Sidebar() {
                         )}
                     </button>
                 )}
-                <div className="flex items-center gap-2">
-                    <ThemeToggle size="sm" />
+
+                <div className={`flex items-center mt-4 gap-2 ${isExpanded ? 'flex-row' : 'flex-col'}`}>
                     <button
-                        onClick={() => toggleSidebar()}
-                        onKeyDown={(e) => {
-                            if (e.key === 'Enter' || e.key === ' ') {
-                                e.preventDefault()
-                                toggleSidebar()
-                            }
+                        onClick={(e) => {
+                            e.stopPropagation();
+                            toggleTheme();
+                        }}
+                        title="Toggle theme"
+                        className="flex-1 w-full py-2 flex items-center justify-center rounded-lg text-muted hover:text-primary hover:bg-accent-silver/5 transition-colors"
+                    >
+                        <span className="material-symbols-outlined text-[18px]">
+                            {theme === 'dark' ? 'dark_mode' : 'light_mode'}
+                        </span>
+                    </button>
+
+                    <button
+                        onClick={(e) => {
+                            e.stopPropagation();
+                            toggleSidebar();
                         }}
-                        aria-label={isExpanded ? 'Collapse sidebar' : 'Expand sidebar'}
-                        aria-controls="sidebar-nav"
-                        className="flex-1 py-2 flex items-center justify-center text-muted hover:text-primary transition-colors rounded hover:bg-accent-silver/5 focus:outline-none focus:ring-2 focus:ring-rag-red/50"
+                        title={isExpanded ? "Collapse sidebar" : "Expand sidebar"}
+                        aria-label={isExpanded ? "Collapse sidebar" : "Expand sidebar"}
+                        className="flex-1 w-full py-2 flex items-center justify-center rounded-lg text-muted hover:text-primary hover:bg-accent-silver/5 transition-colors focus:ring-2 focus:ring-rag-red/50"
                     >
                         <span className="material-symbols-outlined text-[18px]">
                             {isExpanded ? 'keyboard_double_arrow_left' : 'keyboard_double_arrow_right'}
diff --git a/frontend/testing/unit/components/Sidebar.test.tsx b/frontend/testing/unit/components/Sidebar.test.tsx
index 0d8f6b316..24dfba76d 100644
--- a/frontend/testing/unit/components/Sidebar.test.tsx
+++ b/frontend/testing/unit/components/Sidebar.test.tsx
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from 'vitest'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
 import { render, screen, fireEvent } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { BrowserRouter } from 'react-router-dom'
@@ -151,3 +151,59 @@ describe('Sidebar - Accessibility', () => {
     }, 100)
   })
 })
+// --- Regression coverage for #2362 review: restored nav + auth actions ---
+
+const authState = vi.hoisted(() => ({
+  isAuthenticated: true,
+  signOut: vi.fn(),
+}))
+
+vi.mock('../../../src/components/AuthContext', () => ({
+  useAuth: () => authState,
+}))
+
+describe('Sidebar - Navigation & Auth Actions (regression)', () => {
+  beforeEach(() => {
+    localStorage.clear()
+    authState.isAuthenticated = true
+    authState.signOut = vi.fn()
+  })
+
+  it('should retain the Workflows nav item after layout changes', () => {
+    renderSidebar()
+    expect(screen.getByRole('link', { name: /workflows/i })).toBeInTheDocument()
+  })
+
+  it('should retain the Reports and Settings nav items after layout changes', () => {
+    renderSidebar()
+    expect(screen.getByRole('link', { name: /reports/i })).toBeInTheDocument()
+    expect(screen.getByRole('link', { name: /settings/i })).toBeInTheDocument()
+  })
+
+  it('should show the Sign Out action when the user is authenticated', () => {
+    authState.isAuthenticated = true
+    renderSidebar()
+    expect(screen.getByLabelText(/sign out/i)).toBeInTheDocument()
+  })
+
+  it('should not show the Sign Out action when the user is not authenticated', () => {
+    authState.isAuthenticated = false
+    renderSidebar()
+    expect(screen.queryByLabelText(/sign out/i)).not.toBeInTheDocument()
+  })
+
+  it('should call signOut when the Sign Out action is clicked', () => {
+    authState.isAuthenticated = true
+    renderSidebar()
+    const signOutButton = screen.getByLabelText(/sign out/i)
+
+    fireEvent.click(signOutButton)
+
+    expect(authState.signOut).toHaveBeenCalledTimes(1)
+  })
+
+  it('should still show the theme toggle alongside the retained auth/nav actions', () => {
+    renderSidebar()
+    expect(screen.getByTitle(/toggle theme/i)).toBeInTheDocument()
+  })
+})
\ No newline at end of file