diff --git a/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx b/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
index 543b78c669c..0472136abab 100644
--- a/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
+++ b/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
@@ -41,7 +41,7 @@ const GridHeaderActions: FC<Props> = ({
         icon={<IconCode size={14} strokeWidth={2} />}
         onClick={handlePreviewToggle}
       >
-        API Quickstart
+        API
       </Button>
     )
   }
@@ -72,9 +72,7 @@ const GridHeaderActions: FC<Props> = ({
           </Tooltip.Portal>
         </Tooltip.Root>
       )}
-      <div className="mt-[1px]">
-        <RenderAPIPreviewToggle />
-      </div>
+
       <Link href={`/project/${projectRef}/auth/policies?search=${table.id}`}>
         <a>
           <Button
@@ -95,6 +93,9 @@ const GridHeaderActions: FC<Props> = ({
           </Button>
         </a>
       </Link>
+      <div className="mt-[1px]">
+        <RenderAPIPreviewToggle />
+      </div>
     </div>
   )
 }
diff --git a/studio/components/ui/TwoOptionToggle.tsx b/studio/components/ui/TwoOptionToggle.tsx
index d1255788b68..b7989042a0a 100644
--- a/studio/components/ui/TwoOptionToggle.tsx
+++ b/studio/components/ui/TwoOptionToggle.tsx
@@ -20,7 +20,7 @@ const TwoOptionToggle: FC<Props> = ({
     isActive: boolean
   ) => `absolute top-0 z-1 text-xs inline-flex h-full items-center justify-center font-medium
     ${
-      isActive ? 'hover:text-white' : 'hover:text-gray-600'
+      isActive ? 'hover:text-scale-1100 dark:hover:text-white' : 'hover:text-gray-600'
     } dark:hover:text-white focus:z-10 focus:outline-none focus:border-blue-300 focus:ring-blue
     transition ease-in-out duration-150`
 
@@ -33,7 +33,7 @@ const TwoOptionToggle: FC<Props> = ({
         style={{ width, translate: activeOption === options[1] ? '0px' : `${width - 2}px` }}
         aria-hidden="true"
         className={clsx(
-          'z-0 inline-block rounded h-full dark:bg-scale-600 shadow transform',
+          'z-0 inline-block rounded h-full bg-scale-200 dark:bg-scale-600 shadow transform',
           'transition-all ease-in-out border border-scale-700'
         )}
       ></span>
@@ -42,14 +42,21 @@ const TwoOptionToggle: FC<Props> = ({
           key={`toggle_${index}`}
           style={{ width: width + 1 }}
           className={`
-              ${activeOption === option ? 'text-scale-1200' : 'text-scale-1000'} 
-              ${index === 0 ? 'right-0' : 'left-0'} 
+              ${activeOption === option ? 'text-scale-1200' : 'text-scale-1000'}
+              ${index === 0 ? 'right-0' : 'left-0'}
               ${buttonStyle(activeOption === option)}
               cursor-pointer
             `}
           onClick={() => onClickOption(option)}
         >
-          <span className="text-color-inherit capitalize">{option}</span>
+          <span
+            className={clsx(
+              'capitalize hover:text-scale-1200 dark:hover:text-scale-1200',
+              activeOption === option ? 'text-scale-1200' : 'text-scale-1000'
+            )}
+          >
+            {option}
+          </span>
         </span>
       ))}
     </div>