diff --git a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddEndingCardButton.tsx b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddEndingCardButton.tsx
index b614ba86be..ec9afc65f2 100644
--- a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddEndingCardButton.tsx
+++ b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddEndingCardButton.tsx
@@ -18,7 +18,7 @@ export const AddEndingCardButton = ({ localSurvey, addEndingCard }: AddEndingCar
         <PlusIcon className="h-6 w-6 text-white" />
       </div>
       <div className="px-4 py-3 text-sm">
-        <p className="font-semibold">Add Ending</p>
+        <p className="font-semibold">Add ending</p>
       </div>
     </div>
   );
diff --git a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddQuestionButton.tsx b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddQuestionButton.tsx
index fe73f85705..e3a6fbe3da 100644
--- a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddQuestionButton.tsx
+++ b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddQuestionButton.tsx
@@ -38,7 +38,7 @@ export const AddQuestionButton = ({ addQuestion, product, isCxMode }: AddQuestio
             <PlusIcon className="h-5 w-5 text-white" />
           </div>
           <div className="px-4 py-3">
-            <p className="text-sm font-semibold">Add Question</p>
+            <p className="text-sm font-semibold">Add question</p>
             <p className="mt-1 text-xs text-slate-500">Add a new question to your survey</p>
           </div>
         </div>
diff --git a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditWelcomeCard.tsx b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditWelcomeCard.tsx
index 9b564a6053..8770214566 100644
--- a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditWelcomeCard.tsx
+++ b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditWelcomeCard.tsx
@@ -75,11 +75,11 @@ export const EditWelcomeCard = ({
         className="flex-1 rounded-r-lg border border-slate-200 transition-all duration-300 ease-in-out">
         <Collapsible.CollapsibleTrigger
           asChild
-          className="flex cursor-pointer justify-between p-4 hover:bg-slate-50">
+          className="flex cursor-pointer justify-between rounded-r-lg p-4 hover:bg-slate-50">
           <div>
             <div className="inline-flex">
               <div>
-                <p className="text-sm font-semibold">Welcome Card</p>
+                <p className="text-sm font-semibold">Welcome card</p>
                 {!open && (
                   <p className="mt-1 truncate text-xs text-slate-500">
                     {localSurvey?.welcomeCard?.enabled ? "Shown" : "Hidden"}
diff --git a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditorCardMenu.tsx b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditorCardMenu.tsx
index e898baea65..680303acae 100644
--- a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditorCardMenu.tsx
+++ b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditorCardMenu.tsx
@@ -206,9 +206,7 @@ export const EditorCardMenu = ({
 
             {cardType === "question" && (
               <DropdownMenuSub>
-                <DropdownMenuSubTrigger className="cursor-pointer text-sm text-slate-600 hover:text-slate-700">
-                  Add question below
-                </DropdownMenuSubTrigger>
+                <DropdownMenuSubTrigger className="cursor-pointer">Add question below</DropdownMenuSubTrigger>
 
                 <DropdownMenuSubContent className="ml-2">
                   {Object.entries(availableQuestionTypes).map(([type, name]) => {
diff --git a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard.tsx b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard.tsx
index 3bddd32830..98d6b11c8a 100644
--- a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard.tsx
+++ b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard.tsx
@@ -100,11 +100,11 @@ export const HiddenFieldsCard = ({
         className="flex-1 rounded-r-lg border border-slate-200 transition-all duration-300 ease-in-out">
         <Collapsible.CollapsibleTrigger
           asChild
-          className="flex cursor-pointer justify-between p-4 hover:bg-slate-50">
+          className="flex cursor-pointer justify-between rounded-r-lg p-4 hover:bg-slate-50">
           <div>
             <div className="inline-flex">
               <div>
-                <p className="text-sm font-semibold">Hidden Fields</p>
+                <p className="text-sm font-semibold">Hidden fields</p>
               </div>
             </div>
 
diff --git a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyVariablesCard.tsx b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyVariablesCard.tsx
index d25c984bab..686e7b6af3 100644
--- a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyVariablesCard.tsx
+++ b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyVariablesCard.tsx
@@ -48,7 +48,7 @@ export const SurveyVariablesCard = ({
         className="flex-1 rounded-r-lg border border-slate-200 transition-all duration-300 ease-in-out">
         <Collapsible.CollapsibleTrigger
           asChild
-          className="flex cursor-pointer justify-between p-4 hover:bg-slate-50">
+          className="flex cursor-pointer justify-between rounded-r-lg p-4 hover:bg-slate-50">
           <div>
             <div className="inline-flex">
               <div>
diff --git a/apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.tsx b/apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.tsx
index 4b49add672..ed64532f9f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.tsx
@@ -388,7 +388,7 @@ export const MainNavigation = ({
                   {sortedProducts.map((product) => (
                     <DropdownMenuRadioItem
                       value={product.id}
-                      className="cursor-pointer break-all rounded-lg font-normal"
+                      className="cursor-pointer break-all"
                       key={product.id}>
                       <div>
                         {product.config.channel === "website" ? (
@@ -463,17 +463,13 @@ export const MainNavigation = ({
                   {dropdownNavigation.map(
                     (link) =>
                       !link.hidden && (
-                        <Link
-                          href={link.href}
-                          target={link.target}
+                        <DropdownMenuItem
                           key={link.label}
-                          className="flex items-center">
-                          <DropdownMenuItem
-                            key={link.label}
-                            icon={<link.icon className="h-4 w-4" strokeWidth={1.5} />}>
+                          icon={<link.icon className="h-4 w-4" strokeWidth={1.5} />}>
+                          <Link href={link.href} target={link.target} className="flex items-center">
                             {link.label}
-                          </DropdownMenuItem>
-                        </Link>
+                          </Link>
+                        </DropdownMenuItem>
                       )
                   )}
 
diff --git a/apps/web/playwright/survey.spec.ts b/apps/web/playwright/survey.spec.ts
index c9010e0ee1..990c03faa6 100644
--- a/apps/web/playwright/survey.spec.ts
+++ b/apps/web/playwright/survey.spec.ts
@@ -247,47 +247,47 @@ test.describe("Multi Language Survey Create", async () => {
     await page.getByText("Welcome CardShownOn").click();
 
     // Add questions in default language
-    await page.getByText("Add Question").click();
+    await page.getByText("Add question").click();
     await page.getByRole("button", { name: "Single-Select" }).click();
     await page
       .locator("div")
-      .filter({ hasText: /^Add QuestionAdd a new question to your survey$/ })
+      .filter({ hasText: /^Add questionAdd a new question to your survey$/ })
       .nth(1)
       .click();
     await page.getByRole("button", { name: "Multi-Select" }).click();
     await page
       .locator("div")
-      .filter({ hasText: /^Add QuestionAdd a new question to your survey$/ })
+      .filter({ hasText: /^Add questionAdd a new question to your survey$/ })
       .nth(1)
       .click();
     await page.getByRole("button", { name: "Picture Selection" }).click();
     await page
       .locator("div")
-      .filter({ hasText: /^Add QuestionAdd a new question to your survey$/ })
+      .filter({ hasText: /^Add questionAdd a new question to your survey$/ })
       .nth(1)
       .click();
     await page.getByRole("button", { name: "Rating" }).click();
     await page
       .locator("div")
-      .filter({ hasText: /^Add QuestionAdd a new question to your survey$/ })
+      .filter({ hasText: /^Add questionAdd a new question to your survey$/ })
       .nth(1)
       .click();
     await page.getByRole("button", { name: "Net Promoter Score (NPS)" }).click();
     await page
       .locator("div")
-      .filter({ hasText: /^Add QuestionAdd a new question to your survey$/ })
+      .filter({ hasText: /^Add questionAdd a new question to your survey$/ })
       .nth(1)
       .click();
     await page.getByRole("button", { name: "Date" }).click();
     await page
       .locator("div")
-      .filter({ hasText: /^Add QuestionAdd a new question to your survey$/ })
+      .filter({ hasText: /^Add questionAdd a new question to your survey$/ })
       .nth(1)
       .click();
     await page.getByRole("button", { name: "File Upload" }).click();
     await page
       .locator("div")
-      .filter({ hasText: /^Add QuestionAdd a new question to your survey$/ })
+      .filter({ hasText: /^Add questionAdd a new question to your survey$/ })
       .nth(1)
       .click();
 
@@ -295,13 +295,13 @@ test.describe("Multi Language Survey Create", async () => {
     await page.getByRole("button", { name: "Matrix" }).click();
     await page
       .locator("div")
-      .filter({ hasText: /^Add QuestionAdd a new question to your survey$/ })
+      .filter({ hasText: /^Add questionAdd a new question to your survey$/ })
       .nth(1)
       .click();
     await page.getByRole("button", { name: "Address" }).click();
     await page
       .locator("div")
-      .filter({ hasText: /^Add QuestionAdd a new question to your survey$/ })
+      .filter({ hasText: /^Add questionAdd a new question to your survey$/ })
       .nth(1)
       .click();
     await page.getByRole("button", { name: "Ranking" }).click();
diff --git a/apps/web/playwright/utils/helper.ts b/apps/web/playwright/utils/helper.ts
index 07b31115ee..5f30eb5315 100644
--- a/apps/web/playwright/utils/helper.ts
+++ b/apps/web/playwright/utils/helper.ts
@@ -136,7 +136,7 @@ export const signupUsingInviteToken = async (page: Page, name: string, email: st
 };
 
 export const createSurvey = async (page: Page, params: CreateSurveyParams) => {
-  const addQuestion = "Add QuestionAdd a new question to your survey";
+  const addQuestion = "Add questionAdd a new question to your survey";
 
   await page.getByRole("button", { name: "Start from scratch Create a" }).click();
   await page.getByRole("button", { name: "Create survey", exact: true }).click();
@@ -324,7 +324,7 @@ export const createSurvey = async (page: Page, params: CreateSurveyParams) => {
 };
 
 export const createSurveyWithLogic = async (page: Page, params: CreateSurveyWithLogicParams) => {
-  const addQuestion = "Add QuestionAdd a new question to your survey";
+  const addQuestion = "Add questionAdd a new question to your survey";
 
   await page.getByRole("button", { name: "Start from scratch Create a" }).click();
   await page.getByRole("button", { name: "Create survey", exact: true }).click();
diff --git a/packages/ee/multi-language/components/multi-language-card.tsx b/packages/ee/multi-language/components/multi-language-card.tsx
index 400d3007de..e6db53af09 100644
--- a/packages/ee/multi-language/components/multi-language-card.tsx
+++ b/packages/ee/multi-language/components/multi-language-card.tsx
@@ -190,11 +190,11 @@ export const MultiLanguageCard: FC<MultiLanguageCardProps> = ({
         open={open}>
         <Collapsible.CollapsibleTrigger
           asChild
-          className="flex cursor-pointer justify-between p-4 hover:bg-slate-50">
+          className="flex cursor-pointer justify-between rounded-r-lg p-4 hover:bg-slate-50">
           <div>
             <div className="inline-flex">
               <div>
-                <p className="text-sm font-semibold">Multiple Languages</p>
+                <p className="text-sm font-semibold">Multiple languages</p>
               </div>
             </div>
 
diff --git a/packages/ui/components/DropdownMenu/index.tsx b/packages/ui/components/DropdownMenu/index.tsx
index 9d8cd9d9c0..c0fc4ae0f9 100644
--- a/packages/ui/components/DropdownMenu/index.tsx
+++ b/packages/ui/components/DropdownMenu/index.tsx
@@ -29,7 +29,7 @@ const DropdownMenuSubTrigger: React.ComponentType<
     <DropdownMenuPrimitive.SubTrigger
       ref={ref as any}
       className={cn(
-        "flex cursor-default select-none items-center rounded-md px-2 py-1.5 text-sm font-medium outline-none focus:bg-slate-100 data-[state=open]:bg-slate-100",
+        "flex cursor-default select-none items-center rounded-lg px-2 py-1.5 text-sm font-medium text-slate-600 outline-none hover:text-slate-700 focus:bg-slate-100 data-[state=open]:bg-slate-100",
         inset && "pl-8",
         className
       )}
@@ -46,7 +46,7 @@ const DropdownMenuSubContent: React.ComponentType<DropdownMenuPrimitive.Dropdown
     <DropdownMenuPrimitive.SubContent
       ref={ref as any}
       className={cn(
-        "animate-in slide-in-from-left-1 z-50 min-w-[8rem] overflow-hidden rounded-xl border border-slate-200 bg-white p-1 text-slate-700 shadow-sm",
+        "animate-in slide-in-from-left-1 z-50 min-w-[8rem] overflow-hidden rounded-lg border border-slate-200 bg-white p-1 font-medium text-slate-600 shadow-sm hover:text-slate-700",
         className
       )}
       {...props}
@@ -67,7 +67,7 @@ const DropdownMenuContent: React.ComponentType<DropdownMenuPrimitive.DropdownMen
           ref={ref}
           sideOffset={sideOffset}
           className={cn(
-            "animate-in data-[side=right]:slide-in-from-left-2 data-[side=left]:slide-in-from-right-2 data-[side=bottom]:slide-in-from-top-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-xl border border-slate-200 bg-white p-1 text-slate-700 shadow-sm",
+            "animate-in data-[side=right]:slide-in-from-left-2 data-[side=left]:slide-in-from-right-2 data-[side=bottom]:slide-in-from-top-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] overflow-hidden rounded-lg border border-slate-200 bg-white p-1 font-medium text-slate-700 shadow-sm",
             className
           )}
           {...props}
@@ -92,7 +92,7 @@ const DropdownMenuItem: React.ForwardRefExoticComponent<
   <DropdownMenuPrimitive.Item
     ref={ref}
     className={cn(
-      "relative flex w-full cursor-pointer select-none items-center gap-x-2 rounded-lg px-2 py-1.5 text-sm font-normal outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      "relative flex w-full cursor-pointer select-none items-center gap-x-2 rounded-lg px-2 py-1.5 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       inset && "pl-8",
       className
     )}
@@ -112,7 +112,7 @@ const DropdownMenuCheckboxItem: React.ComponentType<
   <DropdownMenuPrimitive.CheckboxItem
     ref={ref}
     className={cn(
-      "relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      "relative flex cursor-default select-none items-center rounded-lg py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className
     )}
     checked={checked}
@@ -136,7 +136,7 @@ const DropdownMenuRadioItem: React.ComponentType<
   <DropdownMenuPrimitive.RadioItem
     ref={ref}
     className={cn(
-      "relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      "relative flex cursor-default select-none items-center rounded-lg py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className
     )}
     {...props}>