From d6c0121b1961f3237294a3f0cc313925a165826e Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:11:39 -0900
Subject: [PATCH] =?UTF-8?q?=E2=8C=A8=EF=B8=8F=20a11y(Settings):=20Improved?=
 =?UTF-8?q?=20Keyboard=20Navigation=20&=20Consistent=20Styling=20(#3975)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: settings tba accessible

* refactor: cleanup unused code

* refactor: improve accessibility and user experience in ChatDirection component

* style: focus ring primary class

* improve a11y of avatar dialog

* style: a11y improvements for Settings

* style: focus ring primary class in OriginalDialog component

---------

Co-authored-by: Danny Avila <danny@librechat.ai>
---
 .../ConvoOptions/ConvoOptions.tsx             |   4 +-
 client/src/components/Nav/Settings.tsx        | 222 ++++++++---------
 .../Nav/SettingsTabs/Account/Account.tsx      |  46 ++--
 .../Nav/SettingsTabs/Account/Avatar.tsx       | 201 ++++++++--------
 .../components/Nav/SettingsTabs/Beta/Beta.tsx |  16 +-
 .../components/Nav/SettingsTabs/Chat/Chat.tsx |  50 ++--
 .../Nav/SettingsTabs/Chat/ChatDirection.tsx   |  18 +-
 .../Nav/SettingsTabs/Commands/Commands.tsx    |  47 ++--
 .../components/Nav/SettingsTabs/Data/Data.tsx |  51 ++--
 .../SettingsTabs/Data/ImportConversations.tsx |  50 ++--
 .../SettingsTabs/General/AutoScrollSwitch.tsx |   2 +-
 .../Nav/SettingsTabs/General/General.tsx      |  45 ++--
 .../Nav/SettingsTabs/Speech/Speech.tsx        | 224 +++++++++---------
 client/src/components/ui/Dropdown.tsx         |   4 +-
 client/src/components/ui/OriginalDialog.tsx   |   2 +-
 client/src/components/ui/Switch.tsx           |   1 +
 client/src/style.css                          |  13 +
 17 files changed, 495 insertions(+), 501 deletions(-)

diff --git a/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx b/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx
index 3b3dcb40b37..60de8fd726e 100644
--- a/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx
+++ b/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx
@@ -70,13 +70,13 @@ export default function ConvoOptions({
             id="conversation-menu-button"
             aria-label={localize('com_nav_convo_menu_options')}
             className={cn(
-              'z-30 inline-flex h-7 w-7 items-center justify-center gap-2 rounded-md border-none p-0 text-sm font-medium transition-all duration-200 ease-in-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+              'z-30 inline-flex h-7 w-7 items-center justify-center gap-2 rounded-md border-none p-0 text-sm font-medium ring-ring-primary transition-all duration-200 ease-in-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
               isActiveConvo === true
                 ? 'opacity-100'
                 : 'opacity-0 focus:opacity-100 group-focus-within:opacity-100 group-hover:opacity-100 data-[open]:opacity-100',
             )}
           >
-            <Ellipsis className="icon-md text-text-secondary" aria-hidden={true}/>
+            <Ellipsis className="icon-md text-text-secondary" aria-hidden={true} />
           </Ariakit.MenuButton>
         }
         items={dropdownItems}
diff --git a/client/src/components/Nav/Settings.tsx b/client/src/components/Nav/Settings.tsx
index fc3f27ed02f..09e473d3cbd 100644
--- a/client/src/components/Nav/Settings.tsx
+++ b/client/src/components/Nav/Settings.tsx
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import * as Tabs from '@radix-ui/react-tabs';
 import { MessageSquare, Command } from 'lucide-react';
 import { SettingsTabValues } from 'librechat-data-provider';
@@ -11,10 +12,45 @@ import { cn } from '~/utils';
 export default function Settings({ open, onOpenChange }: TDialogProps) {
   const isSmallScreen = useMediaQuery('(max-width: 767px)');
   const localize = useLocalize();
+  const [activeTab, setActiveTab] = React.useState(SettingsTabValues.GENERAL);
+
+  const handleKeyDown = (event: React.KeyboardEvent) => {
+    const tabs = [
+      SettingsTabValues.GENERAL,
+      SettingsTabValues.CHAT,
+      SettingsTabValues.BETA,
+      SettingsTabValues.COMMANDS,
+      SettingsTabValues.SPEECH,
+      SettingsTabValues.DATA,
+      SettingsTabValues.ACCOUNT,
+    ];
+    const currentIndex = tabs.indexOf(activeTab);
+
+    switch (event.key) {
+      case 'ArrowDown':
+      case 'ArrowRight':
+        event.preventDefault();
+        setActiveTab(tabs[(currentIndex + 1) % tabs.length]);
+        break;
+      case 'ArrowUp':
+      case 'ArrowLeft':
+        event.preventDefault();
+        setActiveTab(tabs[(currentIndex - 1 + tabs.length) % tabs.length]);
+        break;
+      case 'Home':
+        event.preventDefault();
+        setActiveTab(tabs[0]);
+        break;
+      case 'End':
+        event.preventDefault();
+        setActiveTab(tabs[tabs.length - 1]);
+        break;
+    }
+  };
 
   return (
     <Transition appear show={open}>
-      <Dialog as="div" className="relative z-50 focus:outline-none" onClose={onOpenChange}>
+      <Dialog as="div" className="relative z-50" onClose={onOpenChange}>
         <TransitionChild
           enter="ease-out duration-200"
           enterFrom="opacity-0"
@@ -77,127 +113,93 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {
               </DialogTitle>
               <div className="max-h-[373px] overflow-auto px-6 md:min-h-[373px] md:w-[680px]">
                 <Tabs.Root
-                  defaultValue={SettingsTabValues.GENERAL}
+                  value={activeTab}
+                  onValueChange={(value: string) => setActiveTab(value as SettingsTabValues)}
                   className="flex flex-col gap-10 md:flex-row"
                   orientation="horizontal"
                 >
                   <Tabs.List
                     aria-label="Settings"
-                    role="tablist"
-                    aria-orientation="horizontal"
                     className={cn(
                       'min-w-auto max-w-auto -ml-[8px] flex flex-shrink-0 flex-col flex-nowrap overflow-auto sm:max-w-none',
                       isSmallScreen ? 'flex-row rounded-lg bg-surface-secondary' : '',
                     )}
-                    style={{ outline: 'none' }}
+                    onKeyDown={handleKeyDown}
                   >
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.GENERAL}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <GearIcon />
-                      {localize('com_nav_setting_general')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.CHAT}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <MessageSquare className="icon-sm" />
-                      {localize('com_nav_setting_chat')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.BETA}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <ExperimentIcon />
-                      {localize('com_nav_setting_beta')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.COMMANDS}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <Command className="icon-sm" />
-                      {localize('com_nav_commands')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.SPEECH}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <SpeechIcon className="icon-sm" />
-                      {localize('com_nav_setting_speech')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.DATA}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <DataIcon />
-                      {localize('com_nav_setting_data')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.ACCOUNT}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <UserIcon />
-                      {localize('com_nav_setting_account')}
-                    </Tabs.Trigger>
+                    {[
+                      {
+                        value: SettingsTabValues.GENERAL,
+                        icon: <GearIcon />,
+                        label: 'com_nav_setting_general',
+                      },
+                      {
+                        value: SettingsTabValues.CHAT,
+                        icon: <MessageSquare className="icon-sm" />,
+                        label: 'com_nav_setting_chat',
+                      },
+                      {
+                        value: SettingsTabValues.BETA,
+                        icon: <ExperimentIcon />,
+                        label: 'com_nav_setting_beta',
+                      },
+                      {
+                        value: SettingsTabValues.COMMANDS,
+                        icon: <Command className="icon-sm" />,
+                        label: 'com_nav_commands',
+                      },
+                      {
+                        value: SettingsTabValues.SPEECH,
+                        icon: <SpeechIcon className="icon-sm" />,
+                        label: 'com_nav_setting_speech',
+                      },
+                      {
+                        value: SettingsTabValues.DATA,
+                        icon: <DataIcon />,
+                        label: 'com_nav_setting_data',
+                      },
+                      {
+                        value: SettingsTabValues.ACCOUNT,
+                        icon: <UserIcon />,
+                        label: 'com_nav_setting_account',
+                      },
+                    ].map(({ value, icon, label }) => (
+                      <Tabs.Trigger
+                        key={value}
+                        className={cn(
+                          'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
+                          isSmallScreen
+                            ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
+                            : 'bg-surface-tertiary-alt',
+                        )}
+                        value={value}
+                      >
+                        {icon}
+                        {localize(label)}
+                      </Tabs.Trigger>
+                    ))}
                   </Tabs.List>
                   <div className="max-h-[373px] overflow-auto sm:w-full sm:max-w-none md:pr-0.5 md:pt-0.5">
-                    <General />
-                    <Chat />
-                    <Beta />
-                    <Commands />
-                    <Speech />
-                    <Data />
-                    <Account />
+                    <Tabs.Content value={SettingsTabValues.GENERAL}>
+                      <General />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.CHAT}>
+                      <Chat />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.BETA}>
+                      <Beta />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.COMMANDS}>
+                      <Commands />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.SPEECH}>
+                      <Speech />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.DATA}>
+                      <Data />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.ACCOUNT}>
+                      <Account />
+                    </Tabs.Content>
                   </div>
                 </Tabs.Root>
               </div>
diff --git a/client/src/components/Nav/SettingsTabs/Account/Account.tsx b/client/src/components/Nav/SettingsTabs/Account/Account.tsx
index 6227f3c7a3f..a0fd53445eb 100644
--- a/client/src/components/Nav/SettingsTabs/Account/Account.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/Account.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 import { useRecoilState } from 'recoil';
-import * as Tabs from '@radix-ui/react-tabs';
-import { SettingsTabValues } from 'librechat-data-provider';
 import HoverCardSettings from '../HoverCardSettings';
 import DeleteAccount from './DeleteAccount';
 import { Switch } from '~/components/ui';
@@ -21,33 +19,27 @@ function Account({ onCheckedChange }: { onCheckedChange?: (value: boolean) => vo
   };
 
   return (
-    <Tabs.Content
-      value={SettingsTabValues.ACCOUNT}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-    >
-      <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <Avatar />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <DeleteAccount />
-        </div>
-        <div className="flex items-center justify-between">
-          <div className="flex items-center space-x-2">
-            <div>{localize('com_nav_user_name_display')}</div>
-            <HoverCardSettings side="bottom" text="com_nav_info_user_name_display" />
-          </div>
-          <Switch
-            id="UsernameDisplay"
-            checked={UsernameDisplay}
-            onCheckedChange={handleCheckedChange}
-            className="ml-4 mt-2"
-            data-testid="UsernameDisplay"
-          />
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <Avatar />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <DeleteAccount />
+      </div>
+      <div className="flex items-center justify-between">
+        <div className="flex items-center space-x-2">
+          <div>{localize('com_nav_user_name_display')}</div>
+          <HoverCardSettings side="bottom" text="com_nav_info_user_name_display" />
         </div>
+        <Switch
+          id="UsernameDisplay"
+          checked={UsernameDisplay}
+          onCheckedChange={handleCheckedChange}
+          className="ml-4 mt-2"
+          data-testid="UsernameDisplay"
+        />
       </div>
-    </Tabs.Content>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx b/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx
index 95ac3d464f1..eb04d3f068d 100644
--- a/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx
@@ -4,7 +4,14 @@ import { useSetRecoilState } from 'recoil';
 import AvatarEditor from 'react-avatar-editor';
 import { fileConfig as defaultFileConfig, mergeFileConfig } from 'librechat-data-provider';
 import type { TUser } from 'librechat-data-provider';
-import { Dialog, DialogContent, DialogHeader, DialogTitle, Slider } from '~/components/ui';
+import {
+  OGDialog,
+  OGDialogContent,
+  OGDialogHeader,
+  OGDialogTitle,
+  OGDialogTrigger,
+  Slider,
+} from '~/components/ui';
 import { useUploadAvatarMutation, useGetFileConfig } from '~/data-provider';
 import { useToastContext } from '~/Providers';
 import { Spinner } from '~/components/svg';
@@ -20,6 +27,7 @@ function Avatar() {
   const [rotation, setRotation] = useState<number>(0);
   const editorRef = useRef<AvatarEditor | null>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
+  const openButtonRef = useRef<HTMLButtonElement>(null);
 
   const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
@@ -31,8 +39,8 @@ function Avatar() {
   const { mutate: uploadAvatar, isLoading: isUploading } = useUploadAvatarMutation({
     onSuccess: (data) => {
       showToast({ message: localize('com_ui_upload_success') });
-      setDialogOpen(false);
       setUser((prev) => ({ ...prev, avatar: data.url } as TUser));
+      openButtonRef.current?.click();
     },
     onError: (error) => {
       console.error('Error:', error);
@@ -102,113 +110,114 @@ function Avatar() {
   }, []);
 
   return (
-    <>
+    <OGDialog
+      open={isDialogOpen}
+      onOpenChange={(open) => {
+        setDialogOpen(open);
+        if (!open) {
+          resetImage();
+          setTimeout(() => {
+            openButtonRef.current?.focus();
+          }, 0);
+        }
+      }}
+    >
       <div className="flex items-center justify-between">
         <span>{localize('com_nav_profile_picture')}</span>
-        <button onClick={() => setDialogOpen(true)} className="btn btn-neutral relative">
+        <OGDialogTrigger ref={openButtonRef} className="btn btn-neutral relative">
           <FileImage className="mr-2 flex w-[22px] items-center stroke-1" />
           <span>{localize('com_nav_change_picture')}</span>
-        </button>
+        </OGDialogTrigger>
       </div>
 
-      <Dialog
-        open={isDialogOpen}
-        onOpenChange={(open) => {
-          setDialogOpen(open);
-          if (!open) {
-            resetImage();
-          }
-        }}
+      <OGDialogContent
+        className={cn('bg-surface-tertiary text-text-primary shadow-2xl  md:h-auto md:w-[450px]')}
+        style={{ borderRadius: '12px' }}
       >
-        <DialogContent
-          className={cn('shadow-2xl dark:bg-gray-700 dark:text-white md:h-auto md:w-[450px]')}
-          style={{ borderRadius: '12px' }}
-        >
-          <DialogHeader>
-            <DialogTitle className="text-lg font-medium leading-6 text-gray-800 dark:text-gray-200">
-              {image ? localize('com_ui_preview') : localize('com_ui_upload_image')}
-            </DialogTitle>
-          </DialogHeader>
-          <div className="flex flex-col items-center justify-center">
-            {image ? (
-              <>
-                <div className="relative overflow-hidden rounded-full">
-                  <AvatarEditor
-                    ref={editorRef}
-                    image={image}
-                    width={250}
-                    height={250}
-                    border={0}
-                    borderRadius={125}
-                    color={[255, 255, 255, 0.6]}
-                    scale={scale}
-                    rotate={rotation}
+        <OGDialogHeader>
+          <OGDialogTitle className="text-lg font-medium leading-6 text-text-primary">
+            {image ? localize('com_ui_preview') : localize('com_ui_upload_image')}
+          </OGDialogTitle>
+        </OGDialogHeader>
+        <div className="flex flex-col items-center justify-center">
+          {image ? (
+            <>
+              <div className="relative overflow-hidden rounded-full">
+                <AvatarEditor
+                  ref={editorRef}
+                  image={image}
+                  width={250}
+                  height={250}
+                  border={0}
+                  borderRadius={125}
+                  color={[255, 255, 255, 0.6]}
+                  scale={scale}
+                  rotate={rotation}
+                />
+              </div>
+              <div className="mt-4 flex w-full flex-col items-center space-y-4">
+                <div className="flex w-full items-center justify-center space-x-4">
+                  <span className="text-sm">Zoom:</span>
+                  <Slider
+                    value={[scale]}
+                    min={1}
+                    max={5}
+                    step={0.001}
+                    onValueChange={handleScaleChange}
+                    className="w-2/3 max-w-xs"
                   />
                 </div>
-                <div className="mt-4 flex w-full flex-col items-center space-y-4">
-                  <div className="flex w-full items-center justify-center space-x-4">
-                    <span className="text-sm">Zoom:</span>
-                    <Slider
-                      value={[scale]}
-                      min={1}
-                      max={5}
-                      step={0.001}
-                      onValueChange={handleScaleChange}
-                      className="w-2/3 max-w-xs"
-                    />
-                  </div>
-                  <button
-                    onClick={handleRotate}
-                    className="rounded-full bg-gray-200 p-2 transition-colors hover:bg-gray-300 dark:bg-gray-600 dark:hover:bg-gray-500"
-                  >
-                    <RotateCw className="h-5 w-5" />
-                  </button>
-                </div>
                 <button
-                  className={cn(
-                    'mt-4 flex items-center rounded px-4 py-2 text-white transition-colors hover:bg-green-600 hover:text-gray-200',
-                    isUploading ? 'cursor-not-allowed bg-green-600' : 'bg-green-500',
-                  )}
-                  onClick={handleUpload}
-                  disabled={isUploading}
+                  onClick={handleRotate}
+                  className="rounded-full bg-gray-200 p-2 transition-colors hover:bg-gray-300 dark:bg-gray-600 dark:hover:bg-gray-500"
                 >
-                  {isUploading ? (
-                    <Spinner className="icon-sm mr-2" />
-                  ) : (
-                    <Upload className="mr-2 h-5 w-5" />
-                  )}
-                  {localize('com_ui_upload')}
+                  <RotateCw className="h-5 w-5" />
                 </button>
-              </>
-            ) : (
-              <div
-                className="flex h-64 w-64 flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-300 bg-gray-50 dark:border-gray-600 dark:bg-gray-700"
-                onDrop={handleDrop}
-                onDragOver={handleDragOver}
-              >
-                <FileImage className="mb-4 h-12 w-12 text-gray-400" />
-                <p className="mb-2 text-center text-sm text-gray-500 dark:text-gray-400">
-                  {localize('com_ui_drag_drop')}
-                </p>
-                <button
-                  onClick={openFileDialog}
-                  className="rounded bg-gray-200 px-4 py-2 text-sm text-gray-700 transition-colors hover:bg-gray-300 dark:bg-gray-600 dark:text-gray-200 dark:hover:bg-gray-500"
-                >
-                  {localize('com_ui_select_file')}
-                </button>
-                <input
-                  ref={fileInputRef}
-                  type="file"
-                  className="hidden"
-                  accept=".png, .jpg, .jpeg"
-                  onChange={handleFileChange}
-                />
               </div>
-            )}
-          </div>
-        </DialogContent>
-      </Dialog>
-    </>
+              <button
+                className={cn(
+                  'mt-4 flex items-center rounded px-4 py-2 text-white transition-colors hover:bg-green-600 hover:text-gray-200',
+                  isUploading ? 'cursor-not-allowed bg-green-600' : 'bg-green-500',
+                )}
+                onClick={handleUpload}
+                disabled={isUploading}
+              >
+                {isUploading ? (
+                  <Spinner className="icon-sm mr-2" />
+                ) : (
+                  <Upload className="mr-2 h-5 w-5" />
+                )}
+                {localize('com_ui_upload')}
+              </button>
+            </>
+          ) : (
+            <div
+              className="flex h-64 w-64 flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-300 bg-gray-50 dark:border-gray-600 dark:bg-gray-700"
+              onDrop={handleDrop}
+              onDragOver={handleDragOver}
+            >
+              <FileImage className="mb-4 h-12 w-12 text-gray-400" />
+              <p className="mb-2 text-center text-sm text-gray-500 dark:text-gray-400">
+                {localize('com_ui_drag_drop')}
+              </p>
+              <button
+                onClick={openFileDialog}
+                className="rounded bg-gray-200 px-4 py-2 text-sm text-gray-700 transition-colors hover:bg-gray-300 dark:bg-gray-600 dark:text-gray-200 dark:hover:bg-gray-500"
+              >
+                {localize('com_ui_select_file')}
+              </button>
+              <input
+                ref={fileInputRef}
+                type="file"
+                className="hidden"
+                accept=".png, .jpg, .jpeg"
+                onChange={handleFileChange}
+              />
+            </div>
+          )}
+        </div>
+      </OGDialogContent>
+    </OGDialog>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx b/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx
index e4aae59dd6d..c71c11d4adb 100644
--- a/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx
+++ b/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx
@@ -1,21 +1,13 @@
 import { memo } from 'react';
-import * as Tabs from '@radix-ui/react-tabs';
-import { SettingsTabValues } from 'librechat-data-provider';
 import CodeArtifacts from './CodeArtifacts';
 
 function Beta() {
   return (
-    <Tabs.Content
-      value={SettingsTabValues.BETA}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-    >
-      <div className="flex flex-col gap-3 text-sm text-text-primary">
-        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-          <CodeArtifacts />
-        </div>
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <CodeArtifacts />
       </div>
-    </Tabs.Content>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Chat/Chat.tsx b/client/src/components/Nav/SettingsTabs/Chat/Chat.tsx
index d7278e6c3cf..94d9eb64995 100644
--- a/client/src/components/Nav/SettingsTabs/Chat/Chat.tsx
+++ b/client/src/components/Nav/SettingsTabs/Chat/Chat.tsx
@@ -1,6 +1,4 @@
 import { memo } from 'react';
-import * as Tabs from '@radix-ui/react-tabs';
-import { SettingsTabValues } from 'librechat-data-provider';
 import FontSizeSelector from './FontSizeSelector';
 import SendMessageKeyEnter from './EnterToSend';
 import ShowCodeSwitch from './ShowCodeSwitch';
@@ -12,32 +10,30 @@ import SaveDraft from './SaveDraft';
 
 function Chat() {
   return (
-    <Tabs.Content value={SettingsTabValues.CHAT} role="tabpanel" className="md: w-full">
-      <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <FontSizeSelector />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ChatDirection />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <SendMessageKeyEnter />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ShowCodeSwitch />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <SaveDraft />
-        </div>
-        <ForkSettings />
-        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-          <ModularChat />
-        </div>
-        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-          <LaTeXParsing />
-        </div>
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
+        <FontSizeSelector />
       </div>
-    </Tabs.Content>
+      <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
+        <ChatDirection />
+      </div>
+      <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
+        <SendMessageKeyEnter />
+      </div>
+      <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
+        <ShowCodeSwitch />
+      </div>
+      <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
+        <SaveDraft />
+      </div>
+      <ForkSettings />
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <ModularChat />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <LaTeXParsing />
+      </div>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Chat/ChatDirection.tsx b/client/src/components/Nav/SettingsTabs/Chat/ChatDirection.tsx
index c5fdcaa07a7..6048cb05076 100644
--- a/client/src/components/Nav/SettingsTabs/Chat/ChatDirection.tsx
+++ b/client/src/components/Nav/SettingsTabs/Chat/ChatDirection.tsx
@@ -14,16 +14,22 @@ const ChatDirection = () => {
   return (
     <div className="flex items-center justify-between">
       <div className="flex items-center space-x-2">
-        <span>{localize('com_nav_chat_direction')}</span>
+        <span id="chat-direction-label">{localize('com_nav_chat_direction')}</span>
       </div>
-      <label
+      <button
         onClick={toggleChatDirection}
         data-testid="chatDirection"
-        className="btn btn-neutral relative"
-        style={{ userSelect: 'none' }}
+        className="btn btn-neutral relative ring-ring-primary"
+        aria-labelledby="chat-direction-label chat-direction-status"
+        aria-pressed={direction === 'RTL'}
       >
-        {direction.toLowerCase()}
-      </label>
+        <span aria-hidden="true">{direction.toLowerCase()}</span>
+        <span id="chat-direction-status" className="sr-only">
+          {direction === 'LTR'
+            ? localize('chat_direction_left_to_right')
+            : localize('chat_direction_right_to_left')}
+        </span>
+      </button>
     </div>
   );
 };
diff --git a/client/src/components/Nav/SettingsTabs/Commands/Commands.tsx b/client/src/components/Nav/SettingsTabs/Commands/Commands.tsx
index bbec995aa3d..d9c33034c28 100644
--- a/client/src/components/Nav/SettingsTabs/Commands/Commands.tsx
+++ b/client/src/components/Nav/SettingsTabs/Commands/Commands.tsx
@@ -1,6 +1,5 @@
 import { memo } from 'react';
-import * as Tabs from '@radix-ui/react-tabs';
-import { SettingsTabValues, PermissionTypes, Permissions } from 'librechat-data-provider';
+import { PermissionTypes, Permissions } from 'librechat-data-provider';
 import HoverCardSettings from '~/components/Nav/SettingsTabs/HoverCardSettings';
 import { useLocalize, useHasAccess } from '~/hooks';
 import SlashCommandSwitch from './SlashCommandSwitch';
@@ -21,35 +20,29 @@ function Commands() {
   });
 
   return (
-    <Tabs.Content
-      value={SettingsTabValues.COMMANDS}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-    >
-      <div className="space-y-4">
-        <div className="flex items-center gap-2">
-          <h3 className="text-lg font-medium text-text-primary">
-            {localize('com_nav_chat_commands')}
-          </h3>
-          <HoverCardSettings side="bottom" text="com_nav_chat_commands_info" />
+    <div className="space-y-4 p-1">
+      <div className="flex items-center gap-2">
+        <h3 className="text-lg font-medium text-text-primary">
+          {localize('com_nav_chat_commands')}
+        </h3>
+        <HoverCardSettings side="bottom" text="com_nav_chat_commands_info" />
+      </div>
+      <div className="flex flex-col gap-3 text-sm text-text-primary">
+        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+          <AtCommandSwitch />
         </div>
-        <div className="flex flex-col gap-3 text-sm text-text-primary">
+        {hasAccessToMultiConvo === true && (
           <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-            <AtCommandSwitch />
+            <PlusCommandSwitch />
           </div>
-          {hasAccessToMultiConvo === true && (
-            <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-              <PlusCommandSwitch />
-            </div>
-          )}
-          {hasAccessToPrompts === true && (
-            <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-              <SlashCommandSwitch />
-            </div>
-          )}
-        </div>
+        )}
+        {hasAccessToPrompts === true && (
+          <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+            <SlashCommandSwitch />
+          </div>
+        )}
       </div>
-    </Tabs.Content>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Data/Data.tsx b/client/src/components/Nav/SettingsTabs/Data/Data.tsx
index f7576b117f8..6897a4a0b40 100644
--- a/client/src/components/Nav/SettingsTabs/Data/Data.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/Data.tsx
@@ -1,7 +1,5 @@
 import React, { useState, useRef } from 'react';
-import * as Tabs from '@radix-ui/react-tabs';
 import { useClearConversationsMutation } from 'librechat-data-provider/react-query';
-import { SettingsTabValues } from 'librechat-data-provider';
 import { useConversation, useConversations, useOnClickOutside } from '~/hooks';
 import { RevokeKeysButton } from './RevokeKeysButton';
 import { DeleteCacheButton } from './DeleteCacheButton';
@@ -37,35 +35,28 @@ function Data() {
   };
 
   return (
-    <Tabs.Content
-      value={SettingsTabValues.DATA}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-      ref={dataTabRef}
-    >
-      <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ImportConversations />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <SharedLinks />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <RevokeKeysButton all={true} />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <DeleteCacheButton />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ClearChatsButton
-            confirmClear={confirmClearConvos}
-            onClick={clearConvos}
-            showText={true}
-            mutation={clearConvosMutation}
-          />
-        </div>
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <ImportConversations />
       </div>
-    </Tabs.Content>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <SharedLinks />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <RevokeKeysButton all={true} />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <DeleteCacheButton />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <ClearChatsButton
+          confirmClear={confirmClearConvos}
+          onClick={clearConvos}
+          showText={true}
+          mutation={clearConvosMutation}
+        />
+      </div>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx b/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
index a75eaddd264..7b318e6495e 100644
--- a/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useState, useRef } from 'react';
 import { Import } from 'lucide-react';
 import type { TError } from 'librechat-data-provider';
 import { useUploadConversationsMutation } from '~/data-provider';
@@ -9,6 +9,7 @@ import { cn } from '~/utils';
 
 function ImportConversations() {
   const localize = useLocalize();
+  const fileInputRef = useRef<HTMLInputElement>(null);
 
   const { showToast } = useToastContext();
   const [, setErrors] = useState<string[]>([]);
@@ -26,7 +27,7 @@ function ImportConversations() {
       console.error('Error: ', error);
       setAllowImport(true);
       setError(
-        (error as TError)?.response?.data?.message ?? 'An error occurred while uploading the file.',
+        (error as TError).response?.data?.message ?? 'An error occurred while uploading the file.',
       );
       if (error?.toString().includes('Unsupported import type')) {
         showToast({
@@ -44,13 +45,12 @@ function ImportConversations() {
 
   const startUpload = async (file: File) => {
     const formData = new FormData();
-    formData.append('file', file, encodeURIComponent(file?.name || 'File'));
+    formData.append('file', file, encodeURIComponent(file.name || 'File'));
 
     uploadFile.mutate(formData);
   };
 
   const handleFiles = async (_file: File) => {
-    /* Process files */
     try {
       await startUpload(_file);
     } catch (error) {
@@ -59,33 +59,49 @@ function ImportConversations() {
     }
   };
 
-  const handleFileChange = (event) => {
-    const file = event.target.files[0];
+  const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
     if (file) {
       handleFiles(file);
     }
   };
 
+  const handleImportClick = () => {
+    fileInputRef.current?.click();
+  };
+
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLButtonElement>) => {
+    if (event.key === 'Enter' || event.key === ' ') {
+      event.preventDefault();
+      handleImportClick();
+    }
+  };
+
   return (
     <div className="flex items-center justify-between">
       <div>{localize('com_ui_import_conversation_info')}</div>
-      <label htmlFor={'import-conversations-file'} className="btn btn-neutral relative">
+      <button
+        onClick={handleImportClick}
+        onKeyDown={handleKeyDown}
+        disabled={!allowImport}
+        aria-label={localize('com_ui_import_conversation')}
+        className="btn btn-neutral relative"
+      >
         {allowImport ? (
           <Import className="mr-1 flex h-4 w-4 items-center stroke-1" />
         ) : (
           <Spinner className="mr-1 w-4" />
         )}
         <span>{localize('com_ui_import_conversation')}</span>
-        <input
-          id={'import-conversations-file'}
-          disabled={!allowImport}
-          value=""
-          type="file"
-          className={cn('hidden')}
-          accept=".json"
-          onChange={handleFileChange}
-        />
-      </label>
+      </button>
+      <input
+        ref={fileInputRef}
+        type="file"
+        className={cn('hidden')}
+        accept=".json"
+        onChange={handleFileChange}
+        aria-hidden="true"
+      />
     </div>
   );
 }
diff --git a/client/src/components/Nav/SettingsTabs/General/AutoScrollSwitch.tsx b/client/src/components/Nav/SettingsTabs/General/AutoScrollSwitch.tsx
index 8eb99e571b9..e811e3e7fe2 100644
--- a/client/src/components/Nav/SettingsTabs/General/AutoScrollSwitch.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/AutoScrollSwitch.tsx
@@ -25,7 +25,7 @@ export default function AutoScrollSwitch({
         id="autoScroll"
         checked={autoScroll}
         onCheckedChange={handleCheckedChange}
-        className="ml-4 mt-2"
+        className="ml-4 mt-2 ring-ring-primary"
         data-testid="autoScroll"
       />
     </div>
diff --git a/client/src/components/Nav/SettingsTabs/General/General.tsx b/client/src/components/Nav/SettingsTabs/General/General.tsx
index 7a01e984199..66aed110b2e 100644
--- a/client/src/components/Nav/SettingsTabs/General/General.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/General.tsx
@@ -1,7 +1,5 @@
 import { useRecoilState } from 'recoil';
-import * as Tabs from '@radix-ui/react-tabs';
 import Cookies from 'js-cookie';
-import { SettingsTabValues } from 'librechat-data-provider';
 import React, { useContext, useCallback, useRef } from 'react';
 import type { TDangerButtonProps } from '~/common';
 import { ThemeContext, useLocalize } from '~/hooks';
@@ -151,32 +149,25 @@ function General() {
   );
 
   return (
-    <Tabs.Content
-      value={SettingsTabValues.GENERAL}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-      ref={contentRef}
-    >
-      <div className="flex flex-col gap-3 text-sm text-text-primary">
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ThemeSelector theme={theme} onChange={changeTheme} />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <LangSelector langcode={langcode} onChange={changeLang} />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <AutoScrollSwitch />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <HideSidePanelSwitch />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ArchivedChats />
-        </div>
-        {/* <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-        </div> */}
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <ThemeSelector theme={theme} onChange={changeTheme} />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <LangSelector langcode={langcode} onChange={changeLang} />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <AutoScrollSwitch />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <HideSidePanelSwitch />
       </div>
-    </Tabs.Content>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <ArchivedChats />
+      </div>
+      {/* <div className="border-b pb-3 last-of-type:border-b-0 border-border-medium">
+        </div> */}
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx b/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx
index 779c32ef93b..d1420b89f43 100644
--- a/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx
+++ b/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx
@@ -1,7 +1,6 @@
 import { useRecoilState } from 'recoil';
 import * as Tabs from '@radix-ui/react-tabs';
 import { Lightbulb, Cog } from 'lucide-react';
-import { SettingsTabValues } from 'librechat-data-provider';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useGetCustomConfigSpeechQuery } from 'librechat-data-provider/react-query';
 import {
@@ -141,130 +140,123 @@ function Speech() {
   useOnClickOutside(contentRef, () => confirmClear && setConfirmClear(false), []);
 
   return (
-    <Tabs.Content
-      value={SettingsTabValues.SPEECH}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-      ref={contentRef}
+    <Tabs.Root
+      defaultValue={'simple'}
+      orientation="horizontal"
+      value={advancedMode ? 'advanced' : 'simple'}
     >
-      <Tabs.Root
-        defaultValue={'simple'}
-        orientation="horizontal"
-        value={advancedMode ? 'advanced' : 'simple'}
-      >
-        <div className="sticky -top-1 z-50 mb-4 bg-white dark:bg-gray-700">
-          <Tabs.List className="flex justify-center bg-white dark:bg-gray-700">
-            <Tabs.Trigger
-              onClick={() => setAdvancedMode(false)}
-              className={cn(
-                'group m-1 flex items-center justify-center gap-2 rounded-md px-4 py-2 text-sm text-black transition-all duration-200 ease-in-out radix-state-active:bg-white radix-state-active:text-black dark:text-white dark:radix-state-active:bg-gray-600',
-                isSmallScreen
-                  ? 'flex-row items-center justify-center text-sm text-gray-700 radix-state-active:bg-gray-100 radix-state-active:text-black dark:text-gray-300 dark:radix-state-active:text-white'
-                  : 'bg-white radix-state-active:bg-gray-100 dark:bg-gray-700',
-                'w-full',
-              )}
-              value="simple"
-              style={{ userSelect: 'none' }}
-            >
-              <Lightbulb />
-              Simple
-            </Tabs.Trigger>
-            <Tabs.Trigger
-              onClick={() => setAdvancedMode(true)}
-              className={cn(
-                'group m-1 flex items-center justify-center gap-2 rounded-md px-4 py-2 text-sm text-black transition-all duration-200 ease-in-out radix-state-active:bg-white radix-state-active:text-black dark:text-white dark:radix-state-active:bg-gray-600',
-                isSmallScreen
-                  ? 'flex-row items-center justify-center text-sm text-gray-700 radix-state-active:bg-gray-100 radix-state-active:text-black dark:text-gray-300 dark:radix-state-active:text-white'
-                  : 'bg-white radix-state-active:bg-gray-100 dark:bg-gray-700',
-                'w-full',
-              )}
-              value="advanced"
-              style={{ userSelect: 'none' }}
-            >
-              <Cog />
-              Advanced
-            </Tabs.Trigger>
-          </Tabs.List>
-        </div>
+      <div className="sticky -top-1 z-50 mb-4 bg-white dark:bg-gray-700">
+        <Tabs.List className="flex justify-center bg-white dark:bg-gray-700">
+          <Tabs.Trigger
+            onClick={() => setAdvancedMode(false)}
+            className={cn(
+              'group m-1 flex items-center justify-center gap-2 rounded-md px-4 py-2 text-sm text-black transition-all duration-200 ease-in-out radix-state-active:bg-white radix-state-active:text-black dark:text-white dark:radix-state-active:bg-gray-600',
+              isSmallScreen
+                ? 'flex-row items-center justify-center text-sm text-gray-700 radix-state-active:bg-gray-100 radix-state-active:text-black dark:text-gray-300 dark:radix-state-active:text-white'
+                : 'bg-white radix-state-active:bg-gray-100 dark:bg-gray-700',
+              'w-full',
+            )}
+            value="simple"
+            style={{ userSelect: 'none' }}
+          >
+            <Lightbulb />
+            Simple
+          </Tabs.Trigger>
+          <Tabs.Trigger
+            onClick={() => setAdvancedMode(true)}
+            className={cn(
+              'group m-1 flex items-center justify-center gap-2 rounded-md px-4 py-2 text-sm text-black transition-all duration-200 ease-in-out radix-state-active:bg-white radix-state-active:text-black dark:text-white dark:radix-state-active:bg-gray-600',
+              isSmallScreen
+                ? 'flex-row items-center justify-center text-sm text-gray-700 radix-state-active:bg-gray-100 radix-state-active:text-black dark:text-gray-300 dark:radix-state-active:text-white'
+                : 'bg-white radix-state-active:bg-gray-100 dark:bg-gray-700',
+              'w-full',
+            )}
+            value="advanced"
+            style={{ userSelect: 'none' }}
+          >
+            <Cog />
+            Advanced
+          </Tabs.Trigger>
+        </Tabs.List>
+      </div>
 
-        <Tabs.Content value={'simple'}>
-          <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <SpeechToTextSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <EngineSTTDropdown external={sttExternal} />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <LanguageSTTDropdown />
-            </div>
-            <div className="h-px bg-black/20 bg-white/20" role="none" />
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <TextToSpeechSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <EngineTTSDropdown external={ttsExternal} />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <VoiceDropdown />
-            </div>
+      <Tabs.Content value={'simple'}>
+        <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <SpeechToTextSwitch />
+          </div>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <EngineSTTDropdown external={sttExternal} />
           </div>
-        </Tabs.Content>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <LanguageSTTDropdown />
+          </div>
+          <div className="h-px bg-black/20 bg-white/20" role="none" />
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <TextToSpeechSwitch />
+          </div>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <EngineTTSDropdown external={ttsExternal} />
+          </div>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <VoiceDropdown />
+          </div>
+        </div>
+      </Tabs.Content>
 
-        <Tabs.Content value={'advanced'}>
-          <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-            <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">
-              <ConversationModeSwitch />
-            </div>
-            <div className="h-px bg-black/20 bg-white/20" role="none" />
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <SpeechToTextSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <EngineSTTDropdown external={sttExternal} />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <LanguageSTTDropdown />
-            </div>
+      <Tabs.Content value={'advanced'}>
+        <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
+          <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">
+            <ConversationModeSwitch />
+          </div>
+          <div className="h-px bg-black/20 bg-white/20" role="none" />
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <SpeechToTextSwitch />
+          </div>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <EngineSTTDropdown external={sttExternal} />
+          </div>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <LanguageSTTDropdown />
+          </div>
+          <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
+            <AutoTranscribeAudioSwitch />
+          </div>
+          {autoTranscribeAudio && (
             <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
-              <AutoTranscribeAudioSwitch />
-            </div>
-            {autoTranscribeAudio && (
-              <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
-                <DecibelSelector />
-              </div>
-            )}
-            <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">
-              <AutoSendTextSelector />
-            </div>
-            <div className="h-px bg-black/20 bg-white/20" role="none" />
-            <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">
-              <TextToSpeechSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <AutomaticPlaybackSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <EngineTTSDropdown external={ttsExternal} />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <VoiceDropdown />
+              <DecibelSelector />
             </div>
-            {engineTTS === 'browser' && (
-              <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
-                <CloudBrowserVoicesSwitch />
-              </div>
-            )}
+          )}
+          <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">
+            <AutoSendTextSelector />
+          </div>
+          <div className="h-px bg-black/20 bg-white/20" role="none" />
+          <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">
+            <TextToSpeechSwitch />
+          </div>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <AutomaticPlaybackSwitch />
+          </div>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <EngineTTSDropdown external={ttsExternal} />
+          </div>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <VoiceDropdown />
+          </div>
+          {engineTTS === 'browser' && (
             <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
-              <PlaybackRate />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <CacheTTSSwitch />
+              <CloudBrowserVoicesSwitch />
             </div>
+          )}
+          <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
+            <PlaybackRate />
           </div>
-        </Tabs.Content>
-      </Tabs.Root>
-    </Tabs.Content>
+          <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
+            <CacheTTSSwitch />
+          </div>
+        </div>
+      </Tabs.Content>
+    </Tabs.Root>
   );
 }
 
diff --git a/client/src/components/ui/Dropdown.tsx b/client/src/components/ui/Dropdown.tsx
index f51763cd63a..bd967808315 100644
--- a/client/src/components/ui/Dropdown.tsx
+++ b/client/src/components/ui/Dropdown.tsx
@@ -46,7 +46,7 @@ const Dropdown: FC<DropdownProps> = ({
           <ListboxButton
             data-testid={testId}
             className={cn(
-              'focus:ring-offset-ring-offset relative inline-flex w-auto items-center justify-between rounded-md border-border-light bg-header-primary py-2 pl-3 pr-8 text-text-primary transition-all duration-100 ease-in-out hover:bg-header-hover focus:ring-ring-primary',
+              'btn-neutral focus:ring-offset-ring-offset relative inline-flex w-auto items-center justify-between rounded-md border-border-light bg-header-primary py-2 pl-3 pr-8 text-text-primary transition-all duration-100 ease-in-out hover:bg-header-hover focus:ring-ring-primary',
               className,
             )}
             aria-label="Select an option"
@@ -88,7 +88,7 @@ const Dropdown: FC<DropdownProps> = ({
                 <ListboxOption
                   key={index}
                   value={typeof item === 'string' ? item : item.value}
-                  className="focus-visible:ring-offset ring-offset-ring-offset relative cursor-pointer select-none rounded border-border-light bg-header-primary py-2.5 pl-3 pr-3 text-sm text-text-secondary ring-ring-primary hover:bg-header-hover focus-visible:ring"
+                  className="focus-visible:ring-offset ring-offset-ring-offset relative cursor-pointer select-none rounded border-border-light bg-header-primary py-2.5 pl-3 pr-3 text-sm text-text-secondary ring-ring-primary hover:bg-header-hover focus-visible:ring data-[focus]:bg-surface-hover data-[focus]:text-text-primary"
                   style={{ width: '100%' }}
                   data-theme={typeof item === 'string' ? item : (item as Option).value}
                 >
diff --git a/client/src/components/ui/OriginalDialog.tsx b/client/src/components/ui/OriginalDialog.tsx
index ef0508fbe9f..c09ac786f8f 100644
--- a/client/src/components/ui/OriginalDialog.tsx
+++ b/client/src/components/ui/OriginalDialog.tsx
@@ -48,7 +48,7 @@ const DialogContent = React.forwardRef<
     >
       {children}
       {showCloseButton && (
-        <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
+        <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 ring-ring-primary transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
           <X className="h-4 w-4" />
           <span className="sr-only">Close</span>
         </DialogPrimitive.Close>
diff --git a/client/src/components/ui/Switch.tsx b/client/src/components/ui/Switch.tsx
index b706cb50140..21b1081dac7 100644
--- a/client/src/components/ui/Switch.tsx
+++ b/client/src/components/ui/Switch.tsx
@@ -10,6 +10,7 @@ const Switch = React.forwardRef<
   <SwitchPrimitives.Root
     className={cn(
       'focus-visible:ring-ring focus-visible:ring-offset-background peer inline-flex h-[20px] w-[32px] shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-black data-[state=unchecked]:bg-gray-200 dark:data-[state=checked]:bg-green-500 dark:data-[state=unchecked]:bg-gray-500',
+      'ring-ring-primary',
       className,
     )}
     {...props}
diff --git a/client/src/style.css b/client/src/style.css
index a53376225cd..bcdc8d957d1 100644
--- a/client/src/style.css
+++ b/client/src/style.css
@@ -1178,11 +1178,19 @@ button {
   color: rgba(64, 65, 79, var(--tw-text-opacity));
   font-size: 0.875rem;
   line-height: 1.25rem;
+  transition: all 0.1s ease-in-out;
 }
+
 .btn-neutral:hover {
   --tw-bg-opacity: 1;
   background-color: rgba(236, 236, 241, var(--tw-bg-opacity));
 }
+
+.btn-neutral:focus {
+  outline: none;
+  box-shadow: 0 0 0 2px var(--ring-primary);
+}
+
 .dark .btn-neutral {
   --tw-border-opacity: 1;
   --tw-bg-opacity: 1;
@@ -1191,10 +1199,15 @@ button {
   border-color: rgba(66, 66, 66, var(--tw-border-opacity));
   color: rgba(255, 255, 240, var(--tw-text-opacity));
 }
+
 .dark .btn-neutral:hover {
   --tw-bg-opacity: 1;
   background-color: rgba(66, 66, 66, var(--tw-bg-opacity));
 }
+
+.dark .btn-neutral:focus {
+  box-shadow: 0 0 0 2px var(--ring-primary);
+}
 .btn-small {
   padding: 0.25rem 0.5rem;
 }